diff options
Diffstat (limited to 'reportdesign')
264 files changed, 6662 insertions, 5995 deletions
diff --git a/reportdesign/inc/ModuleHelper.hxx b/reportdesign/inc/ModuleHelper.hxx index b3ed01738b36..2ea495990045 100644 --- a/reportdesign/inc/ModuleHelper.hxx +++ b/reportdesign/inc/ModuleHelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,18 +50,18 @@ namespace rptui // not implemented. OModule is a static class protected: - static ::osl::Mutex s_aMutex; /// access safety - static sal_Int32 s_nClients; /// number of registered clients - static OModuleImpl* s_pImpl; /// impl class. lives as long as at least one client for the module is registered + static ::osl::Mutex s_aMutex; /// access safety + static sal_Int32 s_nClients; /// number of registered clients + static OModuleImpl* s_pImpl; /// impl class. lives as long as at least one client for the module is registered public: /// get the vcl res manager of the module - static ResMgr* getResManager(); + static ResMgr* getResManager(); protected: /// register a client for the module - static void registerClient(); + static void registerClient(); /// revoke a client for the module - static void revokeClient(); + static void revokeClient(); private: /** ensure that the impl class exists @@ -73,13 +73,13 @@ namespace rptui //========================================================================= //= OModuleClient //========================================================================= - /** base class for objects which uses any global module-specific ressources + /** base class for objects which uses any global module-specific ressources */ class REPORTDESIGN_DLLPUBLIC OModuleClient { public: - inline OModuleClient() { OModule::registerClient(); } - inline ~OModuleClient() { OModule::revokeClient(); } + inline OModuleClient() { OModule::registerClient(); } + inline ~OModuleClient() { OModule::revokeClient(); } }; //========================================================================= @@ -90,10 +90,10 @@ namespace rptui class REPORTDESIGN_DLLPUBLIC ModuleRes : public ::ResId { public: - inline ModuleRes(sal_uInt16 _nId) : ResId(_nId, *OModule::getResManager()) { } + inline ModuleRes(USHORT _nId) : ResId(_nId, *OModule::getResManager()) { } }; //......................................................................... -} // namespace rptui +} // namespace rptui //......................................................................... #endif // _RPTUI_MODULE_HELPER_RPT_HXX_ diff --git a/reportdesign/inc/PropertyForward.hxx b/reportdesign/inc/PropertyForward.hxx index bec7eb21c0a6..5a99848ede31 100644 --- a/reportdesign/inc/PropertyForward.hxx +++ b/reportdesign/inc/PropertyForward.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,9 +41,9 @@ namespace rptui { //........................................................................ - typedef ::cppu::WeakComponentImplHelper1< ::com::sun::star::beans::XPropertyChangeListener - > OPropertyForward_Base; - + typedef ::cppu::WeakComponentImplHelper1< ::com::sun::star::beans::XPropertyChangeListener + > OPropertyForward_Base; + /** \class OPropertyMediator * \brief This class ensures the communication between two XPropertySet instances. * Identical properties will be set at the other propertyset. @@ -52,12 +52,12 @@ namespace rptui class REPORTDESIGN_DLLPUBLIC OPropertyMediator : public ::cppu::BaseMutex ,public OPropertyForward_Base { - TPropertyNamePair m_aNameMap; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xSource; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> m_xSourceInfo; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xDest; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> m_xDestInfo; - sal_Bool m_bInChange; + TPropertyNamePair m_aNameMap; + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xSource; + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> m_xSourceInfo; + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xDest; + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> m_xDestInfo; + sal_Bool m_bInChange; OPropertyMediator(OPropertyMediator&); void operator =(OPropertyMediator&); protected: @@ -87,7 +87,7 @@ namespace rptui void startListening(); }; //........................................................................ -} // namespace rptui +} // namespace rptui //........................................................................ #endif // RPTUI_PROPERTYSETFORWARD_HXX diff --git a/reportdesign/inc/ReportDefinition.hxx b/reportdesign/inc/ReportDefinition.hxx index fe7fc36d83e8..d3e3450b8936 100644 --- a/reportdesign/inc/ReportDefinition.hxx +++ b/reportdesign/inc/ReportDefinition.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,36 +30,25 @@ #define REPORTDESIGN_API_REPORTDEFINITION_HXX #include "dllapi.h" - -#include "ReportHelperDefines.hxx" - -/** === begin UNO includes === **/ -#include <com/sun/star/datatransfer/XTransferable.hpp> -#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> -#include <com/sun/star/document/XUndoManagerSupplier.hpp> -#include <com/sun/star/frame/XModule.hpp> +#include <com/sun/star/report/XReportDefinition.hpp> +#include <cppuhelper/compbase12.hxx> +#include <cppuhelper/basemutex.hxx> +#include <com/sun/star/lang/XServiceInfo.hpp> +#include <com/sun/star/lang/XUnoTunnel.hpp> +#include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/frame/XTitle.hpp> #include <com/sun/star/frame/XTitleChangeBroadcaster.hpp> #include <com/sun/star/frame/XUntitledNumbers.hpp> -#include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/lang/XTypeProvider.hpp> -#include <com/sun/star/lang/XUnoTunnel.hpp> -#include <com/sun/star/report/XReportDefinition.hpp> +#include <com/sun/star/frame/XModule.hpp> #include <com/sun/star/util/XNumberFormatsSupplier.hpp> -/** === end UNO includes === **/ - -#include <comphelper/embeddedobjectcontainer.hxx> -#include <comphelper/uno3.hxx> -#include <cppuhelper/basemutex.hxx> +#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> +#include <com/sun/star/datatransfer/XTransferable.hpp> #include <cppuhelper/propertysetmixin.hxx> +#include <comphelper/uno3.hxx> +#include <comphelper/embeddedobjectcontainer.hxx> #include <svx/unomod.hxx> -#if !defined(INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_13) -#define INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_13 -#define COMPHELPER_IMPLBASE_INTERFACE_NUMBER 13 -#include <comphelper/implbase_var.hxx> -#endif - +#include "ReportHelperDefines.hxx" #include <boost/shared_ptr.hpp> @@ -74,47 +63,42 @@ namespace comphelper namespace reportdesign { class OReportComponentProperties; - typedef ::comphelper::PartialWeakComponentImplHelper13 < ::com::sun::star::report::XReportDefinition - , ::com::sun::star::document::XEventBroadcaster - , ::com::sun::star::lang::XServiceInfo - , ::com::sun::star::frame::XModule - , ::com::sun::star::lang::XUnoTunnel - , ::com::sun::star::util::XNumberFormatsSupplier - , ::com::sun::star::frame::XTitle - , ::com::sun::star::frame::XTitleChangeBroadcaster - , ::com::sun::star::frame::XUntitledNumbers - , ::com::sun::star::document::XDocumentPropertiesSupplier - , ::com::sun::star::datatransfer::XTransferable - , ::com::sun::star::document::XUndoManagerSupplier - , SvxUnoDrawMSFactory - > ReportDefinitionBase; - - typedef ::cppu::PropertySetMixin< ::com::sun::star::report::XReportDefinition > ReportDefinitionPropertySet; + typedef ::cppu::WeakComponentImplHelper12< com::sun::star::report::XReportDefinition + ,com::sun::star::document::XEventBroadcaster + ,com::sun::star::lang::XServiceInfo + ,com::sun::star::frame::XModule + ,com::sun::star::lang::XUnoTunnel + ,com::sun::star::util::XNumberFormatsSupplier + ,::com::sun::star::frame::XTitle + ,::com::sun::star::frame::XTitleChangeBroadcaster + ,::com::sun::star::frame::XUntitledNumbers + ,::com::sun::star::document::XDocumentPropertiesSupplier + ,::com::sun::star::datatransfer::XTransferable + ,SvxUnoDrawMSFactory> ReportDefinitionBase; + typedef ::cppu::PropertySetMixin<com::sun::star::report::XReportDefinition> ReportDefinitionPropertySet; struct OReportDefinitionImpl; /** \class OReportDefinition Defines the implementation of a \interface com:::sun::star::report::XReportDefinition * \ingroup reportdesign_api * */ - class REPORTDESIGN_DLLPUBLIC OReportDefinition :public ::cppu::BaseMutex - ,public ReportDefinitionBase - ,public ReportDefinitionPropertySet - ,public ::comphelper::IEmbeddedHelper + class REPORTDESIGN_DLLPUBLIC OReportDefinition : public ::cppu::BaseMutex, + public ReportDefinitionBase, + public ReportDefinitionPropertySet, + public ::comphelper::IEmbeddedHelper { - private: - ::boost::shared_ptr<OReportComponentProperties> m_aProps; + ::boost::shared_ptr<OReportComponentProperties> m_aProps; ::boost::shared_ptr<OReportDefinitionImpl> m_pImpl; - private: OReportDefinition(const OReportDefinition&); OReportDefinition& operator=(const OReportDefinition&); - void setSection( const ::rtl::OUString& _sProperty + void setSection( const ::rtl::OUString& _sProperty ,const sal_Bool& _bOn ,const ::rtl::OUString& _sName ,::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _member); - template <typename T> void set( const ::rtl::OUString& _sProperty + template <typename T> void set( const ::rtl::OUString& _sProperty ,const T& _Value ,T& _member) { @@ -132,8 +116,8 @@ namespace reportdesign /// the component we export const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent> & xComponent, - const sal_Char* pStreamName, /// the stream name - const sal_Char* pServiceName, /// service name of the component + const sal_Char* pStreamName, /// the stream name + const sal_Char* pServiceName, /// service name of the component /// the argument (XInitialization) const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any> & rArguments, @@ -141,7 +125,7 @@ namespace reportdesign const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> & rMediaDesc, sal_Bool bPlainStream - , const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& _xStorageToSaveTo); /// neither compress nor encrypt + , const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& _xStorageToSaveTo); /// neither compress nor encrypt /// write a single output stream /// (to be called either directly or by WriteThroughComponent(...)) @@ -194,7 +178,7 @@ namespace reportdesign /** return the SdrModel of the real model * - * \return + * \return */ ::boost::shared_ptr<rptui::OReportModel> getSdrModel() const; @@ -273,12 +257,12 @@ namespace reportdesign // XComponent virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) + { cppu::WeakComponentImplHelperBase::addEventListener(aListener); } virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + { cppu::WeakComponentImplHelperBase::removeEventListener(aListener); } @@ -344,7 +328,7 @@ namespace reportdesign // document::XEventBroadcaster virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); - + // document::XEventListener virtual void SAL_CALL notifyEvent( const ::com::sun::star::document::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException); @@ -397,9 +381,6 @@ namespace reportdesign virtual ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) throw (::com::sun::star::uno::RuntimeException); - // XUndoManagerSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager > SAL_CALL getUndoManager( ) throw (::com::sun::star::uno::RuntimeException); - // comphelper::IEmbeddedHelper virtual com::sun::star::uno::Reference < com::sun::star::embed::XStorage > getStorage() const; virtual ::comphelper::EmbeddedObjectContainer& getEmbeddedObjectContainer() const; diff --git a/reportdesign/inc/ReportHelperDefines.hxx b/reportdesign/inc/ReportHelperDefines.hxx index 2e6165f175b9..8f1090efd0cc 100644 --- a/reportdesign/inc/ReportHelperDefines.hxx +++ b/reportdesign/inc/ReportHelperDefines.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -190,7 +190,7 @@ virtual ::com::sun::star::lang::Locale SAL_CALL getCharLocaleComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\ virtual void SAL_CALL setCharLocaleComplex( const ::com::sun::star::lang::Locale& _charlocalecomplex ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - + #endif // INCLUDED_REPORTHELPERDEFINES_HXX diff --git a/reportdesign/inc/ReportVisitor.hxx b/reportdesign/inc/ReportVisitor.hxx index 13c080fd0a26..1496542c7635 100644 --- a/reportdesign/inc/ReportVisitor.hxx +++ b/reportdesign/inc/ReportVisitor.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,7 +43,7 @@ namespace reportdesign virtual void traverseReportFooter(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) = 0; virtual void traversePageHeader(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) = 0; virtual void traversePageFooter(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) = 0; - + virtual void traverseGroups(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroups>& _xGroups) = 0; virtual void traverseGroup(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup>& _xGroup) = 0; virtual void traverseGroupFunctions(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunctions>& _xFunctions) = 0; diff --git a/reportdesign/inc/RptDef.hxx b/reportdesign/inc/RptDef.hxx index c3bbd9cd1edc..50dc41493594 100644 --- a/reportdesign/inc/RptDef.hxx +++ b/reportdesign/inc/RptDef.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,23 +46,23 @@ FORWARD_DECLARE_INTERFACE(beans,XPropertySet) namespace rptui { // not all used at the moment -#define RPT_LAYER_FRONT 0 -#define RPT_LAYER_BACK 1 +#define RPT_LAYER_FRONT 0 +#define RPT_LAYER_BACK 1 #define RPT_LAYER_HIDDEN 2 -const sal_uInt32 ReportInventor = sal_uInt32('R')*0x00000001+ - sal_uInt32('P')*0x00000100+ - sal_uInt32('T')*0x00010000+ - sal_uInt32('1')*0x01000000; +const UINT32 ReportInventor = UINT32('R')*0x00000001+ + UINT32('P')*0x00000100+ + UINT32('T')*0x00010000+ + UINT32('1')*0x01000000; -#define OBJ_DLG_FIXEDTEXT ((sal_uInt16) OBJ_MAXI + 1) +#define OBJ_DLG_FIXEDTEXT ((UINT16) OBJ_MAXI + 1) #define OBJ_DLG_IMAGECONTROL OBJ_FM_IMAGECONTROL -#define OBJ_DLG_FORMATTEDFIELD ((sal_uInt16) OBJ_MAXI + 3) -#define OBJ_DLG_HFIXEDLINE ((sal_uInt16) OBJ_MAXI + 4) -#define OBJ_DLG_VFIXEDLINE ((sal_uInt16) OBJ_MAXI + 5) -#define OBJ_DLG_SUBREPORT ((sal_uInt16) OBJ_MAXI + 6) +#define OBJ_DLG_FORMATTEDFIELD ((UINT16) OBJ_MAXI + 3) +#define OBJ_DLG_HFIXEDLINE ((UINT16) OBJ_MAXI + 4) +#define OBJ_DLG_VFIXEDLINE ((UINT16) OBJ_MAXI + 5) +#define OBJ_DLG_SUBREPORT ((UINT16) OBJ_MAXI + 6) // allows the alignment and resizing of controls namespace ControlModification @@ -90,13 +90,13 @@ public: } }; /** returns teh object type depending on the service name - @param _xComponent the report component + @param _xComponent the report component */ REPORTDESIGN_DLLPUBLIC sal_uInt16 getObjectType(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent); typedef ::std::pair< ::rtl::OUString, ::boost::shared_ptr<AnyConverter> > TPropertyConverter; DECLARE_STL_USTRINGACCESS_MAP(TPropertyConverter , TPropertyNamePair); /** returns the property name map for the givern property id - @param _nObjectId the object id + @param _nObjectId the object id */ REPORTDESIGN_DLLPUBLIC const TPropertyNamePair& getPropertyNameMap(sal_uInt16 _nObjectId); REPORTDESIGN_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyle> getUsedStyle(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition>& _xReport); diff --git a/reportdesign/inc/RptModel.hxx b/reportdesign/inc/RptModel.hxx index 8ee243b8273d..47b952949795 100644 --- a/reportdesign/inc/RptModel.hxx +++ b/reportdesign/inc/RptModel.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ class Window; namespace dbaui { - class DBSubComponentController; + class OSingleDocumentController; } namespace reportdesign { @@ -56,8 +56,8 @@ class REPORTDESIGN_DLLPUBLIC OReportModel : public SdrModel friend class OReportPage; private: - OXUndoEnvironment* m_pUndoEnv; - ::dbaui::DBSubComponentController* m_pController; + OXUndoEnvironment* m_pUndoEnv; + ::dbaui::OSingleDocumentController* m_pController; ::reportdesign::OReportDefinition* m_pReportDefinition; virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoModel(); @@ -73,22 +73,22 @@ public: virtual void SetChanged(sal_Bool bFlg = sal_True); virtual SdrPage* AllocPage(bool bMasterPage); virtual Window* GetCurDocViewWin(); - virtual SdrPage* RemovePage(sal_uInt16 nPgNum); + virtual SdrPage* RemovePage(USHORT nPgNum); /** returns the numbering type that is used to format page fields in drawing shapes */ virtual SvxNumType GetPageNumType() const; OXUndoEnvironment& GetUndoEnv(); void SetModified(sal_Bool _bModified); - inline dbaui::DBSubComponentController* getController() const { return m_pController; } - inline void attachController( dbaui::DBSubComponentController& _rController ) { m_pController = &_rController; } + inline dbaui::OSingleDocumentController* getController() const { return m_pController; } + inline void attachController( dbaui::OSingleDocumentController& _rController ) { m_pController = &_rController; } void detachController(); OReportPage* createNewPage(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection); /** returns the page which belongs to a section * - * \param _xSection + * \param _xSection * \return The page or <NULL/> when tno page could be found. */ OReportPage* getPage(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection); diff --git a/reportdesign/inc/RptObject.hxx b/reportdesign/inc/RptObject.hxx index 056a06c4a522..c77678ef9002 100644 --- a/reportdesign/inc/RptObject.hxx +++ b/reportdesign/inc/RptObject.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,8 +61,8 @@ typedef ::std::multimap< sal_Int16, ::rtl::OUString, ::std::less< sal_Int16 > > class REPORTDESIGN_DLLPUBLIC DlgEdHint: public SfxHint { private: - DlgEdHintKind eHintKind; - OUnoObject* pDlgEdObj; + DlgEdHintKind eHintKind; + OUnoObject* pDlgEdObj; DlgEdHint(DlgEdHint&); void operator =(DlgEdHint&); @@ -71,8 +71,8 @@ typedef ::std::multimap< sal_Int16, ::rtl::OUString, ::std::less< sal_Int16 > > DlgEdHint( DlgEdHintKind eHint ); virtual ~DlgEdHint(); - inline DlgEdHintKind GetKind() const { return eHintKind; } - inline OUnoObject* GetObject() const { return pDlgEdObj; } + inline DlgEdHintKind GetKind() const { return eHintKind; } + inline OUnoObject* GetObject() const { return pDlgEdObj; } }; @@ -87,20 +87,20 @@ public: protected: mutable TMediator m_xMediator; mutable ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener> m_xPropertyChangeListener; - //mutable ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener> - mutable ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> m_xReportComponent; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener> m_xContainerListener; - ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> m_xSection; + //mutable ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener> + mutable ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> m_xReportComponent; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener> m_xContainerListener; + ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> m_xSection; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xKeepShapeAlive; ::rtl::OUString m_sComponentName; - sal_Bool m_bIsListening; + sal_Bool m_bIsListening; OObjectBase(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent); OObjectBase(const ::rtl::OUString& _sComponentName); - virtual ~OObjectBase(); - - inline sal_Bool isListening() const { return m_bIsListening; } + virtual ~OObjectBase(); + + inline sal_Bool isListening() const { return m_bIsListening; } void SetPropsFromRect(const Rectangle& _rRect); @@ -124,7 +124,7 @@ public: virtual void _propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw(::com::sun::star::uno::RuntimeException); virtual void initializeOle() {} - sal_Bool supportsService( const ::rtl::OUString& _sServiceName ) const; + sal_Bool supportsService( const ::rtl::OUString& _sServiceName ) const; ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> getReportComponent() const; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> getAwtComponent(); @@ -171,13 +171,13 @@ public: TYPEINFO(); virtual ~OCustomShape(); - - virtual sal_Int32 GetStep() const; + + virtual sal_Int32 GetStep() const; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> getAwtComponent(); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getUnoShape(); - virtual sal_uInt16 GetObjIdentifier() const; - virtual sal_uInt32 GetObjInventor() const; + virtual UINT16 GetObjIdentifier() const; + virtual UINT32 GetObjInventor() const; }; //============================================================================ @@ -188,18 +188,18 @@ class REPORTDESIGN_DLLPUBLIC OOle2Obj: public SdrOle2Obj , public OObjectBase friend class OReportPage; friend class DlgEdFactory; - sal_uInt16 m_nType; + UINT16 m_nType; bool m_bOnlyOnce; void impl_createDataProvider_nothrow( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel>& _xModel); public: - static OOle2Obj* Create( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent,sal_uInt16 _nType ) + static OOle2Obj* Create( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent,UINT16 _nType ) { return new OOle2Obj( _xComponent,_nType ); } protected: - OOle2Obj(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent,sal_uInt16 _nType); - OOle2Obj(const ::rtl::OUString& _sComponentName,sal_uInt16 _nType); - + OOle2Obj(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent,UINT16 _nType); + OOle2Obj(const ::rtl::OUString& _sComponentName,UINT16 _nType); + virtual void NbcMove( const Size& rSize ); virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); @@ -213,15 +213,15 @@ public: TYPEINFO(); virtual ~OOle2Obj(); - - virtual sal_Int32 GetStep() const; + + virtual sal_Int32 GetStep() const; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> getAwtComponent(); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getUnoShape(); - virtual sal_uInt16 GetObjIdentifier() const; - virtual sal_uInt32 GetObjInventor() const; + virtual UINT16 GetObjIdentifier() const; + virtual UINT32 GetObjInventor() const; // Clone() soll eine komplette Kopie des Objektes erzeugen. - virtual OOle2Obj* Clone() const; + virtual SdrObject* Clone() const; virtual void initializeOle(); void initializeChart( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel>& _xModel); @@ -241,12 +241,12 @@ protected: OUnoObject(const ::rtl::OUString& _sComponentName ,const ::rtl::OUString& rModelName ,sal_uInt16 _nObjectType); - OUnoObject( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent + OUnoObject( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent ,const ::rtl::OUString& rModelName ,sal_uInt16 _nObjectType); virtual ~OUnoObject(); - + virtual void NbcMove( const Size& rSize ); virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); virtual void NbcSetLogicRect(const Rectangle& rRect); @@ -258,11 +258,11 @@ protected: public: TYPEINFO(); - virtual sal_Int32 GetStep() const; + virtual sal_Int32 GetStep() const; virtual void _propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw(::com::sun::star::uno::RuntimeException); /** creates the m_xMediator when it doesn't already exist. - @param _bReverse when set to <TRUE/> then the properties from the uno control will be copied into report control + @param _bReverse when set to <TRUE/> then the properties from the uno control will be copied into report control */ void CreateMediator(sal_Bool _bReverse = sal_False); @@ -271,9 +271,9 @@ public: static ::rtl::OUString GetDefaultName(const OUnoObject* _pObj); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getUnoShape(); - virtual sal_uInt16 GetObjIdentifier() const; - virtual sal_uInt32 GetObjInventor() const; - virtual OUnoObject* Clone() const; + virtual UINT16 GetObjIdentifier() const; + virtual UINT32 GetObjInventor() const; + virtual SdrObject* Clone() const; private: void impl_setReportComponent_nothrow(); diff --git a/reportdesign/inc/RptPage.hxx b/reportdesign/inc/RptPage.hxx index bd3a768ed0cc..1313184d0da1 100644 --- a/reportdesign/inc/RptPage.hxx +++ b/reportdesign/inc/RptPage.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,6 +40,7 @@ namespace rptui //============================================================================ class OReportModel; +//class OReportSection; class REPORTDESIGN_DLLPUBLIC OReportPage : public SdrPage { @@ -49,7 +50,7 @@ class REPORTDESIGN_DLLPUBLIC OReportPage : public SdrPage std::vector<SdrObject*> m_aTemporaryObjectList; OReportPage(const OReportPage&); - + // methode to remove temporary objects, created by 'special mode' // (BegDragObj) void removeTempObject(SdrObject *_pToRemoveObj); @@ -64,21 +65,21 @@ public: OReportPage( OReportModel& rModel ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection ,bool bMasterPage = false ); - + virtual SdrPage* Clone() const; using SdrPage::Clone; - virtual void NbcInsertObject(SdrObject* pObj, sal_uLong nPos, const SdrInsertReason* pReason); - virtual SdrObject* RemoveObject(sal_uLong nObjNum); + virtual void NbcInsertObject(SdrObject* pObj, ULONG nPos, const SdrInsertReason* pReason); + virtual SdrObject* RemoveObject(ULONG nObjNum); /** returns the index inside the object list which belongs to the report component. - @param _xObject the report component + @param _xObject the report component */ - sal_uLong getIndexOf(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent >& _xObject); + ULONG getIndexOf(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent >& _xObject); /** removes the SdrObject which belongs to the report component. - @param _xObject the report component + @param _xObject the report component */ void removeSdrObject(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent >& _xObject); @@ -88,7 +89,7 @@ public: void resetSpecialMode(); /** insert a new SdrObject which belongs to the report component. - @param _xObject the report component + @param _xObject the report component */ void insertObject(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent >& _xObject); diff --git a/reportdesign/inc/RptResId.hrc b/reportdesign/inc/RptResId.hrc index 013cafdd8b3e..1fecb756972f 100644 --- a/reportdesign/inc/RptResId.hrc +++ b/reportdesign/inc/RptResId.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,187 +28,187 @@ #ifndef _RPTUI_DLGRESID_HRC #define _RPTUI_DLGRESID_HRC -// include ----------------------------------------------------------- +// include ----------------------------------------------------------- #ifndef _SOLAR_HRC #include <svl/solar.hrc> #endif -#define RID_DIALOG_START RID_RPT_START -#define RID_PAGE_START RID_RPT_START -#define RID_ERRORBOX_START RID_RPT_START -#define RID_QUERYBOX_START RID_RPT_START -#define RID_TOOLBOX_START RID_RPT_START -#define RID_BITMAP_START RID_RPT_START -#define RID_IMAGE_START RID_RPT_START -#define RID_IMAGELIST_START RID_RPT_START -#define RID_MENU_START RID_RPT_START -#define RID_STRING_START RID_RPT_START -#define RID_UNTYPED_START RID_RPT_START -#define RID_WARN_START RID_RPT_START -#define RID_CONTROL_START RID_RPT_START +#define RID_DIALOG_START RID_RPT_START +#define RID_PAGE_START RID_RPT_START +#define RID_ERRORBOX_START RID_RPT_START +#define RID_QUERYBOX_START RID_RPT_START +#define RID_TOOLBOX_START RID_RPT_START +#define RID_BITMAP_START RID_RPT_START +#define RID_IMAGE_START RID_RPT_START +#define RID_IMAGELIST_START RID_RPT_START +#define RID_MENU_START RID_RPT_START +#define RID_STRING_START RID_RPT_START +#define RID_UNTYPED_START RID_RPT_START +#define RID_WARN_START RID_RPT_START +#define RID_CONTROL_START RID_RPT_START #define RID_MISC_START RID_RPT_START // Dialog Control Id's ----------------------------------------------------------- -#define RID_GROUPS_SORTING ( RID_DIALOG_START + 0 ) -#define RID_PAGENUMBERS ( RID_DIALOG_START + 1 ) -#define RID_DATETIME_DLG ( RID_DIALOG_START + 2 ) -#define RID_CONDFORMAT ( RID_DIALOG_START + 3 ) -#define WIN_CONDITION ( RID_DIALOG_START + 4 ) -#define RID_NAVIGATOR ( RID_DIALOG_START + 5 ) +#define RID_GROUPS_SORTING ( RID_DIALOG_START + 0 ) +#define RID_PAGENUMBERS ( RID_DIALOG_START + 1 ) +#define RID_DATETIME_DLG ( RID_DIALOG_START + 2 ) +#define RID_CONDFORMAT ( RID_DIALOG_START + 3 ) +#define WIN_CONDITION ( RID_DIALOG_START + 4 ) +#define RID_NAVIGATOR ( RID_DIALOG_START + 5 ) // strings -#define RID_STR_CLASS_FORMATTEDFIELD ( RID_STRING_START + 1 ) -#define RID_STR_CLASS_FIXEDTEXT ( RID_STRING_START + 2 ) -#define RID_STR_CLASS_IMAGECONTROL ( RID_STRING_START + 3 ) -#define RID_STR_PROPTITLE_FIXEDTEXT ( RID_STRING_START + 4 ) -#define RID_STR_PROPTITLE_FORMATTED ( RID_STRING_START + 5 ) -#define RID_STR_PROPTITLE_SHAPE ( RID_STRING_START + 6 ) -#define RID_STR_PROPTITLE_IMAGECONTROL ( RID_STRING_START + 7 ) -#define RID_STR_PROPTITLE_REPORT ( RID_STRING_START + 8 ) -#define RID_STR_PROPTITLE_SECTION ( RID_STRING_START + 9 ) -#define RID_STR_PROPTITLE_FUNCTION ( RID_STRING_START + 10 ) +#define RID_STR_CLASS_FORMATTEDFIELD ( RID_STRING_START + 1 ) +#define RID_STR_CLASS_FIXEDTEXT ( RID_STRING_START + 2 ) +#define RID_STR_CLASS_IMAGECONTROL ( RID_STRING_START + 3 ) +#define RID_STR_PROPTITLE_FIXEDTEXT ( RID_STRING_START + 4 ) +#define RID_STR_PROPTITLE_FORMATTED ( RID_STRING_START + 5 ) +#define RID_STR_PROPTITLE_SHAPE ( RID_STRING_START + 6 ) +#define RID_STR_PROPTITLE_IMAGECONTROL ( RID_STRING_START + 7 ) +#define RID_STR_PROPTITLE_REPORT ( RID_STRING_START + 8 ) +#define RID_STR_PROPTITLE_SECTION ( RID_STRING_START + 9 ) +#define RID_STR_PROPTITLE_FUNCTION ( RID_STRING_START + 10 ) // undo strings -#define RID_STR_UNDO_REMOVE_REPORTHEADERFOOTER ( RID_STRING_START + 11 ) -#define RID_STR_UNDO_ADD_REPORTHEADERFOOTER ( RID_STRING_START + 12 ) -#define RID_STR_UNDO_REMOVE_PAGEHEADERFOOTER ( RID_STRING_START + 13 ) -#define RID_STR_UNDO_ADD_PAGEHEADERFOOTER ( RID_STRING_START + 14 ) -#define RID_STR_UNDO_PROPERTY ( RID_STRING_START + 15 ) -#define RID_STR_UNDO_REMOVE_GROUP ( RID_STRING_START + 16 ) -#define RID_STR_UNDO_APPEND_GROUP ( RID_STRING_START + 17 ) -#define RID_STR_UNDO_MOVE_GROUP ( RID_STRING_START + 18 ) -#define RID_STR_UNDO_CONDITIONAL_FORMATTING ( RID_STRING_START + 19 ) -#define RID_STR_UNDO_REMOVE_SELECTION ( RID_STRING_START + 20 ) -#define RID_STR_UNDO_PASTE ( RID_STRING_START + 21 ) -#define RID_STR_UNDO_CHANGE_SIZE ( RID_STRING_START + 22 ) -#define RID_STR_UNDO_INSERT_CONTROL ( RID_STRING_START + 23 ) -#define RID_STR_UNDO_DELETE_CONTROL ( RID_STRING_START + 24 ) -#define RID_STR_UNDO_GROUP ( RID_STRING_START + 25 ) -#define RID_STR_UNDO_UNGROUP ( RID_STRING_START + 26 ) -#define RID_STR_UNDO_CHANGEPOSITION ( RID_STRING_START + 27 ) -#define RID_STR_UNDO_ADDFUNCTION ( RID_STRING_START + 28 ) -#define RID_STR_UNDO_DELETEFUNCTION ( RID_STRING_START + 29 ) +#define RID_STR_UNDO_REMOVE_REPORTHEADERFOOTER ( RID_STRING_START + 11 ) +#define RID_STR_UNDO_ADD_REPORTHEADERFOOTER ( RID_STRING_START + 12 ) +#define RID_STR_UNDO_REMOVE_PAGEHEADERFOOTER ( RID_STRING_START + 13 ) +#define RID_STR_UNDO_ADD_PAGEHEADERFOOTER ( RID_STRING_START + 14 ) +#define RID_STR_UNDO_PROPERTY ( RID_STRING_START + 15 ) +#define RID_STR_UNDO_REMOVE_GROUP ( RID_STRING_START + 16 ) +#define RID_STR_UNDO_APPEND_GROUP ( RID_STRING_START + 17 ) +#define RID_STR_UNDO_MOVE_GROUP ( RID_STRING_START + 18 ) +#define RID_STR_UNDO_CONDITIONAL_FORMATTING ( RID_STRING_START + 19 ) +#define RID_STR_UNDO_REMOVE_SELECTION ( RID_STRING_START + 20 ) +#define RID_STR_UNDO_PASTE ( RID_STRING_START + 21 ) +#define RID_STR_UNDO_CHANGE_SIZE ( RID_STRING_START + 22 ) +#define RID_STR_UNDO_INSERT_CONTROL ( RID_STRING_START + 23 ) +#define RID_STR_UNDO_DELETE_CONTROL ( RID_STRING_START + 24 ) +#define RID_STR_UNDO_GROUP ( RID_STRING_START + 25 ) +#define RID_STR_UNDO_UNGROUP ( RID_STRING_START + 26 ) +#define RID_STR_UNDO_CHANGEPOSITION ( RID_STRING_START + 27 ) +#define RID_STR_UNDO_ADDFUNCTION ( RID_STRING_START + 28 ) +#define RID_STR_UNDO_DELETEFUNCTION ( RID_STRING_START + 29 ) // title of tab pages -#define RID_STR_DESIGN_VIEW ( RID_STRING_START + 30 ) -#define RID_STR_PREVIEW_VIEW ( RID_STRING_START + 31 ) +#define RID_STR_DESIGN_VIEW ( RID_STRING_START + 30 ) +#define RID_STR_PREVIEW_VIEW ( RID_STRING_START + 31 ) // other -#define STR_RPT_TITLE ( RID_STRING_START + 32 ) -#define STR_RPT_LABEL ( RID_STRING_START + 33 ) -#define STR_RPT_EXPRESSION ( RID_STRING_START + 34 ) -#define STR_RPT_SORTING ( RID_STRING_START + 35 ) -#define STR_RPT_PN_PAGE ( RID_STRING_START + 36 ) -#define STR_RPT_PN_PAGE_OF ( RID_STRING_START + 37 ) -#define STR_RPT_PREFIXCHARS ( RID_STRING_START + 38 ) -#define STR_RPT_YEAR ( RID_STRING_START + 39 ) -#define STR_RPT_QUARTER ( RID_STRING_START + 40 ) -#define STR_RPT_MONTH ( RID_STRING_START + 41 ) -#define STR_RPT_WEEK ( RID_STRING_START + 42 ) -#define STR_RPT_DAY ( RID_STRING_START + 43 ) -#define STR_RPT_HOUR ( RID_STRING_START + 44 ) -#define STR_RPT_MINUTE ( RID_STRING_START + 45 ) -#define STR_RPT_INTERVAL ( RID_STRING_START + 46 ) -#define STR_RPT_HELP_FIELD ( RID_STRING_START + 47 ) -#define STR_RPT_HELP_HEADER ( RID_STRING_START + 48 ) -#define STR_RPT_HELP_FOOTER ( RID_STRING_START + 49 ) -#define STR_RPT_HELP_GROUPON ( RID_STRING_START + 50 ) -#define STR_RPT_HELP_INTERVAL ( RID_STRING_START + 51 ) -#define STR_RPT_HELP_KEEP ( RID_STRING_START + 52 ) -#define STR_RPT_HELP_SORT ( RID_STRING_START + 53 ) -#define RID_STR_GROUPHEADER ( RID_STRING_START + 54 ) -#define RID_STR_GROUPFOOTER ( RID_STRING_START + 55 ) -#define RID_STR_UNDO_REMOVE_FUNCTION ( RID_STRING_START + 56 ) +#define STR_RPT_TITLE ( RID_STRING_START + 32 ) +#define STR_RPT_LABEL ( RID_STRING_START + 33 ) +#define STR_RPT_EXPRESSION ( RID_STRING_START + 34 ) +#define STR_RPT_SORTING ( RID_STRING_START + 35 ) +#define STR_RPT_PN_PAGE ( RID_STRING_START + 36 ) +#define STR_RPT_PN_PAGE_OF ( RID_STRING_START + 37 ) +#define STR_RPT_PREFIXCHARS ( RID_STRING_START + 38 ) +#define STR_RPT_YEAR ( RID_STRING_START + 39 ) +#define STR_RPT_QUARTER ( RID_STRING_START + 40 ) +#define STR_RPT_MONTH ( RID_STRING_START + 41 ) +#define STR_RPT_WEEK ( RID_STRING_START + 42 ) +#define STR_RPT_DAY ( RID_STRING_START + 43 ) +#define STR_RPT_HOUR ( RID_STRING_START + 44 ) +#define STR_RPT_MINUTE ( RID_STRING_START + 45 ) +#define STR_RPT_INTERVAL ( RID_STRING_START + 46 ) +#define STR_RPT_HELP_FIELD ( RID_STRING_START + 47 ) +#define STR_RPT_HELP_HEADER ( RID_STRING_START + 48 ) +#define STR_RPT_HELP_FOOTER ( RID_STRING_START + 49 ) +#define STR_RPT_HELP_GROUPON ( RID_STRING_START + 50 ) +#define STR_RPT_HELP_INTERVAL ( RID_STRING_START + 51 ) +#define STR_RPT_HELP_KEEP ( RID_STRING_START + 52 ) +#define STR_RPT_HELP_SORT ( RID_STRING_START + 53 ) +#define RID_STR_GROUPHEADER ( RID_STRING_START + 54 ) +#define RID_STR_GROUPFOOTER ( RID_STRING_START + 55 ) +#define RID_STR_UNDO_REMOVE_FUNCTION ( RID_STRING_START + 56 ) #define STR_NUMBERED_CONDITION ( RID_STRING_START + 57 ) // Property Browser Headline Id's ----------------------------------------------------------- -#define RID_STR_BRWTITLE_PROPERTIES ( RID_STRING_START + 60 ) -#define RID_STR_BRWTITLE_NO_PROPERTIES ( RID_STRING_START + 61 ) -#define RID_STR_BRWTITLE_MULTISELECT ( RID_STRING_START + 62 ) -#define STR_SHOW_RULER ( RID_STRING_START + 63 ) -#define STR_SHOW_GRID ( RID_STRING_START + 64 ) +#define RID_STR_BRWTITLE_PROPERTIES ( RID_STRING_START + 60 ) +#define RID_STR_BRWTITLE_NO_PROPERTIES ( RID_STRING_START + 61 ) +#define RID_STR_BRWTITLE_MULTISELECT ( RID_STRING_START + 62 ) +#define STR_SHOW_RULER ( RID_STRING_START + 63 ) +#define STR_SHOW_GRID ( RID_STRING_START + 64 ) -#define STR_COLOR_WHITE ( RID_STRING_START + 65 ) -#define STR_CHARCOLOR ( RID_STRING_START + 66 ) -#define STR_CHARBACKGROUND ( RID_STRING_START + 67 ) -#define STR_TRANSPARENT ( RID_STRING_START + 68 ) -#define RID_STR_FIELDSELECTION ( RID_STRING_START + 69 ) +#define STR_COLOR_WHITE ( RID_STRING_START + 65 ) +#define STR_CHARCOLOR ( RID_STRING_START + 66 ) +#define STR_CHARBACKGROUND ( RID_STRING_START + 67 ) +#define STR_TRANSPARENT ( RID_STRING_START + 68 ) +#define RID_STR_FIELDSELECTION ( RID_STRING_START + 69 ) -#define RID_STR_UNDO_ADD_GROUP_HEADER ( RID_STRING_START + 70 ) -#define RID_STR_UNDO_REMOVE_GROUP_HEADER ( RID_STRING_START + 71 ) -#define RID_STR_UNDO_ADD_GROUP_FOOTER ( RID_STRING_START + 72 ) -#define RID_STR_UNDO_REMOVE_GROUP_FOOTER ( RID_STRING_START + 73 ) +#define RID_STR_UNDO_ADD_GROUP_HEADER ( RID_STRING_START + 70 ) +#define RID_STR_UNDO_REMOVE_GROUP_HEADER ( RID_STRING_START + 71 ) +#define RID_STR_UNDO_ADD_GROUP_FOOTER ( RID_STRING_START + 72 ) +#define RID_STR_UNDO_REMOVE_GROUP_FOOTER ( RID_STRING_START + 73 ) -#define RID_STR_PROPPAGE_DEFAULT ( RID_STRING_START + 74 ) -#define RID_STR_PROPPAGE_DATA ( RID_STRING_START + 75 ) +#define RID_STR_PROPPAGE_DEFAULT ( RID_STRING_START + 74 ) +#define RID_STR_PROPPAGE_DATA ( RID_STRING_START + 75 ) -#define RID_STR_FILTER ( RID_STRING_START + 76 ) +#define RID_STR_FILTER ( RID_STRING_START + 76 ) // free -#define RID_STR_FORCENEWPAGE (RID_STRING_START + 78) -#define RID_STR_NEWROWORCOL (RID_STRING_START + 79) -#define RID_STR_KEEPTOGETHER (RID_STRING_START + 80) -#define RID_STR_CANGROW (RID_STRING_START + 81) -#define RID_STR_CANSHRINK (RID_STRING_START + 82) -#define RID_STR_REPEATSECTION (RID_STRING_START + 83) +#define RID_STR_FORCENEWPAGE (RID_STRING_START + 78) +#define RID_STR_NEWROWORCOL (RID_STRING_START + 79) +#define RID_STR_KEEPTOGETHER (RID_STRING_START + 80) +#define RID_STR_CANGROW (RID_STRING_START + 81) +#define RID_STR_CANSHRINK (RID_STRING_START + 82) +#define RID_STR_REPEATSECTION (RID_STRING_START + 83) -#define RID_STR_PROPTITLE_GROUP (RID_STRING_START + 84) -#define RID_STR_PROPTITLE_FIXEDLINE (RID_STRING_START + 85) -#define RID_STR_CLASS_FIXEDLINE (RID_STRING_START + 86) -#define RID_STR_BACKTRANSPARENT (RID_STRING_START + 87) +#define RID_STR_PROPTITLE_GROUP (RID_STRING_START + 84) +#define RID_STR_PROPTITLE_FIXEDLINE (RID_STRING_START + 85) +#define RID_STR_CLASS_FIXEDLINE (RID_STRING_START + 86) +#define RID_STR_BACKTRANSPARENT (RID_STRING_START + 87) #define RID_STR_CONTROLBACKGROUNDTRANSPARENT (RID_STRING_START + 88) #define RID_STR_OVERLAP_OTHER_CONTROL (RID_STRING_START + 89) #define RID_STR_ILLEGAL_POSITION (RID_STRING_START + 90) -#define RID_STR_PAGEHEADERFOOTER_INSERT (RID_STRING_START + 91) -#define RID_STR_PAGEHEADERFOOTER_DELETE (RID_STRING_START + 92) -#define RID_STR_BACKCOLOR (RID_STRING_START + 93) -#define RID_STR_PRINTREPEATEDVALUES (RID_STRING_START + 94) -#define RID_STR_CONDITIONALPRINTEXPRESSION (RID_STRING_START + 95) -#define RID_STR_COLUMNHEADERFOOTER_INSERT (RID_STRING_START + 96) -#define RID_STR_STARTNEWCOLUMN (RID_STRING_START + 97) -#define RID_STR_STARTNEWPAGE (RID_STRING_START + 98) -#define RID_STR_RESETPAGENUMBER (RID_STRING_START + 99) -#define RID_STR_COLUMNHEADERFOOTER_DELETE (RID_STRING_START + 100) -#define RID_STR_MINHEIGHTNEWPAGE (RID_STRING_START + 101) -#define RID_STR_PRINTWHENGROUPCHANGE (RID_STRING_START + 102) -#define RID_STR_REPORTHEADERFOOTER_INSERT (RID_STRING_START + 103) -#define RID_STR_REPORTHEADERFOOTER_DELETE (RID_STRING_START + 104) -#define RID_STR_VISIBLE (RID_STRING_START + 105) +#define RID_STR_PAGEHEADERFOOTER_INSERT (RID_STRING_START + 91) +#define RID_STR_PAGEHEADERFOOTER_DELETE (RID_STRING_START + 92) +#define RID_STR_BACKCOLOR (RID_STRING_START + 93) +#define RID_STR_PRINTREPEATEDVALUES (RID_STRING_START + 94) +#define RID_STR_CONDITIONALPRINTEXPRESSION (RID_STRING_START + 95) +#define RID_STR_COLUMNHEADERFOOTER_INSERT (RID_STRING_START + 96) +#define RID_STR_STARTNEWCOLUMN (RID_STRING_START + 97) +#define RID_STR_STARTNEWPAGE (RID_STRING_START + 98) +#define RID_STR_RESETPAGENUMBER (RID_STRING_START + 99) +#define RID_STR_COLUMNHEADERFOOTER_DELETE (RID_STRING_START + 100) +#define RID_STR_MINHEIGHTNEWPAGE (RID_STRING_START + 101) +#define RID_STR_PRINTWHENGROUPCHANGE (RID_STRING_START + 102) +#define RID_STR_REPORTHEADERFOOTER_INSERT (RID_STRING_START + 103) +#define RID_STR_REPORTHEADERFOOTER_DELETE (RID_STRING_START + 104) +#define RID_STR_VISIBLE (RID_STRING_START + 105) -#define RID_STR_DETAIL (RID_STRING_START + 106) -#define RID_STR_PAGE_HEADER (RID_STRING_START + 107) -#define RID_STR_GROUPKEEPTOGETHER (RID_STRING_START + 108) -#define RID_STR_PAGE_FOOTER (RID_STRING_START + 109) -#define RID_STR_PAGEHEADEROPTION (RID_STRING_START + 110) -#define RID_STR_PAGEFOOTEROPTION (RID_STRING_START + 111) -#define RID_STR_REPORT_HEADER (RID_STRING_START + 112) -#define RID_STR_REPORT_FOOTER (RID_STRING_START + 113) +#define RID_STR_DETAIL (RID_STRING_START + 106) +#define RID_STR_PAGE_HEADER (RID_STRING_START + 107) +#define RID_STR_GROUPKEEPTOGETHER (RID_STRING_START + 108) +#define RID_STR_PAGE_FOOTER (RID_STRING_START + 109) +#define RID_STR_PAGEHEADEROPTION (RID_STRING_START + 110) +#define RID_STR_PAGEFOOTEROPTION (RID_STRING_START + 111) +#define RID_STR_REPORT_HEADER (RID_STRING_START + 112) +#define RID_STR_REPORT_FOOTER (RID_STRING_START + 113) #define RID_STR_SCOPE_GROUP (RID_STRING_START + 114) -#define RID_APP_TITLE (RID_STRING_START + 115) -#define RID_APP_NEW_DOC (RID_STRING_START + 116) -#define RID_STR_UNDO_ALIGNMENT (RID_STRING_START + 117) -#define RID_STR_HEADER (RID_STRING_START + 118) -#define RID_STR_FOOTER (RID_STRING_START + 119) -#define RID_STR_DATAFIELD (RID_STRING_START + 120) -#define RID_STR_FONT (RID_STRING_START + 121) -#define RID_STR_COULD_NOT_CREATE_REPORT (RID_STRING_START + 122) -#define RID_STR_PRESERVEIRI (RID_STRING_START + 123) -#define RID_STR_IMPORT_GRAPHIC (RID_STRING_START + 124) -#define RID_STR_POSITIONX (RID_STRING_START + 125) -#define RID_STR_POSITIONY (RID_STRING_START + 126) -#define RID_STR_WIDTH (RID_STRING_START + 127) -#define RID_STR_HEIGHT (RID_STRING_START + 128) -#define RID_STR_DELETE (RID_STRING_START + 129) -#define RID_STR_DEEPTRAVERSING (RID_STRING_START + 130) -#define RID_STR_PREEVALUATED (RID_STRING_START + 131) -#define RID_STR_FUNCTIONS (RID_STRING_START + 132) -#define RID_STR_GROUPS (RID_STRING_START + 133) -#define RID_STR_FUNCTION (RID_STRING_START + 134) -#define RID_STR_FORMULA (RID_STRING_START + 135) -#define RID_STR_INITIALFORMULA (RID_STRING_START + 136) -#define RID_STR_UNDO_CHANGEFONT (RID_STRING_START + 137) -#define RID_STR_UNDO_CHANGEPAGE (RID_STRING_START + 138) +#define RID_APP_TITLE (RID_STRING_START + 115) +#define RID_APP_NEW_DOC (RID_STRING_START + 116) +#define RID_STR_UNDO_ALIGNMENT (RID_STRING_START + 117) +#define RID_STR_HEADER (RID_STRING_START + 118) +#define RID_STR_FOOTER (RID_STRING_START + 119) +#define RID_STR_DATAFIELD (RID_STRING_START + 120) +#define RID_STR_FONT (RID_STRING_START + 121) +#define RID_STR_COULD_NOT_CREATE_REPORT (RID_STRING_START + 122) +#define RID_STR_PRESERVEIRI (RID_STRING_START + 123) +#define RID_STR_IMPORT_GRAPHIC (RID_STRING_START + 124) +#define RID_STR_POSITIONX (RID_STRING_START + 125) +#define RID_STR_POSITIONY (RID_STRING_START + 126) +#define RID_STR_WIDTH (RID_STRING_START + 127) +#define RID_STR_HEIGHT (RID_STRING_START + 128) +#define RID_STR_DELETE (RID_STRING_START + 129) +#define RID_STR_DEEPTRAVERSING (RID_STRING_START + 130) +#define RID_STR_PREEVALUATED (RID_STRING_START + 131) +#define RID_STR_FUNCTIONS (RID_STRING_START + 132) +#define RID_STR_GROUPS (RID_STRING_START + 133) +#define RID_STR_FUNCTION (RID_STRING_START + 134) +#define RID_STR_FORMULA (RID_STRING_START + 135) +#define RID_STR_INITIALFORMULA (RID_STRING_START + 136) +#define RID_STR_UNDO_CHANGEFONT (RID_STRING_START + 137) +#define RID_STR_UNDO_CHANGEPAGE (RID_STRING_START + 138) #define RID_STR_CAUGHT_FOREIGN_EXCEPTION (RID_STRING_START + 139) #define RID_STR_FORMULALIST (RID_STRING_START + 140) #define RID_STR_SCOPE (RID_STRING_START + 141) @@ -225,61 +225,65 @@ #define RID_ERR_NO_OBJECTS (RID_STRING_START + 152) #define RID_STR_AREA (RID_STRING_START + 153) #define RID_STR_INSERT (RID_STRING_START + 154) -#define RID_STR_UNDO_SHRINK (RID_STRING_START + 155) -#define RID_STR_F_COUNTER (RID_STRING_START + 156) -#define RID_STR_F_ACCUMULATION (RID_STRING_START + 157) -#define RID_STR_F_MINIMUM (RID_STRING_START + 158) -#define RID_STR_F_MAXIMUM (RID_STRING_START + 159) +#define RID_STR_UNDO_SHRINK (RID_STRING_START + 155) +#define RID_STR_F_COUNTER (RID_STRING_START + 156) +#define RID_STR_F_ACCUMULATION (RID_STRING_START + 157) +#define RID_STR_F_MINIMUM (RID_STRING_START + 158) +#define RID_STR_F_MAXIMUM (RID_STRING_START + 159) #define RID_STR_VERTICALALIGN (RID_STRING_START + 160) #define RID_STR_PARAADJUST (RID_STRING_START + 161) +// #define RID_STR_ (RID_STRING_START + 130) // ----------------------------------------------------------------------- -#define RID_PAGEDIALOG_PAGE ( RID_PAGE_START + 1 ) -#define RID_PAGEDIALOG_BACKGROUND ( RID_PAGE_START + 2 ) -#define RID_PAGEDIALOG_CHAR ( RID_PAGE_START + 3 ) -#define RID_PAGE_CHAR ( RID_PAGE_START + 4 ) -#define RID_PAGE_EFFECTS ( RID_PAGE_START + 5 ) -#define RID_PAGE_POSITION ( RID_PAGE_START + 6 ) -#define RID_PAGE_BACKGROUND ( RID_PAGE_START + 7 ) -#define RID_PAGE_TWOLN ( RID_PAGE_START + 8 ) -#define RID_PAGEDIALOG_LINE ( RID_PAGE_START + 9 ) -#define RID_PAGE_LINE ( RID_PAGE_START + 10 ) -#define RID_PAGE_ALIGNMENT ( RID_PAGE_START + 11 ) +#define RID_PAGEDIALOG_PAGE ( RID_PAGE_START + 1 ) +#define RID_PAGEDIALOG_BACKGROUND ( RID_PAGE_START + 2 ) +#define RID_PAGEDIALOG_CHAR ( RID_PAGE_START + 3 ) +#define RID_PAGE_CHAR ( RID_PAGE_START + 4 ) +#define RID_PAGE_EFFECTS ( RID_PAGE_START + 5 ) +#define RID_PAGE_POSITION ( RID_PAGE_START + 6 ) +#define RID_PAGE_BACKGROUND ( RID_PAGE_START + 7 ) +#define RID_PAGE_TWOLN ( RID_PAGE_START + 8 ) +#define RID_PAGEDIALOG_LINE ( RID_PAGE_START + 9 ) +#define RID_PAGE_LINE ( RID_PAGE_START + 10 ) +#define RID_PAGE_ALIGNMENT ( RID_PAGE_START + 11 ) // ----------------------------------------------------------------------- -#define RID_IMG_TREENODE_COLLAPSED ( RID_IMAGE_START + 1 ) -#define RID_IMG_TREENODE_EXPANDED ( RID_IMAGE_START + 2 ) -#define REPORT_TREE_ICON ( RID_IMAGE_START + 5 ) +#define RID_IMG_TREENODE_COLLAPSED ( RID_IMAGE_START + 1 ) +#define RID_IMG_TREENODE_EXPANDED ( RID_IMAGE_START + 2 ) +#define RID_IMG_TREENODE_COLLAPSED_HC ( RID_IMAGE_START + 3 ) +#define RID_IMG_TREENODE_EXPANDED_HC ( RID_IMAGE_START + 4 ) +#define REPORT_TREE_ICON ( RID_IMAGE_START + 5 ) // menu ----------------------------------------------------------------------- -#define RID_MENU_REPORT ( RID_MENU_START + 0 ) -#define RID_GROUPSROWPOPUPMENU ( RID_MENU_START + 1 ) -#define RID_MENU_NAVIGATOR ( RID_MENU_START + 2 ) -#define RID_TB_SORTING ( RID_MENU_START + 3 ) +#define RID_MENU_REPORT ( RID_MENU_START + 0 ) +#define RID_GROUPSROWPOPUPMENU ( RID_MENU_START + 1 ) +#define RID_MENU_NAVIGATOR ( RID_MENU_START + 2 ) +#define RID_TB_SORTING ( RID_MENU_START + 3 ) // image lists ----------------------------------------------------------------------- -#define IMG_CONDFORMAT_DLG_SC (RID_IMAGELIST_START + 0) -// free -#define IMG_CONDFORMAT_DLG_LC (RID_IMAGELIST_START + 2) -// free -#define RID_SVXIMGLIST_RPTEXPL (RID_IMAGELIST_START + 4) +#define IMG_CONDFORMAT_DLG_SC (RID_IMAGELIST_START + 0) +#define IMG_CONDFORMAT_DLG_SCH (RID_IMAGELIST_START + 1) +#define IMG_CONDFORMAT_DLG_LC (RID_IMAGELIST_START + 2) +#define IMG_CONDFORMAT_DLG_LCH (RID_IMAGELIST_START + 3) +#define RID_SVXIMGLIST_RPTEXPL (RID_IMAGELIST_START + 4) +#define RID_SVXIMGLIST_RPTEXPL_HC (RID_IMAGELIST_START + 5) #define IMGLST_GROUPSORT_DLG_SC (RID_IMAGELIST_START + 6) -// free -#define IMG_ADDFIELD_DLG_SC (RID_IMAGELIST_START + 8) -// free -#define IMG_ADDFIELD_DLG_LC (RID_IMAGELIST_START + 10) -// free +#define IMGLST_GROUPSORT_DLG_SCH (RID_IMAGELIST_START + 7) +#define IMG_ADDFIELD_DLG_SC (RID_IMAGELIST_START + 8) +#define IMG_ADDFIELD_DLG_SCH (RID_IMAGELIST_START + 9) +#define IMG_ADDFIELD_DLG_LC (RID_IMAGELIST_START + 10) +#define IMG_ADDFIELD_DLG_LCH (RID_IMAGELIST_START + 11) #define ADDFIELD_FL_HELP_SEPARATOR (RID_IMAGELIST_START + 12) #define ADDFIELD_HELP_FIELD (RID_IMAGELIST_START + 13) // untyped --------------------------------------------------------------------- -#define RID_STR_BOOL (RID_UNTYPED_START + 0 ) -#define RID_STR_FORCENEWPAGE_CONST (RID_UNTYPED_START + 1 ) -#define RID_STR_KEEPTOGETHER_CONST (RID_UNTYPED_START + 2) -#define RID_STR_GROUPKEEPTOGETHER_CONST (RID_UNTYPED_START + 3) -#define RID_STR_REPORTPRINTOPTION_CONST (RID_UNTYPED_START + 4) -#define RID_STR_SECTIONPAGEBREAK_CONST (RID_UNTYPED_START + 5) +#define RID_STR_BOOL (RID_UNTYPED_START + 0 ) +#define RID_STR_FORCENEWPAGE_CONST (RID_UNTYPED_START + 1 ) +#define RID_STR_KEEPTOGETHER_CONST (RID_UNTYPED_START + 2) +#define RID_STR_GROUPKEEPTOGETHER_CONST (RID_UNTYPED_START + 3) +#define RID_STR_REPORTPRINTOPTION_CONST (RID_UNTYPED_START + 4) +#define RID_STR_SECTIONPAGEBREAK_CONST (RID_UNTYPED_START + 5) #define RID_STR_TYPE_CONST (RID_UNTYPED_START + 6) #define RID_STR_VERTICAL_ALIGN_CONST (RID_UNTYPED_START + 7) #define RID_STR_PARAADJUST_CONST (RID_UNTYPED_START + 8) diff --git a/reportdesign/inc/UndoActions.hxx b/reportdesign/inc/UndoActions.hxx index c16cab9900f0..99178af175c3 100644 --- a/reportdesign/inc/UndoActions.hxx +++ b/reportdesign/inc/UndoActions.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,9 +29,8 @@ #define RPTUI_UNDOACTIONS_HXX #include "dllapi.h" - -#include "RptModel.hxx" - +#include <svx/svdundo.hxx> +#include <tools/string.hxx> /** === begin UNO includes === **/ #include <com/sun/star/util/XModifyListener.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -45,16 +44,13 @@ #include <com/sun/star/report/XReportComponent.hpp> #include <com/sun/star/report/XReportDefinition.hpp> #include <com/sun/star/report/XGroup.hpp> -#include <com/sun/star/document/XUndoManager.hpp> /** === end UNO includes === **/ - #include <cppuhelper/implbase3.hxx> #include <comphelper/uno3.hxx> #include <comphelper/sequence.hxx> #include <svl/lstner.hxx> #include <svx/svdouno.hxx> -#include <svx/svdundo.hxx> -#include <tools/string.hxx> +#include "RptModel.hxx" #include <functional> #include <memory> @@ -73,7 +69,7 @@ namespace rptui enum Action { Inserted = 1, - Removed = 2 + Removed = 2 }; /** Helper class to allow std::mem_fun for SAL_CALL @@ -88,9 +84,9 @@ namespace rptui :m_xGroup(_xGroup) { } - inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > getHeader() { return m_xGroup->getHeader(); } - inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > getFooter() { return m_xGroup->getFooter(); } - inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup > getGroup() { return m_xGroup; } + inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > getHeader() { return m_xGroup->getHeader(); } + inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > getFooter() { return m_xGroup->getFooter(); } + inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup > getGroup() { return m_xGroup; } inline ::sal_Bool getHeaderOn() { return m_xGroup->getHeaderOn(); } inline ::sal_Bool getFooterOn() { return m_xGroup->getFooterOn(); } @@ -112,9 +108,9 @@ namespace rptui } inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > getReportHeader() { return m_xReport->getReportHeader(); } inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > getReportFooter() { return m_xReport->getReportFooter(); } - inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > getPageHeader() { return m_xReport->getPageHeader(); } - inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > getPageFooter() { return m_xReport->getPageFooter(); } - inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > getDetail() { return m_xReport->getDetail(); } + inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > getPageHeader() { return m_xReport->getPageHeader(); } + inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > getPageFooter() { return m_xReport->getPageFooter(); } + inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > getDetail() { return m_xReport->getDetail(); } inline ::sal_Bool getReportHeaderOn() { return m_xReport->getReportHeaderOn(); } inline ::sal_Bool getReportFooterOn() { return m_xReport->getReportFooterOn(); } @@ -124,66 +120,38 @@ namespace rptui static ::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> , OReportHelper> getMemberFunction(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection); }; - //================================================================================================================== - //= UndoContext - //================================================================================================================== - class UndoContext + class REPORTDESIGN_DLLPUBLIC UndoManagerListAction { - public: - UndoContext( SfxUndoManager& i_undoManager, const ::rtl::OUString& i_undoTitle ) - :m_rUndoManager( i_undoManager ) - { - m_rUndoManager.EnterListAction( i_undoTitle, String() ); - } - - ~UndoContext() - { - m_rUndoManager.LeaveListAction(); - } - private: - SfxUndoManager& m_rUndoManager; - }; + SfxUndoManager& m_rManager; - //================================================================================================================== - //= UndoSuppressor - //================================================================================================================== - class UndoSuppressor - { public: - UndoSuppressor( SfxUndoManager& i_undoManager ) - :m_rUndoManager( i_undoManager ) + UndoManagerListAction( SfxUndoManager& _rManager, const String& _rListActionComment ) + :m_rManager( _rManager ) { - m_rUndoManager.EnableUndo( false ); + m_rManager.EnterListAction( _rListActionComment, String() ); } - - ~UndoSuppressor() + ~UndoManagerListAction() { - m_rUndoManager.EnableUndo( true ); + m_rManager.LeaveListAction(); } - - private: - SfxUndoManager& m_rUndoManager; }; - //================================================================================================================== - //= OCommentUndoAction - //================================================================================================================== class REPORTDESIGN_DLLPUBLIC OCommentUndoAction : public SdrUndoAction { protected: - String m_strComment; // undo, redo comment - ::dbaui::IController* m_pController; + String m_strComment; // undo, redo comment + ::dbaui::IController* m_pController; public: TYPEINFO(); - OCommentUndoAction( SdrModel& rMod - ,sal_uInt16 nCommentID); + OCommentUndoAction( SdrModel& rMod + ,USHORT nCommentID); virtual ~OCommentUndoAction(); - virtual UniString GetComment() const { return m_strComment; } - virtual void Undo(); - virtual void Redo(); + virtual UniString GetComment() const { return m_strComment; } + virtual void Undo(); + virtual void Redo(); }; //================================================================== // OUndoContainerAction @@ -196,19 +164,19 @@ namespace rptui ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xElement; // object not owned by the action ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > - m_xOwnElement; // object owned by the action + m_xOwnElement; // object owned by the action ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > m_xContainer; ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > m_xSection; - Action m_eAction; + Action m_eAction; public: OUndoContainerAction(SdrModel& rMod ,Action _eAction ,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > _xContainer ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& xElem - ,sal_uInt16 _nCommentId); + ,USHORT _nCommentId); virtual ~OUndoContainerAction(); virtual void Undo(); @@ -224,7 +192,7 @@ namespace rptui //================================================================== class REPORTDESIGN_DLLPUBLIC OUndoReportSectionAction : public OUndoContainerAction { - OReportHelper m_aReportHelper; + OReportHelper m_aReportHelper; ::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > ,OReportHelper> m_pMemberFunction; public: @@ -234,7 +202,7 @@ namespace rptui ,OReportHelper> _pMemberFunction ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition >& _xReport ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& xElem - ,sal_uInt16 _nCommentId); + ,USHORT _nCommentId); protected: virtual void implReInsert( ) SAL_THROW( ( ::com::sun::star::uno::Exception ) ); @@ -246,7 +214,7 @@ namespace rptui //================================================================== class REPORTDESIGN_DLLPUBLIC OUndoGroupSectionAction : public OUndoContainerAction { - OGroupHelper m_aGroupHelper; + OGroupHelper m_aGroupHelper; ::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > ,OGroupHelper> m_pMemberFunction; public: @@ -256,7 +224,7 @@ namespace rptui ,OGroupHelper> _pMemberFunction ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup >& _xGroup ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& xElem - ,sal_uInt16 _nCommentId); + ,USHORT _nCommentId); protected: virtual void implReInsert( ) SAL_THROW( ( ::com::sun::star::uno::Exception ) ); @@ -269,9 +237,9 @@ namespace rptui class REPORTDESIGN_DLLPUBLIC ORptUndoPropertyAction: public OCommentUndoAction { ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xObj; - ::rtl::OUString m_aPropertyName; - ::com::sun::star::uno::Any m_aNewValue; - ::com::sun::star::uno::Any m_aOldValue; + ::rtl::OUString m_aPropertyName; + ::com::sun::star::uno::Any m_aNewValue; + ::com::sun::star::uno::Any m_aOldValue; /** sets either the old value or the new value again at the property set. * @@ -287,7 +255,7 @@ namespace rptui virtual void Undo(); virtual void Redo(); - virtual String GetComment() const; + virtual String GetComment() const; }; //================================================================== @@ -295,7 +263,7 @@ namespace rptui //================================================================== class REPORTDESIGN_DLLPUBLIC OUndoPropertyReportSectionAction : public ORptUndoPropertyAction { - OReportHelper m_aReportHelper; + OReportHelper m_aReportHelper; ::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > ,OReportHelper> m_pMemberFunction; protected: @@ -314,7 +282,7 @@ namespace rptui //================================================================== class REPORTDESIGN_DLLPUBLIC OUndoPropertyGroupSectionAction : public ORptUndoPropertyAction { - OGroupHelper m_aGroupHelper; + OGroupHelper m_aGroupHelper; ::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > ,OGroupHelper> m_pMemberFunction; protected: diff --git a/reportdesign/inc/UndoEnv.hxx b/reportdesign/inc/UndoEnv.hxx index e48cd253a4ce..a2b16090748b 100644 --- a/reportdesign/inc/UndoEnv.hxx +++ b/reportdesign/inc/UndoEnv.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,14 +41,14 @@ namespace rptui //======================================================================== class REPORTDESIGN_DLLPUBLIC OXUndoEnvironment - : public ::cppu::WeakImplHelper3< ::com::sun::star::beans::XPropertyChangeListener - , ::com::sun::star::container::XContainerListener - , ::com::sun::star::util::XModifyListener + : public ::cppu::WeakImplHelper3< ::com::sun::star::beans::XPropertyChangeListener + , ::com::sun::star::container::XContainerListener + , ::com::sun::star::util::XModifyListener > , public SfxListener { const ::std::auto_ptr<OXUndoEnvironmentImpl> m_pImpl; - + OXUndoEnvironment(const OXUndoEnvironment&); OXUndoEnvironment& operator=(const OXUndoEnvironment&); @@ -111,7 +111,7 @@ namespace rptui void RemoveSection( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection ); /** removes the section from the page out of the undo env * - * \param _pPage + * \param _pPage */ void RemoveSection(OReportPage* _pPage); @@ -142,7 +142,7 @@ namespace rptui void switchListening( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& _rxContainer, bool _bStartListening ) SAL_THROW(()); void switchListening( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxObject, bool _bStartListening ) SAL_THROW(()); - ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::container::XChild> >::const_iterator + ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::container::XChild> >::const_iterator getSection(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XChild>& _xContainer) const; }; diff --git a/reportdesign/inc/conditionalexpression.hxx b/reportdesign/inc/conditionalexpression.hxx index 9b360a3fc9cb..2580a44d5b41 100644 --- a/reportdesign/inc/conditionalexpression.hxx +++ b/reportdesign/inc/conditionalexpression.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/reportdesign/inc/dllapi.h b/reportdesign/inc/dllapi.h index 1f79662e2248..a64a26e8433d 100644 --- a/reportdesign/inc/dllapi.h +++ b/reportdesign/inc/dllapi.h @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,16 +28,16 @@ #ifndef INCLUDED_REPORTDESIGNDLLAPI_H #define INCLUDED_REPORTDESIGNDLLAPI_H - + #include "sal/types.h" - + #if defined(REPORTDESIGN_DLLIMPLEMENTATION) #define REPORTDESIGN_DLLPUBLIC SAL_DLLPUBLIC_EXPORT #else #define REPORTDESIGN_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif #define REPORTDESIGN_DLLPRIVATE SAL_DLLPRIVATE - + #endif /* INCLUDED_REPORTDESIGNDLLAPI_H */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/inc/helpids.hrc b/reportdesign/inc/helpids.hrc index 7b543169e032..5e048c34becb 100644 --- a/reportdesign/inc/helpids.hrc +++ b/reportdesign/inc/helpids.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,96 +27,104 @@ #ifndef RTPUI_REPORTDESIGN_HELPID_HRC #define RTPUI_REPORTDESIGN_HELPID_HRC -#define UID_RPT_PROP_FORMULA "REPORTDESIGN_UID_RPT_PROP_FORMULA" -#define UID_RPT_RPT_PROP_DLG_FONT_TYPE "REPORTDESIGN_UID_RPT_RPT_PROP_DLG_FONT_TYPE" -#define UID_RPT_RPT_PROP_DLG_AREA "REPORTDESIGN_UID_RPT_RPT_PROP_DLG_AREA" -#define UID_RPT_PROP_CHARTTYPE_DLG "REPORTDESIGN_UID_RPT_PROP_CHARTTYPE_DLG" -#define UID_RPT_PROP_DLG_LINKFIELDS "REPORTDESIGN_UID_RPT_PROP_DLG_LINKFIELDS" +#ifndef _SOLAR_HRC +#include <svl/solar.hrc> // HID_RPT_DBACCESS_START +#endif -#define UID_RPT_RPT_APP_VIEW "REPORTDESIGN_UID_RPT_RPT_APP_VIEW" -#define UID_RPT_SCROLLWINDOW "REPORTDESIGN_UID_RPT_SCROLLWINDOW" -#define UID_RPT_REPORTWINDOW "REPORTDESIGN_UID_RPT_REPORTWINDOW" -#define HID_RPT_HORZ_RULER "REPORTDESIGN_HID_RPT_HORZ_RULER" -#define UID_RPT_SECTIONSWINDOW "REPORTDESIGN_UID_RPT_SECTIONSWINDOW" -#define UID_RPT_VIEWSWINDOW "REPORTDESIGN_UID_RPT_VIEWSWINDOW" -#define HID_RPT_ENDMARKER "REPORTDESIGN_HID_RPT_ENDMARKER" -#define HID_RPT_SPLITTER "REPORTDESIGN_HID_RPT_SPLITTER" -#define HID_REPORTSECTION "REPORTDESIGN_HID_REPORTSECTION" -#define HID_RPT_HORZ_SCROLLBAR "REPORTDESIGN_HID_RPT_HORZ_SCROLLBAR" -#define HID_RPT_VERT_SCROLLBAR "REPORTDESIGN_HID_RPT_VERT_SCROLLBAR" -#define HID_RPT_STARTMARKER "REPORTDESIGN_HID_RPT_STARTMARKER" -#define HID_RPT_FIELDEXPRESSION "REPORTDESIGN_HID_RPT_FIELDEXPRESSION" -#define HID_RPT_SORTORDER "REPORTDESIGN_HID_RPT_SORTORDER" -#define HID_RPT_GROUPSBRW "REPORTDESIGN_HID_RPT_GROUPSBRW" -#define HID_RPT_GROUPSSORTING_DLG "REPORTDESIGN_HID_RPT_GROUPSSORTING_DLG" -#define HID_RPT_PAGENUMBERS_DLG "REPORTDESIGN_HID_RPT_PAGENUMBERS_DLG" -#define HID_RPT_DATETIME_DLG "REPORTDESIGN_HID_RPT_DATETIME_DLG" -#define HID_RPT_CONDFORMAT_DLG "REPORTDESIGN_HID_RPT_CONDFORMAT_DLG" -#define HID_RPT_CONDFORMAT_TB "REPORTDESIGN_HID_RPT_CONDFORMAT_TB" -#define HID_RPT_CRTL_FORMAT_PREVIEW "REPORTDESIGN_HID_RPT_CRTL_FORMAT_PREVIEW" -#define HID_RPT_COND_DLG "REPORTDESIGN_HID_RPT_COND_DLG" -#define HID_RPT_POPUP_COLOR_CTRL "REPORTDESIGN_HID_RPT_POPUP_COLOR_CTRL" -#define HID_RPT_POPUP_COLOR "REPORTDESIGN_HID_RPT_POPUP_COLOR" -#define HID_RPT_FIELD_SEL "REPORTDESIGN_HID_RPT_FIELD_SEL" -#define HID_RPT_FIELD_SEL_WIN "REPORTDESIGN_HID_RPT_FIELD_SEL_WIN" -#define HID_RPT_PROPDLG_TAB_GENERAL "REPORTDESIGN_HID_RPT_PROPDLG_TAB_GENERAL" -#define HID_RPT_PROPDLG_TAB_DATA "REPORTDESIGN_HID_RPT_PROPDLG_TAB_DATA" +#define UID_RPT_RPT_APP_VIEW (HID_RPT_START + 0) +#define UID_RPT_SCROLLWINDOW (HID_RPT_START + 1) +#define UID_RPT_REPORTWINDOW (HID_RPT_START + 2) +#define HID_RPT_HORZ_RULER (HID_RPT_START + 3) +#define UID_RPT_SECTIONSWINDOW (HID_RPT_START + 4) +#define UID_RPT_VIEWSWINDOW (HID_RPT_START + 5) +#define HID_RPT_ENDMARKER (HID_RPT_START + 6) +#define HID_RPT_SPLITTER (HID_RPT_START + 7) +#define HID_REPORTSECTION (HID_RPT_START + 8) +#define HID_RPT_HORZ_SCROLLBAR (HID_RPT_START + 9) +#define HID_RPT_VERT_SCROLLBAR (HID_RPT_START + 10) +#define HID_RPT_STARTMARKER (HID_RPT_START + 11) +#define HID_RPT_FIELDEXPRESSION (HID_RPT_START + 12) +#define HID_RPT_SORTORDER (HID_RPT_START + 13) +#define HID_RPT_GROUPSBRW (HID_RPT_START + 14) +#define HID_RPT_GROUPSSORTING_DLG (HID_RPT_START + 15) +#define HID_RPT_PAGENUMBERS_DLG (HID_RPT_START + 16) +#define HID_RPT_DATETIME_DLG (HID_RPT_START + 17) +#define HID_RPT_CONDFORMAT_DLG (HID_RPT_START + 18) +#define HID_RPT_CONDFORMAT_TB (HID_RPT_START + 19) +#define HID_RPT_CRTL_FORMAT_PREVIEW (HID_RPT_START + 20) +#define HID_RPT_COND_DLG (HID_RPT_START + 21) +#define HID_RPT_POPUP_COLOR_CTRL (HID_RPT_START + 22) +#define HID_RPT_POPUP_COLOR (HID_RPT_START + 23) +#define HID_RPT_FIELD_SEL (HID_RPT_START + 24) +#define HID_RPT_FIELD_SEL_WIN (HID_RPT_START + 25) +#define HID_RPT_PROPDLG_TAB_GENERAL (HID_RPT_START + 26) +#define HID_RPT_PROPDLG_TAB_DATA (HID_RPT_START + 27) -#define HID_RPT_PROP_FORCENEWPAGE "REPORTDESIGN_HID_RPT_PROP_FORCENEWPAGE" -#define HID_RPT_PROP_NEWROWORCOL "REPORTDESIGN_HID_RPT_PROP_NEWROWORCOL" -#define HID_RPT_PROP_KEEPTOGETHER "REPORTDESIGN_HID_RPT_PROP_KEEPTOGETHER" -#define HID_RPT_PROP_CANGROW "REPORTDESIGN_HID_RPT_PROP_CANGROW" -#define HID_RPT_PROP_CANSHRINK "REPORTDESIGN_HID_RPT_PROP_CANSHRINK" -#define HID_RPT_PROP_REPEATSECTION "REPORTDESIGN_HID_RPT_PROP_REPEATSECTION" -#define HID_RPT_PROP_FORMULALIST "REPORTDESIGN_HID_RPT_PROP_FORMULALIST" -#define HID_RPT_PROP_SCOPE "REPORTDESIGN_HID_RPT_PROP_SCOPE" -#define HID_RPT_PROP_TYPE "REPORTDESIGN_HID_RPT_PROP_TYPE" -#define HID_RPT_PROP_MASTERFIELDS "REPORTDESIGN_HID_RPT_PROP_MASTERFIELDS" -#define HID_RPT_PROP_DETAILFIELDS "REPORTDESIGN_HID_RPT_PROP_DETAILFIELDS" -#define HID_RPT_PROP_AREA "REPORTDESIGN_HID_RPT_PROP_AREA" -#define HID_RPT_PROP_MIMETYPE "REPORTDESIGN_HID_RPT_PROP_MIMETYPE" +#define HID_RPT_PROP_FORCENEWPAGE (HID_RPT_START + 28) +#define HID_RPT_PROP_NEWROWORCOL (HID_RPT_START + 29) +#define HID_RPT_PROP_KEEPTOGETHER (HID_RPT_START + 30) +#define HID_RPT_PROP_CANGROW (HID_RPT_START + 31) +#define HID_RPT_PROP_CANSHRINK (HID_RPT_START + 32) +#define HID_RPT_PROP_REPEATSECTION (HID_RPT_START + 33) +#define HID_RPT_PROP_FORMULALIST (HID_RPT_START + 34) +#define HID_RPT_PROP_SCOPE (HID_RPT_START + 35) +#define HID_RPT_PROP_TYPE (HID_RPT_START + 36) +#define HID_RPT_PROP_MASTERFIELDS (HID_RPT_START + 37) +#define HID_RPT_PROP_DETAILFIELDS (HID_RPT_START + 38) +#define HID_RPT_PROP_AREA (HID_RPT_START + 39) +#define UID_RPT_RPT_PROP_DLG_AREA (HID_RPT_START + 40) +#define HID_RPT_PROP_MIMETYPE (HID_RPT_START + 41) // free // free -#define HID_RPT_PROP_PRINTREPEATEDVALUES "REPORTDESIGN_HID_RPT_PROP_PRINTREPEATEDVALUES" -#define HID_RPT_PROP_CONDITIONALPRINTEXPRESSION "REPORTDESIGN_HID_RPT_PROP_CONDITIONALPRINTEXPRESSION" -#define HID_RPT_PROP_VERTICALALIGN "REPORTDESIGN_HID_RPT_PROP_VERTICALALIGN" -#define HID_RPT_PROP_STARTNEWCOLUMN "REPORTDESIGN_HID_RPT_PROP_STARTNEWCOLUMN" -#define HID_RPT_PROP_STARTNEWPAGE "REPORTDESIGN_HID_RPT_PROP_STARTNEWPAGE" -#define HID_RPT_PROP_RESETPAGENUMBER "REPORTDESIGN_HID_RPT_PROP_RESETPAGENUMBER" -#define HID_RPT_PROP_PARAADJUST "REPORTDESIGN_HID_RPT_PROP_PARAADJUST" -#define HID_RPT_PROP_MINHEIGHTNEWPAGE "REPORTDESIGN_HID_RPT_PROP_MINHEIGHTNEWPAGE" -#define HID_RPT_PROP_PRINTWHENGROUPCHANGE "REPORTDESIGN_HID_RPT_PROP_PRINTWHENGROUPCHANGE" -#define HID_RPT_PROP_CHARTTYPE "REPORTDESIGN_HID_RPT_PROP_CHARTTYPE" +#define HID_RPT_PROP_PRINTREPEATEDVALUES (HID_RPT_START + 44) +#define HID_RPT_PROP_CONDITIONALPRINTEXPRESSION (HID_RPT_START + 45) +#define HID_RPT_PROP_VERTICALALIGN (HID_RPT_START + 46) +#define HID_RPT_PROP_STARTNEWCOLUMN (HID_RPT_START + 47) +#define HID_RPT_PROP_STARTNEWPAGE (HID_RPT_START + 48) +#define HID_RPT_PROP_RESETPAGENUMBER (HID_RPT_START + 49) +#define HID_RPT_PROP_PARAADJUST (HID_RPT_START + 50) +#define HID_RPT_PROP_MINHEIGHTNEWPAGE (HID_RPT_START + 51) +#define HID_RPT_PROP_PRINTWHENGROUPCHANGE (HID_RPT_START + 52) +#define HID_RPT_PROP_CHARTTYPE (HID_RPT_START + 53) // free // free -#define HID_RPT_PROP_VISIBLE "REPORTDESIGN_HID_RPT_PROP_VISIBLE" -#define HID_RPT_PROP_GROUPKEEPTOGETHER "REPORTDESIGN_HID_RPT_PROP_GROUPKEEPTOGETHER" -#define HID_RPT_PROP_PAGEHEADEROPTION "REPORTDESIGN_HID_RPT_PROP_PAGEHEADEROPTION" -#define HID_RPT_PROP_PAGEFOOTEROPTION "REPORTDESIGN_HID_RPT_PROP_PAGEFOOTEROPTION" -#define UID_RPT_PROP_DLG_LINE_STYLE "REPORTDESIGN_UID_RPT_PROP_DLG_LINE_STYLE" -#define HID_RPT_PROP_PREVIEW_COUNT "REPORTDESIGN_HID_RPT_PROP_PREVIEW_COUNT" -#define HID_RPT_PROP_DATAFIELD "REPORTDESIGN_HID_RPT_PROP_DATAFIELD" -#define HID_RPT_PROP_BACKCOLOR "REPORTDESIGN_HID_RPT_PROP_BACKCOLOR" -#define HID_RPT_PROP_RPT_POSITIONX "REPORTDESIGN_HID_RPT_PROP_RPT_POSITIONX" -#define HID_RPT_PROP_RPT_POSITIONY "REPORTDESIGN_HID_RPT_PROP_RPT_POSITIONY" -#define HID_RPT_PROP_RPT_WIDTH "REPORTDESIGN_HID_RPT_PROP_RPT_WIDTH" -#define HID_RPT_PROP_RPT_HEIGHT "REPORTDESIGN_HID_RPT_PROP_RPT_HEIGHT" -#define HID_RPT_START_TITLE "REPORTDESIGN_HID_RPT_START_TITLE" -#define HID_RPT_START_IMAGE "REPORTDESIGN_HID_RPT_START_IMAGE" -#define HID_RPT_PROP_DEEPTRAVERSING "REPORTDESIGN_HID_RPT_PROP_DEEPTRAVERSING" -#define HID_RPT_PROP_PREEVALUATED "REPORTDESIGN_HID_RPT_PROP_PREEVALUATED" -#define HID_RPT_NAVIGATOR_DLG "REPORTDESIGN_HID_RPT_NAVIGATOR_DLG" -#define HID_REPORT_NAVIGATOR_TREE "REPORTDESIGN_HID_REPORT_NAVIGATOR_TREE" -#define HID_RPT_PROP_FORMULA "REPORTDESIGN_HID_RPT_PROP_FORMULA" -#define HID_RPT_PROP_INITIALFORMULA "REPORTDESIGN_HID_RPT_PROP_INITIALFORMULA" -#define HID_RPT_PROP_RPT_FONT "REPORTDESIGN_HID_RPT_PROP_RPT_FONT" -#define HID_RPT_PROP_PRESERVEIRI "REPORTDESIGN_HID_RPT_PROP_PRESERVEIRI" -#define HID_RPT_PROP_BACKTRANSPARENT "REPORTDESIGN_HID_RPT_PROP_BACKTRANSPARENT" -#define HID_RPT_PROP_CONTROLBACKGROUNDTRANSPARENT "REPORTDESIGN_HID_RPT_PROP_CONTROLBACKGROUNDTRANSPARENT" +#define HID_RPT_PROP_VISIBLE (HID_RPT_START + 55) +#define HID_RPT_PROP_GROUPKEEPTOGETHER (HID_RPT_START + 56) +#define HID_RPT_PROP_PAGEHEADEROPTION (HID_RPT_START + 57) +#define HID_RPT_PROP_PAGEFOOTEROPTION (HID_RPT_START + 58) +#define UID_RPT_PROP_DLG_LINE_STYLE (HID_RPT_START + 59) +#define HID_RPT_PROP_PREVIEW_COUNT (HID_RPT_START + 60) +#define HID_RPT_PROP_DATAFIELD (HID_RPT_START + 61) +#define HID_RPT_PROP_BACKCOLOR (HID_RPT_START + 62) +#define HID_RPT_PROP_RPT_POSITIONX (HID_RPT_START + 63) +#define HID_RPT_PROP_RPT_POSITIONY (HID_RPT_START + 64) +#define HID_RPT_PROP_RPT_WIDTH (HID_RPT_START + 65) +#define HID_RPT_PROP_RPT_HEIGHT (HID_RPT_START + 66) +#define HID_RPT_START_TITLE (HID_RPT_START + 67) +#define HID_RPT_START_IMAGE (HID_RPT_START + 68) +#define HID_RPT_PROP_DEEPTRAVERSING (HID_RPT_START + 69) +#define HID_RPT_PROP_PREEVALUATED (HID_RPT_START + 70) +#define HID_RPT_NAVIGATOR_DLG (HID_RPT_START + 71) +#define HID_REPORT_NAVIGATOR_TREE (HID_RPT_START + 72) +#define HID_RPT_PROP_FORMULA (HID_RPT_START + 73) +#define HID_RPT_PROP_INITIALFORMULA (HID_RPT_START + 74) +#define HID_RPT_PROP_RPT_FONT (HID_RPT_START + 75) +#define UID_RPT_RPT_PROP_DLG_FONT_TYPE (HID_RPT_START + 76) +#define HID_RPT_PROP_PRESERVEIRI (HID_RPT_START + 77) +#define HID_RPT_PROP_BACKTRANSPARENT (HID_RPT_START + 78) +#define HID_RPT_PROP_CONTROLBACKGROUNDTRANSPARENT (HID_RPT_START + 79) +#define UID_RPT_PROP_CHARTTYPE_DLG (HID_RPT_START + 80) +#define UID_RPT_PROP_DLG_LINKFIELDS (HID_RPT_START + 81) +#define UID_RPT_PROP_FORMULA (HID_RPT_START + 82) -#define HID_RPT_GROUPSORT_MOVE_UP "REPORTDESIGN_HID_RPT_GROUPSORT_MOVE_UP" -#define HID_RPT_GROUPSORT_MOVE_DOWN "REPORTDESIGN_HID_RPT_GROUPSORT_MOVE_DOWN" -#define HID_RPT_GROUPSORT_DELETE "REPORTDESIGN_HID_RPT_GROUPSORT_DELETE" +#define HID_RPT_GROUPSORT_MOVE_UP (HID_RPT_START + 82) +#define HID_RPT_GROUPSORT_MOVE_DOWN (HID_RPT_START + 83) +#define HID_RPT_GROUPSORT_DELETE (HID_RPT_START + 84) + +#if UID_RPT_PROP_FORMULA > HID_RPT_END +#error Help-Id Ueberlauf in #file, #line +#endif +// don't forget to update the file util/hidother.src #endif //RTPUI_REPORTDESIGN_HELPID_HRC diff --git a/reportdesign/inc/pch/precompiled_reportdesign.cxx b/reportdesign/inc/pch/precompiled_reportdesign.cxx index e01779afdfba..c52af4709ee2 100644 --- a/reportdesign/inc/pch/precompiled_reportdesign.cxx +++ b/reportdesign/inc/pch/precompiled_reportdesign.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/reportdesign/inc/pch/precompiled_reportdesign.hxx b/reportdesign/inc/pch/precompiled_reportdesign.hxx index c0dfd77c3e5f..396aa8c3a177 100644 --- a/reportdesign/inc/pch/precompiled_reportdesign.hxx +++ b/reportdesign/inc/pch/precompiled_reportdesign.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/reportdesign/inc/reportformula.hxx b/reportdesign/inc/reportformula.hxx index 1ff7c091dfe6..f43ba873b596 100644 --- a/reportdesign/inc/reportformula.hxx +++ b/reportdesign/inc/reportformula.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -89,7 +89,7 @@ namespace rptui If the formula denotes an expression, then the <em>undecorated content</em> is the expression itself. */ - const ::rtl::OUString& getUndecoratedContent() const; + const ::rtl::OUString& getUndecoratedContent() const;// { return m_sUndecoratedContent; } /// convenience alias for <code>getUndecoratedContent</code>, which asserts (in a non-product build) when used on an expression inline ::rtl::OUString getFieldName() const; diff --git a/reportdesign/inc/rptui_slotid.hrc b/reportdesign/inc/rptui_slotid.hrc index 18ab6d5b0181..4096cb6a272a 100644 --- a/reportdesign/inc/rptui_slotid.hrc +++ b/reportdesign/inc/rptui_slotid.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,159 +30,159 @@ #include <svx/svxids.hrc> -#define SID_PAGEHEADERFOOTER ( SID_RPTUI_START + 0 ) -#define SID_REPORTHEADERFOOTER ( SID_RPTUI_START + 1 ) -#define SID_SORTINGANDGROUPING ( SID_RPTUI_START + 2 ) -#define SID_INSERT_FLD_PGNUMBER ( SID_RPTUI_START + 3 ) -#define SID_CONDITIONALFORMATTING ( SID_RPTUI_START + 4 ) -#define SID_PAGEDIALOG ( SID_RPTUI_START + 5 ) -#define SID_SETCONTROLDEFAULTS ( SID_RPTUI_START + 6 ) -#define SID_INSERTBREAK ( SID_RPTUI_START + 7 ) -#define SID_PAGEHEADER_WITHOUT_UNDO ( SID_RPTUI_START + 8 ) -#define SID_PAGEFOOTER_WITHOUT_UNDO ( SID_RPTUI_START + 9 ) -#define SID_REPORTHEADER_WITHOUT_UNDO ( SID_RPTUI_START + 10 ) -#define SID_REPORTFOOTER_WITHOUT_UNDO ( SID_RPTUI_START + 11 ) -#define SID_SELECT_REPORT ( SID_RPTUI_START + 12 ) -#define SID_GROUPHEADER_WITHOUT_UNDO ( SID_RPTUI_START + 13 ) -#define SID_GROUPHEADER ( SID_RPTUI_START + 14 ) -#define SID_GROUPFOOTER_WITHOUT_UNDO ( SID_RPTUI_START + 15 ) -#define SID_GROUPFOOTER ( SID_RPTUI_START + 16 ) -#define SID_GROUP_REMOVE ( SID_RPTUI_START + 17 ) -#define SID_GROUP_APPEND ( SID_RPTUI_START + 18 ) -#define SID_EXECUTE_REPORT ( SID_RPTUI_START + 19 ) -#define SID_DATETIME ( SID_RPTUI_START + 20 ) -#define SID_ESCAPE ( SID_RPTUI_START + 21 ) -#define SID_ADD_CONTROL_PAIR ( SID_RPTUI_START + 22 ) -#define SID_SPLIT_POSITION ( SID_RPTUI_START + 23 ) -#define SID_PROPERTYBROWSER_LAST_PAGE ( SID_RPTUI_START + 24 ) +#define SID_PAGEHEADERFOOTER ( SID_RPTUI_START + 0 ) +#define SID_REPORTHEADERFOOTER ( SID_RPTUI_START + 1 ) +#define SID_SORTINGANDGROUPING ( SID_RPTUI_START + 2 ) +#define SID_INSERT_FLD_PGNUMBER ( SID_RPTUI_START + 3 ) +#define SID_CONDITIONALFORMATTING ( SID_RPTUI_START + 4 ) +#define SID_PAGEDIALOG ( SID_RPTUI_START + 5 ) +#define SID_SETCONTROLDEFAULTS ( SID_RPTUI_START + 6 ) +#define SID_INSERTBREAK ( SID_RPTUI_START + 7 ) +#define SID_PAGEHEADER_WITHOUT_UNDO ( SID_RPTUI_START + 8 ) +#define SID_PAGEFOOTER_WITHOUT_UNDO ( SID_RPTUI_START + 9 ) +#define SID_REPORTHEADER_WITHOUT_UNDO ( SID_RPTUI_START + 10 ) +#define SID_REPORTFOOTER_WITHOUT_UNDO ( SID_RPTUI_START + 11 ) +#define SID_SELECT_REPORT ( SID_RPTUI_START + 12 ) +#define SID_GROUPHEADER_WITHOUT_UNDO ( SID_RPTUI_START + 13 ) +#define SID_GROUPHEADER ( SID_RPTUI_START + 14 ) +#define SID_GROUPFOOTER_WITHOUT_UNDO ( SID_RPTUI_START + 15 ) +#define SID_GROUPFOOTER ( SID_RPTUI_START + 16 ) +#define SID_GROUP_REMOVE ( SID_RPTUI_START + 17 ) +#define SID_GROUP_APPEND ( SID_RPTUI_START + 18 ) +#define SID_EXECUTE_REPORT ( SID_RPTUI_START + 19 ) +#define SID_DATETIME ( SID_RPTUI_START + 20 ) +#define SID_ESCAPE ( SID_RPTUI_START + 21 ) +#define SID_ADD_CONTROL_PAIR ( SID_RPTUI_START + 22 ) +#define SID_SPLIT_POSITION ( SID_RPTUI_START + 23 ) +#define SID_PROPERTYBROWSER_LAST_PAGE ( SID_RPTUI_START + 24 ) // free -#define SID_DRAWTBX_CS_BASIC1 ( SID_RPTUI_START + 26 ) -#define SID_DRAWTBX_CS_BASIC2 ( SID_RPTUI_START + 27 ) -#define SID_DRAWTBX_CS_BASIC3 ( SID_RPTUI_START + 28 ) -#define SID_DRAWTBX_CS_BASIC4 ( SID_RPTUI_START + 29 ) -#define SID_DRAWTBX_CS_BASIC5 ( SID_RPTUI_START + 30 ) -#define SID_DRAWTBX_CS_BASIC6 ( SID_RPTUI_START + 31 ) -#define SID_DRAWTBX_CS_BASIC7 ( SID_RPTUI_START + 32 ) -#define SID_DRAWTBX_CS_BASIC8 ( SID_RPTUI_START + 33 ) -#define SID_DRAWTBX_CS_BASIC9 ( SID_RPTUI_START + 34 ) -#define SID_DRAWTBX_CS_BASIC10 ( SID_RPTUI_START + 35 ) -#define SID_DRAWTBX_CS_BASIC11 ( SID_RPTUI_START + 36 ) -#define SID_DRAWTBX_CS_BASIC12 ( SID_RPTUI_START + 37 ) -#define SID_DRAWTBX_CS_BASIC13 ( SID_RPTUI_START + 38 ) -#define SID_DRAWTBX_CS_BASIC14 ( SID_RPTUI_START + 39 ) -#define SID_DRAWTBX_CS_BASIC15 ( SID_RPTUI_START + 40 ) -#define SID_DRAWTBX_CS_BASIC16 ( SID_RPTUI_START + 41 ) -#define SID_DRAWTBX_CS_BASIC17 ( SID_RPTUI_START + 42 ) -#define SID_DRAWTBX_CS_BASIC18 ( SID_RPTUI_START + 43 ) -#define SID_DRAWTBX_CS_BASIC19 ( SID_RPTUI_START + 44 ) -#define SID_DRAWTBX_CS_BASIC20 ( SID_RPTUI_START + 45 ) -#define SID_DRAWTBX_CS_BASIC21 ( SID_RPTUI_START + 46 ) -#define SID_DRAWTBX_CS_BASIC22 ( SID_RPTUI_START + 47 ) -#define SID_DRAWTBX_CS_SYMBOL1 ( SID_RPTUI_START + 48 ) -#define SID_DRAWTBX_CS_SYMBOL2 ( SID_RPTUI_START + 49 ) -#define SID_DRAWTBX_CS_SYMBOL3 ( SID_RPTUI_START + 50 ) -#define SID_DRAWTBX_CS_SYMBOL4 ( SID_RPTUI_START + 51 ) -#define SID_DRAWTBX_CS_SYMBOL5 ( SID_RPTUI_START + 52 ) -#define SID_DRAWTBX_CS_SYMBOL6 ( SID_RPTUI_START + 53 ) -#define SID_DRAWTBX_CS_SYMBOL7 ( SID_RPTUI_START + 54 ) -#define SID_DRAWTBX_CS_SYMBOL8 ( SID_RPTUI_START + 55 ) -#define SID_DRAWTBX_CS_SYMBOL9 ( SID_RPTUI_START + 56 ) -#define SID_DRAWTBX_CS_SYMBOL10 ( SID_RPTUI_START + 57 ) -#define SID_DRAWTBX_CS_SYMBOL11 ( SID_RPTUI_START + 58 ) -#define SID_DRAWTBX_CS_SYMBOL12 ( SID_RPTUI_START + 59 ) -#define SID_DRAWTBX_CS_SYMBOL13 ( SID_RPTUI_START + 60 ) -#define SID_DRAWTBX_CS_SYMBOL14 ( SID_RPTUI_START + 61 ) -#define SID_DRAWTBX_CS_SYMBOL15 ( SID_RPTUI_START + 62 ) -#define SID_DRAWTBX_CS_SYMBOL16 ( SID_RPTUI_START + 63 ) -#define SID_DRAWTBX_CS_SYMBOL17 ( SID_RPTUI_START + 64 ) -#define SID_DRAWTBX_CS_SYMBOL18 ( SID_RPTUI_START + 65 ) -#define SID_DRAWTBX_CS_ARROW1 ( SID_RPTUI_START + 66 ) -#define SID_DRAWTBX_CS_ARROW2 ( SID_RPTUI_START + 67 ) -#define SID_DRAWTBX_CS_ARROW3 ( SID_RPTUI_START + 68 ) -#define SID_DRAWTBX_CS_ARROW4 ( SID_RPTUI_START + 69 ) -#define SID_DRAWTBX_CS_ARROW5 ( SID_RPTUI_START + 70 ) -#define SID_DRAWTBX_CS_ARROW6 ( SID_RPTUI_START + 71 ) -#define SID_DRAWTBX_CS_ARROW7 ( SID_RPTUI_START + 72 ) -#define SID_DRAWTBX_CS_ARROW8 ( SID_RPTUI_START + 73 ) -#define SID_DRAWTBX_CS_ARROW9 ( SID_RPTUI_START + 74 ) -#define SID_DRAWTBX_CS_ARROW10 ( SID_RPTUI_START + 75 ) -#define SID_DRAWTBX_CS_ARROW11 ( SID_RPTUI_START + 76 ) -#define SID_DRAWTBX_CS_ARROW12 ( SID_RPTUI_START + 77 ) -#define SID_DRAWTBX_CS_ARROW13 ( SID_RPTUI_START + 78 ) -#define SID_DRAWTBX_CS_ARROW14 ( SID_RPTUI_START + 79 ) -#define SID_DRAWTBX_CS_ARROW15 ( SID_RPTUI_START + 80 ) -#define SID_DRAWTBX_CS_ARROW16 ( SID_RPTUI_START + 81 ) -#define SID_DRAWTBX_CS_ARROW17 ( SID_RPTUI_START + 82 ) -#define SID_DRAWTBX_CS_ARROW18 ( SID_RPTUI_START + 83 ) -#define SID_DRAWTBX_CS_ARROW19 ( SID_RPTUI_START + 84 ) -#define SID_DRAWTBX_CS_ARROW20 ( SID_RPTUI_START + 85 ) -#define SID_DRAWTBX_CS_ARROW21 ( SID_RPTUI_START + 86 ) -#define SID_DRAWTBX_CS_ARROW22 ( SID_RPTUI_START + 87 ) -#define SID_DRAWTBX_CS_ARROW23 ( SID_RPTUI_START + 88 ) -#define SID_DRAWTBX_CS_ARROW24 ( SID_RPTUI_START + 89 ) -#define SID_DRAWTBX_CS_ARROW25 ( SID_RPTUI_START + 90 ) -#define SID_DRAWTBX_CS_ARROW26 ( SID_RPTUI_START + 91 ) -#define SID_DRAWTBX_CS_STAR1 ( SID_RPTUI_START + 92 ) -#define SID_DRAWTBX_CS_STAR2 ( SID_RPTUI_START + 93 ) -#define SID_DRAWTBX_CS_STAR3 ( SID_RPTUI_START + 94 ) -#define SID_DRAWTBX_CS_STAR4 ( SID_RPTUI_START + 95 ) -#define SID_DRAWTBX_CS_STAR5 ( SID_RPTUI_START + 96 ) -#define SID_DRAWTBX_CS_STAR6 ( SID_RPTUI_START + 97 ) -#define SID_DRAWTBX_CS_STAR7 ( SID_RPTUI_START + 98 ) -#define SID_DRAWTBX_CS_STAR8 ( SID_RPTUI_START + 99 ) -#define SID_DRAWTBX_CS_STAR9 ( SID_RPTUI_START + 100 ) -#define SID_DRAWTBX_CS_STAR10 ( SID_RPTUI_START + 101 ) -#define SID_DRAWTBX_CS_STAR11 ( SID_RPTUI_START + 102 ) -#define SID_DRAWTBX_CS_STAR12 ( SID_RPTUI_START + 103 ) -#define SID_DRAWTBX_CS_FLOWCHART1 ( SID_RPTUI_START + 104 ) -#define SID_DRAWTBX_CS_FLOWCHART2 ( SID_RPTUI_START + 105 ) -#define SID_DRAWTBX_CS_FLOWCHART3 ( SID_RPTUI_START + 106 ) -#define SID_DRAWTBX_CS_FLOWCHART4 ( SID_RPTUI_START + 107 ) -#define SID_DRAWTBX_CS_FLOWCHART5 ( SID_RPTUI_START + 108 ) -#define SID_DRAWTBX_CS_FLOWCHART6 ( SID_RPTUI_START + 109 ) -#define SID_DRAWTBX_CS_FLOWCHART7 ( SID_RPTUI_START + 110 ) -#define SID_DRAWTBX_CS_FLOWCHART8 ( SID_RPTUI_START + 111 ) -#define SID_DRAWTBX_CS_FLOWCHART9 ( SID_RPTUI_START + 112 ) -#define SID_DRAWTBX_CS_FLOWCHART10 ( SID_RPTUI_START + 113 ) -#define SID_DRAWTBX_CS_FLOWCHART11 ( SID_RPTUI_START + 114 ) -#define SID_DRAWTBX_CS_FLOWCHART12 ( SID_RPTUI_START + 115 ) -#define SID_DRAWTBX_CS_FLOWCHART13 ( SID_RPTUI_START + 116 ) -#define SID_DRAWTBX_CS_FLOWCHART14 ( SID_RPTUI_START + 117 ) -#define SID_DRAWTBX_CS_FLOWCHART15 ( SID_RPTUI_START + 118 ) -#define SID_DRAWTBX_CS_FLOWCHART16 ( SID_RPTUI_START + 119 ) -#define SID_DRAWTBX_CS_FLOWCHART17 ( SID_RPTUI_START + 120 ) -#define SID_DRAWTBX_CS_FLOWCHART18 ( SID_RPTUI_START + 121 ) -#define SID_DRAWTBX_CS_FLOWCHART19 ( SID_RPTUI_START + 122 ) -#define SID_DRAWTBX_CS_FLOWCHART20 ( SID_RPTUI_START + 123 ) -#define SID_DRAWTBX_CS_FLOWCHART21 ( SID_RPTUI_START + 124 ) -#define SID_DRAWTBX_CS_FLOWCHART22 ( SID_RPTUI_START + 125 ) -#define SID_DRAWTBX_CS_FLOWCHART23 ( SID_RPTUI_START + 126 ) -#define SID_DRAWTBX_CS_FLOWCHART24 ( SID_RPTUI_START + 127 ) -#define SID_DRAWTBX_CS_FLOWCHART25 ( SID_RPTUI_START + 128 ) -#define SID_DRAWTBX_CS_FLOWCHART26 ( SID_RPTUI_START + 129 ) -#define SID_DRAWTBX_CS_FLOWCHART27 ( SID_RPTUI_START + 130 ) -#define SID_DRAWTBX_CS_FLOWCHART28 ( SID_RPTUI_START + 131 ) -#define SID_DRAWTBX_CS_CALLOUT1 ( SID_RPTUI_START + 132 ) -#define SID_DRAWTBX_CS_CALLOUT2 ( SID_RPTUI_START + 133 ) -#define SID_DRAWTBX_CS_CALLOUT3 ( SID_RPTUI_START + 134 ) -#define SID_DRAWTBX_CS_CALLOUT4 ( SID_RPTUI_START + 135 ) -#define SID_DRAWTBX_CS_CALLOUT5 ( SID_RPTUI_START + 136 ) -#define SID_DRAWTBX_CS_CALLOUT6 ( SID_RPTUI_START + 137 ) -#define SID_DRAWTBX_CS_CALLOUT7 ( SID_RPTUI_START + 138 ) +#define SID_DRAWTBX_CS_BASIC1 ( SID_RPTUI_START + 26 ) +#define SID_DRAWTBX_CS_BASIC2 ( SID_RPTUI_START + 27 ) +#define SID_DRAWTBX_CS_BASIC3 ( SID_RPTUI_START + 28 ) +#define SID_DRAWTBX_CS_BASIC4 ( SID_RPTUI_START + 29 ) +#define SID_DRAWTBX_CS_BASIC5 ( SID_RPTUI_START + 30 ) +#define SID_DRAWTBX_CS_BASIC6 ( SID_RPTUI_START + 31 ) +#define SID_DRAWTBX_CS_BASIC7 ( SID_RPTUI_START + 32 ) +#define SID_DRAWTBX_CS_BASIC8 ( SID_RPTUI_START + 33 ) +#define SID_DRAWTBX_CS_BASIC9 ( SID_RPTUI_START + 34 ) +#define SID_DRAWTBX_CS_BASIC10 ( SID_RPTUI_START + 35 ) +#define SID_DRAWTBX_CS_BASIC11 ( SID_RPTUI_START + 36 ) +#define SID_DRAWTBX_CS_BASIC12 ( SID_RPTUI_START + 37 ) +#define SID_DRAWTBX_CS_BASIC13 ( SID_RPTUI_START + 38 ) +#define SID_DRAWTBX_CS_BASIC14 ( SID_RPTUI_START + 39 ) +#define SID_DRAWTBX_CS_BASIC15 ( SID_RPTUI_START + 40 ) +#define SID_DRAWTBX_CS_BASIC16 ( SID_RPTUI_START + 41 ) +#define SID_DRAWTBX_CS_BASIC17 ( SID_RPTUI_START + 42 ) +#define SID_DRAWTBX_CS_BASIC18 ( SID_RPTUI_START + 43 ) +#define SID_DRAWTBX_CS_BASIC19 ( SID_RPTUI_START + 44 ) +#define SID_DRAWTBX_CS_BASIC20 ( SID_RPTUI_START + 45 ) +#define SID_DRAWTBX_CS_BASIC21 ( SID_RPTUI_START + 46 ) +#define SID_DRAWTBX_CS_BASIC22 ( SID_RPTUI_START + 47 ) +#define SID_DRAWTBX_CS_SYMBOL1 ( SID_RPTUI_START + 48 ) +#define SID_DRAWTBX_CS_SYMBOL2 ( SID_RPTUI_START + 49 ) +#define SID_DRAWTBX_CS_SYMBOL3 ( SID_RPTUI_START + 50 ) +#define SID_DRAWTBX_CS_SYMBOL4 ( SID_RPTUI_START + 51 ) +#define SID_DRAWTBX_CS_SYMBOL5 ( SID_RPTUI_START + 52 ) +#define SID_DRAWTBX_CS_SYMBOL6 ( SID_RPTUI_START + 53 ) +#define SID_DRAWTBX_CS_SYMBOL7 ( SID_RPTUI_START + 54 ) +#define SID_DRAWTBX_CS_SYMBOL8 ( SID_RPTUI_START + 55 ) +#define SID_DRAWTBX_CS_SYMBOL9 ( SID_RPTUI_START + 56 ) +#define SID_DRAWTBX_CS_SYMBOL10 ( SID_RPTUI_START + 57 ) +#define SID_DRAWTBX_CS_SYMBOL11 ( SID_RPTUI_START + 58 ) +#define SID_DRAWTBX_CS_SYMBOL12 ( SID_RPTUI_START + 59 ) +#define SID_DRAWTBX_CS_SYMBOL13 ( SID_RPTUI_START + 60 ) +#define SID_DRAWTBX_CS_SYMBOL14 ( SID_RPTUI_START + 61 ) +#define SID_DRAWTBX_CS_SYMBOL15 ( SID_RPTUI_START + 62 ) +#define SID_DRAWTBX_CS_SYMBOL16 ( SID_RPTUI_START + 63 ) +#define SID_DRAWTBX_CS_SYMBOL17 ( SID_RPTUI_START + 64 ) +#define SID_DRAWTBX_CS_SYMBOL18 ( SID_RPTUI_START + 65 ) +#define SID_DRAWTBX_CS_ARROW1 ( SID_RPTUI_START + 66 ) +#define SID_DRAWTBX_CS_ARROW2 ( SID_RPTUI_START + 67 ) +#define SID_DRAWTBX_CS_ARROW3 ( SID_RPTUI_START + 68 ) +#define SID_DRAWTBX_CS_ARROW4 ( SID_RPTUI_START + 69 ) +#define SID_DRAWTBX_CS_ARROW5 ( SID_RPTUI_START + 70 ) +#define SID_DRAWTBX_CS_ARROW6 ( SID_RPTUI_START + 71 ) +#define SID_DRAWTBX_CS_ARROW7 ( SID_RPTUI_START + 72 ) +#define SID_DRAWTBX_CS_ARROW8 ( SID_RPTUI_START + 73 ) +#define SID_DRAWTBX_CS_ARROW9 ( SID_RPTUI_START + 74 ) +#define SID_DRAWTBX_CS_ARROW10 ( SID_RPTUI_START + 75 ) +#define SID_DRAWTBX_CS_ARROW11 ( SID_RPTUI_START + 76 ) +#define SID_DRAWTBX_CS_ARROW12 ( SID_RPTUI_START + 77 ) +#define SID_DRAWTBX_CS_ARROW13 ( SID_RPTUI_START + 78 ) +#define SID_DRAWTBX_CS_ARROW14 ( SID_RPTUI_START + 79 ) +#define SID_DRAWTBX_CS_ARROW15 ( SID_RPTUI_START + 80 ) +#define SID_DRAWTBX_CS_ARROW16 ( SID_RPTUI_START + 81 ) +#define SID_DRAWTBX_CS_ARROW17 ( SID_RPTUI_START + 82 ) +#define SID_DRAWTBX_CS_ARROW18 ( SID_RPTUI_START + 83 ) +#define SID_DRAWTBX_CS_ARROW19 ( SID_RPTUI_START + 84 ) +#define SID_DRAWTBX_CS_ARROW20 ( SID_RPTUI_START + 85 ) +#define SID_DRAWTBX_CS_ARROW21 ( SID_RPTUI_START + 86 ) +#define SID_DRAWTBX_CS_ARROW22 ( SID_RPTUI_START + 87 ) +#define SID_DRAWTBX_CS_ARROW23 ( SID_RPTUI_START + 88 ) +#define SID_DRAWTBX_CS_ARROW24 ( SID_RPTUI_START + 89 ) +#define SID_DRAWTBX_CS_ARROW25 ( SID_RPTUI_START + 90 ) +#define SID_DRAWTBX_CS_ARROW26 ( SID_RPTUI_START + 91 ) +#define SID_DRAWTBX_CS_STAR1 ( SID_RPTUI_START + 92 ) +#define SID_DRAWTBX_CS_STAR2 ( SID_RPTUI_START + 93 ) +#define SID_DRAWTBX_CS_STAR3 ( SID_RPTUI_START + 94 ) +#define SID_DRAWTBX_CS_STAR4 ( SID_RPTUI_START + 95 ) +#define SID_DRAWTBX_CS_STAR5 ( SID_RPTUI_START + 96 ) +#define SID_DRAWTBX_CS_STAR6 ( SID_RPTUI_START + 97 ) +#define SID_DRAWTBX_CS_STAR7 ( SID_RPTUI_START + 98 ) +#define SID_DRAWTBX_CS_STAR8 ( SID_RPTUI_START + 99 ) +#define SID_DRAWTBX_CS_STAR9 ( SID_RPTUI_START + 100 ) +#define SID_DRAWTBX_CS_STAR10 ( SID_RPTUI_START + 101 ) +#define SID_DRAWTBX_CS_STAR11 ( SID_RPTUI_START + 102 ) +#define SID_DRAWTBX_CS_STAR12 ( SID_RPTUI_START + 103 ) +#define SID_DRAWTBX_CS_FLOWCHART1 ( SID_RPTUI_START + 104 ) +#define SID_DRAWTBX_CS_FLOWCHART2 ( SID_RPTUI_START + 105 ) +#define SID_DRAWTBX_CS_FLOWCHART3 ( SID_RPTUI_START + 106 ) +#define SID_DRAWTBX_CS_FLOWCHART4 ( SID_RPTUI_START + 107 ) +#define SID_DRAWTBX_CS_FLOWCHART5 ( SID_RPTUI_START + 108 ) +#define SID_DRAWTBX_CS_FLOWCHART6 ( SID_RPTUI_START + 109 ) +#define SID_DRAWTBX_CS_FLOWCHART7 ( SID_RPTUI_START + 110 ) +#define SID_DRAWTBX_CS_FLOWCHART8 ( SID_RPTUI_START + 111 ) +#define SID_DRAWTBX_CS_FLOWCHART9 ( SID_RPTUI_START + 112 ) +#define SID_DRAWTBX_CS_FLOWCHART10 ( SID_RPTUI_START + 113 ) +#define SID_DRAWTBX_CS_FLOWCHART11 ( SID_RPTUI_START + 114 ) +#define SID_DRAWTBX_CS_FLOWCHART12 ( SID_RPTUI_START + 115 ) +#define SID_DRAWTBX_CS_FLOWCHART13 ( SID_RPTUI_START + 116 ) +#define SID_DRAWTBX_CS_FLOWCHART14 ( SID_RPTUI_START + 117 ) +#define SID_DRAWTBX_CS_FLOWCHART15 ( SID_RPTUI_START + 118 ) +#define SID_DRAWTBX_CS_FLOWCHART16 ( SID_RPTUI_START + 119 ) +#define SID_DRAWTBX_CS_FLOWCHART17 ( SID_RPTUI_START + 120 ) +#define SID_DRAWTBX_CS_FLOWCHART18 ( SID_RPTUI_START + 121 ) +#define SID_DRAWTBX_CS_FLOWCHART19 ( SID_RPTUI_START + 122 ) +#define SID_DRAWTBX_CS_FLOWCHART20 ( SID_RPTUI_START + 123 ) +#define SID_DRAWTBX_CS_FLOWCHART21 ( SID_RPTUI_START + 124 ) +#define SID_DRAWTBX_CS_FLOWCHART22 ( SID_RPTUI_START + 125 ) +#define SID_DRAWTBX_CS_FLOWCHART23 ( SID_RPTUI_START + 126 ) +#define SID_DRAWTBX_CS_FLOWCHART24 ( SID_RPTUI_START + 127 ) +#define SID_DRAWTBX_CS_FLOWCHART25 ( SID_RPTUI_START + 128 ) +#define SID_DRAWTBX_CS_FLOWCHART26 ( SID_RPTUI_START + 129 ) +#define SID_DRAWTBX_CS_FLOWCHART27 ( SID_RPTUI_START + 130 ) +#define SID_DRAWTBX_CS_FLOWCHART28 ( SID_RPTUI_START + 131 ) +#define SID_DRAWTBX_CS_CALLOUT1 ( SID_RPTUI_START + 132 ) +#define SID_DRAWTBX_CS_CALLOUT2 ( SID_RPTUI_START + 133 ) +#define SID_DRAWTBX_CS_CALLOUT3 ( SID_RPTUI_START + 134 ) +#define SID_DRAWTBX_CS_CALLOUT4 ( SID_RPTUI_START + 135 ) +#define SID_DRAWTBX_CS_CALLOUT5 ( SID_RPTUI_START + 136 ) +#define SID_DRAWTBX_CS_CALLOUT6 ( SID_RPTUI_START + 137 ) +#define SID_DRAWTBX_CS_CALLOUT7 ( SID_RPTUI_START + 138 ) -#define SID_RPT_TEXTDOCUMENT ( SID_RPTUI_START + 139 ) -#define SID_RPT_SPREADSHEET ( SID_RPTUI_START + 140 ) -#define SID_RPT_SHOWREPORTEXPLORER ( SID_RPTUI_START + 141 ) -#define SID_RPT_NEW_FUNCTION ( SID_RPTUI_START + 142 ) +#define SID_RPT_TEXTDOCUMENT ( SID_RPTUI_START + 139 ) +#define SID_RPT_SPREADSHEET ( SID_RPTUI_START + 140 ) +#define SID_RPT_SHOWREPORTEXPLORER ( SID_RPTUI_START + 141 ) +#define SID_RPT_NEW_FUNCTION ( SID_RPTUI_START + 142 ) -#define SID_OBJECT_SMALLESTWIDTH ( SID_RPTUI_START + 143 ) -#define SID_OBJECT_SMALLESTHEIGHT ( SID_RPTUI_START + 144 ) -#define SID_OBJECT_GREATESTWIDTH ( SID_RPTUI_START + 145 ) -#define SID_OBJECT_GREATESTHEIGHT ( SID_RPTUI_START + 146 ) -#define SID_OBJECT_RESIZING ( SID_RPTUI_START + 147 ) -#define SID_ARRANGEMENU ( SID_RPTUI_START + 148 ) -#define SID_SELECTALL_IN_SECTION ( SID_RPTUI_START + 149 ) +#define SID_OBJECT_SMALLESTWIDTH ( SID_RPTUI_START + 143 ) +#define SID_OBJECT_SMALLESTHEIGHT ( SID_RPTUI_START + 144 ) +#define SID_OBJECT_GREATESTWIDTH ( SID_RPTUI_START + 145 ) +#define SID_OBJECT_GREATESTHEIGHT ( SID_RPTUI_START + 146 ) +#define SID_OBJECT_RESIZING ( SID_RPTUI_START + 147 ) +#define SID_ARRANGEMENU ( SID_RPTUI_START + 148 ) +#define SID_SELECTALL_IN_SECTION ( SID_RPTUI_START + 149 ) #define SID_ICON_GROUP ( SID_RPTUI_START + 150 ) #define SID_ICON_DETAIL ( SID_RPTUI_START + 151 ) diff --git a/reportdesign/prj/build.lst b/reportdesign/prj/build.lst index cfa1e92f8a95..781eb91eccb3 100644 --- a/reportdesign/prj/build.lst +++ b/reportdesign/prj/build.lst @@ -1,4 +1,4 @@ -rd reportdesign : TRANSLATIONS:translations BOOST:boost comphelper dbaccess formula LIBXSLT:libxslt NULL +rd reportdesign : l10n BOOST:boost comphelper dbaccess formula NULL rd reportdesign usr1 - all rd_mkout NULL rd reportdesign\inc nmake - all rd_inc NULL rd reportdesign\source\core\api nmake - all rd_api rd_inc NULL @@ -13,6 +13,3 @@ rd reportdesign\source\ui\inspection nmake rd reportdesign\source\filter\xml nmake - all rd_filter_xml rd_inc NULL rd reportdesign\util nmake - all rd_util rd_api rd_res rd_shared rd_uimisc rd_uidlg rd_uireport rd_uiinspection rd_sdr rd_misc rd_filter_xml NULL -# has problems in m78, in m83 also -# rd reportdesign\qa\complex\reportdesign nmake - all rd_qa_complex NULL - diff --git a/reportdesign/prj/d.lst b/reportdesign/prj/d.lst index d7cc5fad6396..b531c0eed8f0 100644 --- a/reportdesign/prj/d.lst +++ b/reportdesign/prj/d.lst @@ -19,6 +19,3 @@ dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\*.dylib; ..\uiconfig\dbreport\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\dbreport\statusbar\*.xml ..\uiconfig\dbreport\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\dbreport\toolbar\*.xml -..\%__SRC%\misc\rpt.component %_DEST%\xml%_EXT%\rpt.component -..\%__SRC%\misc\rptui.component %_DEST%\xml%_EXT%\rptui.component -..\%__SRC%\misc\rptxml.component %_DEST%\xml%_EXT%\rptxml.component diff --git a/reportdesign/qa/complex/reportdesign/test_documents/RPTCalcTests.odb b/reportdesign/qa/complex/RPTCalcTests.odb Binary files differindex 0e91d633d4e7..0e91d633d4e7 100644..100755 --- a/reportdesign/qa/complex/reportdesign/test_documents/RPTCalcTests.odb +++ b/reportdesign/qa/complex/RPTCalcTests.odb diff --git a/reportdesign/qa/complex/reportdesign/test_documents/RPTWriterTests.odb b/reportdesign/qa/complex/RPTWriterTests.odb Binary files differindex 7099b1abf2b5..86228f457f0b 100644..100755 --- a/reportdesign/qa/complex/reportdesign/test_documents/RPTWriterTests.odb +++ b/reportdesign/qa/complex/RPTWriterTests.odb diff --git a/reportdesign/qa/complex/reportdesign/ReportDesignerTest.java b/reportdesign/qa/complex/ReportDesignerTest.java index 6dfb6f719daf..2a652fa460d9 100644..100755 --- a/reportdesign/qa/complex/reportdesign/ReportDesignerTest.java +++ b/reportdesign/qa/complex/ReportDesignerTest.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -25,7 +25,7 @@ * ************************************************************************/ -package complex.reportdesign; +package complex; import java.io.File; import java.util.ArrayList; @@ -47,30 +47,46 @@ import com.sun.star.uno.UnoRuntime; import com.sun.star.uno.XInterface; import com.sun.star.util.XCloseable; -// import complexlib.ComplexTestCase; -// import util.utils; +// import util.BasicMacroTools; +// import util.DesktopTools; +// import util.dbg; +import complexlib.ComplexTestCase; +import util.utils; import helper.OfficeProvider; import helper.URLHelper; -// import helper.OfficeWatcher; +import helper.OfficeWatcher; import convwatch.DB; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; -import org.openoffice.test.OfficeConnection; -import static org.junit.Assert.*; +// import java.util.Date; +// import java.text.SimpleDateFormat; +// import java.text.ParsePosition; +// import java.sql.Time; +// +// import java.io.BufferedReader; +// import java.io.File; +// import java.io.FileReader; +// import java.io.IOException; +// import java.io.FilenameFilter; +// +// import java.util.Vector; +// +// import helper.AppProvider; +// import java.text.DecimalFormat; +// import util.DynamicClassLoader; +// import java.util.StringTokenizer; + + + class PropertySetHelper { XPropertySet m_xPropertySet; public PropertySetHelper(Object _aObj) { - m_xPropertySet = UnoRuntime.queryInterface(XPropertySet.class, _aObj); + m_xPropertySet = (XPropertySet)UnoRuntime.queryInterface(XPropertySet.class, _aObj); } - + /** get a property and don't convert it @param _sName the string name of the property @@ -136,78 +152,62 @@ class PropertyHelper } } -public class ReportDesignerTest -{ - +public class ReportDesignerTest extends ComplexTestCase { + String mTestDocumentPath; -// public String[] getTestMethodNames() -// { -// return new String[] {"firsttest"}; -// } - - @Before public void before() - { - System.out.println("before"); - // String tempdir = System.getProperty("java.io.tmpdir"); - // - int dummy = 0; - // m_xXMultiServiceFactory = getMSF(); - } - - @After public void after() - { - System.out.println("after"); - } - -// private void checkIfOfficeExists(String _sOfficePathWithTrash) -// { -// String sOfficePath = ""; -// int nIndex = _sOfficePathWithTrash.indexOf("soffice.exe"); -// if (nIndex > 0) -// { -// sOfficePath = _sOfficePathWithTrash.substring(0, nIndex + 11); -// } -// else -// { -// nIndex = _sOfficePathWithTrash.indexOf("soffice"); -// if (nIndex > 0) -// { -// sOfficePath = _sOfficePathWithTrash.substring(0, nIndex + 7); -// } -// } -// -// System.out.println(sOfficePath); -// File sOffice = new File(sOfficePath); -// if (! sOffice.exists()) -// { -// System.out.println("ERROR: There exists no office installation at given path: '" + sOfficePath + "'"); -// System.exit(0); -// } -// } - - - private XDesktop m_xDesktop = null; - public XDesktop getXDesktop() + public String[] getTestMethodNames() { + return new String[] {"firsttest"}; + } - if (m_xDesktop == null) + private void checkIfOfficeExists(String _sOfficePathWithTrash) + { + String sOfficePath = ""; + int nIndex = _sOfficePathWithTrash.indexOf("soffice.exe"); + if (nIndex > 0) { - try + sOfficePath = _sOfficePathWithTrash.substring(0, nIndex + 11); + } + else + { + nIndex = _sOfficePathWithTrash.indexOf("soffice"); + if (nIndex > 0) { - XInterface xInterface = (XInterface) getMSF().createInstance( "com.sun.star.frame.Desktop" ); - m_xDesktop = UnoRuntime.queryInterface(XDesktop.class, xInterface); - assertNotNull("Can't get XDesktop", m_xDesktop); + sOfficePath = _sOfficePathWithTrash.substring(0, nIndex + 7); } - catch (com.sun.star.uno.Exception e) + } + + log.println(sOfficePath); + File sOffice = new File(sOfficePath); + if (! sOffice.exists()) + { + log.println("ERROR: There exists no office installation at given path: '" + sOfficePath + "'"); + System.exit(0); + } + } + + + private static XDesktop m_xDesktop = null; + public static XDesktop getXDesktop() + { + + if (m_xDesktop == null) + { + try { - System.out.println("ERROR: uno.Exception caught"); - System.out.println("Message: " + e.getMessage()); + XInterface xInterface = (XInterface) m_xXMultiServiceFactory.createInstance( "com.sun.star.frame.Desktop" ); + m_xDesktop = (XDesktop) UnoRuntime.queryInterface(XDesktop.class, xInterface); + } + catch (com.sun.star.uno.Exception e) + { + log.println("ERROR: uno.Exception caught"); + log.println("Message: " + e.getMessage()); } } return m_xDesktop; } - + private void showElements(XNameAccess _xNameAccess) { if (_xNameAccess != null) @@ -223,31 +223,32 @@ public class ReportDesignerTest System.out.println("Warning: Given object is null."); } } - - + + private OfficeProvider m_aProvider = null; -// private void startOffice() -// { -// // int tempTime = param.getInt("SingleTimeOut"); -// param.put("TimeOut", new Integer(300000)); -// System.out.println("TimeOut: " + param.getInt("TimeOut")); -// System.out.println("ThreadTimeOut: " + param.getInt("ThreadTimeOut")); -// -// // OfficeProvider aProvider = null; -// m_aProvider = new OfficeProvider(); -// m_xXMultiServiceFactory = (XMultiServiceFactory) m_aProvider.getManager(param); -// param.put("ServiceFactory", m_xXMultiServiceFactory); -// } -// -// private void stopOffice() -// { -// if (m_aProvider != null) -// { -// m_aProvider.closeExistingOffice(param, true); -// m_aProvider = null; -// } -// } + private static XMultiServiceFactory m_xXMultiServiceFactory = null; + private void startOffice() + { + // int tempTime = param.getInt("SingleTimeOut"); + param.put("TimeOut", new Integer(300000)); + System.out.println("TimeOut: " + param.getInt("TimeOut")); + System.out.println("ThreadTimeOut: " + param.getInt("ThreadTimeOut")); + + // OfficeProvider aProvider = null; + m_aProvider = new OfficeProvider(); + m_xXMultiServiceFactory = (XMultiServiceFactory) m_aProvider.getManager(param); + param.put("ServiceFactory", m_xXMultiServiceFactory); + } + private void stopOffice() + { + if (m_aProvider != null) + { + m_aProvider.closeExistingOffice(param, true); + m_aProvider = null; + } + } + private String m_sMailAddress = null; private String m_sUPDMinor; private String m_sCWS_WORK_STAMP; @@ -255,118 +256,158 @@ public class ReportDesignerTest private static final int WRITER = 1; private static final int CALC = 2; - @Test public void firsttest() + public void firsttest() { - // convwatch.GlobalLogWriter.set(log); - - // -------------------- preconditions, try to find an office -------------------- - -// String sAppExecutionCommand = (String) param.get("AppExecutionCommand"); - - String sUser = System.getProperty("user.name"); - System.out.println("user.name='" + sUser + "'"); - - String sVCSID = System.getProperty("VCSID"); - System.out.println("VCSID='" + sVCSID + "'"); - m_sMailAddress = sVCSID + "@openoffice.org"; - System.out.println("Assumed mail address: " + m_sMailAddress); - - m_sUPDMinor = System.getProperty("UPDMINOR"); - m_sCWS_WORK_STAMP = System.getProperty("CWS_WORK_STAMP"); - System.out.println("Current CWS: " + m_sCWS_WORK_STAMP); - System.out.println("Current MWS: " + m_sUPDMinor); - -// sAppExecutionCommand = sAppExecutionCommand.replaceAll( "\\$\\{USERNAME\\}", sUser); -// System.out.println("sAppExecutionCommand='" + sAppExecutionCommand + "'"); -// -// checkIfOfficeExists(sAppExecutionCommand); -// param.put("AppExecutionCommand", new String(sAppExecutionCommand)); - - // --------------------------- Start the given Office --------------------------- - -// startOffice(); - - // ------------------------------ Start a test run ------------------------------ - -// String sCurrentDirectory = System.getProperty("user.dir"); -// System.out.println("Current Dir: " + sCurrentDirectory); -// - String sWriterDocument = TestDocument.getUrl("RPTWriterTests.odb"); - startTestForFile(sWriterDocument, WRITER); - - String sCalcDocument = TestDocument.getUrl("RPTCalcTests.odb"); - startTestForFile(sCalcDocument, CALC); -// catch (AssureException e) -// { -// stopOffice(); -// throw new AssureException(e.getMessage()); -// } -// + convwatch.GlobalLogWriter.set(log); + try + { + + // -------------------- preconditions, try to find an office -------------------- + + String sAppExecutionCommand = (String) param.get("AppExecutionCommand"); + + String sUser = System.getProperty("user.name"); + log.println("user.name='" + sUser + "'"); + + String sVCSID = System.getProperty("VCSID"); + log.println("VCSID='" + sVCSID + "'"); + m_sMailAddress = sVCSID + "@openoffice.org"; + log.println("Assumed mail address: " + m_sMailAddress); + + m_sUPDMinor = System.getProperty("UPDMINOR"); + m_sCWS_WORK_STAMP = System.getProperty("CWS_WORK_STAMP"); + // createDBEntry(); + log.println("Current CWS: " + m_sCWS_WORK_STAMP); + log.println("Current MWS: " + m_sUPDMinor); + + // System.exit(1); + + sAppExecutionCommand = sAppExecutionCommand.replaceAll( "\\$\\{USERNAME\\}", sUser); + log.println("sAppExecutionCommand='" + sAppExecutionCommand + "'"); + + // an other way to replace strings + // sAppExecutionCommand = utils.replaceAll13(sAppExecutionCommand, "${USERNAME}", sUser); + + checkIfOfficeExists(sAppExecutionCommand); + param.put("AppExecutionCommand", new String(sAppExecutionCommand)); + + // --------------------------- Start the given Office --------------------------- + + startOffice(); + + // ------------------------------ Start a test run ------------------------------ + + String sCurrentDirectory = System.getProperty("user.dir"); + log.println("Current Dir: " + sCurrentDirectory); + + String sWriterDocument = sCurrentDirectory + "/" + "RPTWriterTests.odb"; + startTestForFile(sWriterDocument, WRITER); + + String sCalcDocument = sCurrentDirectory + "/" + "RPTCalcTests.odb"; + startTestForFile(sCalcDocument, CALC); + } + catch (AssureException e) + { + stopOffice(); + throw new AssureException(e.getMessage()); + } + // ------------------------------ Office shutdown ------------------------------ -// stopOffice(); + stopOffice(); } - + // ----------------------------------------------------------------------------- private void startTestForFile(String _sDocument, int _nType) { - FileURL aFileURL = new FileURL(_sDocument); - assertTrue("Test File doesn't '" + _sDocument + "'exist.", aFileURL.exists()); - - String sFileURL = _sDocument; // URLHelper.getFileURLFromSystemPath(_sDocument); - System.out.println("File URL: " + sFileURL); - + File aFile = new File(_sDocument); + assure("Test File doesn't '" + _sDocument + "'exist.", aFile.exists()); + + String sFileURL = URLHelper.getFileURLFromSystemPath(_sDocument); + log.println("File URL: " + sFileURL); + XComponent xDocComponent = loadComponent(sFileURL, getXDesktop(), null); - System.out.println("Load done"); - assertNotNull("Can't load document ", xDocComponent); - - + log.println("Load done"); +// context = createUnoService("com.sun.star.sdb.DatabaseContext") +// oDataBase = context.getByName("hh") +// oDBDoc = oDataBase.DatabaseDocument +// +// dim args(1) as new com.sun.star.beans.PropertyValue +// args(0).Name = "ActiveConnection" +// args(0).Value = oDBDoc.getCurrentController().getPropertyValue("ActiveConnection") +// reportContainer = oDBDoc.getReportDocuments() +// report = reportContainer.loadComponentFromURL("Report40","",0,args) + try { - XInterface x = (XInterface)getMSF().createInstance("com.sun.star.sdb.DatabaseContext"); - assertNotNull("can't create instance of com.sun.star.sdb.DatabaseContext", x); - System.out.println("createInstance com.sun.star.sdb.DatabaseContext done"); - - XNameAccess xNameAccess = UnoRuntime.queryInterface(XNameAccess.class, x); + XInterface x = (XInterface)m_xXMultiServiceFactory.createInstance("com.sun.star.sdb.DatabaseContext"); + assure("can't create instance of com.sun.star.sdb.DatabaseContext", x != null); + log.println("createInstance com.sun.star.sdb.DatabaseContext done"); + + XNameAccess xNameAccess = (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class, x); showElements(xNameAccess); Object aObj = xNameAccess.getByName(sFileURL); - - XDocumentDataSource xDataSource = UnoRuntime.queryInterface(XDocumentDataSource.class, aObj); +// log.println("1"); + + // PropertySetHelper aHelper = new PropertySetHelper(aObj); + XDocumentDataSource xDataSource = (XDocumentDataSource)UnoRuntime.queryInterface(XDocumentDataSource.class, aObj); +// Object aDatabaseDocmuent = aHelper.getPropertyValueAsObject("DatabaseDocument"); XOfficeDatabaseDocument xOfficeDBDoc = xDataSource.getDatabaseDocument(); - - assertNotNull("can't access DatabaseDocument", xOfficeDBDoc); - - XModel xDBSource = UnoRuntime.queryInterface(XModel.class, xOfficeDBDoc); + + // XOfficeDatabaseDocument xOfficeDBDoc = (XOfficeDatabaseDocument)UnoRuntime.queryInterface(XOfficeDatabaseDocument.class, aDatabaseDocument); + assure("can't access DatabaseDocument", xOfficeDBDoc != null); +// log.println("2"); + + XModel xDBSource = (XModel)UnoRuntime.queryInterface(XModel.class, xOfficeDBDoc); Object aController = xDBSource.getCurrentController(); - assertNotNull("Controller of xOfficeDatabaseDocument is empty!", aController); - - XDatabaseDocumentUI aDBDocUI = UnoRuntime.queryInterface(XDatabaseDocumentUI.class, aController); - /* boolean isConnect = */ -// TODO: throws an exception in DEV300m78 - aDBDocUI.connect(); - Object aActiveConnectionObj = aDBDocUI.getActiveConnection(); - assertNotNull("ActiveConnection is empty", aActiveConnectionObj); - - XReportDocumentsSupplier xSupplier = UnoRuntime.queryInterface(XReportDocumentsSupplier.class, xOfficeDBDoc); + assure("Controller of xOfficeDatabaseDocument is empty!", aController != null); +// log.println("3"); + + XDatabaseDocumentUI aDBDocUI = (XDatabaseDocumentUI)UnoRuntime.queryInterface(XDatabaseDocumentUI.class, aController); + boolean isConnect = aDBDocUI.connect(); +// if (isConnect) +// { +// System.out.println("true"); +// } +// else +// { +// System.out.println("false"); +// } +// log.println("4"); + + // aHelper = new PropertySetHelper(aController); + + // Object aActiveConnectionObj = aHelper.getPropertyValueAsObject("ActiveConnection"); + Object aActiveConnectionObj = aDBDocUI.getActiveConnection(); + assure("ActiveConnection is empty", aActiveConnectionObj != null); +// log.println("5"); + + XReportDocumentsSupplier xSupplier = (XReportDocumentsSupplier)UnoRuntime.queryInterface(XReportDocumentsSupplier.class, xOfficeDBDoc); xNameAccess = xSupplier.getReportDocuments(); - assertNotNull("xOfficeDatabaseDocument returns no Report Document", xNameAccess); - + assure("xOfficeDatabaseDocument returns no Report Document", xNameAccess != null); +// log.println("5"); + showElements(xNameAccess); - - ArrayList<PropertyValue> aPropertyList = new ArrayList<PropertyValue>(); - + + ArrayList aPropertyList = new ArrayList(); + PropertyValue aActiveConnection = new PropertyValue(); aActiveConnection.Name = "ActiveConnection"; aActiveConnection.Value = aActiveConnectionObj; aPropertyList.add(aActiveConnection); - + loadAndStoreReports(xNameAccess, aPropertyList, _nType); createDBEntry(_nType); } catch(com.sun.star.uno.Exception e) { - fail("ERROR: Exception caught" + e.getMessage()); + log.println("ERROR: Exception caught"); } - + + // String mTestDocumentPath = (String) param.get("TestDocumentPath"); + // System.out.println("mTestDocumentPath: '" + mTestDocumentPath + "'"); + // // workaround for issue using deprecated "DOCPTH" prop + // System.setProperty("DOCPTH", mTestDocumentPath); + // Close the document closeComponent(xDocComponent); } @@ -375,13 +416,13 @@ public class ReportDesignerTest { return getFileFormat(_nType); } - + // ----------------------------------------------------------------------------- private void createDBEntry(int _nType) { // try to connect the database - String sDBConnection = ""; // (String)param.get( convwatch.PropertyName.DB_CONNECTION_STRING ); - System.out.println("DBConnection: " + sDBConnection); + String sDBConnection = (String)param.get( convwatch.PropertyName.DB_CONNECTION_STRING ); + log.println("DBConnection: " + sDBConnection); DB.init(sDBConnection); String sDestinationVersion = m_sCWS_WORK_STAMP; if (sDestinationVersion.length() == 0) @@ -395,12 +436,14 @@ public class ReportDesignerTest String sSpecial = ""; String sFixRefSubDirectory = "ReportDesign_qa_complex_" + getFileFormat(_nType); -// DB.insertinto_documentcompare(sFixRefSubDirectory, "", "fixref", -// sDestinationVersion, sDestinationName, sDestinationCreatorType, -// sDocumentPoolDir, sDocumentPoolName, m_sMailAddress, -// sSpecial); + DB.insertinto_documentcompare(sFixRefSubDirectory, "", "fixref", + sDestinationVersion, sDestinationName, sDestinationCreatorType, + sDocumentPoolDir, sDocumentPoolName, m_sMailAddress, + sSpecial); + // DB.test(); + // System.exit(1); } - + private void loadAndStoreReports(XNameAccess _xNameAccess, ArrayList _aPropertyList, int _nType) { if (_xNameAccess != null) @@ -449,10 +492,10 @@ public class ReportDesignerTest } return sFileType; } - + private String getOutputPath(int _nType) { - String sOutputPath = util.utils.getOfficeTemp/*Dir*/(getMSF());// (String)param.get( convwatch.PropertyName.DOC_COMPARATOR_OUTPUT_PATH ); + String sOutputPath = (String)param.get( convwatch.PropertyName.DOC_COMPARATOR_OUTPUT_PATH ); if (!sOutputPath.endsWith("/") || // construct the output file name !sOutputPath.endsWith("\\")) @@ -462,12 +505,15 @@ public class ReportDesignerTest sOutputPath += "tmp_123"; sOutputPath += System.getProperty("file.separator"); + // sOutputPath += getFileFormat(_nType); + // sOutputPath += System.getProperty("file.separator"); + File aOutputFile = new File(sOutputPath); // create the directory of the given output path aOutputFile.mkdirs(); return sOutputPath; } - + /* store given _xComponent under the given Name in DOC_COMPARATOR_INPUTPATH */ @@ -484,10 +530,10 @@ public class ReportDesignerTest sOutputPath += _sName; sOutputPath += getFormatExtension(_nType); - + String sOutputURL = URLHelper.getFileURLFromSystemPath(sOutputPath); - ArrayList<PropertyValue> aPropertyList = new ArrayList<PropertyValue>(); // set some properties for storeAsURL + ArrayList aPropertyList = new ArrayList(); // set some properties for storeAsURL PropertyValue aFileFormat = new PropertyValue(); aFileFormat.Name = "FilterName"; @@ -500,45 +546,45 @@ public class ReportDesignerTest aPropertyList.add(aOverwrite); // store the document in an other directory - XStorable aStorable = UnoRuntime.queryInterface(XStorable.class, _xComponent); + XStorable aStorable = (XStorable) UnoRuntime.queryInterface( XStorable.class, _xComponent); if (aStorable != null) { - System.out.println("store document as URL: '" + sOutputURL + "'"); + log.println("store document as URL: '" + sOutputURL + "'"); try { aStorable.storeAsURL(sOutputURL, PropertyHelper.createPropertyValueArrayFormArrayList(aPropertyList)); } catch (com.sun.star.io.IOException e) { - System.out.println("ERROR: Exception caught"); - System.out.println("Can't write document URL: '" + sOutputURL + "'"); - System.out.println("Message: " + e.getMessage()); + log.println("ERROR: Exception caught"); + log.println("Can't write document URL: '" + sOutputURL + "'"); + log.println("Message: " + e.getMessage()); } } } - + private XComponent loadComponent(String _sName, Object _xComponent, ArrayList _aPropertyList) { XComponent xDocComponent = null; - XComponentLoader xComponentLoader = UnoRuntime.queryInterface(XComponentLoader.class, _xComponent); + XComponentLoader xComponentLoader = (XComponentLoader) UnoRuntime.queryInterface( XComponentLoader.class, _xComponent ); try { PropertyValue[] aLoadProperties = PropertyHelper.createPropertyValueArrayFormArrayList(_aPropertyList); - System.out.println("Load component: '" + _sName + "'"); + log.println("Load component: '" + _sName + "'"); xDocComponent = xComponentLoader.loadComponentFromURL(_sName, "_blank", 0, aLoadProperties); } catch (com.sun.star.io.IOException e) { - System.out.println("ERROR: Exception caught"); - System.out.println("Can't load document '" + _sName + "'"); - System.out.println("Message: " + e.getMessage()); + log.println("ERROR: Exception caught"); + log.println("Can't load document '" + _sName + "'"); + log.println("Message: " + e.getMessage()); } catch (com.sun.star.lang.IllegalArgumentException e) { - System.out.println("ERROR: Exception caught"); - System.out.println("Illegal Arguments given to loadComponentFromURL."); - System.out.println("Message: " + e.getMessage()); + log.println("ERROR: Exception caught"); + log.println("Illegal Arguments given to loadComponentFromURL."); + log.println("Message: " + e.getMessage()); } return xDocComponent; } @@ -546,39 +592,17 @@ public class ReportDesignerTest private void closeComponent(XComponent _xDoc) { // Close the document - XCloseable xCloseable = UnoRuntime.queryInterface(XCloseable.class, _xDoc); + XCloseable xCloseable = (XCloseable) UnoRuntime.queryInterface(XCloseable.class, _xDoc); try { xCloseable.close(true); } catch (com.sun.star.util.CloseVetoException e) { - System.out.println("ERROR: CloseVetoException caught"); - System.out.println("CloseVetoException occured Can't close document."); - System.out.println("Message: " + e.getMessage()); + log.println("ERROR: CloseVetoException caught"); + log.println("CloseVetoException occured Can't close document."); + log.println("Message: " + e.getMessage()); } } - - - private XMultiServiceFactory getMSF() - { - final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager()); - return xMSF1; - } - - // setup and close connections - @BeforeClass public static void setUpConnection() throws Exception { - System.out.println("setUpConnection()"); - connection.setUp(); - } - - @AfterClass public static void tearDownConnection() - throws InterruptedException, com.sun.star.uno.Exception - { - System.out.println("tearDownConnection()"); - connection.tearDown(); - } - - private static final OfficeConnection connection = new OfficeConnection(); - + } diff --git a/reportdesign/qa/complex/reportdesign/makefile.mk b/reportdesign/qa/complex/makefile.mk index 4174eb02ce3a..9d1b7667c125 100755 --- a/reportdesign/qa/complex/reportdesign/makefile.mk +++ b/reportdesign/qa/complex/makefile.mk @@ -25,38 +25,34 @@ # #************************************************************************* -.IF "$(OOO_SUBSEQUENT_TESTS)" == "" -nothing .PHONY: -.ELSE +PRJ=..$/.. -PRJ = ../../.. PRJNAME = reportdesign -TARGET = qa_complex_reportdesign +PACKAGE = complex +TARGET = rptdesigntest -.IF "$(OOO_JUNIT_JAR)" != "" -PACKAGE = complex/reportdesign +# --- Settings ----------------------------------------------------- -# here store only Files which contain a @Test -JAVATESTFILES = \ - ReportDesignerTest.java +.INCLUDE : settings.mk -# put here all other files -JAVAFILES = $(JAVATESTFILES) \ - TestDocument.java \ - FileURL.java +# --- Files -------------------------------------------------------- -JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar -EXTRAJARFILES = $(OOO_JUNIT_JAR) +JARFILES = ridl.jar jurt.jar unoil.jar juh.jar OOoRunner.jar -# Sample how to debug -# JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y +JAVAFILES = ReportDesignerTest.java -.END +# --- Targets ------------------------------------------------------ -.INCLUDE: settings.mk -.INCLUDE: target.mk -.INCLUDE: installationtest.mk +.INCLUDE : target.mk -ALLTAR : javatest +# JAVADEBUG=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=8502,suspend=y +JAVADEBUG= -.END +MYSQL_CONNECTOR=$(PWD)$/mysql-connector-java-5.0.6-bin.jar +CLASSPATH!:=$(CLASSPATH)$(PATH_SEPERATOR)$(MYSQL_CONNECTOR) + +run: ALLTAR + $(PERL) mysql-connector-exists.pl $(MYSQL_CONNECTOR) +# @echo $(CLASSPATH) +# @echo $(VCSID) + @java $(JAVADEBUG) -cp $(CLASSPATH) -DVCSID=$(VCSID) -DCWS_WORK_STAMP=$(CWS_WORK_STAMP) -DUPDMINOR=$(UPDMINOR) org.openoffice.Runner -ini runner.props diff --git a/reportdesign/qa/complex/reportdesign/mysql-connector-exists.pl b/reportdesign/qa/complex/mysql-connector-exists.pl index 6eefe2bb0639..6eefe2bb0639 100644 --- a/reportdesign/qa/complex/reportdesign/mysql-connector-exists.pl +++ b/reportdesign/qa/complex/mysql-connector-exists.pl diff --git a/reportdesign/qa/complex/reportdesign/FileURL.java b/reportdesign/qa/complex/reportdesign/FileURL.java deleted file mode 100644 index 9d2cdb89bd0e..000000000000 --- a/reportdesign/qa/complex/reportdesign/FileURL.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * ************************************************************************ - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - * ************************************************************************ - */ - -package complex.reportdesign; - -import java.io.File; -import java.net.URI; -import java.net.URISyntaxException; - -/** - * - * @author ll93751 - */ -public class FileURL -{ - String m_sFileURL; - - public FileURL(String _sFileURL) - { - m_sFileURL = _sFileURL; - } - public boolean exists() - { - try - { - final URI aURI = new URI(m_sFileURL); - final File aFile = new File(aURI); - return aFile.exists(); - } - catch (URISyntaxException ex) - { - System.out.println("Error: URI is wrong. '" + m_sFileURL + "': " + ex.getMessage()); - } - return false; - } -} diff --git a/reportdesign/qa/complex/reportdesign/TestDocument.java b/reportdesign/qa/complex/reportdesign/TestDocument.java deleted file mode 100644 index a6e294d4d3ec..000000000000 --- a/reportdesign/qa/complex/reportdesign/TestDocument.java +++ /dev/null @@ -1,41 +0,0 @@ -/************************************************************************* -* -* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* -* Copyright 2000, 2010 Oracle and/or its affiliates. -* -* OpenOffice.org - a multi-platform office productivity suite -* -* This file is part of OpenOffice.org. -* -* OpenOffice.org is free software: you can redistribute it and/or modify -* it under the terms of the GNU Lesser General Public License version 3 -* only, as published by the Free Software Foundation. -* -* OpenOffice.org is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU Lesser General Public License version 3 for more details -* (a copy is included in the LICENSE file that accompanied this code). -* -* You should have received a copy of the GNU Lesser General Public License -* version 3 along with OpenOffice.org. If not, see -* <http://www.openoffice.org/license.html> -* for a copy of the LGPLv3 License. -* -************************************************************************/ - -package complex.reportdesign; - -import java.io.File; -import org.openoffice.test.OfficeFileUrl; - -final class TestDocument -{ - public static String getUrl(String name) - { - return OfficeFileUrl.getAbsolute(new File("test_documents", name)); - } - - private TestDocument() {} -} diff --git a/reportdesign/qa/complex/reportdesign/runner.props b/reportdesign/qa/complex/runner.props index d894366ce006..d894366ce006 100755 --- a/reportdesign/qa/complex/reportdesign/runner.props +++ b/reportdesign/qa/complex/runner.props diff --git a/reportdesign/source/core/api/FixedLine.cxx b/reportdesign/source/core/api/FixedLine.cxx index 6db745085f61..3085c2742083 100644 --- a/reportdesign/source/core/api/FixedLine.cxx +++ b/reportdesign/source/core/api/FixedLine.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -130,7 +130,7 @@ uno::Sequence< ::rtl::OUString > lcl_getLineOptionals() , PROPERTY_CHARWORDMODECOMPLEX , PROPERTY_CHARROTATIONCOMPLEX , PROPERTY_CHARSCALEWIDTHCOMPLEX - , PROPERTY_CHARLOCALECOMPLEX + , PROPERTY_CHARLOCALECOMPLEX }; @@ -139,7 +139,7 @@ uno::Sequence< ::rtl::OUString > lcl_getLineOptionals() DBG_NAME(rpt_OFixedLine) // ----------------------------------------------------------------------------- OFixedLine::OFixedLine(uno::Reference< uno::XComponentContext > const & _xContext) -:FixedLineBase(m_aMutex) +:FixedLineBase(m_aMutex) ,FixedLinePropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),lcl_getLineOptionals()) ,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext) ,m_nOrientation(1) @@ -156,7 +156,7 @@ OFixedLine::OFixedLine(uno::Reference< uno::XComponentContext > const & _xContex ,const uno::Reference< lang::XMultiServiceFactory>& _xFactory ,uno::Reference< drawing::XShape >& _xShape ,sal_Int32 _nOrientation) -:FixedLineBase(m_aMutex) +:FixedLineBase(m_aMutex) ,FixedLinePropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),lcl_getLineOptionals()) ,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext) ,m_nOrientation(_nOrientation) @@ -188,7 +188,7 @@ OFixedLine::OFixedLine(uno::Reference< uno::XComponentContext > const & _xContex } catch(uno::Exception&) { - OSL_FAIL("OFixedLine::OFixedLine: Exception caught!"); + OSL_ENSURE(0,"OFixedLine::OFixedLine: Exception caught!"); } osl_decrementInterlockedCount( &m_refCount ); } @@ -198,6 +198,7 @@ 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) @@ -211,10 +212,10 @@ uno::Any SAL_CALL OFixedLine::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); } // ----------------------------------------------------------------------------- -void SAL_CALL OFixedLine::dispose() throw(uno::RuntimeException) +void SAL_CALL OFixedLine::dispose() throw(uno::RuntimeException) { FixedLinePropertySet::dispose(); - cppu::WeakComponentImplHelperBase::dispose(); + cppu::WeakComponentImplHelperBase::dispose(); } // ----------------------------------------------------------------------------- ::rtl::OUString OFixedLine::getImplementationName_Static( ) throw(uno::RuntimeException) @@ -232,7 +233,7 @@ uno::Sequence< ::rtl::OUString > OFixedLine::getSupportedServiceNames_Static( ) { uno::Sequence< ::rtl::OUString > aServices(1); aServices.getArray()[0] = SERVICE_FIXEDLINE; - + return aServices; } //------------------------------------------------------------------------------ @@ -538,28 +539,28 @@ void SAL_CALL OFixedLine::setSize( const awt::Size& aSize ) throw (beans::Proper return ::rtl::OUString(); } // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OFixedLine::getHyperLinkURL() throw (uno::RuntimeException, beans::UnknownPropertyException) -{ +::rtl::OUString SAL_CALL OFixedLine::getHyperLinkURL() throw (uno::RuntimeException, beans::UnknownPropertyException) +{ throw beans::UnknownPropertyException(); -} -void SAL_CALL OFixedLine::setHyperLinkURL(const ::rtl::OUString & /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException) -{ +} +void SAL_CALL OFixedLine::setHyperLinkURL(const ::rtl::OUString & /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException) +{ throw beans::UnknownPropertyException(); } -::rtl::OUString SAL_CALL OFixedLine::getHyperLinkTarget() throw (uno::RuntimeException, beans::UnknownPropertyException) -{ +::rtl::OUString SAL_CALL OFixedLine::getHyperLinkTarget() throw (uno::RuntimeException, beans::UnknownPropertyException) +{ throw beans::UnknownPropertyException(); -} -void SAL_CALL OFixedLine::setHyperLinkTarget(const ::rtl::OUString & /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException) -{ +} +void SAL_CALL OFixedLine::setHyperLinkTarget(const ::rtl::OUString & /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException) +{ throw beans::UnknownPropertyException(); } -::rtl::OUString SAL_CALL OFixedLine::getHyperLinkName() throw (uno::RuntimeException, beans::UnknownPropertyException) -{ +::rtl::OUString SAL_CALL OFixedLine::getHyperLinkName() throw (uno::RuntimeException, beans::UnknownPropertyException) +{ throw beans::UnknownPropertyException(); -} -void SAL_CALL OFixedLine::setHyperLinkName(const ::rtl::OUString & /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException) -{ +} +void SAL_CALL OFixedLine::setHyperLinkName(const ::rtl::OUString & /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException) +{ throw beans::UnknownPropertyException(); } diff --git a/reportdesign/source/core/api/FixedText.cxx b/reportdesign/source/core/api/FixedText.cxx index 7225803034d5..fbc6dce7e1fd 100644 --- a/reportdesign/source/core/api/FixedText.cxx +++ b/reportdesign/source/core/api/FixedText.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,7 +52,7 @@ uno::Sequence< ::rtl::OUString > lcl_getFixedTextOptionals() DBG_NAME( rpt_OFixedText ) // ----------------------------------------------------------------------------- OFixedText::OFixedText(uno::Reference< uno::XComponentContext > const & _xContext) -:FixedTextBase(m_aMutex) +:FixedTextBase(m_aMutex) ,FixedTextPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),lcl_getFixedTextOptionals()) ,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext) { @@ -64,7 +64,7 @@ OFixedText::OFixedText(uno::Reference< uno::XComponentContext > const & _xContex OFixedText::OFixedText(uno::Reference< uno::XComponentContext > const & _xContext ,const uno::Reference< lang::XMultiServiceFactory>& _xFactory ,uno::Reference< drawing::XShape >& _xShape) -:FixedTextBase(m_aMutex) +:FixedTextBase(m_aMutex) ,FixedTextPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),lcl_getFixedTextOptionals()) ,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext) { @@ -97,8 +97,9 @@ 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) +void SAL_CALL OFixedText::dispose() throw(uno::RuntimeException) { FixedTextPropertySet::dispose(); cppu::WeakComponentImplHelperBase::dispose(); @@ -118,9 +119,10 @@ void SAL_CALL OFixedText::dispose() throw(uno::RuntimeException) //-------------------------------------------------------------------------- uno::Sequence< ::rtl::OUString > OFixedText::getSupportedServiceNames_Static( ) throw(uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aServices(1); + uno::Sequence< ::rtl::OUString > aServices(1);//2); 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/FormatCondition.cxx b/reportdesign/source/core/api/FormatCondition.cxx index 73315be74314..56973d8194ba 100644 --- a/reportdesign/source/core/api/FormatCondition.cxx +++ b/reportdesign/source/core/api/FormatCondition.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,7 +51,7 @@ uno::Reference< uno::XInterface > OFormatCondition::create(uno::Reference< uno:: DBG_NAME( rpt_OFormatCondition ) // ----------------------------------------------------------------------------- OFormatCondition::OFormatCondition(uno::Reference< uno::XComponentContext > const & _xContext) -:FormatConditionBase(m_aMutex) +:FormatConditionBase(m_aMutex) ,FormatConditionPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),uno::Sequence< ::rtl::OUString >()) ,m_bEnabled(sal_True) { @@ -65,10 +65,10 @@ OFormatCondition::~OFormatCondition() // ----------------------------------------------------------------------------- IMPLEMENT_FORWARD_XINTERFACE2(OFormatCondition,FormatConditionBase,FormatConditionPropertySet) // ----------------------------------------------------------------------------- -void SAL_CALL OFormatCondition::dispose() throw(uno::RuntimeException) +void SAL_CALL OFormatCondition::dispose() throw(uno::RuntimeException) { FormatConditionPropertySet::dispose(); - cppu::WeakComponentImplHelperBase::dispose(); + cppu::WeakComponentImplHelperBase::dispose(); } // ----------------------------------------------------------------------------- ::rtl::OUString OFormatCondition::getImplementationName_Static( ) throw(uno::RuntimeException) @@ -86,7 +86,7 @@ uno::Sequence< ::rtl::OUString > OFormatCondition::getSupportedServiceNames_Stat { uno::Sequence< ::rtl::OUString > aServices(1); aServices.getArray()[0] = SERVICE_FORMATCONDITION; - + return aServices; } //-------------------------------------------------------------------------- diff --git a/reportdesign/source/core/api/FormattedField.cxx b/reportdesign/source/core/api/FormattedField.cxx index 237822575de6..b8096cad5853 100644 --- a/reportdesign/source/core/api/FormattedField.cxx +++ b/reportdesign/source/core/api/FormattedField.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,7 +59,7 @@ uno::Sequence< ::rtl::OUString > lcl_getFormattedFieldOptionals() DBG_NAME( rpt_OFormattedField ) // ----------------------------------------------------------------------------- OFormattedField::OFormattedField(uno::Reference< uno::XComponentContext > const & _xContext) -:FormattedFieldBase(m_aMutex) +:FormattedFieldBase(m_aMutex) ,FormattedFieldPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),lcl_getFormattedFieldOptionals()) ,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext) ,m_nFormatKey(0) @@ -71,7 +71,7 @@ OFormattedField::OFormattedField(uno::Reference< uno::XComponentContext > const OFormattedField::OFormattedField(uno::Reference< uno::XComponentContext > const & _xContext ,const uno::Reference< lang::XMultiServiceFactory>& _xFactory ,uno::Reference< drawing::XShape >& _xShape) -:FormattedFieldBase(m_aMutex) +:FormattedFieldBase(m_aMutex) ,FormattedFieldPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),lcl_getFormattedFieldOptionals()) ,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext) ,m_nFormatKey(0) @@ -91,6 +91,7 @@ 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) @@ -105,7 +106,7 @@ uno::Any SAL_CALL OFormattedField::queryInterface( const uno::Type& _rType ) thr } // ----------------------------------------------------------------------------- -void SAL_CALL OFormattedField::dispose() throw(uno::RuntimeException) +void SAL_CALL OFormattedField::dispose() throw(uno::RuntimeException) { FormattedFieldPropertySet::dispose(); cppu::WeakComponentImplHelperBase::dispose(); @@ -129,7 +130,7 @@ uno::Sequence< ::rtl::OUString > OFormattedField::getSupportedServiceNames_Stati uno::Sequence< ::rtl::OUString > aServices(2); aServices.getArray()[0] = SERVICE_FORMATTEDFIELD; aServices.getArray()[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlFormattedFieldModel")); - + return aServices; } //-------------------------------------------------------------------------- @@ -230,7 +231,7 @@ uno::Reference< util::XCloneable > SAL_CALL OFormattedField::createClone( ) thr { uno::Reference< report::XReportComponent> xSource = this; uno::Reference< report::XFormattedField> xSet(cloneObject(xSource,m_aProps.aComponent.m_xFactory,SERVICE_FORMATTEDFIELD),uno::UNO_QUERY_THROW); - + if ( xSet.is() ) { ::std::vector< uno::Reference< report::XFormatCondition> >::iterator aIter = m_aProps.m_aFormatConditions.begin(); diff --git a/reportdesign/source/core/api/Function.cxx b/reportdesign/source/core/api/Function.cxx index 05e52ae6f93c..1752ef615986 100644 --- a/reportdesign/source/core/api/Function.cxx +++ b/reportdesign/source/core/api/Function.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,7 +49,7 @@ uno::Reference< uno::XInterface > OFunction::create(uno::Reference< uno::XCompon DBG_NAME( rpt_OFunction ) // ----------------------------------------------------------------------------- OFunction::OFunction(uno::Reference< uno::XComponentContext > const & _xContext) -:FunctionBase(m_aMutex) +:FunctionBase(m_aMutex) ,FunctionPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),uno::Sequence< ::rtl::OUString >()) ,m_xContext(_xContext) ,m_bPreEvaluated(sal_False) @@ -66,10 +66,10 @@ OFunction::~OFunction() // ----------------------------------------------------------------------------- IMPLEMENT_FORWARD_XINTERFACE2(OFunction,FunctionBase,FunctionPropertySet) // ----------------------------------------------------------------------------- -void SAL_CALL OFunction::dispose() throw(uno::RuntimeException) +void SAL_CALL OFunction::dispose() throw(uno::RuntimeException) { FunctionPropertySet::dispose(); - cppu::WeakComponentImplHelperBase::dispose(); + cppu::WeakComponentImplHelperBase::dispose(); } // ----------------------------------------------------------------------------- ::rtl::OUString OFunction::getImplementationName_Static( ) throw(uno::RuntimeException) @@ -87,7 +87,7 @@ uno::Sequence< ::rtl::OUString > OFunction::getSupportedServiceNames_Static( ) { uno::Sequence< ::rtl::OUString > aServices(1); aServices.getArray()[0] = SERVICE_FUNCTION; - + return aServices; } //-------------------------------------------------------------------------- diff --git a/reportdesign/source/core/api/Functions.cxx b/reportdesign/source/core/api/Functions.cxx index 80a06c85ef61..bce09bf54b03 100644 --- a/reportdesign/source/core/api/Functions.cxx +++ b/reportdesign/source/core/api/Functions.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,20 +49,20 @@ OFunctions::OFunctions(const uno::Reference< report::XFunctionsSupplier >& _xPar DBG_CTOR( rpt_OFunctions,NULL); } //-------------------------------------------------------------------------- -// TODO: VirtualFunctionFinder: This is virtual function! -// +// TODO: VirtualFunctionFinder: This is virtual function! +// OFunctions::~OFunctions() { DBG_DTOR( rpt_OFunctions,NULL); } //-------------------------------------------------------------------------- -void SAL_CALL OFunctions::dispose() throw(uno::RuntimeException) +void SAL_CALL OFunctions::dispose() throw(uno::RuntimeException) { cppu::WeakComponentImplHelperBase::dispose(); } // ----------------------------------------------------------------------------- -// TODO: VirtualFunctionFinder: This is virtual function! -// +// TODO: VirtualFunctionFinder: This is virtual function! +// void SAL_CALL OFunctions::disposing() { ::std::for_each(m_aFunctions.begin(),m_aFunctions.end(),::boost::mem_fn(&com::sun::star::report::XFunction::dispose)); @@ -83,7 +83,7 @@ uno::Reference< report::XFunction > SAL_CALL OFunctions::createFunction( ) thro void SAL_CALL OFunctions::insertByIndex( ::sal_Int32 Index, const uno::Any& aElement ) throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { { - ::osl::MutexGuard aGuard(m_aMutex); + ::osl::MutexGuard aGuard(m_aMutex); sal_Bool bAdd = (Index == static_cast<sal_Int32>(m_aFunctions.size())); if ( !bAdd ) checkIndex(Index); @@ -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); @@ -128,7 +128,7 @@ void SAL_CALL OFunctions::replaceByIndex( ::sal_Int32 Index, const uno::Any& Ele { uno::Any aOldElement; { - ::osl::MutexGuard aGuard(m_aMutex); + ::osl::MutexGuard aGuard(m_aMutex); checkIndex(Index); uno::Reference< report::XFunction > xFunction(Element,uno::UNO_QUERY); if ( !xFunction.is() ) diff --git a/reportdesign/source/core/api/Group.cxx b/reportdesign/source/core/api/Group.cxx index fbcad5aeb276..f57248420880 100644 --- a/reportdesign/source/core/api/Group.cxx +++ b/reportdesign/source/core/api/Group.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,8 +61,8 @@ OGroup::OGroup(const uno::Reference< report::XGroups >& _xParent osl_decrementInterlockedCount( &m_refCount ); } //-------------------------------------------------------------------------- -// TODO: VirtualFunctionFinder: This is virtual function! -// +// TODO: VirtualFunctionFinder: This is virtual function! +// OGroup::~OGroup() { DBG_DTOR( rpt_OGroup,NULL); @@ -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) @@ -109,18 +109,20 @@ sal_Bool SAL_CALL OGroup::supportsService( const ::rtl::OUString& _rServiceName return ::comphelper::existsValue(_rServiceName,getSupportedServiceNames_Static()); } // ----------------------------------------------------------------------------- -void SAL_CALL OGroup::dispose() throw(uno::RuntimeException) +void SAL_CALL OGroup::dispose() throw(uno::RuntimeException) { GroupPropertySet::dispose(); - cppu::WeakComponentImplHelperBase::dispose(); + cppu::WeakComponentImplHelperBase::dispose(); } // ----------------------------------------------------------------------------- -// TODO: VirtualFunctionFinder: This is virtual function! -// +// TODO: VirtualFunctionFinder: This is virtual function! +// 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(); } @@ -148,6 +150,8 @@ 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); } } @@ -163,6 +167,8 @@ 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); } } @@ -174,7 +180,7 @@ uno::Reference< report::XSection > SAL_CALL OGroup::getHeader() throw (container ::osl::MutexGuard aGuard(m_aMutex); xRet = m_xHeader; } - + if ( !xRet.is() ) throw container::NoSuchElementException(); return xRet; @@ -187,7 +193,7 @@ uno::Reference< report::XSection > SAL_CALL OGroup::getFooter() throw (container ::osl::MutexGuard aGuard(m_aMutex); xRet = m_xFooter; } - + if ( !xRet.is() ) throw container::NoSuchElementException(); return xRet; @@ -288,6 +294,7 @@ 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(); } // ----------------------------------------------------------------------------- @@ -321,7 +328,7 @@ void SAL_CALL OGroup::removeVetoableChangeListener( const ::rtl::OUString& Prope GroupPropertySet::removeVetoableChangeListener( PropertyName, aListener ); } // ----------------------------------------------------------------------------- -void OGroup::setSection( const ::rtl::OUString& _sProperty +void OGroup::setSection( const ::rtl::OUString& _sProperty ,const sal_Bool& _bOn ,const ::rtl::OUString& _sName ,uno::Reference< report::XSection>& _member) diff --git a/reportdesign/source/core/api/Groups.cxx b/reportdesign/source/core/api/Groups.cxx index b65d8faf75fe..073894f352bc 100644 --- a/reportdesign/source/core/api/Groups.cxx +++ b/reportdesign/source/core/api/Groups.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,8 +48,8 @@ OGroups::OGroups(const uno::Reference< report::XReportDefinition >& _xParent,con DBG_CTOR( rpt_OGroups,NULL); } //-------------------------------------------------------------------------- -// TODO: VirtualFunctionFinder: This is virtual function! -// +// TODO: VirtualFunctionFinder: This is virtual function! +// OGroups::~OGroups() { DBG_DTOR( rpt_OGroups,NULL); @@ -59,21 +59,21 @@ 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) +void SAL_CALL OGroups::dispose() throw(uno::RuntimeException) { cppu::WeakComponentImplHelperBase::dispose(); } // ----------------------------------------------------------------------------- -// TODO: VirtualFunctionFinder: This is virtual function! -// +// TODO: VirtualFunctionFinder: This is virtual function! +// void SAL_CALL OGroups::disposing() { ::std::for_each(m_aGroups.begin(),m_aGroups.end(),::boost::mem_fn(&com::sun::star::report::XGroup::dispose)); @@ -98,7 +98,7 @@ uno::Reference< report::XGroup > SAL_CALL OGroups::createGroup( ) throw (uno::R void SAL_CALL OGroups::insertByIndex( ::sal_Int32 Index, const uno::Any& aElement ) throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { { - ::osl::MutexGuard aGuard(m_aMutex); + ::osl::MutexGuard aGuard(m_aMutex); sal_Bool bAdd = (Index == static_cast<sal_Int32>(m_aGroups.size())); if ( !bAdd ) checkIndex(Index); @@ -125,7 +125,7 @@ void SAL_CALL OGroups::removeByIndex( ::sal_Int32 Index ) throw (lang::IndexOutO { uno::Reference< report::XGroup > xGroup; { - ::osl::MutexGuard aGuard(m_aMutex); + ::osl::MutexGuard aGuard(m_aMutex); checkIndex(Index); TGroups::iterator aPos = m_aGroups.begin(); ::std::advance(aPos,Index); @@ -141,7 +141,7 @@ void SAL_CALL OGroups::replaceByIndex( ::sal_Int32 Index, const uno::Any& Elemen { uno::Any aOldElement; { - ::osl::MutexGuard aGuard(m_aMutex); + ::osl::MutexGuard aGuard(m_aMutex); checkIndex(Index); uno::Reference< report::XGroup > xGroup(Element,uno::UNO_QUERY); if ( !xGroup.is() ) diff --git a/reportdesign/source/core/api/ImageControl.cxx b/reportdesign/source/core/api/ImageControl.cxx index f1b18970bd22..d7132b80bbb0 100644 --- a/reportdesign/source/core/api/ImageControl.cxx +++ b/reportdesign/source/core/api/ImageControl.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -114,7 +114,7 @@ uno::Sequence< ::rtl::OUString > lcl_getImageOptionals() , PROPERTY_CHARWORDMODECOMPLEX , PROPERTY_CHARROTATIONCOMPLEX , PROPERTY_CHARSCALEWIDTHCOMPLEX - , PROPERTY_CHARLOCALECOMPLEX + , PROPERTY_CHARLOCALECOMPLEX }; return uno::Sequence< ::rtl::OUString >(pProps,SAL_N_ELEMENTS(pProps)); @@ -123,7 +123,7 @@ uno::Sequence< ::rtl::OUString > lcl_getImageOptionals() DBG_NAME( rpt_OImageControl ) // ----------------------------------------------------------------------------- OImageControl::OImageControl(uno::Reference< uno::XComponentContext > const & _xContext) -:ImageControlBase(m_aMutex) +:ImageControlBase(m_aMutex) ,ImageControlPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),lcl_getImageOptionals()) ,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext) ,m_nScaleMode(awt::ImageScaleMode::None) @@ -136,7 +136,7 @@ OImageControl::OImageControl(uno::Reference< uno::XComponentContext > const & _x OImageControl::OImageControl(uno::Reference< uno::XComponentContext > const & _xContext ,const uno::Reference< lang::XMultiServiceFactory>& _xFactory ,uno::Reference< drawing::XShape >& _xShape) -:ImageControlBase(m_aMutex) +:ImageControlBase(m_aMutex) ,ImageControlPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),lcl_getImageOptionals()) ,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext) ,m_nScaleMode(awt::ImageScaleMode::None) @@ -173,7 +173,7 @@ uno::Any SAL_CALL OImageControl::queryInterface( const uno::Type& _rType ) throw } // ----------------------------------------------------------------------------- -void SAL_CALL OImageControl::dispose() throw(uno::RuntimeException) +void SAL_CALL OImageControl::dispose() throw(uno::RuntimeException) { ImageControlPropertySet::dispose(); cppu::WeakComponentImplHelperBase::dispose(); @@ -194,7 +194,7 @@ uno::Sequence< ::rtl::OUString > OImageControl::getSupportedServiceNames_Static( { uno::Sequence< ::rtl::OUString > aServices(1); aServices.getArray()[0] = SERVICE_IMAGECONTROL; - + return aServices; } //------------------------------------------------------------------------------ @@ -218,62 +218,63 @@ 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) -{ - ::osl::MutexGuard aGuard(m_aMutex); - return m_aProps.aFormatProperties.sHyperLinkURL; -} -void SAL_CALL OImageControl::setHyperLinkURL(const ::rtl::OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException) -{ - set(PROPERTY_HYPERLINKURL,the_value,m_aProps.aFormatProperties.sHyperLinkURL); -} -::rtl::OUString SAL_CALL OImageControl::getHyperLinkTarget() throw (uno::RuntimeException, beans::UnknownPropertyException) -{ - ::osl::MutexGuard aGuard(m_aMutex); - return m_aProps.aFormatProperties.sHyperLinkTarget; -} -void SAL_CALL OImageControl::setHyperLinkTarget(const ::rtl::OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException) -{ - set(PROPERTY_HYPERLINKTARGET,the_value,m_aProps.aFormatProperties.sHyperLinkTarget); -} -::rtl::OUString SAL_CALL OImageControl::getHyperLinkName() throw (uno::RuntimeException, beans::UnknownPropertyException) -{ - ::osl::MutexGuard aGuard(m_aMutex); - return m_aProps.aFormatProperties.sHyperLinkName; -} -void SAL_CALL OImageControl::setHyperLinkName(const ::rtl::OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException) -{ - set(PROPERTY_HYPERLINKNAME,the_value,m_aProps.aFormatProperties.sHyperLinkName); +::rtl::OUString SAL_CALL OImageControl::getHyperLinkURL() throw (uno::RuntimeException, beans::UnknownPropertyException) +{ + ::osl::MutexGuard aGuard(m_aMutex); + return m_aProps.aFormatProperties.sHyperLinkURL; +} +void SAL_CALL OImageControl::setHyperLinkURL(const ::rtl::OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException) +{ + set(PROPERTY_HYPERLINKURL,the_value,m_aProps.aFormatProperties.sHyperLinkURL); +} +::rtl::OUString SAL_CALL OImageControl::getHyperLinkTarget() throw (uno::RuntimeException, beans::UnknownPropertyException) +{ + ::osl::MutexGuard aGuard(m_aMutex); + return m_aProps.aFormatProperties.sHyperLinkTarget; +} +void SAL_CALL OImageControl::setHyperLinkTarget(const ::rtl::OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException) +{ + set(PROPERTY_HYPERLINKTARGET,the_value,m_aProps.aFormatProperties.sHyperLinkTarget); +} +::rtl::OUString SAL_CALL OImageControl::getHyperLinkName() throw (uno::RuntimeException, beans::UnknownPropertyException) +{ + ::osl::MutexGuard aGuard(m_aMutex); + return m_aProps.aFormatProperties.sHyperLinkName; +} +void SAL_CALL OImageControl::setHyperLinkName(const ::rtl::OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException) +{ + set(PROPERTY_HYPERLINKNAME,the_value,m_aProps.aFormatProperties.sHyperLinkName); } // ----------------------------------------------------------------------------- -::sal_Int32 SAL_CALL OImageControl::getControlBackground() throw (beans::UnknownPropertyException, uno::RuntimeException) -{ - ::osl::MutexGuard aGuard(m_aMutex); - return m_aProps.aFormatProperties.m_bBackgroundTransparent ? COL_TRANSPARENT : m_aProps.aFormatProperties.nBackgroundColor; -} - +::sal_Int32 SAL_CALL OImageControl::getControlBackground() throw (beans::UnknownPropertyException, uno::RuntimeException) +{ + ::osl::MutexGuard aGuard(m_aMutex); + return m_aProps.aFormatProperties.m_bBackgroundTransparent ? COL_TRANSPARENT : m_aProps.aFormatProperties.nBackgroundColor; +} + void SAL_CALL OImageControl::setControlBackground( ::sal_Int32 _backgroundcolor ) throw (uno::RuntimeException, beans::UnknownPropertyException) -{ +{ sal_Bool bTransparent = _backgroundcolor == static_cast<sal_Int32>(COL_TRANSPARENT); setControlBackgroundTransparent(bTransparent); if ( !bTransparent ) set(PROPERTY_CONTROLBACKGROUND,_backgroundcolor,m_aProps.aFormatProperties.nBackgroundColor); -} - -::sal_Bool SAL_CALL OImageControl::getControlBackgroundTransparent() throw (beans::UnknownPropertyException, uno::RuntimeException) -{ - ::osl::MutexGuard aGuard(m_aMutex); - return m_aProps.aFormatProperties.m_bBackgroundTransparent; -} - -void SAL_CALL OImageControl::setControlBackgroundTransparent( ::sal_Bool _controlbackgroundtransparent ) throw (beans::UnknownPropertyException, uno::RuntimeException) -{ +} + +::sal_Bool SAL_CALL OImageControl::getControlBackgroundTransparent() throw (beans::UnknownPropertyException, uno::RuntimeException) +{ + ::osl::MutexGuard aGuard(m_aMutex); + return m_aProps.aFormatProperties.m_bBackgroundTransparent; +} + +void SAL_CALL OImageControl::setControlBackgroundTransparent( ::sal_Bool _controlbackgroundtransparent ) throw (beans::UnknownPropertyException, uno::RuntimeException) +{ set(PROPERTY_CONTROLBACKGROUNDTRANSPARENT,_controlbackgroundtransparent,m_aProps.aFormatProperties.m_bBackgroundTransparent); if ( _controlbackgroundtransparent ) set(PROPERTY_CONTROLBACKGROUND,static_cast<sal_Int32>(COL_TRANSPARENT),m_aProps.aFormatProperties.nBackgroundColor); -} +} // ----------------------------------------------------------------------------- uno::Reference< beans::XPropertySetInfo > SAL_CALL OImageControl::getPropertySetInfo( ) throw(uno::RuntimeException) diff --git a/reportdesign/source/core/api/ReportComponent.cxx b/reportdesign/source/core/api/ReportComponent.cxx index 6854cec6e635..d43c9032327b 100644 --- a/reportdesign/source/core/api/ReportComponent.cxx +++ b/reportdesign/source/core/api/ReportComponent.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,7 +55,7 @@ void lcl_getDefaultFonts( Font& rLatinFont, Font& rCJKFont, Font& rCTLFont,Langu { LanguageType eLatin = _eLatin; - // If the UI language is Korean, the default Latin font has to + // #108374# / #107782#: If the UI language is Korean, the default Latin font has to // be queried for Korean, too (the Latin language from the document can't be Korean). // This is the same logic as in SwDocShell::InitNew. LanguageType eUiLanguage = Application::GetSettings().GetUILanguage(); @@ -115,6 +115,7 @@ 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 a1617d75d86f..31f5d8127614 100644 --- a/reportdesign/source/core/api/ReportControlModel.cxx +++ b/reportdesign/source/core/api/ReportControlModel.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -85,6 +85,7 @@ 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 935250b9370b..0a1e08b3d8d9 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -25,66 +25,18 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - #include "ReportDefinition.hxx" - -#include "FixedLine.hxx" -#include "FixedText.hxx" -#include "FormattedField.hxx" -#include "Functions.hxx" -#include "Groups.hxx" -#include "ImageControl.hxx" -#include "ReportComponent.hxx" -#include "ReportHelperImpl.hxx" -#include "RptDef.hxx" -#include "RptModel.hxx" -#include "Section.hxx" -#include "Shape.hxx" -#include "Tools.hxx" -#include "UndoEnv.hxx" -#include "core_resource.hrc" -#include "core_resource.hxx" -#include "corestrings.hrc" - -/** === begin UNO includes === **/ #include <com/sun/star/beans/PropertyAttribute.hpp> -#include <com/sun/star/beans/XMultiPropertyStates.hpp> -#include <com/sun/star/chart2/data/DatabaseDataProvider.hpp> -#include <com/sun/star/document/EventObject.hpp> -#include <com/sun/star/document/XEventListener.hpp> -#include <com/sun/star/document/XExporter.hpp> -#include <com/sun/star/document/XFilter.hpp> -#include <com/sun/star/document/XImporter.hpp> -#include <com/sun/star/embed/Aspects.hpp> -#include <com/sun/star/embed/ElementModes.hpp> -#include <com/sun/star/embed/EmbedMapUnits.hpp> -#include <com/sun/star/embed/EntryInitModes.hpp> -#include <com/sun/star/embed/XEmbedPersist.hpp> -#include <com/sun/star/embed/XTransactedObject.hpp> -#include <com/sun/star/frame/FrameSearchFlag.hpp> -#include <com/sun/star/frame/XComponentLoader.hpp> -#include <com/sun/star/io/XActiveDataSource.hpp> -#include <com/sun/star/io/XSeekable.hpp> -#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/report/GroupKeepTogether.hpp> #include <com/sun/star/report/ReportPrintOption.hpp> #include <com/sun/star/report/XFunction.hpp> #include <com/sun/star/sdb/CommandType.hpp> -#include <com/sun/star/sdb/XOfficeDatabaseDocument.hpp> -#include <com/sun/star/style/GraphicLocation.hpp> -#include <com/sun/star/style/NumberingType.hpp> -#include <com/sun/star/style/PageStyleLayout.hpp> -#include <com/sun/star/style/XStyle.hpp> #include <com/sun/star/table/BorderLine.hpp> #include <com/sun/star/table/ShadowFormat.hpp> -#include <com/sun/star/task/ErrorCodeIOException.hpp> -#include <com/sun/star/task/XStatusIndicator.hpp> -#include <com/sun/star/task/XStatusIndicatorFactory.hpp> -#include <com/sun/star/ui/XUIConfigurationStorage.hpp> +#include <com/sun/star/style/PageStyleLayout.hpp> +#include <com/sun/star/style/GraphicLocation.hpp> #include <com/sun/star/xml/AttributeData.hpp> -#include <com/sun/star/xml/sax/XDocumentHandler.hpp> -/** === end UNO includes === **/ - +#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <comphelper/broadcasthelper.hxx> #include <comphelper/documentconstants.hxx> #include <comphelper/genericpropertyset.hxx> @@ -93,111 +45,154 @@ #include <comphelper/namecontainer.hxx> #include <comphelper/namedvaluecollection.hxx> #include <comphelper/numberedcollection.hxx> +#include <comphelper/propertystatecontainer.hxx> #include <comphelper/proparrhlp.hxx> #include <comphelper/property.hxx> #include <comphelper/propertysetinfo.hxx> -#include <comphelper/propertystatecontainer.hxx> -#include <comphelper/seqstream.hxx> #include <comphelper/sequence.hxx> +#include <comphelper/seqstream.hxx> #include <comphelper/storagehelper.hxx> #include <comphelper/uno3.hxx> +#include <com/sun/star/chart2/data/DatabaseDataProvider.hpp> +#include <vcl/svapp.hxx> +#include <vcl/virdev.hxx> +#include <osl/mutex.hxx> +#include <com/sun/star/beans/XMultiPropertyStates.hpp> +#include <com/sun/star/document/EventObject.hpp> +#include <com/sun/star/document/XEventListener.hpp> +#include <com/sun/star/style/XStyle.hpp> +#include <com/sun/star/embed/XTransactedObject.hpp> +#include <com/sun/star/embed/ElementModes.hpp> +#include <com/sun/star/embed/EmbedMapUnits.hpp> +#include <com/sun/star/embed/EntryInitModes.hpp> +#include <com/sun/star/embed/Aspects.hpp> +#include <com/sun/star/io/XActiveDataSource.hpp> +#include <com/sun/star/embed/ElementModes.hpp> +#include <com/sun/star/io/XSeekable.hpp> +#include <com/sun/star/embed/XEmbedPersist.hpp> +#include <com/sun/star/task/XStatusIndicator.hpp> +#include <com/sun/star/task/XStatusIndicatorFactory.hpp> +#include <com/sun/star/ui/XUIConfigurationStorage.hpp> +#include <com/sun/star/document/XExporter.hpp> +#include <com/sun/star/document/XImporter.hpp> +#include <com/sun/star/document/XFilter.hpp> +#include <com/sun/star/task/ErrorCodeIOException.hpp> +#include <com/sun/star/xml/sax/XDocumentHandler.hpp> +#include <com/sun/star/frame/XComponentLoader.hpp> +#include <com/sun/star/frame/FrameSearchFlag.hpp> +#include "corestrings.hrc" +#include "Groups.hxx" +#include "RptDef.hxx" +#include "Section.hxx" +#include "FixedLine.hxx" +#include "core_resource.hrc" +#include "core_resource.hxx" +#include "Tools.hxx" +#include <tools/debug.hxx> +#include <tools/diagnose_ex.h> +#include <unotools/streamwrap.hxx> #include <connectivity/CommonTools.hxx> #include <connectivity/dbconversion.hxx> -#include <connectivity/dbtools.hxx> -#include <cppuhelper/exc_hlp.hxx> -#include <cppuhelper/interfacecontainer.h> -#include <dbaccess/dbaundomanager.hxx> -#include <editeng/paperinf.hxx> #include <framework/titlehelper.hxx> -#include <osl/thread.hxx> +#include <connectivity/dbtools.hxx> +#include <com/sun/star/task/XStatusIndicator.hpp> +#include "Functions.hxx" +#include <boost/mem_fn.hpp> +#include <boost/bind.hpp> +#include <boost/utility.hpp> +#include <unotools/saveopt.hxx> +#include "RptModel.hxx" +#include "UndoEnv.hxx" +#include "FormattedField.hxx" +#include "FixedText.hxx" +#include "ImageControl.hxx" +#include "Shape.hxx" +#include "ReportHelperImpl.hxx" #include <svl/itempool.hxx> -#include <svl/undo.hxx> +#include <unotools/moduleoptions.hxx> +#include <osl/thread.hxx> + +#include <editeng/paperinf.hxx> #include <svx/svdlayer.hxx> -#include <svx/unofill.hxx> #include <svx/xmleohlp.hxx> #include <svx/xmlgrhlp.hxx> -#include <tools/debug.hxx> -#include <tools/diagnose_ex.h> -#include <unotools/moduleoptions.hxx> -#include <unotools/saveopt.hxx> -#include <unotools/streamwrap.hxx> -#include <vcl/svapp.hxx> -#include <vcl/virdev.hxx> - -#include <boost/bind.hpp> -#include <boost/mem_fn.hpp> -#include <boost/utility.hpp> +#include <svx/unofill.hxx> +#include <cppuhelper/interfacecontainer.h> +#include <cppuhelper/exc_hlp.hxx> +#include "ReportComponent.hxx" +#include <com/sun/star/sdb/XOfficeDatabaseDocument.hpp> +#include <com/sun/star/style/NumberingType.hpp> #define MAP_LEN(x) x, sizeof(x) - 1 #define MAP_CHAR_LEN(x) ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(x)) -// page styles -#define SC_UNO_PAGE_GRAPHICFILT "BackGraphicFilter" -#define SC_UNO_PAGE_LEFTBORDER "LeftBorder" -#define SC_UNO_PAGE_RIGHTBORDER "RightBorder" -#define SC_UNO_PAGE_BOTTBORDER "BottomBorder" -#define SC_UNO_PAGE_TOPBORDER "TopBorder" -#define SC_UNO_PAGE_LEFTBRDDIST "LeftBorderDistance" -#define SC_UNO_PAGE_RIGHTBRDDIST "RightBorderDistance" -#define SC_UNO_PAGE_BOTTBRDDIST "BottomBorderDistance" -#define SC_UNO_PAGE_TOPBRDDIST "TopBorderDistance" -#define SC_UNO_PAGE_BORDERDIST "BorderDistance" -#define SC_UNO_PAGE_SHADOWFORM "ShadowFormat" -#define SC_UNO_PAGE_PAPERTRAY "PrinterPaperTray" -#define SC_UNO_PAGE_SCALEVAL "PageScale" -#define SC_UNO_PAGE_SCALETOPAG "ScaleToPages" +// page styles +#define SC_UNO_PAGE_GRAPHICFILT "BackGraphicFilter" +#define SC_UNO_PAGE_LEFTBORDER "LeftBorder" +#define SC_UNO_PAGE_RIGHTBORDER "RightBorder" +#define SC_UNO_PAGE_BOTTBORDER "BottomBorder" +#define SC_UNO_PAGE_TOPBORDER "TopBorder" +#define SC_UNO_PAGE_LEFTBRDDIST "LeftBorderDistance" +#define SC_UNO_PAGE_RIGHTBRDDIST "RightBorderDistance" +#define SC_UNO_PAGE_BOTTBRDDIST "BottomBorderDistance" +#define SC_UNO_PAGE_TOPBRDDIST "TopBorderDistance" +#define SC_UNO_PAGE_BORDERDIST "BorderDistance" +#define SC_UNO_PAGE_SHADOWFORM "ShadowFormat" +#define SC_UNO_PAGE_PAPERTRAY "PrinterPaperTray" +#define SC_UNO_PAGE_SCALEVAL "PageScale" +#define SC_UNO_PAGE_SCALETOPAG "ScaleToPages" #define SC_UNO_PAGE_SCALETOX "ScaleToPagesX" #define SC_UNO_PAGE_SCALETOY "ScaleToPagesY" -#define SC_UNO_PAGE_FIRSTPAGE "FirstPageNumber" -#define SC_UNO_PAGE_LEFTHDRCONT "LeftPageHeaderContent" -#define SC_UNO_PAGE_LEFTFTRCONT "LeftPageFooterContent" -#define SC_UNO_PAGE_RIGHTHDRCON "RightPageHeaderContent" -#define SC_UNO_PAGE_RIGHTFTRCON "RightPageFooterContent" -#define SC_UNO_PAGE_PRINTFORMUL "PrintFormulas" -#define SC_UNO_PAGE_PRINTZERO "PrintZeroValues" -#define SC_UNO_PAGE_HDRBACKCOL "HeaderBackColor" -#define SC_UNO_PAGE_HDRBACKTRAN "HeaderBackTransparent" -#define SC_UNO_PAGE_HDRGRFFILT "HeaderBackGraphicFilter" -#define SC_UNO_PAGE_HDRGRFLOC "HeaderBackGraphicLocation" -#define SC_UNO_PAGE_HDRGRFURL "HeaderBackGraphicURL" -#define SC_UNO_PAGE_HDRLEFTBOR "HeaderLeftBorder" -#define SC_UNO_PAGE_HDRRIGHTBOR "HeaderRightBorder" -#define SC_UNO_PAGE_HDRBOTTBOR "HeaderBottomBorder" -#define SC_UNO_PAGE_HDRTOPBOR "HeaderTopBorder" -#define SC_UNO_PAGE_HDRLEFTBDIS "HeaderLeftBorderDistance" -#define SC_UNO_PAGE_HDRRIGHTBDIS "HeaderRightBorderDistance" -#define SC_UNO_PAGE_HDRBOTTBDIS "HeaderBottomBorderDistance" -#define SC_UNO_PAGE_HDRTOPBDIS "HeaderTopBorderDistance" -#define SC_UNO_PAGE_HDRBRDDIST "HeaderBorderDistance" -#define SC_UNO_PAGE_HDRSHADOW "HeaderShadowFormat" -#define SC_UNO_PAGE_HDRLEFTMAR "HeaderLeftMargin" -#define SC_UNO_PAGE_HDRRIGHTMAR "HeaderRightMargin" -#define SC_UNO_PAGE_HDRBODYDIST "HeaderBodyDistance" -#define SC_UNO_PAGE_HDRHEIGHT "HeaderHeight" -#define SC_UNO_PAGE_HDRON "HeaderIsOn" -#define SC_UNO_PAGE_HDRDYNAMIC "HeaderIsDynamicHeight" -#define SC_UNO_PAGE_HDRSHARED "HeaderIsShared" -#define SC_UNO_PAGE_FTRBACKCOL "FooterBackColor" -#define SC_UNO_PAGE_FTRBACKTRAN "FooterBackTransparent" -#define SC_UNO_PAGE_FTRGRFFILT "FooterBackGraphicFilter" -#define SC_UNO_PAGE_FTRGRFLOC "FooterBackGraphicLocation" -#define SC_UNO_PAGE_FTRGRFURL "FooterBackGraphicURL" -#define SC_UNO_PAGE_FTRLEFTBOR "FooterLeftBorder" -#define SC_UNO_PAGE_FTRRIGHTBOR "FooterRightBorder" -#define SC_UNO_PAGE_FTRBOTTBOR "FooterBottomBorder" -#define SC_UNO_PAGE_FTRTOPBOR "FooterTopBorder" -#define SC_UNO_PAGE_FTRLEFTBDIS "FooterLeftBorderDistance" -#define SC_UNO_PAGE_FTRRIGHTBDIS "FooterRightBorderDistance" -#define SC_UNO_PAGE_FTRBOTTBDIS "FooterBottomBorderDistance" -#define SC_UNO_PAGE_FTRTOPBDIS "FooterTopBorderDistance" -#define SC_UNO_PAGE_FTRBRDDIST "FooterBorderDistance" -#define SC_UNO_PAGE_FTRSHADOW "FooterShadowFormat" -#define SC_UNO_PAGE_FTRLEFTMAR "FooterLeftMargin" -#define SC_UNO_PAGE_FTRRIGHTMAR "FooterRightMargin" -#define SC_UNO_PAGE_FTRBODYDIST "FooterBodyDistance" -#define SC_UNO_PAGE_FTRHEIGHT "FooterHeight" -#define SC_UNO_PAGE_FTRON "FooterIsOn" -#define SC_UNO_PAGE_FTRDYNAMIC "FooterIsDynamicHeight" -#define SC_UNO_PAGE_FTRSHARED "FooterIsShared" +#define SC_UNO_PAGE_FIRSTPAGE "FirstPageNumber" +#define SC_UNO_PAGE_LEFTHDRCONT "LeftPageHeaderContent" +#define SC_UNO_PAGE_LEFTFTRCONT "LeftPageFooterContent" +#define SC_UNO_PAGE_RIGHTHDRCON "RightPageHeaderContent" +#define SC_UNO_PAGE_RIGHTFTRCON "RightPageFooterContent" +#define SC_UNO_PAGE_PRINTFORMUL "PrintFormulas" +#define SC_UNO_PAGE_PRINTZERO "PrintZeroValues" +#define SC_UNO_PAGE_HDRBACKCOL "HeaderBackColor" +#define SC_UNO_PAGE_HDRBACKTRAN "HeaderBackTransparent" +#define SC_UNO_PAGE_HDRGRFFILT "HeaderBackGraphicFilter" +#define SC_UNO_PAGE_HDRGRFLOC "HeaderBackGraphicLocation" +#define SC_UNO_PAGE_HDRGRFURL "HeaderBackGraphicURL" +#define SC_UNO_PAGE_HDRLEFTBOR "HeaderLeftBorder" +#define SC_UNO_PAGE_HDRRIGHTBOR "HeaderRightBorder" +#define SC_UNO_PAGE_HDRBOTTBOR "HeaderBottomBorder" +#define SC_UNO_PAGE_HDRTOPBOR "HeaderTopBorder" +#define SC_UNO_PAGE_HDRLEFTBDIS "HeaderLeftBorderDistance" +#define SC_UNO_PAGE_HDRRIGHTBDIS "HeaderRightBorderDistance" +#define SC_UNO_PAGE_HDRBOTTBDIS "HeaderBottomBorderDistance" +#define SC_UNO_PAGE_HDRTOPBDIS "HeaderTopBorderDistance" +#define SC_UNO_PAGE_HDRBRDDIST "HeaderBorderDistance" +#define SC_UNO_PAGE_HDRSHADOW "HeaderShadowFormat" +#define SC_UNO_PAGE_HDRLEFTMAR "HeaderLeftMargin" +#define SC_UNO_PAGE_HDRRIGHTMAR "HeaderRightMargin" +#define SC_UNO_PAGE_HDRBODYDIST "HeaderBodyDistance" +#define SC_UNO_PAGE_HDRHEIGHT "HeaderHeight" +#define SC_UNO_PAGE_HDRON "HeaderIsOn" +#define SC_UNO_PAGE_HDRDYNAMIC "HeaderIsDynamicHeight" +#define SC_UNO_PAGE_HDRSHARED "HeaderIsShared" +#define SC_UNO_PAGE_FTRBACKCOL "FooterBackColor" +#define SC_UNO_PAGE_FTRBACKTRAN "FooterBackTransparent" +#define SC_UNO_PAGE_FTRGRFFILT "FooterBackGraphicFilter" +#define SC_UNO_PAGE_FTRGRFLOC "FooterBackGraphicLocation" +#define SC_UNO_PAGE_FTRGRFURL "FooterBackGraphicURL" +#define SC_UNO_PAGE_FTRLEFTBOR "FooterLeftBorder" +#define SC_UNO_PAGE_FTRRIGHTBOR "FooterRightBorder" +#define SC_UNO_PAGE_FTRBOTTBOR "FooterBottomBorder" +#define SC_UNO_PAGE_FTRTOPBOR "FooterTopBorder" +#define SC_UNO_PAGE_FTRLEFTBDIS "FooterLeftBorderDistance" +#define SC_UNO_PAGE_FTRRIGHTBDIS "FooterRightBorderDistance" +#define SC_UNO_PAGE_FTRBOTTBDIS "FooterBottomBorderDistance" +#define SC_UNO_PAGE_FTRTOPBDIS "FooterTopBorderDistance" +#define SC_UNO_PAGE_FTRBRDDIST "FooterBorderDistance" +#define SC_UNO_PAGE_FTRSHADOW "FooterShadowFormat" +#define SC_UNO_PAGE_FTRLEFTMAR "FooterLeftMargin" +#define SC_UNO_PAGE_FTRRIGHTMAR "FooterRightMargin" +#define SC_UNO_PAGE_FTRBODYDIST "FooterBodyDistance" +#define SC_UNO_PAGE_FTRHEIGHT "FooterHeight" +#define SC_UNO_PAGE_FTRON "FooterIsOn" +#define SC_UNO_PAGE_FTRDYNAMIC "FooterIsDynamicHeight" +#define SC_UNO_PAGE_FTRSHARED "FooterIsShared" // ============================================================================= namespace reportdesign @@ -243,14 +238,15 @@ void lcl_extractAndStartStatusIndicator( const ::comphelper::MediaDescriptor& _r } catch( const uno::Exception& ) { - OSL_FAIL( "lcl_extractAndStartStatusIndicator: caught an exception!" ); + OSL_ENSURE( sal_False, "lcl_extractAndStartStatusIndicator: caught an exception!" ); +// DBG_UNHANDLED_EXCEPTION(); } } // ----------------------------------------------------------------------------- -typedef ::comphelper::OPropertyStateContainer OStyle_PBASE; +typedef ::comphelper::OPropertyStateContainer OStyle_PBASE; class OStyle; -typedef ::comphelper::OPropertyArrayUsageHelper < OStyle - > OStyle_PABASE; +typedef ::comphelper::OPropertyArrayUsageHelper < OStyle + > OStyle_PABASE; typedef ::cppu::WeakImplHelper2< style::XStyle, beans::XMultiPropertyStates> TStyleBASE; class OStyle : public ::comphelper::OMutexAndBroadcastHelper @@ -321,88 +317,109 @@ 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(PROPERTY_BACKGRAPHICLOCATION, ++i,nBound,::getCppuType((const style::GraphicLocation*)0) ,&eGraphicLocation); - registerPropertyNoMember(PROPERTY_BACKTRANSPARENT, ++i,nBound,::getBooleanCppuType() ,&bTrue); - 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_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(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(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(SC_UNO_PAGE_FTRRIGHTBOR), ++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); + 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,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,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(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_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(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(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(SC_UNO_PAGE_HDRRIGHTBOR), ++i,nBound|nMayBeVoid,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); + 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(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); + 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(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(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); + 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); const ::rtl::OUString sPaperTray(RTL_CONSTASCII_USTRINGPARAM("[From printer settings]")); - 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_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_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,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(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); + 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,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("PrinterName"), ++i,nBound,::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,nBound,::getCppuType((const uno::Sequence<sal_Int8>*)0),&aSe); + registerPropertyNoMember(MAP_CHAR_LEN("PrinterSetup"), ++i,nBound,::getCppuType((const uno::Sequence<sal_Int8>*)0),&aSe); } @@ -470,7 +487,7 @@ void SAL_CALL OStyle::setAllPropertiesToDefault( ) throw (uno::RuntimeException void SAL_CALL OStyle::setPropertiesToDefault( const uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (beans::UnknownPropertyException, uno::RuntimeException) { const ::rtl::OUString* pIter = aPropertyNames.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aPropertyNames.getLength(); + const ::rtl::OUString* pEnd = pIter + aPropertyNames.getLength(); for(;pIter != pEnd;++pIter) setPropertyToDefault(*pIter); } @@ -479,7 +496,7 @@ uno::Sequence< uno::Any > SAL_CALL OStyle::getPropertyDefaults( const uno::Seque { uno::Sequence< uno::Any > aRet(aPropertyNames.getLength()); const ::rtl::OUString* pIter = aPropertyNames.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aPropertyNames.getLength(); + const ::rtl::OUString* pEnd = pIter + aPropertyNames.getLength(); for(sal_Int32 i = 0;pIter != pEnd;++pIter,++i) aRet[i] = getPropertyDefault(*pIter); return aRet; @@ -555,22 +572,22 @@ namespace // ----------------------------------------------------------------------------- struct OReportDefinitionImpl { - uno::WeakReference< uno::XInterface > m_xParent; - ::cppu::OInterfaceContainerHelper m_aStorageChangeListeners; - ::cppu::OInterfaceContainerHelper m_aCloseListener; - ::cppu::OInterfaceContainerHelper m_aModifyListeners; - ::cppu::OInterfaceContainerHelper m_aDocEventListeners; + uno::WeakReference< uno::XInterface > m_xParent; + ::cppu::OInterfaceContainerHelper m_aStorageChangeListeners; + ::cppu::OInterfaceContainerHelper m_aCloseListener; + ::cppu::OInterfaceContainerHelper m_aModifyListeners; + ::cppu::OInterfaceContainerHelper m_aDocEventListeners; ::std::vector< uno::Reference< frame::XController> > m_aControllers; - uno::Sequence< beans::PropertyValue > m_aArgs; - - uno::Reference< report::XGroups > m_xGroups; - uno::Reference< report::XSection> m_xReportHeader; - uno::Reference< report::XSection> m_xReportFooter; - uno::Reference< report::XSection> m_xPageHeader; - uno::Reference< report::XSection> m_xPageFooter; - uno::Reference< report::XSection> m_xDetail; - uno::Reference< embed::XStorage > m_xStorage; - uno::Reference< frame::XController > m_xCurrentController; + uno::Sequence< beans::PropertyValue > m_aArgs; + + uno::Reference< report::XGroups > m_xGroups; + uno::Reference< report::XSection> m_xReportHeader; + uno::Reference< report::XSection> m_xReportFooter; + uno::Reference< report::XSection> m_xPageHeader; + uno::Reference< report::XSection> m_xPageFooter; + uno::Reference< report::XSection> m_xDetail; + uno::Reference< embed::XStorage > m_xStorage; + uno::Reference< frame::XController > m_xCurrentController; uno::Reference< container::XIndexAccess > m_xViewData; uno::Reference< container::XNameAccess > m_xStyles; uno::Reference< container::XNameAccess> m_xXMLNamespaceMap; @@ -591,24 +608,22 @@ struct OReportDefinitionImpl ::boost::shared_ptr< ::comphelper::EmbeddedObjectContainer> m_pObjectContainer; ::boost::shared_ptr<rptui::OReportModel> m_pReportModel; - ::rtl::Reference< ::dbaui::UndoManager > m_pUndoManager; - ::rtl::OUString m_sCaption; - ::rtl::OUString m_sCommand; - ::rtl::OUString m_sFilter; - ::rtl::OUString m_sMimeType; - ::rtl::OUString m_sIdentifier; - ::rtl::OUString m_sDataSourceName; - awt::Size m_aVisualAreaSize; - ::sal_Int64 m_nAspect; - ::sal_Int16 m_nGroupKeepTogether; - ::sal_Int16 m_nPageHeaderOption; - ::sal_Int16 m_nPageFooterOption; - ::sal_Int32 m_nCommandType; - sal_Bool m_bControllersLocked; - sal_Bool m_bModified; - sal_Bool m_bEscapeProcessing; + ::rtl::OUString m_sCaption; + ::rtl::OUString m_sCommand; + ::rtl::OUString m_sFilter; + ::rtl::OUString m_sMimeType; + ::rtl::OUString m_sIdentifier; + ::rtl::OUString m_sDataSourceName; + awt::Size m_aVisualAreaSize; + ::sal_Int64 m_nAspect; + ::sal_Int16 m_nGroupKeepTogether; + ::sal_Int16 m_nPageHeaderOption; + ::sal_Int16 m_nPageFooterOption; + ::sal_Int32 m_nCommandType; + sal_Bool m_bControllersLocked; + sal_Bool m_bModified; + sal_Bool m_bEscapeProcessing; sal_Bool m_bSetModifiedEnabled; - OReportDefinitionImpl(::osl::Mutex& _aMutex) :m_aStorageChangeListeners(_aMutex) ,m_aCloseListener(_aMutex) @@ -732,6 +747,7 @@ OReportDefinition::~OReportDefinition() } // ----------------------------------------------------------------------------- IMPLEMENT_FORWARD_REFCOUNT( OReportDefinition, ReportDefinitionBase ) +//IMPLEMENT_FORWARD_XINTERFACE2(OReportDefinition,ReportDefinitionBase,ReportDefinitionPropertySet) void OReportDefinition::init() { try @@ -749,7 +765,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)); @@ -760,9 +776,6 @@ void OReportDefinition::init() rAdmin.NewLayer(UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "back" ) ), RPT_LAYER_BACK ); rAdmin.NewLayer( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "HiddenLayer" ) ), RPT_LAYER_HIDDEN ); - m_pImpl->m_pUndoManager = new ::dbaui::UndoManager( *this, m_aMutex ); - m_pImpl->m_pReportModel->SetSdrUndoManager( &m_pImpl->m_pUndoManager->GetSfxUndoManager() ); - m_pImpl->m_xFunctions = new OFunctions(this,m_aProps->m_xContext); if ( !m_pImpl->m_xStorage.is() ) m_pImpl->m_xStorage = ::comphelper::OStorageHelper::GetTemporaryStorage(); @@ -777,9 +790,9 @@ void OReportDefinition::init() } m_pImpl->m_pObjectContainer.reset( new comphelper::EmbeddedObjectContainer(m_pImpl->m_xStorage , static_cast<cppu::OWeakObject*>(this) ) ); } - catch ( const uno::Exception& ) + catch(uno::Exception) { - DBG_UNHANDLED_EXCEPTION(); + OSL_ENSURE(0,"Error!"); } } // ----------------------------------------------------------------------------- @@ -813,13 +826,18 @@ 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); // don't dispose, this currently is the task of either the ref count going to // 0, or of the embedded object (if we're embedded, which is the only possible // case so far) - // #i78366# + // #i78366# / 2007-06-18 / frank.schoenheit@sun.com m_pImpl->m_xStorage.clear(); m_pImpl->m_xViewData.clear(); m_pImpl->m_xCurrentController.clear(); @@ -1193,13 +1211,13 @@ void SAL_CALL OReportDefinition::setParent( const uno::Reference< uno::XInterfac // XCloneable uno::Reference< util::XCloneable > SAL_CALL OReportDefinition::createClone( ) throw (uno::RuntimeException) { - OSL_FAIL("Not yet implemented correctly"); + OSL_ENSURE(0,"Not yet implemented correctly"); uno::Reference< report::XReportComponent> xSource = this; uno::Reference< report::XReportDefinition> xSet(cloneObject(xSource,m_aProps->m_xFactory,SERVICE_REPORTDEFINITION),uno::UNO_QUERY_THROW); return xSet.get(); } // ----------------------------------------------------------------------------- -void OReportDefinition::setSection( const ::rtl::OUString& _sProperty +void OReportDefinition::setSection( const ::rtl::OUString& _sProperty ,const sal_Bool& _bOn ,const ::rtl::OUString& _sName ,uno::Reference< report::XSection>& _member) @@ -1260,7 +1278,7 @@ void SAL_CALL OReportDefinition::close( ::sal_Bool _bDeliverOwnership ) throw (u catch( const util::CloseVetoException& ) { throw; } catch( const uno::Exception& ) { - OSL_FAIL( "ODatabaseDocument::impl_closeControllerFrames: caught an unexpected exception!" ); + OSL_ENSURE( sal_False, "ODatabaseDocument::impl_closeControllerFrames: caught an unexpected exception!" ); } } } @@ -1279,21 +1297,10 @@ void SAL_CALL OReportDefinition::close( ::sal_Bool _bDeliverOwnership ) throw (u SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard(m_aMutex); - ::connectivity::checkDisposed( ReportDefinitionBase::rBHelper.bDisposed ); + ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed); ::comphelper::MediaDescriptor aDescriptor( _aArguments ); - - m_pImpl->m_pUndoManager->GetSfxUndoManager().EnableUndo( false ); - try - { - fillArgs(aDescriptor); - m_pImpl->m_pReportModel->SetModified(sal_False); - } - catch ( ... ) - { - m_pImpl->m_pUndoManager->GetSfxUndoManager().EnableUndo( true ); - throw; - } - m_pImpl->m_pUndoManager->GetSfxUndoManager().EnableUndo( true ); + fillArgs(aDescriptor); + m_pImpl->m_pReportModel->SetModified(sal_False); return sal_True; } // ----------------------------------------------------------------------------- @@ -1402,6 +1409,10 @@ 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 ); @@ -1501,7 +1512,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)); @@ -1554,7 +1565,7 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS sWarnFile = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("meta.xml")); } } - } + } // if( !bErr ) if( !bErr ) { @@ -1583,7 +1594,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); @@ -1621,7 +1632,7 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS } catch(uno::Exception) { - OSL_FAIL("Exception Caught: Could not commit report storage!"); + OSL_ENSURE(0,"Exception Caught: Could not commit report storage!"); throw io::IOException(); } @@ -1832,6 +1843,7 @@ void SAL_CALL OReportDefinition::load( const uno::Sequence< beans::PropertyValue else if ( sURL.getLength() ) aStorageSource <<= sURL; else + // TODO: error message throw lang::IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "No input source (URL or InputStream) found." ) ), // TODO: resource @@ -1874,7 +1886,7 @@ void SAL_CALL OReportDefinition::load( const uno::Sequence< beans::PropertyValue { if ( i == nLastOpenMode ) throw lang::WrappedTargetException( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "An error occurred while creating the document storage." ) ), + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "An error occured while creating the document storage." ) ), // TODO: resource *this, ::cppu::getCaughtException() @@ -1897,12 +1909,15 @@ 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 = (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_nAspect = _nAspect; } // ----------------------------------------------------------------------------- @@ -2066,6 +2081,8 @@ 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(); @@ -2080,7 +2097,7 @@ uno::Reference< container::XIndexAccess > SAL_CALL OReportDefinition::getViewDat catch(uno::Exception&) { } - } + } // if ( aIter->is() ) } } @@ -2252,9 +2269,9 @@ uno::Reference< uno::XInterface > SAL_CALL OReportDefinition::createInstanceWith { beans::NamedValue aValue; *pIter >>= aValue; - if( aValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Storage" ) ) ) + 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 )); } @@ -2266,7 +2283,7 @@ uno::Reference< uno::XInterface > SAL_CALL OReportDefinition::createInstance( co ::osl::MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed); uno::Reference< drawing::XShape > xShape; - if ( aServiceSpecifier.indexOf( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.")) ) == 0 ) + if ( aServiceSpecifier.indexOf( ::rtl::OUString::createFromAscii("com.sun.star.report.") ) == 0 ) { if ( aServiceSpecifier == SERVICE_SHAPE ) xShape.set(SvxUnoDrawMSFactory::createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.CustomShape")) ),uno::UNO_QUERY_THROW); @@ -2278,7 +2295,7 @@ uno::Reference< uno::XInterface > SAL_CALL OReportDefinition::createInstance( co else xShape.set(SvxUnoDrawMSFactory::createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.OLE2Shape")) ),uno::UNO_QUERY_THROW); } - else if ( aServiceSpecifier.indexOf( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.")) ) == 0 ) + else if ( aServiceSpecifier.indexOf( ::rtl::OUString::createFromAscii("com.sun.star.form.component.") ) == 0 ) { xShape.set(m_aProps->m_xContext->getServiceManager()->createInstanceWithContext(aServiceSpecifier,m_aProps->m_xContext),uno::UNO_QUERY); } @@ -2310,30 +2327,35 @@ 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") ) ) @@ -2739,7 +2761,7 @@ uno::Reference< frame::XUntitledNumbers > OReportDefinition::impl_getUntitledHel m_pImpl->m_xNumberedControllers = uno::Reference< frame::XUntitledNumbers >(static_cast< ::cppu::OWeakObject* >(pHelper), uno::UNO_QUERY_THROW); pHelper->setOwner (xThis); - pHelper->setUntitledPrefix (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" : "))); + pHelper->setUntitledPrefix (::rtl::OUString::createFromAscii(" : ")); } return m_pImpl->m_xNumberedControllers; @@ -2910,15 +2932,8 @@ uno::Sequence< datatransfer::DataFlavor > SAL_CALL OReportDefinition::getTransfe { return aFlavor.MimeType.equals(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("image/png"))); } - // ----------------------------------------------------------------------------- -uno::Reference< document::XUndoManager > SAL_CALL OReportDefinition::getUndoManager( ) throw (uno::RuntimeException) -{ - ::osl::MutexGuard aGuard( m_aMutex ); - return m_pImpl->m_pUndoManager.get(); -} - - +// ----------------------------------------------------------------------------- // ============================================================================= }// namespace reportdesign // ============================================================================= diff --git a/reportdesign/source/core/api/ReportEngineJFree.cxx b/reportdesign/source/core/api/ReportEngineJFree.cxx index 87d9982b57fe..e5af3f2d8379 100644 --- a/reportdesign/source/core/api/ReportEngineJFree.cxx +++ b/reportdesign/source/core/api/ReportEngineJFree.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -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 isn't in the database yet. + m_xReport->storeToStorage(xTemp,aEmpty); // store to temp file because it may contain information which aren't in the database yet. uno::Sequence< beans::NamedValue > aConvertedProperties(8); sal_Int32 nPos = 0; @@ -262,6 +262,7 @@ 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; } } @@ -332,6 +333,7 @@ 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/ReportVisitor.cxx b/reportdesign/source/core/api/ReportVisitor.cxx index 8ee97e2369c9..d0c17ef9b69f 100644 --- a/reportdesign/source/core/api/ReportVisitor.cxx +++ b/reportdesign/source/core/api/ReportVisitor.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,7 +48,7 @@ void OReportVisitor::start(const uno::Reference< report::XReportDefinition>& _xR m_pTraverseReport->traversePageHeader(_xReportDefinition->getPageHeader()); if ( _xReportDefinition->getReportHeaderOn() ) m_pTraverseReport->traverseReportHeader(_xReportDefinition->getReportHeader()); - + uno::Reference< report::XGroups > xGroups = _xReportDefinition->getGroups(); m_pTraverseReport->traverseGroups(xGroups); const sal_Int32 nCount = xGroups->getCount(); diff --git a/reportdesign/source/core/api/Section.cxx b/reportdesign/source/core/api/Section.cxx index 6c6aba20a81b..1935670dd27c 100644 --- a/reportdesign/source/core/api/Section.cxx +++ b/reportdesign/source/core/api/Section.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -136,10 +136,11 @@ OSection::OSection(const uno::Reference< report::XReportDefinition >& _xParent { DBG_CTOR( rpt_OSection,NULL); init(); + //.getSdrModel()->createNewPage(m_xSection); } //-------------------------------------------------------------------------- -// TODO: VirtualFunctionFinder: This is virtual function! -// +// TODO: VirtualFunctionFinder: This is virtual function! +// OSection::~OSection() { DBG_DTOR( rpt_OSection,NULL); @@ -163,21 +164,43 @@ uno::Any SAL_CALL OSection::queryInterface( const uno::Type& _rType ) throw (uno } // ----------------------------------------------------------------------------- -void SAL_CALL OSection::dispose() throw(uno::RuntimeException) +void SAL_CALL OSection::dispose() throw(uno::RuntimeException) { OSL_ENSURE(!rBHelper.bDisposed,"Already disposed!"); SectionPropertySet::dispose(); - cppu::WeakComponentImplHelperBase::dispose(); - + cppu::WeakComponentImplHelperBase::dispose(); + } // ----------------------------------------------------------------------------- -// TODO: VirtualFunctionFinder: This is virtual function! -// +// TODO: VirtualFunctionFinder: This is virtual function! +// 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) @@ -220,7 +243,7 @@ void OSection::init() { ::comphelper::query_aggregation(m_xProxy,m_xDrawPage); } - + // set ourself as delegator { if ( m_xProxy.is() ) @@ -356,7 +379,7 @@ void SAL_CALL OSection::setNewRowOrCol( ::sal_Int16 _newroworcol ) throw (lang:: ,1 ,m_xContext); checkNotPageHeaderFooter(); - + set(PROPERTY_NEWROWORCOL,_newroworcol,m_nNewRowOrCol); } // ----------------------------------------------------------------------------- @@ -373,7 +396,7 @@ void SAL_CALL OSection::setKeepTogether( ::sal_Bool _keeptogether ) throw (lang: ::osl::MutexGuard aGuard(m_aMutex); checkNotPageHeaderFooter(); } - + set(PROPERTY_KEEPTOGETHER,_keeptogether,m_bKeepTogether); } // ----------------------------------------------------------------------------- @@ -448,7 +471,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; } @@ -481,8 +504,9 @@ 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; } // ----------------------------------------------------------------------------- @@ -492,7 +516,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL OSection::getAvailableReportComponentN const ::std::vector< ::rtl::OUString >& aRet = lcl_getControlModelMap(); const ::rtl::OUString* pRet = aRet.empty() ? 0 : &aRet[0]; - return uno::Sequence< ::rtl::OUString >(pRet, aRet.size()); + return uno::Sequence< ::rtl::OUString >(pRet, aRet.size()); } // ----------------------------------------------------------------------------- // XChild diff --git a/reportdesign/source/core/api/Shape.cxx b/reportdesign/source/core/api/Shape.cxx index 2fa28cd0f81d..c6327bae2841 100644 --- a/reportdesign/source/core/api/Shape.cxx +++ b/reportdesign/source/core/api/Shape.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,8 +53,8 @@ namespace reportdesign using namespace comphelper; uno::Sequence< ::rtl::OUString > lcl_getShapeOptionals() { - ::rtl::OUString pProps[] = { - PROPERTY_DATAFIELD + ::rtl::OUString pProps[] = { + PROPERTY_DATAFIELD ,PROPERTY_CONTROLBACKGROUND ,PROPERTY_CONTROLBACKGROUNDTRANSPARENT }; @@ -64,7 +64,7 @@ uno::Sequence< ::rtl::OUString > lcl_getShapeOptionals() DBG_NAME( rpt_OShape ) // ----------------------------------------------------------------------------- OShape::OShape(uno::Reference< uno::XComponentContext > const & _xContext) -:ShapeBase(m_aMutex) +:ShapeBase(m_aMutex) ,ShapePropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),lcl_getShapeOptionals()) ,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext) ,m_nZOrder(0) @@ -78,7 +78,7 @@ OShape::OShape(uno::Reference< uno::XComponentContext > const & _xContext ,const uno::Reference< lang::XMultiServiceFactory>& _xFactory ,uno::Reference< drawing::XShape >& _xShape ,const ::rtl::OUString& _sServiceName) -:ShapeBase(m_aMutex) +:ShapeBase(m_aMutex) ,ShapePropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),lcl_getShapeOptionals()) ,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext) ,m_nZOrder(0) @@ -122,10 +122,10 @@ uno::Any SAL_CALL OShape::queryInterface( const uno::Type& _rType ) throw (uno:: } // ----------------------------------------------------------------------------- -void SAL_CALL OShape::dispose() throw(uno::RuntimeException) +void SAL_CALL OShape::dispose() throw(uno::RuntimeException) { ShapePropertySet::dispose(); - cppu::WeakComponentImplHelperBase::dispose(); + cppu::WeakComponentImplHelperBase::dispose(); } // ----------------------------------------------------------------------------- ::rtl::OUString OShape::getImplementationName_Static( ) throw(uno::RuntimeException) @@ -143,7 +143,7 @@ uno::Sequence< ::rtl::OUString > OShape::getSupportedServiceNames_Static( ) thr { uno::Sequence< ::rtl::OUString > aServices(1); aServices.getArray()[0] = SERVICE_SHAPE; - + return aServices; } //------------------------------------------------------------------------------ @@ -160,7 +160,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL OShape::getSupportedServiceNames( ) t //------------------------------------------------------------------------------ sal_Bool SAL_CALL OShape::supportsService(const ::rtl::OUString& ServiceName) throw( uno::RuntimeException ) { - + return m_sServiceName == ServiceName || ::comphelper::existsValue(ServiceName,getSupportedServiceNames_Static()); } // ----------------------------------------------------------------------------- @@ -192,7 +192,7 @@ void SAL_CALL OShape::setControlBackgroundTransparent( ::sal_Bool /*_controlback // ----------------------------------------------------------------------------- uno::Reference< beans::XPropertySetInfo > SAL_CALL OShape::getPropertySetInfo( ) throw(uno::RuntimeException) { - + //return ShapePropertySet::getPropertySetInfo(); return cppu::OPropertySetHelper::createPropertySetInfo( getInfoHelper() ); } @@ -322,9 +322,11 @@ 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&) { @@ -343,6 +345,11 @@ 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) { @@ -473,7 +480,7 @@ void SAL_CALL OShape::setTransformation( const drawing::HomogenMatrix3& _transfo { ::osl::MutexGuard aGuard(m_aMutex); m_aProps.aComponent.m_xProperty->getPropertyValue(PROPERTY_CUSTOMSHAPEENGINE) >>= m_CustomShapeEngine; - + return m_CustomShapeEngine; } // ----------------------------------------------------------------------------- diff --git a/reportdesign/source/core/api/Tools.cxx b/reportdesign/source/core/api/Tools.cxx index 99028d9c7e4f..43296d7b2f44 100644 --- a/reportdesign/source/core/api/Tools.cxx +++ b/reportdesign/source/core/api/Tools.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/reportdesign/source/core/api/services.cxx b/reportdesign/source/core/api/services.cxx index 5bbbbad5b1f4..9c500fa9c620 100644 --- a/reportdesign/source/core/api/services.cxx +++ b/reportdesign/source/core/api/services.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -72,11 +72,11 @@ cppu::ImplementationEntry entries[] = { &cppu::createSingleComponentFactory, 0, 0 }, { &OFixedLine::create, &OFixedLine::getImplementationName_Static, &OFixedLine::getSupportedServiceNames_Static, &cppu::createSingleComponentFactory, 0, 0 }, - { 0, 0, 0, 0, 0, 0 } + { 0, 0, 0, 0, 0, 0 } }; } -extern "C" +extern "C" { SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( char const * implName, void * serviceManager, void * registryKey) @@ -91,6 +91,12 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } +SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( + void * serviceManager, void * registryKey) +{ + return cppu::component_writeInfoHelper( + serviceManager, registryKey, entries); +} } // extern "C" /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/inc/FixedLine.hxx b/reportdesign/source/core/inc/FixedLine.hxx index 5ae4790701d2..bc551a8ff136 100644 --- a/reportdesign/source/core/inc/FixedLine.hxx +++ b/reportdesign/source/core/inc/FixedLine.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,32 +39,32 @@ namespace reportdesign { - typedef ::cppu::PropertySetMixin< com::sun::star::report::XFixedLine > FixedLinePropertySet; + typedef ::cppu::PropertySetMixin< com::sun::star::report::XFixedLine > FixedLinePropertySet; typedef ::cppu::WeakComponentImplHelper2< com::sun::star::report::XFixedLine - ,com::sun::star::lang::XServiceInfo > FixedLineBase; + ,com::sun::star::lang::XServiceInfo > FixedLineBase; /** \class OFixedLine Defines the implementation of a \interface com:::sun::star::report::XFixedLine * \ingroup reportdesign_api * */ - class OFixedLine : public comphelper::OBaseMutex, + class OFixedLine : public comphelper::OBaseMutex, public FixedLineBase, public FixedLinePropertySet { friend class OShapeHelper; - OReportControlModel m_aProps; - ::com::sun::star::drawing::LineStyle m_LineStyle; - ::com::sun::star::drawing::LineDash m_LineDash; - sal_Int32 m_nOrientation; - ::sal_Int32 m_LineColor; - ::sal_Int16 m_LineTransparence; - ::sal_Int32 m_LineWidth; + OReportControlModel m_aProps; + ::com::sun::star::drawing::LineStyle m_LineStyle; + ::com::sun::star::drawing::LineDash m_LineDash; + sal_Int32 m_nOrientation; + ::sal_Int32 m_LineColor; + ::sal_Int16 m_LineTransparence; + ::sal_Int32 m_LineWidth; private: OFixedLine(const OFixedLine&); OFixedLine& operator=(const OFixedLine&); - template <typename T> void set( const ::rtl::OUString& _sProperty + template <typename T> void set( const ::rtl::OUString& _sProperty ,const T& _Value ,T& _member) { @@ -116,7 +116,7 @@ namespace reportdesign // XReportControlModel REPORTCONTROLMODEL_HEADER() - + // XFixedLine virtual ::sal_Int32 SAL_CALL getOrientation() throw (::com::sun::star::beans::UnknownPropertyException,::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setOrientation( ::sal_Int32 _orientation ) throw (::com::sun::star::beans::UnknownPropertyException,::com::sun::star::uno::RuntimeException); @@ -139,12 +139,12 @@ namespace reportdesign // XComponent virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) + { cppu::WeakComponentImplHelperBase::addEventListener(aListener); } virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + { cppu::WeakComponentImplHelperBase::removeEventListener(aListener); } diff --git a/reportdesign/source/core/inc/FixedText.hxx b/reportdesign/source/core/inc/FixedText.hxx index f1208c6bf635..0c5aae05c752 100644 --- a/reportdesign/source/core/inc/FixedText.hxx +++ b/reportdesign/source/core/inc/FixedText.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,26 +40,26 @@ namespace reportdesign { - typedef ::cppu::PropertySetMixin< com::sun::star::report::XFixedText > FixedTextPropertySet; + typedef ::cppu::PropertySetMixin< com::sun::star::report::XFixedText > FixedTextPropertySet; typedef ::cppu::WeakComponentImplHelper2< com::sun::star::report::XFixedText - ,com::sun::star::lang::XServiceInfo > FixedTextBase; + ,com::sun::star::lang::XServiceInfo > FixedTextBase; /** \class OFixedText Defines the implementation of a \interface com:::sun::star::report::XFixedText * \ingroup reportdesign_api * */ - class OFixedText : public comphelper::OBaseMutex, + class OFixedText : public comphelper::OBaseMutex, public FixedTextBase, public FixedTextPropertySet { friend class OShapeHelper; - OReportControlModel m_aProps; - ::rtl::OUString m_sLabel; + OReportControlModel m_aProps; + ::rtl::OUString m_sLabel; private: OFixedText(const OFixedText&); OFixedText& operator=(const OFixedText&); - template <typename T> void set( const ::rtl::OUString& _sProperty + template <typename T> void set( const ::rtl::OUString& _sProperty ,const T& _Value ,T& _member) { @@ -125,12 +125,12 @@ namespace reportdesign // XComponent virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) + { cppu::WeakComponentImplHelperBase::addEventListener(aListener); } virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + { cppu::WeakComponentImplHelperBase::removeEventListener(aListener); } diff --git a/reportdesign/source/core/inc/FormatCondition.hxx b/reportdesign/source/core/inc/FormatCondition.hxx index e4698d686655..8a74766f49b4 100644 --- a/reportdesign/source/core/inc/FormatCondition.hxx +++ b/reportdesign/source/core/inc/FormatCondition.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,26 +38,26 @@ namespace reportdesign { - typedef ::cppu::PropertySetMixin< com::sun::star::report::XFormatCondition > FormatConditionPropertySet; + typedef ::cppu::PropertySetMixin< com::sun::star::report::XFormatCondition > FormatConditionPropertySet; typedef ::cppu::WeakComponentImplHelper2< com::sun::star::report::XFormatCondition - ,com::sun::star::lang::XServiceInfo > FormatConditionBase; + ,com::sun::star::lang::XServiceInfo > FormatConditionBase; /** \class OFormatCondition Defines the implementation of a \interface com:::sun::star::report::XFormatCondition * \ingroup reportdesign_api * */ - class OFormatCondition : public comphelper::OBaseMutex, + class OFormatCondition : public comphelper::OBaseMutex, public FormatConditionBase, public FormatConditionPropertySet { - OFormatProperties m_aFormatProperties; - ::rtl::OUString m_sFormula; - sal_Bool m_bEnabled; + OFormatProperties m_aFormatProperties; + ::rtl::OUString m_sFormula; + sal_Bool m_bEnabled; private: OFormatCondition(const OFormatCondition&); OFormatCondition& operator=(const OFormatCondition&); - template <typename T> void set( const ::rtl::OUString& _sProperty + template <typename T> void set( const ::rtl::OUString& _sProperty ,const T& _Value ,T& _member) { @@ -104,12 +104,12 @@ namespace reportdesign REPORTCONTROLFORMAT_HEADER() // XComponent virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) + { cppu::WeakComponentImplHelperBase::addEventListener(aListener); } virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + { cppu::WeakComponentImplHelperBase::removeEventListener(aListener); } }; diff --git a/reportdesign/source/core/inc/FormattedField.hxx b/reportdesign/source/core/inc/FormattedField.hxx index 3c5304417f5f..d47ad7bc90ff 100644 --- a/reportdesign/source/core/inc/FormattedField.hxx +++ b/reportdesign/source/core/inc/FormattedField.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,31 +38,31 @@ #include "ReportHelperDefines.hxx" namespace reportdesign { - typedef ::cppu::PropertySetMixin< com::sun::star::report::XFormattedField > FormattedFieldPropertySet; + typedef ::cppu::PropertySetMixin< com::sun::star::report::XFormattedField > FormattedFieldPropertySet; typedef ::cppu::WeakComponentImplHelper2< com::sun::star::report::XFormattedField - ,com::sun::star::lang::XServiceInfo > FormattedFieldBase; + ,com::sun::star::lang::XServiceInfo > FormattedFieldBase; /** \class OFormattedField Defines the implementation of a \interface com:::sun::star::report::XFormattedField * \ingroup reportdesign_api * */ - class OFormattedField : public comphelper::OBaseMutex, + class OFormattedField : public comphelper::OBaseMutex, public FormattedFieldBase, public FormattedFieldPropertySet { friend class OShapeHelper; - OReportControlModel m_aProps; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > + OReportControlModel m_aProps; + ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > m_xFormatsSupplier; ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunction> m_xFunction; ::sal_Int32 m_nFormatKey; - + private: OFormattedField(const OFormattedField&); OFormattedField& operator=(const OFormattedField&); - template <typename T> void set( const ::rtl::OUString& _sProperty + template <typename T> void set( const ::rtl::OUString& _sProperty ,const T& _Value ,T& _member) { @@ -135,7 +135,7 @@ namespace reportdesign // XReportControlModel REPORTCONTROLMODEL_HEADER() - + // XReportControlFormat REPORTCONTROLFORMAT_HEADER() @@ -150,12 +150,12 @@ namespace reportdesign // XComponent virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) + { cppu::WeakComponentImplHelperBase::addEventListener(aListener); } virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + { cppu::WeakComponentImplHelperBase::removeEventListener(aListener); } diff --git a/reportdesign/source/core/inc/Function.hxx b/reportdesign/source/core/inc/Function.hxx index 21accff689d3..719f911c2bc1 100644 --- a/reportdesign/source/core/inc/Function.hxx +++ b/reportdesign/source/core/inc/Function.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,15 +37,15 @@ namespace reportdesign { - typedef ::cppu::PropertySetMixin< com::sun::star::report::XFunction > FunctionPropertySet; + typedef ::cppu::PropertySetMixin< com::sun::star::report::XFunction > FunctionPropertySet; typedef ::cppu::WeakComponentImplHelper2< com::sun::star::report::XFunction - ,com::sun::star::lang::XServiceInfo > FunctionBase; + ,com::sun::star::lang::XServiceInfo > FunctionBase; /** \class OFunction Defines the implementation of a \interface com:::sun::star::report::XFunction * \ingroup reportdesign_api * */ - class OFunction : public cppu::BaseMutex, + class OFunction : public cppu::BaseMutex, public FunctionBase, public FunctionPropertySet { @@ -53,14 +53,14 @@ namespace reportdesign ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; ::com::sun::star::uno::WeakReference< ::com::sun::star::report::XFunctions > m_xParent; ::rtl::OUString m_sName; - ::rtl::OUString m_sFormula; + ::rtl::OUString m_sFormula; ::sal_Bool m_bPreEvaluated; ::sal_Bool m_bDeepTraversing; private: OFunction(const OFunction&); OFunction& operator=(const OFunction&); - template <typename T> void set( const ::rtl::OUString& _sProperty + template <typename T> void set( const ::rtl::OUString& _sProperty ,const T& _Value ,T& _member) { @@ -110,12 +110,12 @@ namespace reportdesign // XComponent virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) + { cppu::WeakComponentImplHelperBase::addEventListener(aListener); } virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + { cppu::WeakComponentImplHelperBase::removeEventListener(aListener); } diff --git a/reportdesign/source/core/inc/Functions.hxx b/reportdesign/source/core/inc/Functions.hxx index 416ef70460b4..7760392651b8 100644 --- a/reportdesign/source/core/inc/Functions.hxx +++ b/reportdesign/source/core/inc/Functions.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,24 +46,24 @@ namespace reportdesign class OFunctions : public comphelper::OBaseMutex, public FunctionsBase { - typedef ::std::list< ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunction > > TFunctions; - ::cppu::OInterfaceContainerHelper m_aContainerListeners; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; + typedef ::std::list< ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunction > > TFunctions; + ::cppu::OInterfaceContainerHelper m_aContainerListeners; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; ::com::sun::star::uno::WeakReference< ::com::sun::star::report::XFunctionsSupplier > m_xParent; - TFunctions m_aFunctions; + TFunctions m_aFunctions; private: OFunctions& operator=(const OFunctions&); OFunctions(const OFunctions&); void checkIndex(sal_Int32 _nIndex); protected: - // TODO: VirtualFunctionFinder: This is virtual function! - // + // TODO: VirtualFunctionFinder: This is virtual function! + // virtual ~OFunctions(); /** this function is called upon disposing the component */ - // TODO: VirtualFunctionFinder: This is virtual function! - // + // TODO: VirtualFunctionFinder: This is virtual function! + // virtual void SAL_CALL disposing(); public: explicit OFunctions( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunctionsSupplier >& _xParent @@ -89,15 +89,15 @@ namespace reportdesign // XContainer virtual void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - + // XComponent virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) + { cppu::WeakComponentImplHelperBase::addEventListener(aListener); } virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + { cppu::WeakComponentImplHelperBase::removeEventListener(aListener); } }; diff --git a/reportdesign/source/core/inc/Group.hxx b/reportdesign/source/core/inc/Group.hxx index cf43755094c1..b6678c68bf27 100644 --- a/reportdesign/source/core/inc/Group.hxx +++ b/reportdesign/source/core/inc/Group.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,17 +53,17 @@ namespace reportdesign ,public GroupPropertySet { ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - ::com::sun::star::uno::WeakReference< ::com::sun::star::report::XGroups > m_xParent; - ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> m_xHeader; - ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> m_xFooter; + ::com::sun::star::uno::WeakReference< ::com::sun::star::report::XGroups > m_xParent; + ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> m_xHeader; + ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> m_xFooter; ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunctions > m_xFunctions; - ::rptshared::GroupProperties m_aProps; + ::rptshared::GroupProperties m_aProps; private: OGroup& operator=(const OGroup&); OGroup(const OGroup&); - template <typename T> void set( const ::rtl::OUString& _sProperty + template <typename T> void set( const ::rtl::OUString& _sProperty ,const T& _Value ,T& _member) { @@ -78,19 +78,19 @@ namespace reportdesign } l.notify(); } - void setSection( const ::rtl::OUString& _sProperty + void setSection( const ::rtl::OUString& _sProperty ,const sal_Bool& _bOn ,const ::rtl::OUString& _sName ,::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _member); protected: - // TODO: VirtualFunctionFinder: This is virtual function! - // + // TODO: VirtualFunctionFinder: This is virtual function! + // virtual ~OGroup(); /** this function is called upon disposing the component */ - // TODO: VirtualFunctionFinder: This is virtual function! - // + // TODO: VirtualFunctionFinder: This is virtual function! + // virtual void SAL_CALL disposing(); public: OGroup(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroups >& _xParent @@ -105,7 +105,7 @@ namespace reportdesign virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); - + // com::sun::star::beans::XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); @@ -114,7 +114,7 @@ namespace reportdesign virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - + // XGroup virtual ::sal_Bool SAL_CALL getSortAscending() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setSortAscending( ::sal_Bool _sortascending ) throw (::com::sun::star::uno::RuntimeException); @@ -137,7 +137,7 @@ namespace reportdesign virtual void SAL_CALL setStartNewColumn( ::sal_Bool _startnewcolumn ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL getResetPageNumber() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setResetPageNumber( ::sal_Bool _resetpagenumber ) throw (::com::sun::star::uno::RuntimeException); - + //XFunctionsSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunctions > SAL_CALL getFunctions() throw (::com::sun::star::uno::RuntimeException); @@ -147,12 +147,12 @@ namespace reportdesign // XComponent virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) + { cppu::WeakComponentImplHelperBase::addEventListener(aListener); } virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + { cppu::WeakComponentImplHelperBase::removeEventListener(aListener); } diff --git a/reportdesign/source/core/inc/Groups.hxx b/reportdesign/source/core/inc/Groups.hxx index c2ef3bc1b508..c5819cec5279 100644 --- a/reportdesign/source/core/inc/Groups.hxx +++ b/reportdesign/source/core/inc/Groups.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,24 +45,24 @@ namespace reportdesign class OGroups : public comphelper::OBaseMutex, public GroupsBase { - typedef ::std::list< ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup > > TGroups; - ::cppu::OInterfaceContainerHelper m_aContainerListeners; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - ::com::sun::star::uno::WeakReference< ::com::sun::star::report::XReportDefinition > m_xParent; - TGroups m_aGroups; + typedef ::std::list< ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup > > TGroups; + ::cppu::OInterfaceContainerHelper m_aContainerListeners; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; + ::com::sun::star::uno::WeakReference< ::com::sun::star::report::XReportDefinition > m_xParent; + TGroups m_aGroups; private: OGroups& operator=(const OGroups&); OGroups(const OGroups&); void checkIndex(sal_Int32 _nIndex); protected: - // TODO: VirtualFunctionFinder: This is virtual function! - // + // TODO: VirtualFunctionFinder: This is virtual function! + // virtual ~OGroups(); /** this function is called upon disposing the component */ - // TODO: VirtualFunctionFinder: This is virtual function! - // + // TODO: VirtualFunctionFinder: This is virtual function! + // virtual void SAL_CALL disposing(); public: OGroups( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition >& _xParent @@ -92,15 +92,15 @@ namespace reportdesign // XContainer virtual void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - + // XComponent virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) + { cppu::WeakComponentImplHelperBase::addEventListener(aListener); } virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + { cppu::WeakComponentImplHelperBase::removeEventListener(aListener); } }; diff --git a/reportdesign/source/core/inc/ImageControl.hxx b/reportdesign/source/core/inc/ImageControl.hxx index 79ca29ff822c..49daa5ffdc8b 100644 --- a/reportdesign/source/core/inc/ImageControl.hxx +++ b/reportdesign/source/core/inc/ImageControl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,28 +38,28 @@ namespace reportdesign { - typedef ::cppu::PropertySetMixin< com::sun::star::report::XImageControl > ImageControlPropertySet; + typedef ::cppu::PropertySetMixin< com::sun::star::report::XImageControl > ImageControlPropertySet; typedef ::cppu::WeakComponentImplHelper2< com::sun::star::report::XImageControl - ,com::sun::star::lang::XServiceInfo > ImageControlBase; + ,com::sun::star::lang::XServiceInfo > ImageControlBase; /** \class OImageControl Defines the implementation of a \interface com:::sun::star::report::XImageControl * \ingroup reportdesign_api * */ - class OImageControl : public comphelper::OBaseMutex, + class OImageControl : public comphelper::OBaseMutex, public ImageControlBase, public ImageControlPropertySet { friend class OShapeHelper; - OReportControlModel m_aProps; - ::rtl::OUString m_aImageURL; + OReportControlModel m_aProps; + ::rtl::OUString m_aImageURL; sal_Int16 m_nScaleMode; - ::sal_Bool m_bPreserveIRI; + ::sal_Bool m_bPreserveIRI; private: OImageControl(const OImageControl&); OImageControl& operator=(const OImageControl&); - template <typename T> void set( const ::rtl::OUString& _sProperty + template <typename T> void set( const ::rtl::OUString& _sProperty ,const T& _Value ,T& _member) { @@ -129,12 +129,12 @@ namespace reportdesign // XComponent virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) + { cppu::WeakComponentImplHelperBase::addEventListener(aListener); } virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + { cppu::WeakComponentImplHelperBase::removeEventListener(aListener); } diff --git a/reportdesign/source/core/inc/ReportComponent.hxx b/reportdesign/source/core/inc/ReportComponent.hxx index df07fadd0fb9..a2ec036be3dc 100644 --- a/reportdesign/source/core/inc/ReportComponent.hxx +++ b/reportdesign/source/core/inc/ReportComponent.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,12 +43,12 @@ namespace reportdesign { - class OReportComponentProperties + class OReportComponentProperties { public: - ::com::sun::star::uno::WeakReference< ::com::sun::star::container::XChild > m_xParent; + ::com::sun::star::uno::WeakReference< ::com::sun::star::container::XChild > m_xParent; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory; ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > m_xShape; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation > m_xProxy; @@ -56,16 +56,16 @@ namespace reportdesign ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > m_xTypeProvider; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XUnoTunnel > m_xUnoTunnel; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XServiceInfo > m_xServiceInfo; - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aMasterFields; - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aDetailFields; - ::rtl::OUString m_sName; - ::sal_Int32 m_nHeight; - ::sal_Int32 m_nWidth; - ::sal_Int32 m_nPosX; - ::sal_Int32 m_nPosY; - ::sal_Int32 m_nBorderColor; - ::sal_Int16 m_nBorder; - ::sal_Bool m_bPrintRepeatedValues; + ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aMasterFields; + ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aDetailFields; + ::rtl::OUString m_sName; + ::sal_Int32 m_nHeight; + ::sal_Int32 m_nWidth; + ::sal_Int32 m_nPosX; + ::sal_Int32 m_nPosY; + ::sal_Int32 m_nBorderColor; + ::sal_Int16 m_nBorder; + ::sal_Bool m_bPrintRepeatedValues; OReportComponentProperties(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & _xContext ) diff --git a/reportdesign/source/core/inc/ReportControlModel.hxx b/reportdesign/source/core/inc/ReportControlModel.hxx index 44f3b6c1eaa3..1b3f42b67171 100644 --- a/reportdesign/source/core/inc/ReportControlModel.hxx +++ b/reportdesign/source/core/inc/ReportControlModel.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,19 +52,19 @@ namespace reportdesign struct OFormatProperties { - ::sal_Int16 nAlign; - ::com::sun::star::awt::FontDescriptor aFontDescriptor; - ::com::sun::star::awt::FontDescriptor aAsianFontDescriptor; - ::com::sun::star::awt::FontDescriptor aComplexFontDescriptor; + ::sal_Int16 nAlign; + ::com::sun::star::awt::FontDescriptor aFontDescriptor; + ::com::sun::star::awt::FontDescriptor aAsianFontDescriptor; + ::com::sun::star::awt::FontDescriptor aComplexFontDescriptor; ::com::sun::star::lang::Locale aCharLocale; ::com::sun::star::lang::Locale aCharLocaleAsian; ::com::sun::star::lang::Locale aCharLocaleComplex; - ::sal_Int16 nFontEmphasisMark; - ::sal_Int16 nFontRelief; - ::sal_Int32 nTextColor; - ::sal_Int32 nTextLineColor; - ::sal_Int32 nCharUnderlineColor; - ::sal_Int32 nBackgroundColor; + ::sal_Int16 nFontEmphasisMark; + ::sal_Int16 nFontRelief; + ::sal_Int32 nTextColor; + ::sal_Int32 nTextLineColor; + ::sal_Int32 nCharUnderlineColor; + ::sal_Int32 nBackgroundColor; ::rtl::OUString sCharCombinePrefix; ::rtl::OUString sCharCombineSuffix; ::rtl::OUString sHyperLinkURL; @@ -73,17 +73,17 @@ namespace reportdesign ::rtl::OUString sVisitedCharStyleName; ::rtl::OUString sUnvisitedCharStyleName; com::sun::star::style::VerticalAlignment aVerticalAlignment; - ::sal_Int16 nCharEscapement; - ::sal_Int16 nCharCaseMap; - ::sal_Int16 nCharKerning; - ::sal_Int8 nCharEscapementHeight; - ::sal_Bool m_bBackgroundTransparent; - ::sal_Bool bCharFlash; - ::sal_Bool bCharAutoKerning; - ::sal_Bool bCharCombineIsOn; - ::sal_Bool bCharHidden; - ::sal_Bool bCharShadowed; - ::sal_Bool bCharContoured; + ::sal_Int16 nCharEscapement; + ::sal_Int16 nCharCaseMap; + ::sal_Int16 nCharKerning; + ::sal_Int8 nCharEscapementHeight; + ::sal_Bool m_bBackgroundTransparent; + ::sal_Bool bCharFlash; + ::sal_Bool bCharAutoKerning; + ::sal_Bool bCharCombineIsOn; + ::sal_Bool bCharHidden; + ::sal_Bool bCharShadowed; + ::sal_Bool bCharContoured; OFormatProperties(); }; class OReportControlModel @@ -92,16 +92,16 @@ namespace reportdesign OReportControlModel(OReportControlModel&); void operator =(OReportControlModel&); public: - ::cppu::OInterfaceContainerHelper aContainerListeners; - OReportComponentProperties aComponent; - OFormatProperties aFormatProperties; + ::cppu::OInterfaceContainerHelper aContainerListeners; + OReportComponentProperties aComponent; + OFormatProperties aFormatProperties; ::com::sun::star::container::XContainer* m_pOwner; - ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::report::XFormatCondition> > + ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::report::XFormatCondition> > m_aFormatConditions; osl::Mutex& m_rMutex; - ::rtl::OUString aDataField; - ::rtl::OUString aConditionalPrintExpression; - sal_Bool bPrintWhenGroupChange; + ::rtl::OUString aDataField; + ::rtl::OUString aConditionalPrintExpression; + sal_Bool bPrintWhenGroupChange; OReportControlModel(osl::Mutex& _rMutex ,::com::sun::star::container::XContainer* _pOwner diff --git a/reportdesign/source/core/inc/ReportDrawPage.hxx b/reportdesign/source/core/inc/ReportDrawPage.hxx index e8fcc2547b8d..9fc3197c762e 100644 --- a/reportdesign/source/core/inc/ReportDrawPage.hxx +++ b/reportdesign/source/core/inc/ReportDrawPage.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/reportdesign/source/core/inc/ReportEngineJFree.hxx b/reportdesign/source/core/inc/ReportEngineJFree.hxx index b56743807056..43bb35df8451 100644 --- a/reportdesign/source/core/inc/ReportEngineJFree.hxx +++ b/reportdesign/source/core/inc/ReportEngineJFree.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,16 +50,16 @@ namespace reportdesign public ReportEngineBase, public ReportEnginePropertySet { - typedef ::std::multimap< ::rtl::OUString, ::com::sun::star::uno::Any , ::comphelper::UStringMixLess> TComponentMap; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition > m_xReport; - ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator> m_StatusIndicator; + typedef ::std::multimap< ::rtl::OUString, ::com::sun::star::uno::Any , ::comphelper::UStringMixLess> TComponentMap; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; + ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition > m_xReport; + ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator> m_StatusIndicator; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xActiveConnection; - ::sal_Int32 m_nMaxRows; + ::sal_Int32 m_nMaxRows; private: OReportEngineJFree(const OReportEngineJFree&); OReportEngineJFree& operator=(const OReportEngineJFree&); - template <typename T> void set( const ::rtl::OUString& _sProperty + template <typename T> void set( const ::rtl::OUString& _sProperty ,const T& _Value ,T& _member) { @@ -79,11 +79,11 @@ namespace reportdesign ::rtl::OUString getNewOutputName(); protected: - // TODO: VirtualFunctionFinder: This is virtual function! - // + // TODO: VirtualFunctionFinder: This is virtual function! + // virtual ~OReportEngineJFree(); public: - typedef ::comphelper::ImplementationReference< OReportEngineJFree ,::com::sun::star::report::XReportEngine,::com::sun::star::uno::XWeak > TReportEngine; + typedef ::comphelper::ImplementationReference< OReportEngineJFree ,::com::sun::star::report::XReportEngine,::com::sun::star::uno::XWeak > TReportEngine; OReportEngineJFree(const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& context); @@ -126,12 +126,12 @@ namespace reportdesign // XComponent virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) + { cppu::WeakComponentImplHelperBase::addEventListener(aListener); } virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + { cppu::WeakComponentImplHelperBase::removeEventListener(aListener); } }; diff --git a/reportdesign/source/core/inc/ReportHelperImpl.hxx b/reportdesign/source/core/inc/ReportHelperImpl.hxx index 1b5f7d2e78a0..5d27f230e312 100644 --- a/reportdesign/source/core/inc/ReportHelperImpl.hxx +++ b/reportdesign/source/core/inc/ReportHelperImpl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/reportdesign/source/core/inc/ReportUndoFactory.hxx b/reportdesign/source/core/inc/ReportUndoFactory.hxx index 7a9f26d03371..ee4af6f0de02 100644 --- a/reportdesign/source/core/inc/ReportUndoFactory.hxx +++ b/reportdesign/source/core/inc/ReportUndoFactory.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ namespace rptui { class OReportUndoFactory : public SdrUndoFactory { - OModuleClient m_aModuleClient; + OModuleClient m_aModuleClient; ::std::auto_ptr<SdrUndoFactory> m_pUndoFactory; OReportUndoFactory(const OReportUndoFactory&); @@ -68,7 +68,7 @@ namespace rptui virtual SdrUndoAction* CreateUndoMoveLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel, sal_uInt16 nNeuPos1); // page - virtual SdrUndoAction* CreateUndoDeletePage(SdrPage& rPage); + virtual SdrUndoAction* CreateUndoDeletePage(SdrPage& rPage); virtual SdrUndoAction* CreateUndoNewPage(SdrPage& rPage); virtual SdrUndoAction* CreateUndoCopyPage(SdrPage& rPage); virtual SdrUndoAction* CreateUndoSetPageNum(SdrPage& rNewPg, sal_uInt16 nOldPageNum1, sal_uInt16 nNewPageNum1); diff --git a/reportdesign/source/core/inc/RptObjectListener.hxx b/reportdesign/source/core/inc/RptObjectListener.hxx index 0174908452f2..b053be589fde 100644 --- a/reportdesign/source/core/inc/RptObjectListener.hxx +++ b/reportdesign/source/core/inc/RptObjectListener.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,14 +46,14 @@ typedef ::cppu::WeakImplHelper1< ::com::sun::star::beans::XPropertyChangeListene class OObjectListener: public TPropertyChangeListenerHelper { private: - OObjectBase* m_pObject; + OObjectBase* m_pObject; OObjectListener(const OObjectListener&); void operator =(const OObjectListener&); protected: virtual ~OObjectListener(); public: OObjectListener(OObjectBase* _pObject); - + // XEventListener virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException); diff --git a/reportdesign/source/core/inc/Section.hxx b/reportdesign/source/core/inc/Section.hxx index c424b908a4e4..5dbd00c3e9e0 100644 --- a/reportdesign/source/core/inc/Section.hxx +++ b/reportdesign/source/core/inc/Section.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,41 +44,41 @@ namespace reportdesign { - typedef ::cppu::WeakComponentImplHelper3< ::com::sun::star::report::XSection + typedef ::cppu::WeakComponentImplHelper3< ::com::sun::star::report::XSection , ::com::sun::star::lang::XServiceInfo - , ::com::sun::star::lang::XUnoTunnel> SectionBase; + , ::com::sun::star::lang::XUnoTunnel> SectionBase; typedef ::cppu::PropertySetMixin<com::sun::star::report::XSection> SectionPropertySet; class OSection : public comphelper::OMutexAndBroadcastHelper, public SectionBase, public SectionPropertySet { - ::cppu::OInterfaceContainerHelper m_aContainerListeners; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > m_xDrawPage; + ::cppu::OInterfaceContainerHelper m_aContainerListeners; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; + ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > m_xDrawPage; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation > m_xProxy; - ::com::sun::star::uno::WeakReference< ::com::sun::star::report::XGroup > m_xGroup; + ::com::sun::star::uno::WeakReference< ::com::sun::star::report::XGroup > m_xGroup; ::com::sun::star::uno::WeakReference< ::com::sun::star::report::XReportDefinition > m_xReportDefinition; - ::rtl::OUString m_sName; - ::rtl::OUString m_sConditionalPrintExpression; - ::sal_uInt32 m_nHeight; - ::sal_Int32 m_nBackgroundColor; - ::sal_Int16 m_nForceNewPage; - ::sal_Int16 m_nNewRowOrCol; - ::sal_Bool m_bKeepTogether; - ::sal_Bool m_bCanGrow; - ::sal_Bool m_bCanShrink; - ::sal_Bool m_bRepeatSection; - ::sal_Bool m_bVisible; - ::sal_Bool m_bBacktransparent; + ::rtl::OUString m_sName; + ::rtl::OUString m_sConditionalPrintExpression; + ::sal_uInt32 m_nHeight; + ::sal_Int32 m_nBackgroundColor; + ::sal_Int16 m_nForceNewPage; + ::sal_Int16 m_nNewRowOrCol; + ::sal_Bool m_bKeepTogether; + ::sal_Bool m_bCanGrow; + ::sal_Bool m_bCanShrink; + ::sal_Bool m_bRepeatSection; + ::sal_Bool m_bVisible; + ::sal_Bool m_bBacktransparent; bool m_bInRemoveNotify; bool m_bInInsertNotify; - + private: OSection(const OSection&); OSection& operator=(const OSection&); - - template <typename T> void set( const ::rtl::OUString& _sProperty + + template <typename T> void set( const ::rtl::OUString& _sProperty ,const T& _Value ,T& _member) { @@ -101,17 +101,17 @@ namespace reportdesign void init(); protected: - // TODO: VirtualFunctionFinder: This is virtual function! - // + // TODO: VirtualFunctionFinder: This is virtual function! + // virtual ~OSection(); /** this function is called upon disposing the component */ - // TODO: VirtualFunctionFinder: This is virtual function! - // + // TODO: VirtualFunctionFinder: This is virtual function! + // virtual void SAL_CALL disposing(); public: - typedef ::comphelper::ImplementationReference< OSection ,::com::sun::star::report::XSection,::com::sun::star::uno::XWeak > TSection; + typedef ::comphelper::ImplementationReference< OSection ,::com::sun::star::report::XSection,::com::sun::star::uno::XWeak > TSection; OSection(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition >& _xParent ,const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& context,bool _bPageSection=false); @@ -119,7 +119,7 @@ namespace reportdesign ,const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& context,bool _bPageSection=false); DECLARE_XINTERFACE( ) - + // ::com::sun::star::lang::XServiceInfo virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); @@ -185,12 +185,12 @@ namespace reportdesign // XComponent virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) + { cppu::WeakComponentImplHelperBase::addEventListener(aListener); } virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + { cppu::WeakComponentImplHelperBase::removeEventListener(aListener); } diff --git a/reportdesign/source/core/inc/Shape.hxx b/reportdesign/source/core/inc/Shape.hxx index dcef6ae36897..3bb22a9d74f8 100644 --- a/reportdesign/source/core/inc/Shape.hxx +++ b/reportdesign/source/core/inc/Shape.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,15 +40,15 @@ namespace reportdesign { - typedef ::cppu::PropertySetMixin< com::sun::star::report::XShape > ShapePropertySet; + typedef ::cppu::PropertySetMixin< com::sun::star::report::XShape > ShapePropertySet; typedef ::cppu::WeakComponentImplHelper2< com::sun::star::report::XShape - ,com::sun::star::lang::XServiceInfo > ShapeBase; + ,com::sun::star::lang::XServiceInfo > ShapeBase; /** \class OShape Defines the implementation of a \interface com:::sun::star::report::XShape * \ingroup reportdesign_api * */ - class OShape : public comphelper::OBaseMutex, + class OShape : public comphelper::OBaseMutex, public ShapeBase, public ShapePropertySet { @@ -69,7 +69,7 @@ namespace reportdesign OShape(const OShape&); OShape& operator=(const OShape&); - template <typename T> void set( const ::rtl::OUString& _sProperty + template <typename T> void set( const ::rtl::OUString& _sProperty ,const T& _Value ,T& _member) { @@ -146,12 +146,12 @@ namespace reportdesign // XComponent virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) + { cppu::WeakComponentImplHelperBase::addEventListener(aListener); } virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException) - { + { cppu::WeakComponentImplHelperBase::removeEventListener(aListener); } diff --git a/reportdesign/source/core/inc/Tools.hxx b/reportdesign/source/core/inc/Tools.hxx index f61bd095ff2a..81d7a00cf757 100644 --- a/reportdesign/source/core/inc/Tools.hxx +++ b/reportdesign/source/core/inc/Tools.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,6 +50,7 @@ namespace reportdesign if ( _bOn && !_xSection.is() ) _xSection = new OSection(_xParent,_xParent->getContext(),_bPageSection); else if ( !_bOn ) + //_xSection.clear(); ::comphelper::disposeComponent(_xSection); } @@ -95,7 +96,7 @@ namespace reportdesign public: template<typename T> static void setSize(const ::com::sun::star::awt::Size& aSize,T* _pShape) { - OSL_ENSURE(aSize.Width >= 0 && aSize.Height >= 0,"Illegal width or height!"); + OSL_ENSURE(aSize.Width >= 0 && aSize.Height >= 0,"Illegal with or height!"); ::osl::MutexGuard aGuard(_pShape->m_aMutex); if ( _pShape->m_aProps.aComponent.m_xShape.is() ) @@ -117,7 +118,7 @@ namespace reportdesign if ( _pShape->m_aProps.aComponent.m_xShape.is() ) { ::com::sun::star::awt::Size aSize = _pShape->m_aProps.aComponent.m_xShape->getSize(); - OSL_ENSURE(aSize.Width >= 0 && aSize.Height >= 0,"Illegal width or height!"); + OSL_ENSURE(aSize.Width >= 0 && aSize.Height >= 0,"Illegal with or height!"); return aSize; } return ::com::sun::star::awt::Size(_pShape->m_aProps.aComponent.m_nWidth,_pShape->m_aProps.aComponent.m_nHeight); @@ -153,6 +154,7 @@ namespace reportdesign if ( _pShape->m_aProps.aComponent.m_xShape.is() ) { ::com::sun::star::awt::Point aPosition = _pShape->m_aProps.aComponent.m_xShape->getPosition(); +// OSL_ENSURE(aPosition.X >= 0 && aPosition.Y >= 0,"Illegal position!"); return aPosition; } return ::com::sun::star::awt::Point(_pShape->m_aProps.aComponent.m_nPosX,_pShape->m_aProps.aComponent.m_nPosY); @@ -166,7 +168,7 @@ namespace reportdesign if ( xChild.is() ) xChild->setParent(Parent); } - template<typename T> static com::sun::star::uno::Reference< com::sun::star::uno::XInterface > getParent( T* _pShape ) + template<typename T> static com::sun::star::uno::Reference< com::sun::star::uno::XInterface > getParent( T* _pShape ) { ::osl::MutexGuard aGuard(_pShape->m_aMutex); ::com::sun::star::uno::Reference< ::com::sun::star::container::XChild > xChild; diff --git a/reportdesign/source/core/inc/conditionupdater.hxx b/reportdesign/source/core/inc/conditionupdater.hxx index ae7602ca0b82..03f061116545 100644 --- a/reportdesign/source/core/inc/conditionupdater.hxx +++ b/reportdesign/source/core/inc/conditionupdater.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/reportdesign/source/core/inc/core_resource.hrc b/reportdesign/source/core/inc/core_resource.hrc index e565ddc9b9c5..64577312852e 100644 --- a/reportdesign/source/core/inc/core_resource.hrc +++ b/reportdesign/source/core/inc/core_resource.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,26 +33,26 @@ #endif //------------------------------------------------------------------------------ -#define RID_CORE_STRINGS_START RID_RPT_START +#define RID_CORE_STRINGS_START RID_RPT_START //------------------------------------------------------------------------------ //- String-IDs -#define RID_STR_DETAIL ( RID_CORE_STRINGS_START + 0 ) -#define RID_STR_PAGE_HEADER ( RID_CORE_STRINGS_START + 1 ) -#define RID_STR_PAGE_FOOTER ( RID_CORE_STRINGS_START + 2 ) -#define RID_STR_REPORT_HEADER ( RID_CORE_STRINGS_START + 3 ) -#define RID_STR_REPORT_FOOTER ( RID_CORE_STRINGS_START + 4 ) -#define RID_STR_PROPERTY_CHANGE_NOT_ALLOWED ( RID_CORE_STRINGS_START + 5 ) -#define RID_STR_ERROR_WRONG_ARGUMENT ( RID_CORE_STRINGS_START + 6 ) -#define RID_STR_ARGUMENT_IS_NULL ( RID_CORE_STRINGS_START + 7 ) -#define RID_STR_SHAPE ( RID_CORE_STRINGS_START + 8 ) -#define RID_STR_REPORT ( RID_CORE_STRINGS_START + 9 ) -#define RID_STR_IMAGECONTROL ( RID_CORE_STRINGS_START + 10 ) -#define RID_STR_FIXEDTEXT ( RID_CORE_STRINGS_START + 11 ) -#define RID_STR_FORMATTEDFIELD ( RID_CORE_STRINGS_START + 12 ) -#define RID_STR_GROUP_HEADER ( RID_CORE_STRINGS_START + 13 ) -#define RID_STR_GROUP_FOOTER ( RID_CORE_STRINGS_START + 14 ) -#define RID_STR_FIXEDLINE ( RID_CORE_STRINGS_START + 15 ) +#define RID_STR_DETAIL ( RID_CORE_STRINGS_START + 0 ) +#define RID_STR_PAGE_HEADER ( RID_CORE_STRINGS_START + 1 ) +#define RID_STR_PAGE_FOOTER ( RID_CORE_STRINGS_START + 2 ) +#define RID_STR_REPORT_HEADER ( RID_CORE_STRINGS_START + 3 ) +#define RID_STR_REPORT_FOOTER ( RID_CORE_STRINGS_START + 4 ) +#define RID_STR_PROPERTY_CHANGE_NOT_ALLOWED ( RID_CORE_STRINGS_START + 5 ) +#define RID_STR_ERROR_WRONG_ARGUMENT ( RID_CORE_STRINGS_START + 6 ) +#define RID_STR_ARGUMENT_IS_NULL ( RID_CORE_STRINGS_START + 7 ) +#define RID_STR_SHAPE ( RID_CORE_STRINGS_START + 8 ) +#define RID_STR_REPORT ( RID_CORE_STRINGS_START + 9 ) +#define RID_STR_IMAGECONTROL ( RID_CORE_STRINGS_START + 10 ) +#define RID_STR_FIXEDTEXT ( RID_CORE_STRINGS_START + 11 ) +#define RID_STR_FORMATTEDFIELD ( RID_CORE_STRINGS_START + 12 ) +#define RID_STR_GROUP_HEADER ( RID_CORE_STRINGS_START + 13 ) +#define RID_STR_GROUP_FOOTER ( RID_CORE_STRINGS_START + 14 ) +#define RID_STR_FIXEDLINE ( RID_CORE_STRINGS_START + 15 ) #endif // REPORTDESIGN_CORE_RESOURCE_HRC_ diff --git a/reportdesign/source/core/inc/core_resource.hxx b/reportdesign/source/core/inc/core_resource.hxx index 80b9a3228ccb..714771a621ef 100644 --- a/reportdesign/source/core/inc/core_resource.hxx +++ b/reportdesign/source/core/inc/core_resource.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ namespace reportdesign //================================================================== class ResourceManager { - static SimpleResMgr* m_pImpl; + static SimpleResMgr* m_pImpl; private: // no instantiation allowed diff --git a/reportdesign/source/core/misc/conditionalexpression.cxx b/reportdesign/source/core/misc/conditionalexpression.cxx index 1c2d88a546d2..7f3b1d8d07fb 100644 --- a/reportdesign/source/core/misc/conditionalexpression.cxx +++ b/reportdesign/source/core/misc/conditionalexpression.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -67,7 +67,7 @@ namespace rptui if ( pReplace == NULL ) { - OSL_FAIL( "ConditionalExpression::assembleExpression: illegal pattern!" ); + OSL_ENSURE( false, "ConditionalExpression::assembleExpression: illegal pattern!" ); break; } @@ -104,16 +104,16 @@ namespace rptui sal_Int32 nLHSIndex( sMatchExpression.indexOf( sLHSPattern ) ); sal_Int32 nRHSIndex( sMatchExpression.indexOf( sRHSPattern ) ); - // now we should have at most one occurrence of $1 and $2, resp. + // now we should have at most one occurance of $1 and $2, resp. OSL_ENSURE( sMatchExpression.indexOf( sLHSPattern, nLHSIndex + 1 ) == -1, - "ConditionalExpression::matchExpression: unsupported pattern (more than one LHS occurrence)!" ); + "ConditionalExpression::matchExpression: unsupported pattern (more than one LHS occurance)!" ); OSL_ENSURE( sMatchExpression.indexOf( sRHSPattern, nRHSIndex + 1 ) == -1, - "ConditionalExpression::matchExpression: unsupported pattern (more than one RHS occurrence)!" ); + "ConditionalExpression::matchExpression: unsupported pattern (more than one RHS occurance)!" ); // Also, an LHS must be present, and precede the RHS (if present) OSL_ENSURE( ( nLHSIndex != -1 ) && ( ( nLHSIndex < nRHSIndex ) || ( nRHSIndex == -1 ) ), "ConditionalExpression::matchExpression: no LHS, or an RHS preceeding the LHS - this is not supported!" ); - // up to the occurrence of the LHS (which must exist, see above), the two expressions + // up to the occurance of the LHS (which must exist, see above), the two expressions // must be identical if ( _rExpression.getLength() < nLHSIndex ) return false; @@ -123,7 +123,7 @@ namespace rptui // the left-most expression parts do not match return false; - // after the occurrence of the RHS (or the LHS, if there is no RHS), the two expressions + // after the occurance of the RHS (or the LHS, if there is no RHS), the two expressions // must be identical, too bool bHaveRHS( nRHSIndex != -1 ); sal_Int32 nRightMostIndex( bHaveRHS ? nRHSIndex : nLHSIndex ); diff --git a/reportdesign/source/core/misc/conditionupdater.cxx b/reportdesign/source/core/misc/conditionupdater.cxx index ed02acdb254f..8d7fcd2dc23b 100644 --- a/reportdesign/source/core/misc/conditionupdater.cxx +++ b/reportdesign/source/core/misc/conditionupdater.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -70,7 +70,7 @@ namespace rptui return; Reference< XReportControlModel > xRptControlModel( _rEvent.Source, UNO_QUERY ); - if ( xRptControlModel.is() && _rEvent.PropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DataField" ) ) ) + if ( xRptControlModel.is() && _rEvent.PropertyName.equalsAscii( "DataField" ) ) { ::rtl::OUString sOldDataSource, sNewDataSource; OSL_VERIFY( _rEvent.OldValue >>= sOldDataSource ); diff --git a/reportdesign/source/core/misc/reportformula.cxx b/reportdesign/source/core/misc/reportformula.cxx index 635138902d00..7acea859ba49 100644 --- a/reportdesign/source/core/misc/reportformula.cxx +++ b/reportdesign/source/core/misc/reportformula.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -99,7 +99,7 @@ namespace rptui } break; default: - OSL_FAIL( "ReportFormula::ReportFormula: illegal bind type!" ); + OSL_ENSURE( false, "ReportFormula::ReportFormula: illegal bind type!" ); return; } @@ -146,7 +146,7 @@ namespace rptui bool bIsField = ( getType() == Field ); ::rtl::OUStringBuffer aFieldContent; if ( bIsField ) - aFieldContent.appendAscii( "[" ); + aFieldContent.appendAscii( "[" ); aFieldContent.append( getUndecoratedContent() ); if ( bIsField ) aFieldContent.appendAscii( "]" ); @@ -154,9 +154,9 @@ namespace rptui return aFieldContent.makeStringAndClear(); } //-------------------------------------------------------------------- - const ::rtl::OUString& ReportFormula::getUndecoratedContent() const - { - return m_sUndecoratedContent; + const ::rtl::OUString& ReportFormula::getUndecoratedContent() const + { + return m_sUndecoratedContent; } const ::rtl::OUString& ReportFormula::getCompleteFormula() const { return m_sCompleteFormula; } bool ReportFormula::isValid() const { return getType() != Invalid; } diff --git a/reportdesign/source/core/resource/core_resource.cxx b/reportdesign/source/core/resource/core_resource.cxx index c854a9987742..c7e6641e5f56 100644 --- a/reportdesign/source/core/resource/core_resource.cxx +++ b/reportdesign/source/core/resource/core_resource.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,11 +62,12 @@ namespace reportdesign if (!m_pImpl) { // now that we have an impl class make sure it's deleted on unloading the library - static ResourceManager::EnsureDelete s_aDeleteTheImplClass; - + static ResourceManager::EnsureDelete s_aDeleteTheImplClass; + ::com::sun::star::lang::Locale aLocale = Application::GetSettings().GetUILocale(); - m_pImpl = SimpleResMgr::Create("rpt", aLocale); + rtl::OString sResLibName = rtl::OString( "rpt" ); + m_pImpl = SimpleResMgr::Create(sResLibName, aLocale); } } diff --git a/reportdesign/source/core/resource/strings.src b/reportdesign/source/core/resource/strings.src index bdc63648633a..f7d3d3a764aa 100644 --- a/reportdesign/source/core/resource/strings.src +++ b/reportdesign/source/core/resource/strings.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,32 +31,26 @@ String RID_STR_DETAIL { Text [ en-US ] = "Detail"; }; - String RID_STR_PAGE_HEADER { Text [ en-US ] = "Page Header"; }; - String RID_STR_PAGE_FOOTER { Text [ en-US ] = "Page Footer"; }; - String RID_STR_GROUP_HEADER { Text [ en-US ] = "Group Header"; }; - String RID_STR_GROUP_FOOTER { Text [ en-US ] = "Group Footer"; }; - String RID_STR_REPORT_HEADER { Text [ en-US ] = "Report Header"; }; - String RID_STR_REPORT_FOOTER { Text [ en-US ] = "Report Footer"; @@ -71,37 +65,30 @@ String RID_STR_ERROR_WRONG_ARGUMENT { Text [ en-US ] = "You tried to set an illegal argument. Please have a look at '#1' for valid arguments."; }; - String RID_STR_ARGUMENT_IS_NULL { Text [ en-US ] = "The element is invalid."; }; - String RID_STR_FIXEDTEXT { Text [ en-US ] = "Label field" ; }; - String RID_STR_FORMATTEDFIELD { Text [ en-US ] = "Formatted field"; }; - String RID_STR_IMAGECONTROL { Text [ en-US ] = "Image control" ; }; - String RID_STR_REPORT { Text [ en-US ] = "Report"; }; - String RID_STR_SHAPE { Text [ en-US ] = "Shape"; }; - String RID_STR_FIXEDLINE { Text [ en-US ] = "Fixed line"; diff --git a/reportdesign/source/core/sdr/ModuleHelper.cxx b/reportdesign/source/core/sdr/ModuleHelper.cxx index 9c78d9efc35d..c823aed327dc 100644 --- a/reportdesign/source/core/sdr/ModuleHelper.cxx +++ b/reportdesign/source/core/sdr/ModuleHelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,8 +37,8 @@ #include <svl/solar.hrc> #define EXPAND_PROTOCOL "vnd.sun.star.expand:" -#define ENTER_MOD_METHOD() \ - ::osl::MutexGuard aGuard(s_aMutex); \ +#define ENTER_MOD_METHOD() \ + ::osl::MutexGuard aGuard(s_aMutex); \ ensureImpl() //......................................................................... @@ -53,7 +53,7 @@ namespace rptui */ class OModuleImpl { - ResMgr* m_pRessources; + ResMgr* m_pRessources; public: /// ctor @@ -61,7 +61,7 @@ public: ~OModuleImpl(); /// get the manager for the ressources of the module - ResMgr* getResManager(); + ResMgr* getResManager(); }; DBG_NAME( rpt_OModuleImpl ) @@ -83,14 +83,15 @@ OModuleImpl::~OModuleImpl() } //------------------------------------------------------------------------- -ResMgr* OModuleImpl::getResManager() +ResMgr* OModuleImpl::getResManager() { // note that this method is not threadsafe, which counts for the whole class ! if (!m_pRessources) { // create a manager with a fixed prefix - m_pRessources = ResMgr::CreateResMgr("rptui"); + rtl::OString sName = rtl::OString( "rptui" ); + m_pRessources = ResMgr::CreateResMgr(sName); } return m_pRessources; } @@ -98,11 +99,11 @@ ResMgr* OModuleImpl::getResManager() //========================================================================= //= OModule //========================================================================= -::osl::Mutex OModule::s_aMutex; -sal_Int32 OModule::s_nClients = 0; -OModuleImpl* OModule::s_pImpl = NULL; +::osl::Mutex OModule::s_aMutex; +sal_Int32 OModule::s_nClients = 0; +OModuleImpl* OModule::s_pImpl = NULL; //------------------------------------------------------------------------- -ResMgr* OModule::getResManager() +ResMgr* OModule::getResManager() { ENTER_MOD_METHOD(); return s_pImpl->getResManager(); @@ -135,7 +136,7 @@ void OModule::ensureImpl() } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/sdr/PropertyForward.cxx b/reportdesign/source/core/sdr/PropertyForward.cxx index b645d3b3a812..7cef3bf1fcb4 100644 --- a/reportdesign/source/core/sdr/PropertyForward.cxx +++ b/reportdesign/source/core/sdr/PropertyForward.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,7 +33,6 @@ #include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include "corestrings.hrc" -#include <o3tl/compat_functional.hxx> //........................................................................ namespace rptui @@ -43,8 +42,8 @@ namespace rptui using namespace ::com::sun::star::beans; using namespace reportdesign; -DBG_NAME( rpt_OPropertyMediator ) -OPropertyMediator::OPropertyMediator(const Reference< XPropertySet>& _xSource +DBG_NAME( rpt_OPropertyMediator ) +OPropertyMediator::OPropertyMediator(const Reference< XPropertySet>& _xSource ,const Reference< XPropertySet>& _xDest ,const TPropertyNamePair& _aNameMap ,sal_Bool _bReverse) @@ -54,7 +53,7 @@ OPropertyMediator::OPropertyMediator(const Reference< XPropertySet>& _xSource ,m_xDest(_xDest) ,m_bInChange(sal_False) { - DBG_CTOR( rpt_OPropertyMediator,NULL); + DBG_CTOR( rpt_OPropertyMediator,NULL); osl_incrementInterlockedCount(&m_refCount); OSL_ENSURE(m_xDest.is(),"Dest is NULL!"); OSL_ENSURE(m_xSource.is(),"Source is NULL!"); @@ -95,13 +94,13 @@ OPropertyMediator::OPropertyMediator(const Reference< XPropertySet>& _xSource DBG_UNHANDLED_EXCEPTION(); (void)e; } - } + } // if ( m_xDest.is() && m_xSource.is() ) osl_decrementInterlockedCount(&m_refCount); } // ----------------------------------------------------------------------------- OPropertyMediator::~OPropertyMediator() { - DBG_DTOR( rpt_OPropertyMediator,NULL); + DBG_DTOR( rpt_OPropertyMediator,NULL); } // ----------------------------------------------------------------------------- void SAL_CALL OPropertyMediator::propertyChange( const PropertyChangeEvent& evt ) throw(RuntimeException) @@ -132,9 +131,9 @@ void SAL_CALL OPropertyMediator::propertyChange( const PropertyChangeEvent& evt aFind = ::std::find_if( m_aNameMap.begin(), m_aNameMap.end(), - ::o3tl::compose1( + ::std::compose1( ::std::bind2nd(::std::equal_to< ::rtl::OUString >(), evt.PropertyName), - ::o3tl::compose1(::o3tl::select1st<TPropertyConverter>(),::o3tl::select2nd<TPropertyNamePair::value_type>()) + ::std::compose1(::std::select1st<TPropertyConverter>(),::std::select2nd<TPropertyNamePair::value_type>()) ) ); if ( aFind != m_aNameMap.end() ) @@ -142,7 +141,7 @@ void SAL_CALL OPropertyMediator::propertyChange( const PropertyChangeEvent& evt } if ( sPropName.getLength() && xPropInfo->hasPropertyByName(sPropName) ) xProp->setPropertyValue(sPropName,aFind->second.second->operator()(sPropName,evt.NewValue)); - else if ( evt.PropertyName == PROPERTY_CHARFONTNAME + else if ( evt.PropertyName == PROPERTY_CHARFONTNAME || evt.PropertyName == PROPERTY_CHARFONTSTYLENAME || evt.PropertyName == PROPERTY_CHARSTRIKEOUT || evt.PropertyName == PROPERTY_CHARWORDMODE @@ -164,7 +163,7 @@ void SAL_CALL OPropertyMediator::propertyChange( const PropertyChangeEvent& evt } catch(Exception&) { - OSL_FAIL("Exception catched!"); + OSL_ENSURE(0,"Exception catched!"); } m_bInChange = sal_False; } @@ -202,7 +201,7 @@ void OPropertyMediator::startListening() } // ----------------------------------------------------------------------------- //........................................................................ -} // namespace dbaccess +} // namespace dbaccess //........................................................................ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/sdr/ReportDrawPage.cxx b/reportdesign/source/core/sdr/ReportDrawPage.cxx index 3843b894673b..31c977b05bed 100644 --- a/reportdesign/source/core/sdr/ReportDrawPage.cxx +++ b/reportdesign/source/core/sdr/ReportDrawPage.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -111,7 +111,7 @@ uno::Reference< drawing::XShape > OReportDrawPage::_CreateShape( SdrObject *pOb sal_Int64 nAspect = embed::Aspects::MSOLE_CONTENT; uno::Reference < embed::XEmbeddedObject > xObj; ::rtl::OUString sName; - xObj = pObj->GetModel()->GetPersist()->getEmbeddedObjectContainer().CreateEmbeddedObject( + xObj = pObj->GetModel()->GetPersist()->getEmbeddedObjectContainer().CreateEmbeddedObject( ::comphelper::MimeConfigurationHelper::GetSequenceClassIDRepresentation( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("80243D39-6741-46C5-926E-069164FF87BB"))), sName ); OSL_ENSURE(xObj.is(),"Embedded Object could not be created!"); @@ -119,7 +119,7 @@ uno::Reference< drawing::XShape > OReportDrawPage::_CreateShape( SdrObject *pOb /************************************************** * Das leere OLE-Objekt bekommt ein neues IPObj **************************************************/ - pObj->SetEmptyPresObj(sal_False); + pObj->SetEmptyPresObj(FALSE); pOle2Obj->SetOutlinerParaObject(NULL); pOle2Obj->SetObjRef(xObj); pOle2Obj->SetPersistName(sName); @@ -134,6 +134,7 @@ uno::Reference< drawing::XShape > OReportDrawPage::_CreateShape( SdrObject *pOb SvxOle2Shape* pShape = new SvxOle2Shape( pObj ); xShape.set(*pShape,uno::UNO_QUERY); pShape->setShapeKind(pObj->GetObjIdentifier()); + //xShape = new SvxOle2Shape( pOle2Obj ); } if ( !xShape.is() ) diff --git a/reportdesign/source/core/sdr/ReportUndoFactory.cxx b/reportdesign/source/core/sdr/ReportUndoFactory.cxx index 054b3dd311cc..0f2fbcebef48 100644 --- a/reportdesign/source/core/sdr/ReportUndoFactory.cxx +++ b/reportdesign/source/core/sdr/ReportUndoFactory.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,7 +34,7 @@ namespace rptui { using namespace ::com::sun::star; // ----------------------------------------------------------------------------- -SdrUndoAction* lcl_createUndo(SdrObject& rObject,Action _eAction,sal_uInt16 _nCommentId) +SdrUndoAction* lcl_createUndo(SdrObject& rObject,Action _eAction,USHORT _nCommentId) { OObjectBase* pObj = dynamic_cast<OObjectBase*>(&rObject); if ( !pObj ) @@ -54,12 +54,12 @@ DBG_NAME( rpt_OReportUndoFactory ) // ----------------------------------------------------------------------------- OReportUndoFactory::OReportUndoFactory() : m_pUndoFactory(new SdrUndoFactory) { - DBG_CTOR( rpt_OReportUndoFactory,NULL); + DBG_CTOR( rpt_OReportUndoFactory,NULL); } // ----------------------------------------------------------------------------- OReportUndoFactory::~OReportUndoFactory() { - DBG_DTOR( rpt_OReportUndoFactory,NULL); + DBG_DTOR( rpt_OReportUndoFactory,NULL); } /////////////////////////////////////////////////////////////////////// // shapes @@ -80,12 +80,12 @@ SdrUndoAction* OReportUndoFactory::CreateUndoGeoObject( SdrObject& rObject ) SdrUndoAction* OReportUndoFactory::CreateUndoAttrObject( SdrObject& rObject, bool bStyleSheet1, bool bSaveText ) { - return m_pUndoFactory->CreateUndoAttrObject( rObject, bStyleSheet1 ? sal_True : sal_False, bSaveText ? sal_True : sal_False ); + return m_pUndoFactory->CreateUndoAttrObject( rObject, bStyleSheet1 ? TRUE : FALSE, bSaveText ? TRUE : FALSE ); } SdrUndoAction* OReportUndoFactory::CreateUndoRemoveObject( SdrObject& rObject, bool bOrdNumDirect ) { - return m_pUndoFactory->CreateUndoRemoveObject( rObject, bOrdNumDirect ? sal_True : sal_False ); + return m_pUndoFactory->CreateUndoRemoveObject( rObject, bOrdNumDirect ? TRUE : FALSE ); } SdrUndoAction* OReportUndoFactory::CreateUndoInsertObject( SdrObject& rObject, bool /*bOrdNumDirect*/ ) @@ -96,6 +96,7 @@ SdrUndoAction* OReportUndoFactory::CreateUndoInsertObject( SdrObject& rObject, b SdrUndoAction* OReportUndoFactory::CreateUndoDeleteObject( SdrObject& rObject, bool /*bOrdNumDirect*/ ) { return lcl_createUndo(rObject,rptui::Removed,RID_STR_UNDO_DELETE_CONTROL); + //return m_pUndoFactory->CreateUndoDeleteObject( rObject, bOrdNumDirect ? TRUE : FALSE ); } SdrUndoAction* OReportUndoFactory::CreateUndoNewObject( SdrObject& rObject, bool /*bOrdNumDirect*/ ) @@ -105,7 +106,7 @@ SdrUndoAction* OReportUndoFactory::CreateUndoNewObject( SdrObject& rObject, bool SdrUndoAction* OReportUndoFactory::CreateUndoCopyObject( SdrObject& rObject, bool bOrdNumDirect ) { - return m_pUndoFactory->CreateUndoCopyObject( rObject, bOrdNumDirect ? sal_True : sal_False ); + return m_pUndoFactory->CreateUndoCopyObject( rObject, bOrdNumDirect ? TRUE : FALSE ); } SdrUndoAction* OReportUndoFactory::CreateUndoObjectOrdNum( SdrObject& rObject, sal_uInt32 nOldOrdNum1, sal_uInt32 nNewOrdNum1) @@ -115,7 +116,7 @@ SdrUndoAction* OReportUndoFactory::CreateUndoObjectOrdNum( SdrObject& rObject, s SdrUndoAction* OReportUndoFactory::CreateUndoReplaceObject( SdrObject& rOldObject, SdrObject& rNewObject, bool bOrdNumDirect ) { - return m_pUndoFactory->CreateUndoReplaceObject( rOldObject, rNewObject, bOrdNumDirect ? sal_True : sal_False ); + return m_pUndoFactory->CreateUndoReplaceObject( rOldObject, rNewObject, bOrdNumDirect ? TRUE : FALSE ); } SdrUndoAction* OReportUndoFactory::CreateUndoObjectLayerChange( SdrObject& rObject, SdrLayerID aOldLayer, SdrLayerID aNewLayer ) @@ -145,7 +146,7 @@ SdrUndoAction* OReportUndoFactory::CreateUndoMoveLayer(sal_uInt16 nLayerNum, Sdr } // page -SdrUndoAction* OReportUndoFactory::CreateUndoDeletePage(SdrPage& rPage) +SdrUndoAction* OReportUndoFactory::CreateUndoDeletePage(SdrPage& rPage) { return m_pUndoFactory->CreateUndoDeletePage( rPage ); } @@ -176,7 +177,7 @@ SdrUndoAction* OReportUndoFactory::CreateUndoPageChangeMasterPage(SdrPage& rChan } //================================================================== -} //rptui +} //rptui //================================================================== /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/sdr/RptModel.cxx b/reportdesign/source/core/sdr/RptModel.cxx index f6ab95585ee7..689ecd9149a8 100644 --- a/reportdesign/source/core/sdr/RptModel.cxx +++ b/reportdesign/source/core/sdr/RptModel.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "RptModel.hxx" #include "RptPage.hxx" -#include <dbaccess/dbsubcomponentcontroller.hxx> +#include <dbaccess/singledoccontroller.hxx> #include <tools/debug.hxx> #include <unotools/pathoptions.hxx> @@ -37,7 +37,7 @@ #include "UndoEnv.hxx" #include "ReportUndoFactory.hxx" #include "ReportDefinition.hxx" -#define ITEMID_COLOR 1 +#define ITEMID_COLOR 1 #define ITEMID_BRUSH 2 #define ITEMID_FONT 3 #define ITEMID_FONTHEIGHT 4 @@ -71,6 +71,13 @@ OReportModel::OReportModel(::reportdesign::OReportDefinition* _pReportDefinition m_pUndoEnv = new OXUndoEnvironment(*this); m_pUndoEnv->acquire(); SetSdrUndoFactory(new OReportUndoFactory); + + // SvxFontNameToolBoxControl::RegisterControl(SID_ATTR_CHAR_FONT); + //SvxFontHeightToolBoxControl::RegisterControl(SID_ATTR_CHAR_FONTHEIGHT); + //SvxFontColorToolBoxControl::RegisterControl(SID_ATTR_CHAR_COLOR); + //SvxFontColorExtToolBoxControl::RegisterControl(SID_ATTR_CHAR_COLOR2); + //SvxFontColorExtToolBoxControl::RegisterControl(SID_ATTR_CHAR_COLOR_BACKGROUND); + //SvxColorToolBoxControl::RegisterControl(SID_BACKGROUND_COLOR); } //---------------------------------------------------------------------------- @@ -93,7 +100,7 @@ void OReportModel::detachController() SdrPage* OReportModel::AllocPage(bool /*bMasterPage*/) { DBG_CHKTHIS( rpt_OReportModel, 0); - OSL_FAIL("Who called me!"); + OSL_ENSURE(0,"Who called me!"); return NULL; } @@ -113,7 +120,7 @@ Window* OReportModel::GetCurDocViewWin() } //---------------------------------------------------------------------------- -OXUndoEnvironment& OReportModel::GetUndoEnv() +OXUndoEnvironment& OReportModel::GetUndoEnv() { return *m_pUndoEnv; } @@ -124,9 +131,13 @@ void OReportModel::SetModified(sal_Bool _bModified) m_pController->setModified(_bModified); } // ----------------------------------------------------------------------------- -SdrPage* OReportModel::RemovePage(sal_uInt16 nPgNum) +SdrPage* OReportModel::RemovePage(USHORT nPgNum) { OReportPage* pPage = dynamic_cast<OReportPage*>(SdrModel::RemovePage(nPgNum)); + //if ( pPage ) + //{ + // m_pUndoEnv->RemoveSection(pPage); + //} return pPage; } // ----------------------------------------------------------------------------- @@ -141,8 +152,8 @@ OReportPage* OReportModel::createNewPage(const uno::Reference< report::XSection OReportPage* OReportModel::getPage(const uno::Reference< report::XSection >& _xSection) { OReportPage* pPage = NULL; - sal_uInt16 nCount = GetPageCount(); - for (sal_uInt16 i = 0; i < nCount && !pPage ; ++i) + USHORT nCount = GetPageCount(); + for (USHORT i = 0; i < nCount && !pPage ; ++i) { OReportPage* pRptPage = PTR_CAST( OReportPage, GetPage(i) ); if ( pRptPage && pRptPage->getSection() == _xSection ) @@ -219,7 +230,7 @@ uno::Reference< uno::XInterface > OReportModel::createShape(const ::rtl::OUStrin return xRet; } //================================================================== -} //rptui +} //rptui //================================================================== /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx index 4969f740c7bb..3f622a48f636 100644 --- a/reportdesign/source/core/sdr/RptObject.cxx +++ b/reportdesign/source/core/sdr/RptObject.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ #include <toolkit/helper/convert.hxx> #include "RptPage.hxx" #include "corestrings.hrc" -#include <dbaccess/dbsubcomponentcontroller.hxx> +#include <dbaccess/singledoccontroller.hxx> #include "ModuleHelper.hxx" #include <RptResId.hrc> @@ -107,11 +107,11 @@ sal_uInt16 OObjectBase::getObjectType(const uno::Reference< report::XReportCompo } if ( xServiceInfo->supportsService( SERVICE_IMAGECONTROL)) return OBJ_DLG_IMAGECONTROL; - if ( xServiceInfo->supportsService( SERVICE_FORMATTEDFIELD )) + if ( xServiceInfo->supportsService( SERVICE_FORMATTEDFIELD )) return OBJ_DLG_FORMATTEDFIELD; if ( xServiceInfo->supportsService( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.OLE2Shape")) ) ) return OBJ_OLE2; - if ( xServiceInfo->supportsService( SERVICE_SHAPE )) + if ( xServiceInfo->supportsService( SERVICE_SHAPE )) return OBJ_CUSTOMSHAPE; if ( xServiceInfo->supportsService( SERVICE_REPORTDEFINITION ) ) return OBJ_DLG_SUBREPORT; @@ -128,11 +128,11 @@ SdrObject* OObjectBase::createObject(const uno::Reference< report::XReportCompon { case OBJ_DLG_FIXEDTEXT: { - OUnoObject* pUnoObj = new OUnoObject( _xComponent - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FixedText")) + OUnoObject* pUnoObj = new OUnoObject( _xComponent + ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FixedText")) ,OBJ_DLG_FIXEDTEXT); pNewObj = pUnoObj; - + uno::Reference<beans::XPropertySet> xControlModel(pUnoObj->GetUnoControlModel(),uno::UNO_QUERY); if ( xControlModel.is() ) xControlModel->setPropertyValue( PROPERTY_MULTILINE,uno::makeAny(sal_True)); @@ -140,18 +140,18 @@ SdrObject* OObjectBase::createObject(const uno::Reference< report::XReportCompon break; case OBJ_DLG_IMAGECONTROL: pNewObj = new OUnoObject(_xComponent - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.DatabaseImageControl")) + ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.DatabaseImageControl")) ,OBJ_DLG_IMAGECONTROL); break; case OBJ_DLG_FORMATTEDFIELD: pNewObj = new OUnoObject( _xComponent - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FormattedField")) + ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FormattedField")) ,OBJ_DLG_FORMATTEDFIELD); break; case OBJ_DLG_HFIXEDLINE: case OBJ_DLG_VFIXEDLINE: pNewObj = new OUnoObject( _xComponent - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlFixedLineModel")) + ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlFixedLineModel")) ,nType); break; case OBJ_CUSTOMSHAPE: @@ -172,7 +172,7 @@ SdrObject* OObjectBase::createObject(const uno::Reference< report::XReportCompon pNewObj = OOle2Obj::Create( _xComponent,nType ); break; default: - OSL_FAIL("Unknown object id"); + OSL_ENSURE(0,"Unknown object id"); break; } @@ -205,9 +205,9 @@ namespace nTextAlign = style::ParagraphAdjust_RIGHT; break; default: - OSL_FAIL("Illegal text alignment value!"); + OSL_ENSURE(0,"Illegal text alignment value!"); break; - } + } // switch(nTextAlign) aRet <<= (style::ParagraphAdjust)nTextAlign; } else @@ -228,9 +228,9 @@ namespace nTextAlign = awt::TextAlign::RIGHT; break; default: - OSL_FAIL("Illegal text alignment value!"); + OSL_ENSURE(0,"Illegal text alignment value!"); break; - } + } // switch(eParagraphAdjust) aRet <<= nTextAlign; } return aRet; @@ -251,6 +251,7 @@ const TPropertyNamePair& getPropertyNameMap(sal_uInt16 _nObjectId) s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_CONTROLBACKGROUND,TPropertyConverter(PROPERTY_BACKGROUNDCOLOR,aNoConverter))); s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_CONTROLBORDER,TPropertyConverter(PROPERTY_BORDER,aNoConverter))); s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_CONTROLBORDERCOLOR,TPropertyConverter(PROPERTY_BORDERCOLOR,aNoConverter))); + //s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_PARAADJUST,PROPERTY_ALIGN)); } return s_aNameMap; } @@ -291,6 +292,7 @@ const TPropertyNamePair& getPropertyNameMap(sal_uInt16 _nObjectId) s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_CONTROLTEXTEMPHASISMARK,TPropertyConverter(PROPERTY_FONTEMPHASISMARK,aNoConverter))); s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_CONTROLBORDER,TPropertyConverter(PROPERTY_BORDER,aNoConverter))); s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_CONTROLBORDERCOLOR,TPropertyConverter(PROPERTY_BORDERCOLOR,aNoConverter))); + //s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_PARAADJUST,TPropertyConverter(PROPERTY_ALIGN,aNoConverter))); ::boost::shared_ptr<AnyConverter> aParaAdjust(new ParaAdjust()); s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_PARAADJUST,TPropertyConverter(PROPERTY_ALIGN,aParaAdjust))); } @@ -321,7 +323,7 @@ DBG_NAME( rpt_OObjectBase ) OObjectBase::OObjectBase(const uno::Reference< report::XReportComponent>& _xComponent) :m_bIsListening(sal_False) { - DBG_CTOR( rpt_OObjectBase,NULL); + DBG_CTOR( rpt_OObjectBase,NULL); m_xReportComponent = _xComponent; } //---------------------------------------------------------------------------- @@ -334,7 +336,7 @@ OObjectBase::OObjectBase(const ::rtl::OUString& _sComponentName) //---------------------------------------------------------------------------- OObjectBase::~OObjectBase() { - DBG_DTOR( rpt_OObjectBase,NULL); + DBG_DTOR( rpt_OObjectBase,NULL); m_xMediator.reset(); if ( isListening() ) EndListening(); @@ -368,7 +370,7 @@ void OObjectBase::StartListening() if ( !isListening() && m_xReportComponent.is() ) { m_bIsListening = sal_True; - + if ( !m_xPropertyChangeListener.is() ) { m_xPropertyChangeListener = new OObjectListener( this ); @@ -396,7 +398,7 @@ void OObjectBase::EndListening(sal_Bool /*bRemoveListener*/) } catch(uno::Exception) { - OSL_FAIL("OObjectBase::EndListening: Exception caught!"); + OSL_ENSURE(0,"OObjectBase::EndListening: Exception caught!"); } } m_xPropertyChangeListener.clear(); @@ -508,12 +510,12 @@ OCustomShape::~OCustomShape() DBG_DTOR( rpt_OCustomShape, NULL); } // ----------------------------------------------------------------------------- -sal_uInt16 OCustomShape::GetObjIdentifier() const +UINT16 OCustomShape::GetObjIdentifier() const { - return sal_uInt16(OBJ_CUSTOMSHAPE); + return UINT16(OBJ_CUSTOMSHAPE); } //---------------------------------------------------------------------------- -sal_uInt32 OCustomShape::GetObjInventor() const +UINT32 OCustomShape::GetObjInventor() const { return ReportInventor; } @@ -532,7 +534,7 @@ sal_Int32 OCustomShape::GetStep() const { // get step property sal_Int32 nStep = 0; - OSL_FAIL("Who called me!"); + OSL_ENSURE(0,"Who called me!"); return nStep; } //---------------------------------------------------------------------------- @@ -549,8 +551,8 @@ void OCustomShape::NbcMove( const Size& rSize ) m_xReportComponent->setPositionX(m_xReportComponent->getPositionX() + rSize.A()); m_xReportComponent->setPositionY(m_xReportComponent->getPositionY() + rSize.B()); } - - // set geometry properties + + // set geometry properties SetPropsFromRect(GetSnapRect()); m_bIsListening = sal_True; @@ -691,12 +693,12 @@ void OUnoObject::impl_setReportComponent_nothrow() impl_initializeModel_nothrow(); } // ----------------------------------------------------------------------------- -sal_uInt16 OUnoObject::GetObjIdentifier() const +UINT16 OUnoObject::GetObjIdentifier() const { - return sal_uInt16(m_nObjectType); + return UINT16(m_nObjectType); } //---------------------------------------------------------------------------- -sal_uInt32 OUnoObject::GetObjInventor() const +UINT32 OUnoObject::GetObjInventor() const { return ReportInventor; } @@ -718,7 +720,7 @@ sal_Int32 OUnoObject::GetStep() const DBG_CHKTHIS( rpt_OUnoObject,NULL); // get step property sal_Int32 nStep = 0; - OSL_FAIL("Who called me!"); + OSL_ENSURE(0,"Who called me!"); return nStep; } @@ -726,7 +728,7 @@ sal_Int32 OUnoObject::GetStep() const void OUnoObject::NbcMove( const Size& rSize ) { DBG_CHKTHIS( rpt_OUnoObject,NULL); - + if ( m_bIsListening ) { // stop listening @@ -747,6 +749,11 @@ void OUnoObject::NbcMove( const Size& rSize ) // LLA: why there exists getPositionX and getPositionY and NOT getPosition() which return a Point? int nNewX = m_xReportComponent->getPositionX() + rSize.A(); + // can this hinder us to set components outside the area? + // if (nNewX < 0) + // { + // nNewX = 0; + // } m_xReportComponent->setPositionX(nNewX); int nNewY = m_xReportComponent->getPositionY() + rSize.B(); if (nNewY < 0 && !bUndoMode) @@ -759,9 +766,16 @@ void OUnoObject::NbcMove( const Size& rSize ) } if (bPositionFixed) { - GetModel()->AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoMoveObject(*this, aUndoSize)); + // OReportModel* pRptModel = static_cast<OReportModel*>(GetModel()); + // if ( pRptModel ) + // { + // if (! pRptModel->GetUndoEnv().IsLocked()) + // { + GetModel()->AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoMoveObject(*this, aUndoSize)); + // } + // } } - // set geometry properties + // set geometry properties SetPropsFromRect(GetLogicRect()); // start listening @@ -780,8 +794,8 @@ void OUnoObject::NbcResize(const Point& rRef, const Fraction& xFract, const Frac // stop listening OObjectBase::EndListening(sal_False); - - // set geometry properties + + // set geometry properties SetPropsFromRect(GetLogicRect()); // start listening @@ -793,8 +807,8 @@ void OUnoObject::NbcSetLogicRect(const Rectangle& rRect) SdrUnoObj::NbcSetLogicRect(rRect); // stop listening OObjectBase::EndListening(sal_False); - - // set geometry properties + + // set geometry properties SetPropsFromRect(rRect); // start listening @@ -809,7 +823,7 @@ bool OUnoObject::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) if ( bResult ) { impl_setReportComponent_nothrow(); - // set labels + // set labels if ( m_xReportComponent.is() ) { try @@ -826,7 +840,7 @@ bool OUnoObject::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) impl_initializeModel_nothrow(); } - // set geometry properties + // set geometry properties SetPropsFromRect(GetLogicRect()); } @@ -834,7 +848,7 @@ bool OUnoObject::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) } //---------------------------------------------------------------------------- ::rtl::OUString OUnoObject::GetDefaultName(const OUnoObject* _pObj) -{ +{ sal_uInt16 nResId = 0; ::rtl::OUString aDefaultName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HERE WE HAVE TO INSERT OUR NAME!")); if ( _pObj->supportsService( SERVICE_FIXEDTEXT ) ) @@ -855,7 +869,7 @@ bool OUnoObject::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) } if (nResId) - aDefaultName = ::rtl::OUString( String(ModuleRes(nResId)) ); + aDefaultName = ::rtl::OUString( String(ModuleRes(nResId)) ); return aDefaultName; } @@ -914,7 +928,7 @@ void OUnoObject::_propertyChange( const beans::PropertyChangeEvent& evt ) throw OObjectBase::StartListening(); } } - } + } } } // ----------------------------------------------------------------------------- @@ -942,16 +956,16 @@ uno::Reference< uno::XInterface > OUnoObject::getUnoShape() return OObjectBase::getUnoShapeOf( *this ); } // ----------------------------------------------------------------------------- -OUnoObject* OUnoObject::Clone() const +SdrObject* OUnoObject::Clone() const { - OUnoObject* pClone = CloneHelper< OUnoObject >(); + SdrObject* pClone = SdrUnoObj::Clone(); if ( pClone ) { Reference<XPropertySet> xSource(const_cast<OUnoObject*>(this)->getUnoShape(),uno::UNO_QUERY); Reference<XPropertySet> xDest(pClone->getUnoShape(),uno::UNO_QUERY); if ( xSource.is() && xDest.is() ) comphelper::copyProperties(xSource.get(),xDest.get()); - } + } // if ( pClone ) return pClone; } //---------------------------------------------------------------------------- @@ -959,7 +973,7 @@ OUnoObject* OUnoObject::Clone() const //---------------------------------------------------------------------------- TYPEINIT1(OOle2Obj, SdrOle2Obj); DBG_NAME( rpt_OOle2Obj ); -OOle2Obj::OOle2Obj(const uno::Reference< report::XReportComponent>& _xComponent,sal_uInt16 _nType) +OOle2Obj::OOle2Obj(const uno::Reference< report::XReportComponent>& _xComponent,UINT16 _nType) :SdrOle2Obj() ,OObjectBase(_xComponent) ,m_nType(_nType) @@ -971,7 +985,7 @@ OOle2Obj::OOle2Obj(const uno::Reference< report::XReportComponent>& _xComponent, m_bIsListening = sal_True; } //---------------------------------------------------------------------------- -OOle2Obj::OOle2Obj(const ::rtl::OUString& _sComponentName,sal_uInt16 _nType) +OOle2Obj::OOle2Obj(const ::rtl::OUString& _sComponentName,UINT16 _nType) :SdrOle2Obj() ,OObjectBase(_sComponentName) ,m_nType(_nType) @@ -986,12 +1000,12 @@ OOle2Obj::~OOle2Obj() DBG_DTOR( rpt_OOle2Obj, NULL); } // ----------------------------------------------------------------------------- -sal_uInt16 OOle2Obj::GetObjIdentifier() const +UINT16 OOle2Obj::GetObjIdentifier() const { return m_nType; } //---------------------------------------------------------------------------- -sal_uInt32 OOle2Obj::GetObjInventor() const +UINT32 OOle2Obj::GetObjInventor() const { return ReportInventor; } @@ -1013,7 +1027,7 @@ sal_Int32 OOle2Obj::GetStep() const DBG_CHKTHIS( rpt_OOle2Obj,NULL); // get step property sal_Int32 nStep = 0; - OSL_FAIL("Who called me!"); + OSL_ENSURE(0,"Who called me!"); return nStep; } @@ -1021,7 +1035,7 @@ sal_Int32 OOle2Obj::GetStep() const void OOle2Obj::NbcMove( const Size& rSize ) { DBG_CHKTHIS( rpt_OOle2Obj,NULL); - + if ( m_bIsListening ) { // stop listening @@ -1034,8 +1048,8 @@ void OOle2Obj::NbcMove( const Size& rSize ) m_xReportComponent->setPositionX(m_xReportComponent->getPositionX() + rSize.A()); m_xReportComponent->setPositionY(m_xReportComponent->getPositionY() + rSize.B()); } - - // set geometry properties + + // set geometry properties SetPropsFromRect(GetLogicRect()); // start listening @@ -1054,8 +1068,8 @@ void OOle2Obj::NbcResize(const Point& rRef, const Fraction& xFract, const Fracti // stop listening OObjectBase::EndListening(sal_False); - - // set geometry properties + + // set geometry properties SetPropsFromRect(GetLogicRect()); // start listening @@ -1067,8 +1081,8 @@ void OOle2Obj::NbcSetLogicRect(const Rectangle& rRect) SdrOle2Obj::NbcSetLogicRect(rRect); // stop listening OObjectBase::EndListening(sal_False); - - // set geometry properties + + // set geometry properties SetPropsFromRect(rRect); // start listening @@ -1089,7 +1103,7 @@ bool OOle2Obj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) if ( !m_xReportComponent.is() ) m_xReportComponent.set(getUnoShape(),uno::UNO_QUERY); } - // set geometry properties + // set geometry properties SetPropsFromRect(GetLogicRect()); } @@ -1125,18 +1139,18 @@ uno::Reference< chart2::data::XDatabaseDataProvider > lcl_getDataProvider(const { xSource.set(xChartDoc->getDataProvider(),uno::UNO_QUERY); } - } + } // if( xCompSupp.is()) return xSource; } // ----------------------------------------------------------------------------- // Clone() soll eine komplette Kopie des Objektes erzeugen. -OOle2Obj* OOle2Obj::Clone() const +SdrObject* OOle2Obj::Clone() const { - OOle2Obj* pObj = CloneHelper< OOle2Obj >(); + OOle2Obj* pObj = static_cast<OOle2Obj*>(SdrOle2Obj::Clone()); OReportModel* pRptModel = static_cast<OReportModel*>(GetModel()); svt::EmbeddedObjectRef::TryRunningState( pObj->GetObjRef() ); pObj->impl_createDataProvider_nothrow(pRptModel->getReportDefinition().get()); - + uno::Reference< chart2::data::XDatabaseDataProvider > xSource( lcl_getDataProvider(GetObjRef()) ); uno::Reference< chart2::data::XDatabaseDataProvider > xDest( lcl_getDataProvider(pObj->GetObjRef()) ); if ( xSource.is() && xDest.is() ) @@ -1161,7 +1175,7 @@ void OOle2Obj::impl_createDataProvider_nothrow(const uno::Reference< frame::XMod uno::Reference< lang::XMultiServiceFactory> xFac(_xModel,uno::UNO_QUERY); uno::Reference< chart2::data::XDatabaseDataProvider > xDataProvider( xFac->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart2.data.DataProvider"))),uno::UNO_QUERY); xReceiver->attachDataProvider( xDataProvider.get() ); - } + } // if( xReceiver.is() ) } catch(uno::Exception) { @@ -1176,7 +1190,7 @@ void OOle2Obj::initializeOle() uno::Reference < embed::XEmbeddedObject > xObj = GetObjRef(); OReportModel* pRptModel = static_cast<OReportModel*>(GetModel()); pRptModel->GetUndoEnv().AddElement(lcl_getDataProvider(xObj)); - + uno::Reference< embed::XComponentSupplier > xCompSupp( xObj, uno::UNO_QUERY ); if( xCompSupp.is() ) { @@ -1224,11 +1238,11 @@ uno::Reference< style::XStyle> getUsedStyle(const uno::Reference< report::XRepor { uno::Reference<container::XNameAccess> xStyles = _xReport->getStyleFamilies(); uno::Reference<container::XNameAccess> xPageStyles(xStyles->getByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PageStyles"))),uno::UNO_QUERY); - + uno::Reference< style::XStyle> xReturn; uno::Sequence< ::rtl::OUString> aSeq = xPageStyles->getElementNames(); const ::rtl::OUString* pIter = aSeq.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); + const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); for(;pIter != pEnd && !xReturn.is() ;++pIter) { uno::Reference< style::XStyle> xStyle(xPageStyles->getByName(*pIter),uno::UNO_QUERY); diff --git a/reportdesign/source/core/sdr/RptObjectListener.cxx b/reportdesign/source/core/sdr/RptObjectListener.cxx index 693e76028faf..16ba83604b90 100644 --- a/reportdesign/source/core/sdr/RptObjectListener.cxx +++ b/reportdesign/source/core/sdr/RptObjectListener.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,14 +41,14 @@ DBG_NAME(rpt_OObjectListener) OObjectListener::OObjectListener(OObjectBase* _pObject) :m_pObject(_pObject) { - DBG_CTOR(rpt_OObjectListener,NULL); + DBG_CTOR(rpt_OObjectListener,NULL); } //---------------------------------------------------------------------------- OObjectListener::~OObjectListener() { - DBG_DTOR(rpt_OObjectListener,NULL); + DBG_DTOR(rpt_OObjectListener,NULL); } // XEventListener @@ -56,6 +56,13 @@ OObjectListener::~OObjectListener() void SAL_CALL OObjectListener::disposing( const ::com::sun::star::lang::EventObject& ) throw( ::com::sun::star::uno::RuntimeException) { + /* + // disconnect the listener + if (m_pObject) + { + (m_pObject->m_xPropertyChangeListener).clear(); + } + */ } // XPropertyChangeListener diff --git a/reportdesign/source/core/sdr/RptPage.cxx b/reportdesign/source/core/sdr/RptPage.cxx index 2ebbd53a2603..b466a60bd839 100644 --- a/reportdesign/source/core/sdr/RptPage.cxx +++ b/reportdesign/source/core/sdr/RptPage.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -79,11 +79,11 @@ SdrPage* OReportPage::Clone() const } //---------------------------------------------------------------------------- -sal_uLong OReportPage::getIndexOf(const uno::Reference< report::XReportComponent >& _xObject) +ULONG OReportPage::getIndexOf(const uno::Reference< report::XReportComponent >& _xObject) { DBG_CHKTHIS( rpt_OReportPage,NULL); - sal_uLong nCount = GetObjCount(); - sal_uLong i = 0; + ULONG nCount = GetObjCount(); + ULONG i = 0; for (; i < nCount; ++i) { OObjectBase* pObj = dynamic_cast<OObjectBase*>(GetObj(i)); @@ -92,25 +92,25 @@ sal_uLong OReportPage::getIndexOf(const uno::Reference< report::XReportComponent { break; } - } + } // for (; i < nCount; ++i) return i; } //---------------------------------------------------------------------------- void OReportPage::removeSdrObject(const uno::Reference< report::XReportComponent >& _xObject) { DBG_CHKTHIS( rpt_OReportPage,NULL); - sal_uLong nPos = getIndexOf(_xObject); + ULONG nPos = getIndexOf(_xObject); if ( nPos < GetObjCount() ) { OObjectBase* pBase = dynamic_cast<OObjectBase*>(GetObj(nPos)); OSL_ENSURE(pBase,"Why is this not a OObjectBase?"); if ( pBase ) pBase->EndListening(); - RemoveObject(nPos); + /*delete */RemoveObject(nPos); } } // ----------------------------------------------------------------------------- -SdrObject* OReportPage::RemoveObject(sal_uLong nObjNum) +SdrObject* OReportPage::RemoveObject(ULONG nObjNum) { SdrObject* pObj = SdrPage::RemoveObject(nObjNum); if (getSpecialMode()) @@ -132,13 +132,28 @@ SdrObject* OReportPage::RemoveObject(sal_uLong nObjNum) return pObj; } //---------------------------------------------------------------------------- +//namespace +//{ +// ::rtl::OUString lcl_getControlName(const uno::Reference< lang::XServiceInfo >& _xServiceInfo) +// { +// if ( _xServiceInfo->supportsService( SERVICE_FIXEDTEXT )) +// return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FixedText")); +// if ( _xServiceInfo->supportsService( SERVICE_FORMATTEDFIELD )) +// return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FormattedField")); +// if ( _xServiceInfo->supportsService( SERVICE_IMAGECONTROL)) +// return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.DatabaseImageControl")); +// +// return ::rtl::OUString(); +// } +//} +//---------------------------------------------------------------------------- void OReportPage::insertObject(const uno::Reference< report::XReportComponent >& _xObject) { DBG_CHKTHIS( rpt_OReportPage,NULL); OSL_ENSURE(_xObject.is(),"Object is not valid to create a SdrObject!"); - if ( !_xObject.is() ) + if ( !_xObject.is() ) // || !m_pView ) return; - sal_uLong nPos = getIndexOf(_xObject); + ULONG nPos = getIndexOf(_xObject); if ( nPos < GetObjCount() ) return; // Object already in list @@ -163,7 +178,7 @@ void OReportPage::removeTempObject(SdrObject *_pToRemoveObj) { if (_pToRemoveObj) { - for (sal_uLong i=0;i<GetObjCount();i++) + for (ULONG i=0;i<GetObjCount();i++) { SdrObject *aObj = GetObj(i); if (aObj && aObj == _pToRemoveObj) @@ -171,6 +186,7 @@ void OReportPage::removeTempObject(SdrObject *_pToRemoveObj) SdrObject* pObject = RemoveObject(i); (void)pObject; break; + // delete pObject; } } } @@ -181,18 +197,18 @@ void OReportPage::resetSpecialMode() const sal_Bool bChanged = rModel.IsChanged(); ::std::vector<SdrObject*>::iterator aIter = m_aTemporaryObjectList.begin(); ::std::vector<SdrObject*>::iterator aEnd = m_aTemporaryObjectList.end(); - + for (; aIter != aEnd; ++aIter) { removeTempObject(*aIter); } m_aTemporaryObjectList.clear(); rModel.SetChanged(bChanged); - + m_bSpecialInsertMode = false; } // ----------------------------------------------------------------------------- -void OReportPage::NbcInsertObject(SdrObject* pObj, sal_uLong nPos, const SdrInsertReason* pReason) +void OReportPage::NbcInsertObject(SdrObject* pObj, ULONG nPos, const SdrInsertReason* pReason) { SdrPage::NbcInsertObject(pObj, nPos, pReason); @@ -202,7 +218,7 @@ void OReportPage::NbcInsertObject(SdrObject* pObj, sal_uLong nPos, const SdrInse m_aTemporaryObjectList.push_back(pObj); return; } - + if ( pUnoObj ) { pUnoObj->CreateMediator(); @@ -216,6 +232,14 @@ void OReportPage::NbcInsertObject(SdrObject* pObj, sal_uLong nPos, const SdrInse uno::Reference< drawing::XShape> xShape(pObj->getUnoShape(),uno::UNO_QUERY); pSection->notifyElementAdded(xShape); + //// check if we are a shape + //uno::Reference<beans::XPropertySet> xProp(xShape,uno::UNO_QUERY); + //if ( xProp.is() && xProp->getPropertySetInfo()->hasPropertyByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CLSID"))) ) + //{ + // // use MimeConfigurationHelper::GetStringClassIDRepresentation(MimeConfigurationHelper::GetSequenceClassID(SO3_SCH_OLE_EMBED_CLASSID_8)) + // xProp->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CLSID")),uno::makeAny(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("12dcae26-281f-416f-a234-c3086127382e")))); + //} + // now that the shape is inserted into its structures, we can allow the OObjectBase // to release the reference to it OObjectBase* pObjectBase = dynamic_cast< OObjectBase* >( pObj ); diff --git a/reportdesign/source/core/sdr/UndoActions.cxx b/reportdesign/source/core/sdr/UndoActions.cxx index 9c7895d6d708..5e043b49bde5 100644 --- a/reportdesign/source/core/sdr/UndoActions.cxx +++ b/reportdesign/source/core/sdr/UndoActions.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,7 +53,7 @@ #include <tools/diagnose_ex.h> #include <comphelper/stl_types.hxx> #include <vcl/svapp.hxx> -#include <dbaccess/dbsubcomponentcontroller.hxx> +#include <dbaccess/singledoccontroller.hxx> #include <svx/unoshape.hxx> #include <osl/mutex.hxx> @@ -97,17 +97,17 @@ namespace rptui TYPEINIT1( OCommentUndoAction, SdrUndoAction ); DBG_NAME(rpt_OCommentUndoAction) //---------------------------------------------------------------------------- -OCommentUndoAction::OCommentUndoAction(SdrModel& _rMod,sal_uInt16 nCommentID) +OCommentUndoAction::OCommentUndoAction(SdrModel& _rMod,USHORT nCommentID) :SdrUndoAction(_rMod) -{ - DBG_CTOR(rpt_OCommentUndoAction,NULL); +{ + DBG_CTOR(rpt_OCommentUndoAction,NULL); m_pController = static_cast< OReportModel& >( _rMod ).getController(); if ( nCommentID ) - m_strComment = String(ModuleRes(nCommentID)); + m_strComment = String(ModuleRes(nCommentID)); } OCommentUndoAction::~OCommentUndoAction() { - DBG_DTOR(rpt_OCommentUndoAction,NULL); + DBG_DTOR(rpt_OCommentUndoAction,NULL); } //---------------------------------------------------------------------------- void OCommentUndoAction::Undo() @@ -123,7 +123,7 @@ OUndoContainerAction::OUndoContainerAction(SdrModel& _rMod ,Action _eAction ,const uno::Reference< container::XIndexContainer > _xContainer ,const Reference< XInterface > & xElem - ,sal_uInt16 _nCommentId) + ,USHORT _nCommentId) :OCommentUndoAction(_rMod,_nCommentId) ,m_xElement(xElem) ,m_xContainer(_xContainer) @@ -170,7 +170,7 @@ OUndoContainerAction::~OUndoContainerAction() } //------------------------------------------------------------------------------ void OUndoContainerAction::implReInsert( ) SAL_THROW( ( Exception ) ) -{ +{ if ( m_xContainer.is() ) { // insert the element @@ -224,13 +224,13 @@ void OUndoContainerAction::Undo() implReInsert(); break; default: - OSL_FAIL("Illegal case value"); + OSL_ENSURE(0,"Illegal case value"); break; } } catch( const Exception& ) { - OSL_FAIL( "OUndoContainerAction::Undo: caught an exception!" ); + OSL_ENSURE( sal_False, "OUndoContainerAction::Undo: caught an exception!" ); } } } @@ -252,13 +252,13 @@ void OUndoContainerAction::Redo() implReRemove(); break; default: - OSL_FAIL("Illegal case value"); + OSL_ENSURE(0,"Illegal case value"); break; } } catch( const Exception& ) { - OSL_FAIL( "OUndoContainerAction::Redo: caught an exception!" ); + OSL_ENSURE( sal_False, "OUndoContainerAction::Redo: caught an exception!" ); } } } @@ -269,7 +269,7 @@ OUndoGroupSectionAction::OUndoGroupSectionAction(SdrModel& _rMod ,OGroupHelper> _pMemberFunction ,const uno::Reference< report::XGroup >& _xGroup ,const Reference< XInterface > & xElem - ,sal_uInt16 _nCommentId) + ,USHORT _nCommentId) :OUndoContainerAction(_rMod,_eAction,NULL,xElem,_nCommentId) ,m_aGroupHelper(_xGroup) ,m_pMemberFunction(_pMemberFunction) @@ -277,7 +277,7 @@ OUndoGroupSectionAction::OUndoGroupSectionAction(SdrModel& _rMod } //------------------------------------------------------------------------------ void OUndoGroupSectionAction::implReInsert( ) SAL_THROW( ( Exception ) ) -{ +{ OXUndoEnvironment& rEnv = static_cast< OReportModel& >( rMod ).GetUndoEnv(); try { @@ -315,7 +315,7 @@ OUndoReportSectionAction::OUndoReportSectionAction(SdrModel& _rMod ,OReportHelper> _pMemberFunction ,const uno::Reference< report::XReportDefinition >& _xReport ,const Reference< XInterface > & xElem - ,sal_uInt16 _nCommentId) + ,USHORT _nCommentId) :OUndoContainerAction(_rMod,_eAction,NULL,xElem,_nCommentId) ,m_aReportHelper(_xReport) ,m_pMemberFunction(_pMemberFunction) @@ -323,7 +323,7 @@ OUndoReportSectionAction::OUndoReportSectionAction(SdrModel& _rMod } //------------------------------------------------------------------------------ void OUndoReportSectionAction::implReInsert( ) SAL_THROW( ( Exception ) ) -{ +{ OXUndoEnvironment& rEnv = static_cast< OReportModel& >( rMod ).GetUndoEnv(); try { @@ -397,7 +397,7 @@ void ORptUndoPropertyAction::setProperty(sal_Bool _bOld) } catch( const Exception& ) { - OSL_FAIL( "ORptUndoPropertyAction::Redo: caught an exception!" ); + OSL_ENSURE( sal_False, "ORptUndoPropertyAction::Redo: caught an exception!" ); } } } @@ -406,7 +406,7 @@ void ORptUndoPropertyAction::setProperty(sal_Bool _bOld) String ORptUndoPropertyAction::GetComment() const { String aStr(ModuleRes(RID_STR_UNDO_PROPERTY)); - + aStr.SearchAndReplace( '#', m_aPropertyName ); return aStr; } diff --git a/reportdesign/source/core/sdr/UndoEnv.cxx b/reportdesign/source/core/sdr/UndoEnv.cxx index b21a3c91278d..70f132d63cdf 100644 --- a/reportdesign/source/core/sdr/UndoEnv.cxx +++ b/reportdesign/source/core/sdr/UndoEnv.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,17 +45,14 @@ #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/util/XModifyBroadcaster.hpp> -#include <com/sun/star/beans/XIntrospectionAccess.hpp> -#include <com/sun/star/beans/XIntrospection.hpp> /** === end UNO includes === **/ #include <connectivity/dbtools.hxx> #include <svl/smplhint.hxx> #include <tools/diagnose_ex.h> #include <comphelper/stl_types.hxx> -#include <comphelper/componentcontext.hxx> #include <vcl/svapp.hxx> -#include <dbaccess/dbsubcomponentcontroller.hxx> +#include <dbaccess/singledoccontroller.hxx> #include <svx/unoshape.hxx> #include <osl/mutex.hxx> @@ -73,36 +70,8 @@ namespace rptui //---------------------------------------------------------------------------- -struct PropertyInfo -{ - bool bIsReadonlyOrTransient; - - PropertyInfo() - :bIsReadonlyOrTransient( false ) - { - } - - PropertyInfo( const bool i_bIsTransientOrReadOnly ) - :bIsReadonlyOrTransient( i_bIsTransientOrReadOnly ) - { - } -}; - -typedef ::boost::unordered_map< ::rtl::OUString, PropertyInfo, ::rtl::OUStringHash > PropertiesInfo; - -struct ObjectInfo -{ - PropertiesInfo aProperties; - Reference< XPropertySet > xPropertyIntrospection; - - ObjectInfo() - :aProperties() - ,xPropertyIntrospection() - { - } -}; - -typedef ::std::map< Reference< XPropertySet >, ObjectInfo, ::comphelper::OInterfaceCompare< XPropertySet > > PropertySetInfoCache; +DECLARE_STL_USTRINGACCESS_MAP(bool, AllProperties); +DECLARE_STL_STDKEY_MAP(uno::Reference< beans::XPropertySet >, AllProperties, PropertySetInfoCache); // ----------------------------------------------------------------------------- @@ -117,9 +86,8 @@ public: ConditionUpdater m_aConditionUpdater; ::osl::Mutex m_aMutex; ::std::vector< uno::Reference< container::XChild> > m_aSections; - Reference< XIntrospection > m_xIntrospection; oslInterlockedCount m_nLocks; - sal_Bool m_bReadOnly; + sal_Bool m_bReadOnly; sal_Bool m_bIsUndo; OXUndoEnvironmentImpl(OReportModel& _rModel); @@ -150,16 +118,16 @@ OXUndoEnvironment::~OXUndoEnvironment() DBG_DTOR( rpt_OXUndoEnvironment,NULL); } // ----------------------------------------------------------------------------- -void OXUndoEnvironment::Lock() -{ +void OXUndoEnvironment::Lock() +{ OSL_ENSURE(m_refCount,"Illegal call to dead object!"); - osl_incrementInterlockedCount( &m_pImpl->m_nLocks ); + osl_incrementInterlockedCount( &m_pImpl->m_nLocks ); } -void OXUndoEnvironment::UnLock() -{ +void OXUndoEnvironment::UnLock() +{ OSL_ENSURE(m_refCount,"Illegal call to dead object!"); - osl_decrementInterlockedCount( &m_pImpl->m_nLocks ); + osl_decrementInterlockedCount( &m_pImpl->m_nLocks ); } sal_Bool OXUndoEnvironment::IsLocked() const { return m_pImpl->m_nLocks != 0; } // ----------------------------------------------------------------------------- @@ -187,7 +155,7 @@ void OXUndoEnvironment::Clear(const Accessor& /*_r*/) { uno::Reference<beans::XPropertySet> xProp(aIter->first,uno::UNO_QUERY); xProp->getPropertySetInfo(); - int nlen = aIter->second.aProperties.size(); + int nlen = aIter->second.size(); nlen = nlen; } #endif @@ -206,7 +174,7 @@ void OXUndoEnvironment::Clear(const Accessor& /*_r*/) { OReportPage* pPage = PTR_CAST( OReportPage, m_pImpl->m_rModel.GetMasterPage(i) ); RemoveSection(pPage); - } + } m_pImpl->m_aSections.clear(); @@ -232,7 +200,7 @@ void OXUndoEnvironment::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) ModeChanged(); } // ----------------------------------------------------------------------------- -// XEventListener +// XEventListener //------------------------------------------------------------------------------ void SAL_CALL OXUndoEnvironment::disposing(const EventObject& e) throw( RuntimeException ) { @@ -245,6 +213,8 @@ void SAL_CALL OXUndoEnvironment::disposing(const EventObject& e) throw( RuntimeE RemoveSection(xSection); else RemoveElement(xSourceSet); + /*if (!m_pImpl->m_aPropertySetCache.empty()) + m_pImpl->m_aPropertySetCache.erase(xSourceSet);*/ } } @@ -262,83 +232,39 @@ void SAL_CALL OXUndoEnvironment::propertyChange( const PropertyChangeEvent& _rEv if (!xSet.is()) return; - dbaui::DBSubComponentController* pController = m_pImpl->m_rModel.getController(); + dbaui::OSingleDocumentController* pController = m_pImpl->m_rModel.getController(); if ( !pController ) return; - // no Undo for transient and readonly props. + // no Undo for transient and readonly props. // let's see if we know something about the set #if OSL_DEBUG_LEVEL > 0 int nlen = m_pImpl->m_aPropertySetCache.size(); nlen = nlen; #endif - PropertySetInfoCache::iterator objectPos = m_pImpl->m_aPropertySetCache.find(xSet); - if (objectPos == m_pImpl->m_aPropertySetCache.end()) + PropertySetInfoCache::iterator aSetPos = m_pImpl->m_aPropertySetCache.find(xSet); + if (aSetPos == m_pImpl->m_aPropertySetCache.end()) { - objectPos = m_pImpl->m_aPropertySetCache.insert( PropertySetInfoCache::value_type( - xSet, ObjectInfo() - ) ).first; - DBG_ASSERT(objectPos != m_pImpl->m_aPropertySetCache.end(), "OXUndoEnvironment::propertyChange : just inserted it ... why it's not there ?"); + AllProperties aNewEntry; + aSetPos = m_pImpl->m_aPropertySetCache.insert(PropertySetInfoCache::value_type(xSet,aNewEntry)).first; + DBG_ASSERT(aSetPos != m_pImpl->m_aPropertySetCache.end(), "OXUndoEnvironment::propertyChange : just inserted it ... why it's not there ?"); } - if ( objectPos == m_pImpl->m_aPropertySetCache.end() ) + if ( aSetPos == m_pImpl->m_aPropertySetCache.end() ) return; // now we have access to the cached info about the set // let's see what we know about the property - ObjectInfo& rObjectInfo = objectPos->second; - PropertiesInfo::iterator aPropertyPos = rObjectInfo.aProperties.find( _rEvent.PropertyName ); - if ( aPropertyPos == rObjectInfo.aProperties.end() ) - { // nothing 'til now ... have to change this .... + AllProperties& rPropInfos = aSetPos->second; + AllPropertiesIterator aPropertyPos = rPropInfos.find( _rEvent.PropertyName ); + if (aPropertyPos == rPropInfos.end()) + { // nothing 'til now ... have to change this .... // the attributes - Reference< XPropertySetInfo > xPSI( xSet->getPropertySetInfo(), UNO_SET_THROW ); - sal_Int32 nPropertyAttributes = 0; - try - { - if ( xPSI->hasPropertyByName( _rEvent.PropertyName ) ) - { - nPropertyAttributes = xPSI->getPropertyByName( _rEvent.PropertyName ).Attributes; - } - else - { - // it's perfectly valid for a component to notify a change in a property which it doesn't have - as long - // as it has an attribute with this name - if ( !rObjectInfo.xPropertyIntrospection.is() ) - { - if ( !m_pImpl->m_xIntrospection.is() ) - { - ::comphelper::ComponentContext aContext( m_pImpl->m_rModel.getController()->getORB() ); - OSL_VERIFY( aContext.createComponent( "com.sun.star.beans.Introspection", m_pImpl->m_xIntrospection ) ); - } - if ( m_pImpl->m_xIntrospection.is() ) - { - Reference< XIntrospectionAccess > xIntrospection( - m_pImpl->m_xIntrospection->inspect( makeAny( _rEvent.Source ) ), - UNO_SET_THROW - ); - rObjectInfo.xPropertyIntrospection.set( xIntrospection->queryAdapter( XPropertySet::static_type() ), UNO_QUERY_THROW ); - } - } - if ( rObjectInfo.xPropertyIntrospection.is() ) - { - xPSI.set( rObjectInfo.xPropertyIntrospection->getPropertySetInfo(), UNO_SET_THROW ); - nPropertyAttributes = xPSI->getPropertyByName( _rEvent.PropertyName ).Attributes; - } - } - } - catch( const Exception& ) - { - DBG_UNHANDLED_EXCEPTION(); - } - const bool bTransReadOnly = - ( ( nPropertyAttributes & PropertyAttribute::READONLY ) != 0 ) - || ( ( nPropertyAttributes & PropertyAttribute::TRANSIENT ) != 0 ); + INT32 nAttributes = xSet->getPropertySetInfo()->getPropertyByName( _rEvent.PropertyName ).Attributes; + bool bTransReadOnly = ((nAttributes & PropertyAttribute::READONLY) != 0) || ((nAttributes & PropertyAttribute::TRANSIENT) != 0); // insert the new entry - aPropertyPos = rObjectInfo.aProperties.insert( PropertiesInfo::value_type( - _rEvent.PropertyName, - PropertyInfo( bTransReadOnly ) - ) ).first; - DBG_ASSERT(aPropertyPos != rObjectInfo.aProperties.end(), "OXUndoEnvironment::propertyChange : just inserted it ... why it's not there ?"); + aPropertyPos = rPropInfos.insert( AllProperties::value_type( _rEvent.PropertyName, bTransReadOnly ) ).first; + DBG_ASSERT(aPropertyPos != rPropInfos.end(), "OXUndoEnvironment::propertyChange : just inserted it ... why it's not there ?"); } implSetModified(); @@ -347,7 +273,7 @@ void SAL_CALL OXUndoEnvironment::propertyChange( const PropertyChangeEvent& _rEv // and are able to decide wether or not we need an undo action // no UNDO for transient/readonly properties - if ( aPropertyPos->second.bIsReadonlyOrTransient ) + if ( aPropertyPos->second ) return; // give components with sub responsibilities a chance @@ -380,7 +306,7 @@ void SAL_CALL OXUndoEnvironment::propertyChange( const PropertyChangeEvent& _rEv if ( pUndo == NULL ) pUndo = new ORptUndoPropertyAction( m_pImpl->m_rModel, _rEvent ); - m_pImpl->m_rModel.GetSdrUndoManager()->AddUndoAction( pUndo ); + pController->addUndoActionAndInvalidate(pUndo); pController->InvalidateAll(); } // ----------------------------------------------------------------------------- @@ -390,7 +316,7 @@ void SAL_CALL OXUndoEnvironment::propertyChange( const PropertyChangeEvent& _rEv if ( _xContainer.is() ) { aFind = ::std::find(m_pImpl->m_aSections.begin(),m_pImpl->m_aSections.end(),_xContainer); - + if ( aFind == m_pImpl->m_aSections.end() ) { Reference<container::XChild> xParent(_xContainer->getParent(),uno::UNO_QUERY); @@ -416,7 +342,7 @@ void SAL_CALL OXUndoEnvironment::elementInserted(const ContainerEvent& evt) thro Reference< report::XSection > xContainer(evt.Source,uno::UNO_QUERY); ::std::vector< uno::Reference< container::XChild> >::const_iterator aFind = getSection(xContainer.get()); - + if ( aFind != m_pImpl->m_aSections.end() ) { OUndoEnvLock aLock(*this); @@ -431,7 +357,7 @@ void SAL_CALL OXUndoEnvironment::elementInserted(const ContainerEvent& evt) thro { DBG_UNHANDLED_EXCEPTION(); } - + } } else @@ -439,9 +365,12 @@ void SAL_CALL OXUndoEnvironment::elementInserted(const ContainerEvent& evt) thro uno::Reference< report::XFunctions> xContainer(evt.Source,uno::UNO_QUERY); if ( xContainer.is() ) { - m_pImpl->m_rModel.GetSdrUndoManager()->AddUndoAction( - new OUndoContainerAction( m_pImpl->m_rModel, rptui::Inserted, xContainer.get(), - xIface, RID_STR_UNDO_ADDFUNCTION ) ); + dbaui::OSingleDocumentController* pController = m_pImpl->m_rModel.getController(); + pController->addUndoActionAndInvalidate(new OUndoContainerAction(m_pImpl->m_rModel + ,rptui::Inserted + ,xContainer.get() + ,xIface + ,RID_STR_UNDO_ADDFUNCTION)); } } } @@ -454,6 +383,7 @@ void SAL_CALL OXUndoEnvironment::elementInserted(const ContainerEvent& evt) thro //------------------------------------------------------------------------------ void OXUndoEnvironment::implSetModified() { + //if ( !IsLocked() ) m_pImpl->m_rModel.SetModified( sal_True ); } @@ -484,7 +414,7 @@ void SAL_CALL OXUndoEnvironment::elementRemoved(const ContainerEvent& evt) throw { Reference< report::XSection > xContainer(evt.Source,uno::UNO_QUERY); ::std::vector< uno::Reference< container::XChild> >::const_iterator aFind = getSection(xContainer.get()); - + Reference< report::XReportComponent > xReportComponent( xIface, UNO_QUERY ); if ( aFind != m_pImpl->m_aSections.end() && xReportComponent.is() ) { @@ -506,12 +436,16 @@ void SAL_CALL OXUndoEnvironment::elementRemoved(const ContainerEvent& evt) throw uno::Reference< report::XFunctions> xFunctions(evt.Source,uno::UNO_QUERY); if ( xFunctions.is() ) { - m_pImpl->m_rModel.GetSdrUndoManager()->AddUndoAction( new OUndoContainerAction( - m_pImpl->m_rModel, rptui::Removed, xFunctions.get(), xIface, RID_STR_UNDO_ADDFUNCTION ) ); + dbaui::OSingleDocumentController* pController = m_pImpl->m_rModel.getController(); + pController->addUndoActionAndInvalidate(new OUndoContainerAction(m_pImpl->m_rModel + ,rptui::Removed + ,xFunctions.get() + ,xIface + ,RID_STR_UNDO_ADDFUNCTION)); } } } - + if ( xIface.is() ) RemoveElement(xIface); @@ -607,6 +541,7 @@ void OXUndoEnvironment::switchListening( const Reference< XIndexAccess >& _rxCon // 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?" ); if ( xSimpleContainer.is() ) { if ( _bStartListening ) @@ -651,6 +586,7 @@ void OXUndoEnvironment::switchListening( const Reference< XInterface >& _rxObjec } catch( const Exception& ) { + //OSL_ENSURE( sal_False, "OXUndoEnvironment::switchListening: caught an exception!" ); } } diff --git a/reportdesign/source/core/sdr/formatnormalizer.cxx b/reportdesign/source/core/sdr/formatnormalizer.cxx index 9dd4730c81ff..af475726bfa0 100644 --- a/reportdesign/source/core/sdr/formatnormalizer.cxx +++ b/reportdesign/source/core/sdr/formatnormalizer.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ #include <com/sun/star/util/XNumberFormatTypes.hpp> /** === end UNO includes === **/ -#include <dbaccess/dbsubcomponentcontroller.hxx> +#include <dbaccess/singledoccontroller.hxx> #include <unotools/syslocale.hxx> #include <connectivity/statementcomposer.hxx> #include <connectivity/dbtools.hxx> @@ -68,20 +68,20 @@ namespace rptui //==================================================================== //= FormatNormalizer //==================================================================== - DBG_NAME(rpt_FormatNormalizer) + DBG_NAME(rpt_FormatNormalizer) //-------------------------------------------------------------------- FormatNormalizer::FormatNormalizer( const OReportModel& _rModel ) :m_rModel( _rModel ) ,m_xReportDefinition( ) ,m_bFieldListDirty( true ) { - DBG_CTOR(rpt_FormatNormalizer,NULL); + DBG_CTOR(rpt_FormatNormalizer,NULL); } //-------------------------------------------------------------------- FormatNormalizer::~FormatNormalizer() { - DBG_DTOR(rpt_FormatNormalizer,NULL); + DBG_DTOR(rpt_FormatNormalizer,NULL); } //-------------------------------------------------------------------- @@ -127,9 +127,9 @@ namespace rptui //-------------------------------------------------------------------- void FormatNormalizer::impl_onDefinitionPropertyChange( const ::rtl::OUString& _rChangedPropName ) { - if ( !_rChangedPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Command" ) ) - && !_rChangedPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CommandType" ) ) - && !_rChangedPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "EscapeProcessing" ) ) + if ( !_rChangedPropName.equalsAscii( "Command" ) + && !_rChangedPropName.equalsAscii( "CommandType" ) + && !_rChangedPropName.equalsAscii( "EscapeProcessing" ) ) // nothing we're interested in return; @@ -139,7 +139,7 @@ namespace rptui //-------------------------------------------------------------------- void FormatNormalizer::impl_onFormattedProperttyChange( const Reference< XFormattedField >& _rxFormatted, const ::rtl::OUString& _rChangedPropName ) { - if ( !_rChangedPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DataField" ) ) ) + if ( !_rChangedPropName.equalsAscii( "DataField" ) ) // nothing we're interested in return; @@ -187,7 +187,7 @@ namespace rptui if ( !m_xReportDefinition.is() ) return false; - ::dbaui::DBSubComponentController* pController( m_rModel.getController() ); + ::dbaui::OSingleDocumentController* pController( m_rModel.getController() ); OSL_ENSURE( pController, "FormatNormalizer::impl_ensureUpToDateFieldList_nothrow: no controller? how can *this* happen?!" ); if ( !pController ) return false; @@ -247,7 +247,7 @@ namespace rptui if ( sDataField.getStr()[ sDataField.getLength() - 1 ] != ']' ) { // last character is not the closing brace - OSL_FAIL( "FormatNormalizer::impl_adjustFormatToDataFieldType_nothrow: suspicious data field value!" ); + OSL_ENSURE( false, "FormatNormalizer::impl_adjustFormatToDataFieldType_nothrow: suspicious data field value!" ); return; } sDataField = sDataField.copy( sFieldPrefix.getLength(), sDataField.getLength() - sFieldPrefix.getLength() - 1 ); diff --git a/reportdesign/source/core/sdr/formatnormalizer.hxx b/reportdesign/source/core/sdr/formatnormalizer.hxx index a3974f8e9103..f1b6979cc17b 100644 --- a/reportdesign/source/core/sdr/formatnormalizer.hxx +++ b/reportdesign/source/core/sdr/formatnormalizer.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/reportdesign/source/filter/xml/dbloader2.cxx b/reportdesign/source/filter/xml/dbloader2.cxx index 2c66523bb15a..b029a0ddc83a 100644 --- a/reportdesign/source/filter/xml/dbloader2.cxx +++ b/reportdesign/source/filter/xml/dbloader2.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -74,11 +74,11 @@ ORptTypeDetection::ORptTypeDetection(Reference< XComponentContext > const & xCon { ::rtl::OUString sMediaType; xProp->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")) ) >>= sMediaType; - if ( sMediaType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(MIMETYPE_OASIS_OPENDOCUMENT_REPORT_ASCII)) ) + if ( sMediaType.equalsAscii(MIMETYPE_OASIS_OPENDOCUMENT_REPORT_ASCII) ) return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StarBaseReport")); ::comphelper::disposeComponent(xProp); - } - } + } // if ( xProp.is() ) + } catch(Exception&) { } @@ -116,7 +116,7 @@ Sequence< ::rtl::OUString > SAL_CALL ORptTypeDetection::getSupportedServiceNames Sequence< ::rtl::OUString > ORptTypeDetection::getSupportedServiceNames_Static(void) throw( RuntimeException ) { Sequence< ::rtl::OUString > aSNS( 1 ); - aSNS.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ExtendedTypeDetection")); + aSNS.getArray()[0] = ::rtl::OUString::createFromAscii("com.sun.star.document.ExtendedTypeDetection"); return aSNS; } // ----------------------------------------------------------------------------- diff --git a/reportdesign/source/filter/xml/dbloader2.hxx b/reportdesign/source/filter/xml/dbloader2.hxx index b58309ecda91..b7ad819b3a94 100644 --- a/reportdesign/source/filter/xml/dbloader2.hxx +++ b/reportdesign/source/filter/xml/dbloader2.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -84,14 +84,14 @@ public: ORptTypeDetection(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); // XServiceInfo - ::rtl::OUString SAL_CALL getImplementationName() throw( ); - sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw( ); - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ); + ::rtl::OUString SAL_CALL getImplementationName() throw( ); + sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw( ); + ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ); // static methods static ::rtl::OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.ORptTypeDetection")); + return ::rtl::OUString::createFromAscii("com.sun.star.comp.report.ORptTypeDetection"); } static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL diff --git a/reportdesign/source/filter/xml/xmlAutoStyle.cxx b/reportdesign/source/filter/xml/xmlAutoStyle.cxx index e5fec78cda69..b4002229d1f7 100644 --- a/reportdesign/source/filter/xml/xmlAutoStyle.cxx +++ b/reportdesign/source/filter/xml/xmlAutoStyle.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,7 +53,7 @@ void OXMLAutoStylePoolP::exportStyleAttributes( ::std::vector< XMLPropertyState >::const_iterator i = rProperties.begin(); ::std::vector< XMLPropertyState >::const_iterator aEnd = rProperties.end(); for (; i != aEnd ; ++i) - { + { sal_Int16 nContextID = aPropMapper->GetEntryContextId(i->mnIndex); switch (nContextID) { diff --git a/reportdesign/source/filter/xml/xmlAutoStyle.hxx b/reportdesign/source/filter/xml/xmlAutoStyle.hxx index ece3c364b7d6..abdd342b0c80 100644 --- a/reportdesign/source/filter/xml/xmlAutoStyle.hxx +++ b/reportdesign/source/filter/xml/xmlAutoStyle.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#ifndef RPT_XMLAUTOSTYLE_HXX +#ifndef RPT_XMLAUTOSTYLE_HXX #define RPT_XMLAUTOSTYLE_HXX #include <xmloff/maptype.hxx> diff --git a/reportdesign/source/filter/xml/xmlCell.cxx b/reportdesign/source/filter/xml/xmlCell.cxx index 868a73002315..9548d62fba8a 100644 --- a/reportdesign/source/filter/xml/xmlCell.cxx +++ b/reportdesign/source/filter/xml/xmlCell.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -75,7 +75,7 @@ OXMLCell::OXMLCell( ORptFilter& rImport if ( !m_pCell ) m_pCell = this; - OSL_ENSURE(_xAttrList.is(),"Attribute list is NULL!"); + OSL_ENSURE(_xAttrList.is(),"Attribute list is NULL!"); const SvXMLNamespaceMap& rMap = rImport.GetNamespaceMap(); const SvXMLTokenMap& rTokenMap = rImport.GetColumnTokenMap(); @@ -116,7 +116,7 @@ SvXMLImportContext* OXMLCell::CreateChildContext( { SvXMLImportContext *pContext = 0; ORptFilter& rImport = GetOwnImport(); - const SvXMLTokenMap& rTokenMap = rImport.GetCellElemTokenMap(); + const SvXMLTokenMap& rTokenMap = rImport.GetCellElemTokenMap(); Reference<XMultiServiceFactory> xFactor(rImport.GetModel(),uno::UNO_QUERY); static const ::rtl::OUString s_sStringConcat(RTL_CONSTASCII_USTRINGPARAM(" & ")); @@ -140,7 +140,7 @@ SvXMLImportContext* OXMLCell::CreateChildContext( rImport.GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP ); uno::Reference< uno::XInterface> xInt = xFactor->createInstance(SERVICE_FORMATTEDFIELD); Reference< report::XFormattedField > xControl(xInt,uno::UNO_QUERY); - + OSL_ENSURE(xControl.is(),"Could not create FormattedField!"); setComponent(xControl.get()); if ( xControl.is() ) @@ -151,7 +151,7 @@ SvXMLImportContext* OXMLCell::CreateChildContext( { rImport.GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP ); Reference< XImageControl > xControl(xFactor->createInstance(SERVICE_IMAGECONTROL),uno::UNO_QUERY); - + OSL_ENSURE(xControl.is(),"Could not create ImageControl!"); setComponent(xControl.get()); if ( xControl.is() ) @@ -215,7 +215,7 @@ void OXMLCell::EndElement() uno::Reference< uno::XInterface> xInt = xFactor->createInstance(SERVICE_FORMATTEDFIELD); Reference< report::XFormattedField > xControl(xInt,uno::UNO_QUERY); xControl->setDataField(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:")) + m_sText); - + OSL_ENSURE(xControl.is(),"Could not create FormattedField!"); setComponent(xControl.get()); m_xComponent = xControl.get(); @@ -245,7 +245,7 @@ void OXMLCell::EndElement() } catch(uno::Exception&) { - OSL_FAIL("OXMLCell::EndElement -> exception catched"); + OSL_ENSURE(0,"OXMLCell::EndElement -> exception catched"); } } } @@ -258,8 +258,8 @@ ORptFilter& OXMLCell::GetOwnImport() return static_cast<ORptFilter&>(GetImport()); } // ----------------------------------------------------------------------------- -void OXMLCell::setComponent(const uno::Reference< report::XReportComponent >& _xComponent) -{ +void OXMLCell::setComponent(const uno::Reference< report::XReportComponent >& _xComponent) +{ m_pCell->m_xComponent = _xComponent; m_xComponent = _xComponent; } @@ -274,7 +274,7 @@ void OXMLCell::Characters( const ::rtl::OUString& rChars ) static const ::rtl::OUString s_sStringConcat(RTL_CONSTASCII_USTRINGPARAM(" & ")); m_sText += s_sStringConcat; } - + m_sText += s_Quote + rChars + s_Quote; } } diff --git a/reportdesign/source/filter/xml/xmlCell.hxx b/reportdesign/source/filter/xml/xmlCell.hxx index e5cdcbda48f5..8360a691f599 100644 --- a/reportdesign/source/filter/xml/xmlCell.hxx +++ b/reportdesign/source/filter/xml/xmlCell.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ namespace rptxml class OXMLTable; class OXMLCell : public SvXMLImportContext { - ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent > m_xComponent; + ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent > m_xComponent; OXMLTable* m_pContainer; OXMLCell* m_pCell; ::rtl::OUString m_sStyleName; diff --git a/reportdesign/source/filter/xml/xmlColumn.cxx b/reportdesign/source/filter/xml/xmlColumn.cxx index a6599cce79ff..3f90b9bc0d28 100644 --- a/reportdesign/source/filter/xml/xmlColumn.cxx +++ b/reportdesign/source/filter/xml/xmlColumn.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -101,7 +101,7 @@ SvXMLImportContext* OXMLRowColumn::CreateChildContext( { SvXMLImportContext *pContext = 0; ORptFilter& rImport = GetOwnImport(); - const SvXMLTokenMap& rTokenMap = rImport.GetColumnTokenMap(); + const SvXMLTokenMap& rTokenMap = rImport.GetColumnTokenMap(); switch( rTokenMap.Get( nPrefix, rLocalName ) ) { @@ -142,9 +142,9 @@ void OXMLRowColumn::fillStyle(const ::rtl::OUString& _sStyleName) { PropertySetInfo* pInfo = new PropertySetInfo(); static PropertyMapEntry pMap[] = - { - {PROPERTY_WIDTH, static_cast<sal_uInt16>(PROPERTY_WIDTH.length), PROPERTY_ID_WIDTH, &::getCppuType(static_cast< sal_Int32* >( NULL )) ,PropertyAttribute::BOUND,0}, - {PROPERTY_HEIGHT, static_cast<sal_uInt16>(PROPERTY_HEIGHT.length), PROPERTY_ID_HEIGHT, &::getCppuType(static_cast< sal_Int32* >( NULL )) ,PropertyAttribute::BOUND,0}, + { + {PROPERTY_WIDTH, static_cast<sal_uInt16>(PROPERTY_WIDTH.length), PROPERTY_ID_WIDTH, &::getCppuType(static_cast< sal_Int32* >( NULL )) ,PropertyAttribute::BOUND,0}, + {PROPERTY_HEIGHT, static_cast<sal_uInt16>(PROPERTY_HEIGHT.length), PROPERTY_ID_HEIGHT, &::getCppuType(static_cast< sal_Int32* >( NULL )) ,PropertyAttribute::BOUND,0}, { NULL, 0, 0, NULL, 0, 0 } }; pInfo->add(pMap); @@ -157,7 +157,7 @@ void OXMLRowColumn::fillStyle(const ::rtl::OUString& _sStyleName) xProp->getPropertyValue(PROPERTY_WIDTH) >>= nWidth; m_pContainer->addWidth(nWidth); } - else + else { pAutoStyle = PTR_CAST(XMLPropStyleContext,pAutoStyles->FindStyleChildContext(XML_STYLE_FAMILY_TABLE_ROW,_sStyleName)); if ( pAutoStyle ) diff --git a/reportdesign/source/filter/xml/xmlColumn.hxx b/reportdesign/source/filter/xml/xmlColumn.hxx index 21a53a3221c9..47c57dbb78ee 100644 --- a/reportdesign/source/filter/xml/xmlColumn.hxx +++ b/reportdesign/source/filter/xml/xmlColumn.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/reportdesign/source/filter/xml/xmlComponent.cxx b/reportdesign/source/filter/xml/xmlComponent.cxx index aa8da4c42b62..cbe97b2a7102 100644 --- a/reportdesign/source/filter/xml/xmlComponent.cxx +++ b/reportdesign/source/filter/xml/xmlComponent.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,13 +57,13 @@ namespace rptxml OXMLComponent::OXMLComponent( ORptFilter& _rImport ,sal_uInt16 nPrfx ,const ::rtl::OUString& _sLocalName - ,const Reference< XAttributeList > & _xAttrList - ,const Reference< XReportComponent > & _xComponent + ,const Reference< XAttributeList > & _xAttrList + ,const Reference< XReportComponent > & _xComponent ) : SvXMLImportContext( _rImport, nPrfx, _sLocalName ) ,m_xComponent(_xComponent) { - DBG_CTOR( rpt_OXMLComponent,NULL); + DBG_CTOR( rpt_OXMLComponent,NULL); OSL_ENSURE(_xAttrList.is(),"Attribute list is NULL!"); OSL_ENSURE(m_xComponent.is(),"Component is NULL!"); @@ -72,7 +72,7 @@ OXMLComponent::OXMLComponent( ORptFilter& _rImport const sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0; static const ::rtl::OUString s_sTRUE = ::xmloff::token::GetXMLToken(XML_TRUE); - + for(sal_Int16 i = 0; i < nLength; ++i) { try @@ -84,7 +84,7 @@ OXMLComponent::OXMLComponent( ORptFilter& _rImport switch( rTokenMap.Get( nPrefix, sLocalName ) ) { - case XML_TOK_NAME: + case XML_TOK_NAME: m_xComponent->setName(sValue); break; case XML_TOK_TEXT_STYLE_NAME: @@ -98,15 +98,15 @@ OXMLComponent::OXMLComponent( ORptFilter& _rImport } catch(const Exception&) { - OSL_FAIL("Exception catched while putting props into report component!"); + OSL_ENSURE(0,"Exception catched while putting props into report component!"); } - } + } } // ----------------------------------------------------------------------------- OXMLComponent::~OXMLComponent() { - DBG_DTOR( rpt_OXMLComponent,NULL); + DBG_DTOR( rpt_OXMLComponent,NULL); } // ----------------------------------------------------------------------------- //---------------------------------------------------------------------------- diff --git a/reportdesign/source/filter/xml/xmlComponent.hxx b/reportdesign/source/filter/xml/xmlComponent.hxx index 9797b8e2d632..217de3669d55 100644 --- a/reportdesign/source/filter/xml/xmlComponent.hxx +++ b/reportdesign/source/filter/xml/xmlComponent.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,12 +38,12 @@ namespace rptxml class OXMLComponent : public SvXMLImportContext { protected: - ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent > m_xComponent; + ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent > m_xComponent; ::rtl::OUString m_sName; ::rtl::OUString m_sTextStyleName; - + OXMLComponent(const OXMLComponent&); - OXMLComponent operator =(const OXMLComponent&); + void operator =(const OXMLComponent&); public: OXMLComponent( ORptFilter& rImport diff --git a/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx b/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx index 56eb0c4eabb9..30d27143f193 100644 --- a/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx +++ b/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -70,18 +70,18 @@ OXMLCondPrtExpr::OXMLCondPrtExpr( ORptFilter& _rImport, switch( rTokenMap.Get( nPrefix, sLocalName ) ) { - case XML_TOK_FUNCTION_FORMULA: + case XML_TOK_FUNCTION_FORMULA: m_xComponent->setPropertyValue(PROPERTY_CONDITIONALPRINTEXPRESSION,uno::makeAny(ORptFilter::convertFormula(sValue))); break; default: break; } - + } } catch(const Exception&) { - OSL_FAIL("Exception catched while putting Function props!"); + OSL_ENSURE(0,"Exception catched while putting Function props!"); } } // ----------------------------------------------------------------------------- diff --git a/reportdesign/source/filter/xml/xmlCondPrtExpr.hxx b/reportdesign/source/filter/xml/xmlCondPrtExpr.hxx index c7af29faf9c6..fd457de45218 100644 --- a/reportdesign/source/filter/xml/xmlCondPrtExpr.hxx +++ b/reportdesign/source/filter/xml/xmlCondPrtExpr.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ namespace rptxml class ORptFilter; class OXMLCondPrtExpr : public SvXMLImportContext { - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xComponent; + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xComponent; OXMLCondPrtExpr(const OXMLCondPrtExpr&); void operator =(const OXMLCondPrtExpr&); public: diff --git a/reportdesign/source/filter/xml/xmlControlProperty.cxx b/reportdesign/source/filter/xml/xmlControlProperty.cxx index 1de438f425ea..f2d039d319df 100644 --- a/reportdesign/source/filter/xml/xmlControlProperty.cxx +++ b/reportdesign/source/filter/xml/xmlControlProperty.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,9 +38,9 @@ #include <unotools/datetime.hxx> #include <com/sun/star/util/DateTime.hpp> -#define TYPE_DATE 1 -#define TYPE_TIME 2 -#define TYPE_DATETIME 3 +#define TYPE_DATE 1 +#define TYPE_TIME 2 +#define TYPE_DATETIME 3 namespace rptxml { @@ -67,7 +67,7 @@ OXMLControlProperty::OXMLControlProperty( ORptFilter& rImport OSL_ENSURE(_xAttrList.is(),"Attribute list is NULL!"); OSL_ENSURE(m_xControl.is(),"Control is NULL!"); - + const SvXMLNamespaceMap& rMap = rImport.GetNamespaceMap(); const SvXMLTokenMap& rTokenMap = rImport.GetControlPropertyElemTokenMap(); @@ -82,7 +82,7 @@ OXMLControlProperty::OXMLControlProperty( ORptFilter& rImport switch( rTokenMap.Get( nPrefix, sLocalName ) ) { case XML_TOK_LIST_PROPERTY: - m_bIsList = sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("true")); + m_bIsList = sValue.equalsAscii("true"); break; case XML_TOK_VALUE_TYPE: { @@ -91,15 +91,15 @@ OXMLControlProperty::OXMLControlProperty( ORptFilter& rImport static MapString2Type s_aTypeNameMap; if (!s_aTypeNameMap.size()) { - s_aTypeNameMap[GetXMLToken( XML_BOOLEAN)] = ::getBooleanCppuType(); - s_aTypeNameMap[GetXMLToken( XML_FLOAT)] = ::getCppuType( static_cast< double* >(NULL) ); - s_aTypeNameMap[GetXMLToken( XML_DOUBLE)] = ::getCppuType( static_cast< double* >(NULL) ); - s_aTypeNameMap[GetXMLToken( XML_STRING)] = ::getCppuType( static_cast< ::rtl::OUString* >(NULL) ); - s_aTypeNameMap[GetXMLToken( XML_INT)] = ::getCppuType( static_cast< sal_Int32* >(NULL) ); - s_aTypeNameMap[GetXMLToken( XML_SHORT)] = ::getCppuType( static_cast< sal_Int16* >(NULL) ); - s_aTypeNameMap[GetXMLToken( XML_DATE)] = ::getCppuType( static_cast< com::sun::star::util::Date* >(NULL) ); - s_aTypeNameMap[GetXMLToken( XML_TIME)] = ::getCppuType( static_cast< com::sun::star::util::Time* >(NULL) ); - s_aTypeNameMap[GetXMLToken( XML_VOID)] = ::getVoidCppuType(); + s_aTypeNameMap[GetXMLToken( XML_BOOLEAN)] = ::getBooleanCppuType(); + s_aTypeNameMap[GetXMLToken( XML_FLOAT)] = ::getCppuType( static_cast< double* >(NULL) ); + s_aTypeNameMap[GetXMLToken( XML_DOUBLE)] = ::getCppuType( static_cast< double* >(NULL) ); + s_aTypeNameMap[GetXMLToken( XML_STRING)] = ::getCppuType( static_cast< ::rtl::OUString* >(NULL) ); + s_aTypeNameMap[GetXMLToken( XML_INT)] = ::getCppuType( static_cast< sal_Int32* >(NULL) ); + s_aTypeNameMap[GetXMLToken( XML_SHORT)] = ::getCppuType( static_cast< sal_Int16* >(NULL) ); + s_aTypeNameMap[GetXMLToken( XML_DATE)] = ::getCppuType( static_cast< com::sun::star::util::Date* >(NULL) ); + s_aTypeNameMap[GetXMLToken( XML_TIME)] = ::getCppuType( static_cast< com::sun::star::util::Time* >(NULL) ); + s_aTypeNameMap[GetXMLToken( XML_VOID)] = ::getVoidCppuType(); } const ConstMapString2TypeIterator aTypePos = s_aTypeNameMap.find(sValue); @@ -115,7 +115,7 @@ OXMLControlProperty::OXMLControlProperty( ORptFilter& rImport break; } } - + } // ----------------------------------------------------------------------------- @@ -131,7 +131,7 @@ SvXMLImportContext* OXMLControlProperty::CreateChildContext( { SvXMLImportContext *pContext = 0; ORptFilter& rImport = GetOwnImport(); - const SvXMLTokenMap& rTokenMap = rImport.GetControlPropertyElemTokenMap(); + const SvXMLTokenMap& rTokenMap = rImport.GetControlPropertyElemTokenMap(); switch( rTokenMap.Get( nPrefix, rLocalName ) ) { @@ -165,7 +165,7 @@ void OXMLControlProperty::EndElement() } catch(const Exception&) { - OSL_FAIL("Unknown property found!"); + OSL_ENSURE(0,"Unknown property found!"); } } } @@ -184,7 +184,7 @@ void OXMLControlProperty::addValue(const ::rtl::OUString& _sValue) if ( !m_bIsList ) m_aSetting.Value = aValue; - else + else { sal_Int32 nPos = m_aSequence.getLength(); m_aSequence.realloc(nPos+1); @@ -203,7 +203,7 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe Any aReturn; switch (_rExpectedType.getTypeClass()) { - case TypeClass_BOOLEAN: // sal_Bool + case TypeClass_BOOLEAN: // sal_Bool { bool bValue; #if OSL_DEBUG_LEVEL > 0 @@ -212,14 +212,14 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe rImporter.GetMM100UnitConverter().convertBool(bValue, _rReadCharacters); OSL_ENSURE(bSuccess, ::rtl::OString("OXMLControlProperty::convertString: could not convert \"") - += ::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(), RTL_TEXTENCODING_ASCII_US) - += ::rtl::OString("\" into a boolean!")); + += ::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(), RTL_TEXTENCODING_ASCII_US) + += ::rtl::OString("\" into a boolean!")); aReturn <<= bValue; } break; - case TypeClass_SHORT: // sal_Int16 - case TypeClass_LONG: // sal_Int32 - { // it's a real int32/16 property + case TypeClass_SHORT: // sal_Int16 + case TypeClass_LONG: // sal_Int32 + { // it's a real int32/16 property sal_Int32 nValue(0); #if OSL_DEBUG_LEVEL > 0 sal_Bool bSuccess = @@ -227,8 +227,8 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe rImporter.GetMM100UnitConverter().convertNumber(nValue, _rReadCharacters); OSL_ENSURE(bSuccess, ::rtl::OString("OXMLControlProperty::convertString: could not convert \"") - += ::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(), RTL_TEXTENCODING_ASCII_US) - += ::rtl::OString("\" into an integer!")); + += ::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(), RTL_TEXTENCODING_ASCII_US) + += ::rtl::OString("\" into an integer!")); if (TypeClass_SHORT == _rExpectedType.getTypeClass()) aReturn <<= (sal_Int16)nValue; else @@ -237,7 +237,7 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe } case TypeClass_HYPER: { - OSL_FAIL("OXMLControlProperty::convertString: 64-bit integers not implemented yet!"); + OSL_ENSURE(sal_False, "OXMLControlProperty::convertString: 64-bit integers not implemented yet!"); } break; case TypeClass_DOUBLE: @@ -249,8 +249,8 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe rImporter.GetMM100UnitConverter().convertDouble(nValue, _rReadCharacters); OSL_ENSURE(bSuccess, ::rtl::OString("OXMLControlProperty::convertString: could not convert \"") - += ::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(), RTL_TEXTENCODING_ASCII_US) - += ::rtl::OString("\" into a double!")); + += ::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(), RTL_TEXTENCODING_ASCII_US) + += ::rtl::OString("\" into a double!")); aReturn <<= (double)nValue; } break; @@ -260,11 +260,11 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe case TypeClass_STRUCT: { // recognized structs: - static ::com::sun::star::uno::Type s_aDateType = ::getCppuType(static_cast< ::com::sun::star::util::Date* >(NULL)); - static ::com::sun::star::uno::Type s_aTimeType = ::getCppuType(static_cast< ::com::sun::star::util::Time* >(NULL)); - static ::com::sun::star::uno::Type s_aDateTimeType = ::getCppuType(static_cast< ::com::sun::star::util::DateTime* >(NULL)); + static ::com::sun::star::uno::Type s_aDateType = ::getCppuType(static_cast< ::com::sun::star::util::Date* >(NULL)); + static ::com::sun::star::uno::Type s_aTimeType = ::getCppuType(static_cast< ::com::sun::star::util::Time* >(NULL)); + static ::com::sun::star::uno::Type s_aDateTimeType = ::getCppuType(static_cast< ::com::sun::star::util::DateTime* >(NULL)); sal_Int32 nType = 0; - if ( _rExpectedType.equals(s_aDateType) ) + if ( _rExpectedType.equals(s_aDateType) ) nType = TYPE_DATE; else if ( _rExpectedType.equals(s_aTimeType) ) nType = TYPE_TIME; @@ -280,8 +280,8 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe rImporter.GetMM100UnitConverter().convertDouble(nValue, _rReadCharacters); OSL_ENSURE(bSuccess, ::rtl::OString("OPropertyImport::convertString: could not convert \"") - += ::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(), RTL_TEXTENCODING_ASCII_US) - += ::rtl::OString("\" into a double!")); + += ::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(), RTL_TEXTENCODING_ASCII_US) + += ::rtl::OString("\" into a double!")); // then convert it into the target type switch (nType) @@ -321,11 +321,11 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe } } else - OSL_FAIL("OPropertyImport::convertString: unsupported property type!"); + OSL_ENSURE(sal_False, "OPropertyImport::convertString: unsupported property type!"); } break; default: - OSL_FAIL("OXMLControlProperty::convertString: invalid type class!"); + OSL_ENSURE(sal_False, "OXMLControlProperty::convertString: invalid type class!"); } return aReturn; diff --git a/reportdesign/source/filter/xml/xmlControlProperty.hxx b/reportdesign/source/filter/xml/xmlControlProperty.hxx index 6335f993e00e..646a7e1ee93a 100644 --- a/reportdesign/source/filter/xml/xmlControlProperty.hxx +++ b/reportdesign/source/filter/xml/xmlControlProperty.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,7 +44,7 @@ namespace rptxml ::com::sun::star::beans::PropertyValue m_aSetting; ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any> m_aSequence; OXMLControlProperty* m_pContainer; - ::com::sun::star::uno::Type m_aPropType; // the type of the property the instance imports currently + ::com::sun::star::uno::Type m_aPropType; // the type of the property the instance imports currently sal_Bool m_bIsList; ORptFilter& GetOwnImport(); @@ -71,7 +71,7 @@ namespace rptxml /** adds value to property - @param _sValue + @param _sValue The value to add. */ void addValue(const ::rtl::OUString& _sValue); diff --git a/reportdesign/source/filter/xml/xmlEnums.hxx b/reportdesign/source/filter/xml/xmlEnums.hxx index 6986a36c4f9e..af293e902c45 100644 --- a/reportdesign/source/filter/xml/xmlEnums.hxx +++ b/reportdesign/source/filter/xml/xmlEnums.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,16 +45,16 @@ namespace rptxml enum XMLReportToken { XML_TOK_REPORT_HEADER, - XML_TOK_PAGE_HEADER , + XML_TOK_PAGE_HEADER , XML_TOK_GROUP, - XML_TOK_DETAIL , - XML_TOK_PAGE_FOOTER , + XML_TOK_DETAIL , + XML_TOK_PAGE_FOOTER , XML_TOK_REPORT_FOOTER, - XML_TOK_HEADER_ON_NEW_PAGE , - XML_TOK_FOOTER_ON_NEW_PAGE , - XML_TOK_COMMAND_TYPE , - XML_TOK_COMMAND , - XML_TOK_FILTER , + XML_TOK_HEADER_ON_NEW_PAGE , + XML_TOK_FOOTER_ON_NEW_PAGE , + XML_TOK_COMMAND_TYPE , + XML_TOK_COMMAND , + XML_TOK_FILTER , XML_TOK_CAPTION , XML_TOK_ESCAPE_PROCESSING , XML_TOK_REPORT_FUNCTION , @@ -66,26 +66,26 @@ namespace rptxml }; enum XMLGroup { - XML_TOK_START_NEW_COLUMN , - XML_TOK_RESET_PAGE_NUMBER , - XML_TOK_PRINT_HEADER_ON_EACH_PAGE , - XML_TOK_GROUP_EXPRESSION , - XML_TOK_GROUP_HEADER , + XML_TOK_START_NEW_COLUMN , + XML_TOK_RESET_PAGE_NUMBER , + XML_TOK_PRINT_HEADER_ON_EACH_PAGE , + XML_TOK_GROUP_EXPRESSION , + XML_TOK_GROUP_HEADER , XML_TOK_GROUP_GROUP , XML_TOK_GROUP_DETAIL , - XML_TOK_GROUP_FOOTER , - XML_TOK_SORT_ASCENDING , - XML_TOK_GROUP_FUNCTION , + XML_TOK_GROUP_FOOTER , + XML_TOK_SORT_ASCENDING , + XML_TOK_GROUP_FUNCTION , XML_TOK_GROUP_KEEP_TOGETHER }; enum XMLSection { XML_TOK_SECTION_NAME, XML_TOK_TABLE, - XML_TOK_VISIBLE , - XML_TOK_FORCE_NEW_PAGE , - XML_TOK_FORCE_NEW_COLUMN , - XML_TOK_KEEP_TOGETHER , + XML_TOK_VISIBLE , + XML_TOK_FORCE_NEW_PAGE , + XML_TOK_FORCE_NEW_COLUMN , + XML_TOK_KEEP_TOGETHER , XML_TOK_REPEAT_SECTION, XML_TOK_PAGE_PRINT_OPTION, XML_TOK_SECT_STYLE_NAME @@ -119,13 +119,13 @@ namespace rptxml ,XML_TOK_COV_CELL ,XML_TOK_NUMBER_COLUMNS_SPANNED ,XML_TOK_NUMBER_ROWS_SPANNED - ,XML_TOK_TEXT_STYLE_NAME + ,XML_TOK_TEXT_STYLE_NAME ,XML_TOK_TRANSFORM ,XML_TOK_CONDITIONAL_PRINT_EXPRESSION }; enum XMLReportElement { - XML_TOK_PRINT_ONLY_WHEN_GROUP_CHANGE + XML_TOK_PRINT_ONLY_WHEN_GROUP_CHANGE ,XML_TOK_REP_CONDITIONAL_PRINT_EXPRESSION ,XML_TOK_PRINT_REPEATED_VALUES ,XML_TOK_COMPONENT @@ -133,19 +133,19 @@ namespace rptxml }; enum XMLControlProperty { - XML_TOK_PROPERTY_NAME - ,XML_TOK_VALUE_TYPE - ,XML_TOK_LIST_PROPERTY - ,XML_TOK_VALUE - ,XML_TOK_CURRENCY - ,XML_TOK_DATE_VALUE - ,XML_TOK_TIME_VALUE - ,XML_TOK_STRING_VALUE + XML_TOK_PROPERTY_NAME + ,XML_TOK_VALUE_TYPE + ,XML_TOK_LIST_PROPERTY + ,XML_TOK_VALUE + ,XML_TOK_CURRENCY + ,XML_TOK_DATE_VALUE + ,XML_TOK_TIME_VALUE + ,XML_TOK_STRING_VALUE ,XML_TOK_BOOLEAN_VALUE ,XML_TOK_PROPERTIES ,XML_TOK_SIZE ,XML_TOK_IMAGE_DATA - ,XML_TOK_IMAGE_POSITION + ,XML_TOK_IMAGE_POSITION ,XML_TOK_IMAGE_ALIGN ,XML_TOK_SCALE ,XML_TOK_LABEL @@ -173,7 +173,7 @@ namespace rptxml ,XML_TOK_ENABLED ,XML_TOK_FORMULA }; - + // ----------------------------------------------------------------------------- } // namespace rptxml // ----------------------------------------------------------------------------- diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx index 767fc340d1f8..a99de7c06b11 100644 --- a/reportdesign/source/filter/xml/xmlExport.cxx +++ b/reportdesign/source/filter/xml/xmlExport.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,7 +26,7 @@ * ************************************************************************/ #include "precompiled_reportdesign.hxx" - + #include "xmlExport.hxx" #include "xmlAutoStyle.hxx" #include <xmloff/ProgressBarHelper.hxx> @@ -88,13 +88,13 @@ namespace rptxml //--------------------------------------------------------------------- ::rtl::OUString ORptExportHelper::getImplementationName_Static( ) throw (RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.XMLSettingsExporter")); + return ::rtl::OUString::createFromAscii("com.sun.star.comp.report.XMLSettingsExporter"); } //--------------------------------------------------------------------- Sequence< ::rtl::OUString > ORptExportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException) { Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ExportFilter")); + aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.document.ExportFilter"); return aSupported; } //--------------------------------------------------------------------- @@ -105,13 +105,13 @@ namespace rptxml //--------------------------------------------------------------------- ::rtl::OUString ORptContentExportHelper::getImplementationName_Static( ) throw (RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.XMLContentExporter")); + return ::rtl::OUString::createFromAscii("com.sun.star.comp.report.XMLContentExporter"); } //--------------------------------------------------------------------- Sequence< ::rtl::OUString > ORptContentExportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException) { Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ExportFilter")); + aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.document.ExportFilter"); return aSupported; } @@ -124,13 +124,13 @@ namespace rptxml //--------------------------------------------------------------------- ::rtl::OUString ORptStylesExportHelper::getImplementationName_Static( ) throw (RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.XMLStylesExporter")); + return ::rtl::OUString::createFromAscii("com.sun.star.comp.report.XMLStylesExporter"); } //--------------------------------------------------------------------- Sequence< ::rtl::OUString > ORptStylesExportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException) { Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ExportFilter")); + aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.document.ExportFilter"); return aSupported; } @@ -142,16 +142,16 @@ namespace rptxml //--------------------------------------------------------------------- ::rtl::OUString ORptMetaExportHelper::getImplementationName_Static( ) throw (RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.XMLMetaExporter")); + return ::rtl::OUString::createFromAscii("com.sun.star.comp.report.XMLMetaExporter"); } //--------------------------------------------------------------------- Sequence< ::rtl::OUString > ORptMetaExportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException) { Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ExportFilter")); + aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.document.ExportFilter"); return aSupported; } - + //--------------------------------------------------------------------- Reference< XInterface > ODBFullExportHelper::create(Reference< XComponentContext > const & xContext) { @@ -160,16 +160,16 @@ namespace rptxml //--------------------------------------------------------------------- ::rtl::OUString ODBFullExportHelper::getImplementationName_Static( ) throw (RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.XMLFullExporter")); + return ::rtl::OUString::createFromAscii("com.sun.star.comp.report.XMLFullExporter"); } //--------------------------------------------------------------------- Sequence< ::rtl::OUString > ODBFullExportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException) { Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ExportFilter")); + aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.document.ExportFilter"); return aSupported; } - + //--------------------------------------------------------------------- class OSpecialHanldeXMLExportPropertyMapper : public SvXMLExportPropertyMapper @@ -240,8 +240,8 @@ ORptExport::ORptExport(const Reference< XMultiServiceFactory >& _rxMSF,sal_uInt1 _GetNamespaceMap().Add( GetXMLToken(XML_NP_FORM), GetXMLToken(XML_N_FORM), XML_NAMESPACE_FORM ); _GetNamespaceMap().Add( GetXMLToken(XML_NP_DRAW), GetXMLToken(XML_N_DRAW), XML_NAMESPACE_DRAW ); _GetNamespaceMap().Add( GetXMLToken(XML_NP_TEXT), GetXMLToken(XML_N_TEXT), XML_NAMESPACE_TEXT ); - - + + if( (getExportFlags() & (EXPORT_STYLES|EXPORT_MASTERSTYLES|EXPORT_AUTOSTYLES|EXPORT_FONTDECLS) ) != 0 ) _GetNamespaceMap().Add( GetXMLToken(XML_NP_FO), GetXMLToken(XML_N_FO_COMPAT), XML_NAMESPACE_FO ); @@ -275,15 +275,16 @@ ORptExport::ORptExport(const Reference< XMultiServiceFactory >& _rxMSF,sal_uInt1 m_sTableStyle = GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_TABLE, GetXMLToken(XML_STYLE_NAME) ); m_sColumnStyle = GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_TABLE, GetXMLToken(XML_COLUMN) ); m_sCellStyle = GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_REPORT, GetXMLToken(XML_STYLE_NAME) ); - + m_xPropHdlFactory = new OXMLRptPropHdlFactory(); UniReference < XMLPropertyHandlerFactory> xFac = new ::xmloff::OControlPropertyHandlerFactory(); UniReference < XMLPropertySetMapper > xTableStylesPropertySetMapper1 = new XMLPropertySetMapper(OXMLHelper::GetTableStyleProps(),xFac); UniReference < XMLPropertySetMapper > xTableStylesPropertySetMapper2 = new XMLTextPropertySetMapper(TEXT_PROP_MAP_TABLE_DEFAULTS ); xTableStylesPropertySetMapper1->AddMapperEntry(xTableStylesPropertySetMapper2); - + m_xTableStylesExportPropertySetMapper = new SvXMLExportPropertyMapper(xTableStylesPropertySetMapper1); + //m_xTableStylesExportPropertySetMapper->ChainExportMapper(xTableStylesPropertySetMapper2); m_xCellStylesPropertySetMapper = OXMLHelper::GetCellStylePropertyMap(); m_xCellStylesExportPropertySetMapper = new OSpecialHanldeXMLExportPropertyMapper(m_xCellStylesPropertySetMapper); @@ -297,6 +298,7 @@ ORptExport::ORptExport(const Reference< XMultiServiceFactory >& _rxMSF,sal_uInt1 UniReference < XMLPropertySetMapper > xPropMapper(new XMLTextPropertySetMapper( TEXT_PROP_MAP_PARA )); m_xParaPropMapper = new OSpecialHanldeXMLExportPropertyMapper( xPropMapper); + // m_xParaPropMapper->ChainExportMapper(XMLTextParagraphExport::CreateParaExtPropMapper(*this)); ::rtl::OUString sFamily( GetXMLToken(XML_PARAGRAPH) ); ::rtl::OUString aPrefix( String( 'P' ) ); @@ -334,7 +336,7 @@ uno::Sequence< ::rtl::OUString > ORptExport::getSupportedServiceNames_Static( ) { uno::Sequence< ::rtl::OUString > aServices(1); aServices.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ExportFilter")); - + return aServices; } //-------------------------------------------------------------------------- @@ -386,7 +388,7 @@ void ORptExport::exportMasterDetailFields(const Reference<XReportComponent>& _xR const ::rtl::OUString* pDetailFieldsIter = aDetailFields.getConstArray(); const ::rtl::OUString* pIter = aMasterFields.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aMasterFields.getLength(); + const ::rtl::OUString* pEnd = pIter + aMasterFields.getLength(); for(;pIter != pEnd;++pIter,++pDetailFieldsIter) { AddAttribute( XML_NAMESPACE_REPORT, XML_MASTER , *pIter ); @@ -396,19 +398,20 @@ void ORptExport::exportMasterDetailFields(const Reference<XReportComponent>& _xR } } } -// ----------------------------------------------------------------------------- +// ----------------------------------------------------------------------------- void ORptExport::exportReport(const Reference<XReportDefinition>& _xReportDefinition) { if ( _xReportDefinition.is() ) { exportFunctions(_xReportDefinition->getFunctions().get()); exportGroupsExpressionAsFunction(_xReportDefinition->getGroups()); - + //exportMasterDetailFields(_xReportDefinition.get()); + if ( _xReportDefinition->getReportHeaderOn() ) { SvXMLElementExport aGroupSection(*this,XML_NAMESPACE_REPORT, XML_REPORT_HEADER, sal_True, sal_True); exportSection(_xReportDefinition->getReportHeader()); - } + } // if ( _xReportDefinition->getReportHeaderOn() ) if ( _xReportDefinition->getPageHeaderOn() ) { ::rtl::OUStringBuffer sValue; @@ -416,10 +419,10 @@ void ORptExport::exportReport(const Reference<XReportDefinition>& _xReportDefini const SvXMLEnumMapEntry* aXML_EnumMap = OXMLHelper::GetReportPrintOptions(); if ( SvXMLUnitConverter::convertEnum( sValue, nRet,aXML_EnumMap ) ) AddAttribute(XML_NAMESPACE_REPORT, XML_PAGE_PRINT_OPTION,sValue.makeStringAndClear()); - + SvXMLElementExport aGroupSection(*this,XML_NAMESPACE_REPORT, XML_PAGE_HEADER, sal_True, sal_True); exportSection(_xReportDefinition->getPageHeader(),true); - } + } // if ( _xReportDefinition->getPageHeaderOn() ) exportGroup(_xReportDefinition,0); @@ -432,13 +435,13 @@ void ORptExport::exportReport(const Reference<XReportDefinition>& _xReportDefini AddAttribute(XML_NAMESPACE_REPORT, XML_PAGE_PRINT_OPTION,sValue.makeStringAndClear()); SvXMLElementExport aGroupSection(*this,XML_NAMESPACE_REPORT, XML_PAGE_FOOTER, sal_True, sal_True); exportSection(_xReportDefinition->getPageFooter(),true); - } + } // if ( _xReportDefinition->getPageFooterOn() ) if ( _xReportDefinition->getReportFooterOn() ) { SvXMLElementExport aGroupSection(*this,XML_NAMESPACE_REPORT, XML_REPORT_FOOTER, sal_True, sal_True); exportSection(_xReportDefinition->getReportFooter()); - } - } + } // if ( _xReportDefinition->getReportFooterOn() ) + } } // ----------------------------------------------------------------------------- void ORptExport::exportComponent(const Reference<XReportComponent>& _xReportComponent) @@ -448,7 +451,7 @@ void ORptExport::exportComponent(const Reference<XReportComponent>& _xReportComp return; AddAttribute(XML_NAMESPACE_DRAW, XML_NAME,_xReportComponent->getName()); - + SvXMLElementExport aElem(*this,XML_NAMESPACE_REPORT, XML_REPORT_COMPONENT, sal_False, sal_False); } // ----------------------------------------------------------------------------- @@ -469,11 +472,11 @@ void ORptExport::exportFormatConditions(const Reference<XReportControlModel>& _x exportStyleName(xCond.get(),GetAttrList(),m_sCellStyle); SvXMLElementExport aElem(*this,XML_NAMESPACE_REPORT, XML_FORMAT_CONDITION, sal_True, sal_True); - } - } + } // for (sal_Int32 i = 0; i < nCount ; ++i) + } catch(uno::Exception&) { - OSL_FAIL("Can not access format condition!"); + OSL_ENSURE(0,"Can not access format condition!"); } } // ----------------------------------------------------------------------------- @@ -488,7 +491,7 @@ void ORptExport::exportReportElement(const Reference<XReportControlModel>& _xRep SvXMLElementExport aElem(*this,XML_NAMESPACE_REPORT, XML_REPORT_ELEMENT, sal_True, sal_True); if ( _xReportElement->getCount() ) - { + { exportFormatConditions(_xReportElement); } @@ -497,7 +500,7 @@ void ORptExport::exportReportElement(const Reference<XReportControlModel>& _xRep { exportFormula(XML_FORMULA,sExpr); SvXMLElementExport aPrintExpr(*this,XML_NAMESPACE_REPORT, XML_CONDITIONAL_PRINT_EXPRESSION, sal_True, sal_True); - } + } // if ( sExpr.getLength() ) // only export when parent exists uno::Reference< report::XSection> xParent(_xReportElement->getParent(),uno::UNO_QUERY); @@ -555,7 +558,7 @@ void ORptExport::exportSectionAutoStyle(const Reference<XSection>& _xProp) aRowPos.reserve(2*(nCount + 1)); aRowPos.push_back(0); aRowPos.push_back(_xProp->getHeight()); - + sal_Int32 i; for (i = 0 ; i< nCount ; ++i) { @@ -612,7 +615,7 @@ void ORptExport::exportSectionAutoStyle(const Reference<XSection>& _xProp) sal_Int32 xi = 0; sal_Int32 yi = 0; bool isOverlap = false; - + for (i = 0 ; i< nCount ; ++i) { Reference<XReportComponent> xReportElement(_xProp->getByIndex(i),uno::UNO_QUERY); @@ -672,7 +675,7 @@ void ORptExport::exportSectionAutoStyle(const Reference<XSection>& _xProp) sal_Int32 nColSpan = x2 - x1; sal_Int32 nRowSpan = y2 - y1; - aInsert->second[y1].second[x1] = + aInsert->second[y1].second[x1] = TCell( aElementSize.Width , // -1 why? aElementSize.Height, // -1 why? @@ -716,11 +719,11 @@ void ORptExport::exportReportComponentAutoStyles(const Reference<XSection>& _xPr { uno::Reference< report::XFormatCondition > xCond(xFormattedField->getByIndex(j),uno::UNO_QUERY); exportAutoStyle(xCond.get(),xFormattedField); - } - } + } // for (sal_Int32 j = 0; j < nCount ; ++j) + } catch(uno::Exception&) { - OSL_FAIL("Can not access format condition!"); + OSL_ENSURE(0,"Can not access format condition!"); } } } @@ -732,7 +735,7 @@ void ORptExport::exportSection(const Reference<XSection>& _xSection,bool bHeader OSL_ENSURE(_xSection.is(),"Section is NULL -> GPF"); ::rtl::OUStringBuffer sValue; AddAttribute(XML_NAMESPACE_TABLE, XML_NAME,_xSection->getName()); - + if ( !_xSection->getVisible() ) AddAttribute(XML_NAMESPACE_REPORT, XML_VISIBLE,XML_FALSE); @@ -749,12 +752,12 @@ void ORptExport::exportSection(const Reference<XSection>& _xSection,bool bHeader if ( _xSection->getKeepTogether() ) AddAttribute(XML_NAMESPACE_REPORT, XML_KEEP_TOGETHER, XML_TRUE ); } - + exportStyleName(_xSection.get(),GetAttrList(),m_sTableStyle); /// TODO export as table layout SvXMLElementExport aComponents(*this,XML_NAMESPACE_TABLE, XML_TABLE, sal_True, sal_True); - + ::rtl::OUString sExpr = _xSection->getConditionalPrintExpression(); if ( sExpr.getLength() ) { @@ -794,7 +797,7 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection) return; TGrid::iterator aRowIter = aFind->second.begin(); TGrid::iterator aRowEnd = aFind->second.end(); - + sal_Int32 nEmptyCellColSpan = 0; TGridStyleMap::iterator aRowFind = m_aRowStyleNames.find(_xSection.get()); TStringVec::iterator aHeightIter = aRowFind->second.begin(); @@ -810,7 +813,7 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection) { ::std::vector< TCell >::iterator aColIter = aRowIter->second.begin(); ::std::vector< TCell >::iterator aColEnd = aRowIter->second.end(); - nEmptyCellColSpan = 0; + nEmptyCellColSpan = 0; for (; aColIter != aColEnd; ++aColIter) { sal_Bool bCoveredCell = sal_False; @@ -828,10 +831,10 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection) nColSpan = 1; if ( !--(aRowSpanFind->second) ) aRowSpan.erase(aRowSpanFind); - + if ( aColIter->nColSpan > 1 ) nColSpan += aColIter->nColSpan - 1; - + bCoveredCell = sal_True; aColIter = aColIter + (aColIter->nColSpan - 1); } @@ -859,7 +862,7 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection) } if ( aColIter->xElement.is() ) exportStyleName(aColIter->xElement.get(),GetAttrList(),m_sTableStyle); - + // start <table:table-cell> Reference<XFormattedField> xFormattedField(aColIter->xElement,uno::UNO_QUERY); if ( xFormattedField.is() ) @@ -898,7 +901,7 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection) Reference<XReportDefinition> xReportDefinition(xElement,uno::UNO_QUERY); Reference< XImageControl > xImage(xElement,uno::UNO_QUERY); Reference<XSection> xSection(xElement,uno::UNO_QUERY); - + XMLTokenEnum eToken = XML_SECTION; sal_Bool bExportData = sal_False; if ( xElement->supportsService(SERVICE_FIXEDTEXT) ) @@ -968,15 +971,15 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection) exportSection(xSection); } } - } + } // if ( aColIter->xElement.is() ) else if ( !bShapeHandled ) { bShapeHandled = true; exportShapes(_xSection); } aColIter = aColIter + (aColIter->nColSpan - 1); - } - else + } + else ++nEmptyCellColSpan; if ( bCoveredCell ) { @@ -984,9 +987,9 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection) { SvXMLElementExport aCell(*this,XML_NAMESPACE_TABLE, XML_COVERED_TABLE_CELL, sal_True, sal_True); } - + } - } + } // for (sal_Int32 i = 0 ; i< nCount ; ++i) if ( nEmptyCellColSpan ) { { @@ -1034,6 +1037,21 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection) ::rtl::OUString sFormula = _sFormula; if ( _sFormula.equalsAsciiL("rpt:",4) ) sFormula = ::rtl::OUString(); + //sal_Int32 nLength = _sFormula.getLength(); + //if ( nLength ) + //{ + // sal_Int32 nPos = 0; + // if ( _sFormula.matchAsciiL("=",1) != 0 ) + // { + // nPos = 1; + // --nLength; + // } + // bool bFormula = _sFormula.indexOf('[') != -1 || _sFormula.indexOf('(') != -1; + // if ( bFormula ) + // sFormula = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:")) + _sFormula.copy(nPos,nLength); + // else + // sFormula = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("field:[")) + _sFormula.copy(nPos,nLength) + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("]"));; + //} return sFormula; } // ----------------------------------------------------------------------------- @@ -1047,7 +1065,7 @@ bool ORptExport::exportFormula(enum ::xmloff::token::XMLTokenEnum eName,const :: bool bRet = nPageNumberIndex != -1 || nPageCountIndex != -1; if ( !bRet ) AddAttribute(XML_NAMESPACE_REPORT, eName,sFieldData); - + return bRet; } // ----------------------------------------------------------------------------- @@ -1120,7 +1138,7 @@ sal_Bool ORptExport::exportGroup(const Reference<XReportDefinition>& _xReportDef const SvXMLEnumMapEntry* aXML_KeepTogetherEnumMap = OXMLHelper::GetKeepTogetherOptions(); if ( SvXMLUnitConverter::convertEnum( sValue, nRet,aXML_KeepTogetherEnumMap ) ) AddAttribute(XML_NAMESPACE_REPORT, XML_KEEP_TOGETHER,sValue.makeStringAndClear()); - + SvXMLElementExport aGroup(*this,XML_NAMESPACE_REPORT, XML_GROUP, sal_True, sal_True); exportFunctions(xGroup->getFunctions().get()); if ( xGroup->getHeaderOn() ) @@ -1139,7 +1157,7 @@ sal_Bool ORptExport::exportGroup(const Reference<XReportDefinition>& _xReportDef AddAttribute(XML_NAMESPACE_REPORT, XML_REPEAT_SECTION,XML_TRUE ); SvXMLElementExport aGroupSection(*this,XML_NAMESPACE_REPORT, XML_GROUP_FOOTER, sal_True, sal_True); exportSection(xSection); - } + } // if ( xGroup->getFooterOn() ) } } else if ( _bExportAutoStyle ) @@ -1241,6 +1259,37 @@ void ORptExport::exportAutoStyle(XPropertySet* _xProp,const Reference<XFormatted } else { + //sal_Int32 nTextAlignIndex = m_xCellStylesExportPropertySetMapper->getPropertySetMapper()->FindEntryIndex( CTF_SD_SHAPE_PARA_ADJUST ); + //if ( nTextAlignIndex != -1 ) + //{ + // ::std::vector< XMLPropertyState >::iterator aIter = aPropertyStates.begin(); + // ::std::vector< XMLPropertyState >::iterator aEnd = aPropertyStates.end(); + // for (; aIter != aEnd; ++aIter) + // { + // if ( aIter->mnIndex == nTextAlignIndex ) + // { + // sal_Int16 nTextAlign = 0; + // aIter->maValue >>= nTextAlign; + // switch(nTextAlign) + // { + // case awt::TextAlign::LEFT: + // nTextAlign = style::ParagraphAdjust_LEFT; + // break; + // case awt::TextAlign::CENTER: + // nTextAlign = style::ParagraphAdjust_CENTER; + // break; + // case awt::TextAlign::RIGHT: + // nTextAlign = style::ParagraphAdjust_RIGHT; + // break; + // default: + // OSL_ENSURE(0,"Illegal text alignment value!"); + // break; + // } + // aIter->maValue <<= nTextAlign; + // break; + // } + // } + //} const Reference<XFormattedField> xFormattedField(_xProp,uno::UNO_QUERY); if ( (_xParentFormattedField.is() || xFormattedField.is()) && !aPropertyStates.empty() ) { @@ -1257,7 +1306,8 @@ void ORptExport::exportAutoStyle(XPropertySet* _xProp,const Reference<XFormatted } } } - + + if ( !aPropertyStates.empty() ) m_aAutoStyleNames.insert( TPropertyStyleMap::value_type(_xProp,GetAutoStylePool()->Add( XML_STYLE_FAMILY_TABLE_CELL, aPropertyStates ))); } @@ -1276,7 +1326,7 @@ void ORptExport::SetBodyAttributes() } // ----------------------------------------------------------------------------- void ORptExport::exportReportAttributes(const Reference<XReportDefinition>& _xReport) -{ +{ if ( _xReport.is() ) { ::rtl::OUStringBuffer sValue; @@ -1329,7 +1379,7 @@ void ORptExport::collectComponentStyles() uno::Reference< report::XSection> xParent(xProp->getParent(),uno::UNO_QUERY); if ( xParent.is() ) exportAutoStyle(xProp.get()); - + if ( xProp->getReportHeaderOn() ) exportSectionAutoStyle(xProp->getReportHeader()); if ( xProp->getPageHeaderOn() ) @@ -1365,13 +1415,19 @@ void ORptExport::_ExportAutoStyles() ,GetMM100UnitConverter() ,GetNamespaceMap() ); - + GetAutoStylePool()->exportXML(XML_STYLE_FAMILY_TABLE_CELL ,GetDocHandler() ,GetMM100UnitConverter() ,GetNamespaceMap() ); - + + + /*GetAutoStylePool()->exportXML(XML_STYLE_FAMILY_REPORT_ID + ,GetDocHandler() + ,GetMM100UnitConverter() + ,GetNamespaceMap() + );*/ exportDataStyles(); GetShapeExport()->exportAutoStyles(); } @@ -1382,7 +1438,7 @@ void ORptExport::_ExportAutoStyles() GetPageExport()->exportAutoStyles(); } // ----------------------------------------------------------------------------- -void ORptExport::_ExportStyles(sal_Bool bUsed) +void ORptExport::_ExportStyles(BOOL bUsed) { SvXMLExport::_ExportStyles(bUsed); @@ -1422,7 +1478,7 @@ void SAL_CALL ORptExport::setSourceDocument( const Reference< XComponent >& xDoc // ----------------------------------------------------------------------------- void ORptExport::_ExportFontDecls() { - GetFontAutoStylePool(); // make sure the pool is created + GetFontAutoStylePool(); // make sure the pool is created collectComponentStyles(); SvXMLExport::_ExportFontDecls(); } @@ -1464,17 +1520,17 @@ void ORptExport::exportParagraph(const Reference< XReportControlModel >& _xRepor } else { - + if ( sToken.indexOf('"') == 0 && sToken.lastIndexOf('"') == sToken.getLength()-1 ) sToken = sToken.copy(1,sToken.getLength()-2); - + sal_Bool bPrevCharIsSpace = sal_False; GetTextParagraphExport()->exportText(sToken,bPrevCharIsSpace); } } } while ( nIndex >= 0 ); - } + } } Reference< XFixedText > xFT(_xReportElement,UNO_QUERY); if ( xFT.is() ) @@ -1513,7 +1569,7 @@ void ORptExport::exportShapes(const Reference< XSection>& _xSection,bool _bAddPa { pSubDocument.reset(new SvXMLElementExport(*this,XML_NAMESPACE_REPORT, XML_SUB_DOCUMENT, sal_False, sal_False)); exportMasterDetailFields(xShape.get()); - exportReportElement(xShape.get()); + exportReportElement(xShape.get()); } AddAttribute( XML_NAMESPACE_TEXT, XML_ANCHOR_TYPE, XML_PARAGRAPH ); @@ -1597,7 +1653,7 @@ void ORptExport::exportGroupsExpressionAsFunction(const Reference< XGroups>& _xG sFunction += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("([")); sFunction += sExpression; sFunction += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("]")); - + if ( sPrefix.getLength() ) sFunction += sPrefix; sFunction += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")")); diff --git a/reportdesign/source/filter/xml/xmlExport.hxx b/reportdesign/source/filter/xml/xmlExport.hxx index 8e0e7299335b..8e4f2f22a71b 100644 --- a/reportdesign/source/filter/xml/xmlExport.hxx +++ b/reportdesign/source/filter/xml/xmlExport.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -120,80 +120,80 @@ public: typedef ::std::map< Reference<XPropertySet> ,TGrid > TSectionsGrid; typedef ::std::map< Reference<XGroup> ,Reference<XFunction> > TGroupFunctionMap; private: - ::std::auto_ptr< TStringPair > m_aAutoIncrement; - ::std::auto_ptr< TDelimiter > m_aDelimiter; - ::std::vector< Any > m_aDataSourceSettings; + ::std::auto_ptr< TStringPair > m_aAutoIncrement; + ::std::auto_ptr< TDelimiter > m_aDelimiter; + ::std::vector< Any > m_aDataSourceSettings; TSectionsGrid m_aSectionsGrid; - - TPropertyStyleMap m_aAutoStyleNames; + + TPropertyStyleMap m_aAutoStyleNames; TGridStyleMap m_aColumnStyleNames; TGridStyleMap m_aRowStyleNames; - TGroupFunctionMap m_aGroupFunctionMap; - - ::rtl::OUString m_sCharSet; + TGroupFunctionMap m_aGroupFunctionMap; + + ::rtl::OUString m_sCharSet; ::rtl::OUString m_sTableStyle; ::rtl::OUString m_sCellStyle; ::rtl::OUString m_sColumnStyle; - Any m_aPreviewMode; - UniReference < SvXMLExportPropertyMapper> m_xExportHelper; - UniReference < SvXMLExportPropertyMapper> m_xSectionPropMapper; - UniReference < SvXMLExportPropertyMapper> m_xTableStylesExportPropertySetMapper; - UniReference < SvXMLExportPropertyMapper> m_xCellStylesExportPropertySetMapper; - UniReference < SvXMLExportPropertyMapper> m_xColumnStylesExportPropertySetMapper; - UniReference < SvXMLExportPropertyMapper> m_xRowStylesExportPropertySetMapper; + Any m_aPreviewMode; + UniReference < SvXMLExportPropertyMapper> m_xExportHelper; + UniReference < SvXMLExportPropertyMapper> m_xSectionPropMapper; + UniReference < SvXMLExportPropertyMapper> m_xTableStylesExportPropertySetMapper; + UniReference < SvXMLExportPropertyMapper> m_xCellStylesExportPropertySetMapper; + UniReference < SvXMLExportPropertyMapper> m_xColumnStylesExportPropertySetMapper; + UniReference < SvXMLExportPropertyMapper> m_xRowStylesExportPropertySetMapper; UniReference < SvXMLExportPropertyMapper > m_xParaPropMapper; - UniReference < XMLPropertyHandlerFactory > m_xPropHdlFactory; + UniReference < XMLPropertyHandlerFactory > m_xPropHdlFactory; - mutable UniReference < XMLPropertySetMapper > m_xControlStylePropertyMapper; - mutable UniReference < XMLPropertySetMapper > m_xColumnStylesPropertySetMapper; + mutable UniReference < XMLPropertySetMapper > m_xControlStylePropertyMapper; + mutable UniReference < XMLPropertySetMapper > m_xColumnStylesPropertySetMapper; mutable UniReference < XMLPropertySetMapper > m_xCellStylesPropertySetMapper; - Reference<XReportDefinition> m_xReportDefinition; - sal_Bool m_bAllreadyFilled; + Reference<XReportDefinition> m_xReportDefinition; + sal_Bool m_bAllreadyFilled; - void exportReport(const Reference<XReportDefinition>& _xReportDefinition); /// <element name="office:report"> + void exportReport(const Reference<XReportDefinition>& _xReportDefinition); /// <element name="office:report"> void exportReportAttributes(const Reference<XReportDefinition>& _xReport); - void exportFunctions(const Reference<XIndexAccess>& _xFunctions); /// <ref name="rpt-function"/> + void exportFunctions(const Reference<XIndexAccess>& _xFunctions); /// <ref name="rpt-function"/> void exportFunction(const Reference< XFunction>& _xFunction); - void exportMasterDetailFields(const Reference<XReportComponent>& _xReportComponet); - void exportComponent(const Reference<XReportComponent>& _xReportComponent); - sal_Bool exportGroup(const Reference<XReportDefinition>& _xReportDefinition,sal_Int32 _nPos,sal_Bool _bExportAutoStyle = sal_False); - void exportStyleName(XPropertySet* _xProp,SvXMLAttributeList& _rAtt,const ::rtl::OUString& _sName); - void exportSection(const Reference<XSection>& _xProp,bool bHeader = false); + void exportMasterDetailFields(const Reference<XReportComponent>& _xReportComponet); + void exportComponent(const Reference<XReportComponent>& _xReportComponent); + sal_Bool exportGroup(const Reference<XReportDefinition>& _xReportDefinition,sal_Int32 _nPos,sal_Bool _bExportAutoStyle = sal_False); + void exportStyleName(XPropertySet* _xProp,SvXMLAttributeList& _rAtt,const ::rtl::OUString& _sName); + void exportSection(const Reference<XSection>& _xProp,bool bHeader = false); void exportContainer(const Reference< XSection>& _xSection); void exportShapes(const Reference< XSection>& _xSection,bool _bAddParagraph = true); void exportTableColumns(const Reference< XSection>& _xSection); - void exportSectionAutoStyle(const Reference<XSection>& _xProp); - void exportReportElement(const Reference<XReportControlModel>& _xReportElement); - void exportFormatConditions(const Reference<XReportControlModel>& _xReportElement); - void exportAutoStyle(XPropertySet* _xProp,const Reference<XFormattedField>& _xParentFormattedField = Reference<XFormattedField>()); - void exportAutoStyle(const Reference<XSection>& _xProp); + void exportSectionAutoStyle(const Reference<XSection>& _xProp); + void exportReportElement(const Reference<XReportControlModel>& _xReportElement); + void exportFormatConditions(const Reference<XReportControlModel>& _xReportElement); + void exportAutoStyle(XPropertySet* _xProp,const Reference<XFormattedField>& _xParentFormattedField = Reference<XFormattedField>()); + void exportAutoStyle(const Reference<XSection>& _xProp); void exportReportComponentAutoStyles(const Reference<XSection>& _xProp); - void collectComponentStyles(); + void collectComponentStyles(); void collectStyleNames(sal_Int32 _nFamily,const ::std::vector< sal_Int32>& _aSize, ORptExport::TStringVec& _rStyleNames); void exportParagraph(const Reference< XReportControlModel >& _xReportElement); bool exportFormula(enum ::xmloff::token::XMLTokenEnum eName,const ::rtl::OUString& _sFormula); void exportGroupsExpressionAsFunction(const Reference< XGroups>& _xGroups); ::rtl::OUString convertFormula(const ::rtl::OUString& _sFormula); - ::rtl::OUString implConvertNumber(sal_Int32 _nValue); + ::rtl::OUString implConvertNumber(sal_Int32 _nValue); private: ORptExport(); - virtual void SetBodyAttributes(); + virtual void SetBodyAttributes(); protected: - virtual void _ExportStyles( sal_Bool bUsed ); - virtual void _ExportAutoStyles(); - virtual void _ExportContent(); - virtual void _ExportMasterStyles(); - virtual void _ExportFontDecls(); - virtual sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass ); - virtual SvXMLAutoStylePoolP* CreateAutoStylePool(); + virtual void _ExportStyles( BOOL bUsed ); + virtual void _ExportAutoStyles(); + virtual void _ExportContent(); + virtual void _ExportMasterStyles(); + virtual void _ExportFontDecls(); + virtual sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass ); + virtual SvXMLAutoStylePoolP* CreateAutoStylePool(); virtual XMLShapeExport* CreateShapeExport(); - virtual ~ORptExport(){}; -public: - + virtual ~ORptExport(){}; +public: + ORptExport(const Reference< XMultiServiceFactory >& _rxMSF, sal_uInt16 nExportFlag = (EXPORT_CONTENT | EXPORT_AUTOSTYLES | EXPORT_FONTDECLS)); // XServiceInfo virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); @@ -248,7 +248,7 @@ class ORptStylesExportHelper public: static ::rtl::OUString getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException); static Sequence< ::rtl::OUString > getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL + static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); }; diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx index 166ba87db540..7d1f3e231beb 100644 --- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx +++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -159,7 +159,7 @@ void SAL_CALL ExportDocumentHandler::endDocument() throw (uno::RuntimeException, void SAL_CALL ExportDocumentHandler::startElement(const ::rtl::OUString & _sName, const uno::Reference< xml::sax::XAttributeList > & xAttribs) throw (uno::RuntimeException, xml::sax::SAXException) { bool bExport = true; - if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("office:chart")) ) + if ( _sName.equalsAscii("office:chart") ) { SvXMLAttributeList* pList = new SvXMLAttributeList(); uno::Reference< xml::sax::XAttributeList > xNewAttribs = pList; @@ -168,6 +168,7 @@ void SAL_CALL ExportDocumentHandler::startElement(const ::rtl::OUString & _sName { { XML_TABLE, sdb::CommandType::TABLE }, { XML_QUERY, sdb::CommandType::QUERY }, + // { XML_COMMAND, CommandType::COMMAND }, // default { XML_TOKEN_INVALID, 0 } }; if ( SvXMLUnitConverter::convertEnum( sValue, static_cast<sal_uInt16>(m_xDatabaseDataProvider->getCommandType()),aXML_CommnadTypeEnumMap ) ) @@ -202,20 +203,20 @@ void SAL_CALL ExportDocumentHandler::startElement(const ::rtl::OUString & _sName m_xDelegatee->endElement(sTableCalc); bExport = false; } - else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table")) ) + else if ( _sName.equalsAscii("table:table") ) { m_xDelegatee->startElement(lcl_createAttribute(XML_NP_RPT,XML_DETAIL),NULL); lcl_exportPrettyPrinting(m_xDelegatee); } - else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table-header-rows")) ) + else if ( _sName.equalsAscii("table:table-header-rows") ) { m_bCountColumnHeader = true; } - else if ( m_bCountColumnHeader && _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table-cell")) ) + else if ( m_bCountColumnHeader && _sName.equalsAscii("table:table-cell") ) { ++m_nColumnCount; } - else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table-rows")) ) + else if ( _sName.equalsAscii("table:table-rows") ) { m_xDelegatee->startElement(_sName,xAttribs); exportTableRows(); @@ -223,30 +224,30 @@ void SAL_CALL ExportDocumentHandler::startElement(const ::rtl::OUString & _sName m_bTableRowsStarted = true; m_bFirstRowExported = true; } - else if ( m_bTableRowsStarted && m_bFirstRowExported && (_sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table-row")) || _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table-cell"))) ) + else if ( m_bTableRowsStarted && m_bFirstRowExported && (_sName.equalsAscii("table:table-row") || _sName.equalsAscii("table:table-cell")) ) bExport = false; - else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("chart:plot-area"))) + else if ( _sName.equalsAscii("chart:plot-area")) { SvXMLAttributeList* pList = SvXMLAttributeList::getImplementation(xAttribs); pList->RemoveAttribute(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("table:cell-range-address"))); } - else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("chart:categories"))) + else if ( _sName.equalsAscii("chart:categories")) { static ::rtl::OUString s_sCellAddress(lcl_createAttribute(XML_NP_TABLE,XML_CELL_RANGE_ADDRESS)); lcl_correctCellAddress(s_sCellAddress,xAttribs); } - else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("chart:series"))) + else if ( _sName.equalsAscii("chart:series")) { static ::rtl::OUString s_sCellAddress(lcl_createAttribute(XML_NP_CHART,XML_VALUES_CELL_RANGE_ADDRESS)); lcl_correctCellAddress(s_sCellAddress,xAttribs); } - else if ( m_bTableRowsStarted && !m_bFirstRowExported && _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table-cell")) ) + else if ( m_bTableRowsStarted && !m_bFirstRowExported && _sName.equalsAscii("table:table-cell") ) { SvXMLAttributeList* pList = SvXMLAttributeList::getImplementation(xAttribs); static ::rtl::OUString s_sValue(lcl_createAttribute(XML_NP_OFFICE,XML_VALUE)); pList->RemoveAttribute(s_sValue); } - else if ( m_bTableRowsStarted && _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("text:p")) ) + else if ( m_bTableRowsStarted && _sName.equalsAscii("text:p") ) { bExport = false; } @@ -258,27 +259,27 @@ void SAL_CALL ExportDocumentHandler::endElement(const ::rtl::OUString & _sName) { bool bExport = true; ::rtl::OUString sNewName = _sName; - if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("office:chart")) ) + if ( _sName.equalsAscii("office:chart") ) { sNewName = lcl_createAttribute(XML_NP_OFFICE,XML_REPORT); } - else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table")) ) + else if ( _sName.equalsAscii("table:table") ) { m_xDelegatee->endElement(_sName); lcl_exportPrettyPrinting(m_xDelegatee); sNewName = lcl_createAttribute(XML_NP_RPT,XML_DETAIL); } - else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table-header-rows")) ) + else if ( _sName.equalsAscii("table:table-header-rows") ) { m_bCountColumnHeader = false; } - else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table-rows")) ) + else if ( _sName.equalsAscii("table:table-rows") ) m_bTableRowsStarted = false; - else if ( m_bTableRowsStarted && m_bFirstRowExported && (_sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table-row")) || _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table-cell"))) ) + else if ( m_bTableRowsStarted && m_bFirstRowExported && (_sName.equalsAscii("table:table-row") || _sName.equalsAscii("table:table-cell")) ) bExport = false; - else if ( m_bTableRowsStarted && _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table-row")) ) + else if ( m_bTableRowsStarted && _sName.equalsAscii("table:table-row") ) m_bFirstRowExported = true; - else if ( m_bTableRowsStarted && _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("text:p")) ) + else if ( m_bTableRowsStarted && _sName.equalsAscii("text:p") ) { bExport = !m_bFirstRowExported; } @@ -329,7 +330,7 @@ void SAL_CALL ExportDocumentHandler::initialize( const uno::Sequence< uno::Any > if ( !m_xDatabaseDataProvider.is() || !m_xDatabaseDataProvider->getActiveConnection().is() ) throw uno::Exception(); - uno::Reference< reflection::XProxyFactory > xProxyFactory( m_xContext->getServiceManager()->createInstanceWithContext( + uno::Reference< reflection::XProxyFactory > xProxyFactory( m_xContext->getServiceManager()->createInstanceWithContext( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.reflection.ProxyFactory")),m_xContext), uno::UNO_QUERY); m_xProxy = xProxyFactory->createProxy(m_xDelegatee.get()); @@ -414,7 +415,7 @@ void ExportDocumentHandler::exportTableRows() bRemoveString = false; pCellAtt->RemoveAttribute(sValueType); pCellAtt->AddAttribute(sValueType,s_sFloat); - } + } // if ( i == 0 ) m_xDelegatee->startElement(sP,NULL); m_xDelegatee->endElement(sP); m_xDelegatee->endElement(sCell); @@ -446,7 +447,7 @@ void ExportDocumentHandler::exportTableRows() m_xDelegatee->endElement(sFtext); m_xDelegatee->endElement(sP); m_xDelegatee->endElement(sCell); - } + } // for(sal_Int32 i = 0; i < nCount ; ++i) m_xDelegatee->endElement(sRow); } diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx index 3a3d1ad0c851..1e4627098091 100644 --- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx +++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/reportdesign/source/filter/xml/xmlFixedContent.cxx b/reportdesign/source/filter/xml/xmlFixedContent.cxx index faec25209fbf..284a678227e9 100644 --- a/reportdesign/source/filter/xml/xmlFixedContent.cxx +++ b/reportdesign/source/filter/xml/xmlFixedContent.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,7 +52,7 @@ class OXMLCharContent : public XMLCharContext { OXMLFixedContent* m_pFixedContent; OXMLCharContent(const OXMLCharContent&); - OXMLCharContent operator =(const OXMLCharContent&); + void operator =(const OXMLCharContent&); public: OXMLCharContent( SvXMLImport& rImport, @@ -106,7 +106,7 @@ void OXMLCharContent::InsertControlCharacter(sal_Int16 _nControl) m_pFixedContent->Characters(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n"))); break; default: - OSL_FAIL("Not supported control character"); + OSL_ENSURE(0,"Not supported control character"); break; } } @@ -150,7 +150,7 @@ SvXMLImportContext* OXMLFixedContent::_CreateChildContext( return pContext; static const ::rtl::OUString s_sStringConcat(RTL_CONSTASCII_USTRINGPARAM(" & ")); - const SvXMLTokenMap& rTokenMap = m_rImport.GetCellElemTokenMap(); + const SvXMLTokenMap& rTokenMap = m_rImport.GetCellElemTokenMap(); Reference<XMultiServiceFactory> xFactor = m_rImport.getServiceFactory(); m_rImport.GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP ); @@ -213,10 +213,10 @@ void OXMLFixedContent::EndElement() m_xComponent = xControl.get(); xControl->setLabel(m_sLabel); } - + m_pContainer->addCell(m_xComponent); m_rCell.setComponent(m_xComponent); - + OXMLReportElementBase::EndElement(); } } @@ -232,7 +232,7 @@ void OXMLFixedContent::Characters( const ::rtl::OUString& rChars ) static const ::rtl::OUString s_sStringConcat(RTL_CONSTASCII_USTRINGPARAM(" & ")); m_sPageText += s_sStringConcat; } - + m_sPageText += s_Quote + rChars + s_Quote; } } diff --git a/reportdesign/source/filter/xml/xmlFixedContent.hxx b/reportdesign/source/filter/xml/xmlFixedContent.hxx index f1b0fa85ebe7..53bf91377d8f 100644 --- a/reportdesign/source/filter/xml/xmlFixedContent.hxx +++ b/reportdesign/source/filter/xml/xmlFixedContent.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,9 +48,8 @@ namespace rptxml virtual SvXMLImportContext* _CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); - private: OXMLFixedContent(const OXMLFixedContent&); - OXMLFixedContent& operator =(const OXMLFixedContent&); + void operator =(const OXMLFixedContent&); public: OXMLFixedContent( ORptFilter& rImport, sal_uInt16 nPrfx, diff --git a/reportdesign/source/filter/xml/xmlFormatCondition.cxx b/reportdesign/source/filter/xml/xmlFormatCondition.cxx index 71b4f05f95be..1180547ab6c8 100644 --- a/reportdesign/source/filter/xml/xmlFormatCondition.cxx +++ b/reportdesign/source/filter/xml/xmlFormatCondition.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -79,10 +79,10 @@ OXMLFormatCondition::OXMLFormatCondition( ORptFilter& rImport, switch( rTokenMap.Get( nPrefix, sLocalName ) ) { - case XML_TOK_ENABLED: + case XML_TOK_ENABLED: m_xComponent->setEnabled(sValue == s_sTRUE); break; - case XML_TOK_FORMULA: + case XML_TOK_FORMULA: m_xComponent->setFormula(ORptFilter::convertFormula(sValue)); break; case XML_TOK_FORMAT_STYLE_NAME: @@ -95,7 +95,7 @@ OXMLFormatCondition::OXMLFormatCondition( ORptFilter& rImport, } catch(Exception&) { - OSL_FAIL("Exception catched while filling the report definition props"); + OSL_ENSURE(0,"Exception catched while filling the report definition props"); } } // ----------------------------------------------------------------------------- diff --git a/reportdesign/source/filter/xml/xmlFormatCondition.hxx b/reportdesign/source/filter/xml/xmlFormatCondition.hxx index 446b0a9760d6..bf0d1cda8183 100644 --- a/reportdesign/source/filter/xml/xmlFormatCondition.hxx +++ b/reportdesign/source/filter/xml/xmlFormatCondition.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ namespace rptxml { ORptFilter& m_rImport; ::rtl::OUString m_sStyleName; - ::com::sun::star::uno::Reference< ::com::sun::star::report::XFormatCondition > m_xComponent; + ::com::sun::star::uno::Reference< ::com::sun::star::report::XFormatCondition > m_xComponent; OXMLFormatCondition(const OXMLFormatCondition&); void operator =(const OXMLFormatCondition&); public: diff --git a/reportdesign/source/filter/xml/xmlFormattedField.cxx b/reportdesign/source/filter/xml/xmlFormattedField.cxx index 73fd83dc474d..aec8621eff7d 100644 --- a/reportdesign/source/filter/xml/xmlFormattedField.cxx +++ b/reportdesign/source/filter/xml/xmlFormattedField.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,7 +49,7 @@ DBG_NAME( rpt_OXMLFormattedField ) OXMLFormattedField::OXMLFormattedField( ORptFilter& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName ,const uno::Reference< xml::sax::XAttributeList > & _xAttrList - ,const uno::Reference< XFormattedField > & _xComponent + ,const uno::Reference< XFormattedField > & _xComponent ,OXMLTable* _pContainer ,bool _bPageCount) : OXMLReportElementBase( rImport, nPrfx, rLName,_xComponent.get(),_pContainer) @@ -71,7 +71,7 @@ OXMLFormattedField::OXMLFormattedField( ORptFilter& rImport, switch( rTokenMap.Get( nPrefix, sLocalName ) ) { - case XML_TOK_DATA_FORMULA: + case XML_TOK_DATA_FORMULA: _xComponent->setDataField(ORptFilter::convertFormula(sValue)); break; case XML_TOK_SELECT_PAGE: @@ -92,7 +92,7 @@ OXMLFormattedField::OXMLFormattedField( ORptFilter& rImport, } catch(Exception&) { - OSL_FAIL("Exception catched while filling the report definition props"); + OSL_ENSURE(0,"Exception catched while filling the report definition props"); } } // ----------------------------------------------------------------------------- diff --git a/reportdesign/source/filter/xml/xmlFormattedField.hxx b/reportdesign/source/filter/xml/xmlFormattedField.hxx index 5a3a28a48b9c..6437cf007c9c 100644 --- a/reportdesign/source/filter/xml/xmlFormattedField.hxx +++ b/reportdesign/source/filter/xml/xmlFormattedField.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/reportdesign/source/filter/xml/xmlFunction.cxx b/reportdesign/source/filter/xml/xmlFunction.cxx index 998e40839bd2..00eb1759da8e 100644 --- a/reportdesign/source/filter/xml/xmlFunction.cxx +++ b/reportdesign/source/filter/xml/xmlFunction.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,8 +48,8 @@ DBG_NAME( rpt_OXMLFunction ) OXMLFunction::OXMLFunction( ORptFilter& _rImport ,sal_uInt16 nPrfx ,const ::rtl::OUString& _sLocalName - ,const Reference< XAttributeList > & _xAttrList - ,const Reference< XFunctionsSupplier >& _xFunctions + ,const Reference< XAttributeList > & _xAttrList + ,const Reference< XFunctionsSupplier >& _xFunctions ,bool _bAddToReport ) : SvXMLImportContext( _rImport, nPrfx, _sLocalName ) @@ -60,7 +60,7 @@ OXMLFunction::OXMLFunction( ORptFilter& _rImport OSL_ENSURE(m_xFunctions.is(),"Functions is NULL!"); m_xFunction = m_xFunctions->createFunction(); - + OSL_ENSURE(_xAttrList.is(),"Attribute list is NULL!"); const SvXMLNamespaceMap& rMap = _rImport.GetNamespaceMap(); @@ -82,7 +82,7 @@ OXMLFunction::OXMLFunction( ORptFilter& _rImport case XML_TOK_FUNCTION_NAME: m_xFunction->setName(sValue); break; - case XML_TOK_FUNCTION_FORMULA: + case XML_TOK_FUNCTION_FORMULA: m_xFunction->setFormula(ORptFilter::convertFormula(sValue)); break; case XML_TOK_PRE_EVALUATED: @@ -101,7 +101,7 @@ OXMLFunction::OXMLFunction( ORptFilter& _rImport } catch(const Exception&) { - OSL_FAIL("Exception catched while putting Function props!"); + OSL_ENSURE(0,"Exception catched while putting Function props!"); } } } @@ -132,7 +132,7 @@ void OXMLFunction::EndElement() m_xFunction.clear(); }catch(uno::Exception&) { - OSL_FAIL("Exception catched!"); + OSL_ENSURE(0,"Exception catched!"); } } } diff --git a/reportdesign/source/filter/xml/xmlFunction.hxx b/reportdesign/source/filter/xml/xmlFunction.hxx index 1a3f9a06d6bf..9e81d0791640 100644 --- a/reportdesign/source/filter/xml/xmlFunction.hxx +++ b/reportdesign/source/filter/xml/xmlFunction.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,21 +40,21 @@ namespace rptxml class OXMLFunction : public SvXMLImportContext { protected: - ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunctions > m_xFunctions; - ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunction > m_xFunction; + ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunctions > m_xFunctions; + ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunction > m_xFunction; bool m_bAddToReport; - + ORptFilter& GetOwnImport(); OXMLFunction(const OXMLFunction&); - OXMLFunction operator =(const OXMLFunction&); + void operator =(const OXMLFunction&); public: OXMLFunction( ORptFilter& rImport , sal_uInt16 nPrfx ,const ::rtl::OUString& rLName ,const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList - ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunctionsSupplier >& _xFunctions + ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunctionsSupplier >& _xFunctions ,bool _bAddToReport = false ); virtual ~OXMLFunction(); diff --git a/reportdesign/source/filter/xml/xmlGroup.cxx b/reportdesign/source/filter/xml/xmlGroup.cxx index d2524371ae98..f56239dbd8eb 100644 --- a/reportdesign/source/filter/xml/xmlGroup.cxx +++ b/reportdesign/source/filter/xml/xmlGroup.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,7 +61,7 @@ DBG_NAME( rpt_OXMLGroup ) OXMLGroup::OXMLGroup( ORptFilter& _rImport ,sal_uInt16 nPrfx ,const ::rtl::OUString& _sLocalName - ,const Reference< XAttributeList > & _xAttrList + ,const Reference< XAttributeList > & _xAttrList ) : SvXMLImportContext( _rImport, nPrfx, _sLocalName ) { @@ -70,7 +70,7 @@ OXMLGroup::OXMLGroup( ORptFilter& _rImport m_xGroups = _rImport.getReportDefinition()->getGroups(); OSL_ENSURE(m_xGroups.is(),"Groups is NULL!"); m_xGroup = m_xGroups->createGroup(); - + OSL_ENSURE(_xAttrList.is(),"Attribute list is NULL!"); const SvXMLNamespaceMap& rMap = _rImport.GetNamespaceMap(); @@ -103,7 +103,7 @@ OXMLGroup::OXMLGroup( ORptFilter& _rImport sal_Int32 nLen = sValue.getLength(); if ( nLen ) { - + const static ::rtl::OUString s_sChanged(RTL_CONSTASCII_USTRINGPARAM("rpt:HASCHANGED(\"")); sal_Int32 nPos = sValue.indexOf(s_sChanged); if ( nPos == -1 ) @@ -119,7 +119,7 @@ OXMLGroup::OXMLGroup( ORptFilter& _rImport sValue = sValue.replaceAt(nIndex,2,s_sSingleQuote); nIndex = sValue.indexOf(s_sQuote,nIndex+2); } - nLen = sValue.getLength() - 1; + nLen = sValue.getLength() - 1; } sValue = sValue.copy(nPos,nLen-nPos-1); const ORptFilter::TGroupFunctionMap& aFunctions = _rImport.getFunctions(); @@ -149,7 +149,7 @@ OXMLGroup::OXMLGroup( ORptFilter& _rImport { nGroupOn = report::GroupOn::MONTH; } - else if ( sCompleteFormula.matchIgnoreAsciiCase(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:INT((MONTH")),0) + else if ( sCompleteFormula.matchIgnoreAsciiCase(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:INT((MONTH")),0) && sCompleteFormula.endsWithIgnoreAsciiCaseAsciiL("-1)/3)+1",8) ) { nGroupOn = report::GroupOn::QUARTAL; @@ -167,7 +167,7 @@ OXMLGroup::OXMLGroup( ORptFilter& _rImport nGroupOn = report::GroupOn::INTERVAL; _rImport.removeFunction(sExpression); sExpression = sExpression.copy(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("INT_count_")).getLength()); - + nIndex = 0; ::rtl::OUString sInterval = sCompleteFormula.getToken(1,'/',nIndex); nIndex = 0; @@ -176,7 +176,7 @@ OXMLGroup::OXMLGroup( ORptFilter& _rImport } m_xGroup->setGroupOn(nGroupOn); - + _rImport.removeFunction(sValue); sValue = sExpression; } @@ -193,7 +193,7 @@ OXMLGroup::OXMLGroup( ORptFilter& _rImport } catch(const Exception&) { - OSL_FAIL("Exception catched while putting group props!"); + OSL_ENSURE(0,"Exception catched while putting group props!"); } } } @@ -212,7 +212,7 @@ SvXMLImportContext* OXMLGroup::CreateChildContext( { SvXMLImportContext *pContext = 0; ORptFilter& rImport = GetOwnImport(); - const SvXMLTokenMap& rTokenMap = rImport.GetGroupElemTokenMap(); + const SvXMLTokenMap& rTokenMap = rImport.GetGroupElemTokenMap(); switch( rTokenMap.Get( nPrefix, rLocalName ) ) { @@ -271,7 +271,7 @@ void OXMLGroup::EndElement() m_xGroups->insertByIndex(0,uno::makeAny(m_xGroup)); }catch(uno::Exception&) { - OSL_FAIL("Exception catched!"); + OSL_ENSURE(0,"Exception catched!"); } } // ----------------------------------------------------------------------------- diff --git a/reportdesign/source/filter/xml/xmlGroup.hxx b/reportdesign/source/filter/xml/xmlGroup.hxx index 31d31fea2742..5aa34fe4f7ba 100644 --- a/reportdesign/source/filter/xml/xmlGroup.hxx +++ b/reportdesign/source/filter/xml/xmlGroup.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,13 +38,13 @@ namespace rptxml class OXMLGroup : public SvXMLImportContext { protected: - ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroups > m_xGroups; - ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup > m_xGroup; - + ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroups > m_xGroups; + ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup > m_xGroup; + ORptFilter& GetOwnImport(); OXMLGroup(const OXMLGroup&); - OXMLGroup operator =(const OXMLGroup&); + void operator =(const OXMLGroup&); public: OXMLGroup( ORptFilter& rImport diff --git a/reportdesign/source/filter/xml/xmlHelper.cxx b/reportdesign/source/filter/xml/xmlHelper.cxx index 8446bf6bdd5f..584d702d0dba 100644 --- a/reportdesign/source/filter/xml/xmlHelper.cxx +++ b/reportdesign/source/filter/xml/xmlHelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,12 +73,12 @@ namespace rptxml DBG_NAME(rpt_OPropertyHandlerFactory) OPropertyHandlerFactory::OPropertyHandlerFactory() { - DBG_CTOR(rpt_OPropertyHandlerFactory,NULL); + DBG_CTOR(rpt_OPropertyHandlerFactory,NULL); } // ----------------------------------------------------------------------------- OPropertyHandlerFactory::~OPropertyHandlerFactory() { - DBG_DTOR(rpt_OPropertyHandlerFactory,NULL); + DBG_DTOR(rpt_OPropertyHandlerFactory,NULL); } // ----------------------------------------------------------------------------- const XMLPropertyHandler* OPropertyHandlerFactory::GetPropertyHandler(sal_Int32 _nType) const @@ -91,11 +91,11 @@ const XMLPropertyHandler* OPropertyHandlerFactory::GetPropertyHandler(sal_Int32 { case XML_RPT_ALGINMENT: { - static SvXMLEnumMapEntry const pXML_VerticalAlign_Enum[] = + static SvXMLEnumMapEntry __READONLY_DATA pXML_VerticalAlign_Enum[] = { - { XML_TOP, style::VerticalAlignment_TOP }, - { XML_MIDDLE, style::VerticalAlignment_MIDDLE }, - { XML_BOTTOM, style::VerticalAlignment_BOTTOM }, + { XML_TOP, style::VerticalAlignment_TOP }, + { XML_MIDDLE, style::VerticalAlignment_MIDDLE }, + { XML_BOTTOM, style::VerticalAlignment_BOTTOM }, { XML_TOKEN_INVALID, 0 } }; @@ -115,15 +115,15 @@ const XMLPropertyHandler* OPropertyHandlerFactory::GetPropertyHandler(sal_Int32 return pHandler; } // ----------------------------------------------------------------------------- -#define MAP_CONST( name, prefix, token, type, context ) { name.ascii, name.length, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_TEXT, context, SvtSaveOptions::ODFVER_010 } -#define MAP_CONST_T( name, prefix, token, type, context ) { name.ascii, name.length, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_TABLE, context, SvtSaveOptions::ODFVER_010 } +#define MAP_CONST( name, prefix, token, type, context ) { name.ascii, name.length, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_TEXT, context, SvtSaveOptions::ODFVER_010 } +#define MAP_CONST_T( name, prefix, token, type, context ) { name.ascii, name.length, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_TABLE, context, SvtSaveOptions::ODFVER_010 } #define MAP_CONST_ASCII_T( name, prefix, token, type, context ) { name, sizeof(name)-1,XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_TABLE, context, SvtSaveOptions::ODFVER_010 } -#define MAP_CONST_P( name, prefix, token, type, context ) { name.ascii, name.length, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_PARAGRAPH, context, SvtSaveOptions::ODFVER_010 } -#define MAP_CONST_S( name, prefix, token, type, context ) { name, sizeof(name)-1, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_SECTION, context, SvtSaveOptions::ODFVER_010 } -#define MAP_CONST_ASCII( name, prefix, token, type, context ) { name, sizeof(name)-1, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_TEXT, context, SvtSaveOptions::ODFVER_010 } -#define GMAP( name, prefix, token, type, context ) { name.ascii, name.length, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_GRAPHIC, context, SvtSaveOptions::ODFVER_010 } -#define MAP_CONST_C_ASCII( name, prefix, token, type, context ) { name, sizeof(name)-1, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_TABLE_CELL, context, SvtSaveOptions::ODFVER_010 } -#define MAP_CONST_C( name, prefix, token, type, context ) { name, name.length, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_TABLE_CELL, context, SvtSaveOptions::ODFVER_010 } +#define MAP_CONST_P( name, prefix, token, type, context ) { name.ascii, name.length, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_PARAGRAPH, context, SvtSaveOptions::ODFVER_010 } +#define MAP_CONST_S( name, prefix, token, type, context ) { name, sizeof(name)-1, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_SECTION, context, SvtSaveOptions::ODFVER_010 } +#define MAP_CONST_ASCII( name, prefix, token, type, context ) { name, sizeof(name)-1, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_TEXT, context, SvtSaveOptions::ODFVER_010 } +#define GMAP( name, prefix, token, type, context ) { name.ascii, name.length, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_GRAPHIC, context, SvtSaveOptions::ODFVER_010 } +#define MAP_CONST_C_ASCII( name, prefix, token, type, context ) { name, sizeof(name)-1, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_TABLE_CELL, context, SvtSaveOptions::ODFVER_010 } +#define MAP_CONST_C( name, prefix, token, type, context ) { name, name.length, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_TABLE_CELL, context, SvtSaveOptions::ODFVER_010 } #define MAP_END() { NULL, 0, 0, XML_TOKEN_INVALID, 0 ,0, SvtSaveOptions::ODFVER_010} // ----------------------------------------------------------------------------- UniReference < XMLPropertySetMapper > OXMLHelper::GetCellStylePropertyMap(bool _bOldFormat) @@ -134,15 +134,15 @@ UniReference < XMLPropertySetMapper > OXMLHelper::GetCellStylePropertyMap(bool _ { MAP_CONST_C( PROPERTY_FORMATKEY, STYLE, DATA_STYLE_NAME, XML_TYPE_NUMBER | MID_FLAG_SPECIAL_ITEM, CTF_RPT_NUMBERFORMAT ), - MAP_CONST_C( PROPERTY_CONTROLBACKGROUND, - FO, BACKGROUND_COLOR, XML_TYPE_COLORTRANSPARENT|MID_FLAG_MULTI_PROPERTY, 0 ), - MAP_CONST_C( PROPERTY_VERTICALALIGN, STYLE, VERTICAL_ALIGN, XML_RPT_ALGINMENT, 0 ), + MAP_CONST_C( PROPERTY_CONTROLBACKGROUND, + FO, BACKGROUND_COLOR, XML_TYPE_COLORTRANSPARENT|MID_FLAG_MULTI_PROPERTY, 0 ), + MAP_CONST_C( PROPERTY_VERTICALALIGN, STYLE, VERTICAL_ALIGN, XML_RPT_ALGINMENT, 0 ), MAP_CONST_C( PROPERTY_CONTROLBACKGROUNDTRANSPARENT, - FO, BACKGROUND_COLOR, XML_TYPE_ISTRANSPARENT|MID_FLAG_MERGE_ATTRIBUTE, 0 ), - MAP_CONST_P( PROPERTY_CONTROLBACKGROUND, - FO, BACKGROUND_COLOR, XML_TYPE_COLORTRANSPARENT|MID_FLAG_MULTI_PROPERTY, 0 ), + FO, BACKGROUND_COLOR, XML_TYPE_ISTRANSPARENT|MID_FLAG_MERGE_ATTRIBUTE, 0 ), + MAP_CONST_P( PROPERTY_CONTROLBACKGROUND, + FO, BACKGROUND_COLOR, XML_TYPE_COLORTRANSPARENT|MID_FLAG_MULTI_PROPERTY, 0 ), MAP_CONST_P( PROPERTY_CONTROLBACKGROUNDTRANSPARENT, - FO, BACKGROUND_COLOR, XML_TYPE_ISTRANSPARENT|MID_FLAG_MERGE_ATTRIBUTE, 0 ), + FO, BACKGROUND_COLOR, XML_TYPE_ISTRANSPARENT|MID_FLAG_MERGE_ATTRIBUTE, 0 ), MAP_CONST_C_ASCII( "BorderLeft", FO, BORDER_LEFT, XML_TYPE_BORDER, 0 ), MAP_CONST_C_ASCII( "BorderRight", FO, BORDER_RIGHT, XML_TYPE_BORDER, 0 ), MAP_CONST_C_ASCII( "BorderTop", FO, BORDER_TOP, XML_TYPE_BORDER, 0 ), @@ -157,12 +157,12 @@ UniReference < XMLPropertySetMapper > OXMLHelper::GetCellStylePropertyMap(bool _ { MAP_CONST_C( PROPERTY_FORMATKEY, STYLE, DATA_STYLE_NAME, XML_TYPE_NUMBER | MID_FLAG_SPECIAL_ITEM, CTF_RPT_NUMBERFORMAT ), - MAP_CONST_C( PROPERTY_CONTROLBACKGROUND, - FO, BACKGROUND_COLOR, XML_TYPE_COLORTRANSPARENT|MID_FLAG_MULTI_PROPERTY, 0 ), + MAP_CONST_C( PROPERTY_CONTROLBACKGROUND, + FO, BACKGROUND_COLOR, XML_TYPE_COLORTRANSPARENT|MID_FLAG_MULTI_PROPERTY, 0 ), MAP_CONST_C( PROPERTY_CONTROLBACKGROUNDTRANSPARENT, - FO, BACKGROUND_COLOR, XML_TYPE_ISTRANSPARENT|MID_FLAG_MERGE_ATTRIBUTE, 0 ), + FO, BACKGROUND_COLOR, XML_TYPE_ISTRANSPARENT|MID_FLAG_MERGE_ATTRIBUTE, 0 ), MAP_CONST_C( PROPERTY_VERTICALALIGN, - STYLE, VERTICAL_ALIGN, XML_RPT_ALGINMENT, 0 ), + STYLE, VERTICAL_ALIGN, XML_RPT_ALGINMENT, 0 ), MAP_CONST_C_ASCII( "BorderLeft", FO, BORDER_LEFT, XML_TYPE_BORDER, 0 ), MAP_CONST_C_ASCII( "BorderRight", FO, BORDER_RIGHT, XML_TYPE_BORDER, 0 ), MAP_CONST_C_ASCII( "BorderTop", FO, BORDER_TOP, XML_TYPE_BORDER, 0 ), @@ -179,6 +179,7 @@ const XMLPropertyMapEntry* OXMLHelper::GetTableStyleProps() { MAP_CONST_T( PROPERTY_BACKCOLOR, FO, BACKGROUND_COLOR, XML_TYPE_COLORTRANSPARENT|MID_FLAG_MULTI_PROPERTY, 0 ), MAP_CONST_T( PROPERTY_BACKTRANSPARENT,FO, BACKGROUND_COLOR, XML_TYPE_ISTRANSPARENT | MID_FLAG_MERGE_ATTRIBUTE, 0 ), + // MAP_CONST_T( PROPERTY_KEEPTOGETHER, STYLE, MAY_BREAK_BETWEEN_ROWS, XML_TYPE_BOOL , 0 ), MAP_END() }; return aXMLTableStylesProperties; @@ -198,7 +199,10 @@ const XMLPropertyMapEntry* OXMLHelper::GetColumnStyleProps() { static const XMLPropertyMapEntry aXMLColumnStylesProperties[] = { + //MAP( "IsManualPageBreak", XML_NAMESPACE_FO, XML_BREAK_BEFORE, XML_TYPE_PROP_TABLE_COLUMN|XML_SC_TYPE_BREAKBEFORE, 0), + //MAP( "IsVisible", XML_NAMESPACE_TABLE, XML_DISPLAY, XML_TYPE_PROP_TABLE_COLUMN|XML_SC_TYPE_EQUAL|MID_FLAG_SPECIAL_ITEM, CTF_SC_ISVISIBLE ), MAP_CONST_S( "Width", STYLE, COLUMN_WIDTH, XML_TYPE_PROP_TABLE_COLUMN|XML_TYPE_MEASURE, 0 ), + // MAP( "OptimalWidth", XML_NAMESPACE_STYLE, XML_USE_OPTIMAL_COLUMN_WIDTH, XML_TYPE_PROP_TABLE_COLUMN|XML_TYPE_BOOL, 0), MAP_END() }; return aXMLColumnStylesProperties; @@ -208,9 +212,10 @@ const SvXMLEnumMapEntry* OXMLHelper::GetReportPrintOptions() { static SvXMLEnumMapEntry s_aXML_EnumMap[] = { - { XML_NOT_WITH_REPORT_HEADER, report::ReportPrintOption::NOT_WITH_REPORT_HEADER }, - { XML_NOT_WITH_REPORT_FOOTER, report::ReportPrintOption::NOT_WITH_REPORT_FOOTER }, - { XML_NOT_WITH_REPORT_HEADER_NOR_FOOTER, report::ReportPrintOption::NOT_WITH_REPORT_HEADER_FOOTER }, + // { XML_ALL_PAGES, report::ReportPrintOption::ALL_PAGES }, // default + { XML_NOT_WITH_REPORT_HEADER, report::ReportPrintOption::NOT_WITH_REPORT_HEADER }, + { XML_NOT_WITH_REPORT_FOOTER, report::ReportPrintOption::NOT_WITH_REPORT_FOOTER }, + { XML_NOT_WITH_REPORT_HEADER_NOR_FOOTER, report::ReportPrintOption::NOT_WITH_REPORT_HEADER_FOOTER }, { XML_TOKEN_INVALID, 0 } }; return s_aXML_EnumMap; @@ -220,9 +225,10 @@ const SvXMLEnumMapEntry* OXMLHelper::GetForceNewPageOptions() { static SvXMLEnumMapEntry s_aXML_EnumMap[] = { - { XML_BEFORE_SECTION, report::ForceNewPage::BEFORE_SECTION }, - { XML_AFTER_SECTION, report::ForceNewPage::AFTER_SECTION }, - { XML_BEFORE_AFTER_SECTION, report::ForceNewPage::BEFORE_AFTER_SECTION }, + // { XML_NONE, report::ForceNewPage::NONE }, // default + { XML_BEFORE_SECTION, report::ForceNewPage::BEFORE_SECTION }, + { XML_AFTER_SECTION, report::ForceNewPage::AFTER_SECTION }, + { XML_BEFORE_AFTER_SECTION, report::ForceNewPage::BEFORE_AFTER_SECTION }, { XML_TOKEN_INVALID, 0 } }; return s_aXML_EnumMap; @@ -232,8 +238,9 @@ const SvXMLEnumMapEntry* OXMLHelper::GetKeepTogetherOptions() { static SvXMLEnumMapEntry s_aXML_EnumMap[] = { - { XML_WHOLE_GROUP, report::KeepTogether::WHOLE_GROUP }, - { XML_WITH_FIRST_DETAIL, report::KeepTogether::WITH_FIRST_DETAIL }, + // { XML_NO, report::KeepTogether::NO }, // default + { XML_WHOLE_GROUP, report::KeepTogether::WHOLE_GROUP }, + { XML_WITH_FIRST_DETAIL, report::KeepTogether::WITH_FIRST_DETAIL }, { XML_TOKEN_INVALID, 0 } }; return s_aXML_EnumMap; @@ -245,27 +252,28 @@ const SvXMLEnumMapEntry* OXMLHelper::GetCommandTypeOptions() { { XML_TABLE, CommandType::TABLE }, { XML_QUERY, CommandType::QUERY }, + // { XML_COMMAND, CommandType::COMMAND }, // default { XML_TOKEN_INVALID, 0 } }; return s_aXML_EnumMap; } // ----------------------------------------------------------------------------- -#define PROPERTY_ID_FONTNAME 1 -#define PROPERTY_ID_FONTHEIGHT 2 -#define PROPERTY_ID_FONTWIDTH 3 -#define PROPERTY_ID_FONTSTYLENAME 4 -#define PROPERTY_ID_FONTFAMILY 5 -#define PROPERTY_ID_FONTCHARSET 6 -#define PROPERTY_ID_FONTPITCH 7 -#define PROPERTY_ID_FONTCHARWIDTH 8 -#define PROPERTY_ID_FONTWEIGHT 9 -#define PROPERTY_ID_FONTSLANT 10 -#define PROPERTY_ID_FONTUNDERLINE 11 -#define PROPERTY_ID_FONTSTRIKEOUT 12 +#define PROPERTY_ID_FONTNAME 1 +#define PROPERTY_ID_FONTHEIGHT 2 +#define PROPERTY_ID_FONTWIDTH 3 +#define PROPERTY_ID_FONTSTYLENAME 4 +#define PROPERTY_ID_FONTFAMILY 5 +#define PROPERTY_ID_FONTCHARSET 6 +#define PROPERTY_ID_FONTPITCH 7 +#define PROPERTY_ID_FONTCHARWIDTH 8 +#define PROPERTY_ID_FONTWEIGHT 9 +#define PROPERTY_ID_FONTSLANT 10 +#define PROPERTY_ID_FONTUNDERLINE 11 +#define PROPERTY_ID_FONTSTRIKEOUT 12 #define PROPERTY_ID_FONTORIENTATION 13 -#define PROPERTY_ID_FONTKERNING 14 +#define PROPERTY_ID_FONTKERNING 14 #define PROPERTY_ID_FONTWORDLINEMODE 15 -#define PROPERTY_ID_FONTTYPE 16 +#define PROPERTY_ID_FONTTYPE 16 void OXMLHelper::copyStyleElements(const bool _bOld,const ::rtl::OUString& _sStyleName,const SvXMLStylesContext* _pAutoStyles,const uno::Reference<beans::XPropertySet>& _xProp) { if ( !_xProp.is() || !_sStyleName.getLength() || !_pAutoStyles ) @@ -275,23 +283,30 @@ void OXMLHelper::copyStyleElements(const bool _bOld,const ::rtl::OUString& _sSty { ::com::sun::star::awt::FontDescriptor aFont; static comphelper::PropertyMapEntry pMap[] = - { - {PROPERTY_FONTNAME, static_cast<sal_uInt16>(PROPERTY_FONTNAME.length), PROPERTY_ID_FONTNAME, &::getCppuType(&aFont.Name) ,PropertyAttribute::BOUND,0}, - {PROPERTY_CHARFONTHEIGHT, static_cast<sal_uInt16>(PROPERTY_CHARFONTHEIGHT.length), PROPERTY_ID_FONTHEIGHT, &::getCppuType(&aFont.Height) ,PropertyAttribute::BOUND,0}, - {PROPERTY_FONTWIDTH, static_cast<sal_uInt16>(PROPERTY_FONTWIDTH.length), PROPERTY_ID_FONTWIDTH, &::getCppuType(&aFont.Width) ,PropertyAttribute::BOUND,0}, - {PROPERTY_FONTSTYLENAME, static_cast<sal_uInt16>(PROPERTY_FONTSTYLENAME.length), PROPERTY_ID_FONTSTYLENAME, &::getCppuType(&aFont.StyleName) ,PropertyAttribute::BOUND,0}, - {PROPERTY_FONTFAMILY, static_cast<sal_uInt16>(PROPERTY_FONTFAMILY.length), PROPERTY_ID_FONTFAMILY, &::getCppuType(&aFont.Family) ,PropertyAttribute::BOUND,0}, - {PROPERTY_FONTCHARSET, static_cast<sal_uInt16>(PROPERTY_FONTCHARSET.length), PROPERTY_ID_FONTCHARSET, &::getCppuType(&aFont.CharSet) ,PropertyAttribute::BOUND,0}, - {PROPERTY_FONTPITCH, static_cast<sal_uInt16>(PROPERTY_FONTPITCH.length), PROPERTY_ID_FONTPITCH, &::getCppuType(&aFont.Pitch) ,PropertyAttribute::BOUND,0}, - {PROPERTY_FONTCHARWIDTH, static_cast<sal_uInt16>(PROPERTY_FONTCHARWIDTH.length), PROPERTY_ID_FONTCHARWIDTH, &::getCppuType(&aFont.CharacterWidth),PropertyAttribute::BOUND,0}, - {PROPERTY_FONTWEIGHT, static_cast<sal_uInt16>(PROPERTY_FONTWEIGHT.length), PROPERTY_ID_FONTWEIGHT, &::getCppuType(&aFont.Weight) ,PropertyAttribute::BOUND,0}, - {PROPERTY_CHARPOSTURE, static_cast<sal_uInt16>(PROPERTY_CHARPOSTURE.length), PROPERTY_ID_FONTSLANT, &::getCppuType(&aFont.Slant) ,PropertyAttribute::BOUND,0}, - {PROPERTY_FONTUNDERLINE, static_cast<sal_uInt16>(PROPERTY_FONTUNDERLINE.length), PROPERTY_ID_FONTUNDERLINE, &::getCppuType(&aFont.Underline) ,PropertyAttribute::BOUND,0}, - {PROPERTY_CHARSTRIKEOUT, static_cast<sal_uInt16>(PROPERTY_CHARSTRIKEOUT.length), PROPERTY_ID_FONTSTRIKEOUT, &::getCppuType(&aFont.Strikeout) ,PropertyAttribute::BOUND,0}, - {PROPERTY_FONTORIENTATION, static_cast<sal_uInt16>(PROPERTY_FONTORIENTATION.length), PROPERTY_ID_FONTORIENTATION, &::getCppuType(&aFont.Orientation) ,PropertyAttribute::BOUND,0}, - {PROPERTY_FONTKERNING, static_cast<sal_uInt16>(PROPERTY_FONTKERNING.length), PROPERTY_ID_FONTKERNING, &::getCppuType(&aFont.Kerning) ,PropertyAttribute::BOUND,0}, - {PROPERTY_CHARWORDMODE, static_cast<sal_uInt16>(PROPERTY_CHARWORDMODE.length), PROPERTY_ID_FONTWORDLINEMODE, &::getCppuType(&aFont.WordLineMode) ,PropertyAttribute::BOUND,0}, - {PROPERTY_FONTTYPE, static_cast<sal_uInt16>(PROPERTY_FONTTYPE.length), PROPERTY_ID_FONTTYPE, &::getCppuType(&aFont.Type) ,PropertyAttribute::BOUND,0}, + { + {PROPERTY_FONTNAME, static_cast<sal_uInt16>(PROPERTY_FONTNAME.length), PROPERTY_ID_FONTNAME, &::getCppuType(&aFont.Name) ,PropertyAttribute::BOUND,0}, + {PROPERTY_CHARFONTHEIGHT, static_cast<sal_uInt16>(PROPERTY_CHARFONTHEIGHT.length), PROPERTY_ID_FONTHEIGHT, &::getCppuType(&aFont.Height) ,PropertyAttribute::BOUND,0}, + {PROPERTY_FONTWIDTH, static_cast<sal_uInt16>(PROPERTY_FONTWIDTH.length), PROPERTY_ID_FONTWIDTH, &::getCppuType(&aFont.Width) ,PropertyAttribute::BOUND,0}, + {PROPERTY_FONTSTYLENAME, static_cast<sal_uInt16>(PROPERTY_FONTSTYLENAME.length), PROPERTY_ID_FONTSTYLENAME, &::getCppuType(&aFont.StyleName) ,PropertyAttribute::BOUND,0}, + {PROPERTY_FONTFAMILY, static_cast<sal_uInt16>(PROPERTY_FONTFAMILY.length), PROPERTY_ID_FONTFAMILY, &::getCppuType(&aFont.Family) ,PropertyAttribute::BOUND,0}, + {PROPERTY_FONTCHARSET, static_cast<sal_uInt16>(PROPERTY_FONTCHARSET.length), PROPERTY_ID_FONTCHARSET, &::getCppuType(&aFont.CharSet) ,PropertyAttribute::BOUND,0}, + {PROPERTY_FONTPITCH, static_cast<sal_uInt16>(PROPERTY_FONTPITCH.length), PROPERTY_ID_FONTPITCH, &::getCppuType(&aFont.Pitch) ,PropertyAttribute::BOUND,0}, + {PROPERTY_FONTCHARWIDTH, static_cast<sal_uInt16>(PROPERTY_FONTCHARWIDTH.length), PROPERTY_ID_FONTCHARWIDTH, &::getCppuType(&aFont.CharacterWidth),PropertyAttribute::BOUND,0}, + {PROPERTY_FONTWEIGHT, static_cast<sal_uInt16>(PROPERTY_FONTWEIGHT.length), PROPERTY_ID_FONTWEIGHT, &::getCppuType(&aFont.Weight) ,PropertyAttribute::BOUND,0}, + {PROPERTY_CHARPOSTURE, static_cast<sal_uInt16>(PROPERTY_CHARPOSTURE.length), PROPERTY_ID_FONTSLANT, &::getCppuType(&aFont.Slant) ,PropertyAttribute::BOUND,0}, + {PROPERTY_FONTUNDERLINE, static_cast<sal_uInt16>(PROPERTY_FONTUNDERLINE.length), PROPERTY_ID_FONTUNDERLINE, &::getCppuType(&aFont.Underline) ,PropertyAttribute::BOUND,0}, + {PROPERTY_CHARSTRIKEOUT, static_cast<sal_uInt16>(PROPERTY_CHARSTRIKEOUT.length), PROPERTY_ID_FONTSTRIKEOUT, &::getCppuType(&aFont.Strikeout) ,PropertyAttribute::BOUND,0}, + {PROPERTY_FONTORIENTATION, static_cast<sal_uInt16>(PROPERTY_FONTORIENTATION.length), PROPERTY_ID_FONTORIENTATION, &::getCppuType(&aFont.Orientation) ,PropertyAttribute::BOUND,0}, + {PROPERTY_FONTKERNING, static_cast<sal_uInt16>(PROPERTY_FONTKERNING.length), PROPERTY_ID_FONTKERNING, &::getCppuType(&aFont.Kerning) ,PropertyAttribute::BOUND,0}, + {PROPERTY_CHARWORDMODE, static_cast<sal_uInt16>(PROPERTY_CHARWORDMODE.length), PROPERTY_ID_FONTWORDLINEMODE, &::getCppuType(&aFont.WordLineMode) ,PropertyAttribute::BOUND,0}, + {PROPERTY_FONTTYPE, static_cast<sal_uInt16>(PROPERTY_FONTTYPE.length), PROPERTY_ID_FONTTYPE, &::getCppuType(&aFont.Type) ,PropertyAttribute::BOUND,0}, + //{PROPERTY_BACKGROUNDCOLOR, static_cast<sal_uInt16>(PROPERTY_BACKGROUNDCOLOR.length), PROPERTY_ID_BACKGROUNDCOLOR, &::getCppuType(&nBackgroundColor) ,PropertyAttribute::BOUND,0},, + //{PROPERTY_PARAADJUST, static_cast<sal_uInt16>(PROPERTY_PARAADJUST.length), PROPERTY_ID_ALIGN, &::getCppuType(&nAlign) ,PropertyAttribute::BOUND,0},, + //{PROPERTY_CONTROLBORDER, static_cast<sal_uInt16>(PROPERTY_CONTROLBORDER.length), PROPERTY_ID_BORDER, &::getCppuType(&aFont.Type) ,PropertyAttribute::BOUND,0},, + //{PROPERTY_CONTROLBORDERCOLOR, static_cast<sal_uInt16>(PROPERTY_CONTROLBORDERCOLOR.length), PROPERTY_ID_BORDERCOLOR, &::getCppuType(&aFont.Type) ,PropertyAttribute::BOUND,0},, + //{PROPERTY_CHARCOLOR, static_cast<sal_uInt16>(PROPERTY_TEXTCOLOR.length), PROPERTY_ID_TEXTCOLOR, &::getCppuType(&aFont.Type) ,PropertyAttribute::BOUND,0},, + //{PROPERTY_FORMATKEY, static_cast<sal_uInt16>(PROPERTY_FORMATKEY.length), PROPERTY_ID_FORMATKEY, &::getCppuType(&aFont.Type) ,PropertyAttribute::BOUND,0},, + //{PROPERTY_CHARUNDERLINECOLOR, static_cast<sal_uInt16>(PROPERTY_CHARUNDERLINECOLOR.length), PROPERTY_ID_TEXTLINECOLOR, &::getCppuType(&aFont.Type) ,PropertyAttribute::BOUND,0},, { NULL, 0, 0, NULL, 0, 0 } }; try @@ -302,22 +317,22 @@ void OXMLHelper::copyStyleElements(const bool _bOld,const ::rtl::OUString& _sSty uno::Reference<beans::XPropertySet> xProp = comphelper::GenericPropertySet_CreateInstance(new comphelper::PropertySetInfo(pMap)); pAutoStyle->FillPropertySet(xProp); - xProp->getPropertyValue(PROPERTY_FONTNAME) >>= aFont.Name; - xProp->getPropertyValue(PROPERTY_CHARFONTHEIGHT) >>= aFont.Height; - xProp->getPropertyValue(PROPERTY_FONTWIDTH) >>= aFont.Width; - xProp->getPropertyValue(PROPERTY_FONTSTYLENAME) >>= aFont.StyleName; - xProp->getPropertyValue(PROPERTY_FONTFAMILY) >>= aFont.Family; - xProp->getPropertyValue(PROPERTY_FONTCHARSET) >>= aFont.CharSet; - xProp->getPropertyValue(PROPERTY_FONTPITCH) >>= aFont.Pitch; - xProp->getPropertyValue(PROPERTY_FONTCHARWIDTH) >>= aFont.CharacterWidth; - xProp->getPropertyValue(PROPERTY_FONTWEIGHT) >>= aFont.Weight; - xProp->getPropertyValue(PROPERTY_CHARPOSTURE) >>= aFont.Slant; - xProp->getPropertyValue(PROPERTY_FONTUNDERLINE) >>= aFont.Underline; - xProp->getPropertyValue(PROPERTY_CHARSTRIKEOUT) >>= aFont.Strikeout; - xProp->getPropertyValue(PROPERTY_FONTORIENTATION) >>= aFont.Orientation; - xProp->getPropertyValue(PROPERTY_FONTKERNING) >>= aFont.Kerning; - xProp->getPropertyValue(PROPERTY_CHARWORDMODE) >>= aFont.WordLineMode; - xProp->getPropertyValue(PROPERTY_FONTTYPE) >>= aFont.Type; + xProp->getPropertyValue(PROPERTY_FONTNAME) >>= aFont.Name; + xProp->getPropertyValue(PROPERTY_CHARFONTHEIGHT) >>= aFont.Height; + xProp->getPropertyValue(PROPERTY_FONTWIDTH) >>= aFont.Width; + xProp->getPropertyValue(PROPERTY_FONTSTYLENAME) >>= aFont.StyleName; + xProp->getPropertyValue(PROPERTY_FONTFAMILY) >>= aFont.Family; + xProp->getPropertyValue(PROPERTY_FONTCHARSET) >>= aFont.CharSet; + xProp->getPropertyValue(PROPERTY_FONTPITCH) >>= aFont.Pitch; + xProp->getPropertyValue(PROPERTY_FONTCHARWIDTH) >>= aFont.CharacterWidth; + xProp->getPropertyValue(PROPERTY_FONTWEIGHT) >>= aFont.Weight; + xProp->getPropertyValue(PROPERTY_CHARPOSTURE) >>= aFont.Slant; + xProp->getPropertyValue(PROPERTY_FONTUNDERLINE) >>= aFont.Underline; + xProp->getPropertyValue(PROPERTY_CHARSTRIKEOUT) >>= aFont.Strikeout; + xProp->getPropertyValue(PROPERTY_FONTORIENTATION) >>= aFont.Orientation; + xProp->getPropertyValue(PROPERTY_FONTKERNING) >>= aFont.Kerning; + xProp->getPropertyValue(PROPERTY_CHARWORDMODE) >>= aFont.WordLineMode; + xProp->getPropertyValue(PROPERTY_FONTTYPE) >>= aFont.Type; uno::Reference<report::XReportControlFormat> xReportControlModel(_xProp,uno::UNO_QUERY); if ( xReportControlModel.is() && aFont.Name.getLength() ) { @@ -330,7 +345,7 @@ void OXMLHelper::copyStyleElements(const bool _bOld,const ::rtl::OUString& _sSty } catch(uno::Exception&) { - OSL_FAIL("OXMLHelper::copyStyleElements -> exception catched"); + OSL_ENSURE(0,"OXMLHelper::copyStyleElements -> exception catched"); } } } @@ -338,11 +353,11 @@ void OXMLHelper::copyStyleElements(const bool _bOld,const ::rtl::OUString& _sSty uno::Reference<beans::XPropertySet> OXMLHelper::createBorderPropertySet() { static comphelper::PropertyMapEntry pMap[] = - { - {PROPERTY_BORDERLEFT, static_cast<sal_uInt16>(PROPERTY_BORDERLEFT.length), 0, &::getCppuType((const table::BorderLine*)0) ,PropertyAttribute::BOUND,0}, - {PROPERTY_BORDERRIGHT, static_cast<sal_uInt16>(PROPERTY_BORDERRIGHT.length), 1, &::getCppuType((const table::BorderLine*)0) ,PropertyAttribute::BOUND,0}, - {PROPERTY_BORDERTOP, static_cast<sal_uInt16>(PROPERTY_BORDERTOP.length), 2, &::getCppuType((const table::BorderLine*)0) ,PropertyAttribute::BOUND,0}, - {PROPERTY_BORDERBOTTOM, static_cast<sal_uInt16>(PROPERTY_BORDERBOTTOM.length), 3, &::getCppuType((const table::BorderLine*)0) ,PropertyAttribute::BOUND,0}, + { + {PROPERTY_BORDERLEFT, static_cast<sal_uInt16>(PROPERTY_BORDERLEFT.length), 0, &::getCppuType((const table::BorderLine*)0) ,PropertyAttribute::BOUND,0}, + {PROPERTY_BORDERRIGHT, static_cast<sal_uInt16>(PROPERTY_BORDERRIGHT.length), 1, &::getCppuType((const table::BorderLine*)0) ,PropertyAttribute::BOUND,0}, + {PROPERTY_BORDERTOP, static_cast<sal_uInt16>(PROPERTY_BORDERTOP.length), 2, &::getCppuType((const table::BorderLine*)0) ,PropertyAttribute::BOUND,0}, + {PROPERTY_BORDERBOTTOM, static_cast<sal_uInt16>(PROPERTY_BORDERBOTTOM.length), 3, &::getCppuType((const table::BorderLine*)0) ,PropertyAttribute::BOUND,0}, { NULL, 0, 0, NULL, 0, 0 } }; return comphelper::GenericPropertySet_CreateInstance(new comphelper::PropertySetInfo(pMap)); @@ -350,26 +365,26 @@ uno::Reference<beans::XPropertySet> OXMLHelper::createBorderPropertySet() // ----------------------------------------------------------------------------- SvXMLTokenMap* OXMLHelper::GetReportElemTokenMap() { - static SvXMLTokenMapEntry aElemTokenMap[]= + static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= { - { XML_NAMESPACE_REPORT, XML_REPORT_HEADER, XML_TOK_REPORT_HEADER }, - { XML_NAMESPACE_REPORT, XML_PAGE_HEADER , XML_TOK_PAGE_HEADER }, - { XML_NAMESPACE_REPORT, XML_GROUP, XML_TOK_GROUP }, - { XML_NAMESPACE_REPORT, XML_DETAIL , XML_TOK_DETAIL }, - { XML_NAMESPACE_REPORT, XML_PAGE_FOOTER , XML_TOK_PAGE_FOOTER }, - { XML_NAMESPACE_REPORT, XML_REPORT_FOOTER, XML_TOK_REPORT_FOOTER }, - { XML_NAMESPACE_REPORT, XML_HEADER_ON_NEW_PAGE, XML_TOK_HEADER_ON_NEW_PAGE }, - { XML_NAMESPACE_REPORT, XML_FOOTER_ON_NEW_PAGE, XML_TOK_FOOTER_ON_NEW_PAGE }, - { XML_NAMESPACE_REPORT, XML_COMMAND_TYPE, XML_TOK_COMMAND_TYPE }, - { XML_NAMESPACE_REPORT, XML_COMMAND, XML_TOK_COMMAND }, - { XML_NAMESPACE_REPORT, XML_FILTER, XML_TOK_FILTER }, - { XML_NAMESPACE_REPORT, XML_CAPTION, XML_TOK_CAPTION }, - { XML_NAMESPACE_REPORT, XML_ESCAPE_PROCESSING, XML_TOK_ESCAPE_PROCESSING }, - { XML_NAMESPACE_REPORT, XML_FUNCTION, XML_TOK_REPORT_FUNCTION }, - { XML_NAMESPACE_OFFICE, XML_MIMETYPE, XML_TOK_REPORT_MIMETYPE }, - { XML_NAMESPACE_DRAW, XML_NAME, XML_TOK_REPORT_NAME }, - { XML_NAMESPACE_REPORT, XML_MASTER_DETAIL_FIELDS, XML_TOK_MASTER_DETAIL_FIELDS }, - { XML_NAMESPACE_DRAW, XML_FRAME, XML_TOK_SUB_FRAME }, + { XML_NAMESPACE_REPORT, XML_REPORT_HEADER, XML_TOK_REPORT_HEADER }, + { XML_NAMESPACE_REPORT, XML_PAGE_HEADER , XML_TOK_PAGE_HEADER }, + { XML_NAMESPACE_REPORT, XML_GROUP, XML_TOK_GROUP }, + { XML_NAMESPACE_REPORT, XML_DETAIL , XML_TOK_DETAIL }, + { XML_NAMESPACE_REPORT, XML_PAGE_FOOTER , XML_TOK_PAGE_FOOTER }, + { XML_NAMESPACE_REPORT, XML_REPORT_FOOTER, XML_TOK_REPORT_FOOTER }, + { XML_NAMESPACE_REPORT, XML_HEADER_ON_NEW_PAGE, XML_TOK_HEADER_ON_NEW_PAGE }, + { XML_NAMESPACE_REPORT, XML_FOOTER_ON_NEW_PAGE, XML_TOK_FOOTER_ON_NEW_PAGE }, + { XML_NAMESPACE_REPORT, XML_COMMAND_TYPE, XML_TOK_COMMAND_TYPE }, + { XML_NAMESPACE_REPORT, XML_COMMAND, XML_TOK_COMMAND }, + { XML_NAMESPACE_REPORT, XML_FILTER, XML_TOK_FILTER }, + { XML_NAMESPACE_REPORT, XML_CAPTION, XML_TOK_CAPTION }, + { XML_NAMESPACE_REPORT, XML_ESCAPE_PROCESSING, XML_TOK_ESCAPE_PROCESSING }, + { XML_NAMESPACE_REPORT, XML_FUNCTION, XML_TOK_REPORT_FUNCTION }, + { XML_NAMESPACE_OFFICE, XML_MIMETYPE, XML_TOK_REPORT_MIMETYPE }, + { XML_NAMESPACE_DRAW, XML_NAME, XML_TOK_REPORT_NAME }, + { XML_NAMESPACE_REPORT, XML_MASTER_DETAIL_FIELDS, XML_TOK_MASTER_DETAIL_FIELDS }, + { XML_NAMESPACE_DRAW, XML_FRAME, XML_TOK_SUB_FRAME }, XML_TOKEN_MAP_END }; return new SvXMLTokenMap( aElemTokenMap ); @@ -377,11 +392,11 @@ SvXMLTokenMap* OXMLHelper::GetReportElemTokenMap() // ----------------------------------------------------------------------------- SvXMLTokenMap* OXMLHelper::GetSubDocumentElemTokenMap() { - static SvXMLTokenMapEntry aElemTokenMap[]= + static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= { - { XML_NAMESPACE_REPORT, XML_MASTER_DETAIL_FIELD, XML_TOK_MASTER_DETAIL_FIELD}, - { XML_NAMESPACE_REPORT, XML_MASTER, XML_TOK_MASTER}, - { XML_NAMESPACE_REPORT, XML_DETAIL, XML_TOK_SUB_DETAIL}, + { XML_NAMESPACE_REPORT, XML_MASTER_DETAIL_FIELD, XML_TOK_MASTER_DETAIL_FIELD}, + { XML_NAMESPACE_REPORT, XML_MASTER, XML_TOK_MASTER}, + { XML_NAMESPACE_REPORT, XML_DETAIL, XML_TOK_SUB_DETAIL}, XML_TOKEN_MAP_END }; return new SvXMLTokenMap( aElemTokenMap ); @@ -391,6 +406,7 @@ const SvXMLEnumMapEntry* OXMLHelper::GetImageScaleOptions() { static SvXMLEnumMapEntry s_aXML_EnumMap[] = { + // { XML_NONE, awt::ImageScaleMode::None }, // default { XML_ISOTROPIC, awt::ImageScaleMode::Isotropic }, { XML_ANISOTROPIC, awt::ImageScaleMode::Anisotropic }, { XML_TOKEN_INVALID, 0 } diff --git a/reportdesign/source/filter/xml/xmlHelper.hxx b/reportdesign/source/filter/xml/xmlHelper.hxx index 0fd7612e3248..4995161a5e91 100644 --- a/reportdesign/source/filter/xml/xmlHelper.hxx +++ b/reportdesign/source/filter/xml/xmlHelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,11 +37,11 @@ #include <memory> -#define CTF_RPT_NUMBERFORMAT (XML_DB_CTF_START + 1) +#define CTF_RPT_NUMBERFORMAT (XML_DB_CTF_START + 1) -#define XML_STYLE_FAMILY_REPORT_ID 700 -#define XML_STYLE_FAMILY_REPORT_NAME "report-element" -#define XML_STYLE_FAMILY_REPORT_PREFIX "rptelem" +#define XML_STYLE_FAMILY_REPORT_ID 700 +#define XML_STYLE_FAMILY_REPORT_NAME "report-element" +#define XML_STYLE_FAMILY_REPORT_PREFIX "rptelem" class SvXMLImport; @@ -55,8 +55,8 @@ namespace rptxml OPropertyHandlerFactory(const OPropertyHandlerFactory&); void operator =(const OPropertyHandlerFactory&); protected: - mutable ::std::auto_ptr<XMLConstantsPropertyHandler> m_pDisplayHandler; - mutable ::std::auto_ptr<XMLPropertyHandler> m_pTextAlignHandler; + mutable ::std::auto_ptr<XMLConstantsPropertyHandler> m_pDisplayHandler; + mutable ::std::auto_ptr<XMLPropertyHandler> m_pTextAlignHandler; public: OPropertyHandlerFactory(); virtual ~OPropertyHandlerFactory(); @@ -69,15 +69,15 @@ namespace rptxml public: static UniReference < XMLPropertySetMapper > GetCellStylePropertyMap(bool _bOldFormat = false); - static const SvXMLEnumMapEntry* GetReportPrintOptions(); - static const SvXMLEnumMapEntry* GetForceNewPageOptions(); - static const SvXMLEnumMapEntry* GetKeepTogetherOptions(); - static const SvXMLEnumMapEntry* GetCommandTypeOptions(); + static const SvXMLEnumMapEntry* GetReportPrintOptions(); + static const SvXMLEnumMapEntry* GetForceNewPageOptions(); + static const SvXMLEnumMapEntry* GetKeepTogetherOptions(); + static const SvXMLEnumMapEntry* GetCommandTypeOptions(); static const SvXMLEnumMapEntry* GetImageScaleOptions(); - + static const XMLPropertyMapEntry* GetTableStyleProps(); static const XMLPropertyMapEntry* GetColumnStyleProps(); - + static const XMLPropertyMapEntry* GetRowStyleProps(); static void copyStyleElements(const bool _bOld,const ::rtl::OUString& _sStyleName,const SvXMLStylesContext* _pAutoStyles,const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet>& _xProp); @@ -85,7 +85,7 @@ namespace rptxml static SvXMLTokenMap* GetReportElemTokenMap(); static SvXMLTokenMap* GetSubDocumentElemTokenMap(); - + }; // ----------------------------------------------------------------------------- } // rptxml diff --git a/reportdesign/source/filter/xml/xmlImage.cxx b/reportdesign/source/filter/xml/xmlImage.cxx index 0e254e92eab2..a665e74abdef 100644 --- a/reportdesign/source/filter/xml/xmlImage.cxx +++ b/reportdesign/source/filter/xml/xmlImage.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -114,7 +114,7 @@ OXMLImage::OXMLImage( ORptFilter& rImport, } catch(Exception&) { - OSL_FAIL("Exception catched while filling the image props"); + OSL_ENSURE(0,"Exception catched while filling the image props"); } } // ----------------------------------------------------------------------------- diff --git a/reportdesign/source/filter/xml/xmlImage.hxx b/reportdesign/source/filter/xml/xmlImage.hxx index 597c4ffea31a..77eee02d4345 100644 --- a/reportdesign/source/filter/xml/xmlImage.hxx +++ b/reportdesign/source/filter/xml/xmlImage.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx index c2dea15b7023..decca01c4aa5 100644 --- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx +++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -149,7 +149,7 @@ void SAL_CALL ImportDocumentHandler::startElement(const ::rtl::OUString & _sName { uno::Reference< xml::sax::XAttributeList > xNewAttribs = _xAttrList; bool bExport = true; - if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("office:report")) ) + if ( _sName.equalsAscii("office:report") ) { const sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0; static const ::rtl::OUString s_sTRUE = ::xmloff::token::GetXMLToken(XML_TRUE); @@ -168,7 +168,7 @@ void SAL_CALL ImportDocumentHandler::startElement(const ::rtl::OUString & _sName switch( m_pReportElemTokenMap->Get( XML_NAMESPACE_REPORT, sLocalName ) ) { - case XML_TOK_COMMAND_TYPE: + case XML_TOK_COMMAND_TYPE: { sal_uInt16 nRet = static_cast<sal_uInt16>(sdb::CommandType::COMMAND); const SvXMLEnumMapEntry* aXML_EnumMap = OXMLHelper::GetCommandTypeOptions(); @@ -176,13 +176,13 @@ void SAL_CALL ImportDocumentHandler::startElement(const ::rtl::OUString & _sName m_xDatabaseDataProvider->setCommandType(nRet); } break; - case XML_TOK_COMMAND: + case XML_TOK_COMMAND: m_xDatabaseDataProvider->setCommand(sValue); break; - case XML_TOK_FILTER: + case XML_TOK_FILTER: m_xDatabaseDataProvider->setFilter(sValue); break; - case XML_TOK_ESCAPE_PROCESSING: + case XML_TOK_ESCAPE_PROCESSING: m_xDatabaseDataProvider->setEscapeProcessing(sValue == s_sTRUE); break; default: @@ -192,12 +192,13 @@ void SAL_CALL ImportDocumentHandler::startElement(const ::rtl::OUString & _sName } catch(uno::Exception&) { + // OSL_ENSURE(0,"Exception catched while filling the report definition props"); } m_xDelegatee->startElement(lcl_createAttribute(XML_NP_OFFICE,XML_CHART),NULL); bExport = false; m_bImportedChart = true; } - else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("rpt:master-detail-field")) ) + else if ( _sName.equalsAscii("rpt:master-detail-field") ) { const sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0; static const ::rtl::OUString s_sTRUE = ::xmloff::token::GetXMLToken(XML_TRUE); @@ -218,10 +219,10 @@ void SAL_CALL ImportDocumentHandler::startElement(const ::rtl::OUString & _sName switch( pMasterElemTokenMap->Get( XML_NAMESPACE_REPORT, sLocalName ) ) { - case XML_TOK_MASTER: + case XML_TOK_MASTER: sMasterField = sValue; break; - case XML_TOK_SUB_DETAIL: + case XML_TOK_SUB_DETAIL: sDetailField = sValue; break; } @@ -233,17 +234,17 @@ void SAL_CALL ImportDocumentHandler::startElement(const ::rtl::OUString & _sName } catch(uno::Exception&) { - OSL_FAIL("Exception catched while filling the report definition props"); + OSL_ENSURE(0,"Exception catched while filling the report definition props"); } bExport = false; } - else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("rpt:detail")) - || _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("rpt:formatted-text")) - || _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("rpt:master-detail-fields")) - || _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("rpt:report-component")) - || _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("rpt:report-element"))) + else if ( _sName.equalsAscii("rpt:detail") + || _sName.equalsAscii("rpt:formatted-text") + || _sName.equalsAscii("rpt:master-detail-fields") + || _sName.equalsAscii("rpt:report-component") + || _sName.equalsAscii("rpt:report-element")) bExport = false; - else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("chart:plot-area"))) + else if ( _sName.equalsAscii("chart:plot-area")) { sal_Bool bHasCategories = sal_True; const sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0; @@ -257,31 +258,32 @@ void SAL_CALL ImportDocumentHandler::startElement(const ::rtl::OUString & _sName sLocalName = sAttrName; else sLocalName = sAttrName.copy( nColonPos + 1L ); - if ( sLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("data-source-has-labels")) ) + if ( sLocalName.equalsAscii("data-source-has-labels") ) { const rtl::OUString sValue = _xAttrList->getValueByIndex( i ); - bHasCategories = sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("both")); + bHasCategories = sValue.equalsAscii("both"); break; } - } + } // for(sal_Int16 i = 0; i < nLength; ++i) beans::PropertyValue* pArgIter = m_aArguments.getArray(); beans::PropertyValue* pArgEnd = pArgIter + m_aArguments.getLength(); for(;pArgIter != pArgEnd;++pArgIter) { - if ( pArgIter->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("HasCategories")) ) + if ( pArgIter->Name.equalsAscii("HasCategories") ) { pArgIter->Value <<= bHasCategories; break; } - } + } // for(;pArgIter != pArgEnd;++pArgIter) + SvXMLAttributeList* pList = new SvXMLAttributeList(); xNewAttribs = pList; pList->AppendAttributeList(_xAttrList); pList->AddAttribute(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("table:cell-range-address")),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("local-table.$A$1:.$Z$65536"))); - + } - + if ( bExport ) m_xDelegatee->startElement(_sName,xNewAttribs); } @@ -290,11 +292,11 @@ void SAL_CALL ImportDocumentHandler::endElement(const ::rtl::OUString & _sName) { bool bExport = true; ::rtl::OUString sNewName = _sName; - if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("office:report")) ) + if ( _sName.equalsAscii("office:report") ) { sNewName = lcl_createAttribute(XML_NP_OFFICE,XML_CHART); } - else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("rpt:master-detail-fields")) ) + else if ( _sName.equalsAscii("rpt:master-detail-fields") ) { if ( !m_aMasterFields.empty() ) m_xDatabaseDataProvider->setMasterFields(uno::Sequence< ::rtl::OUString>(&*m_aMasterFields.begin(),m_aMasterFields.size())); @@ -302,11 +304,11 @@ void SAL_CALL ImportDocumentHandler::endElement(const ::rtl::OUString & _sName) m_xDatabaseDataProvider->setDetailFields(uno::Sequence< ::rtl::OUString>(&*m_aDetailFields.begin(),m_aDetailFields.size())); bExport = false; } - else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("rpt:detail")) - || _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("rpt:formatted-text")) - || _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("rpt:master-detail-field")) - || _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("rpt:report-component")) - || _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("rpt:report-element"))) + else if ( _sName.equalsAscii("rpt:detail") + || _sName.equalsAscii("rpt:formatted-text") + || _sName.equalsAscii("rpt:master-detail-field") + || _sName.equalsAscii("rpt:report-component") + || _sName.equalsAscii("rpt:report-element")) bExport = false; if ( bExport ) @@ -356,11 +358,11 @@ void SAL_CALL ImportDocumentHandler::initialize( const uno::Sequence< uno::Any > uno::Reference< chart2::data::XDataReceiver > xReceiver(m_xModel,uno::UNO_QUERY_THROW); xReceiver->attachDataProvider(m_xDatabaseDataProvider.get()); - } + } // if ( !m_xDatabaseDataProvider.is() ) m_aArguments = m_xDatabaseDataProvider->detectArguments(NULL); - - uno::Reference< reflection::XProxyFactory > xProxyFactory( m_xContext->getServiceManager()->createInstanceWithContext( + + uno::Reference< reflection::XProxyFactory > xProxyFactory( m_xContext->getServiceManager()->createInstanceWithContext( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.reflection.ProxyFactory")),m_xContext), uno::UNO_QUERY); m_xProxy = xProxyFactory->createProxy(m_xDelegatee.get()); diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx index 4ea40033edda..d2e531629f79 100644 --- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx +++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -97,8 +97,8 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::lang::XServiceInfo > m_xServiceInfo; ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > m_xModel; ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDatabaseDataProvider > m_xDatabaseDataProvider; - - ::std::auto_ptr<SvXMLTokenMap> m_pReportElemTokenMap; + + ::std::auto_ptr<SvXMLTokenMap> m_pReportElemTokenMap; }; // ----------------------------------------------------------------------------- } // namespace rptxml diff --git a/reportdesign/source/filter/xml/xmlMasterFields.cxx b/reportdesign/source/filter/xml/xmlMasterFields.cxx index 745203f25c51..f36a6df7a2e7 100644 --- a/reportdesign/source/filter/xml/xmlMasterFields.cxx +++ b/reportdesign/source/filter/xml/xmlMasterFields.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -97,7 +97,7 @@ SvXMLImportContext* OXMLMasterFields::CreateChildContext( const Reference< XAttributeList > & xAttrList ) { SvXMLImportContext *pContext = 0; - const SvXMLTokenMap& rTokenMap = static_cast<ORptFilter&>(GetImport()).GetSubDocumentElemTokenMap(); + const SvXMLTokenMap& rTokenMap = static_cast<ORptFilter&>(GetImport()).GetSubDocumentElemTokenMap(); switch( rTokenMap.Get( _nPrefix, _rLocalName ) ) { diff --git a/reportdesign/source/filter/xml/xmlMasterFields.hxx b/reportdesign/source/filter/xml/xmlMasterFields.hxx index c684c020be24..b3d784e91f84 100644 --- a/reportdesign/source/filter/xml/xmlMasterFields.hxx +++ b/reportdesign/source/filter/xml/xmlMasterFields.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/reportdesign/source/filter/xml/xmlPropertyHandler.cxx b/reportdesign/source/filter/xml/xmlPropertyHandler.cxx index 358aeba8e0f4..645c0bad893d 100644 --- a/reportdesign/source/filter/xml/xmlPropertyHandler.cxx +++ b/reportdesign/source/filter/xml/xmlPropertyHandler.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/reportdesign/source/filter/xml/xmlPropertyHandler.hxx b/reportdesign/source/filter/xml/xmlPropertyHandler.hxx index 703428832507..1c36503a746d 100644 --- a/reportdesign/source/filter/xml/xmlPropertyHandler.hxx +++ b/reportdesign/source/filter/xml/xmlPropertyHandler.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/reportdesign/source/filter/xml/xmlReport.cxx b/reportdesign/source/filter/xml/xmlReport.cxx index 3edb30acd555..a27712d15c8f 100644 --- a/reportdesign/source/filter/xml/xmlReport.cxx +++ b/reportdesign/source/filter/xml/xmlReport.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,7 +51,7 @@ DBG_NAME( rpt_OXMLReport ) OXMLReport::OXMLReport( ORptFilter& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, - const Reference< XAttributeList > & _xAttrList + const Reference< XAttributeList > & _xAttrList ,const uno::Reference< report::XReportDefinition >& _xComponent ,OXMLTable* _pContainer) : OXMLReportElementBase( rImport, nPrfx, rLName,_xComponent.get(),_pContainer) @@ -78,7 +78,7 @@ OXMLReport::OXMLReport( ORptFilter& rImport, switch( rTokenMap.Get( nPrefix, sLocalName ) ) { - case XML_TOK_COMMAND_TYPE: + case XML_TOK_COMMAND_TYPE: { sal_uInt16 nRet = static_cast<sal_uInt16>(sdb::CommandType::COMMAND); const SvXMLEnumMapEntry* aXML_EnumMap = OXMLHelper::GetCommandTypeOptions(); @@ -86,16 +86,16 @@ OXMLReport::OXMLReport( ORptFilter& rImport, m_xComponent->setCommandType(nRet); } break; - case XML_TOK_COMMAND: + case XML_TOK_COMMAND: m_xComponent->setCommand(sValue); break; - case XML_TOK_FILTER: + case XML_TOK_FILTER: m_xComponent->setFilter(sValue); break; - case XML_TOK_CAPTION: + case XML_TOK_CAPTION: m_xComponent->setCaption(sValue); break; - case XML_TOK_ESCAPE_PROCESSING: + case XML_TOK_ESCAPE_PROCESSING: m_xComponent->setEscapeProcessing(sValue == s_sTRUE); break; case XML_TOK_REPORT_MIMETYPE: @@ -111,7 +111,7 @@ OXMLReport::OXMLReport( ORptFilter& rImport, } catch(Exception&) { - OSL_FAIL("Exception catched while filling the report definition props"); + OSL_ENSURE(0,"Exception catched while filling the report definition props"); } } // ----------------------------------------------------------------------------- @@ -149,7 +149,7 @@ SvXMLImportContext* OXMLReport::CreateChildContext( SvXMLImportContext *pContext = _CreateChildContext(nPrefix,rLocalName,xAttrList); if ( pContext ) return pContext; - const SvXMLTokenMap& rTokenMap = m_rImport.GetReportElemTokenMap(); + const SvXMLTokenMap& rTokenMap = m_rImport.GetReportElemTokenMap(); switch( rTokenMap.Get( nPrefix, rLocalName ) ) { diff --git a/reportdesign/source/filter/xml/xmlReport.hxx b/reportdesign/source/filter/xml/xmlReport.hxx index 858090f39f2c..a1300897fa12 100644 --- a/reportdesign/source/filter/xml/xmlReport.hxx +++ b/reportdesign/source/filter/xml/xmlReport.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ namespace rptxml OXMLReport( ORptFilter& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition >& _xComponent ,OXMLTable* _pContainer); virtual ~OXMLReport(); diff --git a/reportdesign/source/filter/xml/xmlReportElement.cxx b/reportdesign/source/filter/xml/xmlReportElement.cxx index 6ed989c06dbb..a3a8b3cee183 100644 --- a/reportdesign/source/filter/xml/xmlReportElement.cxx +++ b/reportdesign/source/filter/xml/xmlReportElement.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -72,7 +72,7 @@ OXMLReportElement::OXMLReportElement( ORptFilter& rImport, switch( rTokenMap.Get( nPrefix, sLocalName ) ) { - case XML_TOK_PRINT_ONLY_WHEN_GROUP_CHANGE: + case XML_TOK_PRINT_ONLY_WHEN_GROUP_CHANGE: m_xComponent->setPrintWhenGroupChange(s_sTRUE == sValue); break; case XML_TOK_PRINT_REPEATED_VALUES: @@ -85,7 +85,7 @@ OXMLReportElement::OXMLReportElement( ORptFilter& rImport, } catch(Exception&) { - OSL_FAIL("Exception catched while filling the report definition props"); + OSL_ENSURE(0,"Exception catched while filling the report definition props"); } } // ----------------------------------------------------------------------------- @@ -104,7 +104,7 @@ SvXMLImportContext* OXMLReportElement::CreateChildContext( { SvXMLImportContext *pContext = 0; ORptFilter& rImport = GetOwnImport(); - const SvXMLTokenMap& rTokenMap = rImport.GetReportElementElemTokenMap(); + const SvXMLTokenMap& rTokenMap = rImport.GetReportElementElemTokenMap(); switch( rTokenMap.Get( _nPrefix, _rLocalName ) ) { diff --git a/reportdesign/source/filter/xml/xmlReportElement.hxx b/reportdesign/source/filter/xml/xmlReportElement.hxx index 333322430832..00bdbe2d734b 100644 --- a/reportdesign/source/filter/xml/xmlReportElement.hxx +++ b/reportdesign/source/filter/xml/xmlReportElement.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ namespace rptxml class ORptFilter; class OXMLReportElement : public SvXMLImportContext { - ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportControlModel > m_xComponent; + ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportControlModel > m_xComponent; ORptFilter& GetOwnImport(); OXMLReportElement(const OXMLReportElement&); void operator =(const OXMLReportElement&); diff --git a/reportdesign/source/filter/xml/xmlReportElementBase.cxx b/reportdesign/source/filter/xml/xmlReportElementBase.cxx index 0a86638028b9..031eca201534 100644 --- a/reportdesign/source/filter/xml/xmlReportElementBase.cxx +++ b/reportdesign/source/filter/xml/xmlReportElementBase.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -74,7 +74,7 @@ SvXMLImportContext* OXMLReportElementBase::_CreateChildContext( const Reference< XAttributeList > & xAttrList ) { SvXMLImportContext *pContext = 0; - const SvXMLTokenMap& rTokenMap = m_rImport.GetControlElemTokenMap(); + const SvXMLTokenMap& rTokenMap = m_rImport.GetControlElemTokenMap(); switch( rTokenMap.Get( nPrefix, rLocalName ) ) { @@ -108,7 +108,7 @@ void OXMLReportElementBase::EndElement() } catch(Exception&) { - OSL_FAIL("Exception caught while inserting a new control!"); + OSL_ENSURE(0,"Exception caught while inserting a new control!"); } } //---------------------------------------------------------------------------- diff --git a/reportdesign/source/filter/xml/xmlReportElementBase.hxx b/reportdesign/source/filter/xml/xmlReportElementBase.hxx index c1d212748a86..546bdd0af2e0 100644 --- a/reportdesign/source/filter/xml/xmlReportElementBase.hxx +++ b/reportdesign/source/filter/xml/xmlReportElementBase.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,7 +50,7 @@ namespace rptxml protected: ORptFilter& m_rImport; OXMLTable* m_pContainer; - ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent > m_xComponent; + ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent > m_xComponent; virtual SvXMLImportContext* _CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, @@ -67,7 +67,7 @@ namespace rptxml virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); - + virtual void EndElement(); }; // ----------------------------------------------------------------------------- diff --git a/reportdesign/source/filter/xml/xmlRow.cxx b/reportdesign/source/filter/xml/xmlRow.cxx index fbff64b2a617..d5cba84aefd6 100644 --- a/reportdesign/source/filter/xml/xmlRow.cxx +++ b/reportdesign/source/filter/xml/xmlRow.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,7 +61,7 @@ OXMLRow::OXMLRow( ORptFilter& rImport DBG_CTOR( rpt_OXMLRow,NULL); OSL_ENSURE(_xAttrList.is(),"Attribute list is NULL!"); - + const SvXMLNamespaceMap& rMap = rImport.GetNamespaceMap(); const SvXMLTokenMap& rTokenMap = rImport.GetColumnTokenMap(); @@ -85,7 +85,7 @@ OXMLRow::OXMLRow( ORptFilter& rImport break; } } - + } // ----------------------------------------------------------------------------- @@ -101,7 +101,7 @@ SvXMLImportContext* OXMLRow::CreateChildContext( { SvXMLImportContext *pContext = 0; ORptFilter& rImport = GetOwnImport(); - const SvXMLTokenMap& rTokenMap = rImport.GetControlPropertyElemTokenMap(); + const SvXMLTokenMap& rTokenMap = rImport.GetControlPropertyElemTokenMap(); switch( rTokenMap.Get( nPrefix, rLocalName ) ) { @@ -140,9 +140,9 @@ void OXMLRow::EndElement() { PropertySetInfo* pInfo = new PropertySetInfo(); static PropertyMapEntry pMap[] = - { - {PROPERTY_WIDTH, static_cast<sal_uInt16>(PROPERTY_WIDTH.length), 0, &::getCppuType(static_cast< sal_Int32* >( NULL )) ,PropertyAttribute::BOUND,0}, - {PROPERTY_HEIGHT, static_cast<sal_uInt16>(PROPERTY_HEIGHT.length), 0, &::getCppuType(static_cast< sal_Int32* >( NULL )) ,PropertyAttribute::BOUND,0}, + { + {PROPERTY_WIDTH, static_cast<sal_uInt16>(PROPERTY_WIDTH.length), 0, &::getCppuType(static_cast< sal_Int32* >( NULL )) ,PropertyAttribute::BOUND,0}, + {PROPERTY_HEIGHT, static_cast<sal_uInt16>(PROPERTY_HEIGHT.length), 0, &::getCppuType(static_cast< sal_Int32* >( NULL )) ,PropertyAttribute::BOUND,0}, { NULL, 0, 0, NULL, 0, 0 } }; pInfo->add(pMap); @@ -155,7 +155,7 @@ void OXMLRow::EndElement() xProp->getPropertyValue(PROPERTY_WIDTH) >>= nWidth; m_pContainer->addWidth(nWidth); } - else + else { pAutoStyle = PTR_CAST(XMLPropStyleContext,pAutoStyles->FindStyleChildContext(XML_STYLE_FAMILY_TABLE_ROW,m_sStyleName)); if ( pAutoStyle ) diff --git a/reportdesign/source/filter/xml/xmlRow.hxx b/reportdesign/source/filter/xml/xmlRow.hxx index e31a36003b26..bbbe189ecd86 100644 --- a/reportdesign/source/filter/xml/xmlRow.hxx +++ b/reportdesign/source/filter/xml/xmlRow.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/reportdesign/source/filter/xml/xmlSection.cxx b/reportdesign/source/filter/xml/xmlSection.cxx index 5d19b6e9c202..3dc4567bf9ea 100644 --- a/reportdesign/source/filter/xml/xmlSection.cxx +++ b/reportdesign/source/filter/xml/xmlSection.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -90,7 +90,7 @@ OXMLSection::OXMLSection( ORptFilter& rImport, switch( rTokenMap.Get( nPrefix, sLocalName ) ) { - + case XML_TOK_PAGE_PRINT_OPTION: if ( _bPageHeader ) m_xSection->getReportDefinition()->setPageHeaderOption(lcl_getReportPrintOption(sValue)); @@ -102,18 +102,18 @@ OXMLSection::OXMLSection( ORptFilter& rImport, break; default: - OSL_FAIL("OXMLSection: Unknown attribute!"); + OSL_ENSURE(0,"OXMLSection: Unknown attribute!"); } } } catch(Exception&) { - OSL_FAIL("Exception catched while filling the section props"); + OSL_ENSURE(0,"Exception catched while filling the section props"); } } // ----------------------------------------------------------------------------- OXMLSection::~OXMLSection() -{ +{ DBG_DTOR( rpt_OXMLSection,NULL); } // ----------------------------------------------------------------------------- @@ -125,7 +125,7 @@ SvXMLImportContext* OXMLSection::CreateChildContext( { SvXMLImportContext *pContext = 0; ORptFilter& rImport = GetOwnImport(); - const SvXMLTokenMap& rTokenMap = rImport.GetSectionElemTokenMap(); + const SvXMLTokenMap& rTokenMap = rImport.GetSectionElemTokenMap(); uno::Reference<lang::XMultiServiceFactory> xFactor = rImport.getServiceFactory(); switch( rTokenMap.Get( _nPrefix, _rLocalName ) ) diff --git a/reportdesign/source/filter/xml/xmlSection.hxx b/reportdesign/source/filter/xml/xmlSection.hxx index 866401974a0c..6172e74b0be4 100644 --- a/reportdesign/source/filter/xml/xmlSection.hxx +++ b/reportdesign/source/filter/xml/xmlSection.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,10 +38,10 @@ namespace rptxml class OXMLSection : public SvXMLImportContext { private: - ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > m_xSection; - sal_Bool m_bPageHeader; + ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > m_xSection; + sal_Bool m_bPageHeader; ORptFilter& GetOwnImport(); - + OXMLSection(const OXMLSection&); void operator =(const OXMLSection&); public: diff --git a/reportdesign/source/filter/xml/xmlStyleImport.cxx b/reportdesign/source/filter/xml/xmlStyleImport.cxx index eab257017a91..8e38218ecd94 100644 --- a/reportdesign/source/filter/xml/xmlStyleImport.cxx +++ b/reportdesign/source/filter/xml/xmlStyleImport.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,7 +44,7 @@ #include <tools/debug.hxx> #include "xmlfilter.hxx" #include "xmlHelper.hxx" -#include <osl/diagnose.h> +#include <tools/debug.hxx> #define XML_LINE_LEFT 0 #define XML_LINE_RIGHT 1 @@ -129,7 +129,7 @@ void OControlStyleContext::FillPropertySet(const Reference< XPropertySet > & rPr pStyle = PTR_CAST(SvXMLNumFormatContext,pMyStyles-> FindStyleChildContext(XML_STYLE_FAMILY_DATA_STYLE, m_sDataStyleName, sal_True)); else { - OSL_FAIL("not possible to get style"); + DBG_ERROR("not possible to get style"); } } if ( pStyle ) @@ -151,7 +151,7 @@ void OControlStyleContext::SetDefaults() void OControlStyleContext::AddProperty(const sal_Int16 nContextID, const uno::Any& rValue) { sal_Int32 nIndex(static_cast<OReportStylesContext *>(pStyles)->GetIndex(nContextID)); - OSL_ENSURE(nIndex != -1, "Property not found in Map"); + DBG_ASSERT(nIndex != -1, "Property not found in Map"); XMLPropertyState aPropState(nIndex, rValue); GetProperties().push_back(aPropState); // has to be insertes in a sort order later } @@ -229,7 +229,7 @@ UniReference < SvXMLImportPropertyMapper > { m_xCellImpPropMapper = new XMLTextImportPropertyMapper/*OSpecialHanldeXMLImportPropertyMapper*/( rImport.GetCellStylesPropertySetMapper(), m_rImport , const_cast<XMLFontStylesContext*>(m_rImport.GetFontDecls())); - + m_xCellImpPropMapper->ChainImportMapper(XMLTextImportHelper::CreateParaExtPropMapper(m_rImport, const_cast<XMLFontStylesContext*>(m_rImport.GetFontDecls()))); } xMapper = m_xCellImpPropMapper; @@ -238,9 +238,9 @@ UniReference < SvXMLImportPropertyMapper > case XML_STYLE_FAMILY_TABLE_COLUMN: { if( !m_xColumnImpPropMapper.is() ) - m_xColumnImpPropMapper = + m_xColumnImpPropMapper = new SvXMLImportPropertyMapper( rImport.GetColumnStylesPropertySetMapper(), m_rImport ); - + xMapper = m_xColumnImpPropMapper; } break; @@ -257,6 +257,7 @@ UniReference < SvXMLImportPropertyMapper > { UniReference < XMLPropertyHandlerFactory> xFac = new ::xmloff::OControlPropertyHandlerFactory(); m_xTableImpPropMapper = new SvXMLImportPropertyMapper( new XMLPropertySetMapper(OXMLHelper::GetTableStyleProps(), xFac), m_rImport ); + //m_xTableImpPropMapper = new SvXMLImportPropertyMapper( rImport.GetTableStylesPropertySetMapper(), m_rImport ); } xMapper = m_xTableImpPropMapper; } @@ -265,7 +266,7 @@ UniReference < SvXMLImportPropertyMapper > break; } } - + return xMapper; } // ----------------------------------------------------------------------------- @@ -311,7 +312,7 @@ SvXMLStyleContext *OReportStylesContext::CreateStyleStyleChildContext( xAttrList, *this, nFamily ); break; default: - OSL_FAIL("OReportStylesContext::CreateStyleStyleChildContext: Unknown style family. PLease check."); + OSL_ENSURE(0,"OReportStylesContext::CreateStyleStyleChildContext: Unknown style family. PLease check."); break; } } @@ -368,7 +369,7 @@ Reference < XNameContainer > xStyles = ((SvXMLImport *)&GetImport())->GetTextImport()->GetFrameStyles(); break; default: - OSL_FAIL("OReportStylesContext::CreateStyleStyleChildContext: Unknown style family. PLease check."); + OSL_ENSURE(0,"OReportStylesContext::CreateStyleStyleChildContext: Unknown style family. PLease check."); break; } if( !xStyles.is() && sName.getLength() && GetOwnImport().GetModel().is() ) diff --git a/reportdesign/source/filter/xml/xmlStyleImport.hxx b/reportdesign/source/filter/xml/xmlStyleImport.hxx index 07ba5be94c56..8fec6ff9a6c8 100644 --- a/reportdesign/source/filter/xml/xmlStyleImport.hxx +++ b/reportdesign/source/filter/xml/xmlStyleImport.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,16 +47,16 @@ namespace rptxml class OControlStyleContext : public XMLPropStyleContext { - ::rtl::OUString m_sDataStyleName; - ::rtl::OUString sPageStyle; - const rtl::OUString sNumberFormat; - SvXMLStylesContext* pStyles; - // std::vector<ScXMLMapContent> aMaps; - com::sun::star::uno::Any aConditionalFormat; - sal_Int32 m_nNumberFormat; + ::rtl::OUString m_sDataStyleName; + ::rtl::OUString sPageStyle; + const rtl::OUString sNumberFormat; + SvXMLStylesContext* pStyles; + // std::vector<ScXMLMapContent> aMaps; + com::sun::star::uno::Any aConditionalFormat; + sal_Int32 m_nNumberFormat; ORptFilter& m_rImport; - sal_Bool bConditionalFormatCreated : 1; - sal_Bool bParentSet : 1; + sal_Bool bConditionalFormatCreated : 1; + sal_Bool bParentSet : 1; ORptFilter& GetOwnImport() const; diff --git a/reportdesign/source/filter/xml/xmlSubDocument.cxx b/reportdesign/source/filter/xml/xmlSubDocument.cxx index 847752adaeae..9bfc17808082 100644 --- a/reportdesign/source/filter/xml/xmlSubDocument.cxx +++ b/reportdesign/source/filter/xml/xmlSubDocument.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,7 +50,7 @@ DBG_NAME( rpt_OXMLSubDocument ) OXMLSubDocument::OXMLSubDocument( ORptFilter& rImport, sal_uInt16 nPrfx ,const ::rtl::OUString& rLName - ,const Reference< XReportComponent > & _xComponent + ,const Reference< XReportComponent > & _xComponent ,OXMLTable* _pContainer ,OXMLCell* _pCellParent) : OXMLReportElementBase( rImport, nPrfx, rLName,_xComponent.get(),_pContainer) @@ -78,7 +78,7 @@ SvXMLImportContext* OXMLSubDocument::_CreateChildContext( SvXMLImportContext *pContext = OXMLReportElementBase::_CreateChildContext(_nPrefix,_rLocalName,xAttrList); if ( pContext ) return pContext; - const SvXMLTokenMap& rTokenMap = static_cast<ORptFilter&>(GetImport()).GetReportElemTokenMap(); + const SvXMLTokenMap& rTokenMap = static_cast<ORptFilter&>(GetImport()).GetReportElemTokenMap(); switch( rTokenMap.Get( _nPrefix, _rLocalName ) ) { @@ -120,6 +120,9 @@ void OXMLSubDocument::EndElement() m_xComponent.set(m_pContainer->getSection()->getByIndex(m_nCurrentCount),uno::UNO_QUERY); if ( m_xComponent.is() ) { + // #i94115# this is no longer need. + // m_pContainer->addCell(m_xComponent.get()); + if ( !m_aMasterFields.empty() ) m_xComponent->setMasterFields(Sequence< ::rtl::OUString>(&*m_aMasterFields.begin(),m_aMasterFields.size())); if ( !m_aDetailFields.empty() ) @@ -127,8 +130,8 @@ void OXMLSubDocument::EndElement() m_xComponent->setName(m_xFake->getName()); m_xComponent->setPrintRepeatedValues(m_xFake->getPrintRepeatedValues()); - uno::Reference< report::XReportControlModel > xFakeModel(m_xFake,uno::UNO_QUERY); - uno::Reference< report::XReportControlModel > xComponentModel(m_xComponent,uno::UNO_QUERY); + uno::Reference< report::XReportControlModel > xFakeModel(m_xFake,uno::UNO_QUERY); + uno::Reference< report::XReportControlModel > xComponentModel(m_xComponent,uno::UNO_QUERY); if ( xComponentModel.is() && xFakeModel.is() ) { const sal_Int32 nCount = xFakeModel->getCount(); @@ -140,13 +143,13 @@ void OXMLSubDocument::EndElement() uno::Reference< report::XFormatCondition > xNewCond = xComponentModel->createFormatCondition(); ::comphelper::copyProperties(xCond.get(),xNewCond.get()); xComponentModel->insertByIndex(xComponentModel->getCount(),uno::makeAny(xNewCond)); - } - } + } // for (sal_Int32 i = 0; i < nCount ; ++i) + } catch(uno::Exception&) { - OSL_FAIL("Can not access format condition!"); + OSL_ENSURE(0,"Can not access format condition!"); } - + } } } diff --git a/reportdesign/source/filter/xml/xmlSubDocument.hxx b/reportdesign/source/filter/xml/xmlSubDocument.hxx index e26996e81ee0..50bb1b91c8d5 100644 --- a/reportdesign/source/filter/xml/xmlSubDocument.hxx +++ b/reportdesign/source/filter/xml/xmlSubDocument.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,8 +38,8 @@ namespace rptxml class OXMLCell; class OXMLSubDocument : public OXMLReportElementBase, public IMasterDetailFieds { - ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> m_xComponent; - ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> m_xFake; + ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> m_xComponent; + ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> m_xFake; ::std::vector< ::rtl::OUString> m_aMasterFields; ::std::vector< ::rtl::OUString> m_aDetailFields; OXMLCell* m_pCellParent; diff --git a/reportdesign/source/filter/xml/xmlTable.cxx b/reportdesign/source/filter/xml/xmlTable.cxx index 92fbf0658867..e9ba7ac425f1 100644 --- a/reportdesign/source/filter/xml/xmlTable.cxx +++ b/reportdesign/source/filter/xml/xmlTable.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -122,12 +122,12 @@ OXMLTable::OXMLTable( ORptFilter& rImport } catch(Exception&) { - OSL_FAIL("Exception catched while filling the section props"); + OSL_ENSURE(0,"Exception catched while filling the section props"); } } // ----------------------------------------------------------------------------- OXMLTable::~OXMLTable() -{ +{ DBG_DTOR( rpt_OXMLTable,NULL); } // ----------------------------------------------------------------------------- @@ -139,7 +139,7 @@ SvXMLImportContext* OXMLTable::CreateChildContext( { SvXMLImportContext *pContext = 0; ORptFilter& rImport = GetOwnImport(); - const SvXMLTokenMap& rTokenMap = rImport.GetColumnTokenMap(); + const SvXMLTokenMap& rTokenMap = rImport.GetColumnTokenMap(); Reference<XMultiServiceFactory> xFactor = rImport.getServiceFactory(); switch( rTokenMap.Get( _nPrefix, _rLocalName ) ) @@ -192,7 +192,7 @@ void OXMLTable::EndElement() pAutoStyle->FillPropertySet(m_xSection.get()); } } - } + } // if ( m_sStyleName.getLength() ) // set height ::std::vector<sal_Int32>::iterator aIter = m_aHeight.begin(); ::std::vector<sal_Int32>::iterator aEnd = m_aHeight.end(); @@ -265,11 +265,11 @@ void OXMLTable::EndElement() try { (*aCellIter)->setSize(awt::Size(nWidth,nHeight)); - (*aCellIter)->setPosition(awt::Point(nPosX,nPosY)); + (*aCellIter)->setPosition(awt::Point(nPosX,nPosY)); } catch(beans::PropertyVetoException) { - OSL_FAIL("Could not set the correct position or size!"); + OSL_ENSURE(0,"Could not set the correct position or size!"); } } } @@ -278,11 +278,11 @@ void OXMLTable::EndElement() } nPosY += m_aHeight[i]; } - } + } // if ( m_xComponent.is() ) } catch(Exception&) { - OSL_FAIL("OXMLTable::EndElement -> exception catched"); + OSL_ENSURE(0,"OXMLTable::EndElement -> exception catched"); } } // ----------------------------------------------------------------------------- @@ -310,8 +310,8 @@ void OXMLTable::addCell(const Reference<XReportComponent>& _xElement) } // ----------------------------------------------------------------------------- void OXMLTable::incrementRowIndex() -{ - ++m_nRowIndex; +{ + ++m_nRowIndex; m_nColumnIndex = 0; m_aGrid.push_back(::std::vector<TCell>(m_aWidth.size())); } diff --git a/reportdesign/source/filter/xml/xmlTable.hxx b/reportdesign/source/filter/xml/xmlTable.hxx index 4b6bbd2f429b..29105d9b3cd2 100644 --- a/reportdesign/source/filter/xml/xmlTable.hxx +++ b/reportdesign/source/filter/xml/xmlTable.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,14 +51,14 @@ namespace rptxml ::std::vector< ::std::vector<TCell> > m_aGrid; ::std::vector<sal_Int32> m_aHeight; ::std::vector<sal_Int32> m_aWidth; - ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > m_xSection; - ::rtl::OUString m_sStyleName; + ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > m_xSection; + ::rtl::OUString m_sStyleName; sal_Int32 m_nColSpan; sal_Int32 m_nRowSpan; sal_Int32 m_nRowIndex; sal_Int32 m_nColumnIndex; ORptFilter& GetOwnImport(); - + OXMLTable(const OXMLTable&); void operator =(const OXMLTable&); public: @@ -85,7 +85,7 @@ namespace rptxml void incrementRowIndex(); inline void incrementColumnIndex() { ++m_nColumnIndex; } - + inline sal_Int32 getRowIndex() const { return m_nRowIndex; } inline sal_Int32 getColumnIndex() const { return m_nColumnIndex; } diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx index b44fd3282ed3..8574b949845e 100644 --- a/reportdesign/source/filter/xml/xmlfilter.cxx +++ b/reportdesign/source/filter/xml/xmlfilter.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -85,8 +85,8 @@ using namespace ::com::sun::star::io; using namespace ::com::sun::star::report; using namespace ::com::sun::star::xml::sax; using namespace xmloff; - sal_Char const sXML_np__rpt[] = "_report"; - sal_Char const sXML_np___rpt[] = "__report"; + sal_Char __READONLY_DATA sXML_np__rpt[] = "_report"; + sal_Char __READONLY_DATA sXML_np___rpt[] = "__report"; using namespace ::com::sun::star::util; @@ -116,12 +116,12 @@ RptMLMasterStylesContext_Impl::RptMLMasterStylesContext_Impl( XMLTextMasterStylesContext( rImport, nPrfx, rLName, xAttrList ) ,m_rImport(rImport) { - DBG_CTOR(rpt_RptMLMasterStylesContext_Impl,NULL); + DBG_CTOR(rpt_RptMLMasterStylesContext_Impl,NULL); } RptMLMasterStylesContext_Impl::~RptMLMasterStylesContext_Impl() { - DBG_DTOR(rpt_RptMLMasterStylesContext_Impl,NULL); + DBG_DTOR(rpt_RptMLMasterStylesContext_Impl,NULL); } void RptMLMasterStylesContext_Impl::EndElement() @@ -138,9 +138,9 @@ sal_Int32 ReadThroughComponent( const uno::Reference< XDocumentHandler >& _xFilter, sal_Bool /*bEncrypted*/ ) { - OSL_ENSURE(xInputStream.is(), "input stream missing"); - OSL_ENSURE(xModelComponent.is(), "document missing"); - OSL_ENSURE(rFactory.is(), "factory missing"); + DBG_ASSERT(xInputStream.is(), "input stream missing"); + DBG_ASSERT(xModelComponent.is(), "document missing"); + DBG_ASSERT(rFactory.is(), "factory missing"); RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "rptxml", "oj", "ReadThroughComponent" ); @@ -151,15 +151,15 @@ sal_Int32 ReadThroughComponent( // get parser uno::Reference< XParser > xParser( rFactory->createInstance( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser"))), + ::rtl::OUString::createFromAscii("com.sun.star.xml.sax.Parser") ), UNO_QUERY ); - OSL_ENSURE( xParser.is(), "Can't create parser" ); + DBG_ASSERT( xParser.is(), "Can't create parser" ); if( !xParser.is() ) return 1; RTL_LOGFILE_CONTEXT_TRACE( aLog, "parser created" ); // get filter - OSL_ENSURE( _xFilter.is(), "Can't instantiate filter component." ); + DBG_ASSERT( _xFilter.is(), "Can't instantiate filter component." ); if( !_xFilter.is() ) return 1; @@ -182,10 +182,10 @@ sal_Int32 ReadThroughComponent( { xParser->parseStream( aParserInput ); } - catch( SAXParseException& + catch( SAXParseException& #if OSL_DEBUG_LEVEL > 1 -r +r #endif ) { @@ -196,7 +196,7 @@ r aError += ','; aError += ByteString::CreateFromInt32( r.ColumnNumber ); - OSL_FAIL( aError.GetBuffer() ); + DBG_ERROR( aError.GetBuffer() ); #endif return 1; } @@ -233,14 +233,14 @@ sal_Int32 ReadThroughComponent( const ::rtl::OUString& _sFilterName ,const uno::Reference<beans::XPropertySet>& _xProp) { - OSL_ENSURE( xStorage.is(), "Need storage!"); - OSL_ENSURE(NULL != pStreamName, "Please, please, give me a name!"); + DBG_ASSERT( xStorage.is(), "Need storage!"); + DBG_ASSERT(NULL != pStreamName, "Please, please, give me a name!"); if ( xStorage.is() ) { uno::Reference< io::XStream > xDocStream; sal_Bool bEncrypted = sal_False; - + try { // open stream (and set parser input) @@ -249,7 +249,7 @@ sal_Int32 ReadThroughComponent( { // stream name not found! Then try the compatibility name. // if no stream can be opened, return immediatly with OK signal - + // do we even have an alternative name? if ( NULL == pCompatibilityStreamName ) return 0; @@ -330,7 +330,7 @@ Sequence< ::rtl::OUString > ORptImportHelper::getSupportedServiceNames_Static( //--------------------------------------------------------------------- Reference< XInterface > ORptContentImportHelper::create(const Reference< XComponentContext > & xContext) { - return static_cast< XServiceInfo* >(new ORptFilter(Reference< XMultiServiceFactory >(xContext->getServiceManager(),UNO_QUERY),IMPORT_AUTOSTYLES | IMPORT_CONTENT | IMPORT_SCRIPTS | + return static_cast< XServiceInfo* >(new ORptFilter(Reference< XMultiServiceFactory >(xContext->getServiceManager(),UNO_QUERY),IMPORT_AUTOSTYLES | IMPORT_CONTENT | IMPORT_SCRIPTS | IMPORT_FONTDECLS )); } //--------------------------------------------------------------------- @@ -389,10 +389,10 @@ Sequence< ::rtl::OUString > ORptMetaImportHelper::getSupportedServiceNames_Stati // - ORptFilter - // ------------- DBG_NAME(rpt_ORptFilter) -ORptFilter::ORptFilter( const uno::Reference< XMultiServiceFactory >& _rxMSF,sal_uInt16 nImportFlags ) +ORptFilter::ORptFilter( const uno::Reference< XMultiServiceFactory >& _rxMSF,sal_uInt16 nImportFlags ) :SvXMLImport(_rxMSF,nImportFlags) { - DBG_CTOR(rpt_ORptFilter,NULL); + DBG_CTOR(rpt_ORptFilter,NULL); GetMM100UnitConverter().setCoreMeasureUnit(MAP_100TH_MM); GetMM100UnitConverter().setXMLMeasureUnit(MAP_CM); GetNamespaceMap().Add( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( sXML_np__rpt) ), @@ -414,7 +414,7 @@ ORptFilter::ORptFilter( const uno::Reference< XMultiServiceFactory >& _rxMSF,sal ORptFilter::~ORptFilter() throw() { - DBG_DTOR(rpt_ORptFilter,NULL); + DBG_DTOR(rpt_ORptFilter,NULL); } //------------------------------------------------------------------------------ uno::Reference< XInterface > ORptFilter::create(uno::Reference< XComponentContext > const & xContext) @@ -438,7 +438,7 @@ uno::Sequence< ::rtl::OUString > ORptFilter::getSupportedServiceNames_Static( ) { uno::Sequence< ::rtl::OUString > aServices(1); aServices.getArray()[0] = SERVICE_IMPORTFILTER; - + return aServices; } @@ -453,7 +453,7 @@ sal_Bool SAL_CALL ORptFilter::supportsService(const ::rtl::OUString& ServiceName return ::comphelper::existsValue(ServiceName,getSupportedServiceNames_Static()); } // ----------------------------------------------------------------------------- -sal_Bool SAL_CALL ORptFilter::filter( const Sequence< PropertyValue >& rDescriptor ) +sal_Bool SAL_CALL ORptFilter::filter( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException) { Window* pFocusWindow = Application::GetFocusWindow(); @@ -475,26 +475,26 @@ sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException) { ::rtl::OUString sFileName; - uno::Reference< embed::XStorage > xStorage; + uno::Reference< embed::XStorage > xStorage; uno::Reference< util::XNumberFormatsSupplier > xNumberFormatsSupplier; - + const PropertyValue* pIter = rDescriptor.getConstArray(); - const PropertyValue* pEnd = pIter + rDescriptor.getLength(); + const PropertyValue* pEnd = pIter + rDescriptor.getLength(); for(;pIter != pEnd;++pIter) { - if( pIter->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FileName" ) ) ) + if( pIter->Name.equalsAscii( "FileName" ) ) pIter->Value >>= sFileName; - else if( pIter->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Storage" ) ) ) + else if( pIter->Name.equalsAscii( "Storage" ) ) pIter->Value >>= xStorage; - else if( pIter->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ComponentData" ) ) ) + else if( pIter->Name.equalsAscii( "ComponentData" ) ) { Sequence< PropertyValue > aComponent; pIter->Value >>= aComponent; const PropertyValue* pComponentIter = aComponent.getConstArray(); - const PropertyValue* pComponentEnd = pComponentIter + aComponent.getLength(); + const PropertyValue* pComponentEnd = pComponentIter + aComponent.getLength(); for(;pComponentIter != pComponentEnd;++pComponentIter) { - if( pComponentIter->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ActiveConnection" ) ) ) + if( pComponentIter->Name.equalsAscii( "ActiveConnection" ) ) { uno::Reference<sdbc::XConnection> xCon(pComponentIter->Value,uno::UNO_QUERY); xNumberFormatsSupplier = ::dbtools::getNumberFormats(xCon); @@ -503,25 +503,26 @@ sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) } } } - + if ( sFileName.getLength() != 0 ) { uno::Reference<XComponent> xCom(GetModel(),UNO_QUERY); SfxMediumRef pMedium = new SfxMedium( - sFileName, ( STREAM_READ | STREAM_NOCREATE ), sal_False, 0 ); - + sFileName, ( STREAM_READ | STREAM_NOCREATE ), FALSE, 0 ); + if( pMedium ) { try { xStorage = pMedium->GetStorage(); + // nError = pMedium->GetError(); } catch(const Exception&) { } - } - } + } // if( pMedium ) + } // if ( bRet = (sFileName.getLength() != 0) ) sal_Bool bRet = xStorage.is(); if ( bRet ) { @@ -534,13 +535,13 @@ sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) uno::Reference < container::XNameAccess > xAccess( xStorage, uno::UNO_QUERY ); uno::Sequence< ::rtl::OUString> aSeq = xAccess->getElementNames(); const ::rtl::OUString* pDebugIter = aSeq.getConstArray(); - const ::rtl::OUString* pDebugEnd = pDebugIter + aSeq.getLength(); + const ::rtl::OUString* pDebugEnd = pDebugIter + aSeq.getLength(); for(;pDebugIter != pDebugEnd;++pDebugIter) { (void)*pDebugIter; } #endif - + Reference< document::XGraphicObjectResolver > xGraphicObjectResolver; uno::Reference<document::XEmbeddedObjectResolver> xEmbeddedObjectResolver; uno::Reference< lang::XMultiServiceFactory > xServiceFactory( getServiceFactory(), uno::UNO_QUERY); @@ -559,8 +560,8 @@ sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) static const ::rtl::OUString s_sOld(RTL_CONSTASCII_USTRINGPARAM("OldFormat")); static comphelper::PropertyMapEntry pMap[] = - { - { MAP_LEN( "OldFormat" ), 1, &::getCppuType((const sal_Bool*)0), beans::PropertyAttribute::BOUND, 0 }, + { + { MAP_LEN( "OldFormat" ), 1, &::getCppuType((const sal_Bool*)0), beans::PropertyAttribute::BOUND, 0 }, { MAP_LEN( "StreamName"), 0, &::getCppuType( (::rtl::OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 }, { MAP_LEN("PrivateData"), 0, &::getCppuType( (uno::Reference<XInterface> *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 }, { MAP_LEN( "BaseURI"), 0, &::getCppuType( (::rtl::OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 }, @@ -589,7 +590,7 @@ sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) ,xProp ); - + try { xProp->setPropertyValue(s_sOld,uno::makeAny(!(xStorage->hasByName(s_sMeta) || xStorage->isStreamElement( s_sMeta )))); @@ -641,11 +642,11 @@ sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) ,xProp ); } - + bRet = nRet == 0; - if ( bRet ) + if ( bRet ) { m_xReportDefinition->setModified(sal_False); } @@ -739,18 +740,22 @@ SvXMLImportContext* ORptFilter::CreateContext( sal_uInt16 nPrefix, // ----------------------------------------------------------------------------- const SvXMLTokenMap& ORptFilter::GetDocElemTokenMap() const { - if ( !m_pDocElemTokenMap.get() ) + if ( !m_pDocElemTokenMap.get() ) { - static SvXMLTokenMapEntry aElemTokenMap[]= + static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= { - { XML_NAMESPACE_OFFICE, XML_SETTINGS, XML_TOK_DOC_SETTINGS }, - { XML_NAMESPACE_OFFICE, XML_STYLES, XML_TOK_DOC_STYLES }, - { XML_NAMESPACE_OFFICE, XML_AUTOMATIC_STYLES, XML_TOK_DOC_AUTOSTYLES }, - { XML_NAMESPACE_OFFICE, XML_REPORT, XML_TOK_DOC_REPORT }, - { XML_NAMESPACE_OOO, XML_REPORT, XML_TOK_DOC_REPORT }, - { XML_NAMESPACE_OFFICE, XML_FONT_FACE_DECLS, XML_TOK_DOC_FONTDECLS }, - { XML_NAMESPACE_OFFICE, XML_MASTER_STYLES, XML_TOK_DOC_MASTERSTYLES }, - { XML_NAMESPACE_OFFICE, XML_DOCUMENT_META, XML_TOK_DOC_META }, + { XML_NAMESPACE_OFFICE, XML_SETTINGS, XML_TOK_DOC_SETTINGS }, + //{ XML_NAMESPACE_OOO, XML_SETTINGS, XML_TOK_DOC_SETTINGS }, + { XML_NAMESPACE_OFFICE, XML_STYLES, XML_TOK_DOC_STYLES }, + //{ XML_NAMESPACE_OOO, XML_STYLES, XML_TOK_DOC_STYLES }, + { XML_NAMESPACE_OFFICE, XML_AUTOMATIC_STYLES, XML_TOK_DOC_AUTOSTYLES }, + //{ XML_NAMESPACE_OOO, XML_AUTOMATIC_STYLES, XML_TOK_DOC_AUTOSTYLES }, + { XML_NAMESPACE_OFFICE, XML_REPORT, XML_TOK_DOC_REPORT }, + { XML_NAMESPACE_OOO, XML_REPORT, XML_TOK_DOC_REPORT }, + { XML_NAMESPACE_OFFICE, XML_FONT_FACE_DECLS, XML_TOK_DOC_FONTDECLS }, + { XML_NAMESPACE_OFFICE, XML_MASTER_STYLES, XML_TOK_DOC_MASTERSTYLES }, + { XML_NAMESPACE_OFFICE, XML_DOCUMENT_META, XML_TOK_DOC_META }, + //{ XML_NAMESPACE_OOO, XML_FONT_FACE_DECLS, XML_TOK_DOC_FONTDECLS }, XML_TOKEN_MAP_END }; m_pDocElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); @@ -760,7 +765,7 @@ const SvXMLTokenMap& ORptFilter::GetDocElemTokenMap() const // ----------------------------------------------------------------------------- const SvXMLTokenMap& ORptFilter::GetReportElemTokenMap() const { - if ( !m_pReportElemTokenMap.get() ) + if ( !m_pReportElemTokenMap.get() ) m_pReportElemTokenMap.reset(OXMLHelper::GetReportElemTokenMap()); return *m_pReportElemTokenMap; } @@ -776,13 +781,13 @@ const SvXMLTokenMap& ORptFilter::GetFunctionElemTokenMap() const { if ( !m_pFunctionElemTokenMap.get() ) { - static SvXMLTokenMapEntry aElemTokenMap[]= + static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= { - { XML_NAMESPACE_REPORT, XML_NAME, XML_TOK_FUNCTION_NAME }, - { XML_NAMESPACE_REPORT, XML_FORMULA, XML_TOK_FUNCTION_FORMULA}, - { XML_NAMESPACE_REPORT, XML_PRE_EVALUATED, XML_TOK_PRE_EVALUATED }, - { XML_NAMESPACE_REPORT, XML_INITIAL_FORMULA,XML_TOK_INITIAL_FORMULA }, - { XML_NAMESPACE_REPORT, XML_DEEP_TRAVERSING,XML_TOK_DEEP_TRAVERSING }, + { XML_NAMESPACE_REPORT, XML_NAME, XML_TOK_FUNCTION_NAME }, + { XML_NAMESPACE_REPORT, XML_FORMULA, XML_TOK_FUNCTION_FORMULA}, + { XML_NAMESPACE_REPORT, XML_PRE_EVALUATED, XML_TOK_PRE_EVALUATED }, + { XML_NAMESPACE_REPORT, XML_INITIAL_FORMULA,XML_TOK_INITIAL_FORMULA }, + { XML_NAMESPACE_REPORT, XML_DEEP_TRAVERSING,XML_TOK_DEEP_TRAVERSING }, XML_TOKEN_MAP_END }; m_pFunctionElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); @@ -794,36 +799,37 @@ const SvXMLTokenMap& ORptFilter::GetFormatElemTokenMap() const { if ( !m_pFormatElemTokenMap.get() ) { - static SvXMLTokenMapEntry aElemTokenMap[]= + static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= { - { XML_NAMESPACE_REPORT, XML_ENABLED , XML_TOK_ENABLED }, - { XML_NAMESPACE_REPORT, XML_FORMULA , XML_TOK_FORMULA }, - { XML_NAMESPACE_REPORT, XML_STYLE_NAME , XML_TOK_FORMAT_STYLE_NAME }, + { XML_NAMESPACE_REPORT, XML_ENABLED , XML_TOK_ENABLED }, + { XML_NAMESPACE_REPORT, XML_FORMULA , XML_TOK_FORMULA }, + { XML_NAMESPACE_REPORT, XML_STYLE_NAME , XML_TOK_FORMAT_STYLE_NAME }, XML_TOKEN_MAP_END }; m_pFormatElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); } return *m_pFormatElemTokenMap; -} +} // ----------------------------------------------------------------------------- const SvXMLTokenMap& ORptFilter::GetGroupElemTokenMap() const { if ( !m_pGroupElemTokenMap.get() ) { - static SvXMLTokenMapEntry aElemTokenMap[]= + static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= { - { XML_NAMESPACE_REPORT, XML_START_NEW_COLUMN , XML_TOK_START_NEW_COLUMN }, - { XML_NAMESPACE_REPORT, XML_RESET_PAGE_NUMBER , XML_TOK_RESET_PAGE_NUMBER }, - { XML_NAMESPACE_REPORT, XML_PRINT_HEADER_ON_EACH_PAGE , XML_TOK_PRINT_HEADER_ON_EACH_PAGE }, - { XML_NAMESPACE_REPORT, XML_RESET_PAGE_NUMBER , XML_TOK_RESET_PAGE_NUMBER }, - { XML_NAMESPACE_REPORT, XML_GROUP_EXPRESSION , XML_TOK_GROUP_EXPRESSION }, - { XML_NAMESPACE_REPORT, XML_GROUP_HEADER , XML_TOK_GROUP_HEADER }, - { XML_NAMESPACE_REPORT, XML_GROUP , XML_TOK_GROUP_GROUP }, - { XML_NAMESPACE_REPORT, XML_DETAIL , XML_TOK_GROUP_DETAIL }, - { XML_NAMESPACE_REPORT, XML_GROUP_FOOTER , XML_TOK_GROUP_FOOTER }, - { XML_NAMESPACE_REPORT, XML_SORT_ASCENDING , XML_TOK_SORT_ASCENDING }, - { XML_NAMESPACE_REPORT, XML_KEEP_TOGETHER , XML_TOK_GROUP_KEEP_TOGETHER }, - { XML_NAMESPACE_REPORT, XML_FUNCTION , XML_TOK_GROUP_FUNCTION }, + { XML_NAMESPACE_REPORT, XML_START_NEW_COLUMN , XML_TOK_START_NEW_COLUMN }, + { XML_NAMESPACE_REPORT, XML_RESET_PAGE_NUMBER , XML_TOK_RESET_PAGE_NUMBER }, + { XML_NAMESPACE_REPORT, XML_PRINT_HEADER_ON_EACH_PAGE , XML_TOK_PRINT_HEADER_ON_EACH_PAGE }, + { XML_NAMESPACE_REPORT, XML_RESET_PAGE_NUMBER , XML_TOK_RESET_PAGE_NUMBER }, + { XML_NAMESPACE_REPORT, XML_GROUP_EXPRESSION , XML_TOK_GROUP_EXPRESSION }, + { XML_NAMESPACE_REPORT, XML_GROUP_HEADER , XML_TOK_GROUP_HEADER }, + { XML_NAMESPACE_REPORT, XML_GROUP , XML_TOK_GROUP_GROUP }, + { XML_NAMESPACE_REPORT, XML_DETAIL , XML_TOK_GROUP_DETAIL }, + { XML_NAMESPACE_REPORT, XML_GROUP_FOOTER , XML_TOK_GROUP_FOOTER }, + { XML_NAMESPACE_REPORT, XML_SORT_ASCENDING , XML_TOK_SORT_ASCENDING }, + { XML_NAMESPACE_REPORT, XML_KEEP_TOGETHER , XML_TOK_GROUP_KEEP_TOGETHER }, + { XML_NAMESPACE_REPORT, XML_FUNCTION , XML_TOK_GROUP_FUNCTION }, + //{ XML_NAMESPACE_REPORT, XML_ , XML_TOK_ }, XML_TOKEN_MAP_END }; m_pGroupElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); @@ -835,13 +841,13 @@ const SvXMLTokenMap& ORptFilter::GetReportElementElemTokenMap() const { if ( !m_pElemTokenMap.get() ) { - static SvXMLTokenMapEntry aElemTokenMap[]= + static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= { - { XML_NAMESPACE_REPORT, XML_PRINT_REPEATED_VALUES ,XML_TOK_PRINT_REPEATED_VALUES }, - { XML_NAMESPACE_REPORT, XML_PRINT_ONLY_WHEN_GROUP_CHANGE,XML_TOK_PRINT_ONLY_WHEN_GROUP_CHANGE }, - { XML_NAMESPACE_REPORT, XML_CONDITIONAL_PRINT_EXPRESSION,XML_TOK_REP_CONDITIONAL_PRINT_EXPRESSION }, - { XML_NAMESPACE_REPORT, XML_REPORT_COMPONENT ,XML_TOK_COMPONENT }, - { XML_NAMESPACE_REPORT, XML_FORMAT_CONDITION ,XML_TOK_FORMATCONDITION }, + { XML_NAMESPACE_REPORT, XML_PRINT_REPEATED_VALUES ,XML_TOK_PRINT_REPEATED_VALUES }, + { XML_NAMESPACE_REPORT, XML_PRINT_ONLY_WHEN_GROUP_CHANGE,XML_TOK_PRINT_ONLY_WHEN_GROUP_CHANGE }, + { XML_NAMESPACE_REPORT, XML_CONDITIONAL_PRINT_EXPRESSION,XML_TOK_REP_CONDITIONAL_PRINT_EXPRESSION }, + { XML_NAMESPACE_REPORT, XML_REPORT_COMPONENT ,XML_TOK_COMPONENT }, + { XML_NAMESPACE_REPORT, XML_FORMAT_CONDITION ,XML_TOK_FORMATCONDITION }, XML_TOKEN_MAP_END }; m_pElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); @@ -853,17 +859,17 @@ const SvXMLTokenMap& ORptFilter::GetControlElemTokenMap() const { if ( !m_pControlElemTokenMap.get() ) { - static SvXMLTokenMapEntry aElemTokenMap[]= + static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= { - { XML_NAMESPACE_FORM, XML_LABEL ,XML_TOK_LABEL }, - { XML_NAMESPACE_FORM, XML_PROPERTIES ,XML_TOK_PROPERTIES }, - { XML_NAMESPACE_FORM, XML_SIZE ,XML_TOK_SIZE }, - { XML_NAMESPACE_FORM, XML_IMAGE_DATA ,XML_TOK_IMAGE_DATA }, - { XML_NAMESPACE_REPORT, XML_SCALE ,XML_TOK_SCALE }, - { XML_NAMESPACE_REPORT, XML_REPORT_ELEMENT ,XML_TOK_REPORT_ELEMENT }, - { XML_NAMESPACE_REPORT, XML_FORMULA ,XML_TOK_DATA_FORMULA }, - { XML_NAMESPACE_REPORT, XML_PRESERVE_IRI ,XML_TOK_PRESERVE_IRI }, - { XML_NAMESPACE_REPORT, XML_SELECT_PAGE ,XML_TOK_SELECT_PAGE }, + { XML_NAMESPACE_FORM, XML_LABEL ,XML_TOK_LABEL }, + { XML_NAMESPACE_FORM, XML_PROPERTIES ,XML_TOK_PROPERTIES }, + { XML_NAMESPACE_FORM, XML_SIZE ,XML_TOK_SIZE }, + { XML_NAMESPACE_FORM, XML_IMAGE_DATA ,XML_TOK_IMAGE_DATA }, + { XML_NAMESPACE_REPORT, XML_SCALE ,XML_TOK_SCALE }, + { XML_NAMESPACE_REPORT, XML_REPORT_ELEMENT ,XML_TOK_REPORT_ELEMENT }, + { XML_NAMESPACE_REPORT, XML_FORMULA ,XML_TOK_DATA_FORMULA }, + { XML_NAMESPACE_REPORT, XML_PRESERVE_IRI ,XML_TOK_PRESERVE_IRI }, + { XML_NAMESPACE_REPORT, XML_SELECT_PAGE ,XML_TOK_SELECT_PAGE }, XML_TOKEN_MAP_END }; m_pControlElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); @@ -875,17 +881,17 @@ const SvXMLTokenMap& ORptFilter::GetControlPropertyElemTokenMap() const { if ( !m_pControlElemTokenMap.get() ) { - static SvXMLTokenMapEntry aElemTokenMap[]= + static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= { - { XML_NAMESPACE_FORM, XML_PROPERTY_NAME ,XML_TOK_PROPERTY_NAME }, - { XML_NAMESPACE_OOO, XML_VALUE_TYPE ,XML_TOK_VALUE_TYPE }, - { XML_NAMESPACE_FORM, XML_LIST_PROPERTY ,XML_TOK_LIST_PROPERTY }, - { XML_NAMESPACE_OOO, XML_VALUE ,XML_TOK_VALUE }, - { XML_NAMESPACE_OOO, XML_CURRENCY ,XML_TOK_CURRENCY }, - { XML_NAMESPACE_OOO, XML_DATE_VALUE ,XML_TOK_DATE_VALUE }, - { XML_NAMESPACE_OOO, XML_TIME_VALUE ,XML_TOK_TIME_VALUE }, - { XML_NAMESPACE_OOO, XML_STRING_VALUE ,XML_TOK_STRING_VALUE }, - { XML_NAMESPACE_OOO, XML_BOOLEAN_VALUE ,XML_TOK_BOOLEAN_VALUE }, + { XML_NAMESPACE_FORM, XML_PROPERTY_NAME ,XML_TOK_PROPERTY_NAME }, + { XML_NAMESPACE_OOO, XML_VALUE_TYPE ,XML_TOK_VALUE_TYPE }, + { XML_NAMESPACE_FORM, XML_LIST_PROPERTY ,XML_TOK_LIST_PROPERTY }, + { XML_NAMESPACE_OOO, XML_VALUE ,XML_TOK_VALUE }, + { XML_NAMESPACE_OOO, XML_CURRENCY ,XML_TOK_CURRENCY }, + { XML_NAMESPACE_OOO, XML_DATE_VALUE ,XML_TOK_DATE_VALUE }, + { XML_NAMESPACE_OOO, XML_TIME_VALUE ,XML_TOK_TIME_VALUE }, + { XML_NAMESPACE_OOO, XML_STRING_VALUE ,XML_TOK_STRING_VALUE }, + { XML_NAMESPACE_OOO, XML_BOOLEAN_VALUE ,XML_TOK_BOOLEAN_VALUE }, XML_TOKEN_MAP_END }; m_pControlElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); @@ -897,11 +903,11 @@ const SvXMLTokenMap& ORptFilter::GetComponentElemTokenMap() const { if ( !m_pComponentElemTokenMap.get() ) { - static SvXMLTokenMapEntry aElemTokenMap[]= + static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= { - { XML_NAMESPACE_DRAW, XML_NAME , XML_TOK_NAME }, - { XML_NAMESPACE_DRAW, XML_TEXT_STYLE_NAME , XML_TOK_TEXT_STYLE_NAME }, - { XML_NAMESPACE_REPORT, XML_TRANSFORM , XML_TOK_TRANSFORM }, + { XML_NAMESPACE_DRAW, XML_NAME , XML_TOK_NAME }, + { XML_NAMESPACE_DRAW, XML_TEXT_STYLE_NAME , XML_TOK_TEXT_STYLE_NAME }, + { XML_NAMESPACE_REPORT, XML_TRANSFORM , XML_TOK_TRANSFORM }, XML_TOKEN_MAP_END }; m_pComponentElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); @@ -913,19 +919,19 @@ const SvXMLTokenMap& ORptFilter::GetColumnTokenMap() const { if ( !m_pColumnTokenMap.get() ) { - static SvXMLTokenMapEntry aElemTokenMap[]= + static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= { - { XML_NAMESPACE_TABLE, XML_NAME , XML_TOK_NAME }, - { XML_NAMESPACE_TABLE, XML_STYLE_NAME , XML_TOK_COLUMN_STYLE_NAME }, - { XML_NAMESPACE_TABLE, XML_TABLE_COLUMN , XML_TOK_COLUMN }, - { XML_NAMESPACE_TABLE, XML_TABLE_ROW , XML_TOK_ROW }, - { XML_NAMESPACE_TABLE, XML_TABLE_CELL , XML_TOK_CELL }, - { XML_NAMESPACE_TABLE, XML_TABLE_COLUMNS , XML_TOK_TABLE_COLUMNS }, - { XML_NAMESPACE_TABLE, XML_TABLE_ROWS , XML_TOK_TABLE_ROWS }, - { XML_NAMESPACE_TABLE, XML_COVERED_TABLE_CELL , XML_TOK_COV_CELL }, - { XML_NAMESPACE_TABLE, XML_NUMBER_COLUMNS_SPANNED , XML_TOK_NUMBER_COLUMNS_SPANNED }, - { XML_NAMESPACE_TABLE, XML_NUMBER_ROWS_SPANNED , XML_TOK_NUMBER_ROWS_SPANNED }, - { XML_NAMESPACE_REPORT, XML_CONDITIONAL_PRINT_EXPRESSION, XML_TOK_CONDITIONAL_PRINT_EXPRESSION}, + { XML_NAMESPACE_TABLE, XML_NAME , XML_TOK_NAME }, + { XML_NAMESPACE_TABLE, XML_STYLE_NAME , XML_TOK_COLUMN_STYLE_NAME }, + { XML_NAMESPACE_TABLE, XML_TABLE_COLUMN , XML_TOK_COLUMN }, + { XML_NAMESPACE_TABLE, XML_TABLE_ROW , XML_TOK_ROW }, + { XML_NAMESPACE_TABLE, XML_TABLE_CELL , XML_TOK_CELL }, + { XML_NAMESPACE_TABLE, XML_TABLE_COLUMNS , XML_TOK_TABLE_COLUMNS }, + { XML_NAMESPACE_TABLE, XML_TABLE_ROWS , XML_TOK_TABLE_ROWS }, + { XML_NAMESPACE_TABLE, XML_COVERED_TABLE_CELL , XML_TOK_COV_CELL }, + { XML_NAMESPACE_TABLE, XML_NUMBER_COLUMNS_SPANNED , XML_TOK_NUMBER_COLUMNS_SPANNED }, + { XML_NAMESPACE_TABLE, XML_NUMBER_ROWS_SPANNED , XML_TOK_NUMBER_ROWS_SPANNED }, + { XML_NAMESPACE_REPORT, XML_CONDITIONAL_PRINT_EXPRESSION, XML_TOK_CONDITIONAL_PRINT_EXPRESSION}, XML_TOKEN_MAP_END }; m_pColumnTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); @@ -937,17 +943,17 @@ const SvXMLTokenMap& ORptFilter::GetSectionElemTokenMap() const { if ( !m_pSectionElemTokenMap.get() ) { - static SvXMLTokenMapEntry aElemTokenMap[]= + static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= { - { XML_NAMESPACE_TABLE, XML_TABLE , XML_TOK_TABLE }, - { XML_NAMESPACE_TABLE, XML_NAME , XML_TOK_SECTION_NAME }, - { XML_NAMESPACE_REPORT, XML_VISIBLE , XML_TOK_VISIBLE }, - { XML_NAMESPACE_REPORT, XML_FORCE_NEW_PAGE , XML_TOK_FORCE_NEW_PAGE }, - { XML_NAMESPACE_REPORT, XML_FORCE_NEW_COLUMN , XML_TOK_FORCE_NEW_COLUMN }, - { XML_NAMESPACE_REPORT, XML_KEEP_TOGETHER , XML_TOK_KEEP_TOGETHER }, - { XML_NAMESPACE_REPORT, XML_REPEAT_SECTION , XML_TOK_REPEAT_SECTION }, - { XML_NAMESPACE_TABLE, XML_STYLE_NAME , XML_TOK_SECT_STYLE_NAME }, - { XML_NAMESPACE_REPORT, XML_PAGE_PRINT_OPTION , XML_TOK_PAGE_PRINT_OPTION }, + { XML_NAMESPACE_TABLE, XML_TABLE , XML_TOK_TABLE }, + { XML_NAMESPACE_TABLE, XML_NAME , XML_TOK_SECTION_NAME }, + { XML_NAMESPACE_REPORT, XML_VISIBLE , XML_TOK_VISIBLE }, + { XML_NAMESPACE_REPORT, XML_FORCE_NEW_PAGE , XML_TOK_FORCE_NEW_PAGE }, + { XML_NAMESPACE_REPORT, XML_FORCE_NEW_COLUMN , XML_TOK_FORCE_NEW_COLUMN }, + { XML_NAMESPACE_REPORT, XML_KEEP_TOGETHER , XML_TOK_KEEP_TOGETHER }, + { XML_NAMESPACE_REPORT, XML_REPEAT_SECTION , XML_TOK_REPEAT_SECTION }, + { XML_NAMESPACE_TABLE, XML_STYLE_NAME , XML_TOK_SECT_STYLE_NAME }, + { XML_NAMESPACE_REPORT, XML_PAGE_PRINT_OPTION , XML_TOK_PAGE_PRINT_OPTION }, XML_TOKEN_MAP_END }; @@ -960,20 +966,20 @@ const SvXMLTokenMap& ORptFilter::GetCellElemTokenMap() const { if ( !m_pCellElemTokenMap.get() ) { - static SvXMLTokenMapEntry aElemTokenMap[]= + static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= { - { XML_NAMESPACE_TEXT, XML_P , XML_TOK_P }, - { XML_NAMESPACE_REPORT, XML_FIXED_CONTENT , XML_TOK_FIXED_CONTENT }, - { XML_NAMESPACE_REPORT, XML_FORMATTED_TEXT , XML_TOK_FORMATTED_TEXT }, - { XML_NAMESPACE_REPORT, XML_IMAGE , XML_TOK_IMAGE }, - { XML_NAMESPACE_REPORT, XML_SUB_DOCUMENT , XML_TOK_SUB_DOCUMENT }, - { XML_NAMESPACE_DRAW, XML_CUSTOM_SHAPE , XML_TOK_CUSTOM_SHAPE }, - { XML_NAMESPACE_DRAW, XML_FRAME , XML_TOK_FRAME }, - { XML_NAMESPACE_TEXT, XML_PAGE_NUMBER , XML_TOK_PAGE_NUMBER }, - { XML_NAMESPACE_TEXT, XML_PAGE_COUNT , XML_TOK_PAGE_COUNT }, - { XML_NAMESPACE_TEXT, XML_TAB , XML_TOK_TEXT_TAB_STOP }, - { XML_NAMESPACE_TEXT, XML_LINE_BREAK , XML_TOK_TEXT_LINE_BREAK }, - { XML_NAMESPACE_TEXT, XML_S , XML_TOK_TEXT_S }, + { XML_NAMESPACE_TEXT, XML_P , XML_TOK_P }, + { XML_NAMESPACE_REPORT, XML_FIXED_CONTENT , XML_TOK_FIXED_CONTENT }, + { XML_NAMESPACE_REPORT, XML_FORMATTED_TEXT , XML_TOK_FORMATTED_TEXT }, + { XML_NAMESPACE_REPORT, XML_IMAGE , XML_TOK_IMAGE }, + { XML_NAMESPACE_REPORT, XML_SUB_DOCUMENT , XML_TOK_SUB_DOCUMENT }, + { XML_NAMESPACE_DRAW, XML_CUSTOM_SHAPE , XML_TOK_CUSTOM_SHAPE }, + { XML_NAMESPACE_DRAW, XML_FRAME , XML_TOK_FRAME }, + { XML_NAMESPACE_TEXT, XML_PAGE_NUMBER , XML_TOK_PAGE_NUMBER }, + { XML_NAMESPACE_TEXT, XML_PAGE_COUNT , XML_TOK_PAGE_COUNT }, + { XML_NAMESPACE_TEXT, XML_TAB , XML_TOK_TEXT_TAB_STOP }, + { XML_NAMESPACE_TEXT, XML_LINE_BREAK , XML_TOK_TEXT_LINE_BREAK }, + { XML_NAMESPACE_TEXT, XML_S , XML_TOK_TEXT_S }, XML_TOKEN_MAP_END }; m_pCellElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); @@ -989,14 +995,16 @@ SvXMLImportContext* ORptFilter::CreateStylesContext(const ::rtl::OUString& rLoca { pContext = new OReportStylesContext(*this, XML_NAMESPACE_OFFICE, rLocalName, xAttrList, bIsAutoStyle); if (bIsAutoStyle) + //xAutoStyles = pContext; SetAutoStyles((SvXMLStylesContext*)pContext); else + //xStyles = pContext; SetStyles((SvXMLStylesContext*)pContext); } return pContext; } // ----------------------------------------------------------------------------- -SvXMLImport& ORptFilter::getGlobalContext() +SvXMLImport& ORptFilter::getGlobalContext() { return *this; } @@ -1034,6 +1042,20 @@ void ORptFilter::FinishStyles() // ----------------------------------------------------------------------------- ::rtl::OUString ORptFilter::convertFormula(const ::rtl::OUString& _sFormula) { + //sal_Int32 nLen = _sFormula.getLength(); + //if ( nLen ) + //{ + // const static ::rtl::OUString s_sField(RTL_CONSTASCII_USTRINGPARAM("field:[")); + // sal_Int32 nPos = _sFormula.indexOf(s_sField); + // if ( nPos == -1 ) + // nPos = 4; // "rpt:" + // else + // { + // nPos = s_sField.getLength(); + // --nLen; // eat "]" + // } + // return _sFormula.copy(nPos,nLen-nPos); + //} return _sFormula; } // ----------------------------------------------------------------------------- @@ -1054,7 +1076,7 @@ void SAL_CALL ORptFilter::startDocument( void ) void ORptFilter::endDocument( void ) throw( xml::sax::SAXException, uno::RuntimeException ) { - OSL_ENSURE( GetModel().is(), "model missing; maybe startDocument wasn't called?" ); + DBG_ASSERT( GetModel().is(), "model missing; maybe startDocument wasn't called?" ); if( !GetModel().is() ) return; @@ -1087,8 +1109,8 @@ SvXMLImportContext* ORptFilter::CreateMetaContext(const ::rtl::OUString& rLocalN if ( (getImportFlags() & IMPORT_META) ) { uno::Reference<xml::sax::XDocumentHandler> xDocBuilder( - getServiceFactory()->createInstance(::rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.dom.SAXDocumentBuilder"))), + getServiceFactory()->createInstance(::rtl::OUString::createFromAscii( + "com.sun.star.xml.dom.SAXDocumentBuilder")), uno::UNO_QUERY_THROW); uno::Reference<document::XDocumentPropertiesSupplier> xDPS(GetModel(), uno::UNO_QUERY_THROW); pContext = new SvXMLMetaDocumentContext(*this,XML_NAMESPACE_OFFICE, rLocalName,xDPS->getDocumentProperties(), xDocBuilder); @@ -1107,7 +1129,7 @@ sal_Bool ORptFilter::isOldFormat() const { xProp->getPropertyValue(s_sOld) >>= bOldFormat; } - } + } // if ( xProp.is() ) return bOldFormat; } diff --git a/reportdesign/source/filter/xml/xmlfilter.hxx b/reportdesign/source/filter/xml/xmlfilter.hxx index 9e4970d97d3d..e179a0baf5ff 100644 --- a/reportdesign/source/filter/xml/xmlfilter.hxx +++ b/reportdesign/source/filter/xml/xmlfilter.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -80,34 +80,34 @@ public: DECLARE_STL_USTRINGACCESS_MAP(Sequence<PropertyValue>,TPropertyNameMap); DECLARE_STL_USTRINGACCESS_MAP( Reference<XFunction> ,TGroupFunctionMap); private: - + TGroupFunctionMap m_aFunctions; - com::sun::star::uno::Any m_aViewSettings; - Reference< XComponent > m_xSrcDoc; - mutable ::std::auto_ptr<SvXMLTokenMap> m_pDocElemTokenMap; - mutable ::std::auto_ptr<SvXMLTokenMap> m_pReportElemTokenMap; - mutable ::std::auto_ptr<SvXMLTokenMap> m_pGroupsElemTokenMap; - mutable ::std::auto_ptr<SvXMLTokenMap> m_pGroupElemTokenMap; - mutable ::std::auto_ptr<SvXMLTokenMap> m_pSectionElemTokenMap; - mutable ::std::auto_ptr<SvXMLTokenMap> m_pComponentElemTokenMap; - mutable ::std::auto_ptr<SvXMLTokenMap> m_pElemTokenMap; - mutable ::std::auto_ptr<SvXMLTokenMap> m_pControlElemTokenMap; - mutable ::std::auto_ptr<SvXMLTokenMap> m_pFunctionElemTokenMap; - mutable ::std::auto_ptr<SvXMLTokenMap> m_pSubDocumentElemTokenMap; - mutable ::std::auto_ptr<SvXMLTokenMap> m_pFormatElemTokenMap; - mutable ::std::auto_ptr<SvXMLTokenMap> m_pColumnTokenMap; - mutable ::std::auto_ptr<SvXMLTokenMap> m_pCellElemTokenMap; - - UniReference < XMLPropertyHandlerFactory > m_xPropHdlFactory; - UniReference < XMLPropertySetMapper > m_xCellStylesPropertySetMapper; - UniReference < XMLPropertySetMapper > m_xColumnStylesPropertySetMapper; - UniReference < XMLPropertySetMapper > m_xRowStylesPropertySetMapper; - UniReference < XMLPropertySetMapper > m_xTableStylesPropertySetMapper; - - Reference<XReportDefinition> m_xReportDefinition; + com::sun::star::uno::Any m_aViewSettings; + Reference< XComponent > m_xSrcDoc; + mutable ::std::auto_ptr<SvXMLTokenMap> m_pDocElemTokenMap; + mutable ::std::auto_ptr<SvXMLTokenMap> m_pReportElemTokenMap; + mutable ::std::auto_ptr<SvXMLTokenMap> m_pGroupsElemTokenMap; + mutable ::std::auto_ptr<SvXMLTokenMap> m_pGroupElemTokenMap; + mutable ::std::auto_ptr<SvXMLTokenMap> m_pSectionElemTokenMap; + mutable ::std::auto_ptr<SvXMLTokenMap> m_pComponentElemTokenMap; + mutable ::std::auto_ptr<SvXMLTokenMap> m_pElemTokenMap; + mutable ::std::auto_ptr<SvXMLTokenMap> m_pControlElemTokenMap; + mutable ::std::auto_ptr<SvXMLTokenMap> m_pFunctionElemTokenMap; + mutable ::std::auto_ptr<SvXMLTokenMap> m_pSubDocumentElemTokenMap; + mutable ::std::auto_ptr<SvXMLTokenMap> m_pFormatElemTokenMap; + mutable ::std::auto_ptr<SvXMLTokenMap> m_pColumnTokenMap; + mutable ::std::auto_ptr<SvXMLTokenMap> m_pCellElemTokenMap; + + UniReference < XMLPropertyHandlerFactory > m_xPropHdlFactory; + UniReference < XMLPropertySetMapper > m_xCellStylesPropertySetMapper; + UniReference < XMLPropertySetMapper > m_xColumnStylesPropertySetMapper; + UniReference < XMLPropertySetMapper > m_xRowStylesPropertySetMapper; + UniReference < XMLPropertySetMapper > m_xTableStylesPropertySetMapper; + + Reference<XReportDefinition> m_xReportDefinition; ::boost::shared_ptr<rptui::OReportModel> m_pReportModel; - sal_Bool implImport( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException); + sal_Bool implImport( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException); SvXMLImportContext* CreateStylesContext(const ::rtl::OUString& rLocalName, const Reference< XAttributeList>& xAttrList, sal_Bool bIsAutoStyle ); @@ -123,9 +123,9 @@ protected: virtual XMLShapeImportHelper* CreateShapeImport(); - virtual ~ORptFilter() throw(); + virtual ~ORptFilter() throw(); public: - + ORptFilter( const Reference< XMultiServiceFactory >& _rxMSF,sal_uInt16 nImportFlags = IMPORT_ALL ); // XFilter @@ -145,7 +145,7 @@ public: inline Reference<XReportDefinition> getReportDefinition() const { return m_xReportDefinition; } /** return the SdrModel of the real model * - * \return + * \return */ ::boost::shared_ptr<rptui::OReportModel> getSdrModel() const { return m_pReportModel; } void FinishStyles(); @@ -154,7 +154,7 @@ public: throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL endDocument(void) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - + const SvXMLTokenMap& GetDocElemTokenMap() const; const SvXMLTokenMap& GetReportElemTokenMap() const; const SvXMLTokenMap& GetGroupElemTokenMap() const; @@ -176,16 +176,16 @@ public: static ::rtl::OUString convertFormula(const ::rtl::OUString& _sFormula); /** inserts a new function * - * \param _xFunction + * \param _xFunction */ void insertFunction(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunction > & _xFunction); void removeFunction(const ::rtl::OUString& _sFunctionName); inline const TGroupFunctionMap& getFunctions() const { return m_aFunctions; } + + virtual SvXMLImport& getGlobalContext(); - virtual SvXMLImport& getGlobalContext(); - - virtual void enterEventContext(); - virtual void leaveEventContext(); + virtual void enterEventContext(); + virtual void leaveEventContext(); sal_Bool isOldFormat() const; }; diff --git a/reportdesign/source/filter/xml/xmlservices.cxx b/reportdesign/source/filter/xml/xmlservices.cxx index b479396371b8..cf5d753008d3 100644 --- a/reportdesign/source/filter/xml/xmlservices.cxx +++ b/reportdesign/source/filter/xml/xmlservices.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -77,7 +77,7 @@ cppu::ImplementationEntry entries[] = { &cppu::createSingleComponentFactory, 0, 0 }, { &ORptMetaImportHelper::create, &ORptMetaImportHelper::getImplementationName_Static, &ORptMetaImportHelper::getSupportedServiceNames_Static, &cppu::createSingleComponentFactory, 0, 0 }, - { 0, 0, 0, 0, 0, 0 } + { 0, 0, 0, 0, 0, 0 } }; } @@ -94,5 +94,11 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } +extern "C" sal_Bool SAL_CALL component_writeInfo( + void * serviceManager, void * registryKey) +{ + return cppu::component_writeInfoHelper( + serviceManager, registryKey, entries); +} -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/inc/GroupProperties.hxx b/reportdesign/source/inc/GroupProperties.hxx index 8baff4b3a91c..e07244dba64a 100644 --- a/reportdesign/source/inc/GroupProperties.hxx +++ b/reportdesign/source/inc/GroupProperties.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,14 +34,14 @@ namespace rptshared */ struct GroupProperties { - ::sal_Int32 m_nGroupInterval; - ::rtl::OUString m_sExpression; - ::sal_Int16 m_nGroupOn; - ::sal_Int16 m_nKeepTogether; - ::sal_Bool m_eSortAscending; - ::sal_Bool m_bStartNewColumn; - ::sal_Bool m_bResetPageNumber; - + ::sal_Int32 m_nGroupInterval; + ::rtl::OUString m_sExpression; + ::sal_Int16 m_nGroupOn; + ::sal_Int16 m_nKeepTogether; + ::sal_Bool m_eSortAscending; + ::sal_Bool m_bStartNewColumn; + ::sal_Bool m_bResetPageNumber; + GroupProperties() :m_nGroupInterval(1) ,m_nGroupOn(0) diff --git a/reportdesign/source/inc/constasciistring.hxx b/reportdesign/source/inc/constasciistring.hxx index 157923d36b5c..e76472a68803 100644 --- a/reportdesign/source/inc/constasciistring.hxx +++ b/reportdesign/source/inc/constasciistring.hxx @@ -14,17 +14,17 @@ // string constants struct ConstAsciiString { - const sal_Char* ascii; - sal_Int32 length; + const sal_Char* ascii; + sal_Int32 length; - inline operator const ::rtl::OUString& () const; - inline operator const sal_Char* () const { return ascii; } + inline operator const ::rtl::OUString& () const; + inline operator const sal_Char* () const { return ascii; } inline ConstAsciiString(const sal_Char* _pAsciiZeroTerminated, const sal_Int32 _nLength); inline ~ConstAsciiString(); private: - mutable ::rtl::OUString* ustring; + mutable ::rtl::OUString* ustring; }; //------------------------------------------------------------ diff --git a/reportdesign/source/inc/corestrings.hrc b/reportdesign/source/inc/corestrings.hrc index 42f9dd829ad4..256ac5561eed 100644 --- a/reportdesign/source/inc/corestrings.hrc +++ b/reportdesign/source/inc/corestrings.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/reportdesign/source/inc/stringconstants.hrc b/reportdesign/source/inc/stringconstants.hrc index a84d299901da..46ed96fdb961 100644 --- a/reportdesign/source/inc/stringconstants.hrc +++ b/reportdesign/source/inc/stringconstants.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,101 +56,101 @@ DECLARE_CONSTASCII_USTRING(SERVICE_OLEOBJECT); //= property names //============================================================ -DECLARE_CONSTASCII_USTRING(PROPERTY_VISIBLE ); -DECLARE_CONSTASCII_USTRING(PROPERTY_NAME ); -DECLARE_CONSTASCII_USTRING(PROPERTY_HEIGHT ); -DECLARE_CONSTASCII_USTRING(PROPERTY_BACKCOLOR ); -DECLARE_CONSTASCII_USTRING(PROPERTY_BACKTRANSPARENT ); +DECLARE_CONSTASCII_USTRING(PROPERTY_VISIBLE ); +DECLARE_CONSTASCII_USTRING(PROPERTY_NAME ); +DECLARE_CONSTASCII_USTRING(PROPERTY_HEIGHT ); +DECLARE_CONSTASCII_USTRING(PROPERTY_BACKCOLOR ); +DECLARE_CONSTASCII_USTRING(PROPERTY_BACKTRANSPARENT ); DECLARE_CONSTASCII_USTRING(PROPERTY_CONTROLBACKGROUND); DECLARE_CONSTASCII_USTRING(PROPERTY_CONTROLBACKGROUNDTRANSPARENT); -DECLARE_CONSTASCII_USTRING(PROPERTY_FORCENEWPAGE ); -DECLARE_CONSTASCII_USTRING(PROPERTY_NEWROWORCOL ); -DECLARE_CONSTASCII_USTRING(PROPERTY_KEEPTOGETHER ); -DECLARE_CONSTASCII_USTRING(PROPERTY_CANGROW ); -DECLARE_CONSTASCII_USTRING(PROPERTY_CANSHRINK ); -DECLARE_CONSTASCII_USTRING(PROPERTY_REPEATSECTION ); -DECLARE_CONSTASCII_USTRING(PROPERTY_GROUP ); +DECLARE_CONSTASCII_USTRING(PROPERTY_FORCENEWPAGE ); +DECLARE_CONSTASCII_USTRING(PROPERTY_NEWROWORCOL ); +DECLARE_CONSTASCII_USTRING(PROPERTY_KEEPTOGETHER ); +DECLARE_CONSTASCII_USTRING(PROPERTY_CANGROW ); +DECLARE_CONSTASCII_USTRING(PROPERTY_CANSHRINK ); +DECLARE_CONSTASCII_USTRING(PROPERTY_REPEATSECTION ); +DECLARE_CONSTASCII_USTRING(PROPERTY_GROUP ); DECLARE_CONSTASCII_USTRING(PROPERTY_REPORTDEFINITION); -DECLARE_CONSTASCII_USTRING(PROPERTY_HEADER ); -DECLARE_CONSTASCII_USTRING(PROPERTY_FOOTER ); -DECLARE_CONSTASCII_USTRING(PROPERTY_GROUPINTERVAL ); -DECLARE_CONSTASCII_USTRING(PROPERTY_EXPRESSION ); -DECLARE_CONSTASCII_USTRING(PROPERTY_GROUPON ); -DECLARE_CONSTASCII_USTRING(PROPERTY_SORTASCENDING ); -DECLARE_CONSTASCII_USTRING(PROPERTY_GROUPS ); +DECLARE_CONSTASCII_USTRING(PROPERTY_HEADER ); +DECLARE_CONSTASCII_USTRING(PROPERTY_FOOTER ); +DECLARE_CONSTASCII_USTRING(PROPERTY_GROUPINTERVAL ); +DECLARE_CONSTASCII_USTRING(PROPERTY_EXPRESSION ); +DECLARE_CONSTASCII_USTRING(PROPERTY_GROUPON ); +DECLARE_CONSTASCII_USTRING(PROPERTY_SORTASCENDING ); +DECLARE_CONSTASCII_USTRING(PROPERTY_GROUPS ); -DECLARE_CONSTASCII_USTRING(PROPERTY_MASTERFIELDS ); -DECLARE_CONSTASCII_USTRING(PROPERTY_DETAILFIELDS ); -DECLARE_CONSTASCII_USTRING(PROPERTY_REPORTHEADER ); -DECLARE_CONSTASCII_USTRING(PROPERTY_REPORTFOOTER ); -DECLARE_CONSTASCII_USTRING(PROPERTY_PAGEHEADER ); -DECLARE_CONSTASCII_USTRING(PROPERTY_PAGEFOOTER ); -DECLARE_CONSTASCII_USTRING(PROPERTY_DETAIL ); -DECLARE_CONSTASCII_USTRING(PROPERTY_CAPTION ); -DECLARE_CONSTASCII_USTRING(PROPERTY_BACKGRAPHICURL ); -DECLARE_CONSTASCII_USTRING(PROPERTY_COMMAND ); -DECLARE_CONSTASCII_USTRING(PROPERTY_BACKGRAPHICLOCATION ); -DECLARE_CONSTASCII_USTRING(PROPERTY_ORIENTATION ); -DECLARE_CONSTASCII_USTRING(PROPERTY_PAPERFORMAT ); -DECLARE_CONSTASCII_USTRING(PROPERTY_PAPERSIZE ); -DECLARE_CONSTASCII_USTRING(PROPERTY_GROUPKEEPTOGETHER ); -DECLARE_CONSTASCII_USTRING(PROPERTY_PAGEHEADEROPTION ); -DECLARE_CONSTASCII_USTRING(PROPERTY_PAGEFOOTEROPTION ); -DECLARE_CONSTASCII_USTRING(PROPERTY_COMMANDTYPE ); -DECLARE_CONSTASCII_USTRING(PROPERTY_REPORTHEADERON ); -DECLARE_CONSTASCII_USTRING(PROPERTY_REPORTFOOTERON ); -DECLARE_CONSTASCII_USTRING(PROPERTY_PAGEHEADERON ); -DECLARE_CONSTASCII_USTRING(PROPERTY_PAGEFOOTERON ); -DECLARE_CONSTASCII_USTRING(PROPERTY_HEADERON ); -DECLARE_CONSTASCII_USTRING(PROPERTY_FOOTERON ); -DECLARE_CONSTASCII_USTRING(PROPERTY_WIDTH ); -DECLARE_CONSTASCII_USTRING(PROPERTY_POSITIONX ); -DECLARE_CONSTASCII_USTRING(PROPERTY_POSITIONY ); -DECLARE_CONSTASCII_USTRING(PROPERTY_DATAFIELD ); -DECLARE_CONSTASCII_USTRING(PROPERTY_PARAADJUST ); -DECLARE_CONSTASCII_USTRING(PROPERTY_FONTDESCRIPTOR ); +DECLARE_CONSTASCII_USTRING(PROPERTY_MASTERFIELDS ); +DECLARE_CONSTASCII_USTRING(PROPERTY_DETAILFIELDS ); +DECLARE_CONSTASCII_USTRING(PROPERTY_REPORTHEADER ); +DECLARE_CONSTASCII_USTRING(PROPERTY_REPORTFOOTER ); +DECLARE_CONSTASCII_USTRING(PROPERTY_PAGEHEADER ); +DECLARE_CONSTASCII_USTRING(PROPERTY_PAGEFOOTER ); +DECLARE_CONSTASCII_USTRING(PROPERTY_DETAIL ); +DECLARE_CONSTASCII_USTRING(PROPERTY_CAPTION ); +DECLARE_CONSTASCII_USTRING(PROPERTY_BACKGRAPHICURL ); +DECLARE_CONSTASCII_USTRING(PROPERTY_COMMAND ); +DECLARE_CONSTASCII_USTRING(PROPERTY_BACKGRAPHICLOCATION ); +DECLARE_CONSTASCII_USTRING(PROPERTY_ORIENTATION ); +DECLARE_CONSTASCII_USTRING(PROPERTY_PAPERFORMAT ); +DECLARE_CONSTASCII_USTRING(PROPERTY_PAPERSIZE ); +DECLARE_CONSTASCII_USTRING(PROPERTY_GROUPKEEPTOGETHER ); +DECLARE_CONSTASCII_USTRING(PROPERTY_PAGEHEADEROPTION ); +DECLARE_CONSTASCII_USTRING(PROPERTY_PAGEFOOTEROPTION ); +DECLARE_CONSTASCII_USTRING(PROPERTY_COMMANDTYPE ); +DECLARE_CONSTASCII_USTRING(PROPERTY_REPORTHEADERON ); +DECLARE_CONSTASCII_USTRING(PROPERTY_REPORTFOOTERON ); +DECLARE_CONSTASCII_USTRING(PROPERTY_PAGEHEADERON ); +DECLARE_CONSTASCII_USTRING(PROPERTY_PAGEFOOTERON ); +DECLARE_CONSTASCII_USTRING(PROPERTY_HEADERON ); +DECLARE_CONSTASCII_USTRING(PROPERTY_FOOTERON ); +DECLARE_CONSTASCII_USTRING(PROPERTY_WIDTH ); +DECLARE_CONSTASCII_USTRING(PROPERTY_POSITIONX ); +DECLARE_CONSTASCII_USTRING(PROPERTY_POSITIONY ); +DECLARE_CONSTASCII_USTRING(PROPERTY_DATAFIELD ); +DECLARE_CONSTASCII_USTRING(PROPERTY_PARAADJUST ); +DECLARE_CONSTASCII_USTRING(PROPERTY_FONTDESCRIPTOR ); DECLARE_CONSTASCII_USTRING(PROPERTY_FONTDESCRIPTORASIAN ); DECLARE_CONSTASCII_USTRING(PROPERTY_FONTDESCRIPTORCOMPLEX); -DECLARE_CONSTASCII_USTRING(PROPERTY_CONTROLTEXTEMPHASISMARK ); -DECLARE_CONSTASCII_USTRING(PROPERTY_CHARRELIEF ); -DECLARE_CONSTASCII_USTRING(PROPERTY_CHARCOLOR ); -DECLARE_CONSTASCII_USTRING(PROPERTY_VERTICALALIGN ); -DECLARE_CONSTASCII_USTRING(PROPERTY_IMAGEPOSITION ); -DECLARE_CONSTASCII_USTRING(PROPERTY_IMAGEURL ); -DECLARE_CONSTASCII_USTRING(PROPERTY_CHARUNDERLINECOLOR ); -DECLARE_CONSTASCII_USTRING(PROPERTY_LABEL ); -DECLARE_CONSTASCII_USTRING(PROPERTY_EFFECTIVEDEFAULT ); -DECLARE_CONSTASCII_USTRING(PROPERTY_EFFECTIVEMAX ); -DECLARE_CONSTASCII_USTRING(PROPERTY_EFFECTIVEMIN ); -DECLARE_CONSTASCII_USTRING(PROPERTY_FORMATKEY ); -DECLARE_CONSTASCII_USTRING(PROPERTY_MAXTEXTLEN ); -DECLARE_CONSTASCII_USTRING(PROPERTY_LISTSOURCE ); -DECLARE_CONSTASCII_USTRING(PROPERTY_FORMATSSUPPLIER ); -DECLARE_CONSTASCII_USTRING(PROPERTY_CONTROLBORDER ); -DECLARE_CONSTASCII_USTRING(PROPERTY_CONTROLBORDERCOLOR ); -DECLARE_CONSTASCII_USTRING(PROPERTY_BORDER ); -DECLARE_CONSTASCII_USTRING(PROPERTY_BORDERCOLOR ); -DECLARE_CONSTASCII_USTRING(PROPERTY_DEFAULTCONTROL ); +DECLARE_CONSTASCII_USTRING(PROPERTY_CONTROLTEXTEMPHASISMARK ); +DECLARE_CONSTASCII_USTRING(PROPERTY_CHARRELIEF ); +DECLARE_CONSTASCII_USTRING(PROPERTY_CHARCOLOR ); +DECLARE_CONSTASCII_USTRING(PROPERTY_VERTICALALIGN ); +DECLARE_CONSTASCII_USTRING(PROPERTY_IMAGEPOSITION ); +DECLARE_CONSTASCII_USTRING(PROPERTY_IMAGEURL ); +DECLARE_CONSTASCII_USTRING(PROPERTY_CHARUNDERLINECOLOR ); +DECLARE_CONSTASCII_USTRING(PROPERTY_LABEL ); +DECLARE_CONSTASCII_USTRING(PROPERTY_EFFECTIVEDEFAULT ); +DECLARE_CONSTASCII_USTRING(PROPERTY_EFFECTIVEMAX ); +DECLARE_CONSTASCII_USTRING(PROPERTY_EFFECTIVEMIN ); +DECLARE_CONSTASCII_USTRING(PROPERTY_FORMATKEY ); +DECLARE_CONSTASCII_USTRING(PROPERTY_MAXTEXTLEN ); +DECLARE_CONSTASCII_USTRING(PROPERTY_LISTSOURCE ); +DECLARE_CONSTASCII_USTRING(PROPERTY_FORMATSSUPPLIER ); +DECLARE_CONSTASCII_USTRING(PROPERTY_CONTROLBORDER ); +DECLARE_CONSTASCII_USTRING(PROPERTY_CONTROLBORDERCOLOR ); +DECLARE_CONSTASCII_USTRING(PROPERTY_BORDER ); +DECLARE_CONSTASCII_USTRING(PROPERTY_BORDERCOLOR ); +DECLARE_CONSTASCII_USTRING(PROPERTY_DEFAULTCONTROL ); -DECLARE_CONSTASCII_USTRING(PROPERTY_LEFTMARGIN ); -DECLARE_CONSTASCII_USTRING(PROPERTY_RIGHTMARGIN ); -DECLARE_CONSTASCII_USTRING(PROPERTY_TOPMARGIN ); -DECLARE_CONSTASCII_USTRING(PROPERTY_BOTTOMMARGIN ); +DECLARE_CONSTASCII_USTRING(PROPERTY_LEFTMARGIN ); +DECLARE_CONSTASCII_USTRING(PROPERTY_RIGHTMARGIN ); +DECLARE_CONSTASCII_USTRING(PROPERTY_TOPMARGIN ); +DECLARE_CONSTASCII_USTRING(PROPERTY_BOTTOMMARGIN ); -DECLARE_CONSTASCII_USTRING(PROPERTY_PRINTREPEATEDVALUES ); -DECLARE_CONSTASCII_USTRING(PROPERTY_CONDITIONALPRINTEXPRESSION ); -DECLARE_CONSTASCII_USTRING(PROPERTY_STARTNEWCOLUMN ); -DECLARE_CONSTASCII_USTRING(PROPERTY_STARTNEWPAGE ); -DECLARE_CONSTASCII_USTRING(PROPERTY_RESETPAGENUMBER ); -DECLARE_CONSTASCII_USTRING(PROPERTY_MINHEIGHTNEWPAGE ); -DECLARE_CONSTASCII_USTRING(PROPERTY_SHAPE ); -DECLARE_CONSTASCII_USTRING(PROPERTY_PRINTWHENGROUPCHANGE ); -DECLARE_CONSTASCII_USTRING(PROPERTY_STATE ); -DECLARE_CONSTASCII_USTRING(PROPERTY_TIME_STATE ); -DECLARE_CONSTASCII_USTRING(PROPERTY_DATE_STATE ); -DECLARE_CONSTASCII_USTRING(PROPERTY_TRISTATE ); -DECLARE_CONSTASCII_USTRING(PROPERTY_LISTSOURCETYPE ); +DECLARE_CONSTASCII_USTRING(PROPERTY_PRINTREPEATEDVALUES ); +DECLARE_CONSTASCII_USTRING(PROPERTY_CONDITIONALPRINTEXPRESSION ); +DECLARE_CONSTASCII_USTRING(PROPERTY_STARTNEWCOLUMN ); +DECLARE_CONSTASCII_USTRING(PROPERTY_STARTNEWPAGE ); +DECLARE_CONSTASCII_USTRING(PROPERTY_RESETPAGENUMBER ); +DECLARE_CONSTASCII_USTRING(PROPERTY_MINHEIGHTNEWPAGE ); +DECLARE_CONSTASCII_USTRING(PROPERTY_SHAPE ); +DECLARE_CONSTASCII_USTRING(PROPERTY_PRINTWHENGROUPCHANGE ); +DECLARE_CONSTASCII_USTRING(PROPERTY_STATE ); +DECLARE_CONSTASCII_USTRING(PROPERTY_TIME_STATE ); +DECLARE_CONSTASCII_USTRING(PROPERTY_DATE_STATE ); +DECLARE_CONSTASCII_USTRING(PROPERTY_TRISTATE ); +DECLARE_CONSTASCII_USTRING(PROPERTY_LISTSOURCETYPE ); DECLARE_CONSTASCII_USTRING(PROPERTY_FONTCHARWIDTH); DECLARE_CONSTASCII_USTRING(PROPERTY_FONTCHARSET); DECLARE_CONSTASCII_USTRING(PROPERTY_FONTFAMILY); @@ -171,21 +171,21 @@ DECLARE_CONSTASCII_USTRING(PROPERTY_FONTWIDTH); DECLARE_CONSTASCII_USTRING(PROPERTY_FONTWORDLINEMODE); DECLARE_CONSTASCII_USTRING(PROPERTY_FONTTYPE); -DECLARE_CONSTASCII_USTRING(PROPERTY_ENABLED ); +DECLARE_CONSTASCII_USTRING(PROPERTY_ENABLED ); -DECLARE_CONSTASCII_USTRING(PROPERTY_CHAREMPHASIS ); -DECLARE_CONSTASCII_USTRING(PROPERTY_CHARFONTNAME ); -DECLARE_CONSTASCII_USTRING(PROPERTY_CHARFONTSTYLENAME ); -DECLARE_CONSTASCII_USTRING(PROPERTY_CHARFONTFAMILY ); -DECLARE_CONSTASCII_USTRING(PROPERTY_CHARFONTCHARSET ); -DECLARE_CONSTASCII_USTRING(PROPERTY_CHARFONTPITCH ); -DECLARE_CONSTASCII_USTRING(PROPERTY_CHARHEIGHT ); -DECLARE_CONSTASCII_USTRING(PROPERTY_CHARUNDERLINE ); -DECLARE_CONSTASCII_USTRING(PROPERTY_CHARWEIGHT ); -DECLARE_CONSTASCII_USTRING(PROPERTY_CHARPOSTURE ); -DECLARE_CONSTASCII_USTRING(PROPERTY_CHARWORDMODE ); -DECLARE_CONSTASCII_USTRING(PROPERTY_CHARROTATION ); -DECLARE_CONSTASCII_USTRING(PROPERTY_CHARSCALEWIDTH ); +DECLARE_CONSTASCII_USTRING(PROPERTY_CHAREMPHASIS ); +DECLARE_CONSTASCII_USTRING(PROPERTY_CHARFONTNAME ); +DECLARE_CONSTASCII_USTRING(PROPERTY_CHARFONTSTYLENAME ); +DECLARE_CONSTASCII_USTRING(PROPERTY_CHARFONTFAMILY ); +DECLARE_CONSTASCII_USTRING(PROPERTY_CHARFONTCHARSET ); +DECLARE_CONSTASCII_USTRING(PROPERTY_CHARFONTPITCH ); +DECLARE_CONSTASCII_USTRING(PROPERTY_CHARHEIGHT ); +DECLARE_CONSTASCII_USTRING(PROPERTY_CHARUNDERLINE ); +DECLARE_CONSTASCII_USTRING(PROPERTY_CHARWEIGHT ); +DECLARE_CONSTASCII_USTRING(PROPERTY_CHARPOSTURE ); +DECLARE_CONSTASCII_USTRING(PROPERTY_CHARWORDMODE ); +DECLARE_CONSTASCII_USTRING(PROPERTY_CHARROTATION ); +DECLARE_CONSTASCII_USTRING(PROPERTY_CHARSCALEWIDTH ); DECLARE_CONSTASCII_USTRING(PROPERTY_CHAREMPHASISASIAN); DECLARE_CONSTASCII_USTRING(PROPERTY_CHARFONTNAMEASIAN); @@ -217,46 +217,46 @@ DECLARE_CONSTASCII_USTRING(PROPERTY_CHARROTATIONCOMPLEX); DECLARE_CONSTASCII_USTRING(PROPERTY_CHARSCALEWIDTHCOMPLEX); DECLARE_CONSTASCII_USTRING(PROPERTY_CHARLOCALECOMPLEX ); -DECLARE_CONSTASCII_USTRING(PROPERTY_STATUSINDICATOR ); -DECLARE_CONSTASCII_USTRING(PROPERTY_SECTION ); -DECLARE_CONSTASCII_USTRING(PROPERTY_FILTER ); -DECLARE_CONSTASCII_USTRING(PROPERTY_ESCAPEPROCESSING ); +DECLARE_CONSTASCII_USTRING(PROPERTY_STATUSINDICATOR ); +DECLARE_CONSTASCII_USTRING(PROPERTY_SECTION ); +DECLARE_CONSTASCII_USTRING(PROPERTY_FILTER ); +DECLARE_CONSTASCII_USTRING(PROPERTY_ESCAPEPROCESSING ); -DECLARE_CONSTASCII_USTRING(PROPERTY_MULTILINE ); -DECLARE_CONSTASCII_USTRING(PROPERTY_ACTIVECONNECTION ); -DECLARE_CONSTASCII_USTRING(PROPERTY_DATASOURCENAME ); -DECLARE_CONSTASCII_USTRING(PROPERTY_FORMULA ); -DECLARE_CONSTASCII_USTRING(PROPERTY_INITIALFORMULA ); -DECLARE_CONSTASCII_USTRING(PROPERTY_PREEVALUATED ); -DECLARE_CONSTASCII_USTRING(PROPERTY_DEEPTRAVERSING ); -DECLARE_CONSTASCII_USTRING(PROPERTY_MIMETYPE ); -DECLARE_CONSTASCII_USTRING(PROPERTY_BACKGROUNDCOLOR ); -DECLARE_CONSTASCII_USTRING(PROPERTY_TEXT ); -DECLARE_CONSTASCII_USTRING(PROPERTY_TEXTCOLOR ); -DECLARE_CONSTASCII_USTRING(PROPERTY_TEXTLINECOLOR ); -DECLARE_CONSTASCII_USTRING(PROPERTY_FONTRELIEF ); -DECLARE_CONSTASCII_USTRING(PROPERTY_FONTEMPHASISMARK ); -DECLARE_CONSTASCII_USTRING(PROPERTY_ZORDER ); -DECLARE_CONSTASCII_USTRING(PROPERTY_OPAQUE ); -DECLARE_CONSTASCII_USTRING(PROPERTY_TRANSFORMATION ); -DECLARE_CONSTASCII_USTRING(PROPERTY_CUSTOMSHAPEENGINE ); -DECLARE_CONSTASCII_USTRING(PROPERTY_CUSTOMSHAPEDATA ); -DECLARE_CONSTASCII_USTRING(PROPERTY_CUSTOMSHAPEGEOMETRY ); +DECLARE_CONSTASCII_USTRING(PROPERTY_MULTILINE ); +DECLARE_CONSTASCII_USTRING(PROPERTY_ACTIVECONNECTION ); +DECLARE_CONSTASCII_USTRING(PROPERTY_DATASOURCENAME ); +DECLARE_CONSTASCII_USTRING(PROPERTY_FORMULA ); +DECLARE_CONSTASCII_USTRING(PROPERTY_INITIALFORMULA ); +DECLARE_CONSTASCII_USTRING(PROPERTY_PREEVALUATED ); +DECLARE_CONSTASCII_USTRING(PROPERTY_DEEPTRAVERSING ); +DECLARE_CONSTASCII_USTRING(PROPERTY_MIMETYPE ); +DECLARE_CONSTASCII_USTRING(PROPERTY_BACKGROUNDCOLOR ); +DECLARE_CONSTASCII_USTRING(PROPERTY_TEXT ); +DECLARE_CONSTASCII_USTRING(PROPERTY_TEXTCOLOR ); +DECLARE_CONSTASCII_USTRING(PROPERTY_TEXTLINECOLOR ); +DECLARE_CONSTASCII_USTRING(PROPERTY_FONTRELIEF ); +DECLARE_CONSTASCII_USTRING(PROPERTY_FONTEMPHASISMARK ); +DECLARE_CONSTASCII_USTRING(PROPERTY_ZORDER ); +DECLARE_CONSTASCII_USTRING(PROPERTY_OPAQUE ); +DECLARE_CONSTASCII_USTRING(PROPERTY_TRANSFORMATION ); +DECLARE_CONSTASCII_USTRING(PROPERTY_CUSTOMSHAPEENGINE ); +DECLARE_CONSTASCII_USTRING(PROPERTY_CUSTOMSHAPEDATA ); +DECLARE_CONSTASCII_USTRING(PROPERTY_CUSTOMSHAPEGEOMETRY ); -DECLARE_CONSTASCII_USTRING(PROPERTY_NUMBERINGTYPE ); -DECLARE_CONSTASCII_USTRING(PROPERTY_PAGESTYLELAYOUT ); -DECLARE_CONSTASCII_USTRING(PROPERTY_ISLANDSCAPE ); -DECLARE_CONSTASCII_USTRING(PROPERTY_ALIGN ); -DECLARE_CONSTASCII_USTRING(PROPERTY_TYPE ); +DECLARE_CONSTASCII_USTRING(PROPERTY_NUMBERINGTYPE ); +DECLARE_CONSTASCII_USTRING(PROPERTY_PAGESTYLELAYOUT ); +DECLARE_CONSTASCII_USTRING(PROPERTY_ISLANDSCAPE ); +DECLARE_CONSTASCII_USTRING(PROPERTY_ALIGN ); +DECLARE_CONSTASCII_USTRING(PROPERTY_TYPE ); DECLARE_CONSTASCII_USTRING(PROPERTY_PRESERVEIRI ); DECLARE_CONSTASCII_USTRING(PROPERTY_SCALEMODE ); -DECLARE_CONSTASCII_USTRING(PROPERTY_LINESTYLE ); -DECLARE_CONSTASCII_USTRING(PROPERTY_LINEDASH ); -DECLARE_CONSTASCII_USTRING(PROPERTY_LINECOLOR ); +DECLARE_CONSTASCII_USTRING(PROPERTY_LINESTYLE ); +DECLARE_CONSTASCII_USTRING(PROPERTY_LINEDASH ); +DECLARE_CONSTASCII_USTRING(PROPERTY_LINECOLOR ); DECLARE_CONSTASCII_USTRING(PROPERTY_LINETRANSPARENCE ); -DECLARE_CONSTASCII_USTRING(PROPERTY_LINEWIDTH ); +DECLARE_CONSTASCII_USTRING(PROPERTY_LINEWIDTH ); DECLARE_CONSTASCII_USTRING(PROPERTY_CHARFLASH ); DECLARE_CONSTASCII_USTRING(PROPERTY_CHARAUTOKERNING ); diff --git a/reportdesign/source/inc/uistrings.hrc b/reportdesign/source/inc/uistrings.hrc index 84807be6904e..5164236d743b 100644 --- a/reportdesign/source/inc/uistrings.hrc +++ b/reportdesign/source/inc/uistrings.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,28 +37,28 @@ namespace rptui #include "stringconstants.hrc" #undef STRINGCONSTANTS_INCLUDED_INDIRECT -DECLARE_CONSTASCII_USTRING(PROPERTY_REPORTNAME ); -DECLARE_CONSTASCII_USTRING(CFG_REPORTDESIGNER ); -DECLARE_CONSTASCII_USTRING(DBREPORTHEADER ); -DECLARE_CONSTASCII_USTRING(DBREPORTFOOTER ); -DECLARE_CONSTASCII_USTRING(DBPAGEHEADER ); -DECLARE_CONSTASCII_USTRING(DBPAGEFOOTER ); -DECLARE_CONSTASCII_USTRING(DBGROUPHEADER ); -DECLARE_CONSTASCII_USTRING(DBGROUPFOOTER ); -DECLARE_CONSTASCII_USTRING(DBCOLUMNHEADER ); -DECLARE_CONSTASCII_USTRING(DBCOLUMNFOOTER ); -DECLARE_CONSTASCII_USTRING(DBDETAIL ); -DECLARE_CONSTASCII_USTRING(REPORTCONTROLFORMAT ); -DECLARE_CONSTASCII_USTRING(CURRENT_WINDOW ); -DECLARE_CONSTASCII_USTRING(PROPERTY_FONTCOLOR ); -DECLARE_CONSTASCII_USTRING(PROPERTY_EMPTY_IS_NULL ); -DECLARE_CONSTASCII_USTRING(PROPERTY_FILTERPROPOSAL ); -DECLARE_CONSTASCII_USTRING(PROPERTY_POSITION ); -DECLARE_CONSTASCII_USTRING(PROPERTY_FORMATKEYDATE ); -DECLARE_CONSTASCII_USTRING(PROPERTY_FORMATKEYTIME ); +DECLARE_CONSTASCII_USTRING(PROPERTY_REPORTNAME ); +DECLARE_CONSTASCII_USTRING(CFG_REPORTDESIGNER ); +DECLARE_CONSTASCII_USTRING(DBREPORTHEADER ); +DECLARE_CONSTASCII_USTRING(DBREPORTFOOTER ); +DECLARE_CONSTASCII_USTRING(DBPAGEHEADER ); +DECLARE_CONSTASCII_USTRING(DBPAGEFOOTER ); +DECLARE_CONSTASCII_USTRING(DBGROUPHEADER ); +DECLARE_CONSTASCII_USTRING(DBGROUPFOOTER ); +DECLARE_CONSTASCII_USTRING(DBCOLUMNHEADER ); +DECLARE_CONSTASCII_USTRING(DBCOLUMNFOOTER ); +DECLARE_CONSTASCII_USTRING(DBDETAIL ); +DECLARE_CONSTASCII_USTRING(REPORTCONTROLFORMAT ); +DECLARE_CONSTASCII_USTRING(CURRENT_WINDOW ); +DECLARE_CONSTASCII_USTRING(PROPERTY_FONTCOLOR ); +DECLARE_CONSTASCII_USTRING(PROPERTY_EMPTY_IS_NULL ); +DECLARE_CONSTASCII_USTRING(PROPERTY_FILTERPROPOSAL ); +DECLARE_CONSTASCII_USTRING(PROPERTY_POSITION ); +DECLARE_CONSTASCII_USTRING(PROPERTY_FORMATKEYDATE ); +DECLARE_CONSTASCII_USTRING(PROPERTY_FORMATKEYTIME ); DECLARE_CONSTASCII_USTRING(DBOVERLAPPEDCONTROL ); -DECLARE_CONSTASCII_USTRING(PROPERTY_FORMULALIST ); -DECLARE_CONSTASCII_USTRING(PROPERTY_SCOPE ); +DECLARE_CONSTASCII_USTRING(PROPERTY_FORMULALIST ); +DECLARE_CONSTASCII_USTRING(PROPERTY_SCOPE ); DECLARE_CONSTASCII_USTRING(PROPERTY_CHARTTYPE ); DECLARE_CONSTASCII_USTRING(PROPERTY_PREVIEW_COUNT ); DECLARE_CONSTASCII_USTRING(PROPERTY_TITLE ); diff --git a/reportdesign/source/inc/xmlstrings.hrc b/reportdesign/source/inc/xmlstrings.hrc index 3f4a6f216174..248fa9c22f65 100644 --- a/reportdesign/source/inc/xmlstrings.hrc +++ b/reportdesign/source/inc/xmlstrings.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/reportdesign/source/shared/corestrings.cxx b/reportdesign/source/shared/corestrings.cxx index de78ede60197..fac2fb13c223 100644 --- a/reportdesign/source/shared/corestrings.cxx +++ b/reportdesign/source/shared/corestrings.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/reportdesign/source/shared/makefile.mk b/reportdesign/source/shared/makefile.mk index 62f78561dcf2..e399649bc825 100644 --- a/reportdesign/source/shared/makefile.mk +++ b/reportdesign/source/shared/makefile.mk @@ -34,6 +34,8 @@ LIB1TARGET=$(SLB)$/coreshared.lib LIB2TARGET=$(SLB)$/xmlshared.lib LIB3TARGET=$(SLB)$/uishared.lib +#ENABLE_EXCEPTIONS=TRUE + # --- Settings ---------------------------------- .INCLUDE : settings.mk diff --git a/reportdesign/source/shared/stringconstants.cxx b/reportdesign/source/shared/stringconstants.cxx index f9e28fd87bd1..0c15d46d950d 100644 --- a/reportdesign/source/shared/stringconstants.cxx +++ b/reportdesign/source/shared/stringconstants.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,12 +32,12 @@ //============================================================ //= service names //============================================================ -IMPLEMENT_CONSTASCII_USTRING(SERVICE_FIXEDTEXT , "com.sun.star.report.FixedText"); -IMPLEMENT_CONSTASCII_USTRING(SERVICE_FORMATTEDFIELD , "com.sun.star.report.FormattedField"); -IMPLEMENT_CONSTASCII_USTRING(SERVICE_IMAGECONTROL , "com.sun.star.report.ImageControl"); -IMPLEMENT_CONSTASCII_USTRING(SERVICE_FORMATCONDITION , "com.sun.star.report.FormatCondition"); -IMPLEMENT_CONSTASCII_USTRING(SERVICE_REPORTENGINE , "com.sun.star.report.ReportEngine"); -IMPLEMENT_CONSTASCII_USTRING(SERVICE_FUNCTION , "com.sun.star.report.Function"); +IMPLEMENT_CONSTASCII_USTRING(SERVICE_FIXEDTEXT , "com.sun.star.report.FixedText"); +IMPLEMENT_CONSTASCII_USTRING(SERVICE_FORMATTEDFIELD , "com.sun.star.report.FormattedField"); +IMPLEMENT_CONSTASCII_USTRING(SERVICE_IMAGECONTROL , "com.sun.star.report.ImageControl"); +IMPLEMENT_CONSTASCII_USTRING(SERVICE_FORMATCONDITION , "com.sun.star.report.FormatCondition"); +IMPLEMENT_CONSTASCII_USTRING(SERVICE_REPORTENGINE , "com.sun.star.report.ReportEngine"); +IMPLEMENT_CONSTASCII_USTRING(SERVICE_FUNCTION , "com.sun.star.report.Function"); IMPLEMENT_CONSTASCII_USTRING(SERVICE_REPORTDEFINITION , "com.sun.star.report.ReportDefinition"); IMPLEMENT_CONSTASCII_USTRING(SERVICE_SHAPE , "com.sun.star.report.Shape"); IMPLEMENT_CONSTASCII_USTRING(SERVICE_FIXEDLINE , "com.sun.star.report.FixedLine"); @@ -48,190 +48,190 @@ IMPLEMENT_CONSTASCII_USTRING(SERVICE_OLEOBJECT , "com.sun.star.report.O //============================================================ //= property names //============================================================ -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_VISIBLE , "Visible"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_NAME , "Name"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_HEIGHT , "Height"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BACKCOLOR , "BackColor"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BACKTRANSPARENT , "BackTransparent"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CONTROLBACKGROUND , "ControlBackground"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CONTROLBACKGROUNDTRANSPARENT , "ControlBackgroundTransparent"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FORCENEWPAGE , "ForceNewPage"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_NEWROWORCOL , "NewRowOrCol"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_KEEPTOGETHER , "KeepTogether"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CANGROW , "CanGrow"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CANSHRINK , "CanShrink"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_REPEATSECTION , "RepeatSection"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_GROUP , "Group"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_REPORTDEFINITION , "ReportDefinition"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_VISIBLE , "Visible"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_NAME , "Name"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_HEIGHT , "Height"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BACKCOLOR , "BackColor"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BACKTRANSPARENT , "BackTransparent"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CONTROLBACKGROUND , "ControlBackground"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CONTROLBACKGROUNDTRANSPARENT , "ControlBackgroundTransparent"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FORCENEWPAGE , "ForceNewPage"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_NEWROWORCOL , "NewRowOrCol"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_KEEPTOGETHER , "KeepTogether"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CANGROW , "CanGrow"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CANSHRINK , "CanShrink"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_REPEATSECTION , "RepeatSection"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_GROUP , "Group"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_REPORTDEFINITION , "ReportDefinition"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_HEADER , "Header"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FOOTER , "Footer"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_GROUPINTERVAL , "GroupInterval"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_EXPRESSION , "Expression"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_GROUPON , "GroupOn"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_SORTASCENDING , "SortAscending"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_GROUPS , "Groups"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_HEADER , "Header"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FOOTER , "Footer"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_GROUPINTERVAL , "GroupInterval"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_EXPRESSION , "Expression"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_GROUPON , "GroupOn"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_SORTASCENDING , "SortAscending"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_GROUPS , "Groups"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_MASTERFIELDS , "MasterFields"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_DETAILFIELDS , "DetailFields"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_REPORTHEADER , "ReportHeader"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_REPORTFOOTER , "ReportFooter"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PAGEHEADER , "PageHeader"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PAGEFOOTER , "PageFooter"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_DETAIL , "Detail"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CAPTION , "Caption"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BACKGRAPHICURL , "BackGraphicURL"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_COMMAND , "Command"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BACKGRAPHICLOCATION , "BackGraphicLocation"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ORIENTATION , "Orientation"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PAPERFORMAT , "PaperFormat"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PAPERSIZE , "Size"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_GROUPKEEPTOGETHER , "GroupKeepTogether"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PAGEHEADEROPTION , "PageHeaderOption"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PAGEFOOTEROPTION , "PageFooterOption"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_COMMANDTYPE , "CommandType"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_REPORTHEADERON , "ReportHeaderOn"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_REPORTFOOTERON , "ReportFooterOn"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PAGEHEADERON , "PageHeaderOn"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PAGEFOOTERON , "PageFooterOn"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_HEADERON , "HeaderOn"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FOOTERON , "FooterOn"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_MASTERFIELDS , "MasterFields"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_DETAILFIELDS , "DetailFields"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_REPORTHEADER , "ReportHeader"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_REPORTFOOTER , "ReportFooter"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PAGEHEADER , "PageHeader"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PAGEFOOTER , "PageFooter"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_DETAIL , "Detail"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CAPTION , "Caption"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BACKGRAPHICURL , "BackGraphicURL"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_COMMAND , "Command"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BACKGRAPHICLOCATION , "BackGraphicLocation"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ORIENTATION , "Orientation"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PAPERFORMAT , "PaperFormat"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PAPERSIZE , "Size"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_GROUPKEEPTOGETHER , "GroupKeepTogether"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PAGEHEADEROPTION , "PageHeaderOption"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PAGEFOOTEROPTION , "PageFooterOption"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_COMMANDTYPE , "CommandType"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_REPORTHEADERON , "ReportHeaderOn"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_REPORTFOOTERON , "ReportFooterOn"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PAGEHEADERON , "PageHeaderOn"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PAGEFOOTERON , "PageFooterOn"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_HEADERON , "HeaderOn"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FOOTERON , "FooterOn"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_WIDTH , "Width"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_POSITIONX , "PositionX"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_POSITIONY , "PositionY"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_WIDTH , "Width"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_POSITIONX , "PositionX"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_POSITIONY , "PositionY"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_DATAFIELD , "DataField"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PARAADJUST , "ParaAdjust"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ALIGN , "Align"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTDESCRIPTOR , "FontDescriptor"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTDESCRIPTORASIAN , "FontDescriptorAsian"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_DATAFIELD , "DataField"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PARAADJUST , "ParaAdjust"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ALIGN , "Align"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTDESCRIPTOR , "FontDescriptor"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTDESCRIPTORASIAN , "FontDescriptorAsian"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTDESCRIPTORCOMPLEX , "FontDescriptorComplex"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CONTROLTEXTEMPHASISMARK , "ControlTextEmphasis"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARRELIEF , "CharRelief"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARCOLOR , "CharColor"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_VERTICALALIGN , "VerticalAlign"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_IMAGEPOSITION , "ImagePosition"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_IMAGEURL , "ImageURL"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARUNDERLINECOLOR , "CharUnderlineColor"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_LABEL , "Label"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CONTROLTEXTEMPHASISMARK , "ControlTextEmphasis"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARRELIEF , "CharRelief"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARCOLOR , "CharColor"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_VERTICALALIGN , "VerticalAlign"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_IMAGEPOSITION , "ImagePosition"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_IMAGEURL , "ImageURL"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARUNDERLINECOLOR , "CharUnderlineColor"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_LABEL , "Label"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_EFFECTIVEDEFAULT , "EffectiveDefault"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_EFFECTIVEMAX , "EffectiveMax"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_EFFECTIVEMIN , "EffectiveMin"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FORMATKEY , "FormatKey"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_MAXTEXTLEN , "MaxTextLen"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_LISTSOURCE , "ListSource"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FORMATSSUPPLIER , "FormatsSupplier"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CONTROLBORDER , "ControlBorder"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CONTROLBORDERCOLOR , "ControlBorderColor"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BORDER , "Border"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BORDERCOLOR , "BorderColor"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_DEFAULTCONTROL , "DefaultControl"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_EFFECTIVEDEFAULT , "EffectiveDefault"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_EFFECTIVEMAX , "EffectiveMax"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_EFFECTIVEMIN , "EffectiveMin"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FORMATKEY , "FormatKey"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_MAXTEXTLEN , "MaxTextLen"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_LISTSOURCE , "ListSource"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FORMATSSUPPLIER , "FormatsSupplier"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CONTROLBORDER , "ControlBorder"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CONTROLBORDERCOLOR , "ControlBorderColor"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BORDER , "Border"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BORDERCOLOR , "BorderColor"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_DEFAULTCONTROL , "DefaultControl"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_LEFTMARGIN , "LeftMargin"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_RIGHTMARGIN , "RightMargin"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_TOPMARGIN , "TopMargin"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BOTTOMMARGIN , "BottomMargin"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_LEFTMARGIN , "LeftMargin"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_RIGHTMARGIN , "RightMargin"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_TOPMARGIN , "TopMargin"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BOTTOMMARGIN , "BottomMargin"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PRINTREPEATEDVALUES , "PrintRepeatedValues"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CONDITIONALPRINTEXPRESSION , "ConditionalPrintExpression"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_SHAPE , "Shape"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_STARTNEWCOLUMN , "StartNewColumn"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_RESETPAGENUMBER , "ResetPageNumber"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PRINTWHENGROUPCHANGE , "PrintWhenGroupChange"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_STATE , "State"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_TIME_STATE , "TimeState"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_DATE_STATE , "DateState"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_TRISTATE , "TriState"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_LISTSOURCETYPE , "ListSourceType"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTCHARWIDTH, "FontCharWidth"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTCHARSET, "CharFontCharSet"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTFAMILY, "CharFontFamily"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTHEIGHT, "CharHeight"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTHEIGHT, "FontHeight"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTKERNING, "FontKerning"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONT, "FontDescriptor"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTNAME, "FontName"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTORIENTATION, "CharRotation"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTPITCH, "CharFontPitch"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTSLANT, "FontSlant"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARSTRIKEOUT, "CharStrikeout"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTSTRIKEOUT, "FontStrikeout"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTSTYLENAME, "CharFontStyleName"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTUNDERLINE, "CharUnderline"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTWEIGHT, "CharWeight"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTWIDTH, "FontWidth"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTWORDLINEMODE, "FontWordLineMode"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTTYPE, "FontType"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PRINTREPEATEDVALUES , "PrintRepeatedValues"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CONDITIONALPRINTEXPRESSION , "ConditionalPrintExpression"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_SHAPE , "Shape"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_STARTNEWCOLUMN , "StartNewColumn"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_RESETPAGENUMBER , "ResetPageNumber"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PRINTWHENGROUPCHANGE , "PrintWhenGroupChange"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_STATE , "State"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_TIME_STATE , "TimeState"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_DATE_STATE , "DateState"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_TRISTATE , "TriState"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_LISTSOURCETYPE , "ListSourceType"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTCHARWIDTH, "FontCharWidth"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTCHARSET, "CharFontCharSet"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTFAMILY, "CharFontFamily"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTHEIGHT, "CharHeight"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTHEIGHT, "FontHeight"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTKERNING, "FontKerning"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONT, "FontDescriptor"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTNAME, "FontName"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTORIENTATION, "CharRotation"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTPITCH, "CharFontPitch"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTSLANT, "FontSlant"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARSTRIKEOUT, "CharStrikeout"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTSTRIKEOUT, "FontStrikeout"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTSTYLENAME, "CharFontStyleName"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTUNDERLINE, "CharUnderline"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTWEIGHT, "CharWeight"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTWIDTH, "FontWidth"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTWORDLINEMODE, "FontWordLineMode"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTTYPE, "FontType"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ENABLED , "Enabled"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ENABLED , "Enabled"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHAREMPHASIS, "CharEmphasis"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTNAME, "CharFontName"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHAREMPHASIS, "CharEmphasis"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTNAME, "CharFontName"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTSTYLENAME,"CharFontStyleName"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTFAMILY, "CharFontFamily"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTCHARSET, "CharFontCharSet"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTPITCH, "CharFontPitch"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARHEIGHT, "CharHeight"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARUNDERLINE, "CharUnderline"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARWEIGHT, "CharWeight"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARPOSTURE, "CharPosture"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARWORDMODE, "CharWordMode"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARROTATION, "CharRotation"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARSCALEWIDTH, "CharScaleWidth"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTFAMILY, "CharFontFamily"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTCHARSET, "CharFontCharSet"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTPITCH, "CharFontPitch"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARHEIGHT, "CharHeight"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARUNDERLINE, "CharUnderline"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARWEIGHT, "CharWeight"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARPOSTURE, "CharPosture"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARWORDMODE, "CharWordMode"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARROTATION, "CharRotation"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARSCALEWIDTH, "CharScaleWidth"); // Asian -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHAREMPHASISASIAN, "CharEmphasisAsian"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTNAMEASIAN, "CharFontNameAsian"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHAREMPHASISASIAN, "CharEmphasisAsian"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTNAMEASIAN, "CharFontNameAsian"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTSTYLENAMEASIAN, "CharFontStyleNameAsian"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTFAMILYASIAN, "CharFontFamilyAsian"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTCHARSETASIAN, "CharFontCharSetAsian"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTPITCHASIAN, "CharFontPitchAsian"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARHEIGHTASIAN, "CharHeightAsian"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARUNDERLINEASIAN, "CharUnderlineAsian"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARWEIGHTASIAN, "CharWeightAsian"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARPOSTUREASIAN, "CharPostureAsian"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARWORDMODEASIAN, "CharWordModeAsian"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARROTATIONASIAN, "CharRotationAsian"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARSCALEWIDTHASIAN, "CharScaleWidthAsian"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTFAMILYASIAN, "CharFontFamilyAsian"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTCHARSETASIAN, "CharFontCharSetAsian"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTPITCHASIAN, "CharFontPitchAsian"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARHEIGHTASIAN, "CharHeightAsian"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARUNDERLINEASIAN, "CharUnderlineAsian"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARWEIGHTASIAN, "CharWeightAsian"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARPOSTUREASIAN, "CharPostureAsian"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARWORDMODEASIAN, "CharWordModeAsian"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARROTATIONASIAN, "CharRotationAsian"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARSCALEWIDTHASIAN, "CharScaleWidthAsian"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARLOCALEASIAN, "CharLocaleAsian"); // Complex -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHAREMPHASISCOMPLEX, "CharEmphasisComplex"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTNAMECOMPLEX, "CharFontNameComplex"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHAREMPHASISCOMPLEX, "CharEmphasisComplex"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTNAMECOMPLEX, "CharFontNameComplex"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTSTYLENAMECOMPLEX, "CharFontStyleNameComplex"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTFAMILYCOMPLEX, "CharFontFamilyComplex"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTCHARSETCOMPLEX, "CharFontCharSetComplex"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTPITCHCOMPLEX, "CharFontPitchComplex"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARHEIGHTCOMPLEX, "CharHeightComplex"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARUNDERLINECOMPLEX, "CharUnderlineComplex"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARWEIGHTCOMPLEX, "CharWeightComplex"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARPOSTURECOMPLEX, "CharPostureComplex"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARWORDMODECOMPLEX, "CharWordModeComplex"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARROTATIONCOMPLEX, "CharRotationComplex"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARSCALEWIDTHCOMPLEX, "CharScaleWidthComplex"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTFAMILYCOMPLEX, "CharFontFamilyComplex"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTCHARSETCOMPLEX, "CharFontCharSetComplex"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARFONTPITCHCOMPLEX, "CharFontPitchComplex"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARHEIGHTCOMPLEX, "CharHeightComplex"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARUNDERLINECOMPLEX, "CharUnderlineComplex"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARWEIGHTCOMPLEX, "CharWeightComplex"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARPOSTURECOMPLEX, "CharPostureComplex"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARWORDMODECOMPLEX, "CharWordModeComplex"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARROTATIONCOMPLEX, "CharRotationComplex"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARSCALEWIDTHCOMPLEX, "CharScaleWidthComplex"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARLOCALECOMPLEX, "CharLocaleComplex"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_STATUSINDICATOR, "StatusIndicator"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_SECTION, "Section"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FILTER, "Filter"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_MULTILINE, "MultiLine"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ESCAPEPROCESSING, "EscapeProcessing"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ACTIVECONNECTION, "ActiveConnection"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_DATASOURCENAME, "DataSourceName"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FORMULA, "Formula"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_INITIALFORMULA, "InitialFormula"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PREEVALUATED, "PreEvaluated"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_DEEPTRAVERSING, "DeepTraversing"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_MIMETYPE, "MimeType"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_STATUSINDICATOR, "StatusIndicator"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_SECTION, "Section"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FILTER, "Filter"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_MULTILINE, "MultiLine"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ESCAPEPROCESSING, "EscapeProcessing"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ACTIVECONNECTION, "ActiveConnection"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_DATASOURCENAME, "DataSourceName"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FORMULA, "Formula"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_INITIALFORMULA, "InitialFormula"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PREEVALUATED, "PreEvaluated"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_DEEPTRAVERSING, "DeepTraversing"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_MIMETYPE, "MimeType"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BACKGROUNDCOLOR, "BackgroundColor"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_TEXT, "Text"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_TEXTCOLOR, "TextColor"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_TEXTLINECOLOR , "TextLineColor"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTRELIEF , "FontRelief"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_TEXTLINECOLOR , "TextLineColor"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTRELIEF , "FontRelief"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTEMPHASISMARK, "FontEmphasisMark"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ZORDER, "ZOrder"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_OPAQUE, "Opaque"); @@ -264,7 +264,7 @@ IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARCOMBINESUFFIX, "CharCombineSuffix") IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARHIDDEN, "CharHidden"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARSHADOWED, "CharShadowed"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARCONTOURED, "CharContoured"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARAUTOKERNING, "CharAutoKerning"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARAUTOKERNING, "CharAutoKerning"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARKERNING, "CharKerning"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_HYPERLINKURL , "HyperLinkURL"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_HYPERLINKTARGET , "HyperLinkTarget"); diff --git a/reportdesign/source/shared/uistrings.cxx b/reportdesign/source/shared/uistrings.cxx index a9dc08d1a491..2b92d222ba52 100644 --- a/reportdesign/source/shared/uistrings.cxx +++ b/reportdesign/source/shared/uistrings.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,28 +32,28 @@ namespace rptui { #include "stringconstants.cxx" - IMPLEMENT_CONSTASCII_USTRING(PROPERTY_REPORTNAME , "ReportName"); - IMPLEMENT_CONSTASCII_USTRING(CFG_REPORTDESIGNER , "SunReportBuilder"); - IMPLEMENT_CONSTASCII_USTRING(DBREPORTHEADER , "ReportHeader"); - IMPLEMENT_CONSTASCII_USTRING(DBREPORTFOOTER , "ReportFooter"); - IMPLEMENT_CONSTASCII_USTRING(DBPAGEHEADER , "PageHeader"); - IMPLEMENT_CONSTASCII_USTRING(DBPAGEFOOTER , "PageFooter"); - IMPLEMENT_CONSTASCII_USTRING(DBGROUPHEADER , "GroupHeader"); - IMPLEMENT_CONSTASCII_USTRING(DBGROUPFOOTER , "GroupFooter"); - IMPLEMENT_CONSTASCII_USTRING(DBCOLUMNHEADER , "ColumnHeader"); - IMPLEMENT_CONSTASCII_USTRING(DBCOLUMNFOOTER , "ColumnFooter"); - IMPLEMENT_CONSTASCII_USTRING(DBDETAIL , "Detail"); - IMPLEMENT_CONSTASCII_USTRING(REPORTCONTROLFORMAT , "ReportControlFormat"); - IMPLEMENT_CONSTASCII_USTRING(CURRENT_WINDOW , "CurrentWindow"); - IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTCOLOR , "FontColor"); + IMPLEMENT_CONSTASCII_USTRING(PROPERTY_REPORTNAME , "ReportName"); + IMPLEMENT_CONSTASCII_USTRING(CFG_REPORTDESIGNER , "SunReportBuilder"); + IMPLEMENT_CONSTASCII_USTRING(DBREPORTHEADER , "ReportHeader"); + IMPLEMENT_CONSTASCII_USTRING(DBREPORTFOOTER , "ReportFooter"); + IMPLEMENT_CONSTASCII_USTRING(DBPAGEHEADER , "PageHeader"); + IMPLEMENT_CONSTASCII_USTRING(DBPAGEFOOTER , "PageFooter"); + IMPLEMENT_CONSTASCII_USTRING(DBGROUPHEADER , "GroupHeader"); + IMPLEMENT_CONSTASCII_USTRING(DBGROUPFOOTER , "GroupFooter"); + IMPLEMENT_CONSTASCII_USTRING(DBCOLUMNHEADER , "ColumnHeader"); + IMPLEMENT_CONSTASCII_USTRING(DBCOLUMNFOOTER , "ColumnFooter"); + IMPLEMENT_CONSTASCII_USTRING(DBDETAIL , "Detail"); + IMPLEMENT_CONSTASCII_USTRING(REPORTCONTROLFORMAT , "ReportControlFormat"); + IMPLEMENT_CONSTASCII_USTRING(CURRENT_WINDOW , "CurrentWindow"); + IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FONTCOLOR , "FontColor"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_EMPTY_IS_NULL , "ConvertEmptyToNull"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FILTERPROPOSAL , "UseFilterValueProposal"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_POSITION , "Position"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FORMATKEYDATE , "FormatKeyDate"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FORMATKEYTIME , "FormatKeyTime"); - IMPLEMENT_CONSTASCII_USTRING(DBOVERLAPPEDCONTROL , "OverlappedControl"); + IMPLEMENT_CONSTASCII_USTRING(DBOVERLAPPEDCONTROL , "OverlappedControl"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FORMULALIST , "FormulaList"); - IMPLEMENT_CONSTASCII_USTRING(PROPERTY_SCOPE , "Scope"); + IMPLEMENT_CONSTASCII_USTRING(PROPERTY_SCOPE , "Scope"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CHARTTYPE , "ChartType"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PREVIEW_COUNT , "RowLimit"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_TITLE , "Title"); @@ -67,6 +67,6 @@ namespace rptui IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FILLSTYLE , "FillStyle"); IMPLEMENT_CONSTASCII_USTRING(DBTEXTBOXBOUNDCONTENT , "TextBoxBoundContent"); -} +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/shared/xmlstrings.cxx b/reportdesign/source/shared/xmlstrings.cxx index 6933a01a4d2c..d6e4afdd8936 100644 --- a/reportdesign/source/shared/xmlstrings.cxx +++ b/reportdesign/source/shared/xmlstrings.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,16 +32,16 @@ namespace rptxml { #include "stringconstants.cxx" -IMPLEMENT_CONSTASCII_USTRING(SERVICE_SETTINGSIMPORTER , "com.sun.star.comp.Report.XMLOasisSettingsImporter"); -IMPLEMENT_CONSTASCII_USTRING(SERVICE_STYLESIMPORTER , "com.sun.star.comp.Report.XMLOasisStylesImporter"); -IMPLEMENT_CONSTASCII_USTRING(SERVICE_CONTENTIMPORTER , "com.sun.star.comp.Report.XMLOasisContentImporter"); -IMPLEMENT_CONSTASCII_USTRING(SERVICE_IMPORTFILTER , "com.sun.star.comp.document.ImportFilter"); -IMPLEMENT_CONSTASCII_USTRING(SERVICE_METAIMPORTER , "com.sun.star.comp.Report.XMLOasisMetaImporter"); +IMPLEMENT_CONSTASCII_USTRING(SERVICE_SETTINGSIMPORTER , "com.sun.star.comp.Report.XMLOasisSettingsImporter"); +IMPLEMENT_CONSTASCII_USTRING(SERVICE_STYLESIMPORTER , "com.sun.star.comp.Report.XMLOasisStylesImporter"); +IMPLEMENT_CONSTASCII_USTRING(SERVICE_CONTENTIMPORTER , "com.sun.star.comp.Report.XMLOasisContentImporter"); +IMPLEMENT_CONSTASCII_USTRING(SERVICE_IMPORTFILTER , "com.sun.star.comp.document.ImportFilter"); +IMPLEMENT_CONSTASCII_USTRING(SERVICE_METAIMPORTER , "com.sun.star.comp.Report.XMLOasisMetaImporter"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BORDERLEFT , "BorderLeft"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BORDERRIGHT , "BorderRight"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BORDERTOP , "BorderTop"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BORDERBOTTOM , "BorderBottom"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BORDERLEFT , "BorderLeft"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BORDERRIGHT , "BorderRight"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BORDERTOP , "BorderTop"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BORDERBOTTOM , "BorderBottom"); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx index 1193e63d694a..555243316ab1 100644 --- a/reportdesign/source/ui/dlg/AddField.cxx +++ b/reportdesign/source/ui/dlg/AddField.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -70,12 +70,14 @@ using namespace lang; using namespace container; using namespace ::svx; -class OAddFieldWindowListBox : public SvTreeListBox +class OAddFieldWindowListBox : public SvTreeListBox { OAddFieldWindow* m_pTabWin; OAddFieldWindowListBox(const OAddFieldWindowListBox&); void operator =(const OAddFieldWindowListBox&); +protected: +// virtual void Command( const CommandEvent& rEvt ); public: OAddFieldWindowListBox( OAddFieldWindow* _pParent ); @@ -170,8 +172,8 @@ OAddFieldWindow::OAddFieldWindow(Window* pParent ,m_xRowSet(_xRowSet) ,m_aActions(this,ModuleRes(RID_TB_SORTING)) ,m_pListBox(new OAddFieldWindowListBox( this )) - ,m_aFixedLine(this, ModuleRes(ADDFIELD_FL_HELP_SEPARATOR) ) - ,m_aHelpText(this, ModuleRes(ADDFIELD_HELP_FIELD) ) + ,m_aFixedLine(this, ModuleRes(ADDFIELD_FL_HELP_SEPARATOR) ) + ,m_aHelpText(this, ModuleRes(ADDFIELD_HELP_FIELD) ) ,m_aInsertButton(this, WB_TABSTOP|WB_CENTER) ,m_nCommandType(0) ,m_bEscapeProcessing(sal_False) @@ -189,8 +191,8 @@ OAddFieldWindow::OAddFieldWindow(Window* pParent m_aActions.SetSelectHdl(LINK(this, OAddFieldWindow, OnSortAction)); setToolBox(&m_aActions); m_aActions.CheckItem(SID_FM_SORTUP); - m_aActions.EnableItem(SID_ADD_CONTROL_PAIR, sal_False); - + m_aActions.EnableItem(SID_ADD_CONTROL_PAIR, FALSE); + m_pListBox->SetDoubleClickHdl(LINK( this, OAddFieldWindow, OnDoubleClickHdl ) ); m_pListBox->SetSelectHdl(LINK( this, OAddFieldWindow, OnSelectHdl ) ); m_pListBox->SetDeselectHdl(LINK( this, OAddFieldWindow, OnSelectHdl ) ); @@ -205,6 +207,7 @@ OAddFieldWindow::OAddFieldWindow(Window* pParent m_aHelpText.SetControlBackground( GetSettings().GetStyleSettings().GetFaceColor() ); SetSizePixel(Size(STD_WIN_SIZE_X,STD_WIN_SIZE_Y)); + //Show(); if ( m_xRowSet.is() ) { @@ -229,9 +232,9 @@ OAddFieldWindow::~OAddFieldWindow() { if ( m_pListBox.get() ) { - SvLBoxTreeList* pModel = m_pListBox->GetModel(); - sal_uLong nCount = pModel->GetEntryCount(); - for(sal_uLong i = 0; i< nCount;++i) + SvLBoxTreeList* pModel = m_pListBox->GetModel(); + ULONG nCount = pModel->GetEntryCount(); + for(ULONG i = 0; i< nCount;++i) { delete static_cast<ColumnInfo*>(pModel->GetEntry(i)->GetUserData()); } @@ -291,7 +294,7 @@ namespace const ::rtl::OUString* pEntries = _rEntries.getConstArray(); sal_Int32 nEntries = _rEntries.getLength(); for ( sal_Int32 i = 0; i < nEntries; ++i, ++pEntries ) - _rListBox.InsertEntry( *pEntries,NULL,sal_False,LIST_APPEND,new ColumnInfo(*pEntries) ); + _rListBox.InsertEntry( *pEntries,NULL,FALSE,LIST_APPEND,new ColumnInfo(*pEntries) ); } void lcl_addToList( OAddFieldWindowListBox& _rListBox, const uno::Reference< container::XNameAccess>& i_xColumns ) { @@ -305,9 +308,9 @@ namespace if ( xColumn->getPropertySetInfo()->hasPropertyByName(PROPERTY_LABEL) ) xColumn->getPropertyValue(PROPERTY_LABEL) >>= sLabel; if ( sLabel.getLength() ) - _rListBox.InsertEntry( sLabel,NULL,sal_False,LIST_APPEND,new ColumnInfo(*pEntries,sLabel) ); + _rListBox.InsertEntry( sLabel,NULL,FALSE,LIST_APPEND,new ColumnInfo(*pEntries,sLabel) ); else - _rListBox.InsertEntry( *pEntries,NULL,sal_False,LIST_APPEND,new ColumnInfo(*pEntries,sLabel) ); + _rListBox.InsertEntry( *pEntries,NULL,FALSE,LIST_APPEND,new ColumnInfo(*pEntries,sLabel) ); } } } @@ -324,12 +327,12 @@ void OAddFieldWindow::Update() { // ListBox loeschen m_pListBox->Clear(); - const sal_uInt16 nItemCount = m_aActions.GetItemCount(); - for (sal_uInt16 j = 0; j< nItemCount; ++j) + const USHORT nItemCount = m_aActions.GetItemCount(); + for (USHORT j = 0; j< nItemCount; ++j) { - m_aActions.EnableItem(m_aActions.GetItemId(j),sal_False); + m_aActions.EnableItem(m_aActions.GetItemId(j),FALSE); } - + String aTitle(ModuleRes(RID_STR_FIELDSELECTION)); SetText(aTitle); if ( m_xRowSet.is() ) @@ -344,8 +347,8 @@ void OAddFieldWindow::Update() OSL_VERIFY( m_xRowSet->getPropertyValue( PROPERTY_ESCAPEPROCESSING ) >>= bEscapeProcessing ); OSL_VERIFY( m_xRowSet->getPropertyValue( PROPERTY_FILTER ) >>= sFilter ); - m_aCommandName = sCommand; - m_nCommandType = nCommandType; + m_aCommandName = sCommand; + m_nCommandType = nCommandType; m_bEscapeProcessing = bEscapeProcessing; m_sFilter = sFilter; @@ -372,7 +375,7 @@ void OAddFieldWindow::Update() SetText( aTitle ); if ( m_aCommandName.getLength() ) { - for (sal_uInt16 i = 0; i < nItemCount; ++i) + for (USHORT i = 0; i < nItemCount; ++i) { m_aActions.EnableItem(m_aActions.GetItemId(i)); } @@ -445,7 +448,7 @@ void OAddFieldWindow::fillDescriptor(SvLBoxEntry* _pSelected,::svx::ODataAccessD uno::Reference<frame::XModel> xModel(xDocument->getDatabaseDocument(),uno::UNO_QUERY); if ( xModel.is() ) _rDescriptor[ daDatabaseLocation ] <<= xModel->getURL(); - } + } // if ( xDocument.is() ) } _rDescriptor[ ::svx::daCommand ] <<= GetCommand(); @@ -454,6 +457,7 @@ void OAddFieldWindow::fillDescriptor(SvLBoxEntry* _pSelected,::svx::ODataAccessD _rDescriptor[ ::svx::daConnection ] <<= getConnection(); ColumnInfo* pInfo = static_cast<ColumnInfo*>(_pSelected->GetUserData()); + // ::rtl::OUString sColumnName = m_pListBox->GetEntryText( _pSelected ); _rDescriptor[ ::svx::daColumnName ] <<= pInfo->sColumnName; if ( m_xColumns->hasByName( pInfo->sColumnName ) ) _rDescriptor[ ::svx::daColumnObject ] <<= m_xColumns->getByName(pInfo->sColumnName); @@ -472,9 +476,9 @@ void OAddFieldWindow::_elementInserted( const container::ContainerEvent& _rEvent if ( xColumn->getPropertySetInfo()->hasPropertyByName(PROPERTY_LABEL) ) xColumn->getPropertyValue(PROPERTY_LABEL) >>= sLabel; if ( sLabel.getLength() ) - m_pListBox->InsertEntry( sLabel,NULL,sal_False,LIST_APPEND,new ColumnInfo(sName,sLabel) ); + m_pListBox->InsertEntry( sLabel,NULL,FALSE,LIST_APPEND,new ColumnInfo(sName,sLabel) ); else - m_pListBox->InsertEntry( sName,NULL,sal_False,LIST_APPEND,new ColumnInfo(sName,sLabel) ); + m_pListBox->InsertEntry( sName,NULL,FALSE,LIST_APPEND,new ColumnInfo(sName,sLabel) ); } } } @@ -508,12 +512,16 @@ IMPL_LINK( OAddFieldWindow, OnDoubleClickHdl, void* ,/*_pAddFieldDlg*/) return 0L; } //------------------------------------------------------------------------------ -ImageList OAddFieldWindow::getImageList(sal_Int16 _eBitmapSet) const +ImageList OAddFieldWindow::getImageList(sal_Int16 _eBitmapSet,sal_Bool _bHiContast) const { sal_Int16 nN = IMG_ADDFIELD_DLG_SC; + sal_Int16 nH = IMG_ADDFIELD_DLG_SCH; if ( _eBitmapSet == SFX_SYMBOLS_SIZE_LARGE ) + { nN = IMG_ADDFIELD_DLG_LC; - return ImageList(ModuleRes(nN)); + nH = IMG_ADDFIELD_DLG_LCH; + } + return ImageList(ModuleRes( _bHiContast ? nH : nN )); } //------------------------------------------------------------------ void OAddFieldWindow::resizeControls(const Size& _rDiff) @@ -527,19 +535,19 @@ void OAddFieldWindow::resizeControls(const Size& _rDiff) //------------------------------------------------------------------ IMPL_LINK( OAddFieldWindow, OnSortAction, ToolBox*, /*NOTINTERESTEDIN*/ ) { - const sal_uInt16 nCurItem = m_aActions.GetCurItemId(); + const USHORT nCurItem = m_aActions.GetCurItemId(); if ( SID_ADD_CONTROL_PAIR == nCurItem ) OnDoubleClickHdl(NULL); else { if ( SID_FM_REMOVE_FILTER_SORT == nCurItem || !m_aActions.IsItemChecked(nCurItem) ) { - const sal_uInt16 nItemCount = m_aActions.GetItemCount(); - for (sal_uInt16 j = 0; j< nItemCount; ++j) + const USHORT nItemCount = m_aActions.GetItemCount(); + for (USHORT j = 0; j< nItemCount; ++j) { - const sal_uInt16 nItemId = m_aActions.GetItemId(j); + const USHORT nItemId = m_aActions.GetItemId(j); if ( nCurItem != nItemId ) - m_aActions.CheckItem(nItemId,sal_False); + m_aActions.CheckItem(nItemId,FALSE); } SvSortMode eSortMode = SortNone; if ( SID_FM_REMOVE_FILTER_SORT != nCurItem ) @@ -549,12 +557,12 @@ IMPL_LINK( OAddFieldWindow, OnSortAction, ToolBox*, /*NOTINTERESTEDIN*/ ) eSortMode = SortAscending; else if ( m_aActions.IsItemChecked(SID_FM_SORTDOWN) ) eSortMode = SortDescending; - } - + } // if ( SID_FM_REMOVE_FILTER_SORT != nCurItem ) + m_pListBox->GetModel()->SetSortMode(eSortMode); if ( SID_FM_REMOVE_FILTER_SORT == nCurItem ) Update(); - + m_pListBox->GetModel()->Resort(); } } diff --git a/reportdesign/source/ui/dlg/CondFormat.cxx b/reportdesign/source/ui/dlg/CondFormat.cxx index e90b08faab6a..a505e111bf39 100644 --- a/reportdesign/source/ui/dlg/CondFormat.cxx +++ b/reportdesign/source/ui/dlg/CondFormat.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -88,18 +88,18 @@ namespace rptui UpdateLocker( Window& _rWindow ) :m_rWindow( _rWindow ) { - _rWindow.SetUpdateMode( sal_False ); + _rWindow.SetUpdateMode( FALSE ); } ~UpdateLocker() { - m_rWindow.SetUpdateMode( sal_True ); + m_rWindow.SetUpdateMode( TRUE ); } }; //======================================================================== // class ConditionalFormattingDialog //======================================================================== - DBG_NAME(rpt_ConditionalFormattingDialog) + DBG_NAME(rpt_ConditionalFormattingDialog) ConditionalFormattingDialog::ConditionalFormattingDialog( Window* _pParent, const Reference< XReportControlModel >& _rxFormatConditions, ::rptui::OReportController& _rController ) :ModalDialog( _pParent, ModuleRes(RID_CONDFORMAT) ) @@ -110,10 +110,10 @@ namespace rptui ,m_aPB_Help(this, ModuleRes(PB_HELP)) ,m_aCondScroll( this, ModuleRes( SB_ALL_CONDITIONS ) ) ,m_rController( _rController ) - ,m_xFormatConditions( _rxFormatConditions ) + ,m_xFormatConditions( _rxFormatConditions ) ,m_bDeletingCondition( false ) { - DBG_CTOR(rpt_ConditionalFormattingDialog,NULL); + DBG_CTOR(rpt_ConditionalFormattingDialog,NULL); OSL_ENSURE( m_xFormatConditions.is(), "ConditionalFormattingDialog::ConditionalFormattingDialog: ReportControlModel is NULL -> Prepare for GPF!" ); m_xCopy.set( m_xFormatConditions->createClone(), UNO_QUERY_THROW ); @@ -129,7 +129,7 @@ namespace rptui ConditionalFormattingDialog::~ConditionalFormattingDialog() { m_aConditions.clear(); - DBG_DTOR(rpt_ConditionalFormattingDialog,NULL); + DBG_DTOR(rpt_ConditionalFormattingDialog,NULL); } // ----------------------------------------------------------------------------- @@ -188,7 +188,7 @@ namespace rptui m_aConditions.insert( m_aConditions.begin() + _nNewCondIndex, pCon ); pCon->SetPosSizePixel( 0, 0, impl_getConditionWidth(), 0, WINDOW_POSSIZE_WIDTH ); - } + } catch( const Exception& ) { DBG_UNHANDLED_EXCEPTION(); @@ -246,7 +246,7 @@ namespace rptui if ( nNewFocusIndex >= impl_getConditionCount() ) nNewFocusIndex = impl_getConditionCount() - 1; } - } + } catch( const Exception& ) { DBG_UNHANDLED_EXCEPTION(); @@ -391,17 +391,17 @@ namespace rptui pCon->updateToolbar( xCond.get() ); m_aConditions.push_back( pCon ); } - } + } catch(Exception&) { - OSL_FAIL("Can not access format condition!"); + OSL_ENSURE(0,"Can not access format condition!"); } impl_conditionCountChanged(); } // ----------------------------------------------------------------------------- - void ConditionalFormattingDialog::applyCommand( size_t _nCondIndex, sal_uInt16 _nCommandId, const ::Color _aColor ) + void ConditionalFormattingDialog::applyCommand( size_t _nCondIndex, USHORT _nCommandId, const ::Color _aColor ) { OSL_PRECOND( _nCommandId, "ConditionalFormattingDialog::applyCommand: illegal command id!" ); try @@ -418,11 +418,11 @@ namespace rptui aArgs[2].Name = PROPERTY_FONTCOLOR; aArgs[2].Value <<= (sal_uInt32)_aColor.GetColor(); - + // we use this way to create undo actions m_rController.executeUnChecked(_nCommandId,aArgs); m_aConditions[ _nCondIndex ]->updateToolbar(xReportControlFormat); - } + } catch( Exception& ) { DBG_UNHANDLED_EXCEPTION(); @@ -466,8 +466,8 @@ namespace rptui short nRet = ModalDialog::Execute(); if ( nRet == RET_OK ) { - const String sUndoAction( ModuleRes( RID_STR_UNDO_CONDITIONAL_FORMATTING ) ); - const UndoContext aUndoContext( m_rController.getUndoManager(), sUndoAction ); + String sUndoAction( ModuleRes( RID_STR_UNDO_CONDITIONAL_FORMATTING ) ); + UndoManagerListAction aListAction(*m_rController.getUndoMgr(),sUndoAction); try { sal_Int32 j(0), i(0);; @@ -500,7 +500,7 @@ namespace rptui m_xFormatConditions->removeByIndex(k); ::comphelper::copyProperties( m_xCopy.get(), m_xFormatConditions.get() ); - } + } catch ( const Exception& ) { DBG_UNHANDLED_EXCEPTION(); diff --git a/reportdesign/source/ui/dlg/CondFormat.hrc b/reportdesign/source/ui/dlg/CondFormat.hrc index 47091374dec8..3c3b2ad8de78 100644 --- a/reportdesign/source/ui/dlg/CondFormat.hrc +++ b/reportdesign/source/ui/dlg/CondFormat.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,7 +28,7 @@ #define RPTUI_CONDFORMAT_HRC #define CHECKBOX_HEIGHT 8 -#define FIXEDTEXT_WIDTH 60 +#define FIXEDTEXT_WIDTH 60 #define FIXEDTEXT_HEIGHT 8 #define EDIT_WIDTH 75 #define RELATED_CONTROLS 4 @@ -67,6 +67,8 @@ #define BTN_MOVE_DOWN 21 #define BTN_ADD_CONDITION 22 #define BTN_REMOVE_CONDITION 23 +#define IMG_MOVE_UP_HC 24 +#define IMG_MOVE_DOWN_HC 25 #define ROW_0_POS ( RELATED_CONTROLS ) #define ROW_0_HEIGTH ( FIXEDTEXT_HEIGHT ) diff --git a/reportdesign/source/ui/dlg/CondFormat.src b/reportdesign/source/ui/dlg/CondFormat.src index 2e5e352bcbde..58af87f8cc21 100644 --- a/reportdesign/source/ui/dlg/CondFormat.src +++ b/reportdesign/source/ui/dlg/CondFormat.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -110,7 +110,7 @@ Control WIN_CONDITION { Pos = MAP_APPFONT ( CONDITION_WIDTH - UNRELATED_CONTROLS - IMAGE_BUTTON_WIDTH, ROW_1_POS ) ; Size = MAP_APPFONT ( IMAGE_BUTTON_WIDTH, IMAGE_BUTTON_HEIGHT ) ; - TabStop = TRUE ; + TabStop = TRUE ; Symbol = IMAGEBUTTON_ARROW_UP ; }; @@ -118,7 +118,7 @@ Control WIN_CONDITION { Pos = MAP_APPFONT ( CONDITION_WIDTH - UNRELATED_CONTROLS - IMAGE_BUTTON_WIDTH, ROW_1_POS + IMAGE_BUTTON_HEIGHT + RELATED_CONTROLS ) ; Size = MAP_APPFONT ( IMAGE_BUTTON_WIDTH, IMAGE_BUTTON_HEIGHT ) ; - TabStop = TRUE ; + TabStop = TRUE ; Symbol = IMAGEBUTTON_ARROW_DOWN ; }; @@ -190,6 +190,16 @@ Control WIN_CONDITION Size = MAP_APPFONT( IMAGE_BUTTON_WIDTH, IMAGE_BUTTON_HEIGHT ); Text = "-"; }; + + Image IMG_MOVE_UP_HC + { + ImageBitmap = Bitmap { File = "arrow_move_up_hc" ; }; + }; + + Image IMG_MOVE_DOWN_HC + { + ImageBitmap = Bitmap { File = "arrow_move_down_hc" ; }; + }; }; ModalDialog RID_CONDFORMAT @@ -233,7 +243,7 @@ ModalDialog RID_CONDFORMAT HelpButton PB_HELP { - TabStop = TRUE ; + TabStop = TRUE ; Pos = MAP_APPFONT ( CONDITION_WIDTH - BUTTON_WIDTH - UNRELATED_CONTROLS, CONDITION_HEIGHT + 2*RELATED_CONTROLS + 1) ; Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ; Text [ en-US ] = "~Help"; @@ -276,28 +286,56 @@ ImageList IMG_CONDFORMAT_DLG_SC MASKCOLOR; FileList = { - < "res/commandimagelist/sc_bold.png" ; SID_ATTR_CHAR_WEIGHT ; > ; - < "res/commandimagelist/sc_italic.png" ; SID_ATTR_CHAR_POSTURE ; > ; - < "res/commandimagelist/sc_underline.png" ; SID_ATTR_CHAR_UNDERLINE ; > ; - < "res/commandimagelist/sc_backgroundcolor.png" ; SID_BACKGROUND_COLOR ; > ; - < "res/commandimagelist/sc_fontcolor.png" ; SID_ATTR_CHAR_COLOR2 ; > ; - < "res/commandimagelist/sc_fontdialog.png" ; SID_CHAR_DLG ; > ; + < "res/commandimagelist/sc_bold.png" ; SID_ATTR_CHAR_WEIGHT ; > ; + < "res/commandimagelist/sc_italic.png" ; SID_ATTR_CHAR_POSTURE ; > ; + < "res/commandimagelist/sc_underline.png" ; SID_ATTR_CHAR_UNDERLINE ; > ; + < "res/commandimagelist/sc_backgroundcolor.png" ; SID_BACKGROUND_COLOR ; > ; + < "res/commandimagelist/sc_fontcolor.png" ; SID_ATTR_CHAR_COLOR2 ; > ; + < "res/commandimagelist/sc_fontdialog.png" ; SID_CHAR_DLG ; > ; }; }; +ImageList IMG_CONDFORMAT_DLG_SCH +{ + MASKCOLOR; + FileList = + { + < "res/commandimagelist/sch_bold.png" ; SID_ATTR_CHAR_WEIGHT ; > ; + < "res/commandimagelist/sch_italic.png" ; SID_ATTR_CHAR_POSTURE ; > ; + < "res/commandimagelist/sch_underline.png" ; SID_ATTR_CHAR_UNDERLINE ; > ; + < "res/commandimagelist/sch_backgroundcolor.png" ; SID_BACKGROUND_COLOR ; > ; + < "res/commandimagelist/sch_fontcolor.png" ; SID_ATTR_CHAR_COLOR2 ; > ; + < "res/commandimagelist/sch_fontdialog.png" ; SID_CHAR_DLG ; > ; + }; +}; ImageList IMG_CONDFORMAT_DLG_LC { MASKCOLOR; FileList = { - < "res/commandimagelist/lc_bold.png" ; SID_ATTR_CHAR_WEIGHT ; > ; - < "res/commandimagelist/lc_italic.png" ; SID_ATTR_CHAR_POSTURE ; > ; - < "res/commandimagelist/lc_underline.png" ; SID_ATTR_CHAR_UNDERLINE ; > ; - < "res/commandimagelist/lc_backgroundcolor.png" ; SID_BACKGROUND_COLOR ; > ; - < "res/commandimagelist/lc_fontcolor.png" ; SID_ATTR_CHAR_COLOR2 ; > ; - < "res/commandimagelist/lc_fontdialog.png" ; SID_CHAR_DLG ; > ; + < "res/commandimagelist/lc_bold.png" ; SID_ATTR_CHAR_WEIGHT ; > ; + < "res/commandimagelist/lc_italic.png" ; SID_ATTR_CHAR_POSTURE ; > ; + < "res/commandimagelist/lc_underline.png" ; SID_ATTR_CHAR_UNDERLINE ; > ; + < "res/commandimagelist/lc_backgroundcolor.png" ; SID_BACKGROUND_COLOR ; > ; + < "res/commandimagelist/lc_fontcolor.png" ; SID_ATTR_CHAR_COLOR2 ; > ; + < "res/commandimagelist/lc_fontdialog.png" ; SID_CHAR_DLG ; > ; }; }; +ImageList IMG_CONDFORMAT_DLG_LCH +{ + MASKCOLOR; + FileList = + { + < "res/commandimagelist/lch_bold.png" ; SID_ATTR_CHAR_WEIGHT ; > ; + < "res/commandimagelist/lch_italic.png" ; SID_ATTR_CHAR_POSTURE ; > ; + < "res/commandimagelist/lch_underline.png" ; SID_ATTR_CHAR_UNDERLINE ; > ; + < "res/commandimagelist/lch_backgroundcolor.png" ; SID_BACKGROUND_COLOR ; > ; + < "res/commandimagelist/lch_fontcolor.png" ; SID_ATTR_CHAR_COLOR2 ; > ; + < "res/commandimagelist/lch_fontdialog.png" ; SID_CHAR_DLG ; > ; + }; +}; + + ImageList 31000 { @@ -350,9 +388,20 @@ ImageList IMG_ADDFIELD_DLG_SC MASKCOLOR; FileList = { - < "res/commandimagelist/sc_sortup.png" ; SID_FM_SORTUP ; > ; - < "res/commandimagelist/sc_sortdown.png" ; SID_FM_SORTDOWN ; > ; - < "res/commandimagelist/sc_removefiltersort.png" ; SID_FM_REMOVE_FILTER_SORT ; > ; + < "res/commandimagelist/sc_sortup.png" ; SID_FM_SORTUP ; > ; + < "res/commandimagelist/sc_sortdown.png" ; SID_FM_SORTDOWN ; > ; + < "res/commandimagelist/sc_removefiltersort.png" ; SID_FM_REMOVE_FILTER_SORT ; > ; + }; +}; + +ImageList IMG_ADDFIELD_DLG_SCH +{ + MASKCOLOR; + FileList = + { + < "res/commandimagelist/sch_sortup.png" ; SID_FM_SORTUP ; > ; + < "res/commandimagelist/sch_sortdown.png" ; SID_FM_SORTDOWN ; > ; + < "res/commandimagelist/sch_removefiltersort.png" ; SID_FM_REMOVE_FILTER_SORT ; > ; }; }; @@ -361,9 +410,20 @@ ImageList IMG_ADDFIELD_DLG_LC MASKCOLOR; FileList = { - < "res/commandimagelist/lc_sortup.png" ; SID_FM_SORTUP ; > ; - < "res/commandimagelist/lc_sortdown.png" ; SID_FM_SORTDOWN ; > ; - < "res/commandimagelist/lc_removefiltersort.png" ; SID_FM_REMOVE_FILTER_SORT ; > ; + < "res/commandimagelist/lc_sortup.png" ; SID_FM_SORTUP ; > ; + < "res/commandimagelist/lc_sortdown.png" ; SID_FM_SORTDOWN ; > ; + < "res/commandimagelist/lc_removefiltersort.png" ; SID_FM_REMOVE_FILTER_SORT ; > ; + }; +}; + +ImageList IMG_ADDFIELD_DLG_LCH +{ + MASKCOLOR; + FileList = + { + < "res/commandimagelist/lch_sortup.png" ; SID_FM_SORTUP ; > ; + < "res/commandimagelist/lch_sortdown.png" ; SID_FM_SORTDOWN ; > ; + < "res/commandimagelist/lch_removefiltersort.png" ; SID_FM_REMOVE_FILTER_SORT ; > ; }; }; @@ -374,7 +434,7 @@ FixedLine ADDFIELD_FL_HELP_SEPARATOR Size = MAP_APPFONT ( RELATED_CONTROLS , RELATED_CONTROLS ) ; Text [ en-US ] = "Help"; }; - + FixedText ADDFIELD_HELP_FIELD { SVLook = TRUE ; diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx index 3b979d9649a0..e56351ccb4e2 100644 --- a/reportdesign/source/ui/dlg/Condition.cxx +++ b/reportdesign/source/ui/dlg/Condition.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -72,7 +72,7 @@ ConditionField::ConditionField( Condition* _pParent, const ResId& _rResId ) : Ed { m_pSubEdit = new Edit(this,0); SetSubEdit(m_pSubEdit); - m_pSubEdit->EnableRTL( sal_False ); + m_pSubEdit->EnableRTL( FALSE ); m_pSubEdit->SetPosPixel( Point() ); m_aFormula.SetText(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("..."))); @@ -106,7 +106,7 @@ IMPL_LINK( ConditionField, OnFormula, Button*, /*_pClickedButton*/ ) { ReportFormula aFormula( sFormula ); sFormula = aFormula.getCompleteFormula(); - } + } // if ( nLen ) uno::Reference< awt::XWindow> xInspectorWindow = VCLUnoHelper::GetInterface(this); uno::Reference< beans::XPropertySet> xProp(m_pParent->getController().getRowSet(),uno::UNO_QUERY); if ( rptui::openDialogFormula_nothrow( sFormula, m_pParent->getController().getContext(),xInspectorWindow,xProp ) ) @@ -130,7 +130,7 @@ class OColorPopup : public FloatingWindow { DECL_LINK( SelectHdl, void * ); Condition* m_pCondition; - sal_uInt16 m_nSlotId; + USHORT m_nSlotId; public: OColorPopup(Window* _pParent,Condition* _pCondition); ValueSet m_aColorSet; @@ -139,7 +139,7 @@ public: virtual void Resize(); void StartSelection(); - void SetSlotId(sal_uInt16 _nSlotId); + void SetSlotId(USHORT _nSlotId); }; // ----------------------------------------------------------------------------- OColorPopup::OColorPopup(Window* _pParent,Condition* _pCondition) @@ -205,22 +205,22 @@ void OColorPopup::StartSelection() m_aColorSet.StartSelection(); } // ----------------------------------------------------------------------------- -void OColorPopup::SetSlotId(sal_uInt16 _nSlotId) +void OColorPopup::SetSlotId(USHORT _nSlotId) { m_nSlotId = _nSlotId; if ( SID_ATTR_CHAR_COLOR_BACKGROUND == _nSlotId || SID_BACKGROUND_COLOR == _nSlotId ) { m_aColorSet.SetStyle( m_aColorSet.GetStyle() | WB_NONEFIELD ); m_aColorSet.SetText( String(ModuleRes( STR_TRANSPARENT )) ); - } + } // if ( SID_ATTR_CHAR_COLOR_BACKGROUND == theSlotId || SID_BACKGROUND_COLOR == theSlotId ) } // ----------------------------------------------------------------------------- IMPL_LINK( OColorPopup, SelectHdl, void *, EMPTYARG ) { - sal_uInt16 nItemId = m_aColorSet.GetSelectItemId(); + USHORT nItemId = m_aColorSet.GetSelectItemId(); Color aColor( nItemId == 0 ? Color( COL_TRANSPARENT ) : m_aColorSet.GetItemColor( nItemId ) ); - /* #i33380# Moved the following line above the Dispatch() calls. + /* #i33380# DR 2004-09-03 Moved the following line above the Dispatch() calls. This instance may be deleted in the meantime (i.e. when a dialog is opened while in Dispatch()), accessing members will crash in this case. */ m_aColorSet.SetNoSelection(); @@ -259,6 +259,9 @@ Condition::Condition( Window* _pParent, IConditionalFormatAction& _rAction, ::rp ,m_nLastKnownWindowWidth( -1 ) ,m_bInDestruction( false ) { + m_aMoveUp.SetModeImage( ModuleRes( IMG_MOVE_UP_HC ), BMP_COLOR_HIGHCONTRAST ); + m_aMoveDown.SetModeImage( ModuleRes( IMG_MOVE_DOWN_HC ), BMP_COLOR_HIGHCONTRAST ); + FreeResource(); m_aActions.SetStyle(m_aActions.GetStyle()|WB_LINESPACING); m_aCondLHS.GrabFocus(); @@ -328,11 +331,11 @@ Condition::~Condition() // ----------------------------------------------------------------------------- IMPL_LINK( Condition, DropdownClick, ToolBox*, /*pToolBar*/ ) { - sal_uInt16 nId( m_aActions.GetCurItemId() ); + USHORT nId( m_aActions.GetCurItemId() ); if ( !m_pColorFloat ) m_pColorFloat = new OColorPopup(&m_aActions,this); - sal_uInt16 nTextId = 0; + USHORT nTextId = 0; switch(nId) { case SID_ATTR_CHAR_COLOR2: @@ -343,7 +346,7 @@ IMPL_LINK( Condition, DropdownClick, ToolBox*, /*pToolBar*/ ) break; default: break; - } + } // switch(nId) if ( nTextId ) m_pColorFloat->SetText(String(ModuleRes(nTextId))); m_pColorFloat->SetSlotId(nId); @@ -376,7 +379,7 @@ IMPL_LINK( Condition, OnConditionAction, Button*, _pClickedButton ) } //------------------------------------------------------------------------------ -void Condition::ApplyCommand( sal_uInt16 _nCommandId, const ::Color& _rColor) +void Condition::ApplyCommand( USHORT _nCommandId, const ::Color& _rColor) { if ( _nCommandId == SID_ATTR_CHAR_COLOR2 ) m_pBtnUpdaterFontColor->Update( _rColor ); @@ -386,12 +389,16 @@ void Condition::ApplyCommand( sal_uInt16 _nCommandId, const ::Color& _rColor) m_rAction.applyCommand( m_nCondIndex, _nCommandId, _rColor ); } //------------------------------------------------------------------------------ -ImageList Condition::getImageList(sal_Int16 _eBitmapSet) const +ImageList Condition::getImageList(sal_Int16 _eBitmapSet,sal_Bool _bHiContast) const { sal_Int16 nN = IMG_CONDFORMAT_DLG_SC; + sal_Int16 nH = IMG_CONDFORMAT_DLG_SCH; if ( _eBitmapSet == SFX_SYMBOLS_SIZE_LARGE ) + { nN = IMG_CONDFORMAT_DLG_LC; - return ImageList(ModuleRes(nN)); + nH = IMG_CONDFORMAT_DLG_LCH; + } + return ImageList(ModuleRes( _bHiContast ? nH : nN )); } //------------------------------------------------------------------ void Condition::resizeControls(const Size& _rDiff) @@ -399,6 +406,7 @@ void Condition::resizeControls(const Size& _rDiff) // we use large images so we must change them if ( _rDiff.Width() || _rDiff.Height() ) { + Point aPos = LogicToPixel( Point( 2*RELATED_CONTROLS , 0), MAP_APPFONT ); Invalidate(); } } @@ -426,6 +434,7 @@ void Condition::StateChanged( StateChangedType nType ) { // The physical toolbar changed its outlook and shows another logical toolbar! // We have to set the correct high contrast mode on the new tbx manager. + // pMgr->SetHiContrast( IsHiContrastMode() ); checkImageList(); } } @@ -623,8 +632,8 @@ void Condition::impl_setCondition( const ::rtl::OUString& _rConditionFormula ) } // update UI - m_aConditionType.SelectEntryPos( (sal_uInt16)eType ); - m_aOperationList.SelectEntryPos( (sal_uInt16)eOperation ); + m_aConditionType.SelectEntryPos( (USHORT)eType ); + m_aOperationList.SelectEntryPos( (USHORT)eOperation ); m_aCondLHS.SetText( sLHS ); m_aCondRHS.SetText( sRHS ); @@ -659,10 +668,10 @@ void Condition::updateToolbar(const uno::Reference< report::XReportControlFormat OSL_ENSURE(_xReportControlFormat.is(),"XReportControlFormat is NULL!"); if ( _xReportControlFormat.is() ) { - sal_uInt16 nItemCount = m_aActions.GetItemCount(); - for (sal_uInt16 j = 0; j< nItemCount; ++j) + USHORT nItemCount = m_aActions.GetItemCount(); + for (USHORT j = 0; j< nItemCount; ++j) { - sal_uInt16 nItemId = m_aActions.GetItemId(j); + USHORT nItemId = m_aActions.GetItemId(j); m_aActions.CheckItem( nItemId, m_rController.isFormatCommandEnabled( nItemId, _xReportControlFormat ) ); } diff --git a/reportdesign/source/ui/dlg/Condition.hxx b/reportdesign/source/ui/dlg/Condition.hxx index aa34d461fc46..d1b77c83f71c 100644 --- a/reportdesign/source/ui/dlg/Condition.hxx +++ b/reportdesign/source/ui/dlg/Condition.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -94,8 +94,8 @@ namespace rptui ::svx::ToolboxButtonColorUpdater* m_pBtnUpdaterFontColor; // updates the color below the toolbar icon ::svx::ToolboxButtonColorUpdater* m_pBtnUpdaterBackgroundColor; - - + + size_t m_nCondIndex; long m_nLastKnownWindowWidth; bool m_bInDestruction; @@ -113,8 +113,10 @@ namespace rptui /** will be called when the id of the image list is needed. @param _eBitmapSet <svtools/imgdef.hxx> + @param _bHiContast + <TRUE/> when in high contrast mode. */ - virtual ImageList getImageList(sal_Int16 _eBitmapSet) const; + virtual ImageList getImageList(sal_Int16 _eBitmapSet,sal_Bool _bHiContast) const; /** will be called when the controls need to be resized. */ @@ -147,7 +149,7 @@ namespace rptui /** forward to the parent class */ - void ApplyCommand(sal_uInt16 _nCommandId, const ::Color& _aColor ); + void ApplyCommand(USHORT _nCommandId, const ::Color& _aColor ); inline ::rptui::OReportController& getController() const { return m_rController; } diff --git a/reportdesign/source/ui/dlg/DateTime.cxx b/reportdesign/source/ui/dlg/DateTime.cxx index 4a817deab842..f6d24cc70590 100644 --- a/reportdesign/source/ui/dlg/DateTime.cxx +++ b/reportdesign/source/ui/dlg/DateTime.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -65,17 +65,17 @@ ODateTimeDialog::ODateTimeDialog( Window* _pParent ,const uno::Reference< report::XSection >& _xHoldAlive ,OReportController* _pController) : ModalDialog( _pParent, ModuleRes(RID_DATETIME_DLG) ) - ,m_aDate(this, ModuleRes(CB_DATE ) ) - ,m_aFTDateFormat(this, ModuleRes(FT_DATE_FORMAT ) ) - ,m_aDateListBox(this, ModuleRes(LB_DATE_TYPE ) ) - ,m_aFL0(this, ModuleRes(FL_SEPARATOR0 ) ) - ,m_aTime(this, ModuleRes(CB_TIME ) ) - ,m_aFTTimeFormat(this, ModuleRes(FT_TIME_FORMAT ) ) - ,m_aTimeListBox(this, ModuleRes(LB_TIME_TYPE ) ) + ,m_aDate(this, ModuleRes(CB_DATE ) ) + ,m_aFTDateFormat(this, ModuleRes(FT_DATE_FORMAT ) ) + ,m_aDateListBox(this, ModuleRes(LB_DATE_TYPE ) ) + ,m_aFL0(this, ModuleRes(FL_SEPARATOR0 ) ) + ,m_aTime(this, ModuleRes(CB_TIME ) ) + ,m_aFTTimeFormat(this, ModuleRes(FT_TIME_FORMAT ) ) + ,m_aTimeListBox(this, ModuleRes(LB_TIME_TYPE ) ) ,m_aFL1(this, ModuleRes(FL_SEPARATOR1) ) - ,m_aPB_OK(this, ModuleRes(PB_OK)) - ,m_aPB_CANCEL(this, ModuleRes(PB_CANCEL)) - ,m_aPB_Help(this, ModuleRes(PB_HELP)) + ,m_aPB_OK(this, ModuleRes(PB_OK)) + ,m_aPB_CANCEL(this, ModuleRes(PB_CANCEL)) + ,m_aPB_Help(this, ModuleRes(PB_HELP)) ,m_aDateControlling() ,m_aTimeControlling() ,m_pController(_pController) @@ -118,7 +118,7 @@ ODateTimeDialog::ODateTimeDialog( Window* _pParent ListBox* pListBox = &m_aDateListBox; if ( bTime ) pListBox = &m_aTimeListBox; - + const uno::Reference< util::XNumberFormatter> xNumberFormatter = m_pController->getReportNumberFormatter(); const uno::Reference< util::XNumberFormats> xFormats = xNumberFormatter->getNumberFormatsSupplier()->getNumberFormats(); const uno::Sequence<sal_Int32> aFormatKeys = xFormats->queryKeys(_nNumberFormatId,m_nLocale,sal_True); @@ -133,7 +133,7 @@ ODateTimeDialog::ODateTimeDialog( Window* _pParent //------------------------------------------------------------------------ ODateTimeDialog::~ODateTimeDialog() { - DBG_DTOR( rpt_ODateTimeDialog,NULL); + DBG_DTOR( rpt_ODateTimeDialog,NULL); } // ----------------------------------------------------------------------------- short ODateTimeDialog::Execute() @@ -241,10 +241,12 @@ sal_Int32 ODateTimeDialog::getFormatKey(sal_Bool _bDate) const sal_Int32 nFormatKey; if ( _bDate ) { + // nFormat = m_aDateF1.IsChecked() ? i18n::NumberFormatIndex::DATE_SYSTEM_LONG : (m_aDateF2.IsChecked() ? i18n::NumberFormatIndex::DATE_SYS_DMMMYYYY : i18n::NumberFormatIndex::DATE_SYSTEM_SHORT); nFormatKey = static_cast<sal_Int32>(reinterpret_cast<sal_IntPtr>(m_aDateListBox.GetEntryData( m_aDateListBox.GetSelectEntryPos() ))); } else { + // nFormat = m_aTimeF1.IsChecked() ? i18n::NumberFormatIndex::TIME_HHMMSS : (m_aTimeF2.IsChecked() ? i18n::NumberFormatIndex::TIME_HHMMSSAMPM : i18n::NumberFormatIndex::TIME_HHMM); nFormatKey = static_cast<sal_Int32>(reinterpret_cast<sal_IntPtr>(m_aTimeListBox.GetEntryData( m_aTimeListBox.GetSelectEntryPos() ))); } return nFormatKey; diff --git a/reportdesign/source/ui/dlg/DateTime.hrc b/reportdesign/source/ui/dlg/DateTime.hrc index 02a421f10c18..44d6eb6fe0ed 100644 --- a/reportdesign/source/ui/dlg/DateTime.hrc +++ b/reportdesign/source/ui/dlg/DateTime.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,29 +27,29 @@ #ifndef RPTUI_DATETIME_HRC #define RPTUI_DATETIME_HRC -#define CB_DATE (1) +#define CB_DATE (1) #define FT_DATE_FORMAT (2) -#define LB_DATE_TYPE (3) -#define FL_SEPARATOR0 (4) -#define CB_TIME (5) +#define LB_DATE_TYPE (3) +#define FL_SEPARATOR0 (4) +#define CB_TIME (5) #define FT_TIME_FORMAT (6) -#define LB_TIME_TYPE (7) -#define FL_SEPARATOR1 (8) -#define PB_OK (9) -#define PB_CANCEL (10) -#define PB_HELP (11) +#define LB_TIME_TYPE (7) +#define FL_SEPARATOR1 (8) +#define PB_OK (9) +#define PB_CANCEL (10) +#define PB_HELP (11) -#define CHECKBOX_HEIGHT 8 -#define FIXEDTEXT_HEIGHT 8 -#define RELATED_CONTROLS 4 -#define UNRELATED_CONTROLS 7 -#define EDIT_HEIGHT 12 +#define CHECKBOX_HEIGHT 8 +#define FIXEDTEXT_HEIGHT 8 +#define RELATED_CONTROLS 4 +#define UNRELATED_CONTROLS 7 +#define EDIT_HEIGHT 12 #define LISTBOX_HEIGHT 12 -#define BUTTON_HEIGHT 14 -#define BUTTON_WIDTH 50 -#define BROWSER_HEIGHT 75 -#define PAGE_WIDTH (RELATED_CONTROLS + 3*UNRELATED_CONTROLS + 3*BUTTON_WIDTH) -#define PAGE_HEIGHT (2*RELATED_CONTROLS + 6*UNRELATED_CONTROLS + 2*CHECKBOX_HEIGHT + 2*LISTBOX_HEIGHT + BUTTON_HEIGHT) -#define LISTBOX_WIDTH PAGE_WIDTH - 3*UNRELATED_CONTROLS - FIXEDTEXT_WIDTH +#define BUTTON_HEIGHT 14 +#define BUTTON_WIDTH 50 +#define BROWSER_HEIGHT 75 +#define PAGE_WIDTH (RELATED_CONTROLS + 3*UNRELATED_CONTROLS + 3*BUTTON_WIDTH) +#define PAGE_HEIGHT (2*RELATED_CONTROLS + 6*UNRELATED_CONTROLS + 2*CHECKBOX_HEIGHT + 2*LISTBOX_HEIGHT + BUTTON_HEIGHT) +#define LISTBOX_WIDTH PAGE_WIDTH - 3*UNRELATED_CONTROLS - FIXEDTEXT_WIDTH #endif // RPTUI_DATETIME_HRC diff --git a/reportdesign/source/ui/dlg/DateTime.src b/reportdesign/source/ui/dlg/DateTime.src index e9378da1725c..2c391d666572 100644 --- a/reportdesign/source/ui/dlg/DateTime.src +++ b/reportdesign/source/ui/dlg/DateTime.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,16 +44,15 @@ ModalDialog RID_DATETIME_DLG HelpId = HID_RPT_DATETIME_DLG; Moveable = TRUE ; Closeable = TRUE ; - + CheckBox CB_DATE { - HelpID = "reportdesign:CheckBox:RID_DATETIME_DLG:CB_DATE"; Pos = MAP_APPFONT ( UNRELATED_CONTROLS , RELATED_CONTROLS /* + UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT */) ; Size = MAP_APPFONT ( PAGE_WIDTH - 2*UNRELATED_CONTROLS, FIXEDTEXT_HEIGHT ) ; Check = TRUE; Text [ en-US ] = "Include Date"; }; - + FixedText FT_DATE_FORMAT { Pos = MAP_APPFONT ( RELATED_CONTROLS + 2*UNRELATED_CONTROLS, RELATED_CONTROLS + UNRELATED_CONTROLS + CHECKBOX_HEIGHT ); @@ -63,7 +62,6 @@ ModalDialog RID_DATETIME_DLG ListBox LB_DATE_TYPE { - HelpID = "reportdesign:ListBox:RID_DATETIME_DLG:LB_DATE_TYPE"; Pos = MAP_APPFONT ( 2 * UNRELATED_CONTROLS + BUTTON_WIDTH, RELATED_CONTROLS + UNRELATED_CONTROLS + CHECKBOX_HEIGHT) ; Size = MAP_APPFONT( PAGE_WIDTH - 3*UNRELATED_CONTROLS - BUTTON_WIDTH, 60 ); Border = TRUE; @@ -76,17 +74,16 @@ ModalDialog RID_DATETIME_DLG { Pos = MAP_APPFONT ( RELATED_CONTROLS , RELATED_CONTROLS + 2*UNRELATED_CONTROLS + CHECKBOX_HEIGHT + LISTBOX_HEIGHT) ; Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , 1 ) ; + // Text [ en-US ] = "Time"; }; - CheckBox CB_TIME { - HelpID = "reportdesign:CheckBox:RID_DATETIME_DLG:CB_TIME"; Pos = MAP_APPFONT ( UNRELATED_CONTROLS, RELATED_CONTROLS + 3*UNRELATED_CONTROLS + CHECKBOX_HEIGHT + LISTBOX_HEIGHT) ; Size = MAP_APPFONT ( PAGE_WIDTH - 2*UNRELATED_CONTROLS, FIXEDTEXT_HEIGHT ) ; Check = TRUE; Text [ en-US ] = "Include Time"; }; - + FixedText FT_TIME_FORMAT { Pos = MAP_APPFONT ( RELATED_CONTROLS + 2*UNRELATED_CONTROLS, RELATED_CONTROLS + 4*UNRELATED_CONTROLS + 2*CHECKBOX_HEIGHT + LISTBOX_HEIGHT); @@ -96,7 +93,6 @@ ModalDialog RID_DATETIME_DLG ListBox LB_TIME_TYPE { - HelpID = "reportdesign:ListBox:RID_DATETIME_DLG:LB_TIME_TYPE"; Pos = MAP_APPFONT ( 2 * UNRELATED_CONTROLS + BUTTON_WIDTH, RELATED_CONTROLS + 4*UNRELATED_CONTROLS + 2*CHECKBOX_HEIGHT + LISTBOX_HEIGHT) ; Size = MAP_APPFONT( PAGE_WIDTH - 3*UNRELATED_CONTROLS - BUTTON_WIDTH, 60 ); Border = TRUE; @@ -104,13 +100,11 @@ ModalDialog RID_DATETIME_DLG TabStop = TRUE; Sort = FALSE; }; - FixedLine FL_SEPARATOR1 { Pos = MAP_APPFONT ( RELATED_CONTROLS , RELATED_CONTROLS + 5*UNRELATED_CONTROLS + 2*CHECKBOX_HEIGHT + 2*LISTBOX_HEIGHT) ; Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , 1 ) ; }; - OKButton PB_OK { Pos = MAP_APPFONT ( UNRELATED_CONTROLS, RELATED_CONTROLS + 6*UNRELATED_CONTROLS + 2*CHECKBOX_HEIGHT + 2*LISTBOX_HEIGHT +1) ; @@ -118,17 +112,15 @@ ModalDialog RID_DATETIME_DLG TabStop = TRUE ; DefButton = TRUE ; }; - CancelButton PB_CANCEL { Pos = MAP_APPFONT ( RELATED_CONTROLS + UNRELATED_CONTROLS + BUTTON_WIDTH , RELATED_CONTROLS + 6*UNRELATED_CONTROLS + 2*CHECKBOX_HEIGHT + 2*LISTBOX_HEIGHT +1) ; Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ; TabStop = TRUE ; }; - HelpButton PB_HELP { - TabStop = TRUE ; + TabStop = TRUE ; Pos = MAP_APPFONT ( RELATED_CONTROLS + 2*UNRELATED_CONTROLS + 2*BUTTON_WIDTH , RELATED_CONTROLS + 6*UNRELATED_CONTROLS + 2*CHECKBOX_HEIGHT + 2*LISTBOX_HEIGHT +1) ; Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ; Text [ en-US ] = "~Help"; diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx index f86c2cec1521..d18105d9422f 100644 --- a/reportdesign/source/ui/dlg/Formula.cxx +++ b/reportdesign/source/ui/dlg/Formula.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,9 +52,9 @@ namespace rptui using namespace formula; using namespace ::com::sun::star; -// -------------------------------------------------------------------------- -// Initialisierung / gemeinsame Funktionen fuer Dialog -// -------------------------------------------------------------------------- +// -------------------------------------------------------------------------- +// Initialisierung / gemeinsame Funktionen fuer Dialog +// -------------------------------------------------------------------------- FormulaDialog::FormulaDialog(Window* pParent , const uno::Reference<lang::XMultiServiceFactory>& _xServiceFactory @@ -100,7 +100,7 @@ FormulaDialog::~FormulaDialog() { if ( m_pAddField ) { - SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromAscii( HID_RPT_FIELD_SEL_WIN ) ); + SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromInt32( HID_RPT_FIELD_SEL_WIN ) ); aDlgOpt.SetWindowState( ::rtl::OUString::createFromAscii( m_pAddField->GetWindowState((WINDOWSTATE_MASK_X | WINDOWSTATE_MASK_Y | WINDOWSTATE_MASK_STATE | WINDOWSTATE_MASK_MINIMIZED)).GetBuffer() ) ); ::std::auto_ptr<Window> aTemp2(m_pAddField); @@ -108,28 +108,28 @@ FormulaDialog::~FormulaDialog() } } -// -------------------------------------------------------------------------- -// Funktionen fuer rechte Seite -// -------------------------------------------------------------------------- +// -------------------------------------------------------------------------- +// Funktionen fuer rechte Seite +// -------------------------------------------------------------------------- bool FormulaDialog::calculateValue( const String& rStrExp, String& rStrResult ) { rStrResult = rStrExp; return false; } -void FormulaDialog::doClose(sal_Bool _bOk) +void FormulaDialog::doClose(BOOL _bOk) { EndDialog(_bOk ? RET_OK : RET_CANCEL); } -void FormulaDialog::insertEntryToLRUList(const IFunctionDescription* /*_pDesc*/) +void FormulaDialog::insertEntryToLRUList(const IFunctionDescription* /*_pDesc*/) { } void FormulaDialog::showReference(const String& /*_sFormula*/) { } -void FormulaDialog::dispatch(sal_Bool /*_bOK*/,sal_Bool /*_bMartixChecked*/) +void FormulaDialog::dispatch(BOOL /*_bOK*/,BOOL /*_bMartixChecked*/) { } -void FormulaDialog::setDispatcherLock( sal_Bool /*bLock*/ ) +void FormulaDialog::setDispatcherLock( BOOL /*bLock*/ ) { } void FormulaDialog::setReferenceInput(const FormEditData* /*_pData*/) @@ -189,7 +189,7 @@ void FormulaDialog::ShowReference(const String& /*_sRef*/) { } // ----------------------------------------------------------------------------- -void FormulaDialog::HideReference( sal_Bool /*bDoneRefMode*/) +void FormulaDialog::HideReference( BOOL /*bDoneRefMode*/) { } // ----------------------------------------------------------------------------- @@ -210,7 +210,7 @@ void FormulaDialog::ToggleCollapsed( RefEdit* _pEdit, RefButton* _pButton) { m_pAddField = new OAddFieldWindow(this,m_xRowSet); m_pAddField->SetCreateHdl(LINK( this, FormulaDialog, OnClickHdl ) ); - SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromAscii( HID_RPT_FIELD_SEL_WIN ) ); + SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromInt32( HID_RPT_FIELD_SEL_WIN ) ); if ( aDlgOpt.Exists() ) { m_pAddField->SetWindowState( ByteString( aDlgOpt.GetWindowState().getStr(), RTL_TEXTENCODING_ASCII_US ) ); @@ -218,7 +218,7 @@ void FormulaDialog::ToggleCollapsed( RefEdit* _pEdit, RefButton* _pButton) } m_pAddField->Update(); - } + } // if ( !m_pAddField ) RefInputStartAfter( aPair.second, aPair.first ); m_pAddField->Show(); @@ -240,10 +240,10 @@ IMPL_LINK( FormulaDialog, OnClickHdl, OAddFieldWindow* ,_pAddFieldDlg) sName = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("[")) + sName + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("]")); m_pEdit->SetText(sName); } - } + } // if ( m_pEdit && aArgs.getLength() ) m_pEdit = NULL; _pAddFieldDlg->Hide(); - RefInputDoneAfter( sal_True ); + RefInputDoneAfter( TRUE ); return 0L; } diff --git a/reportdesign/source/ui/dlg/GroupExchange.cxx b/reportdesign/source/ui/dlg/GroupExchange.cxx index 7f6720fd68ec..0cb97b5bd365 100644 --- a/reportdesign/source/ui/dlg/GroupExchange.cxx +++ b/reportdesign/source/ui/dlg/GroupExchange.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,7 +61,7 @@ namespace rptui // ----------------------------------------------------------------------------- sal_Bool OGroupExchange::GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) { - sal_uLong nFormat = SotExchange::GetFormat(rFlavor); + ULONG nFormat = SotExchange::GetFormat(rFlavor); if(nFormat == OGroupExchange::getReportGroupId() ) { return SetAny(uno::makeAny(m_aGroupRow),rFlavor); diff --git a/reportdesign/source/ui/dlg/GroupExchange.hxx b/reportdesign/source/ui/dlg/GroupExchange.hxx index f46304d897ba..5b08638227bb 100644 --- a/reportdesign/source/ui/dlg/GroupExchange.hxx +++ b/reportdesign/source/ui/dlg/GroupExchange.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,9 +45,9 @@ namespace rptui static sal_uInt32 getReportGroupId(); protected: - virtual void AddSupportedFormats(); - virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - virtual void ObjectReleased(); + virtual void AddSupportedFormats(); + virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + virtual void ObjectReleased(); }; } #endif // RPTUI_GROUP_EXCHANGE_HXX diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx index f8470a6b6002..8996e0f62f0c 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.cxx +++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx @@ -62,9 +62,9 @@ #include <cppuhelper/bootstrap.hxx> -#define HANDLE_ID 0 -#define FIELD_EXPRESSION 1 -#define GROUPS_START_LEN 5 +#define HANDLE_ID 0 +#define FIELD_EXPRESSION 1 +#define GROUPS_START_LEN 5 #define NO_GROUP -1 namespace rptui @@ -100,16 +100,17 @@ class OFieldExpressionControl : public TContainerListenerBase ::osl::Mutex m_aMutex; ::std::vector<sal_Int32> m_aGroupPositions; ::std::vector<ColumnInfo> m_aColumnInfo; - ::svt::ComboBoxControl* m_pComboCell; - sal_Int32 m_nDataPos; - sal_Int32 m_nCurrentPos; - sal_uLong m_nPasteEvent; - sal_uLong m_nDeleteEvent; - OGroupsSortingDialog* m_pParent; + ::svt::ComboBoxControl* m_pComboCell; + sal_Int32 m_nDataPos; + sal_Int32 m_nCurrentPos; + ULONG m_nPasteEvent; + ULONG m_nDeleteEvent; + OGroupsSortingDialog* m_pParent; bool m_bIgnoreEvent; - void fillListBox(const uno::Reference< beans::XPropertySet>& _xDest,long nRow,sal_uInt16 nColumnId); - sal_Bool SaveModified(bool _bAppend); + + void fillListBox(const uno::Reference< beans::XPropertySet>& _xDest,long nRow,USHORT nColumnId); + BOOL SaveModified(bool _bAppend); OFieldExpressionControl(const OFieldExpressionControl&); // NO COPY void operator =(const OFieldExpressionControl&); // NO ASSIGN @@ -124,17 +125,18 @@ public: virtual void SAL_CALL elementReplaced(const ::com::sun::star::container::ContainerEvent& rEvent) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL elementRemoved(const ::com::sun::star::container::ContainerEvent& rEvent) throw(::com::sun::star::uno::RuntimeException); - void fillColumns(const uno::Reference< container::XNameAccess>& _xColumns); - void lateInit(); - sal_Bool IsDeleteAllowed( ); - void DeleteRows(); - void cut(); - void copy(); - void paste(); + void fillColumns(const uno::Reference< container::XNameAccess>& _xColumns); + void lateInit(); + sal_Bool IsDeleteAllowed( ); + void DeleteRows(); + void cut(); + void copy(); + void paste(); inline sal_Int32 getGroupPosition(sal_Int32 _nRow) const { return _nRow != BROWSER_ENDOFSELECTION ? m_aGroupPositions[_nRow] : sal_Int32(NO_GROUP); } - inline ::svt::ComboBoxControl* getExpressionControl() const { return m_pComboCell; } + inline ::svt::ComboBoxControl* getExpressionControl() const { return m_pComboCell; } + /** returns the sequence with the selected groups */ @@ -144,24 +146,25 @@ public: */ void moveGroups(const uno::Sequence<uno::Any>& _aGroups,sal_Int32 _nRow,sal_Bool _bSelect = sal_True); - virtual sal_Bool CursorMoving(long nNewRow, sal_uInt16 nNewCol); + virtual BOOL CursorMoving(long nNewRow, USHORT nNewCol); using OFieldExpressionControl_Base::GetRowCount; protected: - virtual sal_Bool IsTabAllowed(sal_Bool bForward) const; - - virtual void InitController( ::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol ); - virtual ::svt::CellController* GetController( long nRow, sal_uInt16 nCol ); - virtual void PaintCell( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColId ) const; - virtual sal_Bool SeekRow( long nRow ); - virtual sal_Bool SaveModified(); - virtual String GetCellText( long nRow, sal_uInt16 nColId ) const; + virtual BOOL IsTabAllowed(BOOL bForward) const; + + + virtual void InitController( ::svt::CellControllerRef& rController, long nRow, USHORT nCol ); + virtual ::svt::CellController* GetController( long nRow, USHORT nCol ); + virtual void PaintCell( OutputDevice& rDev, const Rectangle& rRect, USHORT nColId ) const; + virtual BOOL SeekRow( long nRow ); + virtual BOOL SaveModified(); + virtual String GetCellText( long nRow, USHORT nColId ) const; virtual RowStatus GetRowStatus(long nRow) const; virtual void KeyInput(const KeyEvent& rEvt); virtual void Command( const CommandEvent& rEvt ); // D&D - virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); + virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); virtual sal_Int8 AcceptDrop( const BrowserAcceptDropEvent& rEvt ); virtual sal_Int8 ExecuteDrop( const BrowserExecuteDropEvent& rEvt ); @@ -243,12 +246,12 @@ uno::Sequence<uno::Any> OFieldExpressionControl::fillSelectedGroups() } catch(uno::Exception&) { - OSL_FAIL("Can not access group!"); + OSL_ENSURE(0,"Can not access group!"); } } if ( !vClipboardList.empty() ) aList = uno::Sequence< uno::Any >(&vClipboardList[0], vClipboardList.size()); - } + } // if ( nCount > 1 ) return aList; } //------------------------------------------------------------------------------ @@ -264,7 +267,7 @@ void OFieldExpressionControl::StartDrag( sal_Int8 /*_nAction*/ , const Point& /* OGroupExchange* pData = new OGroupExchange(aClipboardList); uno::Reference< ::com::sun::star::datatransfer::XTransferable> xRef = pData; pData->StartDrag(this, DND_ACTION_MOVE ); - } + } // if(!vClipboardList.empty()) } } //------------------------------------------------------------------------------ @@ -274,7 +277,7 @@ sal_Int8 OFieldExpressionControl::AcceptDrop( const BrowserAcceptDropEvent& rEvt sal_Int8 nAction = DND_ACTION_NONE; if ( IsEditing() ) { - sal_uInt16 nPos = m_pComboCell->GetSelectEntryPos(); + USHORT nPos = m_pComboCell->GetSelectEntryPos(); if ( COMBOBOX_ENTRY_NOTFOUND != nPos || m_pComboCell->GetText().Len() ) SaveModified(); DeactivateCell(); @@ -292,7 +295,7 @@ sal_Int8 OFieldExpressionControl::ExecuteDrop( const BrowserExecuteDropEvent& rE sal_Int8 nAction = DND_ACTION_NONE; if ( IsDropFormatSupported( OGroupExchange::getReportGroupId() ) ) { - sal_Int32 nRow = GetRowAtYPosPixel(rEvt.maPosPixel.Y(), sal_False); + sal_Int32 nRow = GetRowAtYPosPixel(rEvt.maPosPixel.Y(), sal_False); SetNoSelection(); TransferableDataHelper aDropped( rEvt.maDropEvent.Transferable ); @@ -315,8 +318,8 @@ void OFieldExpressionControl::moveGroups(const uno::Sequence<uno::Any>& _aGroups m_bIgnoreEvent = true; { sal_Int32 nRow = _nRow; - const String sUndoAction(ModuleRes(RID_STR_UNDO_MOVE_GROUP)); - const UndoContext aUndoContext( m_pParent->m_pController->getUndoManager(), sUndoAction ); + String sUndoAction(ModuleRes(RID_STR_UNDO_MOVE_GROUP)); + UndoManagerListAction aListAction(*m_pParent->m_pController->getUndoMgr(),sUndoAction); uno::Reference< report::XGroups> xGroups = m_pParent->getGroups(); const uno::Any* pIter = _aGroups.getConstArray(); @@ -341,11 +344,11 @@ void OFieldExpressionControl::moveGroups(const uno::Sequence<uno::Any>& _aGroups m_pParent->m_pController->executeChecked(SID_GROUP_APPEND,aArgs); ++nRow; } - } + } // for(;pIter != pEnd;++pIter) } m_bIgnoreEvent = false; Invalidate(); - } + } // if ( _aGroups.getLength() ) } // ----------------------------------------------------------------------------- void OFieldExpressionControl::fillColumns(const uno::Reference< container::XNameAccess>& _xColumns) @@ -375,7 +378,7 @@ void OFieldExpressionControl::lateInit() aFont.SetWeight( WEIGHT_LIGHT ); SetFont(aFont); - InsertHandleColumn(static_cast<sal_uInt16>(GetTextWidth('0') * 4)/*, sal_True */); + InsertHandleColumn(static_cast<USHORT>(GetTextWidth('0') * 4)/*, TRUE */); InsertDataColumn( FIELD_EXPRESSION, String(ModuleRes(STR_RPT_EXPRESSION)), 100); m_pComboCell = new ComboBoxControl( &GetDataWindow() ); @@ -391,8 +394,8 @@ void OFieldExpressionControl::lateInit() ////////////////////////////////////////////////////////////////////// // set browse mode - BrowserMode nMode(BROWSER_COLUMNSELECTION | BROWSER_MULTISELECTION | BROWSER_KEEPSELECTION | - BROWSER_HLINESFULL | BROWSER_VLINESFULL | BROWSER_AUTOSIZE_LASTCOL | BROWSER_AUTO_VSCROLL | BROWSER_AUTO_HSCROLL); + BrowserMode nMode(BROWSER_COLUMNSELECTION | BROWSER_MULTISELECTION | BROWSER_KEEPSELECTION | + BROWSER_HLINESFULL | BROWSER_VLINESFULL | BROWSER_AUTOSIZE_LASTCOL | BROWSER_AUTO_VSCROLL | BROWSER_AUTO_HSCROLL); if( m_pParent->isReadOnly() ) nMode |= BROWSER_HIDECURSOR; SetMode(nMode); @@ -402,7 +405,7 @@ void OFieldExpressionControl::lateInit() // not the first call RowRemoved(0, GetRowCount()); - RowInserted(0, m_aGroupPositions.size(), sal_True); + RowInserted(0, m_aGroupPositions.size(), TRUE); } // ----------------------------------------------------------------------------- // ----------------------------------------------------------------------------- @@ -428,19 +431,19 @@ IMPL_LINK(OFieldExpressionControl, AsynchDeactivate, void*, EMPTYARG) } //------------------------------------------------------------------------------ -sal_Bool OFieldExpressionControl::IsTabAllowed(sal_Bool /*bForward*/) const +BOOL OFieldExpressionControl::IsTabAllowed(BOOL /*bForward*/) const { DBG_CHKTHIS( rpt_OFieldExpressionControl,NULL); - return sal_False; + return FALSE; } //------------------------------------------------------------------------------ -sal_Bool OFieldExpressionControl::SaveModified() +BOOL OFieldExpressionControl::SaveModified() { return SaveModified(true); } //------------------------------------------------------------------------------ -sal_Bool OFieldExpressionControl::SaveModified(bool _bAppendRow) +BOOL OFieldExpressionControl::SaveModified(bool _bAppendRow) { DBG_CHKTHIS( rpt_OFieldExpressionControl,NULL); sal_Int32 nRow = GetCurRow(); @@ -454,7 +457,7 @@ sal_Bool OFieldExpressionControl::SaveModified(bool _bAppendRow) { bAppend = sal_True; String sUndoAction(ModuleRes(RID_STR_UNDO_APPEND_GROUP)); - m_pParent->m_pController->getUndoManager().EnterListAction( sUndoAction, String() ); + m_pParent->m_pController->getUndoMgr()->EnterListAction( sUndoAction, String() ); xGroup = m_pParent->getGroups()->createGroup(); xGroup->setHeaderOn(sal_True); @@ -485,7 +488,7 @@ sal_Bool OFieldExpressionControl::SaveModified(bool _bAppendRow) xGroup = m_pParent->getGroup(m_aGroupPositions[nRow]); if ( xGroup.is() ) { - sal_uInt16 nPos = m_pComboCell->GetSelectEntryPos(); + USHORT nPos = m_pComboCell->GetSelectEntryPos(); ::rtl::OUString sExpression; if ( COMBOBOX_ENTRY_NOTFOUND == nPos ) sExpression = m_pComboCell->GetText(); @@ -498,7 +501,7 @@ sal_Bool OFieldExpressionControl::SaveModified(bool _bAppendRow) ::rptui::adjustSectionName(xGroup,nPos); if ( bAppend ) - m_pParent->m_pController->getUndoManager().LeaveListAction(); + m_pParent->m_pController->getUndoMgr()->LeaveListAction(); } if ( Controller() ) @@ -514,14 +517,14 @@ sal_Bool OFieldExpressionControl::SaveModified(bool _bAppendRow) } catch(uno::Exception&) { - OSL_FAIL("OFieldExpressionControl::SaveModified: Exception caught!"); + OSL_ENSURE(0,"OFieldExpressionControl::SaveModified: Exception caught!"); } } - return sal_True; + return TRUE; } //------------------------------------------------------------------------------ -String OFieldExpressionControl::GetCellText( long nRow, sal_uInt16 /*nColId*/ ) const +String OFieldExpressionControl::GetCellText( long nRow, USHORT /*nColId*/ ) const { DBG_CHKTHIS( rpt_OFieldExpressionControl,NULL); String sText; @@ -545,14 +548,14 @@ String OFieldExpressionControl::GetCellText( long nRow, sal_uInt16 /*nColId*/ ) } catch(uno::Exception&) { - OSL_FAIL("Exception caught while getting expression value from the group"); + OSL_ENSURE(0,"Exception caught while getting expression value from the group"); } - } + } // if ( nRow != BROWSER_ENDOFSELECTION && nRow < m_pParent->getGroups()->getCount() ) return sText; } //------------------------------------------------------------------------------ -void OFieldExpressionControl::InitController( CellControllerRef& /*rController*/, long nRow, sal_uInt16 nColumnId ) +void OFieldExpressionControl::InitController( CellControllerRef& /*rController*/, long nRow, USHORT nColumnId ) { DBG_CHKTHIS( rpt_OFieldExpressionControl,NULL); @@ -575,7 +578,7 @@ sal_Bool OFieldExpressionControl::CursorMoving(long nNewRow, sal_uInt16 nNewCol) return sal_True; } //------------------------------------------------------------------------------ -CellController* OFieldExpressionControl::GetController( long /*nRow*/, sal_uInt16 /*nColumnId*/ ) +CellController* OFieldExpressionControl::GetController( long /*nRow*/, USHORT /*nColumnId*/ ) { DBG_CHKTHIS( rpt_OFieldExpressionControl,NULL); ComboBoxCellController* pCellController = new ComboBoxCellController( m_pComboCell ); @@ -584,17 +587,17 @@ CellController* OFieldExpressionControl::GetController( long /*nRow*/, sal_uInt1 } //------------------------------------------------------------------------------ -sal_Bool OFieldExpressionControl::SeekRow( long _nRow ) +BOOL OFieldExpressionControl::SeekRow( long _nRow ) { DBG_CHKTHIS( rpt_OFieldExpressionControl,NULL); // die Basisklasse braucht den Aufruf, da sie sich dort merkt, welche Zeile gepainted wird EditBrowseBox::SeekRow(_nRow); m_nCurrentPos = _nRow; - return sal_True; + return TRUE; } //------------------------------------------------------------------------------ -void OFieldExpressionControl::PaintCell( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId ) const +void OFieldExpressionControl::PaintCell( OutputDevice& rDev, const Rectangle& rRect, USHORT nColumnId ) const { DBG_CHKTHIS( rpt_OFieldExpressionControl,NULL); String aText =const_cast< OFieldExpressionControl*>(this)->GetCellText( m_nCurrentPos, nColumnId ); @@ -626,12 +629,12 @@ EditBrowseBox::RowStatus OFieldExpressionControl::GetRowStatus(long nRow) const } catch(uno::Exception&) { - OSL_FAIL("Exception cathced while try to get a group!"); + OSL_ENSURE(0,"Exception cathced while try to get a group!"); } } return EditBrowseBox::CLEAN; } -// XEventListener +// XEventListener //------------------------------------------------------------------------------ void SAL_CALL OFieldExpressionControl::disposing(const lang::EventObject& /*e*/) throw( uno::RuntimeException ) { @@ -673,6 +676,13 @@ void SAL_CALL OFieldExpressionControl::elementInserted(const container::Containe for(++aFind;aFind != aEnd;++aFind) if ( *aFind != NO_GROUP ) ++*aFind; + + //::std::vector<sal_Int32>::reverse_iterator aRIter = m_aGroupPositions.rbegin(); + //::std::vector<sal_Int32>::reverse_iterator aREnd = m_aGroupPositions.rend(); + //for (; aRIter != aREnd && *aRIter != NO_GROUP; ++aRIter) + // continue; + //if ( aRIter != aREnd ) + // m_aGroupPositions.erase(m_aGroupPositions.begin() + (m_aGroupPositions.size() - 1 - (aRIter - m_aGroupPositions.rbegin()))); } } Invalidate(); @@ -702,6 +712,7 @@ void SAL_CALL OFieldExpressionControl::elementRemoved(const container::Container for(++aFind;aFind != aEnd;++aFind) if ( *aFind != NO_GROUP ) --*aFind; + //PaintCell(*this,GetFieldRect(FIELD_EXPRESSION),FIELD_EXPRESSION); Invalidate(); } } @@ -716,7 +727,7 @@ void OFieldExpressionControl::KeyInput( const KeyEvent& rEvt ) { if (IsDeleteAllowed()) { - if (rEvt.GetKeyCode().GetCode() == KEY_DELETE && // Delete rows + if (rEvt.GetKeyCode().GetCode() == KEY_DELETE && // Delete rows !rEvt.GetKeyCode().IsShift() && !rEvt.GetKeyCode().IsMod1()) { @@ -739,10 +750,11 @@ void OFieldExpressionControl::Command(const CommandEvent& rEvt) return; } - sal_uInt16 nColId = GetColumnAtXPosPixel(rEvt.GetMousePosPixel().X()); + USHORT nColId = GetColumnAtXPosPixel(rEvt.GetMousePosPixel().X()); if ( nColId == HANDLE_ID ) { + //long nRow = GetRowAtYPosPixel(rEvt.GetMousePosPixel().Y()); PopupMenu aContextMenu(ModuleRes(RID_GROUPSROWPOPUPMENU)); sal_Bool bEnable = sal_False; long nIndex = FirstSelectedRow(); @@ -752,6 +764,10 @@ void OFieldExpressionControl::Command(const CommandEvent& rEvt) bEnable = sal_True; nIndex = NextSelectedRow(); } + //aContextMenu.EnableItem( SID_CUT, IsDeleteAllowed() && bEnable); + //aContextMenu.EnableItem( SID_COPY, bEnable); + //TransferableDataHelper aTransferData(TransferableDataHelper::CreateFromSystemClipboard(GetParent())); + //aContextMenu.EnableItem( SID_PASTE, aTransferData.HasFormat(SOT_FORMATSTR_ID_RPT_GRPED) ); aContextMenu.EnableItem( SID_DELETE, IsDeleteAllowed() && bEnable ); switch (aContextMenu.Execute(this, rEvt.GetMousePosPixel())) { @@ -773,7 +789,7 @@ void OFieldExpressionControl::Command(const CommandEvent& rEvt) default: break; } - } + } // if ( nColId == HANDLE_ID ) // run through } default: @@ -810,7 +826,7 @@ void OFieldExpressionControl::DeleteRows() { bFirstTime = false; String sUndoAction(ModuleRes(RID_STR_UNDO_REMOVE_SELECTION)); - m_pParent->m_pController->getUndoManager().EnterListAction( sUndoAction, String() ); + m_pParent->m_pController->getUndoMgr()->EnterListAction( sUndoAction, String() ); } sal_Int32 nGroupPos = m_aGroupPositions[nIndex]; @@ -827,10 +843,10 @@ void OFieldExpressionControl::DeleteRows() --*aFind; } nIndex = NextSelectedRow(); - } + } // while( nIndex >= 0 ) if ( !bFirstTime ) - m_pParent->m_pController->getUndoManager().LeaveListAction(); + m_pParent->m_pController->getUndoMgr()->LeaveListAction(); m_nDataPos = GetCurRow(); InvalidateStatusCell( nOldDataPos ); @@ -916,8 +932,8 @@ void OFieldExpressionControl::InsertRows( long nRow ) { m_bIgnoreEvent = false; { - const String sUndoAction(ModuleRes(RID_STR_UNDO_APPEND_GROUP)); - const UndoContext aUndoContext( m_pParent->m_pController->getUndoManager(), sUndoAction ); + String sUndoAction(ModuleRes(RID_STR_UNDO_APPEND_GROUP)); + UndoManagerListAction aListAction(*m_pParent->m_pController->getUndoMgr(),sUndoAction); uno::Reference<report::XGroups> xGroups = m_pParent->getGroups(); sal_Int32 nGroupPos = 0; @@ -969,6 +985,11 @@ OGroupsSortingDialog::OGroupsSortingDialog( Window* _pParent ,OPropertyChangeListener(m_aMutex) ,m_aFL2(this, ModuleRes(FL_SEPARATOR2) ) ,m_aMove(this, ModuleRes(FT_MOVELABEL) ) +/* + ,m_aPB_Up(this, ModuleRes(PB_UP) ) + ,m_aPB_Down(this, ModuleRes(PB_DOWN) ) + ,m_aPB_Delete(this, ModuleRes(PB_DELETE) ) +*/ ,m_aToolBox(this, ModuleRes(TB_TOOLBOX) ) ,m_aFL3(this, ModuleRes(FL_SEPARATOR3) ) @@ -994,18 +1015,19 @@ OGroupsSortingDialog::OGroupsSortingDialog( Window* _pParent { DBG_CTOR( rpt_OGroupsSortingDialog,NULL); + Control* pControlsLst[] = { &m_aHeaderLst, &m_aFooterLst, &m_aGroupOnLst, &m_aKeepTogetherLst, &m_aOrderLst, &m_aGroupIntervalEd}; for (size_t i = 0; i < SAL_N_ELEMENTS(pControlsLst); ++i) { pControlsLst[i]->SetGetFocusHdl(LINK(this, OGroupsSortingDialog, OnControlFocusGot)); pControlsLst[i]->SetLoseFocusHdl(LINK(this, OGroupsSortingDialog, OnControlFocusLost)); - pControlsLst[i]->Show(sal_True); - } + pControlsLst[i]->Show(TRUE); + } // for (int i = 0; i < SAL_N_ELEMENTS(pControls); ++i) for (size_t i = 0; i < (SAL_N_ELEMENTS(pControlsLst))-1; ++i) static_cast<ListBox*>(pControlsLst[i])->SetSelectHdl(LINK(this,OGroupsSortingDialog,LBChangeHdl)); - Control* pControls[] = { &m_aHeader, &m_aFooter, &m_aGroupOn, &m_aGroupInterval, &m_aKeepTogether, &m_aOrder + Control* pControls[] = { &m_aHeader, &m_aFooter, &m_aGroupOn, &m_aGroupInterval, &m_aKeepTogether, &m_aOrder , &m_aMove,&m_aFL2}; sal_Int32 nMaxTextWidth = 0; MnemonicGenerator aMnemonicGenerator; @@ -1014,7 +1036,7 @@ OGroupsSortingDialog::OGroupsSortingDialog( Window* _pParent for (size_t i = 0; i < SAL_N_ELEMENTS(pControls); ++i) { - pControls[i]->Show(sal_True); + pControls[i]->Show(TRUE); String sText = pControls[i]->GetText(); if ( aMnemonicGenerator.CreateMnemonic(sText) ) pControls[i]->SetText(sText); @@ -1027,6 +1049,7 @@ OGroupsSortingDialog::OGroupsSortingDialog( Window* _pParent Size aOutSize(nMaxTextWidth + m_aHeader.GetSizePixel().Width() + 3*aSpace.Width(),aSpace.Height()); SetMinOutputSizePixel(aOutSize); SetOutputSizePixel(aOutSize); +// Resize(); m_pReportListener = new OPropertyChangeMultiplexer(this,m_pController->getReportDefinition().get()); m_pReportListener->addProperty(PROPERTY_COMMAND); @@ -1036,11 +1059,20 @@ OGroupsSortingDialog::OGroupsSortingDialog( Window* _pParent fillColumns(); m_pFieldExpression->Show(); + //m_aHelpWindow.SetReadOnly(); m_aHelpWindow.SetControlBackground( GetSettings().GetStyleSettings().GetFaceColor() ); + //BTN m_aPB_Up.SetClickHdl(LINK(this,OGroupsSortingDialog,ClickHdl)); + //BTN m_aPB_Down.SetClickHdl(LINK(this,OGroupsSortingDialog,ClickHdl)); + //BTN m_aPB_Delete.SetClickHdl(LINK(this,OGroupsSortingDialog,ClickHdl)); m_pFieldExpression->SetZOrder(&m_aFL2, WINDOW_ZORDER_BEHIND); m_aMove.SetZOrder(m_pFieldExpression, WINDOW_ZORDER_BEHIND); + //BTN m_aPB_Up.SetZOrder(&m_aMove, WINDOW_ZORDER_BEHIND); + //BTN m_aPB_Down.SetZOrder(&m_aPB_Up, WINDOW_ZORDER_BEHIND); + // set Hi contrast bitmaps + //BTN m_aPB_Up.SetModeImage( ModuleRes(IMG_UP_H),BMP_COLOR_HIGHCONTRAST); + //BTN m_aPB_Down.SetModeImage( ModuleRes(IMG_DOWN_H),BMP_COLOR_HIGHCONTRAST); m_aToolBox.SetStyle(m_aToolBox.GetStyle()|WB_LINESPACING); m_aToolBox.SetSelectHdl(LINK(this, OGroupsSortingDialog, OnFormatAction)); m_aToolBox.SetImageListProvider(this); @@ -1163,7 +1195,7 @@ sal_Int32 OGroupsSortingDialog::getColumnDataType(const ::rtl::OUString& _sColum } catch(uno::Exception&) { - OSL_FAIL("Eception caught while getting the type of a column"); + OSL_ENSURE(0,"Eception caught while getting the type of a column"); } return nDataType; @@ -1184,7 +1216,7 @@ IMPL_LINK(OGroupsSortingDialog, OnControlFocusGot, Control*, pControl ) NumericField* pNumericField = dynamic_cast< NumericField* >( pControl ); if ( pNumericField ) pNumericField->SaveValue(); - showHelpText(static_cast<sal_uInt16>(i+STR_RPT_HELP_FIELD)); + showHelpText(static_cast<USHORT>(i+STR_RPT_HELP_FIELD)); break; } } @@ -1203,10 +1235,11 @@ IMPL_LINK(OGroupsSortingDialog, OnControlFocusLost, Control*, pControl ) } // ----------------------------------------------------------------------------- IMPL_LINK( OGroupsSortingDialog, OnFormatAction, ToolBox*, /*NOTINTERESTEDIN*/ ) +// IMPL_LINK( OGroupsSortingDialog, ClickHdl, ImageButton*, _pButton ) { DBG_CHKTHIS( rpt_OGroupsSortingDialog,NULL); - sal_uInt16 nCommand = m_aToolBox.GetCurItemId(); + USHORT nCommand = m_aToolBox.GetCurItemId(); if ( m_pFieldExpression ) { @@ -1218,17 +1251,22 @@ IMPL_LINK( OGroupsSortingDialog, OnFormatAction, ToolBox*, /*NOTINTERESTEDIN*/ ) aClipboardList.realloc(1); aClipboardList[0] = m_xGroups->getByIndex(nGroupPos); } + //BTN if ( _pButton == &m_aPB_Up ) if ( nCommand == SID_RPT_GROUPSORT_MOVE_UP ) { --nIndex; } + //BTN if ( _pButton == &m_aPB_Down ) if ( nCommand == SID_RPT_GROUPSORT_MOVE_DOWN ) { ++nIndex; } + //BTN if ( _pButton == &m_aPB_Delete ) if ( nCommand == SID_RPT_GROUPSORT_DELETE ) { + // m_pFieldExpression->DeleteCurrentRow(); Application::PostUserEvent( LINK(m_pFieldExpression, OFieldExpressionControl, DelayedDelete) ); + // UpdateData( ); } else { @@ -1238,6 +1276,7 @@ IMPL_LINK( OGroupsSortingDialog, OnFormatAction, ToolBox*, /*NOTINTERESTEDIN*/ ) m_pFieldExpression->moveGroups(aClipboardList,nIndex,sal_False); m_pFieldExpression->DeactivateCell(); m_pFieldExpression->GoToRow(nIndex); + //long nCurRow = m_pFieldExpression->GetCurRow(); m_pFieldExpression->ActivateCell(nIndex, m_pFieldExpression->GetCurColumnId()); DisplayData(nIndex); } @@ -1281,7 +1320,7 @@ IMPL_LINK( OGroupsSortingDialog, LBChangeHdl, ListBox*, pListBox ) return 1L; } // ----------------------------------------------------------------------------- -void OGroupsSortingDialog::showHelpText(sal_uInt16 _nResId) +void OGroupsSortingDialog::showHelpText(USHORT _nResId) { m_aHelpWindow.SetText(String(ModuleRes(_nResId))); } @@ -1325,8 +1364,8 @@ void OGroupsSortingDialog::displayGroup(const uno::Reference<report::XGroup>& _x case sdbc::DataType::TIME: case sdbc::DataType::TIMESTAMP: { - sal_uInt16 nIds[] = { STR_RPT_YEAR, STR_RPT_QUARTER,STR_RPT_MONTH,STR_RPT_WEEK,STR_RPT_DAY,STR_RPT_HOUR,STR_RPT_MINUTE }; - for (sal_uInt16 i = 0; i < SAL_N_ELEMENTS(nIds); ++i) + USHORT nIds[] = { STR_RPT_YEAR, STR_RPT_QUARTER,STR_RPT_MONTH,STR_RPT_WEEK,STR_RPT_DAY,STR_RPT_HOUR,STR_RPT_MINUTE }; + for (USHORT i = 0; i < SAL_N_ELEMENTS(nIds); ++i) { m_aGroupOnLst.InsertEntry(String(ModuleRes(nIds[i]))); m_aGroupOnLst.SetEntryData(i+1,reinterpret_cast<void*>(i+2)); @@ -1337,8 +1376,8 @@ void OGroupsSortingDialog::displayGroup(const uno::Reference<report::XGroup>& _x m_aGroupOnLst.InsertEntry(String(ModuleRes(STR_RPT_INTERVAL))); m_aGroupOnLst.SetEntryData(1,reinterpret_cast<void*>(report::GroupOn::INTERVAL)); break; - } - sal_uInt16 nPos = 0; + } // switch(nDataType) + USHORT nPos = 0; switch(_xGroup->getGroupOn()) { case report::GroupOn::DEFAULT: @@ -1385,7 +1424,7 @@ void OGroupsSortingDialog::displayGroup(const uno::Reference<report::XGroup>& _x for (size_t i = 0; i < SAL_N_ELEMENTS(pControls); ++i) pControls[i]->SaveValue(); - ListBox* pControlsLst2[] = { &m_aHeaderLst, &m_aFooterLst, &m_aGroupOnLst, &m_aKeepTogetherLst,&m_aOrderLst}; + ListBox* pControlsLst2[] = { &m_aHeaderLst, &m_aFooterLst, &m_aGroupOnLst, &m_aKeepTogetherLst,&m_aOrderLst}; sal_Bool bReadOnly = !m_pController->isEditable(); for (size_t i = 0; i < SAL_N_ELEMENTS(pControlsLst2); ++i) pControlsLst2[i]->SetReadOnly(bReadOnly); @@ -1399,14 +1438,15 @@ void OGroupsSortingDialog::Resize() Size aSpace = LogicToPixel( Size( UNRELATED_CONTROLS, UNRELATED_CONTROLS ), MAP_APPFONT ); m_pFieldExpression->SetSizePixel(Size(aTotalOutputSize.Width() - 2*aSpace.Width(),m_pFieldExpression->GetSizePixel().Height())); - Control* pControlsLst[] = { &m_aHeaderLst, &m_aFooterLst, &m_aGroupOnLst, &m_aGroupIntervalEd,&m_aKeepTogetherLst,&m_aOrderLst}; - Control* pControls[] = { &m_aHeader, &m_aFooter, &m_aGroupOn, &m_aGroupInterval, &m_aKeepTogether, &m_aOrder}; + Control* pControlsLst[] = { &m_aHeaderLst, &m_aFooterLst, &m_aGroupOnLst, &m_aGroupIntervalEd,&m_aKeepTogetherLst,&m_aOrderLst}; + Control* pControls[] = { &m_aHeader, &m_aFooter, &m_aGroupOn, &m_aGroupInterval, &m_aKeepTogether, &m_aOrder}; sal_Int32 nMaxTextWidth = 0; for (size_t i = 0; i < SAL_N_ELEMENTS(pControls); ++i) { nMaxTextWidth = ::std::max<sal_Int32>(static_cast<sal_Int32>(GetTextWidth(pControls[i]->GetText())),nMaxTextWidth); - } + } // for (int i = 0; i < SAL_N_ELEMENTS(pControls); ++i) + // aTotalOutputSize.Width() - m_aHeaderLst.GetSizePixel().Width() - 3*aSpace.Width() for (size_t i = 0; i < SAL_N_ELEMENTS(pControls); ++i) { pControls[i]->SetSizePixel(Size(nMaxTextWidth,pControls[i]->GetSizePixel().Height())); @@ -1415,11 +1455,20 @@ void OGroupsSortingDialog::Resize() aPos.Y() = pControlsLst[i]->GetPosPixel().Y(); pControlsLst[i]->SetPosSizePixel(aPos,Size(aTotalOutputSize.Width() - aPos.X() - aSpace.Width(),pControlsLst[i]->GetSizePixel().Height())); - } + } // for (int i = 0; i < SAL_N_ELEMENTS(pControls); ++i) m_aFL.SetSizePixel(Size(aTotalOutputSize.Width() - aSpace.Width(),m_aFL.GetSizePixel().Height())); m_aFL2.SetSizePixel(Size(aTotalOutputSize.Width() - aSpace.Width(),m_aFL2.GetSizePixel().Height())); m_aFL3.SetSizePixel(Size(aTotalOutputSize.Width() - aSpace.Width(),m_aFL3.GetSizePixel().Height())); + +//BTN sal_Int32 nPos = aTotalOutputSize.Width() - aSpace.Width() - m_aPB_Up.GetSizePixel().Width(); +//BTN m_aPB_Delete.SetPosPixel(Point(nPos,m_aPB_Delete.GetPosPixel().Y())); +//BTN +//BTN nPos -= (m_aPB_Up.GetSizePixel().Width() + LogicToPixel( Size( UNRELATED_CONTROLS, 0 ), MAP_APPFONT ).Width()); +//BTN m_aPB_Down.SetPosPixel(Point(nPos,m_aPB_Down.GetPosPixel().Y())); +//BTN +//BTN nPos -= (m_aPB_Up.GetSizePixel().Width() + LogicToPixel( Size( RELATED_CONTROLS, 0 ), MAP_APPFONT ).Width()); +//BTN m_aPB_Up.SetPosPixel(Point(nPos,m_aPB_Up.GetPosPixel().Y())); sal_Int32 nPos = aTotalOutputSize.Width() - aSpace.Width() - m_aToolBox.GetSizePixel().Width(); m_aToolBox.SetPosPixel(Point(nPos,m_aToolBox.GetPosPixel().Y())); @@ -1433,7 +1482,7 @@ void OGroupsSortingDialog::checkButtons(sal_Int32 _nRow) sal_Int32 nRowCount = m_pFieldExpression->GetRowCount(); sal_Bool bEnabled = nGroupCount > 1; - if (bEnabled && _nRow > 0 ) + if (bEnabled && _nRow > 0 /* && _nRow < nGroupCount */ ) { m_aToolBox.EnableItem(SID_RPT_GROUPSORT_MOVE_UP, sal_True); } @@ -1441,7 +1490,7 @@ void OGroupsSortingDialog::checkButtons(sal_Int32 _nRow) { m_aToolBox.EnableItem(SID_RPT_GROUPSORT_MOVE_UP, sal_False); } - if (bEnabled && _nRow < (nRowCount - 1) ) + if (bEnabled && _nRow < (nRowCount - 1) /* && _nRow < (nGroupCount - 1) */ ) { m_aToolBox.EnableItem(SID_RPT_GROUPSORT_MOVE_DOWN, sal_True); } @@ -1449,25 +1498,34 @@ void OGroupsSortingDialog::checkButtons(sal_Int32 _nRow) { m_aToolBox.EnableItem(SID_RPT_GROUPSORT_MOVE_DOWN, sal_False); } + //BTN m_aPB_Up.Enable(bEnable && _nRow > 0 ); + //BTN m_aPB_Down.Enable(bEnable && _nRow < (m_pFieldExpression->GetRowCount()-1) ); + // m_aToolBox.EnableItem(SID_RPT_GROUPSORT_MOVE_DOWN, bEnable && _nRow < (-1) ); sal_Int32 nGroupPos = m_pFieldExpression->getGroupPosition(_nRow); if ( nGroupPos != NO_GROUP ) { sal_Bool bEnableDelete = nGroupCount > 0; + //BTN m_aPB_Delete.Enable(bEnableDelete ); m_aToolBox.EnableItem(SID_RPT_GROUPSORT_DELETE, bEnableDelete); } else { + //BTN m_aPB_Delete.Enable( sal_False ); m_aToolBox.EnableItem(SID_RPT_GROUPSORT_DELETE, sal_False); } } -ImageList OGroupsSortingDialog::getImageList(sal_Int16 _eBitmapSet) const +ImageList OGroupsSortingDialog::getImageList(sal_Int16 _eBitmapSet,sal_Bool _bHiContast) const { sal_Int16 nN = IMG_CONDFORMAT_DLG_SC; + sal_Int16 nH = IMG_CONDFORMAT_DLG_SCH; if ( _eBitmapSet == SFX_SYMBOLS_SIZE_LARGE ) + { nN = IMG_CONDFORMAT_DLG_LC; - return ImageList(ModuleRes( nN )); + nH = IMG_CONDFORMAT_DLG_LCH; + } + return ImageList(ModuleRes( _bHiContast ? nH : nN )); } //------------------------------------------------------------------ @@ -1476,17 +1534,31 @@ void OGroupsSortingDialog::resizeControls(const Size& _rDiff) // we use large images so we must change them if ( _rDiff.Width() || _rDiff.Height() ) { + Point aPos = LogicToPixel( Point( 2*RELATED_CONTROLS , 0), MAP_APPFONT ); Invalidate(); } } //------------------------------------------------------------------ // load the images -ImageList OGroupsSortingDialog::getImageList(vcl::ImageListType) SAL_THROW (( com::sun::star::lang::IllegalArgumentException )) +ImageList OGroupsSortingDialog::getImageList(vcl::ImageListType _eType) SAL_THROW (( com::sun::star::lang::IllegalArgumentException )) { - return ImageList(ModuleRes(IMGLST_GROUPSORT_DLG_SC)); + if (_eType == vcl::HIGHCONTRAST_NO) + { + return ImageList(ModuleRes(IMGLST_GROUPSORT_DLG_SC)); + } + else if (_eType == vcl::HIGHCONTRAST_YES) + { + return ImageList(ModuleRes(IMGLST_GROUPSORT_DLG_SCH)); + } + else + { + throw com::sun::star::lang::IllegalArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("High contrast parameter is wrong.")), NULL, 0); + } } + + // ============================================================================= } // rptui // ============================================================================= diff --git a/reportdesign/source/ui/dlg/GroupsSorting.hrc b/reportdesign/source/ui/dlg/GroupsSorting.hrc index 049afa79d37b..d717562cf14f 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.hrc +++ b/reportdesign/source/ui/dlg/GroupsSorting.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,43 +27,53 @@ #ifndef RPTUI_GROUPSSORTING_HRC #define RPTUI_GROUPSSORTING_HRC -#define FT_HEADER (1) -#define LST_HEADERLST (2) -#define FT_FOOTER (3) -#define LST_FOOTERLST (4) -#define FT_GROUPON (5) -#define LST_GROUPONLST (6) -#define FT_GROUPINTERVAL (7) +#define FT_HEADER (1) +#define LST_HEADERLST (2) +#define FT_FOOTER (3) +#define LST_FOOTERLST (4) +#define FT_GROUPON (5) +#define LST_GROUPONLST (6) +#define FT_GROUPINTERVAL (7) #define ED_GROUPINTERVALLST (8) -#define FT_KEEPTOGETHER (9) -#define LST_KEEPTOGETHERLST (10) -#define PB_OK (11) -#define PB_CANCEL (12) -#define PB_HELP (13) -#define WND_CONTROL (14) -#define HELP_FIELD (15) -#define FT_ORDER (16) -#define LST_ORDER (17) -#define FL_SEPARATOR1 (18) -#define FT_MOVELABEL (19) -#define PB_UP (20) -#define PB_DOWN (21) -#define FL_SEPARATOR2 (22) -#define FL_SEPARATOR3 (23) +#define FT_KEEPTOGETHER (9) +#define LST_KEEPTOGETHERLST (10) +#define PB_OK (11) +#define PB_CANCEL (12) +#define PB_HELP (13) +#define WND_CONTROL (14) +#define HELP_FIELD (15) +#define FT_ORDER (16) +#define LST_ORDER (17) +#define FL_SEPARATOR1 (18) +#define FT_MOVELABEL (19) +#define PB_UP (20) +#define PB_DOWN (21) +#define FL_SEPARATOR2 (22) +#define FL_SEPARATOR3 (23) +//BTN #define IMG_UP_H (24) +//BTN #define IMG_DOWN_H (25) +//BTN #define PB_DELETE (26) #define TB_TOOLBOX (27) +// #define IMG_GROUPSORT_MOVE_DOWN (28) +// #define IMG_GROUPSORT_MOVE_UP (29) +// #define IMG_GROUPSORT_DELETE (30) +// #define IMG_GROUPSORT_MOVE_DOWN_H (31) +// #define IMG_GROUPSORT_MOVE_UP_H (32) +// #define IMG_GROUPSORT_DELETE_H (33) + -#define CHECKBOX_HEIGHT 8 -#define FIXEDTEXT_HEIGHT 8 -#define FIXEDTEXT_WIDTH 60 -#define RELATED_CONTROLS 4 -#define UNRELATED_CONTROLS 7 -#define EDIT_HEIGHT 12 -#define BUTTON_HEIGHT 14 -#define BUTTON_WIDTH 50 -#define BROWSER_HEIGHT 75 -#define PAGE_WIDTH 120 -#define PAGE_HEIGHT ( 13*UNRELATED_CONTROLS + BROWSER_HEIGHT + BUTTON_HEIGHT + 11*FIXEDTEXT_HEIGHT ) -#define LISTBOX_WIDTH PAGE_WIDTH - 4*UNRELATED_CONTROLS - FIXEDTEXT_WIDTH +#define CHECKBOX_HEIGHT 8 +#define FIXEDTEXT_HEIGHT 8 +#define FIXEDTEXT_WIDTH 60 +#define RELATED_CONTROLS 4 +#define UNRELATED_CONTROLS 7 +#define EDIT_HEIGHT 12 +#define BUTTON_HEIGHT 14 +#define BUTTON_WIDTH 50 +#define BROWSER_HEIGHT 75 +#define PAGE_WIDTH 120 +#define PAGE_HEIGHT ( 13*UNRELATED_CONTROLS + BROWSER_HEIGHT + BUTTON_HEIGHT + 11*FIXEDTEXT_HEIGHT ) +#define LISTBOX_WIDTH PAGE_WIDTH - 4*UNRELATED_CONTROLS - FIXEDTEXT_WIDTH #endif // RPTUI_GROUPSSORTING_HRC diff --git a/reportdesign/source/ui/dlg/GroupsSorting.src b/reportdesign/source/ui/dlg/GroupsSorting.src index 3cb470933e26..af78f65dee8d 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.src +++ b/reportdesign/source/ui/dlg/GroupsSorting.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,14 +45,14 @@ FloatingWindow RID_GROUPS_SORTING Moveable = TRUE ; Closeable = TRUE ; Sizeable = TRUE; - + FixedLine FL_SEPARATOR2 { Pos = MAP_APPFONT ( RELATED_CONTROLS , RELATED_CONTROLS ) ; Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ; Text [ en-US ] = "Groups"; }; - + Control WND_CONTROL { Pos = MAP_APPFONT( UNRELATED_CONTROLS, 2*UNRELATED_CONTROLS ); @@ -61,18 +61,62 @@ FloatingWindow RID_GROUPS_SORTING Border = TRUE; TabStop = TRUE; }; - + FixedText FT_MOVELABEL { Pos = MAP_APPFONT ( UNRELATED_CONTROLS , 3*UNRELATED_CONTROLS + BROWSER_HEIGHT ) ; Size = MAP_APPFONT ( FIXEDTEXT_WIDTH , FIXEDTEXT_HEIGHT ) ; +// Text [ en-US ] = "Move group" ; Text [ en-US ] = "Group actions" ; }; + +// /* +// | PAGE_WIDTH | +// | /-----\ {-------\ /---------\ | +// | unreleated FT_MOVELABEL |PB_UP| unreleated |PB_DOWN| unreleated |PD_DELETE| unreleated | +// | \_____/ \_______/ \_________/ | +// +// Don't set any position here, it will be done in OGroupsSortingDialog::Resize() +// +// Find possible IMAGEBUTTON_* in rscicpx.cxx +// Symbol is vclrsc.hxx +// */ +// ImageButton PB_UP +// { +// Pos = MAP_APPFONT ( PAGE_WIDTH - 3*UNRELATED_CONTROLS - 3*14 - 2*RELATED_CONTROLS, 3*UNRELATED_CONTROLS + BROWSER_HEIGHT -1 ) ; +// Size = MAP_APPFONT ( 14 , 14 ) ; +// TabStop = TRUE; +// // Symbol = IMAGEBUTTON_ARROW_UP ; // arrow up +// Symbol = IMAGEBUTTON_SPIN_UP ; // triangle up +// // Symbol = IMAGEBUTTON_FLOAT; +// }; +// +// ImageButton PB_DOWN +// { +// Pos = MAP_APPFONT ( PAGE_WIDTH - 2*UNRELATED_CONTROLS - 2*14 - 2*RELATED_CONTROLS, 3*UNRELATED_CONTROLS + BROWSER_HEIGHT - 1 ) ; +// Size = MAP_APPFONT ( 14 , 14 ) ; +// TabStop = TRUE; +// // Symbol = IMAGEBUTTON_ARROW_DOWN ; // arrow down +// // Symbol = IMAGEBUTTON_FIRST ; +// Symbol = IMAGEBUTTON_SPIN_DOWN; +// +// }; +// +// ImageButton PB_DELETE +// { +// Pos = MAP_APPFONT ( PAGE_WIDTH - UNRELATED_CONTROLS - 14, 3*UNRELATED_CONTROLS + BROWSER_HEIGHT - 1 ) ; +// Size = MAP_APPFONT ( 14 , 14 ) ; +// TabStop = TRUE; +// Symbol = IMAGEBUTTON_CLOSE ; +// }; + ToolBox TB_TOOLBOX { Pos = MAP_APPFONT ( PAGE_WIDTH - 4*14 - UNRELATED_CONTROLS, 3*UNRELATED_CONTROLS + BROWSER_HEIGHT - 1 ) ; ButtonType = BUTTON_SYMBOL; +// Align = BOXALIGN_TOP; +// HelpId = HID_RPT_CONDFORMAT_TB; Customize = FALSE; ItemList = { @@ -80,17 +124,19 @@ FloatingWindow RID_GROUPS_SORTING { Identifier = SID_RPT_GROUPSORT_MOVE_UP ; // Command = ".uno:ReportGroupMoveUp" ; // default_images/res/commandimages/sc_reportgroupmoveup.png - HelpID = HID_RPT_GROUPSORT_MOVE_UP ; + HelpID = HID_RPT_GROUPSORT_MOVE_UP ; Text [ en-US ] = "Move up" ; Checkable = TRUE; +// Disable = TRUE; }; ToolBoxItem { Identifier = SID_RPT_GROUPSORT_MOVE_DOWN ; - // Command = ".uno:ReportGroupMoveDown" ; + // Command = ".uno:ReportGroupMoveDown" ; HelpID = HID_RPT_GROUPSORT_MOVE_DOWN ; Text [ en-US ] = "Move down" ; Checkable = TRUE; +// Disable = TRUE; }; ToolBoxItem { @@ -99,6 +145,7 @@ FloatingWindow RID_GROUPS_SORTING HelpID = HID_RPT_GROUPSORT_DELETE ; Text [ en-US ] = "~Delete" ; Checkable = TRUE; +// Disable = TRUE; }; }; }; @@ -109,7 +156,7 @@ FloatingWindow RID_GROUPS_SORTING Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ; Text [ en-US ] = "Properties"; }; - + FixedText FT_ORDER { Pos = MAP_APPFONT ( UNRELATED_CONTROLS , 4*UNRELATED_CONTROLS + BROWSER_HEIGHT + BUTTON_HEIGHT + FIXEDTEXT_HEIGHT ) ; @@ -117,10 +164,8 @@ FloatingWindow RID_GROUPS_SORTING Hide = TRUE; Text [ en-US ] = "Sorting" ; }; - ListBox LST_ORDER { - HelpID = "reportdesign:ListBox:RID_GROUPS_SORTING:LST_ORDER"; Border = TRUE; Pos = MAP_APPFONT(2*UNRELATED_CONTROLS + FIXEDTEXT_WIDTH, 4*UNRELATED_CONTROLS + BROWSER_HEIGHT + BUTTON_HEIGHT + FIXEDTEXT_HEIGHT - 1 ); Size = MAP_APPFONT( LISTBOX_WIDTH, 60 ); @@ -133,21 +178,18 @@ FloatingWindow RID_GROUPS_SORTING < "Ascending" ; 0 ; > ; < "Descending" ; 1 ; > ; }; - + }; - FixedText FT_HEADER { Pos = MAP_APPFONT ( UNRELATED_CONTROLS , 5*UNRELATED_CONTROLS + BROWSER_HEIGHT + BUTTON_HEIGHT + 2*FIXEDTEXT_HEIGHT) ; Size = MAP_APPFONT ( FIXEDTEXT_WIDTH , FIXEDTEXT_HEIGHT ) ; Hide = TRUE; Text [ en-US ] = "Group Header" ; - + }; - ListBox LST_HEADERLST { - HelpID = "reportdesign:ListBox:RID_GROUPS_SORTING:LST_HEADERLST"; Border = TRUE; Hide = TRUE; Pos = MAP_APPFONT( 2*UNRELATED_CONTROLS + FIXEDTEXT_WIDTH, 5*UNRELATED_CONTROLS + BROWSER_HEIGHT + BUTTON_HEIGHT + 2*FIXEDTEXT_HEIGHT -1); @@ -161,19 +203,16 @@ FloatingWindow RID_GROUPS_SORTING < "Not present" ; Default ; > ; }; }; - FixedText FT_FOOTER { Pos = MAP_APPFONT ( UNRELATED_CONTROLS, 6*UNRELATED_CONTROLS + BROWSER_HEIGHT + BUTTON_HEIGHT + 3*FIXEDTEXT_HEIGHT) ; Size = MAP_APPFONT ( FIXEDTEXT_WIDTH , FIXEDTEXT_HEIGHT ) ; Hide = TRUE; Text [ en-US ] = "Group Footer" ; - + }; - ListBox LST_FOOTERLST { - HelpID = "reportdesign:ListBox:RID_GROUPS_SORTING:LST_FOOTERLST"; Border = TRUE; Hide = TRUE; Pos = MAP_APPFONT( 2*UNRELATED_CONTROLS + FIXEDTEXT_WIDTH, 6*UNRELATED_CONTROLS + BROWSER_HEIGHT + BUTTON_HEIGHT + 3*FIXEDTEXT_HEIGHT -1); @@ -187,19 +226,16 @@ FloatingWindow RID_GROUPS_SORTING < "Not present" ; Default ; > ; }; }; - FixedText FT_GROUPON { Pos = MAP_APPFONT ( UNRELATED_CONTROLS, 7*UNRELATED_CONTROLS + BROWSER_HEIGHT + BUTTON_HEIGHT + 4*FIXEDTEXT_HEIGHT) ; Size = MAP_APPFONT ( FIXEDTEXT_WIDTH , FIXEDTEXT_HEIGHT ) ; Hide = TRUE; Text [ en-US ] = "Group On" ; - + }; - ListBox LST_GROUPONLST { - HelpID = "reportdesign:ListBox:RID_GROUPS_SORTING:LST_GROUPONLST"; Border = TRUE; Hide = TRUE; Pos = MAP_APPFONT( 2*UNRELATED_CONTROLS + FIXEDTEXT_WIDTH, 7*UNRELATED_CONTROLS + BROWSER_HEIGHT + BUTTON_HEIGHT + 4*FIXEDTEXT_HEIGHT -1); @@ -212,7 +248,6 @@ FloatingWindow RID_GROUPS_SORTING < "Each Value" ; Default ; > ; }; }; - FixedText FT_GROUPINTERVAL { Pos = MAP_APPFONT ( UNRELATED_CONTROLS , 8*UNRELATED_CONTROLS + BROWSER_HEIGHT + BUTTON_HEIGHT + 5*FIXEDTEXT_HEIGHT) ; @@ -220,17 +255,15 @@ FloatingWindow RID_GROUPS_SORTING Hide = TRUE; Text [ en-US ] = "Group Interval" ; }; - NumericField ED_GROUPINTERVALLST { - HelpID = "reportdesign:NumericField:RID_GROUPS_SORTING:ED_GROUPINTERVALLST"; Border = TRUE; Hide = TRUE; Pos = MAP_APPFONT(2*UNRELATED_CONTROLS + FIXEDTEXT_WIDTH , 8*UNRELATED_CONTROLS + BROWSER_HEIGHT + BUTTON_HEIGHT + 5*FIXEDTEXT_HEIGHT -1); Size = MAP_APPFONT( LISTBOX_WIDTH, EDIT_HEIGHT ); TabStop = TRUE; }; - + FixedText FT_KEEPTOGETHER { Pos = MAP_APPFONT ( UNRELATED_CONTROLS , 9*UNRELATED_CONTROLS + BROWSER_HEIGHT + BUTTON_HEIGHT + 6*FIXEDTEXT_HEIGHT) ; @@ -240,7 +273,6 @@ FloatingWindow RID_GROUPS_SORTING }; ListBox LST_KEEPTOGETHERLST { - HelpID = "reportdesign:ListBox:RID_GROUPS_SORTING:LST_KEEPTOGETHERLST"; Border = TRUE; Hide = TRUE; Pos = MAP_APPFONT(2*UNRELATED_CONTROLS + FIXEDTEXT_WIDTH , 9*UNRELATED_CONTROLS + BROWSER_HEIGHT + BUTTON_HEIGHT + 6*FIXEDTEXT_HEIGHT -1); @@ -255,20 +287,30 @@ FloatingWindow RID_GROUPS_SORTING < "With First Detail" ; 2 ; > ; }; }; - + FixedLine FL_SEPARATOR1 { Pos = MAP_APPFONT ( RELATED_CONTROLS , 10*UNRELATED_CONTROLS + BROWSER_HEIGHT + BUTTON_HEIGHT + 7*FIXEDTEXT_HEIGHT) ; Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ; Text [ en-US ] = "Help"; }; - + FixedText HELP_FIELD { Pos = MAP_APPFONT ( UNRELATED_CONTROLS , 12*UNRELATED_CONTROLS + BROWSER_HEIGHT + BUTTON_HEIGHT + 7*FIXEDTEXT_HEIGHT) ; Size = MAP_APPFONT( PAGE_WIDTH - 2*UNRELATED_CONTROLS, 4*FIXEDTEXT_HEIGHT); WordBreak = TRUE; }; + +//BTN Image IMG_UP_H +//BTN { +//BTN ImageBitmap = Bitmap { File = "arrow_move_up_hc" ; }; +//BTN }; +//BTN Image IMG_DOWN_H +//BTN { +//BTN ImageBitmap = Bitmap { File = "arrow_move_down_hc" ; }; +//BTN }; + }; @@ -276,52 +318,42 @@ String STR_RPT_EXPRESSION { Text [ en-US ] = "Field/Expression" ; }; - String STR_RPT_SORTING { Text [ en-US ] = "Sort Order" ; }; - String STR_RPT_PREFIXCHARS { Text [ en-US ] = "Prefix Characters" ; }; - String STR_RPT_YEAR { Text [ en-US ] = "Year" ; }; - String STR_RPT_QUARTER { Text [ en-US ] = "Quarter" ; }; - String STR_RPT_MONTH { Text [ en-US ] = "Month" ; }; - String STR_RPT_WEEK { Text [ en-US ] = "Week" ; }; - String STR_RPT_DAY { Text [ en-US ] = "Day" ; }; - String STR_RPT_HOUR { Text [ en-US ] = "Hour" ; }; - String STR_RPT_MINUTE { Text [ en-US ] = "Minute" ; }; - String STR_RPT_INTERVAL { Text [ en-US ] = "Interval" ; @@ -341,31 +373,42 @@ String STR_RPT_HELP_FOOTER { Text [ en-US ] = "Display a footer for this group?" ; }; - String STR_RPT_HELP_GROUPON { Text [ en-US ] = "Select the value or range of values that starts a new group." ; }; - String STR_RPT_HELP_INTERVAL { Text [ en-US ] = "Interval or number of characters to group on." ; }; - String STR_RPT_HELP_KEEP { Text [ en-US ] = "Keep group together on one page?" ; }; - String STR_RPT_HELP_SORT { Text [ en-US ] = "Select ascending or descending sort order. Ascending means from A to Z or 0 to 9" ; }; + Menu RID_GROUPSROWPOPUPMENU { ItemList = { +/* + MenuItem + { + ITEM_EDIT_CUT + }; + MenuItem + { + ITEM_EDIT_COPY + }; + MenuItem + { + ITEM_EDIT_PASTE + }; +*/ MenuItem { ITEM_EDIT_DELETE @@ -393,3 +436,61 @@ ImageList IMGLST_GROUPSORT_DLG_SC prefix = "sc"; DEF_IL_GROUPSORT ; }; + +ImageList IMGLST_GROUPSORT_DLG_SCH +{ + DEF_MASKCOLOR; + prefix = "sch"; + DEF_IL_GROUPSORT ; +}; + + +// Image IMG_GROUPSORT_MOVEUP +// { +// ImageBitmap = Bitmap +// { +// File = "reportgroupmoveup"; // reportdesign/res/... +// }; +// DEF_MASKCOLOR; +// }; +// Image IMG_GROUPSORT_MOVEDOWN +// { +// ImageBitmap = Bitmap +// { +// File = "reportgroupmovedown"; +// }; +// DEF_MASKCOLOR; +// }; +// Image IMG_GROUPSORT_DELETE +// { +// ImageBitmap = Bitmap +// { +// File = "reportgroupdelete"; +// }; +// DEF_MASKCOLOR; +// }; +// +// Image IMG_GROUPSORT_MOVEUP_H +// { +// ImageBitmap = Bitmap +// { +// File = "reportgroupmoveup_h"; // reportdesign/res/... +// }; +// DEF_MASKCOLOR; +// }; +// Image IMG_GROUPSORT_MOVEDOWN_H +// { +// ImageBitmap = Bitmap +// { +// File = "reportgroupmovedown_h"; +// }; +// DEF_MASKCOLOR; +// }; +// Image IMG_GROUPSORT_DELETE_H +// { +// ImageBitmap = Bitmap +// { +// File = "reportgroupdelete_h"; +// }; +// DEF_MASKCOLOR; +// }; diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx index 072a9430d7b0..0c1760b8e48a 100644 --- a/reportdesign/source/ui/dlg/Navigator.cxx +++ b/reportdesign/source/ui/dlg/Navigator.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ #include "uistrings.hrc" #include "ReportController.hxx" #include "UITools.hxx" -#include "RptUndo.hxx" +#include "Undo.hxx" #include "reportformula.hxx" #include <com/sun/star/container/XContainerListener.hpp> #include <com/sun/star/report/XReportDefinition.hpp> @@ -62,8 +62,8 @@ #include <memory> #include <algorithm> -#define RID_SVXIMG_COLLAPSEDNODE (RID_FORMS_START + 2) -#define RID_SVXIMG_EXPANDEDNODE (RID_FORMS_START + 3) +#define RID_SVXIMG_COLLAPSEDNODE (RID_FORMS_START + 2) +#define RID_SVXIMG_EXPANDEDNODE (RID_FORMS_START + 3) #define DROP_ACTION_TIMER_INITIAL_TICKS 10 #define DROP_ACTION_TIMER_SCROLL_TICKS 3 #define DROP_ACTION_TIMER_TICK_BASE 10 @@ -74,9 +74,9 @@ using namespace ::com::sun::star; using namespace utl; using namespace ::comphelper; -sal_uInt16 lcl_getImageId(const uno::Reference< report::XReportComponent>& _xElement) +USHORT lcl_getImageId(const uno::Reference< report::XReportComponent>& _xElement) { - sal_uInt16 nId = 0; + USHORT nId = 0; uno::Reference< report::XFixedLine> xFixedLine(_xElement,uno::UNO_QUERY); if ( uno::Reference< report::XFixedText>(_xElement,uno::UNO_QUERY).is() ) nId = SID_FM_FIXEDTEXT; @@ -121,7 +121,7 @@ class NavigatorTree : public ::cppu::BaseMutex , public SvTreeListBox , public reportdesign::ITraverseReport , public comphelper::OSelectionChangeListener - , public ::comphelper::OPropertyChangeListener + , public ::comphelper::OPropertyChangeListener { class UserData; friend class UserData; @@ -154,28 +154,29 @@ class NavigatorTree : public ::cppu::BaseMutex AutoTimer m_aDropActionTimer; Timer m_aSynchronizeTimer; ImageList m_aNavigatorImages; + ImageList m_aNavigatorImagesHC; Point m_aTimerTriggered; // die Position, an der der DropTimer angeschaltet wurde DROP_ACTION m_aDropActionType; OReportController& m_rController; SvLBoxEntry* m_pMasterReport; - SvLBoxEntry* m_pDragedEntry; - ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> m_pReportListener; + SvLBoxEntry* m_pDragedEntry; + ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> m_pReportListener; ::rtl::Reference< comphelper::OSelectionChangeMultiplexer> m_pSelectionListener; unsigned short m_nTimerCounter; - SvLBoxEntry* insertEntry(const ::rtl::OUString& _sName,SvLBoxEntry* _pParent,sal_uInt16 _nImageId,sal_uLong _nPosition,UserData* _pData); - void traverseSection(const uno::Reference< report::XSection>& _xSection,SvLBoxEntry* _pParent,sal_uInt16 _nImageId,sal_uLong _nPosition = LIST_APPEND); + SvLBoxEntry* insertEntry(const ::rtl::OUString& _sName,SvLBoxEntry* _pParent,USHORT _nImageId,ULONG _nPosition,UserData* _pData); + void traverseSection(const uno::Reference< report::XSection>& _xSection,SvLBoxEntry* _pParent,USHORT _nImageId,ULONG _nPosition = LIST_APPEND); void traverseFunctions(const uno::Reference< report::XFunctions>& _xFunctions,SvLBoxEntry* _pParent); NavigatorTree(const NavigatorTree&); void operator =(const NavigatorTree&); protected: - virtual void Command( const CommandEvent& rEvt ); + virtual void Command( const CommandEvent& rEvt ); // DragSourceHelper overridables - virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); + virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); // DropTargetHelper overridables - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& _rEvt ); - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& _rEvt ); + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& _rEvt ); + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& _rEvt ); // OSelectionChangeListener virtual void _disposing(const lang::EventObject& _rSource) throw( uno::RuntimeException); @@ -204,7 +205,7 @@ public: virtual void traverseReportFooter(const uno::Reference< report::XSection>& _xSection); virtual void traversePageHeader(const uno::Reference< report::XSection>& _xSection); virtual void traversePageFooter(const uno::Reference< report::XSection>& _xSection); - + virtual void traverseGroups(const uno::Reference< report::XGroups>& _xGroups); virtual void traverseGroup(const uno::Reference< report::XGroup>& _xGroup); virtual void traverseGroupFunctions(const uno::Reference< report::XFunctions>& _xFunctions); @@ -231,7 +232,7 @@ NavigatorTree::NavigatorTree( Window* pParent,OReportController& _rController ) ,m_pDragedEntry(NULL) ,m_nTimerCounter( DROP_ACTION_TIMER_INITIAL_TICKS ) { - DBG_CTOR(rpt_NavigatorTree,NULL); + DBG_CTOR(rpt_NavigatorTree,NULL); m_pReportListener = new OPropertyChangeMultiplexer(this,m_rController.getReportDefinition().get()); m_pReportListener->addProperty(PROPERTY_PAGEHEADERON); m_pReportListener->addProperty(PROPERTY_PAGEFOOTERON); @@ -243,10 +244,17 @@ NavigatorTree::NavigatorTree( Window* pParent,OReportController& _rController ) SetHelpId( HID_REPORT_NAVIGATOR_TREE ); m_aNavigatorImages = ImageList( ModuleRes( RID_SVXIMGLIST_RPTEXPL ) ); + m_aNavigatorImagesHC = ImageList( ModuleRes( RID_SVXIMGLIST_RPTEXPL_HC ) ); SetNodeBitmaps( m_aNavigatorImages.GetImage( RID_SVXIMG_COLLAPSEDNODE ), - m_aNavigatorImages.GetImage( RID_SVXIMG_EXPANDEDNODE ) + m_aNavigatorImages.GetImage( RID_SVXIMG_EXPANDEDNODE ), + BMP_COLOR_NORMAL + ); + SetNodeBitmaps( + m_aNavigatorImagesHC.GetImage( RID_SVXIMG_COLLAPSEDNODE ), + m_aNavigatorImagesHC.GetImage( RID_SVXIMG_EXPANDEDNODE ), + BMP_COLOR_HIGHCONTRAST ); SetDragDropMode(0xFFFF); @@ -269,7 +277,7 @@ NavigatorTree::~NavigatorTree() } m_pReportListener->dispose(); m_pSelectionListener->dispose(); - DBG_DTOR(rpt_NavigatorTree,NULL); + DBG_DTOR(rpt_NavigatorTree,NULL); } //------------------------------------------------------------------------------ void NavigatorTree::Command( const CommandEvent& rEvt ) @@ -309,14 +317,14 @@ void NavigatorTree::Command( const CommandEvent& rEvt ) sal_Bool bDeleteAllowed = m_rController.isEditable() && (xGroup.is() || uno::Reference< report::XFunction>(pData->getContent(),uno::UNO_QUERY).is()); PopupMenu aContextMenu( ModuleRes( RID_MENU_NAVIGATOR ) ); - - sal_uInt16 nCount = aContextMenu.GetItemCount(); - for (sal_uInt16 i = 0; i < nCount; ++i) + + USHORT nCount = aContextMenu.GetItemCount(); + for (USHORT i = 0; i < nCount; ++i) { if ( MENUITEM_SEPARATOR != aContextMenu.GetItemType(i)) { - sal_uInt16 nId = aContextMenu.GetItemId(i); - + USHORT nId = aContextMenu.GetItemId(i); + aContextMenu.CheckItem(nId,m_rController.isCommandChecked(nId)); sal_Bool bEnabled = m_rController.isCommandEnabled(nId); if ( nId == SID_RPT_NEW_FUNCTION ) @@ -327,8 +335,8 @@ void NavigatorTree::Command( const CommandEvent& rEvt ) else aContextMenu.EnableItem(nId,bEnabled); } - } - sal_uInt16 nId = aContextMenu.Execute(this, aWhere); + } // for (USHORT i = 0; i < nCount; ++i) + USHORT nId = aContextMenu.Execute(this, aWhere); if ( nId ) { uno::Sequence< beans::PropertyValue> aArgs; @@ -364,7 +372,7 @@ sal_Int8 NavigatorTree::AcceptDrop( const AcceptDropEvent& _rEvt ) { if (m_aDropActionTimer.IsActive()) m_aDropActionTimer.Stop(); - } + } else { bool bNeedTrigger = false; @@ -373,14 +381,14 @@ sal_Int8 NavigatorTree::AcceptDrop( const AcceptDropEvent& _rEvt ) { m_aDropActionType = DA_SCROLLUP; bNeedTrigger = true; - } + } else if ((aDropPos.Y() < GetSizePixel().Height()) && (aDropPos.Y() >= GetSizePixel().Height() - GetEntryHeight())) { m_aDropActionType = DA_SCROLLDOWN; bNeedTrigger = true; - } + } else - { + { SvLBoxEntry* pDropppedOn = GetEntry(aDropPos); if (pDropppedOn && (GetChildCount(pDropppedOn) > 0) && !IsExpanded(pDropppedOn)) { @@ -401,7 +409,7 @@ sal_Int8 NavigatorTree::AcceptDrop( const AcceptDropEvent& _rEvt ) m_aDropActionTimer.SetTimeout(DROP_ACTION_TIMER_TICK_BASE); m_aDropActionTimer.Start(); } - } + } else if (!bNeedTrigger) m_aDropActionTimer.Stop(); } @@ -411,6 +419,7 @@ sal_Int8 NavigatorTree::AcceptDrop( const AcceptDropEvent& _rEvt ) // ------------------------------------------------------------------------- sal_Int8 NavigatorTree::ExecuteDrop( const ExecuteDropEvent& /*_rEvt*/ ) { + // _rEvt.mnAction; return DND_ACTION_NONE; } // ------------------------------------------------------------------------- @@ -471,8 +480,8 @@ IMPL_LINK(NavigatorTree, OnEntrySelDesel, NavigatorTree*, /*pThis*/) aSelection <<= static_cast<UserData*>(pEntry->GetUserData())->getContent(); m_rController.select(aSelection); m_pSelectionListener->unlock(); - } - + } + return 0L; } // ----------------------------------------------------------------------------- @@ -493,7 +502,7 @@ void NavigatorTree::_selectionChanged( const lang::EventObject& aEvent ) throw ( SetCurEntry(pEntry); } else if ( !pEntry ) - SelectAll(sal_False,sal_False); + SelectAll(FALSE,FALSE); } else { @@ -512,20 +521,26 @@ void NavigatorTree::_selectionChanged( const lang::EventObject& aEvent ) throw ( m_pSelectionListener->unlock(); } // ----------------------------------------------------------------------------- -SvLBoxEntry* NavigatorTree::insertEntry(const ::rtl::OUString& _sName,SvLBoxEntry* _pParent,sal_uInt16 _nImageId,sal_uLong _nPosition,UserData* _pData) +SvLBoxEntry* NavigatorTree::insertEntry(const ::rtl::OUString& _sName,SvLBoxEntry* _pParent,USHORT _nImageId,ULONG _nPosition,UserData* _pData) { SvLBoxEntry* pEntry = NULL; if ( _nImageId ) { const Image aImage( m_aNavigatorImages.GetImage( _nImageId ) ); - pEntry = InsertEntry(_sName,aImage,aImage,_pParent,sal_False,_nPosition,_pData); + pEntry = InsertEntry(_sName,aImage,aImage,_pParent,FALSE,_nPosition,_pData); + if ( pEntry ) + { + const Image aImageHC( m_aNavigatorImagesHC.GetImage( _nImageId ) ); + SetExpandedEntryBmp( pEntry, aImageHC, BMP_COLOR_HIGHCONTRAST ); + SetCollapsedEntryBmp( pEntry, aImageHC, BMP_COLOR_HIGHCONTRAST ); + } } else - pEntry = InsertEntry(_sName,_pParent,sal_False,_nPosition,_pData); + pEntry = InsertEntry(_sName,_pParent,FALSE,_nPosition,_pData); return pEntry; } // ----------------------------------------------------------------------------- -void NavigatorTree::traverseSection(const uno::Reference< report::XSection>& _xSection,SvLBoxEntry* _pParent,sal_uInt16 _nImageId,sal_uLong _nPosition) +void NavigatorTree::traverseSection(const uno::Reference< report::XSection>& _xSection,SvLBoxEntry* _pParent,USHORT _nImageId,ULONG _nPosition) { SvLBoxEntry* pSection = insertEntry(_xSection->getName(),_pParent,_nImageId,_nPosition,new UserData(this,_xSection)); const sal_Int32 nCount = _xSection->getCount(); @@ -666,7 +681,7 @@ void NavigatorTree::_propertyChanged(const beans::PropertyChangeEvent& _rEvent) SvLBoxEntry* pParent = find(xReport); if ( _rEvent.PropertyName == PROPERTY_REPORTHEADERON ) { - sal_uLong nPos = xReport->getReportHeaderOn() ? 2 : 1; + ULONG nPos = xReport->getReportHeaderOn() ? 2 : 1; traverseSection(xReport->getReportHeader(),pParent,SID_REPORTHEADERFOOTER,nPos); } else if ( _rEvent.PropertyName == PROPERTY_PAGEHEADERON ) @@ -677,14 +692,14 @@ void NavigatorTree::_propertyChanged(const beans::PropertyChangeEvent& _rEvent) traverseSection(xReport->getPageFooter(),pParent, SID_PAGEHEADERFOOTER); else if ( _rEvent.PropertyName == PROPERTY_REPORTFOOTERON ) { - sal_uLong nPos = xReport->getPageFooterOn() ? (GetLevelChildCount(pParent) - 1) : LIST_APPEND; + ULONG nPos = xReport->getPageFooterOn() ? (GetLevelChildCount(pParent) - 1) : LIST_APPEND; traverseSection(xReport->getReportFooter(),pParent,SID_REPORTHEADERFOOTER,nPos); } } } } // ----------------------------------------------------------------------------- -void NavigatorTree::_elementInserted( const container::ContainerEvent& _rEvent ) +void NavigatorTree::_elementInserted( const container::ContainerEvent& _rEvent ) { SvLBoxEntry* pEntry = find(_rEvent.Source); uno::Reference<beans::XPropertySet> xProp(_rEvent.Element,uno::UNO_QUERY_THROW); @@ -708,7 +723,7 @@ void NavigatorTree::_elementInserted( const container::ContainerEvent& _rEvent ) uno::Reference< report::XReportComponent> xElement(xProp,uno::UNO_QUERY); if ( xProp.is() ) sName = lcl_getName(xProp); - insertEntry(sName,pEntry,(!xElement.is() ? sal_uInt16(SID_RPT_NEW_FUNCTION) : lcl_getImageId(xElement)),LIST_APPEND,new UserData(this,xProp)); + insertEntry(sName,pEntry,(!xElement.is() ? USHORT(SID_RPT_NEW_FUNCTION) : lcl_getImageId(xElement)),LIST_APPEND,new UserData(this,xProp)); } if ( !IsExpanded(pEntry) ) Expand(pEntry); @@ -765,13 +780,13 @@ void NavigatorTree::removeEntry(SvLBoxEntry* _pEntry,bool _bRemove) } DBG_NAME(rpt_NavigatorTree_UserData) // ----------------------------------------------------------------------------- -NavigatorTree::UserData::UserData(NavigatorTree* _pTree,const uno::Reference<uno::XInterface>& _xContent) +NavigatorTree::UserData::UserData(NavigatorTree* _pTree,const uno::Reference<uno::XInterface>& _xContent) : OPropertyChangeListener(m_aMutex) , OContainerListener(m_aMutex) , m_xContent(_xContent) , m_pTree(_pTree) { - DBG_CTOR(rpt_NavigatorTree_UserData,NULL); + DBG_CTOR(rpt_NavigatorTree_UserData,NULL); uno::Reference<beans::XPropertySet> xProp(m_xContent,uno::UNO_QUERY); if ( xProp.is() ) { @@ -802,7 +817,7 @@ NavigatorTree::UserData::UserData(NavigatorTree* _pTree,const uno::Reference<uno // ----------------------------------------------------------------------------- NavigatorTree::UserData::~UserData() { - DBG_DTOR(rpt_NavigatorTree_UserData,NULL); + DBG_DTOR(rpt_NavigatorTree_UserData,NULL); if ( m_pContainerListener.is() ) m_pContainerListener->dispose(); if ( m_pListener.is() ) @@ -829,7 +844,7 @@ void NavigatorTree::UserData::_propertyChanged(const beans::PropertyChangeEvent& pMemFunSection = ::std::mem_fun(&OGroupHelper::getFooter); nPos = m_pTree->GetChildCount(pEntry) - 1; } - + OGroupHelper aGroupHelper(xGroup); if ( pIsOn(&aGroupHelper) ) { @@ -837,6 +852,8 @@ void NavigatorTree::UserData::_propertyChanged(const beans::PropertyChangeEvent& ++nPos; m_pTree->traverseSection(pMemFunSection(&aGroupHelper),pEntry,bFooterOn ? SID_GROUPFOOTER : SID_GROUPHEADER,nPos); } + //else + // m_pTree->removeEntry(m_pTree->GetEntry(pEntry,nPos)); } else if ( PROPERTY_EXPRESSION == _rEvent.PropertyName) { @@ -885,11 +902,11 @@ public: virtual ~ONavigatorImpl(); uno::Reference< report::XReportDefinition> m_xReport; - ::rptui::OReportController& m_rController; + ::rptui::OReportController& m_rController; ::std::auto_ptr<NavigatorTree> m_pNavigatorTree; }; -ONavigatorImpl::ONavigatorImpl(OReportController& _rController,ONavigator* _pParent) +ONavigatorImpl::ONavigatorImpl(OReportController& _rController,ONavigator* _pParent) :m_xReport(_rController.getReportDefinition()) ,m_rController(_rController) ,m_pNavigatorTree(new NavigatorTree(_pParent,_rController)) @@ -919,20 +936,24 @@ ONavigator::ONavigator( Window* _pParent DBG_CTOR( rpt_ONavigator,NULL); m_pImpl.reset(new ONavigatorImpl(_rController,this)); - + + //Size aSpace = LogicToPixel( Size( 7, 120), MAP_APPFONT ); + //Size aOutSize(nMaxTextWidth + m_aHeader.GetSizePixel().Width() + 3*aSpace.Width(),aSpace.Height()); + //SetMinOutputSizePixel(aOutSize); + //SetOutputSizePixel(aOutSize); FreeResource(); m_pImpl->m_pNavigatorTree->Show(); m_pImpl->m_pNavigatorTree->GrabFocus(); SetSizePixel(Size(STD_WIN_SIZE_X,STD_WIN_SIZE_Y)); Show(); - + } // ----------------------------------------------------------------------------- //------------------------------------------------------------------------ ONavigator::~ONavigator() { - DBG_DTOR( rpt_ONavigator,NULL); + DBG_DTOR( rpt_ONavigator,NULL); } //------------------------------------------------------------------------------ void ONavigator::Resize() diff --git a/reportdesign/source/ui/dlg/Navigator.src b/reportdesign/source/ui/dlg/Navigator.src index 150c98d88343..5cac973dc0ef 100644 --- a/reportdesign/source/ui/dlg/Navigator.src +++ b/reportdesign/source/ui/dlg/Navigator.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,9 +35,9 @@ #endif #include <svl/solar.hrc> -#define RID_SVXIMG_COLLAPSEDNODE (RID_FORMS_START + 2) -#define RID_SVXIMG_EXPANDEDNODE (RID_FORMS_START + 3) -#define RID_SVXIMG_FORMS (RID_FORMS_START +13) +#define RID_SVXIMG_COLLAPSEDNODE (RID_FORMS_START + 2) +#define RID_SVXIMG_EXPANDEDNODE (RID_FORMS_START + 3) +#define RID_SVXIMG_FORMS (RID_FORMS_START +13) FloatingWindow RID_NAVIGATOR { @@ -49,7 +49,7 @@ FloatingWindow RID_NAVIGATOR Moveable = TRUE ; Closeable = TRUE ; Sizeable = TRUE; - + Control 1 { Pos = MAP_APPFONT( 0, 0 ); @@ -88,6 +88,13 @@ ImageList RID_SVXIMGLIST_RPTEXPL NAVIGATOR_IMAGEIDS; }; +ImageList RID_SVXIMGLIST_RPTEXPL_HC +{ + Prefix = "sxh"; + MaskColor = Color { Red = 0xff00 ; Green = 0x0000 ; Blue = 0xff00 ; }; + NAVIGATOR_IMAGEIDS; +}; + String RID_STR_FUNCTIONS { Text [ en-US ] = "Functions" ; @@ -103,6 +110,7 @@ Menu RID_MENU_NAVIGATOR MenuItem { Identifier = SID_SORTINGANDGROUPING; + HelpId = SID_SORTINGANDGROUPING ; Command = ".uno:DbSortingAndGrouping"; Text [ en-US ] = "Sorting and Grouping..."; }; @@ -113,6 +121,7 @@ Menu RID_MENU_NAVIGATOR MenuItem { Identifier = SID_PAGEHEADERFOOTER; + HelpId = SID_PAGEHEADERFOOTER ; Command = ".uno:PageHeaderFooter"; Checkable = TRUE; Text [ en-US ] = "Page Header/Footer..."; @@ -120,6 +129,7 @@ Menu RID_MENU_NAVIGATOR MenuItem { Identifier = SID_REPORTHEADERFOOTER; + HelpId = SID_REPORTHEADERFOOTER ; Command = ".uno:ReportHeaderFooter"; Checkable = TRUE; Text [ en-US ] = "Report Header/Footer..."; @@ -131,6 +141,7 @@ Menu RID_MENU_NAVIGATOR MenuItem { Identifier = SID_RPT_NEW_FUNCTION; + HelpId = SID_RPT_NEW_FUNCTION; Command = ".uno:NewFunction"; Text [ en-US ] = "New Function"; }; @@ -141,6 +152,7 @@ Menu RID_MENU_NAVIGATOR MenuItem { Identifier = SID_SHOW_PROPERTYBROWSER; + HelpId = SID_SHOW_PROPERTYBROWSER ; Command = ".uno:FormProperties"; Text [ en-US ] = "Properties..."; }; @@ -169,7 +181,7 @@ Menu RID_MENU_NAVIGATOR { ITEM_EDIT_PASTE }; -*/ +*/ }; }; diff --git a/reportdesign/source/ui/dlg/PageNumber.cxx b/reportdesign/source/ui/dlg/PageNumber.cxx index 10e9f64b852c..8ea8aef3e8b0 100644 --- a/reportdesign/source/ui/dlg/PageNumber.cxx +++ b/reportdesign/source/ui/dlg/PageNumber.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -67,14 +67,14 @@ OPageNumberDialog::OPageNumberDialog( Window* _pParent ,m_aAlignment(this, ModuleRes(FL_ALIGNMENT) ) ,m_aAlignmentLst(this, ModuleRes(LST_ALIGNMENT) ) ,m_aShowNumberOnFirstPage(this, ModuleRes(CB_SHOWNUMBERONFIRSTPAGE) ) - ,m_aFl1(this, ModuleRes(FL_SEPARATOR1)) - ,m_aPB_OK(this, ModuleRes(PB_OK)) - ,m_aPB_CANCEL(this, ModuleRes(PB_CANCEL)) - ,m_aPB_Help(this, ModuleRes(PB_HELP)) + ,m_aFl1(this, ModuleRes(FL_SEPARATOR1)) + ,m_aPB_OK(this, ModuleRes(PB_OK)) + ,m_aPB_CANCEL(this, ModuleRes(PB_CANCEL)) + ,m_aPB_Help(this, ModuleRes(PB_HELP)) ,m_pController(_pController) ,m_xHoldAlive(_xHoldAlive) { - DBG_CTOR( rpt_OPageNumberDialog,NULL); + DBG_CTOR( rpt_OPageNumberDialog,NULL); m_aShowNumberOnFirstPage.Hide(); @@ -84,7 +84,7 @@ OPageNumberDialog::OPageNumberDialog( Window* _pParent //------------------------------------------------------------------------ OPageNumberDialog::~OPageNumberDialog() { - DBG_DTOR( rpt_OPageNumberDialog,NULL); + DBG_DTOR( rpt_OPageNumberDialog,NULL); } // ----------------------------------------------------------------------------- short OPageNumberDialog::Execute() diff --git a/reportdesign/source/ui/dlg/PageNumber.hrc b/reportdesign/source/ui/dlg/PageNumber.hrc index a6087c50b00f..65318a500a26 100644 --- a/reportdesign/source/ui/dlg/PageNumber.hrc +++ b/reportdesign/source/ui/dlg/PageNumber.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,33 +27,33 @@ #ifndef RPTUI_PAGENUMBER_HRC #define RPTUI_PAGENUMBER_HRC -#define FL_FORMAT (1) -#define RB_PAGE_N (2) -#define RB_PAGE_N_OF_M (3) -#define FL_POSITION (4) -#define RB_PAGE_TOPPAGE (5) -#define RB_PAGE_BOTTOMPAGE (6) -#define FL_ALIGNMENT (7) -#define LST_ALIGNMENT (8) -#define CB_SHOWNUMBERONFIRSTPAGE (9) -#define PB_OK (10) -#define PB_CANCEL (11) -#define PB_HELP (12) -#define FL_SEPARATOR1 (13) -#define FL_MISC (14) +#define FL_FORMAT (1) +#define RB_PAGE_N (2) +#define RB_PAGE_N_OF_M (3) +#define FL_POSITION (4) +#define RB_PAGE_TOPPAGE (5) +#define RB_PAGE_BOTTOMPAGE (6) +#define FL_ALIGNMENT (7) +#define LST_ALIGNMENT (8) +#define CB_SHOWNUMBERONFIRSTPAGE (9) +#define PB_OK (10) +#define PB_CANCEL (11) +#define PB_HELP (12) +#define FL_SEPARATOR1 (13) +#define FL_MISC (14) -#define CHECKBOX_HEIGHT 8 -#define FIXEDTEXT_HEIGHT 8 -#define FIXEDTEXT_WIDTH 60 -#define RELATED_CONTROLS 4 -#define UNRELATED_CONTROLS 7 -#define EDIT_HEIGHT 12 -#define BUTTON_HEIGHT 14 -#define BUTTON_WIDTH 50 -#define BROWSER_HEIGHT 75 -#define PAGE_WIDTH (RELATED_CONTROLS + 3*UNRELATED_CONTROLS + 3*BUTTON_WIDTH) -#define PAGE_HEIGHT ( 8*RELATED_CONTROLS + 4*UNRELATED_CONTROLS + 9*FIXEDTEXT_HEIGHT + BUTTON_HEIGHT +1 ) -#define LISTBOX_WIDTH PAGE_WIDTH - 3*UNRELATED_CONTROLS - FIXEDTEXT_WIDTH +#define CHECKBOX_HEIGHT 8 +#define FIXEDTEXT_HEIGHT 8 +#define FIXEDTEXT_WIDTH 60 +#define RELATED_CONTROLS 4 +#define UNRELATED_CONTROLS 7 +#define EDIT_HEIGHT 12 +#define BUTTON_HEIGHT 14 +#define BUTTON_WIDTH 50 +#define BROWSER_HEIGHT 75 +#define PAGE_WIDTH (RELATED_CONTROLS + 3*UNRELATED_CONTROLS + 3*BUTTON_WIDTH) +#define PAGE_HEIGHT ( 8*RELATED_CONTROLS + 4*UNRELATED_CONTROLS + 9*FIXEDTEXT_HEIGHT + BUTTON_HEIGHT +1 ) +#define LISTBOX_WIDTH PAGE_WIDTH - 3*UNRELATED_CONTROLS - FIXEDTEXT_WIDTH #endif // RPTUI_PAGENUMBER_HRC diff --git a/reportdesign/source/ui/dlg/PageNumber.src b/reportdesign/source/ui/dlg/PageNumber.src index c5c760e1755d..751bb7c547e0 100644 --- a/reportdesign/source/ui/dlg/PageNumber.src +++ b/reportdesign/source/ui/dlg/PageNumber.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,17 +44,16 @@ ModalDialog RID_PAGENUMBERS HelpId = HID_RPT_PAGENUMBERS_DLG; Moveable = TRUE ; Closeable = TRUE ; - + FixedLine FL_FORMAT { Pos = MAP_APPFONT ( RELATED_CONTROLS , RELATED_CONTROLS ) ; Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS, FIXEDTEXT_HEIGHT ) ; Text [ en-US ] = "Format"; }; - + RadioButton RB_PAGE_N { - HelpID = "reportdesign:RadioButton:RID_PAGENUMBERS:RB_PAGE_N"; Pos = MAP_APPFONT ( UNRELATED_CONTROLS + RELATED_CONTROLS, 2*RELATED_CONTROLS + FIXEDTEXT_HEIGHT) ; Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ; Group = TRUE; @@ -63,22 +62,20 @@ ModalDialog RID_PAGENUMBERS }; RadioButton RB_PAGE_N_OF_M { - HelpID = "reportdesign:RadioButton:RID_PAGENUMBERS:RB_PAGE_N_OF_M"; Pos = MAP_APPFONT ( UNRELATED_CONTROLS + RELATED_CONTROLS, 3*RELATED_CONTROLS + 2*FIXEDTEXT_HEIGHT) ; Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ; Text [ en-US ] = "Page N of M"; }; - + FixedLine FL_POSITION { Pos = MAP_APPFONT ( RELATED_CONTROLS , 3*RELATED_CONTROLS + UNRELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT) ; Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ; Text [ en-US ] = "Position"; }; - + RadioButton RB_PAGE_TOPPAGE { - HelpID = "reportdesign:RadioButton:RID_PAGENUMBERS:RB_PAGE_TOPPAGE"; Pos = MAP_APPFONT ( UNRELATED_CONTROLS + RELATED_CONTROLS, 4*RELATED_CONTROLS + UNRELATED_CONTROLS + 4*FIXEDTEXT_HEIGHT) ; Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ; Group = TRUE; @@ -87,19 +84,18 @@ ModalDialog RID_PAGENUMBERS }; RadioButton RB_PAGE_BOTTOMPAGE { - HelpID = "reportdesign:RadioButton:RID_PAGENUMBERS:RB_PAGE_BOTTOMPAGE"; Pos = MAP_APPFONT ( UNRELATED_CONTROLS + RELATED_CONTROLS, 5*RELATED_CONTROLS + UNRELATED_CONTROLS + 5*FIXEDTEXT_HEIGHT) ; - Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ; + Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ; Text [ en-US ] = "Bottom of Page (Footer)"; }; - + FixedLine FL_MISC { Pos = MAP_APPFONT ( RELATED_CONTROLS , 5*RELATED_CONTROLS + 2*UNRELATED_CONTROLS + 6*FIXEDTEXT_HEIGHT) ; Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ; Text [ en-US ] = "General"; }; - + FixedText FL_ALIGNMENT { Pos = MAP_APPFONT ( UNRELATED_CONTROLS , 6*RELATED_CONTROLS + 2*UNRELATED_CONTROLS + 7*FIXEDTEXT_HEIGHT) ; @@ -108,7 +104,6 @@ ModalDialog RID_PAGENUMBERS }; ListBox LST_ALIGNMENT { - HelpID = "reportdesign:ListBox:RID_PAGENUMBERS:LST_ALIGNMENT"; Border = TRUE; Pos = MAP_APPFONT( 2*UNRELATED_CONTROLS + FIXEDTEXT_WIDTH , 6*RELATED_CONTROLS + 2*UNRELATED_CONTROLS + 7*FIXEDTEXT_HEIGHT -1); Size = MAP_APPFONT( LISTBOX_WIDTH, 60 ); @@ -126,7 +121,6 @@ ModalDialog RID_PAGENUMBERS }; CheckBox CB_SHOWNUMBERONFIRSTPAGE { - HelpID = "reportdesign:CheckBox:RID_PAGENUMBERS:CB_SHOWNUMBERONFIRSTPAGE"; Pos = MAP_APPFONT ( UNRELATED_CONTROLS , 6*RELATED_CONTROLS + 3*UNRELATED_CONTROLS + 8*FIXEDTEXT_HEIGHT) ; Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ; Check = TRUE; @@ -152,7 +146,7 @@ ModalDialog RID_PAGENUMBERS }; HelpButton PB_HELP { - TabStop = TRUE ; + TabStop = TRUE ; Pos = MAP_APPFONT ( RELATED_CONTROLS + 2*UNRELATED_CONTROLS + 2*BUTTON_WIDTH , 7*RELATED_CONTROLS + 4*UNRELATED_CONTROLS + 9*FIXEDTEXT_HEIGHT +1) ; Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ; Text [ en-US ] = "~Help"; diff --git a/reportdesign/source/ui/dlg/dlgpage.cxx b/reportdesign/source/ui/dlg/dlgpage.cxx index 33547cdd3fe0..bdea855c9e77 100644 --- a/reportdesign/source/ui/dlg/dlgpage.cxx +++ b/reportdesign/source/ui/dlg/dlgpage.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,15 +30,15 @@ #include <svx/dialogs.hrc> #include <svx/tabarea.hxx> -#include <svx/flagsdef.hxx> -#include <svx/svxdlg.hxx> -#include <editeng/svxenum.hxx> +#include <svx/flagsdef.hxx> +#include <svx/svxdlg.hxx> +#include <editeng/svxenum.hxx> #include "dlgpage.hxx" #include "ModuleHelper.hxx" #include "RptResId.hrc" -#include <svl/intitem.hxx> +#include <svl/intitem.hxx> //add CHINA001 #include <svl/cjkoptions.hxx> -#include <svl/aeitem.hxx> +#include <svl/aeitem.hxx> namespace rptui { @@ -48,35 +48,39 @@ namespace rptui |* \************************************************************************/ -ORptPageDialog::ORptPageDialog( Window* pParent, const SfxItemSet* pAttr,sal_uInt16 _nPageId) : +ORptPageDialog::ORptPageDialog( Window* pParent, const SfxItemSet* pAttr,USHORT _nPageId) : SfxTabDialog ( pParent, ModuleRes( _nPageId ), pAttr ), - rOutAttrs ( *pAttr ) -{ - SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); - OSL_ENSURE(pFact, "Dialogdiet fail!"); + rOutAttrs ( *pAttr ) +{ + SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); + DBG_ASSERT(pFact, "Dialogdiet fail!"); switch( _nPageId ) { case RID_PAGEDIALOG_BACKGROUND: AddTabPage( RID_SVXPAGE_BACKGROUND,String(ModuleRes(1))); break; case RID_PAGEDIALOG_PAGE: + //AddTabPage( RID_SVXPAGE_PAGE,String(ModuleRes(1))); + // AddTabPage( RID_SVXPAGE_BACKGROUND,String(ModuleRes(1))); AddTabPage(RID_SVXPAGE_PAGE, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PAGE ), 0 ); - AddTabPage(RID_SVXPAGE_BACKGROUND, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), 0 ); + AddTabPage(RID_SVXPAGE_BACKGROUND, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), 0 ); break; case RID_PAGEDIALOG_CHAR: AddTabPage(RID_PAGE_CHAR, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), 0 ); - AddTabPage(RID_PAGE_EFFECTS, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), 0 ); - AddTabPage(RID_PAGE_POSITION, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_POSITION ), 0 ); - AddTabPage(RID_PAGE_TWOLN, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_TWOLINES ), 0 ); + AddTabPage(RID_PAGE_EFFECTS, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), 0 ); + AddTabPage(RID_PAGE_POSITION, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_POSITION ), 0 ); + AddTabPage(RID_PAGE_TWOLN, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_TWOLINES ), 0 ); AddTabPage(RID_PAGE_BACKGROUND, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), 0 ); AddTabPage(RID_PAGE_ALIGNMENT, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_ALIGNMENT ), 0 ); - + break; case RID_PAGEDIALOG_LINE: AddTabPage( RID_SVXPAGE_LINE,pFact->GetTabPageCreatorFunc( RID_SVXPAGE_LINE ), 0 ); + //AddTabPage( RID_SVXPAGE_LINE_DEF,pFact->GetTabPageCreatorFunc( RID_SVXPAGE_LINE_DEF ), 0 ); + //AddTabPage( RID_SVXPAGE_LINEEND_DEF,pFact->GetTabPageCreatorFunc( RID_SVXPAGE_LINEEND_DEF ), 0 ); break; default: - OSL_FAIL("Unknown page id"); + OSL_ENSURE(0,"Unknown page id"); } SvtCJKOptions aCJKOptions; diff --git a/reportdesign/source/ui/dlg/dlgpage.src b/reportdesign/source/ui/dlg/dlgpage.src index dd05a94b6395..78873f1b1238 100644 --- a/reportdesign/source/ui/dlg/dlgpage.src +++ b/reportdesign/source/ui/dlg/dlgpage.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -79,11 +79,12 @@ TabDialog RID_PAGEDIALOG_PAGE { Pos = MAP_APPFONT ( 169 , 151 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; + /* ### ACHTUNG: Neuer Text in Resource? Zurück : Zur³ck */ Text [ en-US ] = "Return" ; TabStop = TRUE ; }; Text [ x-comment ] = " "; - + String 1 { Text [ en-US ] = "Page" ; @@ -128,12 +129,13 @@ TabDialog RID_PAGEDIALOG_BACKGROUND { Pos = MAP_APPFONT ( 169 , 151 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; + /* ### ACHTUNG: Neuer Text in Resource? Zurück : Zur³ck */ Text [ en-US ] = "Return" ; TabStop = TRUE ; Text [ x-comment ] = " "; }; Text [ x-comment ] = " "; - + String 1 { Text [ en-US ] = "Background" ; @@ -216,12 +218,13 @@ TabDialog RID_PAGEDIALOG_CHAR { Pos = MAP_APPFONT ( 169 , 151 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; + /* ### ACHTUNG: Neuer Text in Resource? Zurück : Zur³ck */ Text [ en-US ] = "Return" ; TabStop = TRUE ; Text [ x-comment ] = " "; }; Text [ x-comment ] = " "; - + String 1 { Text [ en-US ] = "Character" ; @@ -287,12 +290,13 @@ TabDialog RID_PAGEDIALOG_LINE { Pos = MAP_APPFONT ( 169 , 151 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; + /* ### ACHTUNG: Neuer Text in Resource? Zurück : Zur³ck */ Text [ en-US ] = "Return" ; TabStop = TRUE ; Text [ x-comment ] = " "; }; Text [ x-comment ] = " "; - + String 1 { Text [ en-US ] = "Line" ; diff --git a/reportdesign/source/ui/inc/AddField.hxx b/reportdesign/source/ui/inc/AddField.hxx index 374ec169a055..074f15a4ceae 100644 --- a/reportdesign/source/ui/inc/AddField.hxx +++ b/reportdesign/source/ui/inc/AddField.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,8 +57,8 @@ namespace rptui class OAddFieldWindow; class OAddFieldWindowListBox; //======================================================================== -class OAddFieldWindow :public FloatingWindow - , public ::cppu::BaseMutex +class OAddFieldWindow :public FloatingWindow + , public ::cppu::BaseMutex , public ::comphelper::OPropertyChangeListener , public ::comphelper::OContainerListener , public dbaui::OToolBoxHelper @@ -69,17 +69,17 @@ class OAddFieldWindow :public FloatingWindow ToolBox m_aActions; - ::std::auto_ptr<OAddFieldWindowListBox> m_pListBox; + ::std::auto_ptr<OAddFieldWindowListBox> m_pListBox; FixedLine m_aFixedLine; FixedText m_aHelpText; PushButton m_aInsertButton; Link m_aCreateLink; - ::rtl::OUString m_aCommandName; + ::rtl::OUString m_aCommandName; ::rtl::OUString m_sFilter; - sal_Int32 m_nCommandType; + sal_Int32 m_nCommandType; sal_Bool m_bEscapeProcessing; - ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> m_pChangeListener; + ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> m_pChangeListener; ::rtl::Reference< comphelper::OContainerListenerAdapter> m_pContainerListener; DECL_LINK( OnDoubleClickHdl, void* ); @@ -97,8 +97,8 @@ public: virtual void GetFocus(); virtual long PreNotify( NotifyEvent& _rNEvt ); - inline const ::rtl::OUString& GetCommand() const { return m_aCommandName; } - inline sal_Int32 GetCommandType() const { return m_nCommandType; } + inline const ::rtl::OUString& GetCommand() const { return m_aCommandName; } + inline sal_Int32 GetCommandType() const { return m_nCommandType; } inline sal_Bool GetEscapeProcessing() const { return m_bEscapeProcessing; } inline void SetCreateHdl(const Link& _aCreateLink) { m_aCreateLink = _aCreateLink; } @@ -110,8 +110,10 @@ public: /** will be called when the id of the image list is needed. @param _eBitmapSet <svtools/imgdef.hxx> + @param _bHiContast + <TRUE/> when in high contrast mode. */ - virtual ImageList getImageList(sal_Int16 _eBitmapSet) const; + virtual ImageList getImageList(sal_Int16 _eBitmapSet,sal_Bool _bHiContast) const; /** will be called when the controls need to be resized. */ diff --git a/reportdesign/source/ui/inc/ColorChanger.hxx b/reportdesign/source/ui/inc/ColorChanger.hxx index db58419fca42..e794de95ffe7 100644 --- a/reportdesign/source/ui/inc/ColorChanger.hxx +++ b/reportdesign/source/ui/inc/ColorChanger.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ namespace rptui class ColorChanger { protected: - OutputDevice* m_pDev; + OutputDevice* m_pDev; public: ColorChanger( OutputDevice* _pDev, const Color& _rNewLineColor) diff --git a/reportdesign/source/ui/inc/ColorListener.hxx b/reportdesign/source/ui/inc/ColorListener.hxx index b3ded2a5aaf8..13677f7e53fd 100644 --- a/reportdesign/source/ui/inc/ColorListener.hxx +++ b/reportdesign/source/ui/inc/ColorListener.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,14 +42,14 @@ namespace rptui void operator =(const OColorListener&); protected: OModuleClient m_aModuleClient; - Link m_aCollapsedLink; - svtools::ColorConfig m_aColorConfig; - svtools::ExtendedColorConfig m_aExtendedColorConfig; - ::rtl::OUString m_sColorEntry; - sal_Int32 m_nColor; - sal_Int32 m_nTextBoundaries; - sal_Bool m_bCollapsed; - sal_Bool m_bMarked; + Link m_aCollapsedLink; + svtools::ColorConfig m_aColorConfig; + svtools::ExtendedColorConfig m_aExtendedColorConfig; + ::rtl::OUString m_sColorEntry; + sal_Int32 m_nColor; + sal_Int32 m_nTextBoundaries; + sal_Bool m_bCollapsed; + sal_Bool m_bMarked; virtual void ImplInitSettings() = 0; protected: @@ -63,22 +63,22 @@ namespace rptui virtual void Notify(SfxBroadcaster & rBc, SfxHint const & rHint); /** set the marker as marked or not marked - @param _bMark set the new state of the marker + @param _bMark set the new state of the marker */ - void setMarked(sal_Bool _bMark); + void setMarked(sal_Bool _bMark); /** returns if the section is marked */ - inline sal_Bool isMarked() const { return m_bMarked; } + inline sal_Bool isMarked() const { return m_bMarked; } - inline void setCollapsedHdl(const Link& _aLink ){ m_aCollapsedLink = _aLink; } - inline sal_Bool isCollapsed() const { return m_bCollapsed; } + inline void setCollapsedHdl(const Link& _aLink ){ m_aCollapsedLink = _aLink; } + inline sal_Bool isCollapsed() const { return m_bCollapsed; } /** collapse or expand * * \param _bCollapsed */ - virtual void setCollapsed(sal_Bool _bCollapsed); + virtual void setCollapsed(sal_Bool _bCollapsed); }; } #endif // RPTUI_COLORLISTENER_HXX diff --git a/reportdesign/source/ui/inc/ColumnInfo.hxx b/reportdesign/source/ui/inc/ColumnInfo.hxx index bdbdfd3d5f6d..eddde4c724fa 100644 --- a/reportdesign/source/ui/inc/ColumnInfo.hxx +++ b/reportdesign/source/ui/inc/ColumnInfo.hxx @@ -2,11 +2,14 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite * + * $RCSfile: AddField.cxx,v $ + * $Revision: 1.5 $ + * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -37,13 +40,13 @@ namespace rptui ::rtl::OUString sColumnName; ::rtl::OUString sLabel; bool bColumn; - ColumnInfo(const ::rtl::OUString& i_sColumnName,const ::rtl::OUString& i_sLabel) + ColumnInfo(const ::rtl::OUString& i_sColumnName,const ::rtl::OUString& i_sLabel) : sColumnName(i_sColumnName) , sLabel(i_sLabel) , bColumn(true) { } - ColumnInfo(const ::rtl::OUString& i_sColumnName) + ColumnInfo(const ::rtl::OUString& i_sColumnName) : sColumnName(i_sColumnName) , bColumn(false) { diff --git a/reportdesign/source/ui/inc/CondFormat.hxx b/reportdesign/source/ui/inc/CondFormat.hxx index 5ccd968c6a66..1d775e19f7a8 100644 --- a/reportdesign/source/ui/inc/CondFormat.hxx +++ b/reportdesign/source/ui/inc/CondFormat.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,7 +61,7 @@ namespace rptui public: virtual void addCondition( size_t _nAddAfterIndex ) = 0; virtual void deleteCondition( size_t _nCondIndex ) = 0; - virtual void applyCommand( size_t _nCondIndex, sal_uInt16 _nCommandId, const ::Color _aColor ) = 0; + virtual void applyCommand( size_t _nCondIndex, USHORT _nCommandId, const ::Color _aColor ) = 0; virtual void moveConditionUp( size_t _nCondIndex ) = 0; virtual void moveConditionDown( size_t _nCondIndex ) = 0; virtual ::rtl::OUString getDataField() const = 0; @@ -110,7 +110,7 @@ namespace rptui // IConditionalFormatAction overridables virtual void addCondition( size_t _nAddAfterIndex ); virtual void deleteCondition( size_t _nCondIndex ); - virtual void applyCommand( size_t _nCondIndex, sal_uInt16 _nCommandId, const ::Color _aColor ); + virtual void applyCommand( size_t _nCondIndex, USHORT _nCommandId, const ::Color _aColor ); virtual void moveConditionUp( size_t _nCondIndex ); virtual void moveConditionDown( size_t _nCondIndex ); virtual ::rtl::OUString getDataField() const; diff --git a/reportdesign/source/ui/inc/DataProviderHandler.hxx b/reportdesign/source/ui/inc/DataProviderHandler.hxx index 458debb305b3..80f0a5f4aa49 100644 --- a/reportdesign/source/ui/inc/DataProviderHandler.hxx +++ b/reportdesign/source/ui/inc/DataProviderHandler.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -101,7 +101,7 @@ namespace rptui DataProviderHandler(DataProviderHandler &); // not defined void operator =(DataProviderHandler &); // not defined - + bool impl_dialogLinkedFields_nothrow( ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const; bool impl_dialogChartType_nothrow( ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const; void impl_updateChartTitle_throw(const ::com::sun::star::uno::Any& _aValue); diff --git a/reportdesign/source/ui/inc/DateTime.hxx b/reportdesign/source/ui/inc/DateTime.hxx index 4d6f9a233a55..8c670ba5dc55 100644 --- a/reportdesign/source/ui/inc/DateTime.hxx +++ b/reportdesign/source/ui/inc/DateTime.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,40 +47,41 @@ class OReportController; |* Groups and Sorting dialog |* \************************************************************************/ -class ODateTimeDialog : public ModalDialog +class ODateTimeDialog : public ModalDialog { - CheckBox m_aDate; + // FixedLine m_aFLDate; + CheckBox m_aDate; FixedText m_aFTDateFormat; ListBox m_aDateListBox; - FixedLine m_aFL0; - CheckBox m_aTime; + FixedLine m_aFL0; + CheckBox m_aTime; FixedText m_aFTTimeFormat; ListBox m_aTimeListBox; - FixedLine m_aFL1; - OKButton m_aPB_OK; - CancelButton m_aPB_CANCEL; - HelpButton m_aPB_Help; + FixedLine m_aFL1; + OKButton m_aPB_OK; + CancelButton m_aPB_CANCEL; + HelpButton m_aPB_Help; svt::ControlDependencyManager m_aDateControlling; svt::ControlDependencyManager m_aTimeControlling; - ::rptui::OReportController* m_pController; - ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> + ::rptui::OReportController* m_pController; + ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> m_xHoldAlive; - ::com::sun::star::lang::Locale m_nLocale; + ::com::sun::star::lang::Locale m_nLocale; /** returns the frmat string * * \param _nNumberFormatKey the number format key - * \param _xFormats - * \param _bTime - * \return + * \param _xFormats + * \param _bTime + * \return */ ::rtl::OUString getFormatStringByKey(::sal_Int32 _nNumberFormatKey,const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats>& _xFormats,bool _bTime); /** returns the number format key - @param _nNumberFormatIndex the number format index @see com::sun::star::i18n::NumberFormatIndex + @param _nNumberFormatIndex the number format index @see com::sun::star::i18n::NumberFormatIndex */ sal_Int32 getFormatKey(sal_Bool _bDate) const; @@ -95,7 +96,7 @@ public: ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xHoldAlive ,::rptui::OReportController* _pController); virtual ~ODateTimeDialog(); - virtual short Execute(); + virtual short Execute(); }; // ============================================================================= } // namespace rptui diff --git a/reportdesign/source/ui/inc/DefaultInspection.hxx b/reportdesign/source/ui/inc/DefaultInspection.hxx index 43c62a761458..2149777e4cb2 100644 --- a/reportdesign/source/ui/inc/DefaultInspection.hxx +++ b/reportdesign/source/ui/inc/DefaultInspection.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/reportdesign/source/ui/inc/DesignView.hxx b/reportdesign/source/ui/inc/DesignView.hxx index a85f500de4df..c355a6c46d90 100644 --- a/reportdesign/source/ui/inc/DesignView.hxx +++ b/reportdesign/source/ui/inc/DesignView.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/datatransfer/DataFlavor.hpp> #include <tools/link.hxx> -#include <tools/gen.hxx> +#include <tools/gen.hxx> #include <vcl/timer.hxx> #include <svl/hint.hxx> #include <svl/brdcst.hxx> @@ -73,30 +73,30 @@ namespace rptui private: SplitWindow m_aSplitWin; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> m_xReportComponent; - OReportController& m_rReportController; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> m_xReportComponent; + OReportController& m_rReportController; OScrollWindowHelper m_aScrollWindow; - Window* m_pTaskPane; - PropBrw* m_pPropWin; - OAddFieldWindow* m_pAddField; - OSectionView* m_pCurrentView; + Window* m_pTaskPane; + PropBrw* m_pPropWin; + OAddFieldWindow* m_pAddField; + OSectionView* m_pCurrentView; ONavigator* m_pReportExplorer; - Timer m_aMarkTimer; - Point m_aScrollOffset; - DlgEdMode m_eMode; - sal_uInt16 m_nCurrentPosition; - sal_uInt16 m_eActObj; - sal_Bool m_bFirstDraw; + Timer m_aMarkTimer; + Point m_aScrollOffset; + DlgEdMode m_eMode; + USHORT m_nCurrentPosition; + USHORT m_eActObj; + BOOL m_bFirstDraw; Size m_aGridSizeCoarse; Size m_aGridSizeFine; - sal_Bool m_bGridVisible; - sal_Bool m_bGridSnap; - sal_Bool m_bDeleted; - + BOOL m_bGridVisible; + BOOL m_bGridSnap; + BOOL m_bDeleted; + DECL_LINK( MarkTimeout, Timer * ); DECL_LINK( SplitHdl, void* ); - + void ImplInitSettings(); ODesignView(ODesignView&); @@ -108,7 +108,7 @@ namespace rptui virtual void DataChanged( const DataChangedEvent& rDCEvt ); public: - ODesignView(Window* pParent, + ODesignView(Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&, OReportController& _rController); virtual ~ODesignView(); @@ -123,13 +123,13 @@ namespace rptui virtual void initialize(); - inline OReportController& getController() const { return m_rReportController; } + inline OReportController& getController() const { return m_rReportController; } - void SetMode( DlgEdMode m_eMode ); - void SetInsertObj( sal_uInt16 eObj,const ::rtl::OUString& _sShapeType = ::rtl::OUString()); - sal_uInt16 GetInsertObj() const; + void SetMode( DlgEdMode m_eMode ); + void SetInsertObj( USHORT eObj,const ::rtl::OUString& _sShapeType = ::rtl::OUString()); + USHORT GetInsertObj() const; rtl::OUString GetInsertObjString() const; - DlgEdMode GetMode() const { return m_eMode; } + DlgEdMode GetMode() const { return m_eMode; } /** cuts the current selection in this section */ @@ -139,11 +139,11 @@ namespace rptui */ void Copy(); - /** returns if paste is allowed + /** returns if paste is allowed * * \return <TRUE/> if paste is allowed */ - sal_Bool IsPasteAllowed() const; + BOOL IsPasteAllowed() const; /** paste a new control in this section */ @@ -163,59 +163,59 @@ namespace rptui void SelectAll(const sal_uInt16 _nObjectType); /// checks if a selection exists - sal_Bool HasSelection() const; + BOOL HasSelection() const; void UpdatePropertyBrowserDelayed(OSectionView& _rView); - sal_uInt16 getSectionCount() const; + USHORT getSectionCount() const; /** removes the section at the given position. * * \param _nPosition Zero based. */ - void removeSection(sal_uInt16 _nPosition); + void removeSection(USHORT _nPosition); /** adds a new section at position _nPosition. If the section is <NULL/> nothing happens. If the position is grater than the current elements, the section will be appended. */ - void addSection(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection + void addSection(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection ,const ::rtl::OUString& _sColorEntry - ,sal_uInt16 _nPosition = USHRT_MAX); + ,USHORT _nPosition = USHRT_MAX); inline Size getGridSizeCoarse() const { return m_aGridSizeCoarse; } inline Size getGridSizeFine() const { return m_aGridSizeFine; } - inline sal_Bool isGridSnap() const { return m_bGridSnap; } - void setGridSnap(sal_Bool bOn); - void setDragStripes(sal_Bool bOn); + inline BOOL isGridSnap() const { return m_bGridSnap; } + void setGridSnap(BOOL bOn); + void setDragStripes(BOOL bOn); /** turns the grid on or off * * \param _bGridVisible */ - void toggleGrid(sal_Bool _bGridVisible); + void toggleGrid(sal_Bool _bGridVisible); - void togglePropertyBrowser(sal_Bool _bToogleOn); + void togglePropertyBrowser(sal_Bool _bToogleOn); - sal_Bool isAddFieldVisible() const; - void toggleAddField(); + BOOL isAddFieldVisible() const; + void toggleAddField(); - sal_Bool isReportExplorerVisible() const; - void toggleReportExplorer(); + BOOL isReportExplorerVisible() const; + void toggleReportExplorer(); /** shows or hides the ruler. */ - void showRuler(sal_Bool _bShow); + void showRuler(sal_Bool _bShow); /** unmark all objects on the views without the given one. * * @param _pSectionView The view where the objects should not be unmarked. */ - void unmarkAllObjects(OSectionView* _pSectionView); + void unmarkAllObjects(OSectionView* _pSectionView); /** triggers the property browser with the section - @param _xReportComponent the report component + @param _xReportComponent the report component */ - void showProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _xReportComponent); + void showProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _xReportComponent); ::com::sun::star::uno::Any getCurrentlyShownProperty() const; /** returns the current section or the detail section if no section was selected previously @@ -247,17 +247,17 @@ namespace rptui void setCurrentPage(const ::rtl::OUString& _sLastActivePage); /** checks if the keycode is known by the child windows - @param _rCode the keycode + @param _rCode the keycode @return <TRUE/> if the keycode is handled otherwise <FALSE/> */ - sal_Bool handleKeyEvent(const KeyEvent& _rEvent); - + sal_Bool handleKeyEvent(const KeyEvent& _rEvent); + /** set the section as marked or not marked - @param _pSectionView the section where to set the marked flag - @param _bMark the marked flag + @param _pSectionView the section where to set the marked flag + @param _bMark the marked flag */ - void setMarked(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection,sal_Bool _bMark); - void setMarked(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> >& _xShape,sal_Bool _bMark); + void setMarked(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection,sal_Bool _bMark); + void setMarked(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> >& _xShape,sal_Bool _bMark); /** returns if the view handles the event by itself * @@ -287,7 +287,7 @@ namespace rptui sal_uInt16 getZoomFactor(SvxZoomType _eType) const; }; //================================================================== -} //rptui +} //rptui //================================================================== #endif // RPTUI_DESIGNVIEW_HXX diff --git a/reportdesign/source/ui/inc/EndMarker.hxx b/reportdesign/source/ui/inc/EndMarker.hxx index 7c435e94d35e..7c3d3205adea 100644 --- a/reportdesign/source/ui/inc/EndMarker.hxx +++ b/reportdesign/source/ui/inc/EndMarker.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,7 +47,7 @@ namespace rptui // windows virtual void Paint( const Rectangle& rRect ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ); }; } #endif // RPTUI_ENDMARKER_HXX diff --git a/reportdesign/source/ui/inc/FixedTextColor.hxx b/reportdesign/source/ui/inc/FixedTextColor.hxx index 9120aa433537..858aa54a78de 100644 --- a/reportdesign/source/ui/inc/FixedTextColor.hxx +++ b/reportdesign/source/ui/inc/FixedTextColor.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,6 +54,8 @@ namespace rptui void setPropertyTextColor(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XVclWindowPeer >& _xVclWindowPeer, sal_Int32 _nFormatKey); + // sal_Int32 getTextColor(); + public: FixedTextColor(const OReportController & _aObserver); virtual ~FixedTextColor(); diff --git a/reportdesign/source/ui/inc/FormattedFieldBeautifier.hxx b/reportdesign/source/ui/inc/FormattedFieldBeautifier.hxx index 4c2038e8e6a3..fac75dd65c8c 100644 --- a/reportdesign/source/ui/inc/FormattedFieldBeautifier.hxx +++ b/reportdesign/source/ui/inc/FormattedFieldBeautifier.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/reportdesign/source/ui/inc/Formula.hxx b/reportdesign/source/ui/inc/Formula.hxx index c458ccf240e4..c4cc37087242 100644 --- a/reportdesign/source/ui/inc/Formula.hxx +++ b/reportdesign/source/ui/inc/Formula.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,7 +51,7 @@ class FormulaDialog : public formula::FormulaModalDialog, { ::boost::shared_ptr< formula::IFunctionManager > m_aFunctionManager; formula::FormEditData* m_pFormulaData; - OAddFieldWindow* m_pAddField; + OAddFieldWindow* m_pAddField; ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > m_xRowSet; ::com::sun::star::uno::Reference< ::com::sun::star::report::meta::XFormulaParser> m_xParser; ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XFormulaOpCodeMapper> m_xOpCodeMapper; @@ -73,11 +73,11 @@ public: virtual void notifyChange(); virtual void fill(); virtual bool calculateValue(const String& _sExpression,String& _rResult); - virtual void doClose(sal_Bool _bOk); - virtual void insertEntryToLRUList(const formula::IFunctionDescription* pDesc); + virtual void doClose(BOOL _bOk); + virtual void insertEntryToLRUList(const formula::IFunctionDescription* pDesc); virtual void showReference(const String& _sFormula); - virtual void dispatch(sal_Bool _bOK,sal_Bool _bMartixChecked); - virtual void setDispatcherLock( sal_Bool bLock ); + virtual void dispatch(BOOL _bOK,BOOL _bMartixChecked); + virtual void setDispatcherLock( BOOL bLock ); virtual void setReferenceInput(const formula::FormEditData* _pData); virtual void deleteFormData(); virtual void clear(); @@ -97,12 +97,12 @@ public: // IControlReferenceHandler virtual void ShowReference(const String& _sRef); - virtual void HideReference( sal_Bool bDoneRefMode = sal_True ); + virtual void HideReference( BOOL bDoneRefMode = TRUE ); virtual void ReleaseFocus( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL ); virtual void ToggleCollapsed( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL ); protected: - void HighlightFunctionParas(const String& aFormula); + void HighlightFunctionParas(const String& aFormula); }; // ============================================================================= diff --git a/reportdesign/source/ui/inc/FunctionHelper.hxx b/reportdesign/source/ui/inc/FunctionHelper.hxx index e59be1a5c8bf..207977fc46e1 100644 --- a/reportdesign/source/ui/inc/FunctionHelper.hxx +++ b/reportdesign/source/ui/inc/FunctionHelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -79,10 +79,10 @@ public: virtual ::rtl::OUString getDescription() const ; virtual xub_StrLen getSuppressedArgumentCount() const ; virtual ::rtl::OUString getFormula(const ::std::vector< ::rtl::OUString >& _aArguments) const ; - virtual void fillVisibleArgumentMapping(::std::vector<sal_uInt16>& _rArguments) const ; + virtual void fillVisibleArgumentMapping(::std::vector<USHORT>& _rArguments) const ; virtual void initArgumentInfo() const; virtual ::rtl::OUString getSignature() const ; - virtual rtl::OString getHelpId() const ; + virtual long getHelpId() const ; virtual sal_uInt32 getParameterCount() const ; virtual ::rtl::OUString getParameterName(sal_uInt32 _nPos) const ; virtual ::rtl::OUString getParameterDescription(sal_uInt32 _nPos) const ; diff --git a/reportdesign/source/ui/inc/GeometryHandler.hxx b/reportdesign/source/ui/inc/GeometryHandler.hxx index 91504e7f1cb9..4c1b18ee5ebf 100644 --- a/reportdesign/source/ui/inc/GeometryHandler.hxx +++ b/reportdesign/source/ui/inc/GeometryHandler.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -140,9 +140,9 @@ namespace rptui /** clear the own properties like function and scope and send a notification * - * \param _aGuard - * \param _sOldFunctionName - * \param _sOldScope + * \param _aGuard + * \param _sOldFunctionName + * \param _sOldScope * \param _nOldDataFieldType */ void resetOwnProperties(::osl::ResettableMutexGuard& _aGuard,const ::rtl::OUString& _sOldFunctionName,const ::rtl::OUString& _sOldScope,const sal_uInt32 _nOldDataFieldType); @@ -196,7 +196,7 @@ namespace rptui * \param _sQuotedFunction the quoted function name * \param _Out_rDataField the data field which is used in the function * \param _xFunctionsSupplier teh function supplier to search or empty if not used - * \param _bSet If set to sal_True than the m_sDefaultFunction and m_sScope vars will be set if successful. + * \param _bSet If set to TRUE than the m_sDefaultFunction and m_sScope vars will be set if successful. * \return sal_True with known otherwise sal_False */ sal_Bool isDefaultFunction(const ::rtl::OUString& _sQuotedFunction @@ -206,10 +206,10 @@ namespace rptui /** checks if the given function is a default function we know. * - * \param _xFunction - * \param _rDataField - * \param _rsDefaultFunctionName - * \return + * \param _xFunction + * \param _rDataField + * \param _rsDefaultFunctionName + * \return */ sal_Bool impl_isDefaultFunction_nothrow( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunction>& _xFunction ,::rtl::OUString& _rDataField @@ -222,7 +222,7 @@ namespace rptui /** creates a default functionof the _sFunction for the data field _sDataField * The new function will only be created if it didn't exist. - * + * * \param _aGuard Will be cleared, when a new function was created. * \param _sFunction The name of the function. * \param _sDataField The name of the data field. diff --git a/reportdesign/source/ui/inc/GroupsSorting.hxx b/reportdesign/source/ui/inc/GroupsSorting.hxx index 22f195bac07e..d7e819e7348e 100644 --- a/reportdesign/source/ui/inc/GroupsSorting.hxx +++ b/reportdesign/source/ui/inc/GroupsSorting.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,7 +33,7 @@ #include <vcl/lstbox.hxx> #include <vcl/edit.hxx> #include <vcl/field.hxx> -#include <vcl/button.hxx> +#include <vcl/imagebtn.hxx> #include <vcl/toolbox.hxx> #include <com/sun/star/report/XGroups.hpp> #include <com/sun/star/report/XGroup.hpp> @@ -64,45 +64,49 @@ class OReportController; |* \************************************************************************/ -class OGroupsSortingDialog : public FloatingWindow - , public ::cppu::BaseMutex - , public ::comphelper::OPropertyChangeListener - , public dbaui::OToolBoxHelper - , public vcl::IImageListProvider +class OGroupsSortingDialog : public FloatingWindow + , public ::cppu::BaseMutex + , public ::comphelper::OPropertyChangeListener + ,public dbaui::OToolBoxHelper + ,public vcl::IImageListProvider { friend class OFieldExpressionControl; - FixedLine m_aFL2; - FixedText m_aMove; + FixedLine m_aFL2; + FixedText m_aMove; +//BTN ImageButton m_aPB_Up; +//BTN ImageButton m_aPB_Down; +//BTN ImageButton m_aPB_Delete; ToolBox m_aToolBox; - FixedLine m_aFL3; - FixedText m_aOrder; - ListBox m_aOrderLst; - FixedText m_aHeader; - ListBox m_aHeaderLst; - FixedText m_aFooter; - ListBox m_aFooterLst; - FixedText m_aGroupOn; - ListBox m_aGroupOnLst; - FixedText m_aGroupInterval; - NumericField m_aGroupIntervalEd; - FixedText m_aKeepTogether; - ListBox m_aKeepTogetherLst; - FixedLine m_aFL; - FixedText m_aHelpWindow; - - OFieldExpressionControl* m_pFieldExpression; - ::rptui::OReportController* m_pController; - ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> m_pCurrentGroupListener; - ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> m_pReportListener; - ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroups> m_xGroups; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xColumns; - sal_Bool m_bReadOnly; + FixedLine m_aFL3; + FixedText m_aOrder; + ListBox m_aOrderLst; + FixedText m_aHeader; + ListBox m_aHeaderLst; + FixedText m_aFooter; + ListBox m_aFooterLst; + FixedText m_aGroupOn; + ListBox m_aGroupOnLst; + FixedText m_aGroupInterval; + NumericField m_aGroupIntervalEd; + FixedText m_aKeepTogether; + ListBox m_aKeepTogetherLst; + FixedLine m_aFL; + FixedText m_aHelpWindow; + + OFieldExpressionControl* m_pFieldExpression; + ::rptui::OReportController* m_pController; + ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> m_pCurrentGroupListener; + ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> m_pReportListener; + ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroups> m_xGroups; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xColumns; + sal_Bool m_bReadOnly; private: DECL_LINK( OnControlFocusLost, Control* ); DECL_LINK( OnControlFocusGot, Control* ); DECL_LINK( LBChangeHdl, ListBox* ); +//BTN DECL_LINK( ClickHdl, ImageButton* ); DECL_LINK( OnFormatAction, ToolBox* ); /** returns the groups @@ -110,19 +114,19 @@ private: */ ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroups>& getGroups() { return m_xGroups; } - ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup> getGroup(sal_Int32 _nPos) - { + ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup> getGroup(sal_Int32 _nPos) + { OSL_ENSURE(_nPos >= 0 && _nPos < m_xGroups->getCount(),"Invalid count!"); return ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup>(m_xGroups->getByIndex(_nPos),::com::sun::star::uno::UNO_QUERY); } /** updates the listboxes with the new group properties - @param _nRow the new group pos + @param _nRow the new group pos */ void DisplayData( sal_Int32 _nRow ); /** saves the values from the listboxes into the group at position _nRow - @param _nRow the group pos to store in + @param _nRow the group pos to store in */ void SaveData( sal_Int32 _nRow ); @@ -136,20 +140,20 @@ private: sal_Int32 getColumnDataType(const ::rtl::OUString& _sColumnName); /** shows the text given by the id in the multiline edit - @param _nResId the string id + @param _nResId the string id */ - void showHelpText(sal_uInt16 _nResId); + void showHelpText(USHORT _nResId); /** display the group props - @param _xGroup the group to display + @param _xGroup the group to display */ void displayGroup(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup>& _xGroup); /** enables or diables the up and down button - @param _nRow the row which will be active + @param _nRow the row which will be active */ void checkButtons(sal_Int32 _nRow); - /** clears the m_xColumns member and reset the fields + /** clears the m_xColumns member and reset the fields * */ void fillColumns(); @@ -157,9 +161,9 @@ private: void operator =(OGroupsSortingDialog&); protected: // window - virtual void Resize(); + virtual void Resize(); // OPropertyChangeListener - virtual void _propertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& _rEvent) throw( ::com::sun::star::uno::RuntimeException); + virtual void _propertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& _rEvent) throw( ::com::sun::star::uno::RuntimeException); public: OGroupsSortingDialog( Window* pParent ,sal_Bool _bReadOnly @@ -167,7 +171,7 @@ public: virtual ~OGroupsSortingDialog(); /** sets the newe columns at the groups dialog. - @param _xColumns the new columns + @param _xColumns the new columns */ void setColumns(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xColumns); @@ -176,16 +180,18 @@ public: void UpdateData( ); /** will be called when the controls need to be resized. - @param _rDiff + @param _rDiff Contains the difference of the old and new toolbox size. */ virtual void resizeControls(const Size& _rDiff); /** will be called when the image list is needed. - @param _eSymbolsSize + @param _eSymbolsSize <svtools/imgdef.hxx> + @param _bHiContast + <TRUE/> when in high contrast mode. */ - virtual ImageList getImageList(sal_Int16 _eSymbolsSize) const; + virtual ImageList getImageList(sal_Int16 _eSymbolsSize,sal_Bool _bHiContast) const; // ImageListProvider interface virtual ImageList getImageList(vcl::ImageListType) SAL_THROW ((com::sun::star::lang::IllegalArgumentException )); diff --git a/reportdesign/source/ui/inc/IReportControllerObserver.hxx b/reportdesign/source/ui/inc/IReportControllerObserver.hxx index 09d76f9769b4..26b1d7d9c977 100644 --- a/reportdesign/source/ui/inc/IReportControllerObserver.hxx +++ b/reportdesign/source/ui/inc/IReportControllerObserver.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,9 +40,9 @@ namespace rptui protected: // IReportControllerObserver(){} virtual ~IReportControllerObserver() {} - + public: - + virtual void notifyPropertyChange( const ::com::sun::star::beans::PropertyChangeEvent& _rEvent ) = 0; virtual void notifyElementInserted( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxElement ) = 0; virtual void handle( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxElement ) = 0; diff --git a/reportdesign/source/ui/inc/InsertFunctions.hxx b/reportdesign/source/ui/inc/InsertFunctions.hxx index 802a6b993850..ff55d62151c8 100644 --- a/reportdesign/source/ui/inc/InsertFunctions.hxx +++ b/reportdesign/source/ui/inc/InsertFunctions.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,6 +41,6 @@ namespace rptui // --------- } // namespace rptui // --------- -#endif // RPT_INSERTFUNCTIONS_HXX_INCLUDED +#endif // RPT_INSERTFUNCTIONS_HXX_INCLUDED /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inc/MarkedSection.hxx b/reportdesign/source/ui/inc/MarkedSection.hxx index a879e7053d2a..126693d2deaa 100644 --- a/reportdesign/source/ui/inc/MarkedSection.hxx +++ b/reportdesign/source/ui/inc/MarkedSection.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ namespace rptui PREVIOUS = -1, POST = 1 }; - + class IMarkedSection { public: @@ -55,7 +55,7 @@ namespace rptui */ virtual void markSection(const sal_uInt16 _nPos) = 0; }; - + } // rptui #endif /* RPTUI_MARKEDSECTION_HXX */ diff --git a/reportdesign/source/ui/inc/Navigator.hxx b/reportdesign/source/ui/inc/Navigator.hxx index 05cb003b85f0..8ddcb0c65524 100644 --- a/reportdesign/source/ui/inc/Navigator.hxx +++ b/reportdesign/source/ui/inc/Navigator.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ namespace rptui class ONavigatorImpl; class ONavigator : public FloatingWindow { - OModuleClient m_aModuleClient; + OModuleClient m_aModuleClient; ::std::auto_ptr<ONavigatorImpl> m_pImpl; ONavigator(const ONavigator&); void operator =(const ONavigator&); @@ -47,7 +47,7 @@ namespace rptui virtual ~ONavigator(); // window - virtual void Resize(); + virtual void Resize(); virtual void GetFocus(); }; // ============================================================================= diff --git a/reportdesign/source/ui/inc/PageNumber.hxx b/reportdesign/source/ui/inc/PageNumber.hxx index e42530dd22a8..65d4f4f3c23d 100644 --- a/reportdesign/source/ui/inc/PageNumber.hxx +++ b/reportdesign/source/ui/inc/PageNumber.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,28 +44,28 @@ class OReportController; |* Groups and Sorting dialog |* \************************************************************************/ -class OPageNumberDialog : public ModalDialog +class OPageNumberDialog : public ModalDialog { - FixedLine m_aFormat; - RadioButton m_aPageN; - RadioButton m_aPageNofM; + FixedLine m_aFormat; + RadioButton m_aPageN; + RadioButton m_aPageNofM; - FixedLine m_aPosition; - RadioButton m_aTopPage; - RadioButton m_aBottomPage; - FixedLine m_aMisc; - FixedText m_aAlignment; - ListBox m_aAlignmentLst; + FixedLine m_aPosition; + RadioButton m_aTopPage; + RadioButton m_aBottomPage; + FixedLine m_aMisc; + FixedText m_aAlignment; + ListBox m_aAlignmentLst; - CheckBox m_aShowNumberOnFirstPage; - FixedLine m_aFl1; - OKButton m_aPB_OK; - CancelButton m_aPB_CANCEL; - HelpButton m_aPB_Help; + CheckBox m_aShowNumberOnFirstPage; + FixedLine m_aFl1; + OKButton m_aPB_OK; + CancelButton m_aPB_CANCEL; + HelpButton m_aPB_Help; - ::rptui::OReportController* m_pController; - ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition> + ::rptui::OReportController* m_pController; + ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition> m_xHoldAlive; OPageNumberDialog(const OPageNumberDialog&); @@ -75,7 +75,7 @@ public: ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition>& _xHoldAlive ,::rptui::OReportController* _pController); virtual ~OPageNumberDialog(); - virtual short Execute(); + virtual short Execute(); }; // ============================================================================= } // namespace rptui diff --git a/reportdesign/source/ui/inc/ReportComponentHandler.hxx b/reportdesign/source/ui/inc/ReportComponentHandler.hxx index c2b1929e1612..415903019773 100644 --- a/reportdesign/source/ui/inc/ReportComponentHandler.hxx +++ b/reportdesign/source/ui/inc/ReportComponentHandler.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -95,7 +95,7 @@ namespace rptui ReportComponentHandler(ReportComponentHandler &); // not defined void operator =(ReportComponentHandler &); // not defined - + // overload WeakComponentImplHelperBase::disposing() // This function is called upon disposing the component, diff --git a/reportdesign/source/ui/inc/ReportController.hxx b/reportdesign/source/ui/inc/ReportController.hxx index 007b42d225fb..1d5eb6488af7 100644 --- a/reportdesign/source/ui/inc/ReportController.hxx +++ b/reportdesign/source/ui/inc/ReportController.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,52 +28,48 @@ #ifndef RPTUI_REPORTCONTROLLER_HXX #define RPTUI_REPORTCONTROLLER_HXX -#include "DesignView.hxx" -#include "ModuleHelper.hxx" -#include "ReportControllerObserver.hxx" -#include "RptDef.hxx" - -/** === begin UNO includes === **/ +#include <dbaccess/singledoccontroller.hxx> +#include <com/sun/star/uno/XComponentContext.hpp> +#include <com/sun/star/beans/PropertyValue.hpp> +#include <com/sun/star/uno/Sequence.hxx> +#include <com/sun/star/sdbc/XConnection.hpp> +#include <com/sun/star/sdbc/XRowSet.hpp> #include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/beans/XPropertyChangeListener.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/embed/XVisualObject.hpp> +#include <com/sun/star/beans/XPropertyChangeListener.hpp> +#include <com/sun/star/util/XNumberFormatter.hpp> +#include <com/sun/star/io/XObjectOutputStream.hpp> +#include <com/sun/star/io/XObjectInputStream.hpp> #include <com/sun/star/frame/XComponentLoader.hpp> #include <com/sun/star/frame/XFrame.hpp> -#include <com/sun/star/io/XObjectInputStream.hpp> -#include <com/sun/star/io/XObjectOutputStream.hpp> -#include <com/sun/star/report/XReportControlModel.hpp> #include <com/sun/star/report/XReportDefinition.hpp> +#include <com/sun/star/report/XReportControlModel.hpp> #include <com/sun/star/report/XReportEngine.hpp> #include <com/sun/star/report/XSection.hpp> -#include <com/sun/star/sdbc/XConnection.hpp> -#include <com/sun/star/sdbc/XRowSet.hpp> -#include <com/sun/star/uno/Sequence.hxx> -#include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/util/XModeSelector.hpp> -#include <com/sun/star/util/XNumberFormatter.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> -/** === end UNO includes === **/ - -#include <comphelper/implementationreference.hxx> -#include <comphelper/proparrhlp.hxx> -#include <comphelper/propertystatecontainer.hxx> -#include <comphelper/uno3.hxx> +#include <com/sun/star/embed/XVisualObject.hpp> #include <cppuhelper/implbase5.hxx> -#include <dbaccess/dbsubcomponentcontroller.hxx> -#include <svl/lstner.hxx> #include <svtools/transfer.hxx> +#include <svl/lstner.hxx> #include <svx/svdedtv.hxx> #include <svx/zoomitem.hxx> +#include "ModuleHelper.hxx" -#include <boost/noncopyable.hpp> -#include <boost/shared_ptr.hpp> +#include <comphelper/uno3.hxx> +#include <comphelper/implementationreference.hxx> +#include <comphelper/proparrhlp.hxx> +#include <comphelper/propertystatecontainer.hxx> + +#include "RptDef.hxx" +#include "DesignView.hxx" #include <functional> +#include <boost/shared_ptr.hpp> +#include <com/sun/star/util/XModeSelector.hpp> +#include "ReportControllerObserver.hxx" class TransferableHelper; class TransferableClipboardListener; class VclWindowEvent; -class SfxUndoManager; namespace rptui { class OGroupsSortingDialog; @@ -83,56 +79,55 @@ namespace rptui class OAddFieldWindow; class OSectionWindow; - typedef ::dbaui::DBSubComponentController OReportController_BASE; - typedef ::cppu::ImplHelper5 < ::com::sun::star::container::XContainerListener + typedef ::dbaui::OSingleDocumentController OReportController_BASE; + typedef ::cppu::ImplHelper5 < ::com::sun::star::container::XContainerListener , ::com::sun::star::beans::XPropertyChangeListener , ::com::sun::star::view::XSelectionSupplier - , ::com::sun::star::util::XModeSelector - , ::com::sun::star::embed::XVisualObject - > OReportController_Listener; + , ::com::sun::star::util::XModeSelector + , ::com::sun::star::embed::XVisualObject + > OReportController_Listener; - class OReportController : public OReportController_BASE + class OReportController : public OReportController_BASE ,public OReportController_Listener ,public SfxListener ,public ::comphelper::OPropertyStateContainer ,public ::comphelper::OPropertyArrayUsageHelper < OReportController_BASE > - ,public ::boost::noncopyable { private: - OModuleClient m_aModuleClient; + OModuleClient m_aModuleClient; ::cppu::OInterfaceContainerHelper m_aSelectionListeners; - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> m_aCollapsedSections; - TransferableDataHelper m_aSystemClipboard; // content of the clipboard + TransferableDataHelper m_aSystemClipboard; // content of the clipboard TransferableClipboardListener* - m_pClipbordNotifier; /// notifier for changes in the clipboard - OGroupsSortingDialog* m_pGroupsFloater; + m_pClipbordNotifier; /// notifier for changes in the clipboard + OGroupsSortingDialog* m_pGroupsFloater; OXReportControllerObserver* m_pReportControllerObserver; ODesignView* getDesignView() const { return static_cast< ODesignView* >( getView() ); } - - ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition > m_xReportDefinition; - ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportEngine > m_xReportEngine; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XComponentLoader > m_xFrameLoader; + + ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition> m_xReportDefinition; + ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportEngine> m_xReportEngine; + ::com::sun::star::uno::Reference < ::com::sun::star::frame::XComponentLoader> m_xFrameLoader; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet > m_xRowSet; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > m_xRowSetMediator; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > m_xFormatter; // a number formatter working with the report's NumberFormatsSupplier - mutable ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > m_xHoldAlive; + ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > m_xFormatter; // a number formatter working with the report's NumberFormatsSupplier + mutable ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > m_xHoldAlive; mutable ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xColumns; - ::com::sun::star::awt::Size m_aVisualAreaSize; + ::com::sun::star::awt::Size m_aVisualAreaSize; - ::boost::shared_ptr<rptui::OReportModel> + ::boost::shared_ptr<rptui::OReportModel> m_aReportModel; - ::rtl::OUString m_sName; /// name for the report definition + ::rtl::OUString m_sName; /// name for the report definition ::rtl::OUString m_sLastActivePage; /// last active property browser page - ::rtl::OUString m_sMode; /// the current mode of the controller - sal_Int32 m_nSplitPos; /// the position of the splitter + ::rtl::OUString m_sMode; /// the current mode of the controller + sal_Int32 m_nSplitPos; /// the position of the splitter sal_Int32 m_nPageNum; /// the page number from the restoreView call sal_Int32 m_nSelectionCount; - ::sal_Int64 m_nAspect; + ::sal_Int64 m_nAspect; sal_Int16 m_nZoomValue; SvxZoomType m_eZoomType; sal_Bool m_bShowRuler; @@ -147,7 +142,7 @@ namespace rptui /** creates a formatted field in the given section with the given formula as data field * - * \param _aArgs + * \param _aArgs * \param _xSection the section where to create the formatted field * \param _sFunction the function which will be set at the data field. */ @@ -166,7 +161,7 @@ namespace rptui /** append a new group or remove it with undo. * - * \param _bAppend + * \param _bAppend * \param _aArgs The args which contains a element named PROPERTY_GROUP of type report::XGroup. */ void modifyGroup(const bool _bAppend, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _aArgs); @@ -181,7 +176,7 @@ namespace rptui /** add or remove me as listener at the report definition * - * \param _bAdd + * \param _bAdd */ void listen(const bool _bAdd); @@ -202,46 +197,41 @@ namespace rptui sal_Int32 getGroupPosition(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup >& _xGroup); /** calls propertyChanged when the header or footer is really turned on. - @param _rEvent the group - @param _bShow when <TRUE/> the header and footer will be shown otherwise not + @param _rEvent the group + @param _bShow when <TRUE/> the header and footer will be shown otherwise not */ void notifyGroupSections(const ::com::sun::star::container::ContainerEvent& _rEvent ,bool _bShow); /** change the sections for a group - @param _sPropName the header or footer - @param _xGroup the group - @param _nGroupPos the position of the group inside the groups collection or the previous index when it was removed - @param _bShow when <TRUE/> the header and footer will be shown otherwise not + @param _sPropName the header or footer + @param _xGroup the group + @param _nGroupPos the position of the group inside the groups collection or the previous index when it was removed + @param _bShow when <TRUE/> the header and footer will be shown otherwise not */ void groupChange( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup>& _xGroup ,const ::rtl::OUString& _sPropName ,sal_Int32 _nGroupPos ,bool _bShow); - void executeMethodWithUndo(sal_uInt16 _nUndoStrId,const ::std::mem_fun_t<void,ODesignView>& _pMemfun); - void alignControlsWithUndo(sal_uInt16 _nUndoStrId,sal_Int32 _nControlModification,bool _bAlignAtSection = false); - - // open the help agent of report designer at start time - void doOpenHelpAgent(); - - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > getXFrame(); - + void executeMethodWithUndo(USHORT _nUndoStrId,const ::std::mem_fun_t<void,ODesignView>& _pMemfun); + void alignControlsWithUndo(USHORT _nUndoStrId,sal_Int32 _nControlModification,bool _bAlignAtSection = false); /** shrink a section @param _nUndoStrId the string id of the string which is shown in undo menu @param _nShrinkId ID of what you would like to shrink. */ + protected: void shrinkSectionBottom(::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > _xSection); void shrinkSectionTop(::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > _xSection); - public: - void shrinkSection(sal_uInt16 _nUndoStrId, ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > _xSection, sal_Int32 _nShrinkId); + + void shrinkSection(USHORT _nUndoStrId, ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > _xSection, sal_Int32 _nShrinkId); - /** opens the file open dialog to allow the user to select a image which will be + /** opens the file open dialog to allow the user to select a image which will be * bound to a newly created image button. */ void insertGraphic(); - + /** resets the floater */ void updateFloater(); @@ -254,7 +244,7 @@ namespace rptui /** inserts a label - field pair into the current selected section * - * \param aArgs + * \param aArgs */ void addPairControls(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs); @@ -266,7 +256,7 @@ namespace rptui /** creates a formatted filed with TODAY() function and if set also an NOW() function * - * \param _aArgs + * \param _aArgs */ void createDateTime(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _aArgs); @@ -290,7 +280,7 @@ namespace rptui /** collapse or expand the currently selected section. * - * \param _bCollapse collapse if sal_True otherwise expand + * \param _bCollapse collapse if TRUE otherwise expand */ void collapseSection(const bool _bCollapse); @@ -303,11 +293,14 @@ namespace rptui */ void impl_zoom_nothrow(); - virtual void impl_onModifyChanged(); + private: + OReportController(OReportController const&); + OReportController& operator =(OReportController const&); + public: + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > getXFrame(); - virtual void onLoadedMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager >& _xLayoutManager ); - virtual void impl_initialize( ); - bool isUiVisible() const; + // open the help agent of report designer at start time + void doOpenHelpAgent(); /** creates a new default control for the currently set type when the modifier KEY_MOD1 was pressed * \param _aArgs must contain a properyvalue with name "KeyModifier" and value KEY_MOD1 when control should be created. @@ -315,7 +308,7 @@ namespace rptui void createDefaultControl(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& _aArgs); /** fills the state for the feture request. - @param _sProperty the property which should be filled in the value + @param _sProperty the property which should be filled in the value @param _rState the state to fill */ void impl_fillState_nothrow(const ::rtl::OUString& _sProperty,dbaui::FeatureState& _rState) const; @@ -335,21 +328,22 @@ namespace rptui DECL_LINK( OnOpenHelpAgent, void* ); short saveModified(); // all the features which should be handled by this class - virtual void describeSupportedFeatures(); + virtual void describeSupportedFeatures(); // state of a feature. 'feature' may be the handle of a ::com::sun::star::util::URL somebody requested a dispatch interface for OR a toolbar slot. - virtual dbaui::FeatureState GetState(sal_uInt16 nId) const; + virtual dbaui::FeatureState GetState(sal_uInt16 nId) const; // execute a feature virtual void Execute(sal_uInt16 nId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs); + virtual void losingConnection( ); + virtual void getPropertyDefaultByHandle( sal_Int32 _nHandle, ::com::sun::star::uno::Any& _rDefault ) const; virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const ::com::sun::star::uno::Any& rValue) throw (::com::sun::star::uno::Exception); - - private: + virtual ~OReportController(); - public: OReportController(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & the_context); + DECL_LINK( NotifyUndoActionHdl, SfxUndoAction* ); DECL_LINK( EventLstHdl, VclWindowEvent* ); DECL_LINK( OnCreateHdl, OAddFieldWindow*); @@ -359,22 +353,28 @@ namespace rptui // SfxListener virtual void Notify(SfxBroadcaster & rBc, SfxHint const & rHint); + virtual void impl_onModifyChanged(); + + // const ::connectivity::OSQLParseNode* getParseTree() const { return m_aSqlIterator.getParseTree();} + // need for undo's and redo's + SfxUndoManager* getUndoMgr(); + /** returns <TRUE/> when the command is enbaled - @param _nCommand the command id - @param _xControlFormat the report control format + @param _nCommand the command id + @param _xControlFormat the report control format */ - sal_Bool isFormatCommandEnabled(sal_uInt16 _nCommand + sal_Bool isFormatCommandEnabled(sal_uInt16 _nCommand ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportControlFormat>& _xControlFormat) const; - - virtual sal_Bool Construct(Window* pParent); + + virtual sal_Bool Construct(Window* pParent); // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::frame::XController - virtual sal_Bool SAL_CALL suspend(sal_Bool bSuspend) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL suspend(sal_Bool bSuspend) throw( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::lang::XComponent - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing(); // XServiceInfo virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); @@ -430,10 +430,10 @@ namespace rptui /** returns the current position of the splitter * - * \return + * \return */ - inline sal_Int32 getSplitPos() const { return m_nSplitPos;} - inline void setSplitPos(sal_Int32 _nSplitPos) { m_nSplitPos = _nSplitPos;} + inline sal_Int32 getSplitPos() const { return m_nSplitPos;} + inline void setSplitPos(sal_Int32 _nSplitPos) { m_nSplitPos = _nSplitPos;} /** creates a new report from the report definition. * @@ -450,13 +450,13 @@ namespace rptui /** returns the number formatter */ - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > getReportNumberFormatter() const; + ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > getReportNumberFormatter() const; /** return the SdrModel of the real model * - * \return + * \return */ - ::boost::shared_ptr<rptui::OReportModel> getSdrModel() const; + ::boost::shared_ptr<rptui::OReportModel> getSdrModel(); inline ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > getContext() const { return m_xContext; } inline sal_Int16 getZoomValue() const { return m_nZoomValue; } @@ -478,9 +478,10 @@ namespace rptui ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > getColumns() const; ::rtl::OUString getColumnLabel_throw(const ::rtl::OUString& i_sColumnName) const; - SfxUndoManager& getUndoManager() const; - void clearUndoManager() const; - void addUndoAction( SfxUndoAction* i_pAction ); + private: + virtual void onLoadedMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager >& _xLayoutManager ); + virtual void impl_initialize( ); + bool isUiVisible() const; }; } #endif // RPTUI_REPORTCONTROLLER_HXX diff --git a/reportdesign/source/ui/inc/ReportControllerObserver.hxx b/reportdesign/source/ui/inc/ReportControllerObserver.hxx index 9beba004407b..378a599136e5 100644 --- a/reportdesign/source/ui/inc/ReportControllerObserver.hxx +++ b/reportdesign/source/ui/inc/ReportControllerObserver.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,11 +49,12 @@ namespace rptui class OXReportControllerObserverImpl; //======================================================================== - class OXReportControllerObserver - : public ::cppu::WeakImplHelper3< ::com::sun::star::beans::XPropertyChangeListener - , ::com::sun::star::container::XContainerListener - , ::com::sun::star::util::XModifyListener + class /* REPORTDESIGN_DLLPUBLIC */ OXReportControllerObserver + : public ::cppu::WeakImplHelper3< ::com::sun::star::beans::XPropertyChangeListener + , ::com::sun::star::container::XContainerListener + , ::com::sun::star::util::XModifyListener > + /*,public SfxListener*/ { const ::std::auto_ptr<OXReportControllerObserverImpl> m_pImpl; @@ -68,6 +69,7 @@ namespace rptui public: OXReportControllerObserver(const OReportController& _rController); +// protected: // XPropertyChangeListener virtual void SAL_CALL propertyChange(const ::com::sun::star::beans::PropertyChangeEvent& evt) throw(::com::sun::star::uno::RuntimeException); @@ -89,6 +91,9 @@ namespace rptui void AddSection( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection); void RemoveSection( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection ); + // SfxListener + // virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + /** Create an object ob OUndoEnvLock locks the undo possibility As long as in the OUndoEnvLock scope, no undo is possible for manipulated object. @@ -112,13 +117,14 @@ namespace rptui void switchListening( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& _rxContainer, bool _bStartListening ) SAL_THROW(()); void switchListening( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxObject, bool _bStartListening ) SAL_THROW(()); + // void ModeChanged(); // will be called from 'Notify' DECL_LINK(SettingsChanged, VclWindowEvent* ); private: - + ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::container::XChild> >::const_iterator getSection(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XChild>& _xContainer) const; - + }; - + } // namespace rptui #endif /* INCLUDED_REPORTCONTROLLEROBSERVER_HXX */ diff --git a/reportdesign/source/ui/inc/ReportDefines.hxx b/reportdesign/source/ui/inc/ReportDefines.hxx index 0e45ca91c418..6fc274f1e276 100644 --- a/reportdesign/source/ui/inc/ReportDefines.hxx +++ b/reportdesign/source/ui/inc/ReportDefines.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,9 +32,9 @@ namespace rptui { enum DlgEdMode { RPTUI_INSERT, RPTUI_SELECT, RPTUI_TEST, RPTUI_READONLY }; -#define REPORT_STARTMARKER_WIDTH 120 -#define REPORT_ENDMARKER_WIDTH 10 -#define REPORT_EXTRA_SPACE 10 +#define REPORT_STARTMARKER_WIDTH 120 +#define REPORT_ENDMARKER_WIDTH 10 +#define REPORT_EXTRA_SPACE 10 } #endif //RPTUI_REPORT_DEFINES_HXX diff --git a/reportdesign/source/ui/inc/ReportRuler.hxx b/reportdesign/source/ui/inc/ReportRuler.hxx index 092054b9faf5..fd78308a5408 100644 --- a/reportdesign/source/ui/inc/ReportRuler.hxx +++ b/reportdesign/source/ui/inc/ReportRuler.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,9 +37,9 @@ namespace rptui class OReportWindow; class OReportRuler : public Window { - OReportSection* m_pSection; - OReportWindow* m_pParent; - sal_Bool m_bShow; + OReportSection* m_pSection; + OReportWindow* m_pParent; + sal_Bool m_bShow; OReportRuler(OReportRuler&); void operator =(OReportRuler&); public: @@ -49,14 +49,14 @@ namespace rptui // windows overloads virtual void Resize(); - inline OReportSection* getSection() const { return m_pSection; } - inline OReportWindow* getView() const { return m_pParent; } + inline OReportSection* getSection() const { return m_pSection; } + inline OReportWindow* getView() const { return m_pParent; } /** makes the grid visible * * \param _bVisible when <TRUE/> the grid is made visible */ - void SetGridVisible(sal_Bool _bVisible); + void SetGridVisible(BOOL _bVisible); }; //============================================================================== } // rptui diff --git a/reportdesign/source/ui/inc/ReportSection.hxx b/reportdesign/source/ui/inc/ReportSection.hxx index cc64b29f9223..f7a09c7e1925 100644 --- a/reportdesign/source/ui/inc/ReportSection.hxx +++ b/reportdesign/source/ui/inc/ReportSection.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,28 +42,28 @@ namespace rptui { - class OReportModel; - class OReportPage; - class OSectionView; - class OSectionWindow; - - class OReportSection : public Window - , public ::cppu::BaseMutex - , public ::comphelper::OPropertyChangeListener + class OReportModel; + class OReportPage; + class OSectionView; + class OSectionWindow; + + class OReportSection : public Window + , public ::cppu::BaseMutex + , public ::comphelper::OPropertyChangeListener , public DropTargetHelper { - OReportPage* m_pPage; - OSectionView* m_pView; - OSectionWindow* m_pParent; - ::std::auto_ptr<DlgEdFunc> m_pFunc; + OReportPage* m_pPage; + OSectionView* m_pView; + OSectionWindow* m_pParent; + ::std::auto_ptr<DlgEdFunc> m_pFunc; ::boost::shared_ptr<OReportModel> m_pModel; - ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> m_pMulti; - ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> m_pReportListener; + ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> m_pMulti; + ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> m_pReportListener; ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > m_xSection; - - DlgEdMode m_eMode; - sal_Bool m_bDialogModelChanged; - sal_Bool m_bInDrag; + + DlgEdMode m_eMode; + BOOL m_bDialogModelChanged; + sal_Bool m_bInDrag; /** fills the section with all control from the report section */ @@ -73,24 +73,24 @@ namespace rptui void operator =(OReportSection&); protected: // DropTargetHelper overridables - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& _rEvt ); - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& _rEvt ); - + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& _rEvt ); + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& _rEvt ); + // window overrides virtual void Paint( const Rectangle& rRect ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void Command( const CommandEvent& rCEvt ); - virtual void Resize(); + virtual void MouseMove( const MouseEvent& rMEvt ); + virtual void Command( const CommandEvent& rCEvt ); + virtual void Resize(); // OPropertyChangeListener - virtual void _propertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& _rEvent) throw( ::com::sun::star::uno::RuntimeException); + virtual void _propertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& _rEvent) throw( ::com::sun::star::uno::RuntimeException); public: OReportSection(OSectionWindow* _pParent,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection); virtual ~OReportSection(); // window overrides - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void MouseButtonUp( const MouseEvent& rMEvt ); /** copies the current selection in this section @param _rAllreadyCopiedObjects This is an out/in put param which contains all already copied objects. @@ -118,23 +118,23 @@ namespace rptui * * \param _bVisible when <TRUE/> the grid is made visible */ - void SetGridVisible(sal_Bool _bVisible); + void SetGridVisible(BOOL _bVisible); - inline OSectionWindow* getSectionWindow() const { return m_pParent; } - inline OSectionView& getSectionView() const { return *m_pView; } - inline OReportPage* getPage() const { return m_pPage; } + inline OSectionWindow* getSectionWindow() const { return m_pParent; } + inline OSectionView& getSectionView() const { return *m_pView; } + inline OReportPage* getPage() const { return m_pPage; } inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > getSection() const { return m_xSection; } - void SetDialogModelChanged( sal_Bool bChanged = sal_True ) { m_bDialogModelChanged = bChanged; } - sal_Bool IsDialogModelChanged() const { return m_bDialogModelChanged; } - DlgEdMode GetMode() const { return m_eMode; } - void SetMode( DlgEdMode m_eMode ); + void SetDialogModelChanged( BOOL bChanged = TRUE ) { m_bDialogModelChanged = bChanged; } + BOOL IsDialogModelChanged() const { return m_bDialogModelChanged; } + DlgEdMode GetMode() const { return m_eMode; } + void SetMode( DlgEdMode m_eMode ); /** checks if the keycode is known by the child windows - @param _rCode the keycode + @param _rCode the keycode @return <TRUE/> if the keycode is handled otherwise <FALSE/> */ - sal_Bool handleKeyEvent(const KeyEvent& _rEvent); + sal_Bool handleKeyEvent(const KeyEvent& _rEvent); /** returns the current control report model or <NULL/> */ @@ -153,8 +153,8 @@ namespace rptui /** creates a new default custom shape * - * \param _sType - * \param _pObj + * \param _sType + * \param _pObj */ void createDefault(const ::rtl::OUString& _sType,SdrObject* _pObj); void stopScrollTimer(); @@ -168,7 +168,7 @@ namespace rptui bool isUiActive() const; }; //================================================================== -} //rptui +} //rptui //================================================================== #endif // REPORT_REPORTSECTION_HXX diff --git a/reportdesign/source/ui/inc/ReportWindow.hxx b/reportdesign/source/ui/inc/ReportWindow.hxx index 290076b6732c..573f92023dcc 100644 --- a/reportdesign/source/ui/inc/ReportWindow.hxx +++ b/reportdesign/source/ui/inc/ReportWindow.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,20 +55,20 @@ namespace rptui class DlgEdFunc; class DlgEdFactory; - class OReportWindow : public Window, public IMarkedSection + class OReportWindow : public Window, public IMarkedSection { - Ruler m_aHRuler; - ODesignView* m_pView; - OScrollWindowHelper* m_pParent; - OViewsWindow m_aViewsWindow; - ::std::auto_ptr<DlgEdFactory> + Ruler m_aHRuler; + ODesignView* m_pView; + OScrollWindowHelper* m_pParent; + OViewsWindow m_aViewsWindow; + ::std::auto_ptr<DlgEdFactory> m_pObjFac; - + void ImplInitSettings(); - + sal_Int32 GetTotalHeight() const; sal_Int32 impl_getRealPixelWidth() const; - + OReportWindow(OReportWindow&); void operator =(OReportWindow&); protected: @@ -83,24 +83,24 @@ namespace rptui // WINDOW overloads virtual void Resize(); - inline ODesignView* getReportView() const { return m_pView; } - inline OScrollWindowHelper* getScrollWindow() const { return m_pParent; } + inline ODesignView* getReportView() const { return m_pView; } + inline OScrollWindowHelper* getScrollWindow() const { return m_pParent; } - void SetMode( DlgEdMode m_eMode ); - void SetInsertObj( sal_uInt16 eObj,const ::rtl::OUString& _sShapeType = ::rtl::OUString()); + void SetMode( DlgEdMode m_eMode ); + void SetInsertObj( USHORT eObj,const ::rtl::OUString& _sShapeType = ::rtl::OUString()); rtl::OUString GetInsertObjString() const; - void setGridSnap(sal_Bool bOn); - void setDragStripes(sal_Bool bOn); + void setGridSnap(BOOL bOn); + void setDragStripes(BOOL bOn); /** copies the current selection in this section */ void Copy(); - /** returns if paste is allowed + /** returns if paste is allowed * * \return <TRUE/> if paste is allowed */ - sal_Bool IsPasteAllowed() const; + BOOL IsPasteAllowed() const; /** paste a new control in this section */ @@ -117,78 +117,78 @@ namespace rptui /** returns <TRUE/> when a object is marked */ - sal_Bool HasSelection() const; + BOOL HasSelection() const; - Point getThumbPos() const; + Point getThumbPos() const; /** removes the section at the given position. * * \param _nPosition Zero based. */ - void removeSection(sal_uInt16 _nPosition); + void removeSection(USHORT _nPosition); /** adds a new section at position _nPosition. If the section is <NULL/> nothing happens. If the position is grater than the current elements, the section will be appended. */ - void addSection(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection + void addSection(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection ,const ::rtl::OUString& _sColorEntry - ,sal_uInt16 _nPosition = USHRT_MAX); + ,USHORT _nPosition = USHRT_MAX); - sal_uInt16 getSectionCount() const; + USHORT getSectionCount() const; /** turns the grid on or off * * \param _bVisible */ - void toggleGrid(sal_Bool _bVisible); + void toggleGrid(sal_Bool _bVisible); /** shows the ruler */ - void showRuler(sal_Bool _bShow); + void showRuler(sal_Bool _bShow); inline sal_Int32 getRulerHeight() const { return m_aHRuler.GetSizePixel().Height(); } /** returns the total width of the first section */ - sal_Int32 GetTotalWidth() const; + sal_Int32 GetTotalWidth() const; /** calculate the max width of the markers * - * @param _bWithEnd if <TRUE/> the end marker will be used for calculation as well otherwise not. + * @param _bWithEnd if <TRUE/> the end marker will be used for calculation as well otherwise not. * \return the max width */ - sal_Int32 getMaxMarkerWidth(sal_Bool _bWithEnd) const; + sal_Int32 getMaxMarkerWidth(sal_Bool _bWithEnd) const; - void ScrollChildren(const Point& _aThumbPos); + void ScrollChildren(const Point& _aThumbPos); - void notifySizeChanged(); + void notifySizeChanged(); /** unmark all objects on the views without the given one. * * @param _pSectionView The view where the objects should not be unmarked. */ - void unmarkAllObjects(OSectionView* _pSectionView); + void unmarkAllObjects(OSectionView* _pSectionView); /** triggers the property browser with the report component or section - @param _xReportComponent + @param _xReportComponent */ - void showProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xReportComponent); + void showProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xReportComponent); /** checks if the keycode is known by the child windows - @param _rCode the keycode + @param _rCode the keycode @return <TRUE/> if the keycode is handled otherwise <FALSE/> */ - sal_Bool handleKeyEvent(const KeyEvent& _rEvent); + sal_Bool handleKeyEvent(const KeyEvent& _rEvent); /** the the section as marked or not marked - @param _pSectionView the section where to set the marked flag - @param _bMark the marked flag + @param _pSectionView the section where to set the marked flag + @param _bMark the marked flag */ - void setMarked(OSectionView* _pSectionView,sal_Bool _bMark); - void setMarked(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection,sal_Bool _bMark); - void setMarked(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> >& _xShape,sal_Bool _bMark); + void setMarked(OSectionView* _pSectionView,sal_Bool _bMark); + void setMarked(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection,sal_Bool _bMark); + void setMarked(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> >& _xShape,sal_Bool _bMark); // IMarkedSection ::boost::shared_ptr<OSectionWindow> getMarkedSection(NearSectionAccess nsa = CURRENT) const; @@ -207,12 +207,12 @@ namespace rptui * \param _aCollpasedSections The position of the sections which should be collapsed. */ void collapseSections(const com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& _aCollpasedSections); - + /** align all marked objects in all sections * - * \param eHor - * \param eVert - * \param bBoundRects + * \param eHor + * \param eVert + * \param bBoundRects */ void alignMarkedObjects(sal_Int32 _nControlModification, bool _bAlignAtSection, bool bBoundRects = false); @@ -233,7 +233,7 @@ namespace rptui sal_uInt16 getZoomFactor(SvxZoomType _eType) const; }; //================================================================== -} //rptui +} //rptui //================================================================== #endif // RPTUI_REPORT_WINDOW_HXX diff --git a/reportdesign/source/ui/inc/ScrollHelper.hxx b/reportdesign/source/ui/inc/ScrollHelper.hxx index 06d9daeb1a6b..8a74946d591e 100644 --- a/reportdesign/source/ui/inc/ScrollHelper.hxx +++ b/reportdesign/source/ui/inc/ScrollHelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,7 +43,7 @@ class SdrView; namespace rptui -{ +{ class ODesignView; class OReportWindow; class OSectionView; @@ -54,18 +54,18 @@ namespace rptui the h-ruler and the sections, and end marker. Not the start marker. */ typedef Window OScrollWindowHelper_BASE; - class OScrollWindowHelper : public ::cppu::BaseMutex + class OScrollWindowHelper : public ::cppu::BaseMutex , public OScrollWindowHelper_BASE/*TabPage*/ - , public ::comphelper::OPropertyChangeListener + , public ::comphelper::OPropertyChangeListener , public IMarkedSection { - private: - ScrollBar m_aHScroll; - ScrollBar m_aVScroll; - ScrollBarBox m_aCornerWin; // window in the bottom right corner - Size m_aTotalPixelSize; - ODesignView* m_pParent; - OReportWindow m_aReportWindow; + private: + ScrollBar m_aHScroll; + ScrollBar m_aVScroll; + ScrollBarBox m_aCornerWin; // window in the bottom right corner + Size m_aTotalPixelSize; + ODesignView* m_pParent; + OReportWindow m_aReportWindow; ::rtl::Reference<comphelper::OPropertyChangeMultiplexer > m_pReportDefintionMultiPlexer; // listener for property changes @@ -79,40 +79,40 @@ namespace rptui protected: virtual void DataChanged( const DataChangedEvent& rDCEvt ); // window - virtual void Resize(); + virtual void Resize(); virtual long Notify( NotifyEvent& rNEvt ); // OPropertyChangeListener - virtual void _propertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& _rEvent) throw( ::com::sun::star::uno::RuntimeException); + virtual void _propertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& _rEvent) throw( ::com::sun::star::uno::RuntimeException); public: OScrollWindowHelper( ODesignView* _pReportDesignView); virtual ~OScrollWindowHelper(); /** late ctor */ - void initialize(); + void initialize(); - inline Point getThumbPos() const { return Point(m_aHScroll.GetThumbPos(),m_aVScroll.GetThumbPos())/*m_aScrollOffset*/; } - inline const OReportWindow& getReportWindow() const { return m_aReportWindow; } - void setTotalSize(sal_Int32 _nWidth ,sal_Int32 _nHeight); - inline Size getTotalSize() const { return m_aTotalPixelSize; } - inline ScrollBar* GetHScroll() { return &m_aHScroll; } - inline ScrollBar* GetVScroll() { return &m_aVScroll; } + inline Point getThumbPos() const { return Point(m_aHScroll.GetThumbPos(),m_aVScroll.GetThumbPos())/*m_aScrollOffset*/; } + inline const OReportWindow& getReportWindow() const { return m_aReportWindow; } + void setTotalSize(sal_Int32 _nWidth ,sal_Int32 _nHeight); + inline Size getTotalSize() const { return m_aTotalPixelSize; } + inline ScrollBar* GetHScroll() { return &m_aHScroll; } + inline ScrollBar* GetVScroll() { return &m_aVScroll; } // forwards - void SetMode( DlgEdMode _eMode ); - void SetInsertObj( sal_uInt16 eObj,const ::rtl::OUString& _sShapeType = ::rtl::OUString()); + void SetMode( DlgEdMode _eMode ); + void SetInsertObj( USHORT eObj,const ::rtl::OUString& _sShapeType = ::rtl::OUString()); rtl::OUString GetInsertObjString() const; - void setGridSnap(sal_Bool bOn); - void setDragStripes(sal_Bool bOn); + void setGridSnap(BOOL bOn); + void setDragStripes(BOOL bOn); /** copies the current selection in this section */ void Copy(); - /** returns if paste is allowed + /** returns if paste is allowed * * \return <TRUE/> if paste is allowed */ - sal_Bool IsPasteAllowed() const; + BOOL IsPasteAllowed() const; /** paste a new control in this section */ @@ -129,61 +129,61 @@ namespace rptui /** returns <TRUE/> when a object is marked */ - sal_Bool HasSelection() const; + BOOL HasSelection() const; /** removes the section at the given position. * * \param _nPosition Zero based. */ - void removeSection(sal_uInt16 _nPosition); + void removeSection(USHORT _nPosition); /** adds a new section at position _nPosition. If the section is <NULL/> nothing happens. If the position is grater than the current elements, the section will be appended. */ - void addSection(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection + void addSection(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection ,const ::rtl::OUString& _sColorEntry - ,sal_uInt16 _nPosition = USHRT_MAX); + ,USHORT _nPosition = USHRT_MAX); - sal_uInt16 getSectionCount() const; + USHORT getSectionCount() const; /** turns the grid on or off * * \param _bVisible */ - void toggleGrid(sal_Bool _bVisible); + void toggleGrid(sal_Bool _bVisible); /** unmark all objects on the views without the given one. * * @param _pSectionView The view where the objects should not be unmarked. */ - void unmarkAllObjects(OSectionView* _pSectionView); + void unmarkAllObjects(OSectionView* _pSectionView); /** shows or hides the ruler. */ - void showRuler(sal_Bool _bShow); - + void showRuler(sal_Bool _bShow); + /** calculate the max width of the markers * - * @param _bWithEnd if <TRUE/> the end marker will be used for calculation as well otherwise not. + * @param _bWithEnd if <TRUE/> the end marker will be used for calculation as well otherwise not. * \return the max width */ - sal_Int32 getMaxMarkerWidth(sal_Bool _bWithEnd) const; + sal_Int32 getMaxMarkerWidth(sal_Bool _bWithEnd) const; /** checks if the keycode is known by the child windows - @param _rCode the keycode + @param _rCode the keycode @return <TRUE/> if the keycode is handled otherwise <FALSE/> */ - sal_Bool handleKeyEvent(const KeyEvent& _rEvent); + sal_Bool handleKeyEvent(const KeyEvent& _rEvent); /** the the section as marked or not marked - @param _pSectionView the section where to set the marked flag - @param _bMark the marked flag + @param _pSectionView the section where to set the marked flag + @param _bMark the marked flag */ - void setMarked(OSectionView* _pSectionView,sal_Bool _bMark); - void setMarked(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection,sal_Bool _bMark); - void setMarked(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> >& _xShape,sal_Bool _bMark); - + void setMarked(OSectionView* _pSectionView,sal_Bool _bMark); + void setMarked(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection,sal_Bool _bMark); + void setMarked(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> >& _xShape,sal_Bool _bMark); + // IMarkedSection ::boost::shared_ptr<OSectionWindow> getMarkedSection(NearSectionAccess nsa = CURRENT) const; ::boost::shared_ptr<OSectionWindow> getSectionWindow(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) const; @@ -204,9 +204,9 @@ namespace rptui /** align all marked objects in all sections * - * \param eHor - * \param eVert - * \param bBoundRects + * \param eHor + * \param eVert + * \param bBoundRects */ void alignMarkedObjects(sal_Int32 _nControlModification, bool _bAlignAtSection, bool bBoundRects = false); diff --git a/reportdesign/source/ui/inc/SectionView.hxx b/reportdesign/source/ui/inc/SectionView.hxx index 63424dfc38a2..6014aceb90fa 100644 --- a/reportdesign/source/ui/inc/SectionView.hxx +++ b/reportdesign/source/ui/inc/SectionView.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,8 +43,8 @@ class OReportSection; class OSectionView : public SdrView { private: - OReportWindow* m_pReportWindow; - OReportSection* m_pSectionWindow; + OReportWindow* m_pReportWindow; + OReportSection* m_pSectionWindow; void ObjectRemovedInAliveMode( const SdrObject* pObject ); OSectionView(const OSectionView&); @@ -58,8 +58,8 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); virtual void MarkListHasChanged(); virtual void MakeVisible( const Rectangle& rRect, Window& rWin ); - - inline OReportSection* getReportSection() const { return m_pSectionWindow; } + + inline OReportSection* getReportSection() const { return m_pSectionWindow; } // switch the marked objects to the given layer. void SetMarkedToLayer( SdrLayerID nLayerNo ); diff --git a/reportdesign/source/ui/inc/SectionWindow.hxx b/reportdesign/source/ui/inc/SectionWindow.hxx index 700550ee99d5..7acbc96da8d6 100644 --- a/reportdesign/source/ui/inc/SectionWindow.hxx +++ b/reportdesign/source/ui/inc/SectionWindow.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,8 +55,8 @@ namespace rptui class ODesignView; class OViewsWindow; class OSectionWindow : public Window - , public ::cppu::BaseMutex - , public ::comphelper::OPropertyChangeListener + , public ::cppu::BaseMutex + , public ::comphelper::OPropertyChangeListener { OViewsWindow* m_pParent; OStartMarker m_aStartMarker; @@ -72,23 +72,23 @@ namespace rptui /** set the title of the group header or footer * - * \param _xGroup - * \param _nResId - * \param _pGetSection - * \param _pIsSectionOn - * @return sal_True when title was set otherwise FALSE + * \param _xGroup + * \param _nResId + * \param _pGetSection + * \param _pIsSectionOn + * @return TRUE when title was set otherwise FALSE */ - bool setGroupSectionTitle(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup>& _xGroup,sal_uInt16 _nResId,::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> , OGroupHelper> _pGetSection,::std::mem_fun_t<sal_Bool, OGroupHelper> _pIsSectionOn); + bool setGroupSectionTitle(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup>& _xGroup,USHORT _nResId,::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> , OGroupHelper> _pGetSection,::std::mem_fun_t<sal_Bool, OGroupHelper> _pIsSectionOn); /** set the title of the (report/page) header or footer * - * \param _xGroup - * \param _nResId - * \param _pGetSection - * \param _pIsSectionOn - * @return sal_True when title was set otherwise FALSE + * \param _xGroup + * \param _nResId + * \param _pGetSection + * \param _pIsSectionOn + * @return TRUE when title was set otherwise FALSE */ - bool setReportSectionTitle(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition>& _xReport,sal_uInt16 _nResId,::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> , OReportHelper> _pGetSection,::std::mem_fun_t<sal_Bool, OReportHelper> _pIsSectionOn); + bool setReportSectionTitle(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition>& _xReport,USHORT _nResId,::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> , OReportHelper> _pGetSection,::std::mem_fun_t<sal_Bool, OReportHelper> _pIsSectionOn); void ImplInitSettings(); DECL_LINK(Collapsed,OColorListener*); @@ -100,9 +100,9 @@ namespace rptui virtual void DataChanged( const DataChangedEvent& rDCEvt ); // windows overload virtual void Resize(); - + protected: - virtual void _propertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& _rEvent) throw( ::com::sun::star::uno::RuntimeException); + virtual void _propertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& _rEvent) throw( ::com::sun::star::uno::RuntimeException); public: OSectionWindow( OViewsWindow* _pParent ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection @@ -114,17 +114,17 @@ namespace rptui inline OEndMarker& getEndMarker() { return m_aEndMarker; } inline OViewsWindow* getViewsWindow() { return m_pParent; } - void setCollapsed(sal_Bool _bCollapsed); + void setCollapsed(sal_Bool _bCollapsed); /** triggers the property browser with the section - @param _pStartMarker + @param _pStartMarker */ - void showProperties(); + void showProperties(); /** set the marker as marked or not marked - @param _bMark set the new state of the marker + @param _bMark set the new state of the marker */ - void setMarked(sal_Bool _bMark); + void setMarked(sal_Bool _bMark); OViewsWindow* getViewsWindow() const { return m_pParent; } diff --git a/reportdesign/source/ui/inc/StartMarker.hxx b/reportdesign/source/ui/inc/StartMarker.hxx index 2ae45214b44b..d902d004f6c4 100644 --- a/reportdesign/source/ui/inc/StartMarker.hxx +++ b/reportdesign/source/ui/inc/StartMarker.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,16 +39,18 @@ namespace rptui class OSectionWindow; class OStartMarker : public OColorListener { - - Ruler m_aVRuler; + + Ruler m_aVRuler; FixedText m_aText; FixedImage m_aImage; - OSectionWindow* m_pParent; - static Image* s_pDefCollapsed; - static Image* s_pDefExpanded; - static oslInterlockedCount s_nImageRefCount; /// When 0 all static images will be destroyed + OSectionWindow* m_pParent; + static Image* s_pDefCollapsed; + static Image* s_pDefExpanded; + static Image* s_pDefCollapsedHC; + static Image* s_pDefExpandedHC; + static oslInterlockedCount s_nImageRefCount; /// When 0 all static images will be destroyed - sal_Bool m_bShowRuler; + sal_Bool m_bShowRuler; void changeImage(); void initDefaultNodeImages(); @@ -64,19 +66,19 @@ namespace rptui virtual void Notify(SfxBroadcaster & rBc, SfxHint const & rHint); // window overloads virtual void Paint( const Rectangle& rRect ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void Resize(); - virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void MouseButtonUp( const MouseEvent& rMEvt ); + virtual void Resize(); + virtual void RequestHelp( const HelpEvent& rHEvt ); using Window::Notify; - void setTitle(const String& _sTitle); - sal_Int32 getMinHeight() const; + void setTitle(const String& _sTitle); + sal_Int32 getMinHeight() const; /** shows or hides the ruler. */ - void showRuler(sal_Bool _bShow); + void showRuler(sal_Bool _bShow); - virtual void setCollapsed(sal_Bool _bCollapsed); + virtual void setCollapsed(sal_Bool _bCollapsed); /** zoom the ruler and view windows */ diff --git a/reportdesign/source/ui/inc/UITools.hxx b/reportdesign/source/ui/inc/UITools.hxx index 569c0b138e7c..11e30e9d1add 100644 --- a/reportdesign/source/ui/inc/UITools.hxx +++ b/reportdesign/source/ui/inc/UITools.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,35 +54,35 @@ namespace comphelper namespace rptui { /** returns the position of the object inside the index container - @param _xReportDefinition the report definition to get the groups - @param _xGroup the group to search + @param _xReportDefinition the report definition to get the groups + @param _xGroup the group to search @return returns the position of the group in the list, otherwise -1 */ - template<typename T> sal_Int32 getPositionInIndexAccess( + template<typename T> sal_Int32 getPositionInIndexAccess( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& _xCollection ,const ::com::sun::star::uno::Reference< T >& _xSearch) { sal_Int32 nCount = _xCollection->getCount(); - sal_Int32 i = (nCount == 0) ? -1 : 0; + sal_Int32 i = (nCount == 0) ? -1 : 0; for (;i<nCount ; ++i) { ::com::sun::star::uno::Reference< T > xObject(_xCollection->getByIndex(i),::com::sun::star::uno::UNO_QUERY); if ( xObject == _xSearch ) break; - } + } // for (;i<nCount ; ++i) return i; } /** set the name of the header and footer of the group by the expression appended by the localized name of the section - @param _xGroup the group where the header/footer name is set by the expression of the group + @param _xGroup the group where the header/footer name is set by the expression of the group */ void adjustSectionName(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup >& _xGroup,sal_Int32 _nPos); /** add a listener for the properties size, left margin, right margin to the page style * - * \param _xReportDefinition - * \param _pListener - * \return + * \param _xReportDefinition + * \param _pListener + * \return */ ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> addStyleListener( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition >& _xReportDefinition ,::comphelper::OPropertyChangeListener* _pListener); @@ -97,7 +97,7 @@ namespace rptui /** opens the area dialog for shapes */ - bool openAreaDialog( + bool openAreaDialog( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XShape >& _xShape ,const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow>& _xWindow ); @@ -124,11 +124,11 @@ namespace rptui ); /** notifySystemWindow adds or remove the given window _pToRegister at the Systemwindow found when search _pWindow. - @param _pWindow + @param _pWindow The window which is used to search for the SystemWindow. - @param _pToRegister + @param _pToRegister The window which should be added or removed on the TaskPaneList. - @param _rMemFunc + @param _rMemFunc The member function which should be called at the SystemWindow when found. Possible values are: ::comphelper::mem_fun(&TaskPaneList::AddWindow) @@ -141,8 +141,8 @@ namespace rptui /** checks whether the given rectangle overlapps another OUnoObject object in that view. * - * \param _rRect - * \param _rPage + * \param _rRect + * \param _rPage * \param _bAllObjects if <TRUE/> all objects are taken into account, otherwise only not marked ones * \return the object which is overlapped, otherwise <NULL/> */ @@ -152,9 +152,9 @@ namespace rptui /** checks whether the given OUnoObject object rectangle overlapps another object in that view. * - * \param _pObj - * \param _rPage - * \param _rView + * \param _pObj + * \param _rPage + * \param _rView * \param _bAllObjects if <TRUE/> all objects are taken into account, otherwise only not marked ones * \return the object which is overlapped, otherwise <NULL/>. If the given object is not of type OUnoObject <NULL/> will be returned. */ @@ -169,7 +169,7 @@ namespace rptui * * \param pControl the control which should place in the section without overlapping * \param _pReportSection the section - * \param _bInsert sal_True whe the control should be inserted, otherwise not. + * \param _bInsert TRUE whe the control should be inserted, otherwise not. */ void correctOverlapping(SdrObject* pControl,OReportSection& _aReportSection,bool _bInsert = true); diff --git a/reportdesign/source/ui/inc/RptUndo.hxx b/reportdesign/source/ui/inc/Undo.hxx index 1ac8295fb7c2..4e3a35e161aa 100644 --- a/reportdesign/source/ui/inc/RptUndo.hxx +++ b/reportdesign/source/ui/inc/Undo.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,8 +41,8 @@ namespace dbaui namespace rptui { class OObjectBase; - - + + /** \class OSectionUndo * Undo class for section add and remove. */ @@ -51,12 +51,12 @@ namespace rptui OSectionUndo(const OSectionUndo&); void operator =(const OSectionUndo&); protected: - ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape> > + ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape> > m_aControls; - ::std::vector< ::std::pair< ::rtl::OUString ,::com::sun::star::uno::Any> > + ::std::vector< ::std::pair< ::rtl::OUString ,::com::sun::star::uno::Any> > m_aValues; - Action m_eAction; - sal_uInt16 m_nSlot; + Action m_eAction; + sal_uInt16 m_nSlot; bool m_bInserted; virtual void implReInsert( ) = 0; @@ -65,21 +65,21 @@ namespace rptui void collectControls(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection); public: TYPEINFO(); - OSectionUndo( OReportModel& rMod + OSectionUndo( OReportModel& rMod ,sal_uInt16 _nSlot ,Action _eAction - ,sal_uInt16 nCommentID); + ,USHORT nCommentID); virtual ~OSectionUndo(); - virtual void Undo(); - virtual void Redo(); + virtual void Undo(); + virtual void Redo(); }; /** Undo action for the group header, footer, page header, footer */ class OReportSectionUndo : public OSectionUndo { - OReportHelper m_aReportHelper; + OReportHelper m_aReportHelper; ::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > ,OReportHelper> m_pMemberFunction; @@ -89,14 +89,14 @@ namespace rptui void operator =(const OReportSectionUndo&); public: TYPEINFO(); - //OReportSectionUndo( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection - OReportSectionUndo( OReportModel& rMod + //OReportSectionUndo( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection + OReportSectionUndo( OReportModel& rMod ,sal_uInt16 _nSlot ,::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > ,OReportHelper> _pMemberFunction ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition >& _xReport ,Action _eAction - ,sal_uInt16 nCommentID); + ,USHORT nCommentID); virtual ~OReportSectionUndo(); }; @@ -104,7 +104,7 @@ namespace rptui */ class OGroupSectionUndo : public OSectionUndo { - OGroupHelper m_aGroupHelper; + OGroupHelper m_aGroupHelper; ::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > ,OGroupHelper> m_pMemberFunction; @@ -116,16 +116,16 @@ namespace rptui void operator =(const OGroupSectionUndo&); public: TYPEINFO(); - //OGroupSectionUndo( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection - OGroupSectionUndo( OReportModel& rMod + //OGroupSectionUndo( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection + OGroupSectionUndo( OReportModel& rMod ,sal_uInt16 _nSlot ,::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > ,OGroupHelper> _pMemberFunction ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup >& _xGroup ,Action _eAction - ,sal_uInt16 nCommentID); + ,USHORT nCommentID); - virtual String GetComment() const; + virtual String GetComment() const; }; /** /class OGroupUndo @@ -133,22 +133,22 @@ namespace rptui */ class OGroupUndo : public OCommentUndoAction { - ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup> m_xGroup; ///<! the group for the undo redo action - ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition > m_xReportDefinition; ///<! the parent report definition - Action m_eAction; ///<! the current action - sal_Int32 m_nLastPosition; ///<! the last position of the group + ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup> m_xGroup; ///<! the group for the undo redo action + ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition > m_xReportDefinition; ///<! the parent report definition + Action m_eAction; ///<! the current action + sal_Int32 m_nLastPosition; ///<! the last position of the group void implReInsert( ); void implReRemove( ); public: TYPEINFO(); OGroupUndo(OReportModel& rMod - ,sal_uInt16 nCommentID - ,Action _eAction + ,USHORT nCommentID + ,Action _eAction ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup>& _xGroup ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition >& _xReportDefinition); - virtual void Undo(); - virtual void Redo(); + virtual void Undo(); + virtual void Redo(); }; } #endif // RPTUI_UNDO_HXX diff --git a/reportdesign/source/ui/inc/ViewsWindow.hxx b/reportdesign/source/ui/inc/ViewsWindow.hxx index 041da5de03ce..c87566859f76 100644 --- a/reportdesign/source/ui/inc/ViewsWindow.hxx +++ b/reportdesign/source/ui/inc/ViewsWindow.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,7 +55,7 @@ namespace rptui class OEndMarker; class OReportSection; class OSectionView; - + // ----------------------------------------------------------------------------- struct RectangleLess : public ::std::binary_function< Rectangle, Rectangle, bool> @@ -64,7 +64,7 @@ namespace rptui CompareMode m_eCompareMode; Point m_aRefPoint; RectangleLess(CompareMode _eCompareMode,const Point& _rRefPoint ) : m_eCompareMode(_eCompareMode),m_aRefPoint(_rRefPoint){} - bool operator() (const Rectangle& lhs, const Rectangle& rhs) const + bool operator() (const Rectangle& lhs, const Rectangle& rhs) const { switch(m_eCompareMode) { @@ -93,7 +93,7 @@ namespace rptui public: OWindowPositionCorrector(Window* _pWindow,long _nDeltaX, long _nDeltaY) :m_nDeltaX(_nDeltaX), m_nDeltaY(_nDeltaY) { - sal_uInt16 nCount = _pWindow->GetChildCount(); + USHORT nCount = _pWindow->GetChildCount(); m_aChildren.reserve(nCount); while( nCount ) { @@ -114,13 +114,13 @@ namespace rptui } }; - class OViewsWindow : public Window - , public utl::ConfigurationListener + class OViewsWindow : public Window + , public utl::ConfigurationListener , public IMarkedSection { typedef ::std::multimap<Rectangle,::std::pair<SdrObject*,OSectionView*>,RectangleLess> TRectangleMap; public: - typedef ::std::vector< ::boost::shared_ptr<OSectionWindow> > TSectionsMap; + typedef ::std::vector< ::boost::shared_ptr<OSectionWindow> > TSectionsMap; struct TReportPairHelper : public ::std::unary_function< TSectionsMap::value_type, OReportSection > { @@ -131,23 +131,23 @@ namespace rptui }; struct TStartMarkerHelper : public ::std::unary_function< TSectionsMap::value_type, OStartMarker > { - OStartMarker& operator() (const TSectionsMap::value_type& lhs) const + OStartMarker& operator() (const TSectionsMap::value_type& lhs) const { return lhs->getStartMarker(); } }; private: - TSectionsMap m_aSections; - svtools::ColorConfig m_aColorConfig; - OReportWindow* m_pParent; + TSectionsMap m_aSections; + svtools::ColorConfig m_aColorConfig; + OReportWindow* m_pParent; ::rtl::OUString m_sShapeType; - sal_Bool m_bInSplitHandler; - sal_Bool m_bInUnmark; + sal_Bool m_bInSplitHandler; + sal_Bool m_bInUnmark; void ImplInitSettings(); /** returns the iterator at pos _nPos or the end() */ - TSectionsMap::iterator getIteratorAtPos(sal_uInt16 _nPos); + TSectionsMap::iterator getIteratorAtPos(USHORT _nPos); void collectRectangles(TRectangleMap& _rMap,bool _bBoundRects); void collectBoundResizeRect(const TRectangleMap& _rSortRectangles,sal_Int32 _nControlModification,bool _bAlignAtSection,bool _bBoundRects,Rectangle& _rBound,Rectangle& _rResize); void impl_resizeSectionWindow(OSectionWindow& _rSectionWindow,Point& _rStartPoint,bool _bSet); @@ -163,7 +163,7 @@ namespace rptui virtual void Paint( const Rectangle& rRect ); virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ); public: - OViewsWindow( + OViewsWindow( OReportWindow* _pReportWindow); virtual ~OViewsWindow(); @@ -176,55 +176,55 @@ namespace rptui */ void initialize(); - inline OReportWindow* getView() const { return m_pParent; } + inline OReportWindow* getView() const { return m_pParent; } /** removes the section at the given position. * * \param _nPosition Zero based. */ - void removeSection(sal_uInt16 _nPosition); + void removeSection(USHORT _nPosition); /** adds a new section at position _nPosition. If the section is <NULL/> nothing happens. If the position is grater than the current elements, the section will be appended. */ - void addSection(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection + void addSection(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection ,const ::rtl::OUString& _sColorEntry - ,sal_uInt16 _nPosition = USHRT_MAX); + ,USHORT _nPosition = USHRT_MAX); - sal_uInt16 getSectionCount() const; + USHORT getSectionCount() const; /** return the section at the given position * - * \param _nPos + * \param _nPos * \return the section at this pos or an empty section */ - ::boost::shared_ptr<OSectionWindow> getSectionWindow(const sal_uInt16 _nPos) const; + ::boost::shared_ptr<OSectionWindow> getSectionWindow(const USHORT _nPos) const; /** turns the grid on or off * * \param _bVisible */ - void toggleGrid(sal_Bool _bVisible); - void setGridSnap(sal_Bool bOn); - void setDragStripes(sal_Bool bOn); + void toggleGrid(sal_Bool _bVisible); + void setGridSnap(BOOL bOn); + void setDragStripes(BOOL bOn); /** returns the total accumulated height of all sections until _pSection is reached */ - sal_Int32 getTotalHeight() const; + sal_Int32 getTotalHeight() const; - inline bool empty() const { return m_aSections.empty(); } - void SetMode( DlgEdMode m_eMode ); - void SetInsertObj( sal_uInt16 eObj,const ::rtl::OUString& _sShapeType = ::rtl::OUString()); + inline bool empty() const { return m_aSections.empty(); } + void SetMode( DlgEdMode m_eMode ); + void SetInsertObj( USHORT eObj,const ::rtl::OUString& _sShapeType = ::rtl::OUString()); rtl::OUString GetInsertObjString() const; /** copies the current selection in this section */ void Copy(); - /** returns if paste is allowed + /** returns if paste is allowed * * \return <TRUE/> if paste is allowed */ - sal_Bool IsPasteAllowed() const; + BOOL IsPasteAllowed() const; /** paste a new control in this section */ @@ -241,32 +241,33 @@ namespace rptui /** returns <TRUE/> when a object is marked */ - sal_Bool HasSelection() const; + BOOL HasSelection() const; /** unmark all objects on the views without the given one. * * @param _pSectionView The view where the objects should not be unmarked. */ - void unmarkAllObjects(OSectionView* _pSectionView); + void unmarkAllObjects(OSectionView* _pSectionView); /** returns the report section window for the given xsection - @param _xSection the section + @param _xSection the section */ + // ::boost::shared_ptr<OSectionWindow> getReportSection(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection); ::boost::shared_ptr<OSectionWindow> getSectionWindow(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) const; /** checks if the keycode is known by the child windows - @param _rCode the keycode + @param _rCode the keycode @return <TRUE/> if the keycode is handled otherwise <FALSE/> */ - sal_Bool handleKeyEvent(const KeyEvent& _rEvent); + sal_Bool handleKeyEvent(const KeyEvent& _rEvent); /** the the section as marked or not marked - @param _pSectionView the section where to set the marked flag - @param _bMark the marked flag + @param _pSectionView the section where to set the marked flag + @param _bMark the marked flag */ - void setMarked(OSectionView* _pSectionView,sal_Bool _bMark); - void setMarked(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection,sal_Bool _bMark); - void setMarked(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> >& _xShape,sal_Bool _bMark); + void setMarked(OSectionView* _pSectionView,sal_Bool _bMark); + void setMarked(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection,sal_Bool _bMark); + void setMarked(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> >& _xShape,sal_Bool _bMark); // IMarkedSection ::boost::shared_ptr<OSectionWindow> getMarkedSection(NearSectionAccess nsa = CURRENT) const; @@ -293,7 +294,7 @@ namespace rptui /** returns the current position in the list */ - sal_uInt16 getPosition(const OSectionWindow* _pSectionWindow = NULL) const; + USHORT getPosition(const OSectionWindow* _pSectionWindow = NULL) const; /** calls on every section BrkAction * @@ -309,12 +310,12 @@ namespace rptui bool isObjectInMyTempList(SdrObject *); public: void BegDragObj(const Point& _aPnt, SdrHdl* _pHdl,const OSectionView* _pSection); - void EndDragObj(sal_Bool _bDragIntoNewSection,const OSectionView* _pSection,const Point& _aPnt); + void EndDragObj(BOOL _bDragIntoNewSection,const OSectionView* _pSection,const Point& _aPnt); void EndAction(); void ForceMarkedToAnotherPage(); - sal_Bool IsAction() const; - sal_Bool IsDragObj() const; + BOOL IsAction() const; + BOOL IsDragObj() const; void handleKey(const KeyCode& _rCode); void stopScrollTimer(); @@ -327,6 +328,7 @@ namespace rptui OSectionView* getSectionRelativeToPosition(const OSectionView* _pSection,Point& _rPnt); void MovAction(const Point& rPnt,const OSectionView* _pSection,bool _bMove /*= true */, bool _bControlKeySet); + // void MovAction2(const Point& rPnt,const OSectionView* _pSection); sal_uInt32 getMarkedObjectCount() const; diff --git a/reportdesign/source/ui/inc/dlgedclip.hxx b/reportdesign/source/ui/inc/dlgedclip.hxx index dc5533fbea8d..1f80d5cabc3e 100644 --- a/reportdesign/source/ui/inc/dlgedclip.hxx +++ b/reportdesign/source/ui/inc/dlgedclip.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ namespace rptui //============================================================================ // OReportExchange //============================================================================ -/** \class OReportExchange +/** \class OReportExchange * \brief defines a clipboard fromat for copying selection elements. * \ingroup reportdesign_source_ui_report * @@ -51,15 +51,15 @@ public: /** Constructs a new exchange object with section elements * * \param _rCopyElements the elements to copy. Each section is one entry. The value must be a sequence of elements. - * \return + * \return */ OReportExchange( const TSectionElements& _rCopyElements); /** checks whether or not a descriptor can be extracted from the data flavor vector given * - * \param _rFlavors + * \param _rFlavors available flavors - * \return + * \return */ static sal_Bool canExtract(const DataFlavorExVector& _rFlavors); @@ -74,14 +74,14 @@ public: * * \return the registered format id */ - static sal_uInt32 getDescriptorFormatId(); + static sal_uInt32 getDescriptorFormatId(); protected: // TransferableHelper overridables - virtual void AddSupportedFormats(); - virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + virtual void AddSupportedFormats(); + virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); private: - TSectionElements m_aCopyElements; + TSectionElements m_aCopyElements; }; } #endif // _REPORT_RPTUICLIP_HXX diff --git a/reportdesign/source/ui/inc/dlgedfac.hxx b/reportdesign/source/ui/inc/dlgedfac.hxx index 415d27e9ba7b..d4690e3f031b 100644 --- a/reportdesign/source/ui/inc/dlgedfac.hxx +++ b/reportdesign/source/ui/inc/dlgedfac.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/reportdesign/source/ui/inc/dlgedfunc.hxx b/reportdesign/source/ui/inc/dlgedfunc.hxx index 2ac110a70396..327c4a78c4c4 100644 --- a/reportdesign/source/ui/inc/dlgedfunc.hxx +++ b/reportdesign/source/ui/inc/dlgedfunc.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,7 +52,7 @@ class DlgEdFunc /* : public LinkHdl */ protected: OReportSection* m_pParent; OSectionView& m_rView; - Timer aScrollTimer; + Timer aScrollTimer; Point m_aMDPos; com::sun::star::uno::Reference<com::sun::star::uno::XInterface> m_xOverlappingObj; SdrObject * m_pOverlappingObj; @@ -63,16 +63,16 @@ protected: bool m_bShowPropertyBrowser; DECL_LINK( ScrollTimeout, Timer * ); - void ForceScroll( const Point& rPos ); + void ForceScroll( const Point& rPos ); /** checks that no other object is overlapped. * - * \param rMEvt + * \param rMEvt */ void checkMovementAllowed(const MouseEvent& rMEvt); /** sets the correct mouse pointer when moving a object * - * \param rMEvt + * \param rMEvt * \return <TRUE/> when the pointer was already set. */ bool setMovementPointer(const MouseEvent& rMEvt); @@ -94,19 +94,19 @@ public: DlgEdFunc( OReportSection* pParent ); virtual ~DlgEdFunc(); - virtual sal_Bool MouseButtonDown( const MouseEvent& rMEvt ); - virtual sal_Bool MouseButtonUp( const MouseEvent& rMEvt ); - virtual sal_Bool MouseMove( const MouseEvent& rMEvt ); + virtual BOOL MouseButtonDown( const MouseEvent& rMEvt ); + virtual BOOL MouseButtonUp( const MouseEvent& rMEvt ); + virtual BOOL MouseMove( const MouseEvent& rMEvt ); /** checks if the keycode is known by the child windows - @param _rCode the keycode + @param _rCode the keycode @return <TRUE/> if the keycode is handled otherwise <FALSE/> */ - virtual sal_Bool handleKeyEvent(const KeyEvent& _rEvent); + virtual sal_Bool handleKeyEvent(const KeyEvent& _rEvent); /** returns <TRUE/> if the mouse event is over an existing object * - * \param rMEvt + * \param rMEvt * \return <TRUE/> if overlapping, otherwise <FALSE/> */ bool isOverlapping(const MouseEvent& rMEvt); @@ -122,7 +122,7 @@ protected: void colorizeOverlappedObject(SdrObject* _pOverlappedObj); void unColorizeOverlappedObj(); - + }; //============================================================================ @@ -135,9 +135,9 @@ public: DlgEdFuncInsert( OReportSection* pParent ); ~DlgEdFuncInsert(); - virtual sal_Bool MouseButtonDown( const MouseEvent& rMEvt ); - virtual sal_Bool MouseButtonUp( const MouseEvent& rMEvt ); - virtual sal_Bool MouseMove( const MouseEvent& rMEvt ); + virtual BOOL MouseButtonDown( const MouseEvent& rMEvt ); + virtual BOOL MouseButtonUp( const MouseEvent& rMEvt ); + virtual BOOL MouseMove( const MouseEvent& rMEvt ); }; //============================================================================ @@ -150,11 +150,11 @@ public: DlgEdFuncSelect( OReportSection* pParent ); ~DlgEdFuncSelect(); - virtual sal_Bool MouseButtonDown( const MouseEvent& rMEvt ); - virtual sal_Bool MouseButtonUp( const MouseEvent& rMEvt ); - virtual sal_Bool MouseMove( const MouseEvent& rMEvt ); + virtual BOOL MouseButtonDown( const MouseEvent& rMEvt ); + virtual BOOL MouseButtonUp( const MouseEvent& rMEvt ); + virtual BOOL MouseMove( const MouseEvent& rMEvt ); - void SetInEditMode(SdrTextObj* _pTextObj,const MouseEvent& rMEvt, sal_Bool bQuickDrag); + void SetInEditMode(SdrTextObj* _pTextObj,const MouseEvent& rMEvt, BOOL bQuickDrag); }; } diff --git a/reportdesign/source/ui/inc/dlgpage.hxx b/reportdesign/source/ui/inc/dlgpage.hxx index 4f713dad90ef..680452cbbbde 100644 --- a/reportdesign/source/ui/inc/dlgpage.hxx +++ b/reportdesign/source/ui/inc/dlgpage.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,13 +40,13 @@ namespace rptui class ORptPageDialog : public SfxTabDialog { private: - const SfxItemSet& rOutAttrs; + const SfxItemSet& rOutAttrs; ORptPageDialog(const ORptPageDialog&); void operator =(const ORptPageDialog&); public: - ORptPageDialog( Window* pParent, const SfxItemSet* pAttr,sal_uInt16 _nPageId); + ORptPageDialog( Window* pParent, const SfxItemSet* pAttr,USHORT _nPageId); virtual ~ORptPageDialog() {} }; // ============================================================================= diff --git a/reportdesign/source/ui/inc/metadata.hxx b/reportdesign/source/ui/inc/metadata.hxx index 2d0b49f74640..84d9d8c797b6 100644 --- a/reportdesign/source/ui/inc/metadata.hxx +++ b/reportdesign/source/ui/inc/metadata.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,17 +53,17 @@ namespace rptui OPropertyInfoService(const OPropertyInfoService&); void operator =(const OPropertyInfoService&); protected: - static sal_uInt16 s_nCount; - static OPropertyInfoImpl* s_pPropertyInfos; + static sal_uInt16 s_nCount; + static OPropertyInfoImpl* s_pPropertyInfos; // TODO: a real structure which allows quick access by name as well as by id public: OPropertyInfoService(){} virtual ~OPropertyInfoService(){} // IPropertyInfoService - sal_Int32 getPropertyId(const String& _rName) const; - String getPropertyTranslation(sal_Int32 _nId) const; - rtl::OString getPropertyHelpId(sal_Int32 _nId) const; + sal_Int32 getPropertyId(const String& _rName) const; + String getPropertyTranslation(sal_Int32 _nId) const; + sal_Int32 getPropertyHelpId(sal_Int32 _nId) const; sal_uInt32 getPropertyUIFlags(sal_Int32 _nId) const; static void getExcludeProperties(::std::vector< com::sun::star::beans::Property >& _rExcludeProperties,const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyHandler >& _xFormComponentHandler); @@ -86,7 +86,7 @@ namespace rptui class HelpIdUrl { public: - static ::rtl::OUString getHelpURL( const rtl::OString& _sHelpId ); + static ::rtl::OUString getHelpURL( sal_uInt32 _nHelpId ); }; //======================================================================== @@ -110,12 +110,12 @@ namespace rptui //= The ID is used for the view order in the property browser. //======================================================================== - #define PROPERTY_ID_FORCENEWPAGE 1 - #define PROPERTY_ID_NEWROWORCOL 2 - #define PROPERTY_ID_KEEPTOGETHER 3 - #define PROPERTY_ID_CANGROW 4 - #define PROPERTY_ID_CANSHRINK 5 - #define PROPERTY_ID_REPEATSECTION 6 + #define PROPERTY_ID_FORCENEWPAGE 1 + #define PROPERTY_ID_NEWROWORCOL 2 + #define PROPERTY_ID_KEEPTOGETHER 3 + #define PROPERTY_ID_CANGROW 4 + #define PROPERTY_ID_CANSHRINK 5 + #define PROPERTY_ID_REPEATSECTION 6 #define PROPERTY_ID_PRESERVEIRI 7 #define PROPERTY_ID_VISIBLE 8 #define PROPERTY_ID_GROUPKEEPTOGETHER 9 @@ -125,10 +125,10 @@ namespace rptui #define PROPERTY_ID_POSITIONY 13 #define PROPERTY_ID_WIDTH 14 #define PROPERTY_ID_HEIGHT 15 - #define PROPERTY_ID_FORMULA 16 + #define PROPERTY_ID_FORMULA 16 #define PROPERTY_ID_PRINTREPEATEDVALUES 17 - #define PROPERTY_ID_CONDITIONALPRINTEXPRESSION 18 - #define PROPERTY_ID_INITIALFORMULA 19 + #define PROPERTY_ID_CONDITIONALPRINTEXPRESSION 18 + #define PROPERTY_ID_INITIALFORMULA 19 #define PROPERTY_ID_STARTNEWCOLUMN 20 #define PROPERTY_ID_TYPE 21 #define PROPERTY_ID_DATAFIELD 22 @@ -155,7 +155,7 @@ namespace rptui #define PROPERTY_ID_FONT 40 #define PROPERTY_ID_PARAADJUST 41 #define PROPERTY_ID_VERTICALALIGN 42 - + //............................................................................ } // namespace rptui diff --git a/reportdesign/source/ui/inc/propbrw.hxx b/reportdesign/source/ui/inc/propbrw.hxx index ad31dfb4b24c..c7efc6d02817 100644 --- a/reportdesign/source/ui/inc/propbrw.hxx +++ b/reportdesign/source/ui/inc/propbrw.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,8 +54,8 @@ class OObjectBase; class PropBrw : public DockingWindow , public SfxListener, public SfxBroadcaster { private: - OModuleClient m_aModuleClient; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > + OModuleClient m_aModuleClient; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xInspectorContext; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xORB; @@ -69,17 +69,17 @@ private: m_xLastSection; /// is the previously displayed section ::rtl::OUString m_sLastActivePage; ODesignView* m_pDesignView; - OSectionView* m_pView; - sal_Bool m_bInitialStateChange; + OSectionView* m_pView; + sal_Bool m_bInitialStateChange; PropBrw(PropBrw&); void operator =(PropBrw&); protected: - + virtual void Resize(); virtual sal_Bool Close(); - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> > + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> > CreateCompPropSet(const SdrMarkList& rMarkList); void implSetNewObject( @@ -96,16 +96,16 @@ protected: DECL_LINK( OnAsyncGetFocus, void* ); public: - PropBrw(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xORB + PropBrw(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xORB ,Window* pParent ,ODesignView* _pDesignView); virtual ~PropBrw(); virtual void LoseFocus(); - void Update( OSectionView* m_pView ); - void Update( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _xReportComponent); - inline OSectionView* GetCurView() const { return m_pView; } + void Update( OSectionView* m_pView ); + void Update( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _xReportComponent); + inline OSectionView* GetCurView() const { return m_pView; } ::rtl::OUString getCurrentPage() const; void setCurrentPage(const ::rtl::OUString& _sLastActivePage); diff --git a/reportdesign/source/ui/inc/statusbarcontroller.hxx b/reportdesign/source/ui/inc/statusbarcontroller.hxx index cd25a477d02e..615dde813ca1 100644 --- a/reportdesign/source/ui/inc/statusbarcontroller.hxx +++ b/reportdesign/source/ui/inc/statusbarcontroller.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,13 +39,13 @@ namespace rptui { typedef ::comphelper::ImplementationReference<SfxStatusBarControl,::com::sun::star::frame::XStatusbarController> TStatusbarHelper; - typedef ::cppu::ImplHelper1 < ::com::sun::star::lang::XServiceInfo> OStatusbarController_BASE; + typedef ::cppu::ImplHelper1 < ::com::sun::star::lang::XServiceInfo> OStatusbarController_BASE; class OStatusbarController : public ::svt::StatusbarController, public OStatusbarController_BASE { TStatusbarHelper m_pController; - sal_uInt16 m_nSlotId; - sal_uInt16 m_nId; + sal_uInt16 m_nSlotId; + sal_uInt16 m_nId; public: OStatusbarController(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB); @@ -62,7 +62,7 @@ namespace rptui virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // need by registration - + virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); // XInitialization @@ -70,7 +70,7 @@ namespace rptui // XUpdatable virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException); - + // XStatusListener virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ); @@ -78,12 +78,12 @@ namespace rptui virtual ::sal_Bool SAL_CALL mouseButtonDown( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL mouseMove( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL mouseButtonUp( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL command( const ::com::sun::star::awt::Point& aPos, - ::sal_Int32 nCommand, - ::sal_Bool bMouseEvent, + virtual void SAL_CALL command( const ::com::sun::star::awt::Point& aPos, + ::sal_Int32 nCommand, + ::sal_Bool bMouseEvent, const ::com::sun::star::uno::Any& aData ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL paint( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& xGraphics, - const ::com::sun::star::awt::Rectangle& rOutputRectangle, + virtual void SAL_CALL paint( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& xGraphics, + const ::com::sun::star::awt::Rectangle& rOutputRectangle, ::sal_Int32 nItemId, ::sal_Int32 nStyle ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL click() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL doubleClick() throw (::com::sun::star::uno::RuntimeException); diff --git a/reportdesign/source/ui/inc/toolboxcontroller.hxx b/reportdesign/source/ui/inc/toolboxcontroller.hxx index 0b12e6551176..d55cb94dea48 100644 --- a/reportdesign/source/ui/inc/toolboxcontroller.hxx +++ b/reportdesign/source/ui/inc/toolboxcontroller.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ class SfxToolBoxControl; namespace rptui { - typedef ::cppu::ImplHelper2 < ::com::sun::star::lang::XServiceInfo, + typedef ::cppu::ImplHelper2 < ::com::sun::star::lang::XServiceInfo, ::com::sun::star::frame::XSubToolbarController> TToolboxController_BASE; typedef ::comphelper::ImplementationReference<SfxToolBoxControl,::com::sun::star::frame::XToolbarController> TToolbarHelper; @@ -47,10 +47,10 @@ namespace rptui ,public TToolboxController_BASE { DECLARE_STL_USTRINGACCESS_MAP(sal_Bool,TCommandState); - TCommandState m_aStates; + TCommandState m_aStates; TToolbarHelper m_pToolbarController; - sal_uInt16 m_nToolBoxId; - sal_uInt16 m_nSlotId; + sal_uInt16 m_nToolBoxId; + sal_uInt16 m_nSlotId; OToolboxController(const OToolboxController&); void operator =(const OToolboxController&); public: diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx index fadd0fd065cc..d1756b123202 100644 --- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx +++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,7 +52,7 @@ #include <com/sun/star/inspection/XNumericControl.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/util/MeasureUnit.hpp> -#include <tools/fldunit.hxx> +#include <vcl/fldunit.hxx> #include "metadata.hxx" #include <vcl/svapp.hxx> #include <osl/mutex.hxx> @@ -169,6 +169,13 @@ void SAL_CALL DataProviderHandler::inspect(const uno::Reference< uno::XInterface m_xMasterDetails = new OPropertyMediator( m_xDataProvider.get(), m_xReportComponent.get(), aPropertyMediation,sal_True ); } + + //const ::rtl::OUString sRowSet(RTL_CONSTASCII_USTRINGPARAM("RowSet")); + //if ( xNameCont->hasByName(sRowSet) ) + //{ + // uno::Reference<beans::XPropertySet> xProp(m_xFormComponentHandler,uno::UNO_QUERY); + // xProp->setPropertyValue(sRowSet,xNameCont->getByName(sRowSet)); + //} } catch(uno::Exception) { @@ -198,7 +205,7 @@ uno::Any SAL_CALL DataProviderHandler::getPropertyValue(const ::rtl::OUString & // uno::Reference< chart2::XCoordinateSystemContainer > xCooSysCnt( xDiagram, uno::UNO_QUERY_THROW ); // const uno::Sequence< uno::Reference< chart2::XCoordinateSystem > > aCooSysSeq( xCooSysCnt->getCoordinateSystems()); // const uno::Reference< chart2::XCoordinateSystem >* pIter = aCooSysSeq.getConstArray(); - // const uno::Reference< chart2::XCoordinateSystem >* pEnd = pIter + aCooSysSeq.getLength(); + // const uno::Reference< chart2::XCoordinateSystem >* pEnd = pIter + aCooSysSeq.getLength(); // for(;pIter != pEnd;++pIter) // { // const uno::Reference< chart2::XChartTypeContainer > xCTCnt( *pIter, uno::UNO_QUERY_THROW ); @@ -260,11 +267,11 @@ void DataProviderHandler::impl_updateChartTitle_throw(const uno::Any& _aValue) ::rtl::OUString sStr; _aValue>>= sStr; xFormatted->setString(sStr); - uno::Sequence< uno::Reference< chart2::XFormattedString> > aArgs(1); + uno::Sequence< uno::Reference< chart2::XFormattedString> > aArgs(1); aArgs[0] = xFormatted; xTitle->setText(aArgs); } - } + } // if ( xTitled.is() ) } beans::PropertyState SAL_CALL DataProviderHandler::getPropertyState(const ::rtl::OUString & PropertyName) throw (uno::RuntimeException, beans::UnknownPropertyException) @@ -279,7 +286,7 @@ inspection::LineDescriptor SAL_CALL DataProviderHandler::describePropertyLine(co switch(nId) { case PROPERTY_ID_CHARTTYPE: - aOut.PrimaryButtonId = rtl::OUString::createFromAscii(UID_RPT_PROP_CHARTTYPE_DLG); + aOut.PrimaryButtonId = UID_RPT_PROP_CHARTTYPE_DLG; aOut.Control = _xControlFactory->createPropertyControl(inspection::PropertyControlType::TextField , sal_True); aOut.HasPrimaryButton = sal_True; break; @@ -289,7 +296,7 @@ inspection::LineDescriptor SAL_CALL DataProviderHandler::describePropertyLine(co case PROPERTY_ID_MASTERFIELDS: case PROPERTY_ID_DETAILFIELDS: aOut.Control = _xControlFactory->createPropertyControl(inspection::PropertyControlType::StringListField , sal_False); - aOut.PrimaryButtonId = rtl::OUString::createFromAscii(UID_RPT_PROP_DLG_LINKFIELDS); + aOut.PrimaryButtonId = UID_RPT_PROP_DLG_LINKFIELDS; aOut.HasPrimaryButton = sal_True; break; default: @@ -323,7 +330,7 @@ uno::Any SAL_CALL DataProviderHandler::convertToPropertyValue(const ::rtl::OUStr } catch( const uno::Exception& ) { - OSL_FAIL( "DataProviderHandler::convertToPropertyValue: caught an exception while converting via TypeConverter!" ); + OSL_ENSURE( sal_False, "DataProviderHandler::convertToPropertyValue: caught an exception while converting via TypeConverter!" ); } break; case PROPERTY_ID_MASTERFIELDS: @@ -357,7 +364,7 @@ uno::Any SAL_CALL DataProviderHandler::convertToControlValue(const ::rtl::OUStri } catch( const uno::Exception& ) { - OSL_FAIL( "GeometryHandler::convertToPropertyValue: caught an exception while converting via TypeConverter!" ); + OSL_ENSURE( sal_False, "GeometryHandler::convertToPropertyValue: caught an exception while converting via TypeConverter!" ); } break; default: @@ -389,8 +396,9 @@ uno::Sequence< beans::Property > SAL_CALL DataProviderHandler::getSupportedPrope ,PROPERTY_MASTERFIELDS ,PROPERTY_DETAILFIELDS ,PROPERTY_PREVIEW_COUNT + //,PROPERTY_TITLE }; - + for (size_t nPos = 0; nPos < SAL_N_ELEMENTS(s_pProperties) ;++nPos ) { aValue.Name = s_pProperties[nPos]; @@ -444,7 +452,7 @@ inspection::InteractiveSelectionResult SAL_CALL DataProviderHandler::onInteracti default: eResult = m_xFormComponentHandler->onInteractivePropertySelection(PropertyName, Primary, out_Data, _rxInspectorUI); } - + return eResult; } @@ -472,9 +480,9 @@ void SAL_CALL DataProviderHandler::actuatingPropertyChanged(const ::rtl::OUStrin xReceiver->setArguments( aArgs.getPropertyValues() ); if ( !bModified ) xReport->setModified(sal_False); - } + } // if ( NewValue != OldValue ) m_xFormComponentHandler->actuatingPropertyChanged(ActuatingPropertyName, NewValue, OldValue, InspectorUI, FirstTimeInit); - } + } // if ( ActuatingPropertyName == PROPERTY_COMMAND ) else if ( ActuatingPropertyName == PROPERTY_TITLE ) { if ( NewValue != OldValue ) @@ -485,7 +493,7 @@ void SAL_CALL DataProviderHandler::actuatingPropertyChanged(const ::rtl::OUStrin const sal_Int32 nId = m_pInfoService->getPropertyId(ActuatingPropertyName); switch(nId) { - + case PROPERTY_ID_MASTERFIELDS: break; case PROPERTY_ID_DETAILFIELDS: @@ -551,7 +559,7 @@ bool DataProviderHandler::impl_dialogChartType_nothrow( ::osl::ClearableMutexGua _rClearBeforeDialog.clear(); return ( xDialog->execute() != 0 ); -} +} //........................................................................ } // namespace rptui //........................................................................ diff --git a/reportdesign/source/ui/inspection/DefaultInspection.cxx b/reportdesign/source/ui/inspection/DefaultInspection.cxx index 7701c91e83d4..b82f11071692 100644 --- a/reportdesign/source/ui/inspection/DefaultInspection.cxx +++ b/reportdesign/source/ui/inspection/DefaultInspection.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,20 +38,17 @@ #include <rtl/ustrbuf.hxx> #include <tools/debug.hxx> #include "metadata.hxx" -#include <tools/urlobj.hxx> //........................................................................ namespace rptui { //........................................................................ //------------------------------------------------------------------------ - ::rtl::OUString HelpIdUrl::getHelpURL( const rtl::OString& sHelpId ) + ::rtl::OUString HelpIdUrl::getHelpURL( sal_uInt32 _nHelpId ) { ::rtl::OUStringBuffer aBuffer; - ::rtl::OUString aTmp( sHelpId, sHelpId.getLength(), RTL_TEXTENCODING_UTF8 ); - DBG_ASSERT( INetURLObject( aTmp ).GetProtocol() == INET_PROT_NOT_VALID, "Wrong HelpId!" ); - aBuffer.appendAscii( INET_HID_SCHEME ); - aBuffer.append( aTmp.getStr() ); + aBuffer.appendAscii( "HID:" ); + aBuffer.append( (sal_Int32)_nHelpId ); return aBuffer.makeStringAndClear(); } @@ -64,7 +61,7 @@ namespace rptui //==================================================================== //= DefaultComponentInspectorModel //==================================================================== - DBG_NAME(DefaultComponentInspectorModel) + DBG_NAME(DefaultComponentInspectorModel) //-------------------------------------------------------------------- DefaultComponentInspectorModel::DefaultComponentInspectorModel( const Reference< XComponentContext >& _rxContext) :m_xContext( _rxContext ) @@ -75,13 +72,13 @@ namespace rptui ,m_nMaxHelpTextLines( 8 ) ,m_pInfoService(new OPropertyInfoService()) { - DBG_CTOR(DefaultComponentInspectorModel,NULL); + DBG_CTOR(DefaultComponentInspectorModel,NULL); } //------------------------------------------------------------------------ DefaultComponentInspectorModel::~DefaultComponentInspectorModel() { - DBG_DTOR(DefaultComponentInspectorModel,NULL); + DBG_DTOR(DefaultComponentInspectorModel,NULL); } //------------------------------------------------------------------------ @@ -127,7 +124,7 @@ namespace rptui { ::osl::MutexGuard aGuard( m_aMutex ); - + // service names for all our handlers const struct { @@ -138,9 +135,9 @@ namespace rptui { "com.sun.star.form.inspection.EditPropertyHandler"}, { "com.sun.star.report.inspection.DataProviderHandler"}, { "com.sun.star.report.inspection.GeometryHandler"} - + // generic virtual edit properties - + }; const size_t nFactories = SAL_N_ELEMENTS( aFactories ); @@ -159,7 +156,7 @@ namespace rptui ::osl::MutexGuard aGuard(m_aMutex); return m_bHasHelpSection; } - + //-------------------------------------------------------------------- ::sal_Int32 SAL_CALL DefaultComponentInspectorModel::getMinHelpTextLines() throw (RuntimeException) { @@ -178,7 +175,7 @@ namespace rptui ::osl::MutexGuard aGuard(m_aMutex); m_bIsReadOnly = _isreadonly; } - + //-------------------------------------------------------------------- ::sal_Int32 SAL_CALL DefaultComponentInspectorModel::getMaxHelpTextLines() throw (RuntimeException) { @@ -234,8 +231,8 @@ namespace rptui const struct { const sal_Char* programmaticName; - sal_uInt16 uiNameResId; - rtl::OString helpId; + USHORT uiNameResId; + sal_uInt32 helpId; } aCategories[] = { { "General", RID_STR_PROPPAGE_DEFAULT, HID_RPT_PROPDLG_TAB_GENERAL }, { "Data", RID_STR_PROPPAGE_DATA, HID_RPT_PROPDLG_TAB_DATA }, diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx index 8b7cae395c33..691bef2134e9 100644 --- a/reportdesign/source/ui/inspection/GeometryHandler.cxx +++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -67,7 +67,7 @@ #include <vcl/msgbox.hxx> #include <vcl/waitobj.hxx> -#include <tools/fldunit.hxx> +#include <vcl/fldunit.hxx> #include <vcl/stdtext.hxx> #include "ModuleHelper.hxx" @@ -85,9 +85,9 @@ #include <svl/itempool.hxx> #include <svl/itemset.hxx> -#define ITEMID_COLOR_TABLE SID_COLOR_TABLE -#define ITEMID_DASH_LIST SID_DASH_LIST -#define ITEMID_LINEEND_LIST SID_LINEEND_LIST +#define ITEMID_COLOR_TABLE SID_COLOR_TABLE +#define ITEMID_DASH_LIST SID_DASH_LIST +#define ITEMID_LINEEND_LIST SID_LINEEND_LIST #include <svx/xdef.hxx> #include <svx/xpool.hxx> #include <svx/xtable.hxx> @@ -104,9 +104,9 @@ #include <svx/xlineit0.hxx> #include <svx/svxids.hrc> -#define ITEMID_COLOR_TABLE SID_COLOR_TABLE -#define ITEMID_DASH_LIST SID_DASH_LIST -#define ITEMID_LINEEND_LIST SID_LINEEND_LIST +#define ITEMID_COLOR_TABLE SID_COLOR_TABLE +#define ITEMID_DASH_LIST SID_DASH_LIST +#define ITEMID_LINEEND_LIST SID_LINEEND_LIST #include <svx/drawitem.hxx> #define ITEMID_BRUSH SID_ATTR_BRUSH #include <editeng/brshitem.hxx> @@ -116,8 +116,6 @@ #include "helpids.hrc" #include <toolkit/helper/convert.hxx> -#include <o3tl/compat_functional.hxx> - #define DATA_OR_FORMULA 0 #define FUNCTION 1 #define COUNTER 2 @@ -129,17 +127,18 @@ namespace rptui { //........................................................................ using namespace ::com::sun::star; +//using namespace formula; // comparing two property instances struct PropertyCompare : public ::std::binary_function< beans::Property, ::rtl::OUString , bool > { bool operator() (const beans::Property& x, const ::rtl::OUString& y) const { - return x.Name.equals(y); + return x.Name.equals(y);// ? true : false; } bool operator() (const ::rtl::OUString& x,const beans::Property& y) const { - return x.equals(y.Name); + return x.equals(y.Name);// ? true : false; } }; @@ -177,7 +176,7 @@ void lcl_collectFunctionNames(const uno::Reference< report::XSection>& _xSection nPos = getPositionInIndexAccess(xGroups.get(),xGroup); else if ( _xSection == xReportDefinition->getDetail() ) nPos = xGroups->getCount()-1; - + for (sal_Int32 i = 0 ; i <= nPos ; ++i) { xGroup.set(xGroups->getByIndex(i),uno::UNO_QUERY_THROW); @@ -250,7 +249,7 @@ GeometryHandler::GeometryHandler(uno::Reference< uno::XComponentContext > const // ----------------------------------------------------------------------------- GeometryHandler::~GeometryHandler() { - DBG_DTOR(rpt_GeometryHandler,NULL); + DBG_DTOR(rpt_GeometryHandler,NULL); } //------------------------------------------------------------------------ ::rtl::OUString SAL_CALL GeometryHandler::getImplementationName( ) throw(uno::RuntimeException) @@ -301,7 +300,7 @@ void SAL_CALL GeometryHandler::disposing() ::comphelper::disposeComponent(m_xTypeConverter); if ( m_xReportComponent.is() && m_xReportComponent->getPropertySetInfo()->hasPropertyByName(PROPERTY_DATAFIELD) ) m_xReportComponent->removePropertyChangeListener(PROPERTY_DATAFIELD,static_cast< beans::XPropertyChangeListener* >( this )); - + m_xReportComponent.clear(); m_xRowSet.clear(); m_aPropertyListeners.clear(); @@ -399,7 +398,7 @@ uno::Any SAL_CALL GeometryHandler::getPropertyValue(const ::rtl::OUString & Prop aPropertyValue = uno::Any(); break; } - + } break; case PROPERTY_ID_TYPE: @@ -435,8 +434,8 @@ uno::Any SAL_CALL GeometryHandler::getPropertyValue(const ::rtl::OUString & Prop aPropertyValue <<= m_sScope; break; } - - } + + } break; case PROPERTY_ID_BACKCOLOR: case PROPERTY_ID_CONTROLBACKGROUND: @@ -495,7 +494,7 @@ void SAL_CALL GeometryHandler::setPropertyValue(const ::rtl::OUString & Property else if ( m_aFunctionNames.find(sDataField) != m_aFunctionNames.end() ) m_nDataFieldType = USER_DEF_FUNCTION; } - + resetOwnProperties(aGuard,sOldFunctionName,sOldScope,nOldDataFieldType); } break; @@ -593,10 +592,10 @@ void SAL_CALL GeometryHandler::setPropertyValue(const ::rtl::OUString & Property } } } - + break; case PROPERTY_ID_SCOPE: - if ( !(Value >>= m_sScope) ) + if ( !(Value >>= m_sScope) ) m_sScope = ::rtl::OUString(); else { @@ -619,7 +618,7 @@ void SAL_CALL GeometryHandler::setPropertyValue(const ::rtl::OUString & Property ::rtl::OUString sDefaultFunctionName; ::rtl::OUString sDataField; OSL_VERIFY( impl_isDefaultFunction_nothrow(m_xFunction,sDataField,sDefaultFunctionName) ); - m_sDefaultFunction = sDefaultFunctionName; + m_sDefaultFunction = sDefaultFunctionName; createDefaultFunction(aGuard,m_sDefaultFunction,sDataField); } } @@ -646,7 +645,7 @@ void SAL_CALL GeometryHandler::setPropertyValue(const ::rtl::OUString & Property aAwtSize.Height = nNewValue; else if ( nId == PROPERTY_ID_WIDTH ) aAwtSize.Width = nNewValue; - + checkPosAndSize(aAwtPoint,aAwtSize); } } @@ -691,7 +690,7 @@ void GeometryHandler::implCreateListLikeControl( { ::std::vector< ::rtl::OUString > aList; tools::StringListResource aRes(ModuleRes(_nResId),aList); - + implCreateListLikeControl(_rxControlFactory,out_Descriptor,aList,_bReadOnlyControl,_bTrueIfListBoxFalseIfComboBox); } // ----------------------------------------------------------------------------- @@ -756,7 +755,7 @@ inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const case PROPERTY_ID_TYPE: implCreateListLikeControl(_xControlFactory,aOut,RID_STR_TYPE_CONST,sal_False,sal_True); break; - case PROPERTY_ID_VISIBLE: + case PROPERTY_ID_VISIBLE: case PROPERTY_ID_CANGROW: case PROPERTY_ID_CANSHRINK: case PROPERTY_ID_REPEATSECTION: @@ -779,12 +778,12 @@ inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const break; case PROPERTY_ID_INITIALFORMULA: case PROPERTY_ID_FORMULA: - aOut.PrimaryButtonId = rtl::OUString::createFromAscii(UID_RPT_PROP_FORMULA); + aOut.PrimaryButtonId = UID_RPT_PROP_FORMULA; aOut.HasPrimaryButton = sal_True; aOut.Control = _xControlFactory->createPropertyControl(inspection::PropertyControlType::MultiLineTextField , sal_False); break; case PROPERTY_ID_CONDITIONALPRINTEXPRESSION: - aOut.PrimaryButtonId = rtl::OUString::createFromAscii(UID_RPT_PROP_FORMULA); + aOut.PrimaryButtonId = UID_RPT_PROP_FORMULA; aOut.HasPrimaryButton = sal_True; aOut.Control = _xControlFactory->createPropertyControl(inspection::PropertyControlType::MultiLineTextField , sal_False); break; @@ -799,7 +798,7 @@ inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const if ( m_nDataFieldType == DATA_OR_FORMULA ) { - aOut.PrimaryButtonId = rtl::OUString::createFromAscii(UID_RPT_PROP_FORMULA); + aOut.PrimaryButtonId = UID_RPT_PROP_FORMULA; aOut.HasPrimaryButton = sal_True; } @@ -808,9 +807,9 @@ inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const { // add function names ::std::for_each( m_aFunctionNames.begin(), m_aFunctionNames.end(), - ::o3tl::compose1( + ::std::compose1( ::boost::bind( &inspection::XStringListControl::appendListEntry, xListControl,_1 ), - ::o3tl::select1st<TFunctions::value_type>())); + ::std::select1st<TFunctions::value_type>())); } else { @@ -826,12 +825,12 @@ inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const aOut.Control = _xControlFactory->createPropertyControl( inspection::PropertyControlType::ColorListBox, sal_False ); break; case PROPERTY_ID_FONT: - aOut.PrimaryButtonId = rtl::OUString::createFromAscii(UID_RPT_RPT_PROP_DLG_FONT_TYPE); + aOut.PrimaryButtonId = UID_RPT_RPT_PROP_DLG_FONT_TYPE; aOut.Control = _xControlFactory->createPropertyControl( inspection::PropertyControlType::TextField, sal_True ); aOut.HasPrimaryButton = sal_True; break; case PROPERTY_ID_AREA: - aOut.PrimaryButtonId = rtl::OUString::createFromAscii(UID_RPT_RPT_PROP_DLG_AREA); + aOut.PrimaryButtonId = UID_RPT_RPT_PROP_DLG_AREA; aOut.Control = _xControlFactory->createPropertyControl( inspection::PropertyControlType::TextField, sal_True ); aOut.HasPrimaryButton = sal_True; break; @@ -846,7 +845,7 @@ inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const aOut = m_xFormComponentHandler->describePropertyLine(PropertyName, _xControlFactory); } } - + if ( nId != -1 ) { aOut.Category = ((m_pInfoService->getPropertyUIFlags(nId ) & PROP_FLAG_DATA_PROPERTY) != 0) ? @@ -856,7 +855,7 @@ inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const aOut.HelpURL = HelpIdUrl::getHelpURL( m_pInfoService->getPropertyHelpId( nId ) ); aOut.DisplayName = m_pInfoService->getPropertyTranslation(nId); } - + if ( ( nId == PROPERTY_ID_POSITIONX ) || ( nId == PROPERTY_ID_POSITIONY ) || ( nId == PROPERTY_ID_WIDTH ) @@ -975,7 +974,7 @@ uno::Any SAL_CALL GeometryHandler::convertToPropertyValue(const ::rtl::OUString aPropertyValue <<= static_cast<sal_Int32>(COL_TRANSPARENT); break; } - // run through + // run through case PROPERTY_ID_KEEPTOGETHER: if ( uno::Reference< report::XGroup>(m_xReportComponent,uno::UNO_QUERY).is()) @@ -983,7 +982,7 @@ uno::Any SAL_CALL GeometryHandler::convertToPropertyValue(const ::rtl::OUString aPropertyValue = getConstantValue(sal_False,RID_STR_KEEPTOGETHER_CONST,_rControlValue,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.KeepTogether")),PropertyName); break; } - // run through + // run through case PROPERTY_ID_VISIBLE: case PROPERTY_ID_CANGROW: @@ -1000,17 +999,17 @@ uno::Any SAL_CALL GeometryHandler::convertToPropertyValue(const ::rtl::OUString case PROPERTY_ID_CONTROLBACKGROUNDTRANSPARENT: { if ( aPropertyValue.hasValue() ) - { + { const beans::Property aProp = getProperty(PropertyName); if ( aPropertyValue.getValueType().equals( aProp.Type ) ) // nothing to do, type is already as desired return aPropertyValue; - + if ( _rControlValue.getValueType().getTypeClass() == uno::TypeClass_STRING ) { ::rtl::OUString sControlValue; _rControlValue >>= sControlValue; - + const uno::Reference< inspection::XStringRepresentation > xConversionHelper = inspection::StringRepresentation::create( m_xContext,m_xTypeConverter ); aPropertyValue = xConversionHelper->convertToPropertyValue( sControlValue, aProp.Type ); } @@ -1022,11 +1021,11 @@ uno::Any SAL_CALL GeometryHandler::convertToPropertyValue(const ::rtl::OUString } catch( const uno::Exception& ) { - OSL_FAIL( "GeometryHandler::convertToPropertyValue: caught an exception while converting via TypeConverter!" ); + OSL_ENSURE( sal_False, "GeometryHandler::convertToPropertyValue: caught an exception while converting via TypeConverter!" ); } } } - + break; } case PROPERTY_ID_CONDITIONALPRINTEXPRESSION: @@ -1167,7 +1166,7 @@ uno::Any SAL_CALL GeometryHandler::convertToControlValue(const ::rtl::OUString & } catch( const uno::Exception& ) { - OSL_FAIL( "GeometryHandler::convertToControlValue: caught an exception while converting via TypeConverter!" ); + OSL_ENSURE( sal_False, "GeometryHandler::convertToControlValue: caught an exception while converting via TypeConverter!" ); } } break; @@ -1330,17 +1329,17 @@ uno::Sequence< beans::Property > SAL_CALL GeometryHandler::getSupportedPropertie } aNewProps.push_back(*pFind); } - } + } // for (size_t i = 0; i < SAL_N_ELEMENTS(pIncludeProperties) ;++i ) // special property for shapes // if ( uno::Reference< report::XShape>(m_xReportComponent,uno::UNO_QUERY).is() ) // { // beans::Property aValue; // aValue.Name = PROPERTY_AREA; -// aNewProps.push_back(aValue); +// aNewProps.push_back(aValue); // } // re-enable when the remaining issues of #i88727# are fixed - + return uno::Sequence< beans::Property > (&(*aNewProps.begin()),aNewProps.size()); } @@ -1385,7 +1384,7 @@ inspection::InteractiveSelectionResult SAL_CALL GeometryHandler::onInteractivePr if ( !_rxInspectorUI.is() ) throw lang::NullPointerException(); if ( PropertyName.equalsAscii(PROPERTY_FILTER) ) - { + { ::osl::ClearableMutexGuard aGuard( m_aMutex ); inspection::InteractiveSelectionResult eResult = inspection::InteractiveSelectionResult_Cancelled; @@ -1396,9 +1395,9 @@ inspection::InteractiveSelectionResult SAL_CALL GeometryHandler::onInteractivePr eResult = inspection::InteractiveSelectionResult_ObtainedValue; } return eResult; - } + } else if ( PropertyName.equalsAscii(PROPERTY_FONT) ) - { + { ::osl::ClearableMutexGuard aGuard( m_aMutex ); inspection::InteractiveSelectionResult eResult = inspection::InteractiveSelectionResult_Cancelled; @@ -1414,21 +1413,21 @@ inspection::InteractiveSelectionResult SAL_CALL GeometryHandler::onInteractivePr } return eResult; } - else if ( PropertyName.equalsAscii(PROPERTY_FORMULA) - || PropertyName.equalsAscii(PROPERTY_INITIALFORMULA) - || PropertyName.equalsAscii(PROPERTY_DATAFIELD) + else if ( PropertyName.equalsAscii(PROPERTY_FORMULA) + || PropertyName.equalsAscii(PROPERTY_INITIALFORMULA) + || PropertyName.equalsAscii(PROPERTY_DATAFIELD) || PropertyName.equalsAscii(PROPERTY_CONDITIONALPRINTEXPRESSION)) - { + { ::osl::ClearableMutexGuard aGuard( m_aMutex ); - + ::rtl::OUString sFormula; m_xReportComponent->getPropertyValue(PropertyName) >>= sFormula; const uno::Reference< awt::XWindow> xInspectorWindow(m_xContext->getValueByName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DialogParentWindow"))) ,uno::UNO_QUERY); uno::Reference< uno::XComponentContext > xContext = m_xContext; uno::Reference< beans::XPropertySet > xRowSet( m_xRowSet,uno::UNO_QUERY); aGuard.clear(); - + inspection::InteractiveSelectionResult eResult = inspection::InteractiveSelectionResult_Cancelled; if ( rptui::openDialogFormula_nothrow( sFormula, xContext,xInspectorWindow,xRowSet ) ) { @@ -1438,7 +1437,7 @@ inspection::InteractiveSelectionResult SAL_CALL GeometryHandler::onInteractivePr return eResult; } else if ( PropertyName.equalsAscii(PROPERTY_AREA) ) - { + { ::osl::ClearableMutexGuard aGuard( m_aMutex ); inspection::InteractiveSelectionResult eResult = inspection::InteractiveSelectionResult_Cancelled; @@ -1451,6 +1450,7 @@ inspection::InteractiveSelectionResult SAL_CALL GeometryHandler::onInteractivePr eResult = inspection::InteractiveSelectionResult_ObtainedValue; beans::PropertyChangeEvent aScopeEvent; aScopeEvent.PropertyName = PROPERTY_FILLCOLOR; + // aScopeEvent.OldValue <<= _nOldDataFieldType; aScopeEvent.NewValue <<= xShape->getPropertyValue(PROPERTY_FILLCOLOR); m_aPropertyListeners.notify( aScopeEvent, &beans::XPropertyChangeListener::propertyChange ); } @@ -1482,14 +1482,14 @@ void SAL_CALL GeometryHandler::actuatingPropertyChanged(const ::rtl::OUString & _rxInspectorUI->enablePropertyUI(PROPERTY_FORMULALIST,sal_False); _rxInspectorUI->enablePropertyUI(PROPERTY_SCOPE,sal_False); OSL_ENSURE(m_sDefaultFunction.getLength() == 0,"Why is the m_sDefaultFunction set?"); - OSL_ENSURE(m_sScope.getLength() == 0,"Why is the m_sScope set?"); + OSL_ENSURE(m_sScope.getLength() == 0,"Why is the m_sScope set?"); break; case FUNCTION: _rxInspectorUI->rebuildPropertyUI(PROPERTY_DATAFIELD); _rxInspectorUI->rebuildPropertyUI(PROPERTY_FORMULALIST); _rxInspectorUI->enablePropertyUI(PROPERTY_DATAFIELD,sal_True); - _rxInspectorUI->enablePropertyUI(PROPERTY_FORMULALIST,m_sDefaultFunction.getLength() != 0); - _rxInspectorUI->enablePropertyUI(PROPERTY_SCOPE,m_sScope.getLength() != 0); + _rxInspectorUI->enablePropertyUI(PROPERTY_FORMULALIST,m_sDefaultFunction.getLength() != 0); + _rxInspectorUI->enablePropertyUI(PROPERTY_SCOPE,m_sScope.getLength() != 0); break; case USER_DEF_FUNCTION: _rxInspectorUI->enablePropertyUI(PROPERTY_DATAFIELD,sal_False); @@ -1519,7 +1519,7 @@ void SAL_CALL GeometryHandler::actuatingPropertyChanged(const ::rtl::OUString & { _rxInspectorUI->rebuildPropertyUI(PROPERTY_DATAFIELD); _rxInspectorUI->rebuildPropertyUI(PROPERTY_FORMULALIST); - } + } // if ( bEnable ) m_xFormComponentHandler->actuatingPropertyChanged(ActuatingPropertyName, NewValue, OldValue, _rxInspectorUI, _bFirstTimeInit); } break; @@ -1541,7 +1541,7 @@ void SAL_CALL GeometryHandler::actuatingPropertyChanged(const ::rtl::OUString & default: m_xFormComponentHandler->actuatingPropertyChanged(ActuatingPropertyName, NewValue, OldValue, _rxInspectorUI, _bFirstTimeInit); break; - } + } } ::sal_Bool SAL_CALL GeometryHandler::suspend(::sal_Bool Suspend) throw (uno::RuntimeException) @@ -1609,7 +1609,7 @@ bool GeometryHandler::impl_dialogFilter_nothrow( ::rtl::OUString& _out_rSelected catch (sdbc::SQLException& e) { aErrorInfo = e; } catch( const uno::Exception& ) { - OSL_FAIL( "GeometryHandler::impl_dialogFilter_nothrow: caught an exception!" ); + OSL_ENSURE( sal_False, "GeometryHandler::impl_dialogFilter_nothrow: caught an exception!" ); } if ( aErrorInfo.isValid() ) @@ -1625,7 +1625,7 @@ void GeometryHandler::checkPosAndSize( const awt::Point& _aNewPos, const uno::Reference< report::XSection> xSection(xSourceReportComponent->getParent(),uno::UNO_QUERY); if ( !xSection.is() || uno::Reference< report::XShape>(xSourceReportComponent,uno::UNO_QUERY).is() ) // shapes can overlap. return; - + ::Point aPos(VCLPoint(_aNewPos)); if ( aPos.X() < 0 || aPos.Y() < 0 ) // TODO: have to check size with pos aka || (aPos.X() + aAwtSize.Width) > m_xSection->getReportDefinition()-> throw beans::PropertyVetoException(String(ModuleRes(RID_STR_ILLEGAL_POSITION)),xSourceReportComponent); @@ -1651,7 +1651,7 @@ void GeometryHandler::impl_fillFormulaList_nothrow(::std::vector< ::rtl::OUStrin if ( m_nDataFieldType == FUNCTION ) ::std::transform(m_aDefaultFunctions.begin(),m_aDefaultFunctions.end(),::std::back_inserter(_out_rList),::boost::bind( &DefaultFunction::getName, _1 )); else if ( m_nDataFieldType == USER_DEF_FUNCTION ) - ::std::transform(m_aFunctionNames.begin(),m_aFunctionNames.end(),::std::back_inserter(_out_rList),::o3tl::select1st<TFunctions::value_type>()); + ::std::transform(m_aFunctionNames.begin(),m_aFunctionNames.end(),::std::back_inserter(_out_rList),::std::select1st<TFunctions::value_type>()); } // ----------------------------------------------------------------------------- ::rtl::OUString GeometryHandler::impl_ConvertUIToMimeType_nothrow(const ::rtl::OUString& _sUIName) const @@ -1669,7 +1669,7 @@ void GeometryHandler::impl_fillFormulaList_nothrow(::std::vector< ::rtl::OUStrin const uno::Sequence< ::rtl::OUString > aMimeTypes( xReportDefinition->getAvailableMimeTypes() ); sRet = aMimeTypes[nPos]; } - } + } // if ( aFind != aList.end() ) return sRet; } // ----------------------------------------------------------------------------- @@ -1706,7 +1706,7 @@ void GeometryHandler::impl_fillMimeTypes_nothrow(::std::vector< ::rtl::OUString } catch(uno::Exception&) { - OSL_FAIL("Exception caught!"); + OSL_ENSURE(0,"Exception caught!"); } } // ----------------------------------------------------------------------------- @@ -1738,7 +1738,7 @@ void GeometryHandler::impl_fillScopeList_nothrow(::std::vector< ::rtl::OUString } catch(uno::Exception&) { - OSL_FAIL("Exception caught!"); + OSL_ENSURE(0,"Exception caught!"); } } // ----------------------------------------------------------------------------- @@ -1750,7 +1750,7 @@ uno::Reference< report::XFunctionsSupplier> GeometryHandler::fillScope_throw(::r const uno::Reference< report::XSection> xSection(xSourceReportComponent->getParent(),uno::UNO_QUERY_THROW); const uno::Reference< report::XReportDefinition> xReportDefinition = xSection->getReportDefinition(); if ( !m_sScope.getLength() ) - { + { const uno::Reference< report::XGroup> xGroup(xSection->getGroup(),uno::UNO_QUERY); if ( xGroup.is() ) { @@ -1770,7 +1770,7 @@ uno::Reference< report::XFunctionsSupplier> GeometryHandler::fillScope_throw(::r String sGroupName = String(ModuleRes(RID_STR_SCOPE_GROUP)); _rsNamePostFix = xGroup2->getExpression(); sGroupName.SearchAndReplaceAscii("%1",_rsNamePostFix); - m_sScope = sGroupName; + m_sScope = sGroupName; xReturn = xGroup2.get(); } } @@ -1789,7 +1789,7 @@ uno::Reference< report::XFunctionsSupplier> GeometryHandler::fillScope_throw(::r { uno::Reference< report::XGroups> xGroups = xReportDefinition->getGroups(); const sal_Int32 nCount = xGroups->getCount(); - + for (sal_Int32 i = 0 ; i < nCount; ++i) { const uno::Reference< report::XGroup> xGroup(xGroups->getByIndex(i),uno::UNO_QUERY_THROW); @@ -1802,7 +1802,7 @@ uno::Reference< report::XFunctionsSupplier> GeometryHandler::fillScope_throw(::r break; } } - + } OSL_ENSURE(xReturn.is(),"Why don't we have a functionssupplier here!"); @@ -1820,7 +1820,7 @@ sal_Bool GeometryHandler::isDefaultFunction( const ::rtl::OUString& _sQuotedFunc const uno::Reference< report::XReportComponent> xSourceReportComponent(m_xReportComponent,uno::UNO_QUERY_THROW); const uno::Reference< report::XSection> xSection(xSourceReportComponent->getParent(),uno::UNO_QUERY_THROW); const uno::Reference< report::XReportDefinition> xReportDefinition = xSection->getReportDefinition(); - + ::std::pair<TFunctions::const_iterator,TFunctions::const_iterator> aFind = m_aFunctionNames.equal_range(_sQuotedFunction); while ( aFind.first != aFind.second ) { @@ -1856,7 +1856,7 @@ sal_Bool GeometryHandler::isDefaultFunction( const ::rtl::OUString& _sQuotedFunc } catch(uno::Exception&) { - OSL_FAIL("Exception caught!"); + OSL_ENSURE(0,"Exception caught!"); } return bDefaultFunction; } @@ -1891,12 +1891,12 @@ sal_Bool GeometryHandler::impl_isDefaultFunction_nothrow( const uno::Reference< break; } } - + bDefaultFunction = aIter != aDeEnd; } catch(uno::Exception&) { - OSL_FAIL("Exception caught!"); + OSL_ENSURE(0,"Exception caught!"); } return bDefaultFunction; } @@ -1916,6 +1916,13 @@ void GeometryHandler::loadDefaultFunctions() DefaultFunction aDefault; aDefault.m_bDeepTraversing = sal_False; + //aDefault.m_sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Counter")); + //aDefault.m_sFormula = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:[%FunctionName] + 1")); + //aDefault.m_sSearchString = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:\\[[:alpha:]+[:alnum:]*\\][:space:]*\\+[:space:]*1")); + //aDefault.m_sInitialFormula.IsPresent = sal_True; + //aDefault.m_sInitialFormula.Value = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:1")); + //m_aDefaultFunctions.push_back(aDefault); + aDefault.m_bPreEvaluated = sal_True; aDefault.m_sName = String(ModuleRes(RID_STR_F_ACCUMULATION)); @@ -1987,7 +1994,7 @@ void GeometryHandler::createDefaultFunction(::osl::ResettableMutexGuard& _aGuard } catch(uno::Exception&) { - OSL_FAIL("Exception caught!"); + OSL_ENSURE(0,"Exception caught!"); } } // ----------------------------------------------------------------------------- @@ -2032,7 +2039,7 @@ void GeometryHandler::resetOwnProperties(::osl::ResettableMutexGuard& _aGuard,co aFormulaEvent.PropertyName = PROPERTY_FORMULALIST; aFormulaEvent.OldValue <<= _sOldFunctionName; aFormulaEvent.NewValue <<= sNewFunction; - + m_aPropertyListeners.notify( aFormulaEvent, &beans::XPropertyChangeListener::propertyChange ); } if ( _sOldScope != sNewScope ) @@ -2043,7 +2050,7 @@ void GeometryHandler::resetOwnProperties(::osl::ResettableMutexGuard& _aGuard,co aScopeEvent.NewValue <<= sNewScope; m_aPropertyListeners.notify( aScopeEvent, &beans::XPropertyChangeListener::propertyChange ); } - + _aGuard.reset(); } //------------------------------------------------------------------------ @@ -2077,7 +2084,7 @@ void GeometryHandler::impl_initFieldList_nothrow( uno::Sequence< ::rtl::OUString } catch (uno::Exception&) { - OSL_FAIL( "GeometryHandler::impl_initFieldList_nothrow: caught an exception!" ); + DBG_ERROR( "GeometryHandler::impl_initFieldList_nothrow: caught an exception!" ); } } // ----------------------------------------------------------------------------- @@ -2161,7 +2168,7 @@ void GeometryHandler::impl_setCounterFunction_throw() ::rtl::OUString sScope; if ( !(sFunctionName.getLength() && m_aFunctionNames.find(sQuotedFunctionName) != m_aFunctionNames.end() && impl_isCounterFunction_throw(sQuotedFunctionName,sScope)) ) impl_createFunction(sFunctionName,::rtl::OUString(),m_aCounterFunction); - + OBlocker aBlocker(m_bIn); m_xReportComponent->setPropertyValue(PROPERTY_DATAFIELD,uno::makeAny(impl_convertToFormula( uno::makeAny(sQuotedFunctionName)))); } @@ -2178,7 +2185,7 @@ sal_uInt32 GeometryHandler::impl_getDataFieldType_throw(const ::rtl::OUString& _ lcl_convertFormulaTo(aDataField,aDataField); aDataField >>= sDataField; } - + if ( sDataField.getLength() ) { if ( impl_isDataField(sDataField) ) @@ -2230,7 +2237,7 @@ void SAL_CALL GeometryHandler::propertyChange(const beans::PropertyChangeEvent& default: ; } - + resetOwnProperties(aGuard,sOldFunctionName,sOldScope,nOldDataFieldType); } } diff --git a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx index 87e1f006c177..7e34b66672d9 100644 --- a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx +++ b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ #include <com/sun/star/inspection/XNumericControl.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/util/MeasureUnit.hpp> -#include <tools/fldunit.hxx> +#include <vcl/fldunit.hxx> #include "metadata.hxx" //........................................................................ @@ -47,6 +47,7 @@ namespace rptui { //........................................................................ using namespace ::com::sun::star; +// using namespace comphelper; ReportComponentHandler::ReportComponentHandler(uno::Reference< uno::XComponentContext > const & context) :ReportComponentHandler_Base(m_aMutex) @@ -189,7 +190,7 @@ uno::Sequence< beans::Property > SAL_CALL ReportComponentHandler::getSupportedPr { ::std::vector< beans::Property > aNewProps; m_pInfoService->getExcludeProperties( aNewProps, m_xFormComponentHandler ); - + return aNewProps.empty() ? uno::Sequence< beans::Property > () : uno::Sequence< beans::Property > (&(*aNewProps.begin()),aNewProps.size()); } diff --git a/reportdesign/source/ui/inspection/inspection.src b/reportdesign/source/ui/inspection/inspection.src index 5d496ee26d83..99b6d8d3a41c 100644 --- a/reportdesign/source/ui/inspection/inspection.src +++ b/reportdesign/source/ui/inspection/inspection.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -266,37 +266,37 @@ String RID_STR_ILLEGAL_POSITION Text [ en-US ] = "This position can not be set. It is invalid."; }; String RID_STR_SCOPE_GROUP -{ +{ Text [ en-US ] = "Group: %1"; }; String RID_STR_FORMULALIST -{ +{ Text [ en-US ] = "Function"; }; String RID_STR_SCOPE -{ +{ Text [ en-US ] = "Scope"; }; String RID_STR_TYPE -{ +{ Text [ en-US ] = "Data Field Type"; }; Resource RID_STR_TYPE_CONST { String 1 - { + { Text [ en-US ] = "Field or Formula"; }; String 2 - { + { Text [ en-US ] = "Function"; }; String 3 - { + { Text [ en-US ] = "Counter"; }; String 4 - { + { Text [ en-US ] = "User defined Function"; }; }; diff --git a/reportdesign/source/ui/inspection/metadata.cxx b/reportdesign/source/ui/inspection/metadata.cxx index 4d53bca64388..bc866d9c13ee 100644 --- a/reportdesign/source/ui/inspection/metadata.cxx +++ b/reportdesign/source/ui/inspection/metadata.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,7 +30,7 @@ #include <svtools/localresaccess.hxx> #include "com/sun/star/inspection/XPropertyHandler.hpp" #include <tools/debug.hxx> -#include <comphelper/extract.hxx> +#include <cppuhelper/extract.hxx> #include "helpids.hrc" #include "RptResId.hrc" #include "uistrings.hrc" @@ -51,28 +51,28 @@ namespace rptui //======================================================================== struct OPropertyInfoImpl { - String sName; - String sTranslation; - rtl::OString sHelpId; + String sName; + String sTranslation; + sal_uInt32 nHelpId; sal_Int32 nId; sal_uInt16 nPos; sal_uInt32 nUIFlags; OPropertyInfoImpl( - const ::rtl::OUString& rName, - sal_Int32 _nId, - const String& aTranslation, - sal_uInt16 nPosId, - const rtl::OString& _sHelpId, + const ::rtl::OUString& rName, + sal_Int32 _nId, + const String& aTranslation, + sal_uInt16 nPosId, + sal_uInt32 nHelpId, sal_uInt32 _nUIFlags); }; //------------------------------------------------------------------------ OPropertyInfoImpl::OPropertyInfoImpl(const ::rtl::OUString& _rName, sal_Int32 _nId, - const String& aString, sal_uInt16 nP, const rtl::OString& sHid, sal_uInt32 _nUIFlags) + const String& aString, sal_uInt16 nP, sal_uInt32 nHid, sal_uInt32 _nUIFlags) :sName(_rName) ,sTranslation(aString) - ,sHelpId(sHid) + ,nHelpId(nHid) ,nId(_nId) ,nPos(nP) ,nUIFlags(_nUIFlags) @@ -111,8 +111,8 @@ namespace rptui #define DEF_INFO_5( ident, uinameres, helpid, flag1, flag2, flag3, flag4, flag5 ) \ DEF_INFO( ident, uinameres, helpid, PROP_FLAG_##flag1 | PROP_FLAG_##flag2 | PROP_FLAG_##flag3 | PROP_FLAG_##flag4 | PROP_FLAG_##flag5 ) - sal_uInt16 OPropertyInfoService::s_nCount = 0; - OPropertyInfoImpl* OPropertyInfoService::s_pPropertyInfos = NULL; + sal_uInt16 OPropertyInfoService::s_nCount = 0; + OPropertyInfoImpl* OPropertyInfoService::s_pPropertyInfos = NULL; //------------------------------------------------------------------------ const OPropertyInfoImpl* OPropertyInfoService::getPropertyInfo() { @@ -155,7 +155,7 @@ namespace rptui ,DEF_INFO_2( TYPE, TYPE, TYPE, COMPOSEABLE,DATA_PROPERTY ) ,DEF_INFO_2( DATAFIELD, DATAFIELD, DATAFIELD, COMPOSEABLE,DATA_PROPERTY ) ,DEF_INFO_2( FORMULALIST, FORMULALIST, FORMULALIST, COMPOSEABLE,DATA_PROPERTY ) - ,DEF_INFO_2( SCOPE, SCOPE, SCOPE, COMPOSEABLE,DATA_PROPERTY ) + ,DEF_INFO_2( SCOPE, SCOPE, SCOPE, COMPOSEABLE,DATA_PROPERTY ) ,DEF_INFO_1( PRESERVEIRI, PRESERVEIRI, PRESERVEIRI, COMPOSEABLE ) ,DEF_INFO_1( BACKCOLOR, BACKCOLOR, BACKCOLOR, COMPOSEABLE ) ,DEF_INFO_1( CONTROLBACKGROUND, BACKCOLOR, BACKCOLOR, COMPOSEABLE ) @@ -194,10 +194,10 @@ namespace rptui } //------------------------------------------------------------------------ - rtl::OString OPropertyInfoService::getPropertyHelpId(sal_Int32 _nId) const + sal_Int32 OPropertyInfoService::getPropertyHelpId(sal_Int32 _nId) const { const OPropertyInfoImpl* pInfo = getPropertyInfo(_nId); - return (pInfo) ? pInfo->sHelpId : rtl::OString(); + return (pInfo) ? pInfo->nHelpId : 0; } //------------------------------------------------------------------------ @@ -213,7 +213,7 @@ namespace rptui // intialisierung if(!s_pPropertyInfos) getPropertyInfo(); - OPropertyInfoImpl aSearch(_rName, 0L, String(), 0, "", 0); + OPropertyInfoImpl aSearch(_rName, 0L, String(), 0, 0, 0); const OPropertyInfoImpl* pPropInfo = ::std::lower_bound( s_pPropertyInfos, s_pPropertyInfos + s_nCount, aSearch, PropertyInfoLessByName() ); diff --git a/reportdesign/source/ui/misc/ColorListener.cxx b/reportdesign/source/ui/misc/ColorListener.cxx index 4c37cfa888f1..4b773392041f 100644 --- a/reportdesign/source/ui/misc/ColorListener.cxx +++ b/reportdesign/source/ui/misc/ColorListener.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,20 +30,20 @@ #include <svl/smplhint.hxx> #include "uistrings.hrc" -#define BORDERCOLORCHANGE 191 +#define BORDERCOLORCHANGE 191 //===================================================================== namespace rptui { //===================================================================== DBG_NAME( rpt_OColorListener ) -OColorListener::OColorListener(Window* _pParent ,const ::rtl::OUString& _sColorEntry) +OColorListener::OColorListener(Window* _pParent ,const ::rtl::OUString& _sColorEntry) : Window(_pParent) ,m_sColorEntry(_sColorEntry) ,m_nColor(COL_LIGHTBLUE) ,m_bCollapsed(sal_False) ,m_bMarked(sal_False) { - DBG_CTOR( rpt_OColorListener,NULL); + DBG_CTOR( rpt_OColorListener,NULL); StartListening(m_aExtendedColorConfig); m_nColor = m_aExtendedColorConfig.GetColorValue(CFG_REPORTDESIGNER,m_sColorEntry).getColor(); m_nTextBoundaries = m_aColorConfig.GetColorValue(::svtools::DOCBOUNDARIES).nColor; @@ -73,21 +73,21 @@ void OColorListener::DataChanged( const DataChangedEvent& rDCEvt ) if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) ) - { + { ImplInitSettings(); Invalidate(); } } // ----------------------------------------------------------------------------- void OColorListener::setCollapsed(sal_Bool _bCollapsed) -{ - m_bCollapsed = _bCollapsed; - if ( m_aCollapsedLink.IsSet() ) +{ + m_bCollapsed = _bCollapsed; + if ( m_aCollapsedLink.IsSet() ) m_aCollapsedLink.Call(this); } // ----------------------------------------------------------------------------- void OColorListener::setMarked(sal_Bool _bMark) -{ +{ m_bMarked = _bMark; Invalidate(); } diff --git a/reportdesign/source/ui/misc/FunctionHelper.cxx b/reportdesign/source/ui/misc/FunctionHelper.cxx index 0f8787a07dd1..d653ef971437 100644 --- a/reportdesign/source/ui/misc/FunctionHelper.cxx +++ b/reportdesign/source/ui/misc/FunctionHelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,7 +58,7 @@ sal_Unicode FunctionManager::getSingleToken(const formula::IFunctionManager::ETo return sal_Unicode('{'); case eArrayClose: return sal_Unicode('}'); - } + } // switch(_eToken) return 0; } // ----------------------------------------------------------------------------- @@ -93,6 +93,11 @@ const formula::IFunctionDescription* FunctionManager::getFunctionByName(const :: // ----------------------------------------------------------------------------- void FunctionManager::fillLastRecentlyUsedFunctions(::std::vector< const formula::IFunctionDescription*>& /*_rLastRUFunctions*/) const { + //const sal_uInt32 nCount = getCount(); + //for(sal_uInt32 i = 0 ; i < nCount ; ++i) + //{ + // const formula::IFunctionCategory* pCategory = getCategory( + //} } // ----------------------------------------------------------------------------- ::boost::shared_ptr< FunctionDescription > FunctionManager::get(const uno::Reference< report::meta::XFunctionDescription>& _xFunctionDescription) const @@ -113,9 +118,9 @@ void FunctionManager::fillLastRecentlyUsedFunctions(::std::vector< const formula m_aCategoryIndex.push_back( aCategoryFind ); } aFunctionFind = m_aFunctions.insert(TFunctionsMap::value_type(sFunctionName,::boost::shared_ptr<FunctionDescription>(new FunctionDescription(aCategoryFind->second.get(),_xFunctionDescription)))).first; - } + } // if ( aFind == m_aFunctions.end() ) pDesc = aFunctionFind->second; - } + } // if ( _xFunctionDescription.is() ) return pDesc; } // ----------------------------------------------------------------------------- @@ -194,15 +199,15 @@ xub_StrLen FunctionDescription::getSuppressedArgumentCount() const } catch(const uno::Exception&) { - OSL_FAIL("Exception caught!"); + DBG_ERROR("Exception caught!"); } return sFormula; } // ----------------------------------------------------------------------------- -void FunctionDescription::fillVisibleArgumentMapping(::std::vector<sal_uInt16>& _rArguments) const +void FunctionDescription::fillVisibleArgumentMapping(::std::vector<USHORT>& _rArguments) const { const sal_Int32 nCount = m_aParameter.getLength(); - for(sal_uInt16 i = 0;i < nCount; ++i) + for(USHORT i = 0;i < nCount; ++i) { _rArguments.push_back(i); } @@ -212,36 +217,36 @@ void FunctionDescription::initArgumentInfo() const { } // ----------------------------------------------------------------------------- -::rtl::OUString FunctionDescription::getSignature() const +::rtl::OUString FunctionDescription::getSignature() const { return m_xFunctionDescription->getSignature(); } // ----------------------------------------------------------------------------- -rtl::OString FunctionDescription::getHelpId() const +long FunctionDescription::getHelpId() const { - return rtl::OString(); + return 0; } // ----------------------------------------------------------------------------- -sal_uInt32 FunctionDescription::getParameterCount() const +sal_uInt32 FunctionDescription::getParameterCount() const { return m_aParameter.getLength(); } // ----------------------------------------------------------------------------- -::rtl::OUString FunctionDescription::getParameterName(sal_uInt32 _nPos) const +::rtl::OUString FunctionDescription::getParameterName(sal_uInt32 _nPos) const { if ( _nPos < static_cast<sal_uInt32>(m_aParameter.getLength()) ) return m_aParameter[_nPos].Name; return ::rtl::OUString(); } // ----------------------------------------------------------------------------- -::rtl::OUString FunctionDescription::getParameterDescription(sal_uInt32 _nPos) const +::rtl::OUString FunctionDescription::getParameterDescription(sal_uInt32 _nPos) const { if ( _nPos < static_cast<sal_uInt32>(m_aParameter.getLength()) ) return m_aParameter[_nPos].Description; return ::rtl::OUString(); } // ----------------------------------------------------------------------------- -bool FunctionDescription::isParameterOptional(sal_uInt32 _nPos) const +bool FunctionDescription::isParameterOptional(sal_uInt32 _nPos) const { if ( _nPos < static_cast<sal_uInt32>(m_aParameter.getLength()) ) return m_aParameter[_nPos].IsOptional; diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx index a8dcd7ee351b..ba963d93131b 100644 --- a/reportdesign/source/ui/misc/UITools.cxx +++ b/reportdesign/source/ui/misc/UITools.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,7 +50,7 @@ #include <editeng/charscaleitem.hxx> #include <svx/algitem.hxx> #include <svx/svdpagv.hxx> -#include <svx/xtable.hxx> // XColorTable +#include <svx/xtable.hxx> // XColorTable #include <editeng/brshitem.hxx> #include <editeng/fontitem.hxx> #include <editeng/emphitem.hxx> @@ -175,14 +175,14 @@ void adjustSectionName(const uno::Reference< report::XGroup >& _xGroup,sal_Int32 ::rtl::OUString sName = String(ModuleRes(RID_STR_GROUPHEADER)); sName += ::rtl::OUString::valueOf(_nPos); _xGroup->getHeader()->setName(sName); - } + } // if ( _xGroup->getHeaderOn() ) if ( _xGroup->getFooterOn() && !_xGroup->getFooter()->getName().getLength() ) { ::rtl::OUString sName = String(ModuleRes(RID_STR_GROUPFOOTER)); sName += ::rtl::OUString::valueOf(_nPos); _xGroup->getFooter()->setName(sName); - } + } // if ( _xGroup->getHeaderOn() ) } // ----------------------------------------------------------------------------- ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> addStyleListener(const uno::Reference< report::XReportDefinition >& _xReportDefinition,::comphelper::OPropertyChangeListener* _pListener) @@ -207,7 +207,7 @@ void adjustSectionName(const uno::Reference< report::XGroup >& _xGroup,sal_Int32 namespace { // ------------------------------------------------------------------------- - Font lcl_getReportControlFont( const uno::Reference<report::XReportControlFormat >& _rxReportControlFormat, awt::FontDescriptor& _out_rControlFont ,sal_uInt16 _nWichFont) + Font lcl_getReportControlFont( const uno::Reference<report::XReportControlFormat >& _rxReportControlFormat, awt::FontDescriptor& _out_rControlFont ,USHORT _nWichFont) { if ( !_rxReportControlFormat.is() ) throw uno::RuntimeException(); @@ -231,14 +231,14 @@ namespace } // ------------------------------------------------------------------------- - Font lcl_getReportControlFont( const uno::Reference<report::XReportControlFormat >& _rxReportControlFormat,sal_uInt16 _nWhich ) + Font lcl_getReportControlFont( const uno::Reference<report::XReportControlFormat >& _rxReportControlFormat,USHORT _nWhich ) { awt::FontDescriptor aAwtFont; return lcl_getReportControlFont( _rxReportControlFormat, aAwtFont, _nWhich ); } // ------------------------------------------------------------------------- const Font lcl_setFont(const uno::Reference<report::XReportControlFormat >& _rxReportControlFormat, - SfxItemSet& _rItemSet,sal_uInt16 _nWhich,sal_uInt16 _nFont, sal_uInt16 _nFontHeight,sal_uInt16 _nLanguage,sal_uInt16 _nPosture, sal_uInt16 _nWeight) + SfxItemSet& _rItemSet,USHORT _nWhich,USHORT _nFont, USHORT _nFontHeight,USHORT _nLanguage,USHORT _nPosture, USHORT _nWeight) { // fill it awt::FontDescriptor aControlFont; @@ -261,7 +261,7 @@ namespace case COMPLEX: aLocale = _rxReportControlFormat->getCharLocaleComplex(); break; - } + } // switch(_nWhich) _rItemSet.Put(SvxLanguageItem(MsLangId::convertLocaleToLanguageWithFallback(aLocale),_nLanguage)); @@ -288,7 +288,7 @@ namespace pClone->PutValue(_xShape->getPropertyValue(aIt->sName), aIt->nMemberId); _rItemSet.Put(*pClone, aIt->nWID); } - } + } // if ( xInfo->hasPropertyByName(sPropertyName) ) ++aIt; } } @@ -319,11 +319,11 @@ namespace catch(uno::Exception&) { // shapes have a bug so we ignore this one. } - } + } // if ( pItem ) } } ++aIt; - } + } // while ( pPropertyMap->pName ) } // ------------------------------------------------------------------------- void lcl_CharPropertiesToItems( const uno::Reference<report::XReportControlFormat >& _rxReportControlFormat, @@ -353,6 +353,7 @@ namespace _rItemSet.Put(aUnderLineItem); _rItemSet.Put(SvxKerningItem(_rxReportControlFormat->getCharKerning(),ITEMID_KERNING)); _rItemSet.Put(SvxEmphasisMarkItem(static_cast<FontEmphasisMark>(_rxReportControlFormat->getCharEmphasis()),ITEMID_EMPHASISMARK)); + //_rItemSet.Put(SvxTwoLinesItem()); _rItemSet.Put(SvxCharReliefItem(static_cast<FontRelief>(_rxReportControlFormat->getCharRelief()),ITEMID_CHARRELIEF)); _rItemSet.Put(SvxColorItem(::Color(_rxReportControlFormat->getCharColor()),ITEMID_COLOR)); _rItemSet.Put(SvxCharRotateItem(_rxReportControlFormat->getCharRotation(),sal_False,ITEMID_CHARROTATE)); @@ -361,9 +362,11 @@ namespace SvxHorJustifyItem aHorJustifyItem(ITEMID_HORJUSTIFY); aHorJustifyItem.PutValue(xSet->getPropertyValue(PROPERTY_PARAADJUST),MID_HORJUST_ADJUST); _rItemSet.Put(aHorJustifyItem); + //_rItemSet.Put(SfxInt32Item(ITEMID_DEGREES,_rxReportControlFormat->getCharRotation())); SvxVerJustifyItem aVerJustifyItem(ITEMID_VERJUSTIFY); aVerJustifyItem.PutValue(xSet->getPropertyValue(PROPERTY_VERTICALALIGN),MID_HORJUST_ADJUST); _rItemSet.Put(aVerJustifyItem); + //_rItemSet.Put(SfxInt32Item(ITEMID_IDENT,_rxReportControlFormat->getCharRotation())); uno::Reference< report::XShape> xShape(_rxReportControlFormat,uno::UNO_QUERY); if ( !xShape.is() ) @@ -383,7 +386,7 @@ namespace // ------------------------------------------------------------------------- void lcl_initAwtFont( const Font& _rOriginalFont, const SfxItemSet& _rItemSet, awt::FontDescriptor& _out_rAwtFont, - sal_uInt16 _nFont, sal_uInt16 _nFontHeight,sal_uInt16 _nPosture, sal_uInt16 _nWeight) + USHORT _nFont, USHORT _nFontHeight,USHORT _nPosture, USHORT _nWeight) { Font aNewFont( _rOriginalFont ); const SfxPoolItem* pItem( NULL ); @@ -395,7 +398,7 @@ namespace aNewFont.SetFamily(pFontItem->GetFamily()); aNewFont.SetPitch(pFontItem->GetPitch()); aNewFont.SetCharSet(pFontItem->GetCharSet()); - } + } // if ( SFX_ITEM_SET == _rItemSet.GetItemState( ITEMID_FONT,sal_True,&pItem) && pItem->ISA(SvxFontItem)) if ( SFX_ITEM_SET == _rItemSet.GetItemState( _nFontHeight,sal_True,&pItem) && pItem->ISA(SvxFontHeightItem)) { const SvxFontHeightItem* pFontItem = static_cast<const SvxFontHeightItem*>(pItem); @@ -541,9 +544,9 @@ namespace { const SvxCaseMapItem* pFontItem = static_cast<const SvxCaseMapItem*>(pItem); lcl_pushBack( _out_rProperties, PROPERTY_CHARCASEMAP, uno::makeAny( pFontItem->GetValue() ) ); - } + } // if ( SFX_ITEM_SET == _rItemSet.GetItemState( ITEMID_CASEMAP,sal_True,&pItem) && pItem->ISA(SvxCaseMapItem)) struct Items { - sal_uInt16 nWhich; + USHORT nWhich; ::rtl::OUString sPropertyName; }; const Items pItems[] = { {ITEMID_LANGUAGE,PROPERTY_CHARLOCALE} @@ -558,7 +561,7 @@ namespace lang::Locale aCharLocale; MsLangId::convertLanguageToLocale( pFontItem->GetLanguage(), aCharLocale ); lcl_pushBack( _out_rProperties, pItems[k].sPropertyName, uno::makeAny( aCharLocale ) ); - } + } // if ( SFX_ITEM_SET == _rItemSet.GetItemState( ITEMID_LANGUAGE,sal_True,&pItem) && pItem->ISA(SvxLanguageItem)) } if ( SFX_ITEM_SET == _rItemSet.GetItemState( ITEMID_ESCAPEMENT,sal_True,&pItem) && pItem->ISA(SvxEscapementItem)) { @@ -638,6 +641,7 @@ bool openCharDialog( const uno::Reference<report::XReportControlFormat >& _rxRep { SID_ATTR_CHAR_SCALEWIDTH, SFX_ITEM_POOLABLE }, { SID_ATTR_CHAR_RELIEF, SFX_ITEM_POOLABLE }, { SID_ATTR_CHAR_HIDDEN, SFX_ITEM_POOLABLE }, + //{ SID_ATTR_BRUSH_CHAR, SFX_ITEM_POOLABLE }, { SID_ATTR_BRUSH, SFX_ITEM_POOLABLE }, { SID_ATTR_ALIGN_HOR_JUSTIFY, SFX_ITEM_POOLABLE }, { SID_ATTR_ALIGN_VER_JUSTIFY, SFX_ITEM_POOLABLE }, @@ -666,9 +670,9 @@ bool openCharDialog( const uno::Reference<report::XReportControlFormat >& _rxRep new SvxPostureItem(ITALIC_NONE,ITEMID_POSTURE), new SvxWeightItem(WEIGHT_NORMAL,ITEMID_WEIGHT), - new SvxShadowedItem(sal_False,ITEMID_SHADOWED), - new SvxWordLineModeItem(sal_False,ITEMID_WORDLINEMODE), - new SvxContourItem(sal_False,ITEMID_CONTOUR), + new SvxShadowedItem(FALSE,ITEMID_SHADOWED), + new SvxWordLineModeItem(FALSE,ITEMID_WORDLINEMODE), + new SvxContourItem(FALSE,ITEMID_CONTOUR), new SvxCrossedOutItem(STRIKEOUT_NONE,ITEMID_CROSSEDOUT), new SvxUnderlineItem(UNDERLINE_NONE,ITEMID_UNDERLINE), @@ -677,15 +681,15 @@ bool openCharDialog( const uno::Reference<report::XReportControlFormat >& _rxRep new SvxCaseMapItem(SVX_CASEMAP_NOT_MAPPED,ITEMID_CASEMAP), new SvxEscapementItem(ITEMID_ESCAPEMENT), new SvxFontListItem(pFontList.get(),ITEMID_FONTLIST), - new SvxAutoKernItem(sal_False,ITEMID_AUTOKERN), + new SvxAutoKernItem(FALSE,ITEMID_AUTOKERN), new SvxColorTableItem(pColorTable.get(),ITEMID_COLOR_TABLE), - new SvxBlinkItem(sal_False,ITEMID_BLINK), + new SvxBlinkItem(FALSE,ITEMID_BLINK), new SvxEmphasisMarkItem(EMPHASISMARK_NONE,ITEMID_EMPHASISMARK), - new SvxTwoLinesItem(sal_True,0,0,ITEMID_TWOLINES), + new SvxTwoLinesItem(TRUE,0,0,ITEMID_TWOLINES), new SvxCharRotateItem(0,sal_False,ITEMID_CHARROTATE), new SvxCharScaleWidthItem(100,ITEMID_CHARSCALE_W), new SvxCharReliefItem(RELIEF_NONE,ITEMID_CHARRELIEF), - new SvxCharHiddenItem(sal_False,ITEMID_CHARHIDDEN), + new SvxCharHiddenItem(FALSE,ITEMID_CHARHIDDEN), new SvxBrushItem(ITEMID_BRUSH), new SvxHorJustifyItem(ITEMID_HORJUSTIFY), new SvxVerJustifyItem(ITEMID_VERJUSTIFY), @@ -706,22 +710,22 @@ bool openCharDialog( const uno::Reference<report::XReportControlFormat >& _rxRep OSL_ASSERT((SAL_N_ELEMENTS(pDefaults)) == (SAL_N_ELEMENTS(aItemInfos))); - static sal_uInt16 pRanges[] = + static USHORT pRanges[] = { ITEMID_FONT,ITEMID_WEIGHT_COMPLEX, 0 }; SfxItemPool* pPool( new SfxItemPool(String::CreateFromAscii("ReportCharProperties"), ITEMID_FONT,ITEMID_WEIGHT_COMPLEX, aItemInfos, pDefaults) ); - // not needed for font height pPool->SetDefaultMetric( SFX_MAPUNIT_100TH_MM ); // ripped, don't understand why - pPool->FreezeIdRanges(); // the same + // not needed for font height pPool->SetDefaultMetric( SFX_MAPUNIT_100TH_MM ); // ripped, don't understand why + pPool->FreezeIdRanges(); // the same bool bSuccess = false; try { ::std::auto_ptr<SfxItemSet> pDescriptor( new SfxItemSet( *pPool, pRanges ) ); lcl_CharPropertiesToItems( _rxReportControlFormat, *pDescriptor ); - { // want the dialog to be destroyed before our set + { // want the dialog to be destroyed before our set ORptPageDialog aDlg(pParent, pDescriptor.get(),RID_PAGEDIALOG_CHAR); uno::Reference< report::XShape > xShape( _rxReportControlFormat, uno::UNO_QUERY ); if ( xShape.is() ) @@ -757,6 +761,12 @@ bool openAreaDialog( const uno::Reference<report::XShape >& _xShape,const uno::R Window* pParent = VCLUnoHelper::GetWindow( _rxParentWindow ); + //static USHORT pRanges[] = + //{ + // XATTR_START,XATTR_END, + // 0 + //}; + bool bSuccess = false; try { @@ -765,7 +775,7 @@ bool openAreaDialog( const uno::Reference<report::XShape >& _xShape,const uno::R lcl_fillShapeToItems(_xShape,*pDescriptor); - { // want the dialog to be destroyed before our set + { // want the dialog to be destroyed before our set SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); ::std::auto_ptr<AbstractSvxAreaTabDialog> pDialog(pFact->CreateSvxAreaTabDialog( pParent,pDescriptor.get(),pModel.get() )); // #i74099# by default, the dialog deletes the current color table if a different one is loaded @@ -803,14 +813,14 @@ void applyCharacterSettings( const uno::Reference< report::XReportControlFormat aAwtFont.Name = ::rtl::OUString(); // hack to _rxReportControlFormat->setFontDescriptor( aAwtFont ); _rxReportControlFormat->setCharFontName( sTemp ); - } + } // if ( aSettings.get( "Font" ) >>= aAwtFont ) if ( aSettings.get( "FontAsian" ) >>= aAwtFont ) { ::rtl::OUString sTemp = aAwtFont.Name; aAwtFont.Name = ::rtl::OUString(); // hack to _rxReportControlFormat->setFontDescriptorAsian( aAwtFont ); _rxReportControlFormat->setCharFontNameAsian( sTemp ); - } + } // if ( aSettings.get( "Font" ) >>= aAwtFont ) if ( aSettings.get( "FontComplex" ) >>= aAwtFont ) { ::rtl::OUString sTemp = aAwtFont.Name; @@ -889,7 +899,7 @@ SdrObject* isOver(const Rectangle& _rRect, SdrPage& _rPage, SdrView& _rView, boo return pOverlappedObj; } // ----------------------------------------------------------------------------- -bool checkArrayForOccurrence(SdrObject* _pObjToCheck, SdrUnoObj* _pIgnore[], int _nListLength) +bool checkArrayForOccurance(SdrObject* _pObjToCheck, SdrUnoObj* _pIgnore[], int _nListLength) { for(int i=0;i<_nListLength;i++) { @@ -910,7 +920,7 @@ SdrObject* isOver(const Rectangle& _rRect,SdrPage& _rPage,SdrView& _rView,bool _ while( !pOverlappedObj && (pObjIter = aIter.Next()) != NULL ) { - if (checkArrayForOccurrence(pObjIter, _pIgnoreList, _nIgnoreListLength)) + if (checkArrayForOccurance(pObjIter, _pIgnoreList, _nIgnoreListLength)) { continue; } @@ -992,6 +1002,9 @@ void correctOverlapping(SdrObject* _pControl,OReportSection& _aReportSection,boo { OSectionView& rSectionView = _aReportSection.getSectionView(); uno::Reference< report::XReportComponent> xComponent(_pControl->getUnoShape(),uno::UNO_QUERY); + // Rectangle aRet(VCLPoint(xComponent->getPosition()),VCLSize(xComponent->getSize())); + // aRet.setHeight(aRet.getHeight() + 1); + // aRet.setWidth(aRet.getWidth() + 1); Rectangle aRect = getRectangleFromControl(_pControl); bool bOverlapping = true; @@ -1027,6 +1040,7 @@ bool openDialogFormula_nothrow( ::rtl::OUString& _in_out_rFormula OSL_PRECOND( _xInspectorWindow.is(), "openDialogFormula_nothrow: invalid parameters!" ); if ( !_xInspectorWindow.is() ) return false; + // _out_rFormula = ::rtl::OUString(); bool bSuccess = false; ::dbtools::SQLExceptionInfo aErrorInfo; uno::Reference< awt::XWindow > xInspectorWindow; @@ -1060,7 +1074,7 @@ bool openDialogFormula_nothrow( ::rtl::OUString& _in_out_rFormula catch (sdbc::SQLException& e) { aErrorInfo = e; } catch( const uno::Exception& ) { - OSL_FAIL( "GeometryHandler::impl_dialogFilter_nothrow: caught an exception!" ); + OSL_ENSURE( sal_False, "GeometryHandler::impl_dialogFilter_nothrow: caught an exception!" ); } if ( aErrorInfo.isValid() ) diff --git a/reportdesign/source/ui/misc/RptUndo.cxx b/reportdesign/source/ui/misc/Undo.cxx index 9e1fb6c66861..b66511816dcb 100644 --- a/reportdesign/source/ui/misc/RptUndo.cxx +++ b/reportdesign/source/ui/misc/Undo.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,16 +27,15 @@ ************************************************************************/ #include "precompiled_reportdesign.hxx" -#include "RptUndo.hxx" +#include "Undo.hxx" #include "uistrings.hrc" #include "rptui_slotid.hrc" #include "UITools.hxx" -#include "UndoEnv.hxx" - #include <dbaccess/IController.hxx> #include <com/sun/star/report/XSection.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> +#include "UndoEnv.hxx" #include <com/sun/star/awt/Point.hpp> #include <com/sun/star/awt/Size.hpp> #include <svx/unoshape.hxx> @@ -71,7 +70,7 @@ namespace _xSection->remove(xShape); --nCount; } - } + } // if ( _xSection.is() ) } //---------------------------------------------------------------------------- void lcl_insertElements(const uno::Reference< report::XSection >& _xSection,const ::std::vector< uno::Reference< drawing::XShape> >& _aControls) @@ -92,7 +91,7 @@ namespace } catch(const uno::Exception&) { - OSL_FAIL("lcl_insertElements:Exception caught!"); + OSL_ENSURE(0,"lcl_insertElements:Exception caught!"); } } } @@ -112,7 +111,7 @@ namespace } catch(const uno::Exception&) { - OSL_FAIL("lcl_setValues:Exception caught!"); + OSL_ENSURE(0,"lcl_setValues:Exception caught!"); } } } @@ -125,13 +124,13 @@ DBG_NAME(rpt_OSectionUndo) OSectionUndo::OSectionUndo(OReportModel& _rMod ,sal_uInt16 _nSlot ,Action _eAction - ,sal_uInt16 nCommentID) + ,USHORT nCommentID) : OCommentUndoAction(_rMod,nCommentID) ,m_eAction(_eAction) ,m_nSlot(_nSlot) ,m_bInserted(false) { - DBG_CTOR(rpt_OSectionUndo,NULL); + DBG_CTOR(rpt_OSectionUndo,NULL); } // ----------------------------------------------------------------------------- OSectionUndo::~OSectionUndo() @@ -157,23 +156,23 @@ OSectionUndo::~OSectionUndo() } catch(uno::Exception) { - OSL_FAIL("Exception caught!"); + OSL_ENSURE(0,"Exception caught!"); } } } - DBG_DTOR(rpt_OSectionUndo,NULL); + DBG_DTOR(rpt_OSectionUndo,NULL); } // ----------------------------------------------------------------------------- void OSectionUndo::collectControls(const uno::Reference< report::XSection >& _xSection) { m_aControls.clear(); try - { + { // copy all properties for restoring uno::Reference< beans::XPropertySetInfo> xInfo = _xSection->getPropertySetInfo(); uno::Sequence< beans::Property> aSeq = xInfo->getProperties(); const beans::Property* pIter = aSeq.getConstArray(); - const beans::Property* pEnd = pIter + aSeq.getLength(); + const beans::Property* pEnd = pIter + aSeq.getLength(); for(;pIter != pEnd;++pIter) { if ( 0 == (pIter->Attributes & beans::PropertyAttribute::READONLY) ) @@ -203,7 +202,7 @@ void OSectionUndo::Undo() } catch( const Exception& ) { - OSL_FAIL( "OSectionUndo::Undo: caught an exception!" ); + OSL_ENSURE( sal_False, "OSectionUndo::Undo: caught an exception!" ); } } //---------------------------------------------------------------------------- @@ -224,7 +223,7 @@ void OSectionUndo::Redo() } catch( const Exception& ) { - OSL_FAIL( "OSectionUndo::Redo: caught an exception!" ); + OSL_ENSURE( sal_False, "OSectionUndo::Redo: caught an exception!" ); } } //---------------------------------------------------------------------------- @@ -235,7 +234,7 @@ OReportSectionUndo::OReportSectionUndo(OReportModel& _rMod,sal_uInt16 _nSlot ,OReportHelper> _pMemberFunction ,const uno::Reference< report::XReportDefinition >& _xReport ,Action _eAction - ,sal_uInt16 nCommentID) + ,USHORT nCommentID) : OSectionUndo(_rMod,_nSlot,_eAction,nCommentID) ,m_aReportHelper(_xReport) ,m_pMemberFunction(_pMemberFunction) @@ -263,7 +262,7 @@ void OReportSectionUndo::implReRemove( ) if( m_eAction == Removed ) collectControls(m_pMemberFunction(&m_aReportHelper)); const uno::Sequence< beans::PropertyValue > aArgs; - m_pController->executeChecked(m_nSlot,aArgs); + m_pController->executeChecked(m_nSlot,aArgs); m_bInserted = false; } //---------------------------------------------------------------------------- @@ -274,7 +273,7 @@ OGroupSectionUndo::OGroupSectionUndo(OReportModel& _rMod,sal_uInt16 _nSlot ,OGroupHelper> _pMemberFunction ,const uno::Reference< report::XGroup >& _xGroup ,Action _eAction - ,sal_uInt16 nCommentID) + ,USHORT nCommentID) : OSectionUndo(_rMod,_nSlot,_eAction,nCommentID) ,m_aGroupHelper(_xGroup) ,m_pMemberFunction(_pMemberFunction) @@ -295,7 +294,7 @@ String OGroupSectionUndo::GetComment() const try { uno::Reference< report::XSection > xSection = const_cast<OGroupSectionUndo*>(this)->m_pMemberFunction(&const_cast<OGroupSectionUndo*>(this)->m_aGroupHelper); - + if ( xSection.is() ) m_sName = xSection->getName(); } @@ -332,7 +331,7 @@ void OGroupSectionUndo::implReRemove( ) aArgs[0].Value <<= sal_False; aArgs[1].Name = PROPERTY_GROUP; aArgs[1].Value <<= m_aGroupHelper.getGroup(); - + m_pController->executeChecked(m_nSlot,aArgs); m_bInserted = false; } @@ -340,8 +339,8 @@ void OGroupSectionUndo::implReRemove( ) TYPEINIT1( OGroupUndo, OCommentUndoAction ); //---------------------------------------------------------------------------- OGroupUndo::OGroupUndo(OReportModel& _rMod - ,sal_uInt16 nCommentID - ,Action _eAction + ,USHORT nCommentID + ,Action _eAction ,const uno::Reference< report::XGroup>& _xGroup ,const uno::Reference< report::XReportDefinition >& _xReportDefinition) : OCommentUndoAction(_rMod,nCommentID) @@ -360,7 +359,7 @@ void OGroupUndo::implReInsert( ) } catch(uno::Exception&) { - OSL_FAIL("Exception catched while undoing remove group"); + OSL_ENSURE(0,"Exception catched while undoing remove group"); } } //---------------------------------------------------------------------------- @@ -372,7 +371,7 @@ void OGroupUndo::implReRemove( ) } catch(uno::Exception&) { - OSL_FAIL("Exception catched while redoing remove group"); + OSL_ENSURE(0,"Exception catched while redoing remove group"); } } //---------------------------------------------------------------------------- @@ -388,7 +387,7 @@ void OGroupUndo::Undo() implReInsert(); break; } - + } //---------------------------------------------------------------------------- void OGroupUndo::Redo() diff --git a/reportdesign/source/ui/misc/makefile.mk b/reportdesign/source/ui/misc/makefile.mk index 494b68023d62..b12bafdc7760 100644 --- a/reportdesign/source/ui/misc/makefile.mk +++ b/reportdesign/source/ui/misc/makefile.mk @@ -44,7 +44,7 @@ VISIBILITY_HIDDEN=TRUE # ... object files ............................ EXCEPTIONSFILES= \ - $(SLO)$/RptUndo.obj \ + $(SLO)$/Undo.obj \ $(SLO)$/ColorListener.obj \ $(SLO)$/UITools.obj \ $(SLO)$/rptuiservices.obj \ diff --git a/reportdesign/source/ui/misc/rptuiservices.cxx b/reportdesign/source/ui/misc/rptuiservices.cxx index 61d1b20ab432..444ae268e304 100644 --- a/reportdesign/source/ui/misc/rptuiservices.cxx +++ b/reportdesign/source/ui/misc/rptuiservices.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -65,7 +65,7 @@ cppu::ImplementationEntry entries[] = { &cppu::createSingleComponentFactory, 0, 0 }, { &DataProviderHandler::create, &DataProviderHandler::getImplementationName_Static, &DataProviderHandler::getSupportedServiceNames_static, &cppu::createSingleComponentFactory, 0, 0 }, - { 0, 0, 0, 0, 0, 0 } + { 0, 0, 0, 0, 0, 0 } }; } @@ -82,5 +82,11 @@ extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnviron *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( + void * serviceManager, void * registryKey) +{ + return cppu::component_writeInfoHelper( + serviceManager, registryKey, entries); +} -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/misc/statusbarcontroller.cxx b/reportdesign/source/ui/misc/statusbarcontroller.cxx index 2de27a2217c4..a8230177caad 100644 --- a/reportdesign/source/ui/misc/statusbarcontroller.cxx +++ b/reportdesign/source/ui/misc/statusbarcontroller.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -84,10 +84,10 @@ Reference< XInterface > OStatusbarController::create(Reference< XComponentContex } IMPLEMENT_FORWARD_XINTERFACE2(OStatusbarController, ::svt::StatusbarController,OStatusbarController_BASE) -OStatusbarController::OStatusbarController(const Reference< XMultiServiceFactory >& _rxORB) +OStatusbarController::OStatusbarController(const Reference< XMultiServiceFactory >& _rxORB) : m_nSlotId(0) ,m_nId(1) -{ +{ m_xServiceManager = _rxORB; } // ----------------------------------------------------------------------------- @@ -100,22 +100,22 @@ void SAL_CALL OStatusbarController::initialize( const Sequence< Any >& _rArgumen StatusBar* pStatusBar = static_cast<StatusBar*>(VCLUnoHelper::GetWindow(m_xParentWindow)); if ( pStatusBar ) { - const sal_uInt16 nCount = pStatusBar->GetItemCount(); - for (sal_uInt16 nPos = 0; nPos < nCount; ++nPos) + const USHORT nCount = pStatusBar->GetItemCount(); + for (USHORT nPos = 0; nPos < nCount; ++nPos) { - const sal_uInt16 nItemId = pStatusBar->GetItemId(nPos); + const USHORT nItemId = pStatusBar->GetItemId(nPos); if ( pStatusBar->GetItemCommand(nItemId) == String(m_aCommandURL) ) { m_nId = nItemId; break; } } - if ( m_aCommandURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:ZoomSlider")) ) - { + if ( m_aCommandURL.equalsAscii(".uno:ZoomSlider") ) + { m_pController = TStatusbarHelper::createFromQuery(new SvxZoomSliderControl(m_nSlotId = SID_ATTR_ZOOMSLIDER,m_nId,*pStatusBar)); - } - else if ( m_aCommandURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:Zoom")) ) - { + } // if ( m_aCommandURL.equalsAscii(".uno:ZoomSlider") ) + else if ( m_aCommandURL.equalsAscii(".uno:Zoom") ) + { m_pController = TStatusbarHelper::createFromQuery(new SvxZoomStatusBarControl(m_nSlotId = SID_ATTR_ZOOM,m_nId,*pStatusBar)); } @@ -137,7 +137,7 @@ void SAL_CALL OStatusbarController::statusChanged( const FeatureStateEvent& _aEv if ( m_pController.is() ) { - if ( m_aCommandURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:ZoomSlider")) ) + if ( m_aCommandURL.equalsAscii(".uno:ZoomSlider") ) { Sequence< PropertyValue > aSeq; if ( (_aEvent.State >>= aSeq) && aSeq.getLength() == 2 ) @@ -146,8 +146,8 @@ void SAL_CALL OStatusbarController::statusChanged( const FeatureStateEvent& _aEv aZoomSlider.PutValue(_aEvent.State); static_cast<SvxZoomSliderControl*>(m_pController.get())->StateChanged(m_nSlotId,SFX_ITEM_AVAILABLE,&aZoomSlider); } - } - else if ( m_aCommandURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:Zoom")) ) + } // if ( m_aCommandURL.equalsAscii(".uno:ZoomSlider") ) + else if ( m_aCommandURL.equalsAscii(".uno:Zoom") ) { Sequence< PropertyValue > aSeq; if ( (_aEvent.State >>= aSeq) && aSeq.getLength() == 3 ) diff --git a/reportdesign/source/ui/misc/toolboxcontroller.cxx b/reportdesign/source/ui/misc/toolboxcontroller.cxx index 016573d21c01..3bc4d1810a40 100644 --- a/reportdesign/source/ui/misc/toolboxcontroller.cxx +++ b/reportdesign/source/ui/misc/toolboxcontroller.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ #include <svtools/menuoptions.hxx> #include <osl/mutex.hxx> #include <svx/svxids.hrc> -#define ITEMID_COLOR 1 +#define ITEMID_COLOR 1 #define ITEMID_BRUSH 2 #define ITEMID_FONT 3 #define ITEMID_FONTHEIGHT 4 @@ -149,52 +149,52 @@ void SAL_CALL OToolboxController::initialize( const Sequence< Any >& _rArguments ToolBox* pToolBox = static_cast<ToolBox*>(VCLUnoHelper::GetWindow(getParent())); if ( pToolBox ) { - const sal_uInt16 nCount = pToolBox->GetItemCount(); - for (sal_uInt16 nPos = 0; nPos < nCount; ++nPos) + const USHORT nCount = pToolBox->GetItemCount(); + for (USHORT nPos = 0; nPos < nCount; ++nPos) { - const sal_uInt16 nItemId = pToolBox->GetItemId(nPos); + const USHORT nItemId = pToolBox->GetItemId(nPos); if ( pToolBox->GetItemCommand(nItemId) == String(m_aCommandURL) ) { m_nToolBoxId = nItemId; break; } } - if ( m_aCommandURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:BasicShapes")) ) + if ( m_aCommandURL.equalsAscii(".uno:BasicShapes") ) { m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:BasicShapes")),sal_True)); m_pToolbarController = TToolbarHelper::createFromQuery(new SvxTbxCtlCustomShapes(m_nSlotId = SID_DRAWTBX_CS_BASIC,m_nToolBoxId,*pToolBox)); } - else if ( m_aCommandURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:SymbolShapes")) ) + else if ( m_aCommandURL.equalsAscii(".uno:SymbolShapes") ) { m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:SymbolShapes")),sal_True)); m_pToolbarController = TToolbarHelper::createFromQuery(new SvxTbxCtlCustomShapes(m_nSlotId = SID_DRAWTBX_CS_SYMBOL,m_nToolBoxId,*pToolBox)); } - else if ( m_aCommandURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:ArrowShapes")) ) + else if ( m_aCommandURL.equalsAscii(".uno:ArrowShapes") ) { m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:ArrowShapes")),sal_True)); m_pToolbarController = TToolbarHelper::createFromQuery(new SvxTbxCtlCustomShapes(m_nSlotId = SID_DRAWTBX_CS_ARROW,m_nToolBoxId,*pToolBox)); } - else if ( m_aCommandURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:FlowChartShapes")) ) + else if ( m_aCommandURL.equalsAscii(".uno:FlowChartShapes") ) { m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:FlowChartShapes")),sal_True)); m_pToolbarController = TToolbarHelper::createFromQuery(new SvxTbxCtlCustomShapes(m_nSlotId = SID_DRAWTBX_CS_FLOWCHART,m_nToolBoxId,*pToolBox)); } - else if ( m_aCommandURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:CalloutShapes")) ) + else if ( m_aCommandURL.equalsAscii(".uno:CalloutShapes") ) { m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:CalloutShapes")),sal_True)); m_pToolbarController = TToolbarHelper::createFromQuery(new SvxTbxCtlCustomShapes(m_nSlotId = SID_DRAWTBX_CS_CALLOUT,m_nToolBoxId,*pToolBox)); } - else if ( m_aCommandURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:StarShapes")) ) + else if ( m_aCommandURL.equalsAscii(".uno:StarShapes") ) { m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:StarShapes")),sal_True)); m_pToolbarController = TToolbarHelper::createFromQuery(new SvxTbxCtlCustomShapes(m_nSlotId = SID_DRAWTBX_CS_STAR,m_nToolBoxId,*pToolBox)); } - else if ( m_aCommandURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:CharFontName")) ) + else if ( m_aCommandURL.equalsAscii(".uno:CharFontName") ) { m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:CharFontName")),sal_True)); m_pToolbarController = TToolbarHelper::createFromQuery(new SvxFontNameToolBoxControl/*SvxStyleToolBoxControl*/(m_nSlotId = SID_ATTR_CHAR_FONT,m_nToolBoxId,*pToolBox)); } - else if ( m_aCommandURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:FontColor")) || m_aCommandURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:Color")) ) + else if ( m_aCommandURL.equalsAscii(".uno:FontColor") || m_aCommandURL.equalsAscii(".uno:Color") ) { m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:FontColor")),sal_True)); m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Color")),sal_True)); @@ -228,12 +228,12 @@ void SAL_CALL OToolboxController::statusChanged( const FeatureStateEvent& Event { // All other status events will be processed here sal_Bool bSetCheckmark = sal_False; - sal_Bool bCheckmark = sal_False; + sal_Bool bCheckmark = sal_False; //m_pToolbarController->GetToolBox().Enable(Event.IsEnabled); ToolBox& rTb = m_pToolbarController->GetToolBox(); - for ( sal_uInt16 i = 0; i < rTb.GetItemCount(); i++ ) + for ( USHORT i = 0; i < rTb.GetItemCount(); i++ ) { - sal_uInt16 nId = rTb.GetItemId( i ); + USHORT nId = rTb.GetItemId( i ); if ( nId == 0 ) continue; diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx index b8791bc294ff..4af7f7025345 100644 --- a/reportdesign/source/ui/report/DesignView.cxx +++ b/reportdesign/source/ui/report/DesignView.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,7 +60,7 @@ using namespace lang; using namespace beans; using namespace container; -#define LINE_SIZE 50 +#define LINE_SIZE 50 #define START_SIZE_TASKPANE 30 #define COLSET_ID 1 #define REPORT_ID 2 @@ -96,7 +96,7 @@ class OwnSplitWindow : public SplitWindow public: OwnSplitWindow(Window* pParent) : SplitWindow(pParent,WB_DIALOGCONTROL){SetBackground( );} - virtual void Split() + virtual void Split() { SplitWindow::Split(); setItemSizes(); @@ -104,7 +104,7 @@ public: void setItemSizes() { const long nOutWidth = GetOutputSizePixel().Width(); - long nTaskPaneMinSplitSize = static_cast<OTaskWindow*>(GetItemWindow(TASKPANE_ID))->getMinimumWidth(); + long nTaskPaneMinSplitSize = static_cast<OTaskWindow*>(GetItemWindow(TASKPANE_ID))->getMinimumWidth(); nTaskPaneMinSplitSize = static_cast<long>(nTaskPaneMinSplitSize*100/nOutWidth); if ( !nTaskPaneMinSplitSize ) nTaskPaneMinSplitSize = START_SIZE_TASKPANE; @@ -114,20 +114,20 @@ public: long nReportSize = GetItemSize( REPORT_ID ); long nTaskPaneSize = GetItemSize( TASKPANE_ID ); - sal_Bool bMod = sal_False; + BOOL bMod = FALSE; if( nReportSize < nReportMinSplitSize ) { nReportSize = nReportMinSplitSize; nTaskPaneSize = 99 - nReportMinSplitSize; - bMod = sal_True; + bMod = TRUE; } else if( nTaskPaneSize < nTaskPaneMinSplitSize ) { nTaskPaneSize = nTaskPaneMinSplitSize; nReportSize = 99 - nTaskPaneMinSplitSize; - bMod = sal_True; + bMod = TRUE; } if( bMod ) @@ -156,12 +156,12 @@ ODesignView::ODesignView( Window* pParent, ,m_eMode( RPTUI_SELECT ) ,m_nCurrentPosition(USHRT_MAX) ,m_eActObj( OBJ_NONE ) - ,m_bFirstDraw(sal_False) - ,m_aGridSizeCoarse( 1000, 1000 ) // #i93595# 100TH_MM changed to grid using coarse 1 cm grid + ,m_bFirstDraw(FALSE) + ,m_aGridSizeCoarse( 1000, 1000 ) // #i93595# 100TH_MM changed to grid using coarse 1 cm grid ,m_aGridSizeFine( 250, 250 ) // and a 0,25 cm subdivision for better visualisation - ,m_bGridVisible(sal_True) - ,m_bGridSnap(sal_True) - ,m_bDeleted( sal_False ) + ,m_bGridVisible(TRUE) + ,m_bGridSnap(TRUE) + ,m_bDeleted( FALSE ) { DBG_CTOR( rpt_ODesignView,NULL); SetHelpId(UID_RPT_RPT_APP_VIEW); @@ -171,11 +171,14 @@ ODesignView::ODesignView( Window* pParent, // now create the task pane on the right side :-) m_pTaskPane = new OTaskWindow(this); + //m_pTaskPane->Show(); m_aSplitWin.InsertItem( COLSET_ID,100,SPLITWINDOW_APPEND, 0, SWIB_PERCENTSIZE | SWIB_COLSET ); - m_aSplitWin.InsertItem( REPORT_ID, &m_aScrollWindow, 100, SPLITWINDOW_APPEND, COLSET_ID, SWIB_PERCENTSIZE); + m_aSplitWin.InsertItem( REPORT_ID, &m_aScrollWindow, 100/*m_aScrollWindow.getMaxMarkerWidth(sal_False)*/, SPLITWINDOW_APPEND, COLSET_ID, SWIB_PERCENTSIZE /*SWIB_COLSET*/); + //m_aSplitWin.InsertItem( TASKPANE_ID, m_pTaskPane, 50, SPLITWINDOW_APPEND, 0, SWIB_PERCENTSIZE ); // Splitter einrichten + //m_aSplitter.SetSplitHdl(LINK(this, ODesignView,SplitHdl)); m_aSplitWin.SetSplitHdl(LINK(this, ODesignView,SplitHdl)); m_aSplitWin.ShowAutoHideButton(); m_aSplitWin.SetAlign(WINDOWALIGN_LEFT); @@ -189,7 +192,7 @@ ODesignView::ODesignView( Window* pParent, ODesignView::~ODesignView() { DBG_DTOR( rpt_ODesignView,NULL); - m_bDeleted = sal_True; + m_bDeleted = TRUE; Hide(); m_aScrollWindow.Hide(); m_aMarkTimer.Stop(); @@ -201,7 +204,7 @@ ODesignView::~ODesignView() } if ( m_pAddField ) { - SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromAscii( UID_RPT_RPT_APP_VIEW ) ); + SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromInt32( UID_RPT_RPT_APP_VIEW ) ); aDlgOpt.SetWindowState( ::rtl::OUString::createFromAscii( m_pAddField->GetWindowState(WINDOWSTATE_MASK_ALL).GetBuffer() ) ); notifySystemWindow(this,m_pAddField,::comphelper::mem_fun(&TaskPaneList::RemoveWindow)); ::std::auto_ptr<Window> aTemp2(m_pAddField); @@ -246,12 +249,7 @@ long ODesignView::PreNotify( NotifyEvent& rNEvt ) switch(rNEvt.GetType()) { case EVENT_KEYINPUT: - if ( (m_pPropWin && m_pPropWin->HasChildPathFocus()) ) - return 0L; - if ( (m_pAddField && m_pAddField->HasChildPathFocus()) ) - return 0L; - if ( (m_pReportExplorer && m_pReportExplorer->HasChildPathFocus()) ) - return 0L; + //if ( nRet != 1L ) { const KeyEvent* pKeyEvent = rNEvt.GetKeyEvent(); if ( handleKeyEvent(*pKeyEvent) ) @@ -283,8 +281,8 @@ void ODesignView::resizeDocumentView(Rectangle& _rPlayground) sal_Int32 nSplitPos = getController().getSplitPos(); if ( 0 != aPlaygroundSize.Width() ) { - if ( ( -1 == nSplitPos ) - || ( nSplitPos >= aPlaygroundSize.Width() ) + if ( ( -1 == nSplitPos ) + || ( nSplitPos >= aPlaygroundSize.Width() ) ) { long nMinWidth = static_cast<long>(0.1*aPlaygroundSize.Width()); @@ -293,7 +291,7 @@ void ODesignView::resizeDocumentView(Rectangle& _rPlayground) nSplitPos = static_cast<sal_Int32>(_rPlayground.Right() - nMinWidth); getController().setSplitPos(nSplitPos); } - } + } // if ( 0 != _rPlaygroundSize.Width() ) Size aReportWindowSize(aPlaygroundSize); if ( m_aSplitWin.IsItemValid(TASKPANE_ID) ) @@ -361,7 +359,7 @@ void ODesignView::SetMode( DlgEdMode _eNewMode ) m_aScrollWindow.SetMode(_eNewMode); } //---------------------------------------------------------------------------- -void ODesignView::SetInsertObj( sal_uInt16 eObj,const ::rtl::OUString& _sShapeType ) +void ODesignView::SetInsertObj( USHORT eObj,const ::rtl::OUString& _sShapeType ) { m_eActObj = eObj; m_aScrollWindow.SetInsertObj( eObj,_sShapeType ); @@ -373,7 +371,7 @@ rtl::OUString ODesignView::GetInsertObjString() const } //---------------------------------------------------------------------------- -sal_uInt16 ODesignView::GetInsertObj() const +USHORT ODesignView::GetInsertObj() const { return m_eActObj; } @@ -404,13 +402,13 @@ void ODesignView::Delete() m_aScrollWindow.Delete(); } //---------------------------------------------------------------------------- -sal_Bool ODesignView::HasSelection() const +BOOL ODesignView::HasSelection() const { return m_aScrollWindow.HasSelection(); } //---------------------------------------------------------------------------- -sal_Bool ODesignView::IsPasteAllowed() const +BOOL ODesignView::IsPasteAllowed() const { return m_aScrollWindow.IsPasteAllowed(); } @@ -438,7 +436,7 @@ void ODesignView::toggleGrid(sal_Bool _bGridVisible) m_aScrollWindow.toggleGrid(_bGridVisible); } //---------------------------------------------------------------------------- -sal_uInt16 ODesignView::getSectionCount() const +USHORT ODesignView::getSectionCount() const { return m_aScrollWindow.getSectionCount(); } @@ -448,12 +446,12 @@ void ODesignView::showRuler(sal_Bool _bShow) m_aScrollWindow.showRuler(_bShow); } //---------------------------------------------------------------------------- -void ODesignView::removeSection(sal_uInt16 _nPosition) +void ODesignView::removeSection(USHORT _nPosition) { m_aScrollWindow.removeSection(_nPosition); } //---------------------------------------------------------------------------- -void ODesignView::addSection(const uno::Reference< report::XSection >& _xSection,const ::rtl::OUString& _sColorEntry,sal_uInt16 _nPosition) +void ODesignView::addSection(const uno::Reference< report::XSection >& _xSection,const ::rtl::OUString& _sColorEntry,USHORT _nPosition) { m_aScrollWindow.addSection(_xSection,_sColorEntry,_nPosition); } @@ -472,7 +470,11 @@ void ODesignView::GetFocus() // ----------------------------------------------------------------------------- void ODesignView::ImplInitSettings() { +//#if OSL_DEBUG_LEVEL > 0 +// SetBackground( Wallpaper( COL_RED )); +//#else SetBackground( Wallpaper( Application::GetSettings().GetStyleSettings().GetFaceColor() )); +//#endif SetFillColor( Application::GetSettings().GetStyleSettings().GetFaceColor() ); SetTextFillColor( Application::GetSettings().GetStyleSettings().GetFaceColor() ); } @@ -528,10 +530,12 @@ void ODesignView::togglePropertyBrowser(sal_Bool _bToogleOn) m_pTaskPane->Invalidate(); if ( bWillBeVisible ) - m_aSplitWin.InsertItem( TASKPANE_ID, m_pTaskPane,START_SIZE_TASKPANE, SPLITWINDOW_APPEND, COLSET_ID, SWIB_PERCENTSIZE); + m_aSplitWin.InsertItem( TASKPANE_ID, m_pTaskPane,START_SIZE_TASKPANE, SPLITWINDOW_APPEND, COLSET_ID, SWIB_PERCENTSIZE/*|SWIB_COLSET */); else m_aSplitWin.RemoveItem(TASKPANE_ID); + // TRY + // Invalidate(/*INVALIDATE_NOCHILDREN|INVALIDATE_NOERASE*/); if ( bWillBeVisible ) m_aMarkTimer.Start(); } @@ -549,7 +553,7 @@ void ODesignView::showProperties(const uno::Reference< uno::XInterface>& _xRepor } } //----------------------------------------------------------------------------- -sal_Bool ODesignView::isReportExplorerVisible() const +BOOL ODesignView::isReportExplorerVisible() const { return m_pReportExplorer && m_pReportExplorer->IsVisible(); } @@ -570,7 +574,7 @@ void ODesignView::toggleReportExplorer() m_pReportExplorer->Show(!m_pReportExplorer->IsVisible()); } //----------------------------------------------------------------------------- -sal_Bool ODesignView::isAddFieldVisible() const +BOOL ODesignView::isAddFieldVisible() const { return m_pAddField && m_pAddField->IsVisible(); } @@ -597,7 +601,7 @@ void ODesignView::toggleAddField() uno::Reference < beans::XPropertySet > xSet(rReportController.getRowSet(),uno::UNO_QUERY); m_pAddField = new OAddFieldWindow(this,xSet); m_pAddField->SetCreateHdl(LINK( &rReportController, OReportController, OnCreateHdl ) ); - SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromAscii( UID_RPT_RPT_APP_VIEW ) ); + SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromInt32( UID_RPT_RPT_APP_VIEW ) ); if ( aDlgOpt.Exists() ) m_pAddField->SetWindowState( ByteString( aDlgOpt.GetWindowState().getStr(), RTL_TEXTENCODING_ASCII_US ) ); m_pAddField->Update(); @@ -615,6 +619,12 @@ uno::Reference< report::XSection > ODesignView::getCurrentSection() const if ( m_pCurrentView ) xSection = m_pCurrentView->getReportSection()->getSection(); + // why do we need the code below? + //else + // { + // OReportController& rReportController = getController(); + // xSection = rReportController.getReportDefinition()->getDetail(); + // } return xSection; } // ----------------------------------------------------------------------------- @@ -735,13 +745,13 @@ void ODesignView::fillControlModelSelection(::std::vector< uno::Reference< uno:: m_aScrollWindow.fillControlModelSelection(_rSelection); } // ----------------------------------------------------------------------------- -void ODesignView::setGridSnap(sal_Bool bOn) +void ODesignView::setGridSnap(BOOL bOn) { m_aScrollWindow.setGridSnap(bOn); } // ----------------------------------------------------------------------------- -void ODesignView::setDragStripes(sal_Bool bOn) +void ODesignView::setDragStripes(BOOL bOn) { m_aScrollWindow.setDragStripes(bOn); } diff --git a/reportdesign/source/ui/report/EndMarker.cxx b/reportdesign/source/ui/report/EndMarker.cxx index 77fb99286993..686bb65daab5 100644 --- a/reportdesign/source/ui/report/EndMarker.cxx +++ b/reportdesign/source/ui/report/EndMarker.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,19 +35,19 @@ #include <vcl/lineinfo.hxx> -#define CORNER_SPACE 5 +#define CORNER_SPACE 5 //===================================================================== namespace rptui { //===================================================================== DBG_NAME( rpt_OEndMarker ) -OEndMarker::OEndMarker(Window* _pParent ,const ::rtl::OUString& _sColorEntry) +OEndMarker::OEndMarker(Window* _pParent ,const ::rtl::OUString& _sColorEntry) : OColorListener(_pParent,_sColorEntry) { - DBG_CTOR( rpt_OEndMarker,NULL); + DBG_CTOR( rpt_OEndMarker,NULL); SetUniqueId(HID_RPT_ENDMARKER); ImplInitSettings(); - SetPaintTransparent(sal_True); + SetPaintTransparent(TRUE); } // ----------------------------------------------------------------------------- OEndMarker::~OEndMarker() @@ -69,14 +69,14 @@ void OEndMarker::Paint( const Rectangle& /*rRect*/ ) Color aStartColor(m_nColor); aStartColor.IncreaseLuminance(10); - sal_uInt16 nHue = 0; - sal_uInt16 nSat = 0; - sal_uInt16 nBri = 0; + USHORT nHue = 0; + USHORT nSat = 0; + USHORT nBri = 0; aStartColor.RGBtoHSB(nHue, nSat, nBri); nSat += 40; Color aEndColor(Color::HSBtoRGB(nHue, nSat, nBri)); Gradient aGradient(GRADIENT_LINEAR,aStartColor,aEndColor); - aGradient.SetSteps(static_cast<sal_uInt16>(aSize.Height())); + aGradient.SetSteps(static_cast<USHORT>(aSize.Height())); DrawGradient(PixelToLogic(aPoly) ,aGradient); if ( m_bMarked ) diff --git a/reportdesign/source/ui/report/FixedTextColor.cxx b/reportdesign/source/ui/report/FixedTextColor.cxx index 2d6555dff6bc..659fc4a32fdd 100644 --- a/reportdesign/source/ui/report/FixedTextColor.cxx +++ b/reportdesign/source/ui/report/FixedTextColor.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,14 +69,78 @@ namespace rptui } //-------------------------------------------------------------------- + // sal_Int32 FixedTextColor::getTextColor() + // { + // const StyleSettings& aStyleSettings = Application::GetSettings().GetStyleSettings(); + // BOOL bHighContrast = aStyleSettings.GetHighContrastMode(); + // + // Color aGetFaceColor = aStyleSettings.GetFaceColor(); + // Color aGetCheckedColor = aStyleSettings.GetCheckedColor(); + // Color aGetLightColor = aStyleSettings.GetLightColor(); + // Color aGetLightBorderColor = aStyleSettings.GetLightBorderColor(); + // Color aGetShadowColor = aStyleSettings.GetShadowColor(); + // Color aGetDarkShadowColor = aStyleSettings.GetDarkShadowColor(); + // Color aGetButtonTextColor = aStyleSettings.GetButtonTextColor(); + // Color aGetButtonRolloverTextColor = aStyleSettings.GetButtonRolloverTextColor(); + // Color aGetRadioCheckTextColor = aStyleSettings.GetRadioCheckTextColor(); + // Color aGetGroupTextColor = aStyleSettings.GetGroupTextColor(); + // Color aGetLabelTextColor = aStyleSettings.GetLabelTextColor(); + // Color aGetInfoTextColor = aStyleSettings.GetInfoTextColor(); + // Color aGetWindowColor = aStyleSettings.GetWindowColor(); + // Color aGetWindowTextColor = aStyleSettings.GetWindowTextColor(); + // Color aGetDialogColor = aStyleSettings.GetDialogColor(); + // Color aGetDialogTextColor = aStyleSettings.GetDialogTextColor(); + // Color aGetWorkspaceColor = aStyleSettings.GetWorkspaceColor(); + // Color aGetFieldColor = aStyleSettings.GetFieldColor(); + // Color aGetFieldTextColor = aStyleSettings.GetFieldTextColor(); + // Color aGetFieldRolloverTextColor = aStyleSettings.GetFieldRolloverTextColor(); + // Color aGetActiveColor = aStyleSettings.GetActiveColor(); + // Color aGetActiveColor2 = aStyleSettings.GetActiveColor2(); + // Color aGetActiveTextColor = aStyleSettings.GetActiveTextColor(); + // Color aGetActiveBorderColor = aStyleSettings.GetActiveBorderColor(); + // Color aGetDeactiveColor = aStyleSettings.GetDeactiveColor(); + // Color aGetDeactiveColor2 = aStyleSettings.GetDeactiveColor2(); + // Color aGetDeactiveTextColor = aStyleSettings.GetDeactiveTextColor(); + // Color aGetDeactiveBorderColor = aStyleSettings.GetDeactiveBorderColor(); + // Color aGetHighlightColor = aStyleSettings.GetHighlightColor(); + // Color aGetHighlightTextColor = aStyleSettings.GetHighlightTextColor(); + // Color aGetDisableColor = aStyleSettings.GetDisableColor(); + // Color aGetHelpColor = aStyleSettings.GetHelpColor(); + // Color aGetHelpTextColor = aStyleSettings.GetHelpTextColor(); + // Color aGetMenuColor = aStyleSettings.GetMenuColor(); + // Color aGetMenuBarColor = aStyleSettings.GetMenuBarColor(); + // Color aGetMenuBorderColor = aStyleSettings.GetMenuBorderColor(); + // Color aGetMenuTextColor = aStyleSettings.GetMenuTextColor(); + // Color aGetMenuHighlightColor = aStyleSettings.GetMenuHighlightColor(); + // Color aGetMenuHighlightTextColor = aStyleSettings.GetMenuHighlightTextColor(); + // Color aGetLinkColor = aStyleSettings.GetLinkColor(); + // Color aGetVisitedLinkColor = aStyleSettings.GetVisitedLinkColor(); + // Color aGetHighlightLinkColor = aStyleSettings.GetHighlightLinkColor(); + // Color aGetMonoColor = aStyleSettings.GetMonoColor(); + // Color aGetActiveTabColor = aStyleSettings.GetActiveTabColor(); + // Color aGetInactiveTabColor = aStyleSettings.GetInactiveTabColor(); + // + // Color aWindowColor = aStyleSettings.GetWindowColor(); + // Color aLabelColor = aStyleSettings.GetLabelTextColor(); + // + // // if (m_nTextColor == -1) + // // { + // // svtools::ExtendedColorConfig aConfig; + // // m_nTextColor = aConfig.GetColorValue(CFG_REPORTDESIGNER, DBTEXTBOXBOUNDCONTENT).getColor(); + // // } + // return aLabelColor.GetColor(); + // } + + //-------------------------------------------------------------------- FixedTextColor::~FixedTextColor() { DBG_DTOR(rpt_FixedTextColor,NULL); } // ----------------------------------------------------------------------------- - + void FixedTextColor::notifyPropertyChange( const beans::PropertyChangeEvent& _rEvent ) { + // (void)_rEvent; uno::Reference< report::XFixedText > xFixedText( _rEvent.Source, uno::UNO_QUERY ); if ( ! xFixedText.is() ) { @@ -87,13 +151,16 @@ namespace rptui { uno::Reference< lang::XComponent > xComponent( xFixedText, uno::UNO_QUERY_THROW ); handle(xComponent); + // uno::Reference<awt::XVclWindowPeer> xVclWindowPeer = getVclWindowPeer(xComponent); + + // setPropertyTextColor(xVclWindowPeer, getTextColor()); } - catch (uno::Exception const&) + catch (uno::Exception e) { DBG_UNHANDLED_EXCEPTION(); } } - + // ----------------------------------------------------------------------------- void FixedTextColor::setPropertyTextColor(const uno::Reference< awt::XVclWindowPeer >& _xVclWindowPeer, sal_Int32 _nTextColor) { @@ -105,10 +172,11 @@ namespace rptui { handle(_rxElement); } - + // ----------------------------------------------------------------------------- void FixedTextColor::handle( const uno::Reference< uno::XInterface >& _rxElement ) { + // (void) _rxElement; uno::Reference< report::XFixedText > xFixedText( _rxElement, uno::UNO_QUERY ); if ( ! xFixedText.is() ) { @@ -120,9 +188,9 @@ namespace rptui sal_Bool bIsDark = sal_False; const sal_Int32 nBackColor( xFixedText->getControlBackground() ); if ((sal_uInt32)nBackColor == COL_TRANSPARENT) - { + { uno::Reference <report::XSection> xSection(xFixedText->getParent(), uno::UNO_QUERY_THROW); - + sal_Bool bSectionBackColorIsTransparent = xSection->getBackTransparent(); if (bSectionBackColorIsTransparent) { @@ -142,8 +210,8 @@ namespace rptui { Color aLabelBackColor(nBackColor); bIsDark = aLabelBackColor.IsDark(); - } - + } + uno::Reference<awt::XVclWindowPeer> xVclWindowPeer = getVclWindowPeer(xFixedText); if (bIsDark) { @@ -156,30 +224,30 @@ namespace rptui util::Color aLabelColor = xFixedText->getCharColor(); setPropertyTextColor(xVclWindowPeer, aLabelColor); } - + } catch( const uno::Exception& ) { DBG_UNHANDLED_EXCEPTION(); } } - + // ----------------------------------------------------------------------------- // XPropertyChangeListener uno::Reference<awt::XControl> FixedTextColor::getXControl(const uno::Reference< report::XFixedText >& _xFixedText) throw(uno::RuntimeException) { - + uno::Reference<awt::XControl> xControl; OReportController *pController = (OReportController *)&m_rReportController; - + ::boost::shared_ptr<OReportModel> pModel = pController->getSdrModel(); - + uno::Reference<report::XSection> xSection(_xFixedText->getSection()); if ( xSection.is() ) { OReportPage *pPage = pModel->getPage(xSection); - sal_uLong nIndex = pPage->getIndexOf(_xFixedText.get()); + ULONG nIndex = pPage->getIndexOf(_xFixedText.get()); if (nIndex < pPage->GetObjCount() ) { SdrObject *pObject = pPage->GetObj(nIndex); @@ -198,7 +266,7 @@ namespace rptui } return xControl; } - + // ----------------------------------------------------------------------------- uno::Reference<awt::XVclWindowPeer> FixedTextColor::getVclWindowPeer(const uno::Reference< report::XFixedText >& _xComponent) throw(uno::RuntimeException) { @@ -212,7 +280,7 @@ namespace rptui - + } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx index f7529c94bce8..2e604a95da34 100644 --- a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx +++ b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -78,7 +78,7 @@ namespace rptui } return m_nTextColor; } - + //-------------------------------------------------------------------- FormattedFieldBeautifier::~FormattedFieldBeautifier() { @@ -127,7 +127,7 @@ namespace rptui DBG_UNHANDLED_EXCEPTION(); } } - + // ----------------------------------------------------------------------------- void FormattedFieldBeautifier::setPlaceholderText( const uno::Reference< awt::XVclWindowPeer >& _xVclWindowPeer, const ::rtl::OUString& _rText ) { @@ -146,17 +146,17 @@ namespace rptui aFontDescriptorStructure.Slant = ::com::sun::star::awt::FontSlant_ITALIC; _xVclWindowPeer->setProperty(PROPERTY_FONTDESCRIPTOR, uno::makeAny(aFontDescriptorStructure)); } - + // ----------------------------------------------------------------------------- void FormattedFieldBeautifier::notifyPropertyChange( const beans::PropertyChangeEvent& _rEvent ) { - if ( !_rEvent.PropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DataField" ) ) ) + if ( !_rEvent.PropertyName.equalsAscii( "DataField" ) ) // not interested in return; setPlaceholderText( _rEvent.Source ); } - + // ----------------------------------------------------------------------------- void FormattedFieldBeautifier::handle( const uno::Reference< uno::XInterface >& _rxElement ) { @@ -168,25 +168,26 @@ namespace rptui { handle( _rxElement ); } - + // ----------------------------------------------------------------------------- uno::Reference<awt::XVclWindowPeer> FormattedFieldBeautifier::getVclWindowPeer(const uno::Reference< report::XReportComponent >& _xComponent) throw(uno::RuntimeException) - { + { uno::Reference<awt::XVclWindowPeer> xVclWindowPeer; ::boost::shared_ptr<OReportModel> pModel = const_cast< OReportController& >( m_rReportController ).getSdrModel(); - + uno::Reference<report::XSection> xSection(_xComponent->getSection()); if ( xSection.is() ) - { + { OReportPage *pPage = pModel->getPage(xSection); - sal_uLong nIndex = pPage->getIndexOf(_xComponent); + ULONG nIndex = pPage->getIndexOf(_xComponent); if (nIndex < pPage->GetObjCount() ) { SdrObject *pObject = pPage->GetObj(nIndex); OUnoObject* pUnoObj = dynamic_cast<OUnoObject*>(pObject); if ( pUnoObj ) // this doesn't need to be done for shapes { + // Rectangle aRect = pUnoObj->GetCurrentBoundRect(); ::boost::shared_ptr<OSectionWindow> pSectionWindow = m_rReportController.getSectionWindow(xSection); if (pSectionWindow != NULL) { diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index 3f44e172ee00..473e3b366ee7 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,21 +27,21 @@ ************************************************************************/ #include "precompiled_reportdesign.hxx" -#define RPTUI_ID_LRSPACE 1 -#define RPTUI_ID_ULSPACE 2 -#define RPTUI_ID_PAGE 3 -#define RPTUI_ID_SIZE 4 -#define RPTUI_ID_PAGE_MODE 5 -#define RPTUI_ID_START 6 -#define RPTUI_ID_END 7 -#define RPTUI_ID_BRUSH 8 -#define RPTUI_ID_METRIC 9 +#define RPTUI_ID_LRSPACE 1 +#define RPTUI_ID_ULSPACE 2 +#define RPTUI_ID_PAGE 3 +#define RPTUI_ID_SIZE 4 +#define RPTUI_ID_PAGE_MODE 5 +#define RPTUI_ID_START 6 +#define RPTUI_ID_END 7 +#define RPTUI_ID_BRUSH 8 +#define RPTUI_ID_METRIC 9 #define ITEMID_LRSPACE RPTUI_ID_LRSPACE #define ITEMID_ULSPACE RPTUI_ID_ULSPACE #define ITEMID_SIZE RPTUI_ID_SIZE -#define ITEMID_PAGE RPTUI_ID_PAGE -#define ITEMID_BRUSH RPTUI_ID_BRUSH +#define ITEMID_PAGE RPTUI_ID_PAGE +#define ITEMID_BRUSH RPTUI_ID_BRUSH #include "ReportController.hxx" @@ -100,7 +100,6 @@ #include <com/sun/star/sdb/SQLContext.hpp> #include <com/sun/star/sdbc/SQLWarning.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> -#include <com/sun/star/document/XUndoManagerSupplier.hpp> #include <vcl/svapp.hxx> #include <vcl/msgbox.hxx> @@ -128,7 +127,7 @@ #include "DesignView.hxx" #include "ModuleHelper.hxx" #include "RptObject.hxx" -#include "RptUndo.hxx" +#include "Undo.hxx" #include "uistrings.hrc" #include "RptDef.hxx" #include "ReportSection.hxx" @@ -154,12 +153,10 @@ #include <toolkit/helper/vclunohelper.hxx> #include "UndoEnv.hxx" #include "InsertFunctions.hxx" -#include "ReportControllerObserver.hxx" #include <boost/mem_fn.hpp> #include <boost/bind.hpp> #include <boost/utility.hpp> -#include <boost/scoped_ptr.hpp> #include <cppuhelper/exc_hlp.hxx> #include <unotools/confignode.hxx> @@ -167,7 +164,7 @@ #include <ReportControllerObserver.hxx> -#define MAX_ROWS_FOR_PREVIEW 20 +#define MAX_ROWS_FOR_PREVIEW 50 using namespace ::com::sun::star; using namespace uno; @@ -197,11 +194,11 @@ namespace { bool operator() (const beans::PropertyValue& x, const ::rtl::OUString& y) const { - return x.Name.equals(y); + return x.Name.equals(y);// ? true : false; } bool operator() (const ::rtl::OUString& x,const beans::PropertyValue& y) const { - return x.equals(y.Name); + return x.equals(y.Name);// ? true : false; } }; @@ -224,16 +221,16 @@ namespace aFontDescriptor.Underline = awt::FontUnderline::SINGLE - aFontDescriptor.Underline; break; default: - OSL_FAIL("Illegal value in default!"); + OSL_ENSURE(0,"Illegal value in default!"); break; } _xReportControlFormat->setFontDescriptor(aFontDescriptor); } - catch(const beans::UnknownPropertyException&) + catch(beans::UnknownPropertyException&) { } - } + } // if ( xReportControlFormat.is() ) } } @@ -249,16 +246,14 @@ void lcl_getReportControlFormat(const Sequence< PropertyValue >& aArgs, SequenceAsHashMap aMap(aArgs); xReportControlFormat = aMap.getUnpackedValueOrDefault(REPORTCONTROLFORMAT,uno::Reference< report::XReportControlFormat>()); _xWindow = aMap.getUnpackedValueOrDefault(CURRENT_WINDOW,uno::Reference< awt::XWindow>()); - } - + } // if ( aArgs.getLength() ) if ( !xReportControlFormat.is() ) { _pView->fillControlModelSelection(_rControlsFormats); - } + //xReportControlFormat.set( _pView->getCurrentControlModel(),uno::UNO_QUERY); + } // if ( !xReportControlFormat.is() ) else - { _rControlsFormats.push_back(xReportControlFormat); - } if ( !_xWindow.is() ) _xWindow = VCLUnoHelper::GetInterface(_pView); @@ -345,7 +340,7 @@ void OReportController::disposing() m_pClipbordNotifier->AddRemoveListener( getView(), sal_False ); m_pClipbordNotifier->release(); m_pClipbordNotifier = NULL; - } + } // if ( getView() && m_pClipbordNotifier ) if ( m_pGroupsFloater ) { SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromInt32( RID_GROUPS_SORTING ) ); @@ -362,9 +357,9 @@ void OReportController::disposing() ::comphelper::disposeComponent( m_xRowSetMediator ); ::comphelper::disposeComponent( m_xFormatter ); } - catch(const uno::Exception&) + catch(uno::Exception&) { - OSL_FAIL("Exception caught while disposing row sets."); + OSL_ENSURE(0,"Exception caught while disposing row sets."); } m_xRowSet.clear(); m_xRowSetMediator.clear(); @@ -378,15 +373,14 @@ void OReportController::disposing() pSectionWindow = getDesignView()->getMarkedSection(); if ( pSectionWindow ) pSectionWindow->getReportSection().deactivateOle(); - clearUndoManager(); + getUndoMgr()->Clear(); // clear all undo redo things if ( m_aReportModel ) listen(false); m_pReportControllerObserver->Clear(); m_pReportControllerObserver->release(); } - catch(const uno::Exception&) + catch(uno::Exception&) { - DBG_UNHANDLED_EXCEPTION(); } } @@ -398,6 +392,7 @@ void OReportController::disposing() OReportController_BASE::disposing(); + // disconnect(); try { m_xReportDefinition.clear(); @@ -405,7 +400,7 @@ void OReportController::disposing() m_xFrameLoader.clear(); m_xReportEngine.clear(); } - catch(const uno::Exception&) + catch(uno::Exception&) { } if ( getDesignView() ) @@ -463,27 +458,15 @@ FeatureState OReportController::GetState(sal_uInt16 _nId) const break; case SID_REDO: case SID_UNDO: - { - size_t ( SfxUndoManager::*retrieveCount )( bool const ) const = - ( _nId == SID_UNDO ) ? &SfxUndoManager::GetUndoActionCount : &SfxUndoManager::GetRedoActionCount; - - SfxUndoManager& rUndoManager( getUndoManager() ); - aReturn.bEnabled = ( rUndoManager.*retrieveCount )( ::svl::IUndoManager::TopLevel ) > 0; - if ( aReturn.bEnabled ) - { - // TODO: add "Undo/Redo: prefix" - String ( SfxUndoManager::*retrieveComment )( size_t, bool const ) const = - ( _nId == SID_UNDO ) ? &SfxUndoManager::GetUndoActionComment : &SfxUndoManager::GetRedoActionComment; - aReturn.sTitle = (rUndoManager.*retrieveComment)( 0, ::svl::IUndoManager::TopLevel ); - } - } + aReturn = OReportController_BASE::GetState(_nId); + aReturn.bEnabled = aReturn.bEnabled; break; case SID_OBJECT_RESIZING: case SID_OBJECT_SMALLESTWIDTH: case SID_OBJECT_SMALLESTHEIGHT: case SID_OBJECT_GREATESTWIDTH: case SID_OBJECT_GREATESTHEIGHT: - aReturn.bEnabled = isEditable() && getDesignView()->HasSelection(); + aReturn.bEnabled = isEditable() && getDesignView()->HasSelection();// && getDesignView()->isAlignPossible(); if ( aReturn.bEnabled ) aReturn.bEnabled = m_nSelectionCount > 1; break; @@ -545,7 +528,7 @@ FeatureState OReportController::GetState(sal_uInt16 _nId) const case SID_SECTION_ALIGN_UP: case SID_SECTION_ALIGN_MIDDLE: case SID_SECTION_ALIGN_DOWN: - aReturn.bEnabled = isEditable() && getDesignView()->HasSelection(); + aReturn.bEnabled = isEditable() && getDesignView()->HasSelection();// && getDesignView()->isAlignPossible(); break; case SID_CUT: aReturn.bEnabled = isEditable() && getDesignView()->HasSelection() && !getDesignView()->isHandleEvent(_nId); @@ -581,7 +564,7 @@ FeatureState OReportController::GetState(sal_uInt16 _nId) const case SID_EXPAND_SECTION: case SID_NEXT_MARK: case SID_PREV_MARK: - aReturn.bEnabled = isEditable() && !getDesignView()->isHandleEvent(_nId); + aReturn.bEnabled = isEditable(); break; case SID_SELECT: case SID_SELECT_REPORT: @@ -826,7 +809,7 @@ FeatureState OReportController::GetState(sal_uInt16 _nId) const const uno::Reference< report::XReportControlModel> xControlModel(getDesignView()->getCurrentControlModel(),uno::UNO_QUERY); aReturn.bEnabled = !xControlModel.is(); } - catch(const beans::UnknownPropertyException&) + catch(beans::UnknownPropertyException&) { } else @@ -860,7 +843,7 @@ FeatureState OReportController::GetState(sal_uInt16 _nId) const break; default: ; - } + } // switch(_nCommand) } break; case SID_ATTR_CHAR_COLOR: @@ -905,7 +888,7 @@ FeatureState OReportController::GetState(sal_uInt16 _nId) const aReturn.bChecked = _nId == SID_ATTR_PARA_ADJUST_CENTER; break; } - } + } // if ( aReturn.aValue >>= nParaAdjust ) aReturn.aValue.clear(); } break; @@ -915,7 +898,7 @@ FeatureState OReportController::GetState(sal_uInt16 _nId) const break; case SID_CHAR_DLG: case SID_SETCONTROLDEFAULTS: - aReturn.bEnabled = m_xReportDefinition.is() && isEditable(); + aReturn.bEnabled = m_xReportDefinition.is() && isEditable();// && getDesignView()->getCurrentControlModel().is(); if ( aReturn.bEnabled ) { ::std::vector< uno::Reference< uno::XInterface > > aSelection; @@ -952,6 +935,7 @@ FeatureState OReportController::GetState(sal_uInt16 _nId) const SvxZoomItem aZoom(m_eZoomType,m_nZoomValue); aZoom.SetValueSet(SVX_ZOOM_ENABLE_50|SVX_ZOOM_ENABLE_75|SVX_ZOOM_ENABLE_100|SVX_ZOOM_ENABLE_200); aZoom.QueryValue(aReturn.aValue); + //aReturn.sTitle = ::rtl::OUString::valueOf((sal_Int32)m_nZoomValue); } break; case SID_ATTR_ZOOMSLIDER: @@ -963,6 +947,7 @@ FeatureState OReportController::GetState(sal_uInt16 _nId) const aZoomSlider.AddSnappingPoint(100); aZoomSlider.AddSnappingPoint(200); aZoomSlider.QueryValue(aReturn.aValue); + //aReturn.sTitle = ::rtl::OUString::valueOf((sal_Int32)m_nZoomValue); } break; default: @@ -1000,7 +985,37 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue > { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); - + if ( !getView() ) + { + switch(_nId) + { + case SID_RULER: + OSL_ENSURE(aArgs.getLength() == 1,"Invalid length!"); + aArgs[0].Value >>= m_bShowRuler; + break; + case SID_HELPLINES_MOVE: + OSL_ENSURE(aArgs.getLength() == 1,"Invalid length!"); + aArgs[0].Value >>= m_bHelplinesMove; + break; + case SID_GRID_VISIBLE: + OSL_ENSURE(aArgs.getLength() == 1,"Invalid length!"); + aArgs[0].Value >>= m_bGridVisible; + break; + case SID_SHOW_PROPERTYBROWSER: + OSL_ENSURE(aArgs.getLength() == 1,"Invalid length!"); + aArgs[0].Value >>= m_bShowProperties; + break; + case SID_PROPERTYBROWSER_LAST_PAGE: + OSL_ENSURE(aArgs.getLength() == 1,"Invalid length!"); + aArgs[0].Value >>= m_sLastActivePage; + break; + case SID_SPLIT_POSITION: + OSL_ENSURE(aArgs.getLength() == 1,"Invalid length!"); + aArgs[0].Value >>= m_nSplitPos; + break; + } + return; // return without execution + } sal_Bool bForceBroadcast = sal_False; switch(_nId) { @@ -1040,12 +1055,10 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue > case SID_REDO: case SID_UNDO: { + // const OXUndoEnvironment::OUndoEnvLock aLock( m_aReportModel->GetUndoEnv() ); + // We would like to know if we are in undo mode const OXUndoEnvironment::OUndoMode aLock( m_aReportModel->GetUndoEnv() ); - sal_Bool ( SfxUndoManager::*doXDo )() = - ( _nId == SID_UNDO ) ? &SfxUndoManager::Undo : &SfxUndoManager::Redo; - - SfxUndoManager& rUndoManager( getUndoManager() ); - (rUndoManager.*doXDo)(); + OReportController_BASE::Execute( _nId, aArgs ); InvalidateAll(); updateFloater(); } @@ -1156,7 +1169,7 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue > select(uno::makeAny(m_xReportDefinition)); break; case SID_EXECUTE_REPORT: - getView()->PostUserEvent(LINK(this, OReportController,OnExecuteReport)); + /*m_nExecuteReportEvent = */getView()->PostUserEvent(LINK(this, OReportController,OnExecuteReport)); break; case SID_RPT_NEW_FUNCTION: createNewFunction(aArgs[0].Value); @@ -1183,7 +1196,7 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue > uno::Reference< report::XFunctions> xFunctions(xFunction->getParent(),uno::UNO_QUERY_THROW); sal_Int32 nIndex = getPositionInIndexAccess(xFunctions.get(),xFunction); const String sUndoAction = String((ModuleRes(RID_STR_UNDO_REMOVE_FUNCTION))); - UndoContext aUndoContext( getUndoManager(), sUndoAction ); + UndoManagerListAction aListAction(m_aUndoManager,sUndoAction); xFunctions->removeByIndex(nIndex); select(uno::makeAny(xFunctions->getParent())); InvalidateFeature( SID_SAVEDOC ); @@ -1210,6 +1223,14 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue > InvalidateAll(); break; case SID_INSERT_DIAGRAM: + /*{ + OSectionView* pView = getCurrentSectionView(); + if ( pView ) + { + Reference< awt::XWindow> xWindow = VCLUnoHelper::GetInterface(getView()->Window::GetParent()); + InsertChart(m_xContext,m_xReportDefinition.get(),xWindow,pView,getSdrModel().get()); + } + }*/ getDesignView()->SetMode( RPTUI_INSERT ); getDesignView()->SetInsertObj( OBJ_OLE2); createDefaultControl(aArgs); @@ -1388,6 +1409,7 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue > case SID_DRAWTBX_CS_STAR: sType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("star5")); break; + case SID_DRAWTBX_CS_BASIC: default: sType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("diamond")); } @@ -1461,16 +1483,19 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue > case SID_ATTR_CHAR_POSTURE: case SID_ATTR_CHAR_UNDERLINE: { + ::std::auto_ptr<UndoManagerListAction> pListAction; uno::Reference< awt::XWindow> xWindow; ::std::vector< uno::Reference< uno::XInterface > > aControlsFormats; lcl_getReportControlFormat( aArgs, getDesignView(), xWindow, aControlsFormats ); - - const String sUndoAction(ModuleRes(RID_STR_UNDO_CHANGEFONT)); - UndoContext aUndoContext( getUndoManager(), sUndoAction ); - + bool bMulti = aControlsFormats.size() > 1; ::std::vector< uno::Reference< uno::XInterface > >::iterator aIter = aControlsFormats.begin(); for(; aIter != aControlsFormats.end();++aIter) { + if ( !pListAction.get() && bMulti) + { + const String sUndoAction(ModuleRes(RID_STR_UNDO_CHANGEFONT)); + pListAction.reset(new UndoManagerListAction(m_aUndoManager,sUndoAction)); + } // if ( !pListAction.get() ) uno::Reference< report::XReportControlFormat> xReportControlFormat(*aIter,uno::UNO_QUERY); lcl_setFontWPU_nothrow(xReportControlFormat,_nId); } @@ -1492,7 +1517,7 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue > if ( aArgs[0].Value >>= aFont ) { impl_setPropertyAtControls_throw(RID_STR_UNDO_CHANGEFONT,PROPERTY_CHARFONTNAME,uno::makeAny(aFont.Name),aArgs); - } + } // if ( aArgs[0].Value >>= aFont ) } break; case SID_ATTR_CHAR_FONTHEIGHT: @@ -1523,7 +1548,7 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue > case SID_ATTR_PARA_ADJUST_BLOCK: eParagraphAdjust = style::ParagraphAdjust_BLOCK; break; - } + } // switch(_nId) impl_setPropertyAtControls_throw(RID_STR_UNDO_ALIGNMENT,PROPERTY_PARAADJUST,uno::makeAny(eParagraphAdjust),aArgs); InvalidateFeature(SID_ATTR_PARA_ADJUST_LEFT); @@ -1534,37 +1559,32 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue > break; case SID_CHAR_DLG: { + ::std::auto_ptr<UndoManagerListAction> pListAction; uno::Sequence< beans::NamedValue > aSettings; uno::Reference< awt::XWindow> xWindow; ::std::vector< uno::Reference< uno::XInterface > > aControlsFormats; lcl_getReportControlFormat( aArgs, getDesignView(), xWindow, aControlsFormats ); - - if ( !aControlsFormats.empty() ) + ::std::vector< uno::Reference< uno::XInterface > >::iterator aIter = aControlsFormats.begin(); + for(; aIter != aControlsFormats.end();++aIter) { - const String sUndoAction( ModuleRes( RID_STR_UNDO_CHANGEFONT ) ); - UndoContext aUndoContext( getUndoManager(), sUndoAction ); - - ::std::vector< uno::Reference< uno::XInterface > >::iterator aIter = aControlsFormats.begin(); - for(; aIter != aControlsFormats.end();++aIter) + uno::Reference< report::XReportControlFormat > xFormat(*aIter,uno::UNO_QUERY); + if ( xFormat.is() ) { - uno::Reference< report::XReportControlFormat > xFormat( *aIter, uno::UNO_QUERY ); - if ( !xFormat.is() ) - continue; - - if ( aSettings.getLength() == 0 ) + if ( !pListAction.get() ) { - ::rptui::openCharDialog( xFormat, xWindow, aSettings ); - if ( aSettings.getLength() == 0 ) - break; - } - + const String sUndoAction(ModuleRes(RID_STR_UNDO_CHANGEFONT)); + pListAction.reset(new UndoManagerListAction(m_aUndoManager,sUndoAction)); + rptui::openCharDialog(xFormat,xWindow,aSettings); + } // if ( !pListAction.get() ) applyCharacterSettings( xFormat, aSettings ); } - + } // for(; aIter != aControlsFormats.end();++aIter) + if ( !aControlsFormats.empty() ) InvalidateAll(); - } } break; + //case SID_FM_DESIGN_MODE: + // break; case SID_INSERT_GRAPHIC: insertGraphic(); break; @@ -1590,7 +1610,7 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue > } else createDateTime(aArgs); - } + } // if ( m_xReportDefinition.is() ) break; case SID_INSERT_FLD_PGNUMBER: if ( m_xReportDefinition.is() ) @@ -1602,7 +1622,7 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue > } else createPageNumber(aArgs); - } + } // if ( m_xReportDefinition.is() ) break; case SID_EXPORTDOC: case SID_EXPORTDOCASPDF: @@ -1621,13 +1641,14 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue > // don't change anything here so return return; case RET_NO: - setModified(sal_False); // and we are not modified yet + setModified(sal_False); // and we are not modified yet break; default: break; } } setEditable(!isEditable()); + //getJoinView()->setReadOnly(!isEditable()); InvalidateAll(); return; case SID_GROUP: @@ -1637,17 +1658,17 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue > { openZoomDialog(); } - else if ( aArgs.getLength() == 1 && aArgs[0].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Zoom")) ) + else if ( aArgs.getLength() == 1 && aArgs[0].Name.equalsAscii("Zoom") ) { SvxZoomItem aZoomItem; aZoomItem.PutValue(aArgs[0].Value); m_nZoomValue = aZoomItem.GetValue(); m_eZoomType = aZoomItem.GetType(); impl_zoom_nothrow(); - } + } // if ( aArgs.getLength() == 1 && aArgs[0].Name.equalsAscii("Zoom") ) break; case SID_ATTR_ZOOMSLIDER: - if ( aArgs.getLength() == 1 && aArgs[0].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ZoomSlider")) ) + if ( aArgs.getLength() == 1 && aArgs[0].Name.equalsAscii("ZoomSlider") ) { SvxZoomSliderItem aZoomSlider; aZoomSlider.PutValue(aArgs[0].Value); @@ -1666,7 +1687,6 @@ short OReportController::saveModified() { return RET_NO; } - // ----------------------------------------------------------------------------- void OReportController::impl_initialize( ) { @@ -1682,18 +1702,15 @@ void OReportController::impl_initialize( ) { if ( m_xReportDefinition.is() ) { - getView()->initialize(); // show the windows and fill with our informations - - m_aReportModel = reportdesign::OReportDefinition::getSdrModel(m_xReportDefinition); + //m_sName = m_xReportDefinition->getName(); + getView()->initialize(); // show the windows and fill with our informations + getUndoMgr()->Clear(); // clear all undo redo things + getSdrModel(); if ( !m_aReportModel ) - throw RuntimeException(); - m_aReportModel->attachController( *this ); - - clearUndoManager(); - UndoSuppressor aSuppressUndo( getUndoManager() ); + throw Exception(); ::comphelper::NamedValueCollection aArgs(getModel()->getArgs()); - setMode(aArgs.getOrDefault("Mode", ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("normal")))); + setMode(aArgs.getOrDefault("Mode", rtl::OUString::createFromAscii("normal"))); listen(true); setEditable( !m_aReportModel->IsReadOnly() ); @@ -1715,11 +1732,11 @@ void OReportController::impl_initialize( ) m_xReportDefinition->setCommand(aNames[0]); m_xReportDefinition->setCommandType(sdb::CommandType::TABLE); } - } + } // if ( !sHierarchicalDocumentName.getLength() && getConnection().is() ) m_aVisualAreaSize = m_xReportDefinition->getVisualAreaSize(0); - } + } // if ( m_xReportDefinition.is() ) // check if chart is supported by the engine checkChartEnabled(); @@ -1757,9 +1774,9 @@ void OReportController::impl_initialize( ) getDesignView()->setCurrentPage(m_sLastActivePage); uno::Sequence< beans::PropertyValue> aArgs; executeUnChecked(SID_SELECT_REPORT,aArgs); - } + } // if ( m_bShowProperties && m_nPageNum == -1 ) - setModified(sal_False); // and we are not modified yet + setModified(sal_False); // and we are not modified yet // open the global help agent // we need a Frame but at this time there is no frame, therefore we send a UserEvent @@ -1767,12 +1784,13 @@ void OReportController::impl_initialize( ) } catch(const SQLException&) { - DBG_UNHANDLED_EXCEPTION(); + OSL_ENSURE(sal_False, "OReportController::initialize: caught an exception!"); } } // ----------------------------------------------------------------------------- IMPL_LINK( OReportController, OnOpenHelpAgent, void* ,/*_pMemfun*/) { + //m_nExecuteReportEvent = 0; doOpenHelpAgent(); return 0L; } @@ -1794,8 +1812,10 @@ void OReportController::doOpenHelpAgent() { if (getFrame().is()) { - rtl::OUString suURL(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.help://shared/text/shared/explorer/database/rep_main.xhp?UseDB=no&DbPAR=swriter")); + rtl::OUString suURL = rtl::OUString::createFromAscii("vnd.sun.star.help://shared/text/shared/explorer/database/rep_main.xhp?UseDB=no&DbPAR=swriter"); openHelpAgent(suURL); + // openHelpAgent(68245 /* HID_REPORT_DESIGN... UNKNOWN */ ); + // HID_APP_REPORT_TREE } else { @@ -1818,6 +1838,7 @@ sal_Bool OReportController::Construct(Window* pParent) m_pClipbordNotifier->AddRemoveListener( getView(), sal_True ); OReportController_BASE::Construct(pParent); + //getView()->Show(); return sal_True; } // ----------------------------------------------------------------------------- @@ -1838,264 +1859,272 @@ sal_Bool SAL_CALL OReportController::suspend(sal_Bool /*_bSuspend*/) throw( Runt // ----------------------------------------------------------------------------- void OReportController::describeSupportedFeatures() { - DBSubComponentController::describeSupportedFeatures(); - - implDescribeSupportedFeature( ".uno:TextDocument", SID_RPT_TEXTDOCUMENT, CommandGroup::APPLICATION ); - implDescribeSupportedFeature( ".uno:Spreadsheet", SID_RPT_SPREADSHEET, CommandGroup::APPLICATION ); - - implDescribeSupportedFeature( ".uno:Redo", SID_REDO, CommandGroup::EDIT ); - implDescribeSupportedFeature( ".uno:Undo", SID_UNDO, CommandGroup::EDIT ); - implDescribeSupportedFeature( ".uno:SelectAll", SID_SELECTALL, CommandGroup::EDIT ); - implDescribeSupportedFeature( ".uno:SelectAllInSection", SID_SELECTALL_IN_SECTION, CommandGroup::EDIT ); - implDescribeSupportedFeature( ".uno:Delete", SID_DELETE, CommandGroup::EDIT ); - implDescribeSupportedFeature( ".uno:SelectReport", SID_SELECT_REPORT, CommandGroup::EDIT ); - implDescribeSupportedFeature( ".uno:ExecuteReport", SID_EXECUTE_REPORT, CommandGroup::EDIT ); - - implDescribeSupportedFeature( ".uno:GridVisible", SID_GRID_VISIBLE, CommandGroup::VIEW ); - implDescribeSupportedFeature( ".uno:GridUse", SID_GRID_USE, CommandGroup::VIEW ); - implDescribeSupportedFeature( ".uno:HelplinesMove", SID_HELPLINES_MOVE, CommandGroup::VIEW ); - implDescribeSupportedFeature( ".uno:ShowRuler", SID_RULER, CommandGroup::VIEW ); - implDescribeSupportedFeature( ".uno:AddField", SID_FM_ADD_FIELD, CommandGroup::VIEW ); - implDescribeSupportedFeature( ".uno:ReportNavigator", SID_RPT_SHOWREPORTEXPLORER, CommandGroup::VIEW ); - implDescribeSupportedFeature( ".uno:ControlProperties", SID_SHOW_PROPERTYBROWSER, CommandGroup::VIEW ); - implDescribeSupportedFeature( ".uno:DbSortingAndGrouping", SID_SORTINGANDGROUPING, CommandGroup::VIEW ); - implDescribeSupportedFeature( ".uno:PageHeaderFooter", SID_PAGEHEADERFOOTER, CommandGroup::VIEW ); - implDescribeSupportedFeature( ".uno:ReportHeaderFooter", SID_REPORTHEADERFOOTER, CommandGroup::VIEW ); - implDescribeSupportedFeature( ".uno:ZoomSlider", SID_ATTR_ZOOMSLIDER, CommandGroup::VIEW ); - implDescribeSupportedFeature( ".uno:Zoom", SID_ATTR_ZOOM, CommandGroup::VIEW ); - - implDescribeSupportedFeature( ".uno:ConditionalFormatting", SID_CONDITIONALFORMATTING, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:PageDialog", SID_PAGEDIALOG, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:ResetAttributes", SID_SETCONTROLDEFAULTS, CommandGroup::FORMAT ); - - implDescribeSupportedFeature( ".uno:Bold", SID_ATTR_CHAR_WEIGHT, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:Italic", SID_ATTR_CHAR_POSTURE, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:Underline", SID_ATTR_CHAR_UNDERLINE, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:BackColor", SID_ATTR_CHAR_COLOR_BACKGROUND, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:BackgroundColor", SID_BACKGROUND_COLOR, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:Color", SID_ATTR_CHAR_COLOR); - implDescribeSupportedFeature( ".uno:FontColor", SID_ATTR_CHAR_COLOR2, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:FontDialog", SID_CHAR_DLG, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:LeftPara", SID_ATTR_PARA_ADJUST_LEFT, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:CenterPara", SID_ATTR_PARA_ADJUST_CENTER, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:RightPara", SID_ATTR_PARA_ADJUST_RIGHT, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:JustifyPara", SID_ATTR_PARA_ADJUST_BLOCK, CommandGroup::FORMAT ); - - implDescribeSupportedFeature( ".uno:FontHeight", SID_ATTR_CHAR_FONTHEIGHT, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:CharFontName", SID_ATTR_CHAR_FONT, CommandGroup::FORMAT ); - - implDescribeSupportedFeature( ".uno:ArrangeMenu", SID_ARRANGEMENU, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:BringToFront", SID_FRAME_TO_TOP, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:ObjectBackOne", SID_FRAME_DOWN, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:ObjectForwardOne", SID_FRAME_UP, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:SendToBack", SID_FRAME_TO_BOTTOM, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:SetObjectToForeground", SID_OBJECT_HEAVEN, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:SetObjectToBackground", SID_OBJECT_HELL, CommandGroup::FORMAT ); - - implDescribeSupportedFeature( ".uno:ObjectAlign", SID_OBJECT_ALIGN, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:ObjectAlignLeft", SID_OBJECT_ALIGN_LEFT, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:AlignCenter", SID_OBJECT_ALIGN_CENTER, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:ObjectAlignRight", SID_OBJECT_ALIGN_RIGHT, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:AlignUp", SID_OBJECT_ALIGN_UP, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:AlignMiddle", SID_OBJECT_ALIGN_MIDDLE, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:AlignDown", SID_OBJECT_ALIGN_DOWN, CommandGroup::FORMAT ); - - implDescribeSupportedFeature( ".uno:SectionAlign", SID_SECTION_ALIGN, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:SectionAlignLeft", SID_SECTION_ALIGN_LEFT, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:SectionAlignCenter", SID_SECTION_ALIGN_CENTER, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:SectionAlignRight", SID_SECTION_ALIGN_RIGHT, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:SectionAlignTop", SID_SECTION_ALIGN_UP, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:SectionAlignMiddle", SID_SECTION_ALIGN_MIDDLE, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:SectionAlignBottom", SID_SECTION_ALIGN_DOWN, CommandGroup::FORMAT ); + OSingleDocumentController::describeSupportedFeatures(); + + implDescribeSupportedFeature( ".uno:TextDocument", SID_RPT_TEXTDOCUMENT, CommandGroup::APPLICATION ); + implDescribeSupportedFeature( ".uno:Spreadsheet", SID_RPT_SPREADSHEET, CommandGroup::APPLICATION ); + + implDescribeSupportedFeature( ".uno:Redo", SID_REDO, CommandGroup::EDIT ); + implDescribeSupportedFeature( ".uno:Undo", SID_UNDO, CommandGroup::EDIT ); + //implDescribeSupportedFeature( ".uno:PasteSpecial", SID_PASTE, CommandGroup::EDIT ); + implDescribeSupportedFeature( ".uno:SelectAll", SID_SELECTALL, CommandGroup::EDIT ); + implDescribeSupportedFeature( ".uno:SelectAllInSection", SID_SELECTALL_IN_SECTION, CommandGroup::EDIT ); + implDescribeSupportedFeature( ".uno:Delete", SID_DELETE, CommandGroup::EDIT ); + implDescribeSupportedFeature( ".uno:SelectReport", SID_SELECT_REPORT, CommandGroup::EDIT ); + implDescribeSupportedFeature( ".uno:ExecuteReport", SID_EXECUTE_REPORT, CommandGroup::EDIT ); + + implDescribeSupportedFeature( ".uno:GridVisible", SID_GRID_VISIBLE, CommandGroup::VIEW ); + implDescribeSupportedFeature( ".uno:GridUse", SID_GRID_USE, CommandGroup::VIEW ); + implDescribeSupportedFeature( ".uno:HelplinesMove", SID_HELPLINES_MOVE, CommandGroup::VIEW ); + implDescribeSupportedFeature( ".uno:ShowRuler", SID_RULER, CommandGroup::VIEW ); + implDescribeSupportedFeature( ".uno:AddField", SID_FM_ADD_FIELD, CommandGroup::VIEW ); + implDescribeSupportedFeature( ".uno:ReportNavigator", SID_RPT_SHOWREPORTEXPLORER, CommandGroup::VIEW ); + implDescribeSupportedFeature( ".uno:ControlProperties", SID_SHOW_PROPERTYBROWSER, CommandGroup::VIEW ); + //implDescribeSupportedFeature( ".uno:SwitchControlDesignMode", SID_FM_DESIGN_MODE, CommandGroup::VIEW ); + implDescribeSupportedFeature( ".uno:DbSortingAndGrouping", SID_SORTINGANDGROUPING, CommandGroup::VIEW ); + implDescribeSupportedFeature( ".uno:PageHeaderFooter", SID_PAGEHEADERFOOTER, CommandGroup::VIEW ); + implDescribeSupportedFeature( ".uno:ReportHeaderFooter", SID_REPORTHEADERFOOTER, CommandGroup::VIEW ); + implDescribeSupportedFeature( ".uno:ZoomSlider", SID_ATTR_ZOOMSLIDER, CommandGroup::VIEW ); + implDescribeSupportedFeature( ".uno:Zoom", SID_ATTR_ZOOM, CommandGroup::VIEW ); + //implDescribeSupportedFeature( ".uno:SwitchControlDesignMode", SID_FM_DESIGN_MODE, CommandGroup::VIEW ); + + implDescribeSupportedFeature( ".uno:ConditionalFormatting", SID_CONDITIONALFORMATTING, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:PageDialog", SID_PAGEDIALOG, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:ResetAttributes", SID_SETCONTROLDEFAULTS, CommandGroup::FORMAT ); + + implDescribeSupportedFeature( ".uno:Bold", SID_ATTR_CHAR_WEIGHT, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:Italic", SID_ATTR_CHAR_POSTURE, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:Underline", SID_ATTR_CHAR_UNDERLINE, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:BackColor", SID_ATTR_CHAR_COLOR_BACKGROUND, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:BackgroundColor", SID_BACKGROUND_COLOR, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:Color", SID_ATTR_CHAR_COLOR); + implDescribeSupportedFeature( ".uno:FontColor", SID_ATTR_CHAR_COLOR2, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:FontDialog", SID_CHAR_DLG, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:LeftPara", SID_ATTR_PARA_ADJUST_LEFT, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:CenterPara", SID_ATTR_PARA_ADJUST_CENTER, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:RightPara", SID_ATTR_PARA_ADJUST_RIGHT, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:JustifyPara", SID_ATTR_PARA_ADJUST_BLOCK, CommandGroup::FORMAT ); + + implDescribeSupportedFeature( ".uno:FontHeight", SID_ATTR_CHAR_FONTHEIGHT, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:CharFontName", SID_ATTR_CHAR_FONT, CommandGroup::FORMAT ); + + implDescribeSupportedFeature( ".uno:ArrangeMenu", SID_ARRANGEMENU, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:BringToFront", SID_FRAME_TO_TOP, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:ObjectBackOne", SID_FRAME_DOWN, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:ObjectForwardOne", SID_FRAME_UP, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:SendToBack", SID_FRAME_TO_BOTTOM, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:SetObjectToForeground", SID_OBJECT_HEAVEN, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:SetObjectToBackground", SID_OBJECT_HELL, CommandGroup::FORMAT ); + + implDescribeSupportedFeature( ".uno:ObjectAlign", SID_OBJECT_ALIGN, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:ObjectAlignLeft", SID_OBJECT_ALIGN_LEFT, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:AlignCenter", SID_OBJECT_ALIGN_CENTER, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:ObjectAlignRight", SID_OBJECT_ALIGN_RIGHT, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:AlignUp", SID_OBJECT_ALIGN_UP, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:AlignMiddle", SID_OBJECT_ALIGN_MIDDLE, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:AlignDown", SID_OBJECT_ALIGN_DOWN, CommandGroup::FORMAT ); + + implDescribeSupportedFeature( ".uno:SectionAlign", SID_SECTION_ALIGN, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:SectionAlignLeft", SID_SECTION_ALIGN_LEFT, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:SectionAlignCenter", SID_SECTION_ALIGN_CENTER, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:SectionAlignRight", SID_SECTION_ALIGN_RIGHT, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:SectionAlignTop", SID_SECTION_ALIGN_UP, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:SectionAlignMiddle", SID_SECTION_ALIGN_MIDDLE, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:SectionAlignBottom", SID_SECTION_ALIGN_DOWN, CommandGroup::FORMAT ); implDescribeSupportedFeature( ".uno:SectionShrink", SID_SECTION_SHRINK, CommandGroup::FORMAT ); implDescribeSupportedFeature( ".uno:SectionShrinkTop", SID_SECTION_SHRINK_TOP, CommandGroup::FORMAT ); implDescribeSupportedFeature( ".uno:SectionShrinkBottom", SID_SECTION_SHRINK_BOTTOM, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:ObjectResize", SID_OBJECT_RESIZING, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:SmallestWidth", SID_OBJECT_SMALLESTWIDTH, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:SmallestHeight", SID_OBJECT_SMALLESTHEIGHT, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:GreatestWidth", SID_OBJECT_GREATESTWIDTH, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:GreatestHeight", SID_OBJECT_GREATESTHEIGHT, CommandGroup::FORMAT ); - implDescribeSupportedFeature( ".uno:Distribution", SID_DISTRIBUTION, CommandGroup::FORMAT ); - - implDescribeSupportedFeature( ".uno:HelpMenu", SID_HELPMENU, CommandGroup::APPLICATION ); - implDescribeSupportedFeature( ".uno:ExportTo", SID_EXPORTDOC, CommandGroup::APPLICATION ); - implDescribeSupportedFeature( ".uno:ExportToPDF", SID_EXPORTDOCASPDF, CommandGroup::APPLICATION ); - implDescribeSupportedFeature( ".uno:PrintPreview", SID_PRINTPREVIEW, CommandGroup::APPLICATION ); - - implDescribeSupportedFeature( ".uno:NewDoc", SID_NEWDOC, CommandGroup::DOCUMENT ); - implDescribeSupportedFeature( ".uno:Save", SID_SAVEDOC, CommandGroup::DOCUMENT ); - implDescribeSupportedFeature( ".uno:SaveAs", SID_SAVEASDOC, CommandGroup::DOCUMENT ); - - implDescribeSupportedFeature( ".uno:InsertPageNumberField", SID_INSERT_FLD_PGNUMBER, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:InsertDateTimeField", SID_DATETIME, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:InsertObjectChart", SID_INSERT_DIAGRAM, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:InsertGraphic", SID_INSERT_GRAPHIC, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:ObjectResize", SID_OBJECT_RESIZING, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:SmallestWidth", SID_OBJECT_SMALLESTWIDTH, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:SmallestHeight", SID_OBJECT_SMALLESTHEIGHT, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:GreatestWidth", SID_OBJECT_GREATESTWIDTH, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:GreatestHeight", SID_OBJECT_GREATESTHEIGHT, CommandGroup::FORMAT ); + implDescribeSupportedFeature( ".uno:Distribution", SID_DISTRIBUTION, CommandGroup::FORMAT ); + + implDescribeSupportedFeature( ".uno:HelpMenu", SID_HELPMENU, CommandGroup::APPLICATION ); + implDescribeSupportedFeature( ".uno:ExportTo", SID_EXPORTDOC, CommandGroup::APPLICATION ); + implDescribeSupportedFeature( ".uno:ExportToPDF", SID_EXPORTDOCASPDF, CommandGroup::APPLICATION ); + implDescribeSupportedFeature( ".uno:PrintPreview", SID_PRINTPREVIEW, CommandGroup::APPLICATION ); + + implDescribeSupportedFeature( ".uno:NewDoc", SID_NEWDOC, CommandGroup::DOCUMENT ); + implDescribeSupportedFeature( ".uno:Save", SID_SAVEDOC, CommandGroup::DOCUMENT ); + implDescribeSupportedFeature( ".uno:SaveAs", SID_SAVEASDOC, CommandGroup::DOCUMENT ); + + implDescribeSupportedFeature( ".uno:InsertPageNumberField", SID_INSERT_FLD_PGNUMBER, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:InsertDateTimeField", SID_DATETIME, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:InsertObjectChart", SID_INSERT_DIAGRAM, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:InsertGraphic", SID_INSERT_GRAPHIC, CommandGroup::INSERT ); // controls - implDescribeSupportedFeature( ".uno:SelectObject", SID_OBJECT_SELECT, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:Label", SID_FM_FIXEDTEXT, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:Edit", SID_FM_EDIT, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ImageControl", SID_FM_IMAGECONTROL, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:HFixedLine", SID_INSERT_HFIXEDLINE, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:VFixedLine", SID_INSERT_VFIXEDLINE, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:SelectObject", SID_OBJECT_SELECT, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:Label", SID_FM_FIXEDTEXT, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:Edit", SID_FM_EDIT, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:ImageControl", SID_FM_IMAGECONTROL, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:HFixedLine", SID_INSERT_HFIXEDLINE, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:VFixedLine", SID_INSERT_VFIXEDLINE, CommandGroup::INSERT ); // shapes - implDescribeSupportedFeature( ".uno:BasicShapes", SID_DRAWTBX_CS_BASIC, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:BasicShapes.rectangle", SID_DRAWTBX_CS_BASIC1, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:BasicShapes.round-rectangle",SID_DRAWTBX_CS_BASIC2, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:BasicShapes.quadrat", SID_DRAWTBX_CS_BASIC3, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:BasicShapes.round-quadrat", SID_DRAWTBX_CS_BASIC4, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:BasicShapes.circle", SID_DRAWTBX_CS_BASIC5, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:BasicShapes.ellipse", SID_DRAWTBX_CS_BASIC6, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:BasicShapes.circle-pie", SID_DRAWTBX_CS_BASIC7, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:BasicShapes.isosceles-triangle",SID_DRAWTBX_CS_BASIC8, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:BasicShapes.right-triangle",SID_DRAWTBX_CS_BASIC9, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:BasicShapes.trapezoid", SID_DRAWTBX_CS_BASIC10, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:BasicShapes.diamond", SID_DRAWTBX_CS_BASIC11, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:BasicShapes.parallelogram", SID_DRAWTBX_CS_BASIC12, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:BasicShapes.pentagon", SID_DRAWTBX_CS_BASIC13, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:BasicShapes.hexagon", SID_DRAWTBX_CS_BASIC14, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:BasicShapes.octagon", SID_DRAWTBX_CS_BASIC15, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:BasicShapes.cross", SID_DRAWTBX_CS_BASIC16, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:BasicShapes.ring", SID_DRAWTBX_CS_BASIC17, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:BasicShapes.block-arc", SID_DRAWTBX_CS_BASIC18, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:BasicShapes.can", SID_DRAWTBX_CS_BASIC19, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:BasicShapes.cube", SID_DRAWTBX_CS_BASIC20, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:BasicShapes.paper", SID_DRAWTBX_CS_BASIC21, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:BasicShapes.frame", SID_DRAWTBX_CS_BASIC22, CommandGroup::INSERT ); - - implDescribeSupportedFeature( ".uno:SymbolShapes", SID_DRAWTBX_CS_SYMBOL, CommandGroup::INSERT ); - - implDescribeSupportedFeature( ".uno:SymbolShapes.smiley" , SID_DRAWTBX_CS_SYMBOL1, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:SymbolShapes.sun" , SID_DRAWTBX_CS_SYMBOL2, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:SymbolShapes.moon" , SID_DRAWTBX_CS_SYMBOL3, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:SymbolShapes.lightning" , SID_DRAWTBX_CS_SYMBOL4, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:SymbolShapes.heart" , SID_DRAWTBX_CS_SYMBOL5, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:SymbolShapes.flower" , SID_DRAWTBX_CS_SYMBOL6, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:SymbolShapes.cloud" , SID_DRAWTBX_CS_SYMBOL7, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:SymbolShapes.forbidden" , SID_DRAWTBX_CS_SYMBOL8, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:SymbolShapes.puzzle" , SID_DRAWTBX_CS_SYMBOL9, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:SymbolShapes.bracket-pair" ,SID_DRAWTBX_CS_SYMBOL10, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:SymbolShapes.left-bracket" ,SID_DRAWTBX_CS_SYMBOL11, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:SymbolShapes.right-bracket",SID_DRAWTBX_CS_SYMBOL12, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:SymbolShapes.brace-pair" , SID_DRAWTBX_CS_SYMBOL13, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:SymbolShapes.left-brace" , SID_DRAWTBX_CS_SYMBOL14, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:SymbolShapes.right-brace" , SID_DRAWTBX_CS_SYMBOL15, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:SymbolShapes.quad-bevel" , SID_DRAWTBX_CS_SYMBOL16, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:SymbolShapes.octagon-bevel",SID_DRAWTBX_CS_SYMBOL17, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:SymbolShapes.diamond-bevel",SID_DRAWTBX_CS_SYMBOL18, CommandGroup::INSERT ); - - implDescribeSupportedFeature( ".uno:ArrowShapes.left-arrow" , SID_DRAWTBX_CS_ARROW1, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.right-arrow" , SID_DRAWTBX_CS_ARROW2, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.up-arrow" , SID_DRAWTBX_CS_ARROW3, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.down-arrow" , SID_DRAWTBX_CS_ARROW4, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.left-right-arrow" , SID_DRAWTBX_CS_ARROW5, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.up-down-arrow" , SID_DRAWTBX_CS_ARROW6, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.up-right-arrow" , SID_DRAWTBX_CS_ARROW7, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.up-right-down-arrow" , SID_DRAWTBX_CS_ARROW8, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.quad-arrow" , SID_DRAWTBX_CS_ARROW9, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.corner-right-arrow" , SID_DRAWTBX_CS_ARROW10, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.split-arrow" , SID_DRAWTBX_CS_ARROW11, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.striped-right-arrow" , SID_DRAWTBX_CS_ARROW12, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.notched-right-arrow" , SID_DRAWTBX_CS_ARROW13, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.pentagon-right" , SID_DRAWTBX_CS_ARROW14, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.chevron" , SID_DRAWTBX_CS_ARROW15, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.right-arrow-callout" , SID_DRAWTBX_CS_ARROW16, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.left-arrow-callout" , SID_DRAWTBX_CS_ARROW17, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.up-arrow-callout" , SID_DRAWTBX_CS_ARROW18, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.down-arrow-callout" , SID_DRAWTBX_CS_ARROW19, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.left-right-arrow-callout",SID_DRAWTBX_CS_ARROW20, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.up-down-arrow-callout" ,SID_DRAWTBX_CS_ARROW21, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.up-right-arrow-callout",SID_DRAWTBX_CS_ARROW22, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.quad-arrow-callout" , SID_DRAWTBX_CS_ARROW23, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.circular-arrow" , SID_DRAWTBX_CS_ARROW24, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.split-round-arrow" , SID_DRAWTBX_CS_ARROW25, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:ArrowShapes.s-sharped-arrow" , SID_DRAWTBX_CS_ARROW26, CommandGroup::INSERT ); - - implDescribeSupportedFeature( ".uno:StarShapes.bang" , SID_DRAWTBX_CS_STAR1, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:StarShapes.star4" , SID_DRAWTBX_CS_STAR2, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:StarShapes.star5" , SID_DRAWTBX_CS_STAR3, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:StarShapes.star6" , SID_DRAWTBX_CS_STAR4, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:StarShapes.star8" , SID_DRAWTBX_CS_STAR5, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:StarShapes.star12" , SID_DRAWTBX_CS_STAR6, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:StarShapes.star24" , SID_DRAWTBX_CS_STAR7, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:StarShapes.concave-star6" , SID_DRAWTBX_CS_STAR8, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:StarShapes.vertical-scroll" , SID_DRAWTBX_CS_STAR9, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:StarShapes.horizontal-scroll" , SID_DRAWTBX_CS_STAR10, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:StarShapes.signet" , SID_DRAWTBX_CS_STAR11, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:StarShapes.doorplate" , SID_DRAWTBX_CS_STAR12, CommandGroup::INSERT ); - - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-process" , SID_DRAWTBX_CS_FLOWCHART1, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-alternate-process" , SID_DRAWTBX_CS_FLOWCHART2, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-decision" , SID_DRAWTBX_CS_FLOWCHART3, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-data" , SID_DRAWTBX_CS_FLOWCHART4, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-predefined-process" , SID_DRAWTBX_CS_FLOWCHART5, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-internal-storage" , SID_DRAWTBX_CS_FLOWCHART6, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-document" , SID_DRAWTBX_CS_FLOWCHART7, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-multidocument" , SID_DRAWTBX_CS_FLOWCHART8, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-terminator" , SID_DRAWTBX_CS_FLOWCHART9, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-preparation" , SID_DRAWTBX_CS_FLOWCHART10, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-manual-input" , SID_DRAWTBX_CS_FLOWCHART11, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-manual-operation" , SID_DRAWTBX_CS_FLOWCHART12, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-connector" , SID_DRAWTBX_CS_FLOWCHART13, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-off-page-connector" , SID_DRAWTBX_CS_FLOWCHART14, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-card" , SID_DRAWTBX_CS_FLOWCHART15, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-punched-tape" , SID_DRAWTBX_CS_FLOWCHART16, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-summing-junction" , SID_DRAWTBX_CS_FLOWCHART17, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-or" , SID_DRAWTBX_CS_FLOWCHART18, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-collate" , SID_DRAWTBX_CS_FLOWCHART19, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-sort" , SID_DRAWTBX_CS_FLOWCHART20, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-extract" , SID_DRAWTBX_CS_FLOWCHART21, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-merge" , SID_DRAWTBX_CS_FLOWCHART22, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-stored-data" , SID_DRAWTBX_CS_FLOWCHART23, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-delay" , SID_DRAWTBX_CS_FLOWCHART24, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-sequential-access" , SID_DRAWTBX_CS_FLOWCHART25, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-magnetic-disk" , SID_DRAWTBX_CS_FLOWCHART26, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-direct-access-storage",SID_DRAWTBX_CS_FLOWCHART27, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-display" , SID_DRAWTBX_CS_FLOWCHART28, CommandGroup::INSERT ); - - implDescribeSupportedFeature( ".uno:CalloutShapes.rectangular-callout" , SID_DRAWTBX_CS_CALLOUT1, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:CalloutShapes.round-rectangular-callout" , SID_DRAWTBX_CS_CALLOUT2, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:CalloutShapes.round-callout" , SID_DRAWTBX_CS_CALLOUT3, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:CalloutShapes.cloud-callout" , SID_DRAWTBX_CS_CALLOUT4, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:CalloutShapes.line-callout-1" , SID_DRAWTBX_CS_CALLOUT5, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:CalloutShapes.line-callout-2" , SID_DRAWTBX_CS_CALLOUT6, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:CalloutShapes.line-callout-3" , SID_DRAWTBX_CS_CALLOUT7, CommandGroup::INSERT ); - - implDescribeSupportedFeature( ".uno:ArrowShapes", SID_DRAWTBX_CS_ARROW, CommandGroup::INSERT ); - - implDescribeSupportedFeature( ".uno:FlowChartShapes", SID_DRAWTBX_CS_FLOWCHART, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:CalloutShapes", SID_DRAWTBX_CS_CALLOUT, CommandGroup::INSERT ); - implDescribeSupportedFeature( ".uno:StarShapes", SID_DRAWTBX_CS_STAR, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:BasicShapes", SID_DRAWTBX_CS_BASIC, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:BasicShapes.rectangle", SID_DRAWTBX_CS_BASIC1, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:BasicShapes.round-rectangle",SID_DRAWTBX_CS_BASIC2, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:BasicShapes.quadrat", SID_DRAWTBX_CS_BASIC3, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:BasicShapes.round-quadrat", SID_DRAWTBX_CS_BASIC4, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:BasicShapes.circle", SID_DRAWTBX_CS_BASIC5, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:BasicShapes.ellipse", SID_DRAWTBX_CS_BASIC6, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:BasicShapes.circle-pie", SID_DRAWTBX_CS_BASIC7, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:BasicShapes.isosceles-triangle",SID_DRAWTBX_CS_BASIC8, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:BasicShapes.right-triangle",SID_DRAWTBX_CS_BASIC9, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:BasicShapes.trapezoid", SID_DRAWTBX_CS_BASIC10, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:BasicShapes.diamond", SID_DRAWTBX_CS_BASIC11, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:BasicShapes.parallelogram", SID_DRAWTBX_CS_BASIC12, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:BasicShapes.pentagon", SID_DRAWTBX_CS_BASIC13, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:BasicShapes.hexagon", SID_DRAWTBX_CS_BASIC14, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:BasicShapes.octagon", SID_DRAWTBX_CS_BASIC15, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:BasicShapes.cross", SID_DRAWTBX_CS_BASIC16, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:BasicShapes.ring", SID_DRAWTBX_CS_BASIC17, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:BasicShapes.block-arc", SID_DRAWTBX_CS_BASIC18, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:BasicShapes.can", SID_DRAWTBX_CS_BASIC19, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:BasicShapes.cube", SID_DRAWTBX_CS_BASIC20, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:BasicShapes.paper", SID_DRAWTBX_CS_BASIC21, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:BasicShapes.frame", SID_DRAWTBX_CS_BASIC22, CommandGroup::INSERT ); + + implDescribeSupportedFeature( ".uno:SymbolShapes", SID_DRAWTBX_CS_SYMBOL, CommandGroup::INSERT ); + + implDescribeSupportedFeature( ".uno:SymbolShapes.smiley" , SID_DRAWTBX_CS_SYMBOL1, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:SymbolShapes.sun" , SID_DRAWTBX_CS_SYMBOL2, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:SymbolShapes.moon" , SID_DRAWTBX_CS_SYMBOL3, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:SymbolShapes.lightning" , SID_DRAWTBX_CS_SYMBOL4, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:SymbolShapes.heart" , SID_DRAWTBX_CS_SYMBOL5, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:SymbolShapes.flower" , SID_DRAWTBX_CS_SYMBOL6, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:SymbolShapes.cloud" , SID_DRAWTBX_CS_SYMBOL7, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:SymbolShapes.forbidden" , SID_DRAWTBX_CS_SYMBOL8, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:SymbolShapes.puzzle" , SID_DRAWTBX_CS_SYMBOL9, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:SymbolShapes.bracket-pair" ,SID_DRAWTBX_CS_SYMBOL10, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:SymbolShapes.left-bracket" ,SID_DRAWTBX_CS_SYMBOL11, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:SymbolShapes.right-bracket",SID_DRAWTBX_CS_SYMBOL12, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:SymbolShapes.brace-pair" , SID_DRAWTBX_CS_SYMBOL13, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:SymbolShapes.left-brace" , SID_DRAWTBX_CS_SYMBOL14, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:SymbolShapes.right-brace" , SID_DRAWTBX_CS_SYMBOL15, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:SymbolShapes.quad-bevel" , SID_DRAWTBX_CS_SYMBOL16, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:SymbolShapes.octagon-bevel",SID_DRAWTBX_CS_SYMBOL17, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:SymbolShapes.diamond-bevel",SID_DRAWTBX_CS_SYMBOL18, CommandGroup::INSERT ); + + implDescribeSupportedFeature( ".uno:ArrowShapes.left-arrow" , SID_DRAWTBX_CS_ARROW1, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:ArrowShapes.right-arrow" , SID_DRAWTBX_CS_ARROW2, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:ArrowShapes.up-arrow" , SID_DRAWTBX_CS_ARROW3, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:ArrowShapes.down-arrow" , SID_DRAWTBX_CS_ARROW4, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:ArrowShapes.left-right-arrow" , SID_DRAWTBX_CS_ARROW5, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:ArrowShapes.up-down-arrow" , SID_DRAWTBX_CS_ARROW6, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:ArrowShapes.up-right-arrow" , SID_DRAWTBX_CS_ARROW7, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:ArrowShapes.up-right-down-arrow" , SID_DRAWTBX_CS_ARROW8, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:ArrowShapes.quad-arrow" , SID_DRAWTBX_CS_ARROW9, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:ArrowShapes.corner-right-arrow" , SID_DRAWTBX_CS_ARROW10, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:ArrowShapes.split-arrow" , SID_DRAWTBX_CS_ARROW11, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:ArrowShapes.striped-right-arrow" , SID_DRAWTBX_CS_ARROW12, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:ArrowShapes.notched-right-arrow" , SID_DRAWTBX_CS_ARROW13, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:ArrowShapes.pentagon-right" , SID_DRAWTBX_CS_ARROW14, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:ArrowShapes.chevron" , SID_DRAWTBX_CS_ARROW15, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:ArrowShapes.right-arrow-callout" , SID_DRAWTBX_CS_ARROW16, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:ArrowShapes.left-arrow-callout" , SID_DRAWTBX_CS_ARROW17, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:ArrowShapes.up-arrow-callout" , SID_DRAWTBX_CS_ARROW18, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:ArrowShapes.down-arrow-callout" , SID_DRAWTBX_CS_ARROW19, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:ArrowShapes.left-right-arrow-callout",SID_DRAWTBX_CS_ARROW20, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:ArrowShapes.up-down-arrow-callout" ,SID_DRAWTBX_CS_ARROW21, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:ArrowShapes.up-right-arrow-callout",SID_DRAWTBX_CS_ARROW22, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:ArrowShapes.quad-arrow-callout" , SID_DRAWTBX_CS_ARROW23, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:ArrowShapes.circular-arrow" , SID_DRAWTBX_CS_ARROW24, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:ArrowShapes.split-round-arrow" , SID_DRAWTBX_CS_ARROW25, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:ArrowShapes.s-sharped-arrow" , SID_DRAWTBX_CS_ARROW26, CommandGroup::INSERT ); + + implDescribeSupportedFeature( ".uno:StarShapes.bang" , SID_DRAWTBX_CS_STAR1, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:StarShapes.star4" , SID_DRAWTBX_CS_STAR2, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:StarShapes.star5" , SID_DRAWTBX_CS_STAR3, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:StarShapes.star6" , SID_DRAWTBX_CS_STAR4, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:StarShapes.star8" , SID_DRAWTBX_CS_STAR5, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:StarShapes.star12" , SID_DRAWTBX_CS_STAR6, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:StarShapes.star24" , SID_DRAWTBX_CS_STAR7, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:StarShapes.concave-star6" , SID_DRAWTBX_CS_STAR8, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:StarShapes.vertical-scroll" , SID_DRAWTBX_CS_STAR9, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:StarShapes.horizontal-scroll" , SID_DRAWTBX_CS_STAR10, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:StarShapes.signet" , SID_DRAWTBX_CS_STAR11, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:StarShapes.doorplate" , SID_DRAWTBX_CS_STAR12, CommandGroup::INSERT ); + + implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-process" , SID_DRAWTBX_CS_FLOWCHART1, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-alternate-process" , SID_DRAWTBX_CS_FLOWCHART2, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-decision" , SID_DRAWTBX_CS_FLOWCHART3, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-data" , SID_DRAWTBX_CS_FLOWCHART4, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-predefined-process" , SID_DRAWTBX_CS_FLOWCHART5, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-internal-storage" , SID_DRAWTBX_CS_FLOWCHART6, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-document" , SID_DRAWTBX_CS_FLOWCHART7, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-multidocument" , SID_DRAWTBX_CS_FLOWCHART8, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-terminator" , SID_DRAWTBX_CS_FLOWCHART9, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-preparation" , SID_DRAWTBX_CS_FLOWCHART10, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-manual-input" , SID_DRAWTBX_CS_FLOWCHART11, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-manual-operation" , SID_DRAWTBX_CS_FLOWCHART12, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-connector" , SID_DRAWTBX_CS_FLOWCHART13, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-off-page-connector" , SID_DRAWTBX_CS_FLOWCHART14, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-card" , SID_DRAWTBX_CS_FLOWCHART15, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-punched-tape" , SID_DRAWTBX_CS_FLOWCHART16, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-summing-junction" , SID_DRAWTBX_CS_FLOWCHART17, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-or" , SID_DRAWTBX_CS_FLOWCHART18, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-collate" , SID_DRAWTBX_CS_FLOWCHART19, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-sort" , SID_DRAWTBX_CS_FLOWCHART20, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-extract" , SID_DRAWTBX_CS_FLOWCHART21, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-merge" , SID_DRAWTBX_CS_FLOWCHART22, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-stored-data" , SID_DRAWTBX_CS_FLOWCHART23, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-delay" , SID_DRAWTBX_CS_FLOWCHART24, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-sequential-access" , SID_DRAWTBX_CS_FLOWCHART25, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-magnetic-disk" , SID_DRAWTBX_CS_FLOWCHART26, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-direct-access-storage",SID_DRAWTBX_CS_FLOWCHART27, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:FlowChartShapes.flowchart-display" , SID_DRAWTBX_CS_FLOWCHART28, CommandGroup::INSERT ); + + implDescribeSupportedFeature( ".uno:CalloutShapes.rectangular-callout" , SID_DRAWTBX_CS_CALLOUT1, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:CalloutShapes.round-rectangular-callout" , SID_DRAWTBX_CS_CALLOUT2, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:CalloutShapes.round-callout" , SID_DRAWTBX_CS_CALLOUT3, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:CalloutShapes.cloud-callout" , SID_DRAWTBX_CS_CALLOUT4, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:CalloutShapes.line-callout-1" , SID_DRAWTBX_CS_CALLOUT5, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:CalloutShapes.line-callout-2" , SID_DRAWTBX_CS_CALLOUT6, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:CalloutShapes.line-callout-3" , SID_DRAWTBX_CS_CALLOUT7, CommandGroup::INSERT ); + + implDescribeSupportedFeature( ".uno:ArrowShapes", SID_DRAWTBX_CS_ARROW, CommandGroup::INSERT ); + + implDescribeSupportedFeature( ".uno:FlowChartShapes", SID_DRAWTBX_CS_FLOWCHART, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:CalloutShapes", SID_DRAWTBX_CS_CALLOUT, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:StarShapes", SID_DRAWTBX_CS_STAR, CommandGroup::INSERT ); // keys - implDescribeSupportedFeature( ".uno:Escape", SID_ESCAPE, CommandGroup::CONTROLS); + implDescribeSupportedFeature( ".uno:Escape", SID_ESCAPE, CommandGroup::CONTROLS); // internal one - implDescribeSupportedFeature( ".uno:RPT_RPTHEADER_UNDO", SID_REPORTHEADER_WITHOUT_UNDO); - implDescribeSupportedFeature( ".uno:RPT_RPTFOOTER_UNDO", SID_REPORTFOOTER_WITHOUT_UNDO); - implDescribeSupportedFeature( ".uno:RPT_PGHEADER_UNDO", SID_PAGEHEADER_WITHOUT_UNDO); - implDescribeSupportedFeature( ".uno:RPT_PGFOOTER_UNDO", SID_PAGEFOOTER_WITHOUT_UNDO); - implDescribeSupportedFeature( ".uno:DBBackgroundColor", SID_ATTR_CHAR_COLOR_BACKGROUND); - implDescribeSupportedFeature( ".uno:SID_GROUPHEADER", SID_GROUPHEADER); - implDescribeSupportedFeature( ".uno:SID_GROUPHEADER_WITHOUT_UNDO", SID_GROUPHEADER_WITHOUT_UNDO); - implDescribeSupportedFeature( ".uno:SID_GROUPFOOTER", SID_GROUPFOOTER); - implDescribeSupportedFeature( ".uno:SID_GROUPFOOTER_WITHOUT_UNDO", SID_GROUPFOOTER_WITHOUT_UNDO); - implDescribeSupportedFeature( ".uno:SID_GROUP_REMOVE", SID_GROUP_REMOVE); - implDescribeSupportedFeature( ".uno:SID_GROUP_APPEND", SID_GROUP_APPEND); - implDescribeSupportedFeature( ".uno:SID_ADD_CONTROL_PAIR", SID_ADD_CONTROL_PAIR); - implDescribeSupportedFeature( ".uno:SplitPosition", SID_SPLIT_POSITION); - implDescribeSupportedFeature( ".uno:LastPropertyBrowserPage", SID_PROPERTYBROWSER_LAST_PAGE); - implDescribeSupportedFeature( ".uno:Select", SID_SELECT); - implDescribeSupportedFeature( ".uno:InsertFunction", SID_RPT_NEW_FUNCTION); - implDescribeSupportedFeature( ".uno:NextMark", SID_NEXT_MARK); - implDescribeSupportedFeature( ".uno:PrevMark", SID_PREV_MARK); + implDescribeSupportedFeature( ".uno:RPT_RPTHEADER_UNDO", SID_REPORTHEADER_WITHOUT_UNDO); + implDescribeSupportedFeature( ".uno:RPT_RPTFOOTER_UNDO", SID_REPORTFOOTER_WITHOUT_UNDO); + implDescribeSupportedFeature( ".uno:RPT_PGHEADER_UNDO", SID_PAGEHEADER_WITHOUT_UNDO); + implDescribeSupportedFeature( ".uno:RPT_PGFOOTER_UNDO", SID_PAGEFOOTER_WITHOUT_UNDO); + implDescribeSupportedFeature( ".uno:DBBackgroundColor", SID_ATTR_CHAR_COLOR_BACKGROUND); + implDescribeSupportedFeature( ".uno:SID_GROUPHEADER", SID_GROUPHEADER); + implDescribeSupportedFeature( ".uno:SID_GROUPHEADER_WITHOUT_UNDO", SID_GROUPHEADER_WITHOUT_UNDO); + implDescribeSupportedFeature( ".uno:SID_GROUPFOOTER", SID_GROUPFOOTER); + implDescribeSupportedFeature( ".uno:SID_GROUPFOOTER_WITHOUT_UNDO", SID_GROUPFOOTER_WITHOUT_UNDO); + implDescribeSupportedFeature( ".uno:SID_GROUP_REMOVE", SID_GROUP_REMOVE); + implDescribeSupportedFeature( ".uno:SID_GROUP_APPEND", SID_GROUP_APPEND); + implDescribeSupportedFeature( ".uno:SID_ADD_CONTROL_PAIR", SID_ADD_CONTROL_PAIR); + implDescribeSupportedFeature( ".uno:SplitPosition", SID_SPLIT_POSITION); + implDescribeSupportedFeature( ".uno:LastPropertyBrowserPage", SID_PROPERTYBROWSER_LAST_PAGE); + implDescribeSupportedFeature( ".uno:Select", SID_SELECT); + implDescribeSupportedFeature( ".uno:InsertFunction", SID_RPT_NEW_FUNCTION); + implDescribeSupportedFeature( ".uno:NextMark", SID_NEXT_MARK); + implDescribeSupportedFeature( ".uno:PrevMark", SID_PREV_MARK); implDescribeSupportedFeature( ".uno:TerminateInplaceActivation", SID_TERMINATE_INPLACEACTIVATION); implDescribeSupportedFeature( ".uno:SelectAllLabels", SID_SELECT_ALL_LABELS); implDescribeSupportedFeature( ".uno:SelectAllEdits", SID_SELECT_ALL_EDITS); - implDescribeSupportedFeature( ".uno:CollapseSection", SID_COLLAPSE_SECTION); - implDescribeSupportedFeature( ".uno:ExpandSection", SID_EXPAND_SECTION); + implDescribeSupportedFeature( ".uno:CollapseSection", SID_COLLAPSE_SECTION); + implDescribeSupportedFeature( ".uno:ExpandSection", SID_EXPAND_SECTION); +} +// ----------------------------------------------------------------------------- +SfxUndoManager* OReportController::getUndoMgr() +{ + return &m_aUndoManager; } // ----------------------------------------------------------------------------- void OReportController::impl_onModifyChanged() @@ -2104,14 +2133,22 @@ void OReportController::impl_onModifyChanged() { if ( m_xReportDefinition.is() ) m_xReportDefinition->setModified( impl_isModified() ); - DBSubComponentController::impl_onModifyChanged(); + OSingleDocumentController::impl_onModifyChanged(); } - catch(const uno::Exception&) + catch(uno::Exception) { DBG_UNHANDLED_EXCEPTION(); } } // ----------------------------------------------------------------------------- +void OReportController::losingConnection( ) +{ + // let the base class do it's reconnect + OReportController_BASE::losingConnection( ); + + InvalidateAll(); +} +// ----------------------------------------------------------------------------- void OReportController::onLoadedMenu(const Reference< frame::XLayoutManager >& _xLayoutManager) { if ( _xLayoutManager.is() ) @@ -2131,7 +2168,7 @@ void OReportController::onLoadedMenu(const Reference< frame::XLayoutManager >& _ _xLayoutManager->createElement( s_sMenu[i] ); _xLayoutManager->requestElement( s_sMenu[i] ); } - } + } // if ( _xLayoutManager.is() ) } // ----------------------------------------------------------------------------- void OReportController::notifyGroupSections(const ContainerEvent& _rEvent,bool _bShow) @@ -2197,7 +2234,7 @@ void SAL_CALL OReportController::elementReplaced( const ContainerEvent& /*_rEven { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); - OSL_FAIL("Not yet implemented!"); + OSL_ENSURE(0,"Not yet implemented!"); } // ----------------------------------------------------------------------------- void SAL_CALL OReportController::propertyChange( const beans::PropertyChangeEvent& evt ) throw (RuntimeException) @@ -2212,7 +2249,7 @@ void SAL_CALL OReportController::propertyChange( const beans::PropertyChangeEven { if ( evt.PropertyName.equals( PROPERTY_REPORTHEADERON ) ) { - const sal_uInt16 nPosition = m_xReportDefinition->getPageHeaderOn() ? 1 : 0; + const USHORT nPosition = m_xReportDefinition->getPageHeaderOn() ? 1 : 0; if ( bShow ) { getDesignView()->addSection(m_xReportDefinition->getReportHeader(),DBREPORTHEADER,nPosition); @@ -2225,7 +2262,7 @@ void SAL_CALL OReportController::propertyChange( const beans::PropertyChangeEven } else if ( evt.PropertyName.equals( PROPERTY_REPORTFOOTERON ) ) { - sal_uInt16 nPosition = getDesignView()->getSectionCount(); + USHORT nPosition = getDesignView()->getSectionCount(); if ( m_xReportDefinition->getPageFooterOn() ) --nPosition; if ( bShow ) @@ -2247,7 +2284,7 @@ void SAL_CALL OReportController::propertyChange( const beans::PropertyChangeEven } else { - getDesignView()->removeSection(sal_uInt16(0)); + getDesignView()->removeSection(USHORT(0)); } } else if ( evt.PropertyName.equals( PROPERTY_PAGEFOOTERON ) ) @@ -2277,7 +2314,7 @@ void SAL_CALL OReportController::propertyChange( const beans::PropertyChangeEven /// TODO: check what we need to notify here TitleHelper /*else if ( evt.PropertyName.equals( PROPERTY_CAPTION ) ) updateTitle();*/ - } + } // if ( evt.Source == m_xReportDefinition ) else { uno::Reference< report::XGroup> xGroup(evt.Source,uno::UNO_QUERY); @@ -2298,17 +2335,16 @@ void SAL_CALL OReportController::propertyChange( const beans::PropertyChangeEven // ----------------------------------------------------------------------------- void SAL_CALL OReportController::disposing( const lang::EventObject& Source ) throw(uno::RuntimeException) { - // simply disambiguate OReportController_BASE::disposing(Source); } // ----------------------------------------------------------------------------- -sal_uInt16 lcl_getNonVisbleGroupsBefore( const uno::Reference< report::XGroups>& _xGroups +USHORT lcl_getNonVisbleGroupsBefore( const uno::Reference< report::XGroups>& _xGroups ,sal_Int32 _nGroupPos ,::std::mem_fun_t<sal_Bool,OGroupHelper>&_pGroupMemberFunction) { uno::Reference< report::XGroup> xGroup; - sal_uInt16 nNonVisibleGroups = 0; + USHORT nNonVisibleGroups = 0; sal_Int32 nCount = _xGroups->getCount(); for( sal_Int32 i = 0; i < _nGroupPos && i < nCount; ++i) { @@ -2323,15 +2359,16 @@ sal_uInt16 lcl_getNonVisbleGroupsBefore( const uno::Reference< report::XGroups>& // ----------------------------------------------------------------------------- void OReportController::groupChange( const uno::Reference< report::XGroup>& _xGroup,const ::rtl::OUString& _sPropName,sal_Int32 _nGroupPos,bool _bShow) { + //adjustSectionName(_xGroup,_nGroupPos); ::std::mem_fun_t<sal_Bool,OGroupHelper> pMemFun = ::std::mem_fun(&OGroupHelper::getHeaderOn); ::std::mem_fun_t<uno::Reference<report::XSection> , OGroupHelper> pMemFunSection = ::std::mem_fun(&OGroupHelper::getHeader); ::rtl::OUString sColor(DBGROUPHEADER); - sal_uInt16 nPosition = 0; + USHORT nPosition = 0; bool bHandle = false; if ( _sPropName.equals( PROPERTY_HEADERON ) ) { nPosition = m_xReportDefinition->getPageHeaderOn() ? (m_xReportDefinition->getReportHeaderOn() ? 2 : 1) : (m_xReportDefinition->getReportHeaderOn() ? 1 : 0); - nPosition += (static_cast<sal_uInt16>(_nGroupPos) - lcl_getNonVisbleGroupsBefore(m_xReportDefinition->getGroups(),_nGroupPos,pMemFun)); + nPosition += (static_cast<USHORT>(_nGroupPos) - lcl_getNonVisbleGroupsBefore(m_xReportDefinition->getGroups(),_nGroupPos,pMemFun)); bHandle = true; } else if ( _sPropName.equals( PROPERTY_FOOTERON ) ) @@ -2345,7 +2382,7 @@ void OReportController::groupChange( const uno::Reference< report::XGroup>& _xGr if ( m_xReportDefinition->getReportFooterOn() ) --nPosition; sColor = DBGROUPFOOTER; - nPosition -= (static_cast<sal_uInt16>(_nGroupPos) - lcl_getNonVisbleGroupsBefore(m_xReportDefinition->getGroups(),_nGroupPos,pMemFun)); + nPosition -= (static_cast<USHORT>(_nGroupPos) - lcl_getNonVisbleGroupsBefore(m_xReportDefinition->getGroups(),_nGroupPos,pMemFun)); if ( !_bShow ) --nPosition; bHandle = true; @@ -2369,6 +2406,13 @@ IMPL_LINK( OReportController, OnClipboardChanged, void*, EMPTYARG ) return OnInvalidateClipboard( NULL ); } //------------------------------------------------------------------------------ +IMPL_LINK( OReportController, NotifyUndoActionHdl, SfxUndoAction*, _pUndoAction ) +{ + OSL_ENSURE(_pUndoAction,"UndoAction is NULL!"); + addUndoActionAndInvalidate(_pUndoAction); + return 0L; +} +//------------------------------------------------------------------------------ IMPL_LINK(OReportController, OnInvalidateClipboard, void*, EMPTYARG) { InvalidateFeature(SID_CUT); @@ -2385,16 +2429,16 @@ void OReportController::openPageDialog(const uno::Reference<report::XSection>& _ // UNO->ItemSet static SfxItemInfo aItemInfos[] = { - { SID_ATTR_LRSPACE, SFX_ITEM_POOLABLE }, - { SID_ATTR_ULSPACE, SFX_ITEM_POOLABLE }, - { SID_ATTR_PAGE, SFX_ITEM_POOLABLE }, - { SID_ATTR_PAGE_SIZE, SFX_ITEM_POOLABLE }, - { SID_ENUM_PAGE_MODE, SFX_ITEM_POOLABLE }, - { SID_PAPER_START, SFX_ITEM_POOLABLE }, - { SID_PAPER_END, SFX_ITEM_POOLABLE }, - { SID_ATTR_BRUSH, SFX_ITEM_POOLABLE }, - { SID_FLAG_TYPE, SFX_ITEM_POOLABLE }, - { SID_ATTR_METRIC, SFX_ITEM_POOLABLE } + { SID_ATTR_LRSPACE, SFX_ITEM_POOLABLE }, + { SID_ATTR_ULSPACE, SFX_ITEM_POOLABLE }, + { SID_ATTR_PAGE, SFX_ITEM_POOLABLE }, + { SID_ATTR_PAGE_SIZE, SFX_ITEM_POOLABLE }, + { SID_ENUM_PAGE_MODE, SFX_ITEM_POOLABLE }, + { SID_PAPER_START, SFX_ITEM_POOLABLE }, + { SID_PAPER_END, SFX_ITEM_POOLABLE }, + { SID_ATTR_BRUSH, SFX_ITEM_POOLABLE }, + { SID_FLAG_TYPE, SFX_ITEM_POOLABLE }, + { SID_ATTR_METRIC, SFX_ITEM_POOLABLE } }; MeasurementSystem eSystem = SvtSysLocale().GetLocaleData().getMeasurementSystemEnum(); @@ -2409,18 +2453,18 @@ void OReportController::openPageDialog(const uno::Reference<report::XSection>& _ new SfxAllEnumItem(RPTUI_ID_START,PAPER_A4), new SfxAllEnumItem(RPTUI_ID_END,PAPER_E), new SvxBrushItem(ITEMID_BRUSH), - new SfxUInt16Item(RPTUI_ID_METRIC,static_cast<sal_uInt16>(eUserMetric)) + new SfxUInt16Item(RPTUI_ID_METRIC,static_cast<UINT16>(eUserMetric)) }; - static sal_uInt16 pRanges[] = + static USHORT pRanges[] = { RPTUI_ID_LRSPACE,RPTUI_ID_BRUSH, SID_ATTR_METRIC,SID_ATTR_METRIC, 0 }; SfxItemPool* pPool( new SfxItemPool(String::CreateFromAscii("ReportPageProperties"), RPTUI_ID_LRSPACE,RPTUI_ID_METRIC, aItemInfos, pDefaults) ); - pPool->SetDefaultMetric( SFX_MAPUNIT_100TH_MM ); // ripped, don't understand why - pPool->FreezeIdRanges(); // the same + pPool->SetDefaultMetric( SFX_MAPUNIT_100TH_MM ); // ripped, don't understand why + pPool->FreezeIdRanges(); // the same try { @@ -2433,9 +2477,9 @@ void OReportController::openPageDialog(const uno::Reference<report::XSection>& _ pDescriptor->Put(SvxSizeItem(RPTUI_ID_SIZE,VCLSize(getStyleProperty<awt::Size>(m_xReportDefinition,PROPERTY_PAPERSIZE)))); pDescriptor->Put(SvxLRSpaceItem(getStyleProperty<sal_Int32>(m_xReportDefinition,PROPERTY_LEFTMARGIN) ,getStyleProperty<sal_Int32>(m_xReportDefinition,PROPERTY_RIGHTMARGIN),0,0,RPTUI_ID_LRSPACE)); - pDescriptor->Put(SvxULSpaceItem(static_cast<sal_uInt16>(getStyleProperty<sal_Int32>(m_xReportDefinition,PROPERTY_TOPMARGIN)) - ,static_cast<sal_uInt16>(getStyleProperty<sal_Int32>(m_xReportDefinition,PROPERTY_BOTTOMMARGIN)),RPTUI_ID_ULSPACE)); - pDescriptor->Put(SfxUInt16Item(SID_ATTR_METRIC,static_cast<sal_uInt16>(eUserMetric))); + pDescriptor->Put(SvxULSpaceItem(static_cast<USHORT>(getStyleProperty<sal_Int32>(m_xReportDefinition,PROPERTY_TOPMARGIN)) + ,static_cast<USHORT>(getStyleProperty<sal_Int32>(m_xReportDefinition,PROPERTY_BOTTOMMARGIN)),RPTUI_ID_ULSPACE)); + pDescriptor->Put(SfxUInt16Item(SID_ATTR_METRIC,static_cast<UINT16>(eUserMetric))); uno::Reference< style::XStyle> xPageStyle(getUsedStyle(m_xReportDefinition)); if ( xPageStyle.is() ) @@ -2451,7 +2495,7 @@ void OReportController::openPageDialog(const uno::Reference<report::XSection>& _ } } - { // want the dialog to be destroyed before our set + { // want the dialog to be destroyed before our set ORptPageDialog aDlg(getView(), pDescriptor.get(),_xSection.is() ? RID_PAGEDIALOG_BACKGROUND : RID_PAGEDIALOG_PAGE); if (RET_OK == aDlg.Execute()) { @@ -2469,10 +2513,11 @@ void OReportController::openPageDialog(const uno::Reference<report::XSection>& _ { uno::Reference< beans::XPropertySet> xProp(getUsedStyle(m_xReportDefinition),uno::UNO_QUERY_THROW); const String sUndoAction(ModuleRes(RID_STR_UNDO_CHANGEPAGE)); - UndoContext aUndoContext( getUndoManager(), sUndoAction ); + UndoManagerListAction aListAction(m_aUndoManager,sUndoAction); const SfxPoolItem* pItem = NULL; if ( SFX_ITEM_SET == pSet->GetItemState( RPTUI_ID_SIZE,sal_True,&pItem)) { + const Size aPaperSize = static_cast<const SvxSizeItem*>(pItem)->GetSize(); uno::Any aValue; static_cast<const SvxSizeItem*>(pItem)->QueryValue(aValue,MID_SIZE_SIZE); xProp->setPropertyValue(PROPERTY_PAPERSIZE,aValue); @@ -2509,7 +2554,7 @@ void OReportController::openPageDialog(const uno::Reference<report::XSection>& _ } } } - catch(const Exception&) + catch(Exception&) { DBG_UNHANDLED_EXCEPTION(); } @@ -2519,24 +2564,13 @@ void OReportController::openPageDialog(const uno::Reference<report::XSection>& _ delete pDefaults[i]; } - // ----------------------------------------------------------------------------- sal_Bool SAL_CALL OReportController::attachModel(const uno::Reference< frame::XModel > & xModel) throw( uno::RuntimeException ) { ::osl::MutexGuard aGuard( getMutex() ); - - uno::Reference< report::XReportDefinition > xReportDefinition( xModel, UNO_QUERY ); - if ( !xReportDefinition.is() ) - return sal_False; - - uno::Reference< document::XUndoManagerSupplier > xTestSuppUndo( xModel, UNO_QUERY ); - if ( !xTestSuppUndo.is() ) - return sal_False; - - m_xReportDefinition = xReportDefinition; - return sal_True; + m_xReportDefinition.set(xModel,uno::UNO_QUERY); + return m_xReportDefinition.is(); } - // ----------------------------------------------------------------------------- void OReportController::openSortingAndGroupingDialog() { @@ -2590,19 +2624,19 @@ void OReportController::Notify(SfxBroadcaster & /* _rBc */, SfxHint const & _rHi } } // ----------------------------------------------------------------------------- -void OReportController::executeMethodWithUndo(sal_uInt16 _nUndoStrId,const ::std::mem_fun_t<void,ODesignView>& _pMemfun) +void OReportController::executeMethodWithUndo(USHORT _nUndoStrId,const ::std::mem_fun_t<void,ODesignView>& _pMemfun) { const String sUndoAction = String((ModuleRes(_nUndoStrId))); - UndoContext aUndoContext( getUndoManager(), sUndoAction ); + UndoManagerListAction aListAction(m_aUndoManager,sUndoAction); _pMemfun( getDesignView() ); InvalidateFeature( SID_SAVEDOC ); InvalidateFeature( SID_UNDO ); } // ----------------------------------------------------------------------------- -void OReportController::alignControlsWithUndo(sal_uInt16 _nUndoStrId,sal_Int32 _nControlModification,bool _bAlignAtSection) +void OReportController::alignControlsWithUndo(USHORT _nUndoStrId,sal_Int32 _nControlModification,bool _bAlignAtSection) { const String sUndoAction = String((ModuleRes(_nUndoStrId))); - UndoContext aUndoContext( getUndoManager(), sUndoAction ); + UndoManagerListAction aListAction(m_aUndoManager,sUndoAction); getDesignView()->alignMarkedObjects(_nControlModification,_bAlignAtSection); InvalidateFeature( SID_SAVEDOC ); InvalidateFeature( SID_UNDO ); @@ -2617,6 +2651,7 @@ void OReportController::shrinkSectionBottom(uno::Reference<report::XSection> _xS return; } const sal_Int32 nSectionHeight = _xSection->getHeight(); + // sal_Int32 nMinPositionY = nSectionHeight; sal_Int32 nMaxPositionY = 0; uno::Reference< report::XReportComponent> xReportComponent; @@ -2627,6 +2662,7 @@ void OReportController::shrinkSectionBottom(uno::Reference<report::XSection> _xS const sal_Int32 nReportComponentPositionY = xReportComponent->getPositionY(); const sal_Int32 nReportComponentHeight = xReportComponent->getHeight(); const sal_Int32 nReportComponentPositionYAndHeight = nReportComponentPositionY + nReportComponentHeight; + // nMinPositionY = std::min(nReportComponentPositionY, nMinPositionY); nMaxPositionY = std::max(nReportComponentPositionYAndHeight, nMaxPositionY); } // now we know the minimal Y-Position and maximal Y-Position @@ -2650,6 +2686,7 @@ void OReportController::shrinkSectionTop(uno::Reference<report::XSection> _xSect const sal_Int32 nSectionHeight = _xSection->getHeight(); sal_Int32 nMinPositionY = nSectionHeight; + // sal_Int32 nMaxPositionY = 0; uno::Reference< report::XReportComponent> xReportComponent; // for every component get it's Y-position and compare it to the current Y-position @@ -2657,7 +2694,10 @@ void OReportController::shrinkSectionTop(uno::Reference<report::XSection> _xSect { xReportComponent.set(_xSection->getByIndex(i), uno::UNO_QUERY); const sal_Int32 nReportComponentPositionY = xReportComponent->getPositionY(); + // const sal_Int32 nReportComponentHeight = xReportComponent->getHeight(); + // const sal_Int32 nReportComponentPositionYAndHeight = nReportComponentPositionY + nReportComponentHeight; nMinPositionY = std::min(nReportComponentPositionY, nMinPositionY); + // nMaxPositionY = std::max(nReportComponentPositionYAndHeight, nMaxPositionY); } // now we know the minimal Y-Position and maximal Y-Position if (nMinPositionY == 0) @@ -2676,12 +2716,12 @@ void OReportController::shrinkSectionTop(uno::Reference<report::XSection> _xSect _xSection->setHeight(nNewSectionHeight); } -void OReportController::shrinkSection(sal_uInt16 _nUndoStrId, uno::Reference<report::XSection> _xSection, sal_Int32 _nSid) +void OReportController::shrinkSection(USHORT _nUndoStrId, uno::Reference<report::XSection> _xSection, sal_Int32 _nSid) { if ( _xSection.is() ) { const String sUndoAction = String((ModuleRes(_nUndoStrId))); - UndoContext aUndoContext( getUndoManager(), sUndoAction ); + UndoManagerListAction aListAction(m_aUndoManager,sUndoAction); if (_nSid == SID_SECTION_SHRINK) { @@ -2706,38 +2746,35 @@ void OReportController::shrinkSection(sal_uInt16 _nUndoStrId, uno::Reference<rep uno::Any SAL_CALL OReportController::getViewData(void) throw( uno::RuntimeException ) { ::osl::MutexGuard aGuard( getMutex() ); - - sal_Int32 nCommandIDs[] = + typedef ::std::pair< ::rtl::OUString,sal_uInt16> TStringIntPair; + const TStringIntPair pViewDataList[] = { - SID_GRID_VISIBLE, - SID_GRID_USE, - SID_HELPLINES_MOVE, - SID_RULER, - SID_SHOW_PROPERTYBROWSER, - SID_PROPERTYBROWSER_LAST_PAGE, - SID_SPLIT_POSITION + TStringIntPair(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GridVisible")), SID_GRID_VISIBLE) + ,TStringIntPair(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GridUse")), SID_GRID_USE) + ,TStringIntPair(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HelplinesMove")), SID_HELPLINES_MOVE) + ,TStringIntPair(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowRuler")), SID_RULER) + ,TStringIntPair(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ControlProperties")), SID_SHOW_PROPERTYBROWSER) + ,TStringIntPair(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LastPropertyBrowserPage")),SID_PROPERTYBROWSER_LAST_PAGE) + ,TStringIntPair(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SplitPosition")), SID_SPLIT_POSITION) }; - ::comphelper::NamedValueCollection aCommandProperties; - for ( size_t i=0; i < SAL_N_ELEMENTS(nCommandIDs); ++i ) + uno::Sequence<beans::PropertyValue> aCommandProps(SAL_N_ELEMENTS(pViewDataList)); + beans::PropertyValue* pIter = aCommandProps.getArray(); + beans::PropertyValue* pEnd = pIter + aCommandProps.getLength(); + for (sal_Int32 i = 0; pIter != pEnd; ++pIter,++i) { - const FeatureState aFeatureState = GetState( nCommandIDs[i] ); - - ::rtl::OUString sCommandURL( getURLForId( nCommandIDs[i] ).Main ); - OSL_ENSURE( sCommandURL.indexOfAsciiL( ".uno:", 5 ) == 0, "OReportController::getViewData: illegal command URL!" ); - sCommandURL = sCommandURL.copy( 5 ); - - Any aCommandState; + FeatureState aFeatureState = GetState(pViewDataList[i].second); + pIter->Name = pViewDataList[i].first; if ( !!aFeatureState.bChecked ) - aCommandState <<= (*aFeatureState.bChecked) ? sal_True : sal_False; + pIter->Value <<= (*aFeatureState.bChecked) ? sal_True : sal_False; else if ( aFeatureState.aValue.hasValue() ) - aCommandState = aFeatureState.aValue; + pIter->Value = aFeatureState.aValue; - aCommandProperties.put( sCommandURL, aCommandState ); - } + } // for (; pIter != pEnd; ++pIter) - ::comphelper::NamedValueCollection aViewData; - aViewData.put( "CommandProperties", aCommandProperties.getPropertyValues() ); + uno::Sequence<beans::PropertyValue> aProps(1); + aProps[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CommandProperties")); + aProps[0].Value <<= aCommandProps; if ( getDesignView() ) { @@ -2754,83 +2791,68 @@ uno::Any SAL_CALL OReportController::getViewData(void) throw( uno::RuntimeExcept pCollapsedIter->Name = PROPERTY_SECTION + ::rtl::OUString::valueOf(i); pCollapsedIter->Value <<= static_cast<sal_Int32>(*aIter); } - - aViewData.put( "CollapsedSections", aCollapsedSections ); + const sal_Int32 nCount = aProps.getLength(); + aProps.realloc( nCount + 1 ); + aProps[nCount].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CollapsedSections")); + aProps[nCount].Value <<= aCollapsedSections; } ::boost::shared_ptr<OSectionWindow> pSectionWindow = getDesignView()->getMarkedSection(); if ( pSectionWindow.get() ) { - aViewData.put( "MarkedSection", (sal_Int32)pSectionWindow->getReportSection().getPage()->GetPageNum() ); - } - } - - aViewData.put( "ZoomFactor", m_nZoomValue ); - return uno::makeAny( aViewData.getPropertyValues() ); + const sal_Int32 nCount = aProps.getLength(); + aProps.realloc( nCount + 1 ); + aProps[nCount].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MarkedSection")); + aProps[nCount].Value <<= (sal_Int32)pSectionWindow->getReportSection().getPage()->GetPageNum(); + } // if ( pSectionWindow.get() ) + } // if ( getDesignView() ) + const sal_Int32 nCount = aProps.getLength(); + aProps.realloc( nCount + 1 ); + aProps[nCount].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ZoomFactor")); + aProps[nCount].Value <<= m_nZoomValue; + return uno::makeAny(aProps); } // ----------------------------------------------------------------------------- -void SAL_CALL OReportController::restoreViewData(const uno::Any& i_data) throw( uno::RuntimeException ) +void SAL_CALL OReportController::restoreViewData(const uno::Any& Data) throw( uno::RuntimeException ) { ::osl::MutexGuard aGuard( getMutex() ); - - try + uno::Sequence<beans::PropertyValue> aProps; + if ( Data >>= aProps ) { - const ::comphelper::NamedValueCollection aViewData( i_data ); - - m_aCollapsedSections = aViewData.getOrDefault( "CollapsedSections", m_aCollapsedSections ); - m_nPageNum = aViewData.getOrDefault( "MarkedSection", m_nPageNum ); - m_nZoomValue = aViewData.getOrDefault( "ZoomFactor", m_nZoomValue ); - // TODO: setting those 3 members is not enough - in theory, restoreViewData can be called when the - // view is fully alive, so we need to reflect those 3 values in the view. - // (At the moment, the method is called only during construction phase) - - - ::comphelper::NamedValueCollection aCommandProperties( aViewData.get( "CommandProperties" ) ); - const ::std::vector< ::rtl::OUString > aCommandNames( aCommandProperties.getNames() ); - - for ( ::std::vector< ::rtl::OUString >::const_iterator commandName = aCommandNames.begin(); - commandName != aCommandNames.end(); - ++commandName - ) + const beans::PropertyValue* pPropsIter = aProps.getConstArray(); + const beans::PropertyValue* pPropsEnd = pPropsIter + aProps.getLength(); + for (sal_Int32 i = 0; pPropsIter != pPropsEnd; ++pPropsIter,++i) { - const Any& rCommandValue = aCommandProperties.get( *commandName ); - if ( !rCommandValue.hasValue() ) - continue; - - if ( getView() ) + if ( pPropsIter->Name.equalsAscii("CommandProperties") ) { util::URL aCommand; - aCommand.Complete = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:" ) ) + *commandName; - - Sequence< PropertyValue > aCommandArgs(1); - aCommandArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Value" ) ); - aCommandArgs[0].Value = rCommandValue; - - executeUnChecked( aCommand, aCommandArgs ); - } - else - { - if ( commandName->equalsAscii( "ShowRuler" ) ) - OSL_VERIFY( rCommandValue >>= m_bShowRuler ); - else if ( commandName->equalsAscii( "HelplinesMove" ) ) - OSL_VERIFY( rCommandValue >>= m_bHelplinesMove ); - else if ( commandName->equalsAscii( "GridVisible" ) ) - OSL_VERIFY( rCommandValue >>= m_bGridVisible ); - else if ( commandName->equalsAscii( "GridUse" ) ) - OSL_VERIFY( rCommandValue >>= m_bGridUse ); - else if ( commandName->equalsAscii( "ControlProperties" ) ) - OSL_VERIFY( rCommandValue >>= m_bShowProperties ); - else if ( commandName->equalsAscii( "LastPropertyBrowserPage" ) ) - OSL_VERIFY( rCommandValue >>= m_sLastActivePage ); - else if ( commandName->equalsAscii( "SplitPosition" ) ) - OSL_VERIFY( rCommandValue >>= m_nSplitPos ); + uno::Sequence< beans::PropertyValue> aArgs(1); + beans::PropertyValue* pArg = aArgs.getArray(); + pArg->Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Value")); + uno::Sequence< beans::PropertyValue> aCommandProps; + if ( pPropsIter->Value >>= aCommandProps ) + { + const beans::PropertyValue* pIter = aCommandProps.getConstArray(); + const beans::PropertyValue* pEnd = pIter + aCommandProps.getLength(); + for (; pIter != pEnd; ++pIter) + { + pArg->Value = pIter->Value; + if ( pArg->Value.hasValue() ) + { + aCommand.Complete = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:")) + pIter->Name; + executeUnChecked(aCommand,aArgs); + } + } + } } + else if ( pPropsIter->Name.equalsAscii("CollapsedSections") ) + pPropsIter->Value >>= m_aCollapsedSections; + else if ( pPropsIter->Name.equalsAscii("MarkedSection") ) + pPropsIter->Value >>= m_nPageNum; + else if ( pPropsIter->Name.equalsAscii("ZoomFactor") ) + pPropsIter->Value >>= m_nZoomValue; } } - catch(const IllegalArgumentException&) - { - DBG_UNHANDLED_EXCEPTION(); - } } // ----------------------------------------------------------------------------- void OReportController::updateFloater() @@ -2919,7 +2941,7 @@ uno::Reference<frame::XModel> OReportController::executeReport() Reference<XFrame> xFrame = getXFrame(); xModel = m_xReportEngine->createDocumentAlive(xFrame); } - catch(const sdbc::SQLException&) + catch( const sdbc::SQLException& /*e*/ ) { // SQLExceptions and derived exceptions must not be translated aInfo = ::cppu::getCaughtException(); } @@ -2957,7 +2979,7 @@ uno::Reference<frame::XModel> OReportController::executeReport() { const String suSQLContext = String( ModuleRes( RID_STR_COULD_NOT_CREATE_REPORT ) ); aInfo.prepend(suSQLContext); - } + } // if (aInfo.isValid()) m_bInGeneratePreview = false; } @@ -3000,7 +3022,7 @@ uno::Reference< sdbc::XRowSet > OReportController::getRowSet() m_xRowSetMediator = new OPropertyMediator( m_xReportDefinition.get(), xRowSetProp, aPropertyMediation ); m_xRowSet = xRowSet; } - catch(const uno::Exception&) + catch( const uno::Exception& ) { DBG_UNHANDLED_EXCEPTION(); } @@ -3035,14 +3057,23 @@ void OReportController::insertGraphic() createControl(aArgs,xSection,::rtl::OUString(),OBJ_DLG_IMAGECONTROL); } } - catch(const Exception&) + catch(Exception&) { DBG_UNHANDLED_EXCEPTION(); } } // ----------------------------------------------------------------------------- -::boost::shared_ptr<rptui::OReportModel> OReportController::getSdrModel() const +::boost::shared_ptr<rptui::OReportModel> OReportController::getSdrModel() { + if ( !m_aReportModel ) + { + m_aReportModel = reportdesign::OReportDefinition::getSdrModel(m_xReportDefinition); + if ( m_aReportModel ) + { + m_aReportModel->attachController( *this ); + m_aReportModel->SetNotifyUndoActionHdl(LINK( this, OReportController, NotifyUndoActionHdl )); + } + } return m_aReportModel; } // ----------------------------------------------------------------------------- @@ -3121,6 +3152,7 @@ void OReportController::createNewFunction(const uno::Any& _aValue) // ----------------------------------------------------------------------------- IMPL_LINK( OReportController, OnExecuteReport, void* ,/*_pMemfun*/) { + //m_nExecuteReportEvent = 0; executeReport(); return 0L; } @@ -3153,7 +3185,7 @@ void OReportController::createControl(const Sequence< PropertyValue >& _aArgs,co sCustomShapeType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("diamond")); pSectionWindow->getReportSection().createDefault(sCustomShapeType,pNewControl); pNewControl->SetLogicRect(Rectangle(3000,500,6000,3500)); // switch height and width - } + } // if ( _nObjectId == OBJ_CUSTOMSHAPE ) else if ( _nObjectId == OBJ_OLE2 || OBJ_DLG_SUBREPORT == _nObjectId ) { pNewControl = SdrObjFactory::MakeNewObject( ReportInventor, _nObjectId, pSectionWindow->getReportSection().getPage(),m_aReportModel.get() ); @@ -3197,7 +3229,7 @@ void OReportController::createControl(const Sequence< PropertyValue >& _aArgs,co { if ( xInfo->hasPropertyByName(sProps[i]) && xShapeInfo->hasPropertyByName(sProps[i]) ) xUnoProp->setPropertyValue(sProps[i],xShapeProp->getPropertyValue(sProps[i])); - } + } // for(size_t i = 0; i < SAL_N_ELEMENTS(sProps);++i) if ( xInfo->hasPropertyByName(PROPERTY_BORDER) && xShapeInfo->hasPropertyByName(PROPERTY_CONTROLBORDER) ) xUnoProp->setPropertyValue(PROPERTY_BORDER,xShapeProp->getPropertyValue(PROPERTY_CONTROLBORDER)); @@ -3245,7 +3277,7 @@ void OReportController::createDateTime(const Sequence< PropertyValue >& _aArgs) getDesignView()->unmarkAllObjects(NULL); const String sUndoAction(ModuleRes(RID_STR_UNDO_INSERT_CONTROL)); - UndoContext aUndoContext( getUndoManager(), sUndoAction ); + UndoManagerListAction aListAction(m_aUndoManager,sUndoAction); SequenceAsHashMap aMap(_aArgs); aMap.createItemIfMissing(PROPERTY_FORMATKEY,aMap.getUnpackedValueOrDefault(PROPERTY_FORMATKEYDATE,sal_Int32(0))); @@ -3273,13 +3305,13 @@ void OReportController::createPageNumber(const Sequence< PropertyValue >& _aArgs getDesignView()->unmarkAllObjects(NULL); const String sUndoAction(ModuleRes(RID_STR_UNDO_INSERT_CONTROL)); - UndoContext aUndoContext( getUndoManager(), sUndoAction ); + UndoManagerListAction aListAction(m_aUndoManager,sUndoAction); if ( !m_xReportDefinition->getPageHeaderOn() ) { uno::Sequence< beans::PropertyValue > aArgs; executeChecked(SID_PAGEHEADERFOOTER,aArgs); - } + } // if ( !m_xHoldAlive->getPageHeaderOn() ) SequenceAsHashMap aMap(_aArgs); sal_Bool bStateOfPage = aMap.getUnpackedValueOrDefault(PROPERTY_STATE,sal_False); @@ -3317,7 +3349,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs) } uno::Reference<report::XSection> xCurrentSection = getDesignView()->getCurrentSection(); - UndoContext aUndoContext( getUndoManager(), String( ModuleRes( RID_STR_UNDO_INSERT_CONTROL ) ) ); + UndoManagerListAction aUndo( *getUndoMgr(), String( ModuleRes( RID_STR_UNDO_INSERT_CONTROL ) ) ); try { @@ -3348,6 +3380,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs) // LLA: new feature, add the Label in dependency of the given DND_ACTION one section up, normal or one section down sal_Int8 nDNDAction = aMap.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DNDAction")), sal_Int8(0)); pSectionWindow[1] = pSectionWindow[0]; + // ::boost::shared_ptr<OReportSection> pReportSectionPost; sal_Bool bLabelAboveTextField = nDNDAction == DND_ACTION_COPY; if ( bLabelAboveTextField || nDNDAction == DND_ACTION_LINK ) { @@ -3381,7 +3414,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs) { xReportDefinition->setCommand(sCommand); xReportDefinition->setCommandType(nCommandType); - } + } // if ( !xReportDefinition->getCommand().getLength() ) xColumns = dbtools::getFieldsByCommandDescriptor(xConnection,nCommandType,sCommand,xHoldAlive); if ( xColumns.is() && xColumns->hasByName(sColumnName) ) @@ -3405,7 +3438,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs) // definition is bound to - which is not supported for the parameters case, since we // can retrieve parameters from the RowSet only. } - catch(const Exception&) + catch( const Exception& ) { DBG_UNHANDLED_EXCEPTION(); } @@ -3457,6 +3490,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs) SdrUnoObj* pControl[2]; pControl[0] = NULL; pControl[1] = NULL; + //getDesignView()->GetModel()->GetUndoEnv().Lock(); const sal_Int32 nRightMargin = getStyleProperty<sal_Int32>(m_xReportDefinition,PROPERTY_RIGHTMARGIN); const sal_Int32 nPaperWidth = getStyleProperty<awt::Size>(m_xReportDefinition,PROPERTY_PAPERSIZE).Width - nRightMargin; OSectionView* pSectionViews[2]; @@ -3468,6 +3502,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs) ,xField,xNumberFormats,nOBJID,::rtl::OUString(),ReportInventor,OBJ_DLG_FIXEDTEXT, pSectionWindow[1]->getReportSection().getPage(),pSectionWindow[0]->getReportSection().getPage(),m_aReportModel.get(), pControl[0],pControl[1]); + //getDesignView()->GetModel()->GetUndoEnv().UnLock(); if ( pControl[0] && pControl[1] ) { SdrPageView* pPgViews[2]; @@ -3507,12 +3542,15 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs) ReportFormula aFormula( ReportFormula::Field, sName ); xUnoProp->setPropertyValue( PROPERTY_DATAFIELD, uno::makeAny( aFormula.getCompleteFormula() ) ); - } + } // if ( xInfo->hasPropertyByName(PROPERTY_DATAFIELD) ) if ( xInfo->hasPropertyByName(PROPERTY_BORDER) && xShapeInfo->hasPropertyByName(PROPERTY_CONTROLBORDER) ) xUnoProp->setPropertyValue(PROPERTY_BORDER,xShapeProp->getPropertyValue(PROPERTY_CONTROLBORDER)); pObjs[i]->CreateMediator(sal_True); + // need SectionView from the above or follow Section + // (getMarkedSection) returns the current Section + //pSectionViews[i]->InsertObjectAtView(pControl[i],*pPgViews[i],SDRINSERT_ADDMARK); const sal_Int32 nShapeWidth = xShapeProp->getWidth(); const bool bChangedPos = (aPos.X + nShapeWidth) > nPaperWidth; @@ -3530,6 +3568,8 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs) if (pSectionViews[0] != pSectionViews[1] && nOBJID == OBJ_DLG_FORMATTEDFIELD) // we want this nice feature only at FORMATTEDFIELD { + // we have two different Views, so set the position x new. + // pSectionViews[1].position.x = pSectionViews[0].position.x uno::Reference< report::XReportComponent> xShapePropLabel(pObjs[0]->getUnoShape(),uno::UNO_QUERY_THROW); uno::Reference< report::XReportComponent> xShapePropTextField(pObjs[1]->getUnoShape(),uno::UNO_QUERY_THROW); if ( sLabel.getLength() ) @@ -3554,7 +3594,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs) OUnoObject* pObj = dynamic_cast<OUnoObject*>(pControl[0]); uno::Reference< report::XFixedText> xShapeProp(pObj->getUnoShape(),uno::UNO_QUERY_THROW); xShapeProp->setName(xShapeProp->getName() + sDefaultName ); - + for(i = 0; i < SAL_N_ELEMENTS(pControl);++i) // insert controls { correctOverlapping(pControl[i],pSectionWindow[1-i]->getReportSection()); @@ -3599,6 +3639,11 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs) xTextfield->setPositionY(aTextfield.Top()); } } + // this should never happen. + // else + // { + // DBG_ERROR("unhandled case."); + // } } } } @@ -3609,7 +3654,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs) } } } - catch(const Exception&) + catch( const Exception& ) { DBG_UNHANDLED_EXCEPTION(); } @@ -3672,7 +3717,7 @@ void OReportController::listen(const bool _bAdd) uno::Reference< XPropertyChangeListener > xUndo = &rUndoEnv; uno::Sequence< beans::Property> aSeq = m_xReportDefinition->getPropertySetInfo()->getProperties(); const beans::Property* pIter = aSeq.getConstArray(); - const beans::Property* pEnd = pIter + aSeq.getLength(); + const beans::Property* pEnd = pIter + aSeq.getLength(); const ::rtl::OUString* pPropsBegin = &aProps[0]; const ::rtl::OUString* pPropsEnd = pPropsBegin + (SAL_N_ELEMENTS(aProps)) - 3; for(;pIter != pEnd;++pIter) @@ -3690,6 +3735,11 @@ void OReportController::listen(const bool _bAdd) // Add Listeners to ReportControllerObserver OXReportControllerObserver& rObserver = *m_pReportControllerObserver; + // void (OXReportControllerObserver::*pObserverFunction)( const uno::Reference< uno::XInterface >& ) = + // _bAdd ? &OXReportControllerObserver::AddElement : &OXReportControllerObserver::RemoveElement; + + // (rObserver.*pObserverFunction)( m_xReportDefinition->getStyleFamilies() ); + // (rObserver.*pObserverFunction)( m_xReportDefinition->getFunctions() ); if ( m_xReportDefinition->getPageHeaderOn() && _bAdd ) { @@ -3720,7 +3770,7 @@ void OReportController::listen(const bool _bAdd) getDesignView()->addSection(xGroup->getHeader(),DBGROUPHEADER); rObserver.AddSection(xGroup->getHeader()); } - } + } // for (sal_Int32 i=0;i<nCount ; ++i) if ( _bAdd ) { @@ -3767,21 +3817,19 @@ void OReportController::switchReportSection(const sal_Int16 _nId) { const OXUndoEnvironment::OUndoEnvLock aLock( m_aReportModel->GetUndoEnv() ); const bool bSwitchOn = !m_xReportDefinition->getReportHeaderOn(); - - ::boost::scoped_ptr< UndoContext > pUndoContext; if ( SID_REPORTHEADERFOOTER == _nId ) { const String sUndoAction(ModuleRes(bSwitchOn ? RID_STR_UNDO_ADD_REPORTHEADERFOOTER : RID_STR_UNDO_REMOVE_REPORTHEADERFOOTER)); - pUndoContext.reset( new UndoContext( getUndoManager(), sUndoAction ) ); + getUndoMgr()->EnterListAction( sUndoAction, String() ); - addUndoAction(new OReportSectionUndo(*(m_aReportModel),SID_REPORTHEADER_WITHOUT_UNDO + addUndoActionAndInvalidate(new OReportSectionUndo(*(m_aReportModel),SID_REPORTHEADER_WITHOUT_UNDO ,::std::mem_fun(&OReportHelper::getReportHeader) ,m_xReportDefinition ,bSwitchOn ? Inserted : Removed ,0 )); - addUndoAction(new OReportSectionUndo(*(m_aReportModel),SID_REPORTFOOTER_WITHOUT_UNDO + addUndoActionAndInvalidate(new OReportSectionUndo(*(m_aReportModel),SID_REPORTFOOTER_WITHOUT_UNDO ,::std::mem_fun(&OReportHelper::getReportFooter) ,m_xReportDefinition ,bSwitchOn ? Inserted : Removed @@ -3804,7 +3852,7 @@ void OReportController::switchReportSection(const sal_Int16 _nId) } if ( SID_REPORTHEADERFOOTER == _nId ) - pUndoContext.reset(); + getUndoMgr()->LeaveListAction(); getView()->Resize(); } } @@ -3817,13 +3865,12 @@ void OReportController::switchPageSection(const sal_Int16 _nId) const OXUndoEnvironment::OUndoEnvLock aLock( m_aReportModel->GetUndoEnv() ); const bool bSwitchOn = !m_xReportDefinition->getPageHeaderOn(); - ::boost::scoped_ptr< UndoContext > pUndoContext; if ( SID_PAGEHEADERFOOTER == _nId ) { const String sUndoAction(ModuleRes(bSwitchOn ? RID_STR_UNDO_ADD_REPORTHEADERFOOTER : RID_STR_UNDO_REMOVE_REPORTHEADERFOOTER)); - pUndoContext.reset( new UndoContext( getUndoManager(), sUndoAction ) ); + getUndoMgr()->EnterListAction( sUndoAction, String() ); - addUndoAction(new OReportSectionUndo(*m_aReportModel + addUndoActionAndInvalidate(new OReportSectionUndo(*m_aReportModel ,SID_PAGEHEADER_WITHOUT_UNDO ,::std::mem_fun(&OReportHelper::getPageHeader) ,m_xReportDefinition @@ -3831,14 +3878,14 @@ void OReportController::switchPageSection(const sal_Int16 _nId) ,0 )); - addUndoAction(new OReportSectionUndo(*m_aReportModel + addUndoActionAndInvalidate(new OReportSectionUndo(*m_aReportModel ,SID_PAGEFOOTER_WITHOUT_UNDO ,::std::mem_fun(&OReportHelper::getPageFooter) ,m_xReportDefinition ,bSwitchOn ? Inserted : Removed ,0 )); - } + } // if ( SID_PAGEHEADERFOOTER == _nId ) switch( _nId ) { case SID_PAGEHEADER_WITHOUT_UNDO: @@ -3853,7 +3900,7 @@ void OReportController::switchPageSection(const sal_Int16 _nId) break; } if ( SID_PAGEHEADERFOOTER == _nId ) - pUndoContext.reset(); + getUndoMgr()->LeaveListAction(); getView()->Resize(); } } @@ -3879,7 +3926,7 @@ void OReportController::modifyGroup(const bool _bAppend, const Sequence< Propert rUndoEnv.AddElement( xGroup->getFunctions() ); } - addUndoAction( new OGroupUndo( + addUndoActionAndInvalidate( new OGroupUndo( *m_aReportModel, _bAppend ? RID_STR_UNDO_APPEND_GROUP : RID_STR_UNDO_REMOVE_GROUP, _bAppend ? Inserted : Removed, @@ -3895,7 +3942,7 @@ void OReportController::modifyGroup(const bool _bAppend, const Sequence< Propert xGroups->removeByIndex( nPos ); } } - catch(const Exception&) + catch( const Exception& ) { DBG_UNHANDLED_EXCEPTION(); } @@ -3913,7 +3960,7 @@ void OReportController::createGroupSection(const bool _bUndo,const bool _bHeader { const OXUndoEnvironment::OUndoEnvLock aLock(m_aReportModel->GetUndoEnv()); if ( _bUndo ) - addUndoAction(new OGroupSectionUndo(*m_aReportModel + addUndoActionAndInvalidate(new OGroupSectionUndo(*m_aReportModel ,_bHeader ? SID_GROUPHEADER_WITHOUT_UNDO : SID_GROUPFOOTER_WITHOUT_UNDO ,_bHeader ? ::std::mem_fun(&OGroupHelper::getHeader) : ::std::mem_fun(&OGroupHelper::getFooter) ,xGroup @@ -4085,7 +4132,7 @@ void SAL_CALL OReportController::setMode( const ::rtl::OUString& aMode ) throw ( // ----------------------------------------------------------------------------- bool OReportController::isUiVisible() const { - return !m_sMode.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("remote")); + return !m_sMode.equalsAscii("remote"); } // ----------------------------------------------------------------------------- void OReportController::impl_fillState_nothrow(const ::rtl::OUString& _sProperty,dbaui::FeatureState& _rState) const @@ -4113,15 +4160,15 @@ void OReportController::impl_fillState_nothrow(const ::rtl::OUString& _sProperty else if ( !comphelper::compare(aTemp,aTemp2) ) break; } - catch(const beans::UnknownPropertyException&) + catch(beans::UnknownPropertyException&) { _rState.bEnabled = sal_False; } - } + } // for(; aIter != aSelection.end();++aIter) if ( aIter == aSelection.end() ) _rState.aValue = aTemp; } - } + } // if ( _rState.bEnabled ) } // ----------------------------------------------------------------------------- void OReportController::impl_zoom_nothrow() @@ -4129,6 +4176,8 @@ void OReportController::impl_zoom_nothrow() Fraction aZoom(m_nZoomValue,100); setZoomFactor( aZoom,*getDesignView() ); getDesignView()->zoom(aZoom); + // TRY + /*getDesignView()->Invalidate(INVALIDATE_NOCHILDREN);*/ InvalidateFeature(SID_ATTR_ZOOM,Reference< XStatusListener >(),sal_True); InvalidateFeature(SID_ATTR_ZOOMSLIDER,Reference< XStatusListener >(),sal_True); } @@ -4155,9 +4204,9 @@ sal_Bool OReportController::isFormatCommandEnabled(sal_uInt16 _nCommand,const un break; default: ; - } + } // switch(_nCommand) } - catch(const uno::Exception&) + catch(uno::Exception&) { } } @@ -4166,21 +4215,23 @@ sal_Bool OReportController::isFormatCommandEnabled(sal_uInt16 _nCommand,const un // ----------------------------------------------------------------------------- bool OReportController::impl_setPropertyAtControls_throw(const sal_uInt16 _nUndoResId,const ::rtl::OUString& _sProperty,const uno::Any& _aValue,const Sequence< PropertyValue >& _aArgs) { + ::std::auto_ptr<UndoManagerListAction> pListAction; ::std::vector< uno::Reference< uno::XInterface > > aSelection; uno::Reference< awt::XWindow> xWindow; lcl_getReportControlFormat( _aArgs, getDesignView(), xWindow, aSelection ); + const bool bMultiSet = aSelection.size() > 1; ::std::vector< uno::Reference< uno::XInterface > >::iterator aIter = aSelection.begin(); - - const String sUndoAction = String( ModuleRes( _nUndoResId ) ); - UndoContext aUndoContext( getUndoManager(), sUndoAction ); - for(; aIter != aSelection.end();++aIter) { + if ( !pListAction.get() && _nUndoResId && bMultiSet ) + { + const String sUndoAction = String(ModuleRes(_nUndoResId)); + pListAction.reset(new UndoManagerListAction(m_aUndoManager,sUndoAction)); + } // if ( !pListAction.get() ) const uno::Reference< beans::XPropertySet > xControlModel(*aIter,uno::UNO_QUERY); if ( xControlModel.is() ) xControlModel->setPropertyValue(_sProperty,_aValue); - } - + } // for(; aIter != aSelection.end();++aIter) return !aSelection.empty(); } // ----------------------------------------------------------------------------- @@ -4218,14 +4269,14 @@ void OReportController::openZoomDialog() { new SvxZoomItem() }; - static sal_uInt16 pRanges[] = + static USHORT pRanges[] = { SID_ATTR_ZOOM,SID_ATTR_ZOOM, 0 }; SfxItemPool* pPool( new SfxItemPool(String::CreateFromAscii("ZoomProperties"), SID_ATTR_ZOOM,SID_ATTR_ZOOM, aItemInfos, pDefaults) ); - pPool->SetDefaultMetric( SFX_MAPUNIT_100TH_MM ); // ripped, don't understand why - pPool->FreezeIdRanges(); // the same + pPool->SetDefaultMetric( SFX_MAPUNIT_100TH_MM ); // ripped, don't understand why + pPool->FreezeIdRanges(); // the same try { ::std::auto_ptr<SfxItemSet> pDescriptor(new SfxItemSet(*pPool, pRanges)); @@ -4240,16 +4291,16 @@ void OReportController::openZoomDialog() if ( !bCancel ) { - const SvxZoomItem& rZoomItem = (const SvxZoomItem&)pDlg->GetOutputItemSet()->Get( SID_ATTR_ZOOM ); + const SvxZoomItem& rZoomItem = (const SvxZoomItem&)pDlg->GetOutputItemSet()->Get( SID_ATTR_ZOOM ); m_eZoomType = rZoomItem.GetType(); m_nZoomValue = rZoomItem.GetValue(); if ( m_eZoomType != SVX_ZOOM_PERCENT ) m_nZoomValue = getDesignView()->getZoomFactor( m_eZoomType ); impl_zoom_nothrow(); - } + } // if ( !bCancel ) } - catch(const uno::Exception&) + catch(uno::Exception&) { DBG_UNHANDLED_EXCEPTION(); } @@ -4257,7 +4308,7 @@ void OReportController::openZoomDialog() for (sal_uInt16 i=0; i < SAL_N_ELEMENTS(pDefaults); ++i) delete pDefaults[i]; - } + } // if(pFact) } // ----------------------------------------------------------------------------- // ----------------------------------------------------------------------------- @@ -4265,12 +4316,15 @@ void OReportController::openZoomDialog() void SAL_CALL OReportController::setVisualAreaSize( ::sal_Int64 _nAspect, const awt::Size& _aSize ) throw (lang::IllegalArgumentException, embed::WrongStateException, uno::Exception, uno::RuntimeException) { ::osl::MutexGuard aGuard( getMutex() ); + //if( nAspect == embed::Aspects::MSOLE_CONTENT ) + { bool bChanged = (m_aVisualAreaSize.Width != _aSize.Width || m_aVisualAreaSize.Height != _aSize.Height); m_aVisualAreaSize = _aSize; if( bChanged ) setModified( sal_True ); + } m_nAspect = _nAspect; } // ----------------------------------------------------------------------------- @@ -4303,15 +4357,17 @@ embed::VisualRepresentation SAL_CALL OReportController::getPreferredVisualRepres { xTransfer->setVisualAreaSize(m_nAspect,m_aVisualAreaSize); aResult = xTransfer->getPreferredVisualRepresentation( _nAspect ); - } + } // if ( xTransfer.is() ) } - catch(const uno::Exception&) + catch( uno::Exception & ex ) { + (void)ex; } m_xReportEngine->setMaxRows(nOldMaxRows); } - catch(const uno::Exception&) + catch( uno::Exception & ex ) { + (void)ex; } m_bInGeneratePreview = false; } @@ -4344,34 +4400,6 @@ uno::Reference< container::XNameAccess > OReportController::getColumns() const } return sLabel; } - -// ----------------------------------------------------------------------------- -SfxUndoManager& OReportController::getUndoManager() const -{ - DBG_TESTSOLARMUTEX(); - // this is expected to be called during UI actions, so the SM is assumed to be locked - - ::boost::shared_ptr< OReportModel > pReportModel( getSdrModel() ); - ENSURE_OR_THROW( !!pReportModel, "no access to our model" ); - - SfxUndoManager* pUndoManager( pReportModel->GetSdrUndoManager() ); - ENSURE_OR_THROW( pUndoManager != NULL, "no access to our model's UndoManager" ); - - return *pUndoManager; -} - -// ----------------------------------------------------------------------------- -void OReportController::clearUndoManager() const -{ - getUndoManager().Clear(); -} - // ----------------------------------------------------------------------------- -void OReportController::addUndoAction( SfxUndoAction* i_pAction ) -{ - getUndoManager().AddUndoAction( i_pAction ); - InvalidateFeature( SID_UNDO ); - InvalidateFeature( SID_REDO ); -} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/report/ReportControllerObserver.cxx b/reportdesign/source/ui/report/ReportControllerObserver.cxx index ce0427728d20..007e0e01966e 100644 --- a/reportdesign/source/ui/report/ReportControllerObserver.cxx +++ b/reportdesign/source/ui/report/ReportControllerObserver.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,6 +50,8 @@ namespace rptui using namespace ::com::sun::star; + // const OReportController *& m_pReportController; + DECLARE_STL_USTRINGACCESS_MAP(bool, AllProperties); DECLARE_STL_STDKEY_MAP(uno::Reference< beans::XPropertySet >, AllProperties, PropertySetInfoCache); @@ -76,7 +78,7 @@ public: ,m_bReadOnly(sal_False) { } - + OXReportControllerObserverImpl::~OXReportControllerObserverImpl() { } @@ -109,16 +111,43 @@ public: if ( _pEvt ) { sal_Int32 nEvent = _pEvt->GetId(); - + /* + // just for debug + if (nEvent == VCLEVENT_WINDOW_CHILDCREATED || + nEvent == VCLEVENT_WINDOW_PAINT || + nEvent == VCLEVENT_WINDOW_MOVE || + nEvent == VCLEVENT_WINDOW_RESIZE || + nEvent == VCLEVENT_WINDOW_SHOW || + nEvent == VCLEVENT_WINDOW_MOUSEMOVE || + nEvent == VCLEVENT_WINDOW_FRAMETITLECHANGED || + nEvent == VCLEVENT_WINDOW_HIDE || + nEvent == VCLEVENT_EDIT_MODIFY || + nEvent == VCLEVENT_SCROLLBAR_ENDSCROLL || + nEvent == VCLEVENT_EDIT_SELECTIONCHANGED || + nEvent == VCLEVENT_TABPAGE_INSERTED || + nEvent == VCLEVENT_TABPAGE_REMOVED || + nEvent == VCLEVENT_TOOLBOX_FORMATCHANGED || + nEvent == VCLEVENT_TOOLBOX_ITEMADDED || + nEvent == VCLEVENT_TOOLBOX_ALLITEMCHANGED || + nEvent == VCLEVENT_MENUBARADDED || + nEvent == 1 + ) + { + return 0L; + } + */ + if (nEvent == VCLEVENT_APPLICATION_DATACHANGED ) { DataChangedEvent* pData = reinterpret_cast<DataChangedEvent*>(_pEvt->GetData()); - if ( pData && ((( pData->GetType() == DATACHANGED_SETTINGS ) || - ( pData->GetType() == DATACHANGED_DISPLAY )) && - ( pData->GetFlags() & SETTINGS_STYLE ))) + if ( pData && ((( pData->GetType() == DATACHANGED_SETTINGS ) || + ( pData->GetType() == DATACHANGED_DISPLAY )) && + ( pData->GetFlags() & SETTINGS_STYLE ))) { OEnvLock aLock(*this); - + + // sal_uInt32 nCount = m_pImpl->m_aSections.size(); + // send all Section Objects a 'tingle' // maybe they need a change in format, color, etc ::std::vector< uno::Reference< container::XChild > >::const_iterator aIter = m_pImpl->m_aSections.begin(); @@ -130,7 +159,7 @@ public: { uno::Reference<report::XSection> xSection(xChild, uno::UNO_QUERY); if (xSection.is()) - { + { const sal_Int32 nCount = xSection->getCount(); for (sal_Int32 i = 0; i < nCount; ++i) { @@ -148,7 +177,7 @@ public: } } } - + return 0L; } @@ -167,13 +196,14 @@ public: RemoveElement(xSourceSet); } } - + void OXReportControllerObserver::Clear() { OEnvLock aLock(*this); + // sal_uInt32 nDebugValue = m_pImpl->m_aSections.size(); m_pImpl->m_aSections.clear(); } - + // XPropertyChangeListener void SAL_CALL OXReportControllerObserver::propertyChange(const beans::PropertyChangeEvent& _rEvent) throw(uno::RuntimeException) { @@ -184,20 +214,20 @@ public: return; m_aFormattedFieldBeautifier.notifyPropertyChange(_rEvent); - m_aFixedTextColor.notifyPropertyChange(_rEvent); + m_aFixedTextColor.notifyPropertyChange(_rEvent); } - + // ----------------------------------------------------------------------------- -void OXReportControllerObserver::Lock() -{ +void OXReportControllerObserver::Lock() +{ OSL_ENSURE(m_refCount,"Illegal call to dead object!"); - osl_incrementInterlockedCount( &m_pImpl->m_nLocks ); + osl_incrementInterlockedCount( &m_pImpl->m_nLocks ); } -void OXReportControllerObserver::UnLock() -{ +void OXReportControllerObserver::UnLock() +{ OSL_ENSURE(m_refCount,"Illegal call to dead object!"); - osl_decrementInterlockedCount( &m_pImpl->m_nLocks ); + osl_decrementInterlockedCount( &m_pImpl->m_nLocks ); } sal_Bool OXReportControllerObserver::IsLocked() const { return m_pImpl->m_nLocks != 0; } @@ -286,6 +316,7 @@ void OXReportControllerObserver::switchListening( const uno::Reference< containe // be notified of any changes in the container elements uno::Reference< container::XContainer > xSimpleContainer( _rxContainer, uno::UNO_QUERY ); + // OSL_ENSURE( xSimpleContainer.is(), "OXReportControllerObserver::switchListening: how are we expected to be notified of changes in the container?" ); if ( xSimpleContainer.is() ) { if ( _bStartListening ) @@ -337,14 +368,18 @@ void OXReportControllerObserver::switchListening( const uno::Reference< uno::XIn //------------------------------------------------------------------------------ void SAL_CALL OXReportControllerObserver::modified( const lang::EventObject& /*aEvent*/ ) throw (uno::RuntimeException) { + // implSetModified(); } //------------------------------------------------------------------------------ void OXReportControllerObserver::AddElement(const uno::Reference< uno::XInterface >& _rxElement ) { + // if ( !IsLocked() ) + // { m_aFormattedFieldBeautifier.notifyElementInserted(_rxElement); m_aFixedTextColor.notifyElementInserted(_rxElement); - + // } + // if it's a container, start listening at all elements uno::Reference< container::XIndexAccess > xContainer( _rxElement, uno::UNO_QUERY ); if ( xContainer.is() ) @@ -370,7 +405,7 @@ void OXReportControllerObserver::RemoveElement(const uno::Reference< uno::XInter if ( _xContainer.is() ) { aFind = ::std::find(m_pImpl->m_aSections.begin(),m_pImpl->m_aSections.end(),_xContainer); - + if ( aFind == m_pImpl->m_aSections.end() ) { uno::Reference<container::XChild> xParent(_xContainer->getParent(),uno::UNO_QUERY); diff --git a/reportdesign/source/ui/report/ReportRuler.cxx b/reportdesign/source/ui/report/ReportRuler.cxx index 7c63b73c9299..a345d00550c0 100644 --- a/reportdesign/source/ui/report/ReportRuler.cxx +++ b/reportdesign/source/ui/report/ReportRuler.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,14 +32,14 @@ namespace rptui { using namespace ::com::sun::star; -DBG_NAME( rpt_OReportRuler ) +DBG_NAME( rpt_OReportRuler ) OReportRuler::OReportRuler(Window* _pParent,OReportWindow* _pReportWindow,const uno::Reference< report::XSection >& _xSection) :Window(_pParent) ,m_pParent(_pReportWindow) { DBG_CTOR( rpt_OReportRuler,NULL); SetMapMode( MapMode( MAP_100TH_MM ) ); - + Show(); } //------------------------------------------------------------------------------ @@ -54,7 +54,7 @@ void OReportRuler::Resize() m_pSection->SetPosSizePixel(Point(0,0),GetOutputSize()); } //------------------------------------------------------------------------------ -void OReportRuler::SetGridVisible(sal_Bool _bVisible) +void OReportRuler::SetGridVisible(BOOL _bVisible) { m_pSection->SetGridVisible( _bVisible ); } diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx index 54ccff238de2..9c7888e12c27 100644 --- a/reportdesign/source/ui/report/ReportSection.cxx +++ b/reportdesign/source/ui/report/ReportSection.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -85,7 +85,7 @@ sal_Int32 lcl_getOverlappedControlColor(/*const uno::Reference <lang::XMultiServ } //------------------------------------------------------------------------------ DBG_NAME( rpt_OReportSection ) -OReportSection::OReportSection(OSectionWindow* _pParent,const uno::Reference< report::XSection >& _xSection) +OReportSection::OReportSection(OSectionWindow* _pParent,const uno::Reference< report::XSection >& _xSection) : Window(_pParent,WB_DIALOGCONTROL) , ::comphelper::OPropertyChangeListener(m_aMutex) , DropTargetHelper(this) @@ -97,44 +97,46 @@ OReportSection::OReportSection(OSectionWindow* _pParent,const uno::Reference< re ,m_pReportListener(NULL) ,m_xSection(_xSection) ,m_eMode(RPTUI_SELECT) -,m_bDialogModelChanged(sal_False) +,m_bDialogModelChanged(FALSE) ,m_bInDrag(sal_False) { DBG_CTOR( rpt_OReportSection,NULL); EnableChildTransparentMode(); SetHelpId(HID_REPORTSECTION); SetMapMode( MapMode( MAP_100TH_MM ) ); - + try { fill(); } catch(uno::Exception&) { - OSL_FAIL("Exception catched!"); + OSL_ENSURE(0,"Exception catched!"); } m_pFunc.reset(new DlgEdFuncSelect( this )); - m_pFunc->setOverlappedControlColor(lcl_getOverlappedControlColor() ); + m_pFunc->setOverlappedControlColor(lcl_getOverlappedControlColor( /* m_pParent->getViewsWindow()->getView()->getReportView()->getController().getORB() */ ) ); } //------------------------------------------------------------------------------ OReportSection::~OReportSection() { DBG_DTOR( rpt_OReportSection,NULL); m_pPage = NULL; + //m_pModel->GetUndoEnv().RemoveSection(m_xSection.get()); if ( m_pMulti.is() ) m_pMulti->dispose(); - + if ( m_pReportListener.is() ) m_pReportListener->dispose(); m_pFunc = ::std::auto_ptr<DlgEdFunc>(); - + { ::std::auto_ptr<OSectionView> aTemp( m_pView); if ( m_pView ) m_pView->EndListening( *m_pModel ); m_pView = NULL; } + /*m_pModel->DeletePage(m_pPage->GetPageNum());*/ } //------------------------------------------------------------------------------ void OReportSection::Paint( const Rectangle& rRect ) @@ -210,7 +212,7 @@ void OReportSection::fill() // without the following call, no grid is painted m_pView->ShowSdrPage( m_pPage ); - m_pView->SetMoveSnapOnlyTopLeft( sal_True ); + m_pView->SetMoveSnapOnlyTopLeft( TRUE ); ODesignView* pDesignView = m_pParent->getViewsWindow()->getView()->getReportView(); // #i93595# Adapted grid to a more coarse grid and subdivisions for better visualisation. This @@ -225,9 +227,9 @@ void OReportSection::fill() const Fraction aY(aGridSizeFine.B()); m_pView->SetSnapGridWidth(aX, aY); - m_pView->SetGridSnap( pDesignView->isGridSnap() ); - m_pView->SetGridFront( sal_False ); - m_pView->SetDragStripes( sal_True ); + m_pView->SetGridSnap( pDesignView->isGridSnap() ); + m_pView->SetGridFront( FALSE ); + m_pView->SetDragStripes( TRUE ); m_pView->SetPageVisible(); sal_Int32 nColor = m_xSection->getBackColor(); if ( nColor == (sal_Int32)COL_TRANSPARENT ) @@ -242,9 +244,10 @@ void OReportSection::fill() // LLA: TODO // m_pPage->SetUppBorder(-10000); - m_pView->SetDesignMode( sal_True ); + m_pView->SetDesignMode( TRUE ); m_pView->StartListening( *m_pModel ); + /*Resize();*/ if ( m_xSection.is() && m_pPage && m_pView ) { uno::Reference<report::XReportDefinition> xReportDefinition = m_xSection->getReportDefinition(); @@ -253,7 +256,9 @@ void OReportSection::fill() const sal_Int32 nWorkAreaLeftMargin = getStyleProperty<sal_Int32>(xReportDefinition,PROPERTY_LEFTMARGIN); const sal_Int32 nWorkAreaRightMargin = getStyleProperty<sal_Int32>(xReportDefinition,PROPERTY_RIGHTMARGIN); m_pView->SetWorkArea( Rectangle( Point( nWorkAreaLeftMargin, 0), Size(aPageSize.Width() - nWorkAreaLeftMargin - nWorkAreaRightMargin,aPageSize.Height()) ) ); - } + } // if ( m_xSection.is() && m_pPage && m_pView ) + + //SetBackground( Wallpaper( COL_BLUE )); } // ----------------------------------------------------------------------------- void OReportSection::Paste(const uno::Sequence< beans::NamedValue >& _aAllreadyCopiedObjects,bool _bForce) @@ -285,7 +290,7 @@ void OReportSection::Paste(const uno::Sequence< beans::NamedValue >& _aAllreadyC SvxShape* pShape = SvxShape::getImplementation( *pCopiesIter ); SdrObject* pObject = pShape ? pShape->GetSdrObject() : NULL; if ( pObject ) - { + { SdrObject* pNeuObj = pObject->Clone(); pNeuObj->SetPage( m_pPage ); @@ -304,6 +309,7 @@ void OReportSection::Paste(const uno::Sequence< beans::NamedValue >& _aAllreadyC { aRet.Move(0,aRet.getHeight()+1); pNeuObj->SetLogicRect(aRet); + //(*pCopiesIter)->setPositionY(aRet.Top()); } } m_pView->AddUndo( m_pView->GetModel()->GetSdrUndoFactory().CreateUndoNewObject( *pNeuObj ) ); @@ -315,7 +321,7 @@ void OReportSection::Paste(const uno::Sequence< beans::NamedValue >& _aAllreadyC } catch(uno::Exception&) { - OSL_FAIL("Exception caught while pasting a new object!"); + OSL_ENSURE(0,"Exception caught while pasting a new object!"); } if ( !_bForce ) break; @@ -348,30 +354,33 @@ void OReportSection::SetMode( DlgEdMode eNewMode ) m_pFunc->setOverlappedControlColor(lcl_getOverlappedControlColor( ) ); m_pModel->SetReadOnly(eNewMode == RPTUI_READONLY); m_eMode = eNewMode; - } + } } // ----------------------------------------------------------------------------- void OReportSection::Copy(uno::Sequence< beans::NamedValue >& _rAllreadyCopiedObjects) -{ +{ Copy(_rAllreadyCopiedObjects,false); } //---------------------------------------------------------------------------- void OReportSection::Copy(uno::Sequence< beans::NamedValue >& _rAllreadyCopiedObjects,bool _bEraseAnddNoClone) -{ +{ OSL_ENSURE(m_xSection.is(),"Why is the section here NULL!"); if( !m_pView->AreObjectsMarked() || !m_xSection.is() ) return; + // stop all drawing actions + //m_pView->BrkAction(); + // insert control models of marked objects into clipboard dialog model const SdrMarkList& rMarkedList = m_pView->GetMarkedObjectList(); - const sal_uLong nMark = rMarkedList.GetMarkCount(); + const ULONG nMark = rMarkedList.GetMarkCount(); ::std::vector< uno::Reference<report::XReportComponent> > aCopies; aCopies.reserve(nMark); SdrUndoFactory& rUndo = m_pView->GetModel()->GetSdrUndoFactory(); - - for( sal_uLong i = nMark; i > 0; ) + + for( ULONG i = nMark; i > 0; ) { --i; SdrObject* pSdrObject = rMarkedList.GetMark(i)->GetMarkedSdrObj(); @@ -391,10 +400,10 @@ void OReportSection::Copy(uno::Sequence< beans::NamedValue >& _rAllreadyCopiedOb } catch(uno::Exception&) { - OSL_FAIL("Can't copy report elements!"); + OSL_ENSURE(0,"Can't copy report elements!"); } } - } + } // for( ULONG i = 0; i < nMark; i++ ) if ( !aCopies.empty() ) { @@ -428,7 +437,7 @@ void OReportSection::MouseMove( const MouseEvent& rMEvt ) } //---------------------------------------------------------------------------- -void OReportSection::SetGridVisible(sal_Bool _bVisible) +void OReportSection::SetGridVisible(BOOL _bVisible) { m_pView->SetGridVisible( _bVisible ); } @@ -443,36 +452,32 @@ void OReportSection::SelectAll(const sal_uInt16 _nObjectType) { m_pView->UnmarkAll(); SdrObjListIter aIter(*m_pPage,IM_DEEPNOGROUPS); - SdrObject* pObjIter = NULL; + SdrObject* pObjIter = NULL; while( (pObjIter = aIter.Next()) != NULL ) { if ( pObjIter->GetObjIdentifier() == _nObjectType ) m_pView->MarkObj( pObjIter, m_pView->GetSdrPageView() ); } - } + } } } -void lcl_insertMenuItemImages( - PopupMenu& rContextMenu, - OReportController& rController, - const uno::Reference< report::XReportDefinition>& _xReportDefinition,uno::Reference<frame::XFrame>& _rFrame -) +void lcl_insertMenuItemImages(PopupMenu& rContextMenu,OReportController& rController,const uno::Reference< report::XReportDefinition>& _xReportDefinition,uno::Reference<frame::XFrame>& _rFrame,BOOL _bHiContrast) { - const sal_uInt16 nCount = rContextMenu.GetItemCount(); - for (sal_uInt16 i = 0; i < nCount; ++i) + const USHORT nCount = rContextMenu.GetItemCount(); + for (USHORT i = 0; i < nCount; ++i) { if ( MENUITEM_SEPARATOR != rContextMenu.GetItemType(i)) { - const sal_uInt16 nId = rContextMenu.GetItemId(i); + const USHORT nId = rContextMenu.GetItemId(i); PopupMenu* pPopupMenu = rContextMenu.GetPopupMenu( nId ); if ( pPopupMenu ) { - lcl_insertMenuItemImages(*pPopupMenu,rController,_xReportDefinition,_rFrame); + lcl_insertMenuItemImages(*pPopupMenu,rController,_xReportDefinition,_rFrame,_bHiContrast); } else { const ::rtl::OUString sCommand = rContextMenu.GetItemCommand(nId); - rContextMenu.SetItemImage(nId,framework::GetImageFromURL(_rFrame,sCommand,sal_False)); + rContextMenu.SetItemImage(nId,framework::GetImageFromURL(_rFrame,sCommand,FALSE,_bHiContrast)); if ( nId == SID_PAGEHEADERFOOTER ) { String sText = String(ModuleRes((_xReportDefinition.is() && _xReportDefinition->getPageHeaderOn()) ? RID_STR_PAGEHEADERFOOTER_DELETE : RID_STR_PAGEHEADERFOOTER_INSERT)); @@ -487,7 +492,7 @@ void lcl_insertMenuItemImages( rContextMenu.CheckItem(nId,rController.isCommandChecked(nId)); rContextMenu.EnableItem(nId,rController.isCommandEnabled(nId)); } - } + } // for (USHORT i = 0; i < nCount; ++i) } //---------------------------------------------------------------------------- void OReportSection::Command( const CommandEvent& _rCEvt ) @@ -497,16 +502,18 @@ void OReportSection::Command( const CommandEvent& _rCEvt ) { case COMMAND_CONTEXTMENU: { + const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); + BOOL bHiContrast = rSettings.GetHighContrastMode(); OReportController& rController = m_pParent->getViewsWindow()->getView()->getReportView()->getController(); uno::Reference<frame::XFrame> xFrame = rController.getFrame(); - PopupMenu aContextMenu( ModuleRes( RID_MENU_REPORT ) ); + PopupMenu aContextMenu( ModuleRes( RID_MENU_REPORT ) ); uno::Reference< report::XReportDefinition> xReportDefinition = getSection()->getReportDefinition(); - - lcl_insertMenuItemImages(aContextMenu,rController,xReportDefinition,xFrame); + + lcl_insertMenuItemImages(aContextMenu,rController,xReportDefinition,xFrame,bHiContrast); Point aPos = _rCEvt.GetMousePosPixel(); m_pView->EndAction(); - const sal_uInt16 nId = aContextMenu.Execute(this, aPos); + const USHORT nId = aContextMenu.Execute(this, aPos); if ( nId ) { uno::Sequence< beans::PropertyValue> aArgs; @@ -588,7 +595,7 @@ void OReportSection::_propertyChanged(const beans::PropertyChangeEvent& _rEvent) } if ( aPos.Y < 0 ) aPos.Y = 0; - if ( bChanged ) + if ( bChanged ) { xReportComponent->setPosition(aPos); correctOverlapping(pObject,*this,false); @@ -600,16 +607,16 @@ void OReportSection::_propertyChanged(const beans::PropertyChangeEvent& _rEvent) } pBase->StartListening(); } - } + } // for (sal_Int32 i = 0; i < nCount; ++i) } catch(uno::Exception) { - OSL_FAIL("Exception caught: OReportSection::_propertyChanged("); + OSL_ENSURE(0,"Exception caught: OReportSection::_propertyChanged("); } Resize(); } - } + } } //------------------------------------------------------------------------------ sal_Bool OReportSection::handleKeyEvent(const KeyEvent& _rEvent) @@ -625,7 +632,7 @@ void OReportSection::deactivateOle() // ----------------------------------------------------------------------------- void OReportSection::createDefault(const ::rtl::OUString& _sType) { - SdrObject* pObj = m_pView->GetCreateObj(); + SdrObject* pObj = m_pView->GetCreateObj();//rMarkList.GetMark(0)->GetObj(); if ( !pObj ) return; createDefault(_sType,pObj); @@ -655,7 +662,7 @@ void OReportSection::createDefault(const ::rtl::OUString& _sType,SdrObject* _pOb if( pSourceObj ) { const SfxItemSet& rSource = pSourceObj->GetMergedItemSet(); - SfxItemSet aDest( _pObj->GetModel()->GetItemPool(), // ranges from SdrAttrObj + SfxItemSet aDest( _pObj->GetModel()->GetItemPool(), // ranges from SdrAttrObj SDRATTR_START, SDRATTR_SHADOW_LAST, SDRATTR_MISC_FIRST, SDRATTR_MISC_LAST, SDRATTR_TEXTDIRECTION, SDRATTR_TEXTDIRECTION, @@ -745,7 +752,7 @@ sal_Int8 OReportSection::AcceptDrop( const AcceptDropEvent& _rEvt ) ) { if (!m_pParent) return DND_ACTION_NONE; - sal_uInt16 nCurrentPosition = 0; + USHORT nCurrentPosition = 0; nCurrentPosition = m_pParent->getViewsWindow()->getPosition(m_pParent); if (_rEvt.mnAction == DND_ACTION_COPY ) { @@ -772,7 +779,7 @@ sal_Int8 OReportSection::AcceptDrop( const AcceptDropEvent& _rEvt ) if ( ::svx::OMultiColumnTransferable::canExtractDescriptor(rFlavors) || ::svx::OColumnTransferable::canExtractColumnDescriptor(rFlavors, CTF_FIELD_DESCRIPTOR | CTF_CONTROL_EXCHANGE | CTF_COLUMN_DESCRIPTOR) ) return _rEvt.mnAction; - + const sal_Int8 nDropOption = ( OReportExchange::canExtract(rFlavors) ) ? DND_ACTION_COPYMOVE : DND_ACTION_NONE; return nDropOption; @@ -800,7 +807,8 @@ sal_Int8 OReportSection::ExecuteDrop( const ExecuteDropEvent& _rEvt ) nDropOption = DND_ACTION_COPYMOVE; m_pParent->getViewsWindow()->BrkAction(); m_pParent->getViewsWindow()->unmarkAllObjects(m_pView); - } + //m_pParent->getViewsWindow()->getView()->setMarked(m_pView,sal_True); + } // if ( OReportExchange::canExtract(rFlavors) ) else if ( bMultipleFormat || ::svx::OColumnTransferable::canExtractColumnDescriptor(rFlavors, CTF_FIELD_DESCRIPTOR | CTF_CONTROL_EXCHANGE | CTF_COLUMN_DESCRIPTOR) ) { @@ -819,13 +827,13 @@ sal_Int8 OReportSection::ExecuteDrop( const ExecuteDropEvent& _rEvt ) if ( !bMultipleFormat ) { ::svx::ODataAccessDescriptor aDescriptor = ::svx::OColumnTransferable::extractColumnDescriptor(aDropped); - + aValues.realloc(1); aValues[0].Value <<= aDescriptor.createPropertyValueSequence(); - } - else + } // if ( !bMultipleFormat ) + else aValues = ::svx::OMultiColumnTransferable::extractDescriptor(aDropped); - + beans::PropertyValue* pIter = aValues.getArray(); beans::PropertyValue* pEnd = pIter + aValues.getLength(); for(;pIter != pEnd; ++pIter) @@ -838,7 +846,7 @@ sal_Int8 OReportSection::ExecuteDrop( const ExecuteDropEvent& _rEvt ) aCurrent.realloc(nLength + 3); aCurrent[nLength].Name = PROPERTY_POSITION; aCurrent[nLength++].Value <<= AWTPoint(aDropPos); - // give also the DND Action (Shift|Ctrl) Key to really say what we want + // give also the DND Action (Shift|Ctrl) Key to really say what we want aCurrent[nLength].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DNDAction")); aCurrent[nLength++].Value <<= _rEvt.mnAction; diff --git a/reportdesign/source/ui/report/ReportWindow.cxx b/reportdesign/source/ui/report/ReportWindow.cxx index 2a7a32408db9..ddbeea74a9a9 100644 --- a/reportdesign/source/ui/report/ReportWindow.cxx +++ b/reportdesign/source/ui/report/ReportWindow.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,7 +54,7 @@ #include <toolkit/helper/vclunohelper.hxx> -#define SECTION_OFFSET 3 +#define SECTION_OFFSET 3 namespace rptui { using namespace ::com::sun::star; @@ -64,7 +64,7 @@ using namespace ::comphelper; //================================================================== DBG_NAME( rpt_OReportWindow ) //------------------------------------------------------------------------------ -OReportWindow::OReportWindow(OScrollWindowHelper* _pParent,ODesignView* _pView) +OReportWindow::OReportWindow(OScrollWindowHelper* _pParent,ODesignView* _pView) : Window(_pParent,WB_DIALOGCONTROL) ,m_aHRuler(this) ,m_pView(_pView) @@ -78,7 +78,7 @@ OReportWindow::OReportWindow(OScrollWindowHelper* _pParent,ODesignView* _pView) m_aViewsWindow.Show(); - m_aHRuler.Show(); + m_aHRuler.Show(); m_aHRuler.Activate(); m_aHRuler.SetPagePos(0); m_aHRuler.SetBorders(); @@ -101,9 +101,9 @@ void OReportWindow::initialize() m_aViewsWindow.initialize(); } //---------------------------------------------------------------------------- -void OReportWindow::SetInsertObj( sal_uInt16 eObj,const ::rtl::OUString& _sShapeType ) +void OReportWindow::SetInsertObj( USHORT eObj,const ::rtl::OUString& _sShapeType ) { - m_aViewsWindow.SetInsertObj( eObj,_sShapeType); + m_aViewsWindow.SetInsertObj( eObj,_sShapeType); } //---------------------------------------------------------------------------- @@ -114,23 +114,24 @@ rtl::OUString OReportWindow::GetInsertObjString() const //------------------------------------------------------------------------------ void OReportWindow::SetMode( DlgEdMode eNewMode ) { - m_aViewsWindow.SetMode(eNewMode); + m_aViewsWindow.SetMode(eNewMode); } //---------------------------------------------------------------------------- -void OReportWindow::removeSection(sal_uInt16 _nPosition) +void OReportWindow::removeSection(USHORT _nPosition) { m_aViewsWindow.removeSection(_nPosition); m_pParent->setTotalSize(GetTotalWidth(),GetTotalHeight()); m_aViewsWindow.Invalidate(INVALIDATE_TRANSPARENT); + //Resize(); } //---------------------------------------------------------------------------- -void OReportWindow::addSection(const uno::Reference< report::XSection >& _xSection,const ::rtl::OUString& _sColorEntry,sal_uInt16 _nPosition) +void OReportWindow::addSection(const uno::Reference< report::XSection >& _xSection,const ::rtl::OUString& _sColorEntry,USHORT _nPosition) { if ( !_xSection.is() ) return; - - m_aViewsWindow.addSection(_xSection,_sColorEntry,_nPosition); - + + m_aViewsWindow.addSection(_xSection,_sColorEntry,_nPosition); + m_pParent->setTotalSize(GetTotalWidth(),GetTotalHeight()); } //------------------------------------------------------------------------------ @@ -142,7 +143,7 @@ void OReportWindow::toggleGrid(sal_Bool _bVisible) void OReportWindow::showRuler(sal_Bool _bShow) { m_aHRuler.Show(_bShow); - + m_aViewsWindow.showRuler(_bShow); } //------------------------------------------------------------------------------ @@ -156,20 +157,20 @@ sal_Int32 OReportWindow::getMaxMarkerWidth(sal_Bool _bWithEnd) const } //------------------------------------------------------------------------------ sal_Int32 OReportWindow::GetTotalWidth() const -{ +{ sal_Int32 nWidth = 0; if ( !m_aViewsWindow.empty() ) { Fraction aStartWidth(long(REPORT_ENDMARKER_WIDTH + REPORT_STARTMARKER_WIDTH )); const Fraction aZoom(m_pView->getController().getZoomValue(),100); - aStartWidth *= aZoom; + aStartWidth *= aZoom; // m_aViewsWindow.GetMapMode().GetScaleX();; const sal_Int32 nPaperWidth = getStyleProperty<awt::Size>(m_pView->getController().getReportDefinition(),PROPERTY_PAPERSIZE).Width; Fraction aPaperWidth(nPaperWidth,1); aPaperWidth *= aZoom; const Size aPageSize = LogicToPixel(Size(aPaperWidth,0)); nWidth = aPageSize.Width() + long(aStartWidth); } - return nWidth; + return nWidth; } //------------------------------------------------------------------------------ void OReportWindow::Resize() @@ -199,12 +200,12 @@ void OReportWindow::Resize() m_aHRuler.SetNullOffset(nLeftMargin); m_aHRuler.SetMargin1(0); m_aHRuler.SetMargin2(aPageSize.Width() - nLeftMargin - nRightMargin); - + aStartPoint.Y() += aPageSize.Height(); nSectionsHeight -= aStartPoint.Y(); aStartPoint.X() = aOffset.X(); - + m_aViewsWindow.SetPosSizePixel(aStartPoint,Size(aTotalOutputSize.Width(),nSectionsHeight)); } } @@ -226,7 +227,7 @@ void OReportWindow::DataChanged( const DataChangedEvent& rDCEvt ) if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) ) { - ImplInitSettings(); + ImplInitSettings(); Invalidate(); } } @@ -247,10 +248,11 @@ void OReportWindow::ScrollChildren(const Point& _aThumbPos) m_aHRuler.Scroll(-(aOrg.X() + _aThumbPos.X()),0); } + /*const Point aPos(PixelToLogic(_aThumbPos));*/ m_aViewsWindow.scrollChildren(_aThumbPos); } //---------------------------------------------------------------------------- -sal_uInt16 OReportWindow::getSectionCount() const +USHORT OReportWindow::getSectionCount() const { return m_aViewsWindow.getSectionCount(); } @@ -260,43 +262,43 @@ void OReportWindow::notifySizeChanged() m_pParent->setTotalSize(GetTotalWidth(),GetTotalHeight()); } //---------------------------------------------------------------------------- -sal_Bool OReportWindow::HasSelection() const +BOOL OReportWindow::HasSelection() const { return m_aViewsWindow.HasSelection(); } //---------------------------------------------------------------------------- void OReportWindow::Delete() { - + m_aViewsWindow.Delete(); } //---------------------------------------------------------------------------- void OReportWindow::Copy() -{ - +{ + m_aViewsWindow.Copy(); } //---------------------------------------------------------------------------- void OReportWindow::Paste() { - + m_aViewsWindow.Paste(); } //---------------------------------------------------------------------------- -sal_Bool OReportWindow::IsPasteAllowed() const +BOOL OReportWindow::IsPasteAllowed() const { return m_aViewsWindow.IsPasteAllowed(); } //----------------------------------------------------------------------------- void OReportWindow::SelectAll(const sal_uInt16 _nObjectType) { - + m_aViewsWindow.SelectAll(_nObjectType); } //----------------------------------------------------------------------------- void OReportWindow::unmarkAllObjects(OSectionView* _pSectionView) { - + m_aViewsWindow.unmarkAllObjects(_pSectionView); } //----------------------------------------------------------------------------- @@ -319,13 +321,13 @@ void OReportWindow::setMarked(OSectionView* _pSectionView,sal_Bool _bMark) //------------------------------------------------------------------------ void OReportWindow::setMarked(const uno::Reference< report::XSection>& _xSection,sal_Bool _bMark) { - + m_aViewsWindow.setMarked(_xSection,_bMark); } //------------------------------------------------------------------------ void OReportWindow::setMarked(const uno::Sequence< uno::Reference< report::XReportComponent> >& _xShape,sal_Bool _bMark) { - + m_aViewsWindow.setMarked(_xShape,_bMark); } //----------------------------------------------------------------------------- @@ -339,37 +341,37 @@ void OReportWindow::setMarked(const uno::Sequence< uno::Reference< report::XRepo return m_aViewsWindow.getSectionWindow(_xSection); } // ------------------------------------------------------------------------- -void OReportWindow::markSection(const sal_uInt16 _nPos) +void OReportWindow::markSection(const sal_uInt16 _nPos) { - + m_aViewsWindow.markSection(_nPos); } // ----------------------------------------------------------------------------- void OReportWindow::fillCollapsedSections(::std::vector<sal_uInt16>& _rCollapsedPositions) const { - + m_aViewsWindow.fillCollapsedSections(_rCollapsedPositions); } // ----------------------------------------------------------------------------- void OReportWindow::collapseSections(const uno::Sequence< ::com::sun::star::beans::PropertyValue>& _aCollpasedSections) { - + m_aViewsWindow.collapseSections(_aCollpasedSections); } // ----------------------------------------------------------------------------- void OReportWindow::alignMarkedObjects(sal_Int32 _nControlModification,bool _bAlignAtSection, bool bBoundRects) { - + m_aViewsWindow.alignMarkedObjects(_nControlModification, _bAlignAtSection, bBoundRects); } // ----------------------------------------------------------------------------- -void OReportWindow::setGridSnap(sal_Bool bOn) +void OReportWindow::setGridSnap(BOOL bOn) { - + m_aViewsWindow.setGridSnap(bOn); } // ----------------------------------------------------------------------------- -void OReportWindow::setDragStripes(sal_Bool bOn) +void OReportWindow::setDragStripes(BOOL bOn) { m_aViewsWindow.setDragStripes(bOn); } @@ -384,14 +386,15 @@ void OReportWindow::zoom(const Fraction& _aZoom) m_aHRuler.SetZoom(_aZoom); m_aHRuler.Invalidate(); + //setZoomFactor(_aZoom,*this); // if this will be include the H - ruler has the wrong size m_aViewsWindow.zoom(_aZoom); - + notifySizeChanged(); const Point aNewThumbPos( m_pParent->getThumbPos() ); ScrollChildren( aNewThumbPos ); Resize(); - + Invalidate(INVALIDATE_NOERASE | INVALIDATE_NOCHILDREN | INVALIDATE_TRANSPARENT); } // ----------------------------------------------------------------------------- @@ -421,23 +424,23 @@ sal_uInt16 OReportWindow::getZoomFactor(SvxZoomType _eType) const break; case SVX_ZOOM_WHOLEPAGE: { - nZoom = (sal_uInt16)(long)Fraction(aSize.Width()*100,impl_getRealPixelWidth()); + nZoom = (USHORT)(long)Fraction(aSize.Width()*100,impl_getRealPixelWidth()); MapMode aMap( MAP_100TH_MM ); const Size aHeight = m_aViewsWindow.LogicToPixel(m_aViewsWindow.PixelToLogic(Size(0,GetTotalHeight() + m_aHRuler.GetSizePixel().Height())),aMap); - nZoom = ::std::min(nZoom,(sal_uInt16)(long)Fraction(aSize.Height()*100,aHeight.Height())); + nZoom = ::std::min(nZoom,(USHORT)(long)Fraction(aSize.Height()*100,aHeight.Height())); } break; case SVX_ZOOM_PAGEWIDTH: - nZoom = (sal_uInt16)(long)Fraction(aSize.Width()*100,impl_getRealPixelWidth()); + nZoom = (USHORT)(long)Fraction(aSize.Width()*100,impl_getRealPixelWidth()); break; default: break; } - return nZoom; + return nZoom; } //================================================================== -} //rptui +} //rptui //================================================================== /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/report/ScrollHelper.cxx b/reportdesign/source/ui/report/ScrollHelper.cxx index 0abd5b75f666..2f4429f72202 100644 --- a/reportdesign/source/ui/report/ScrollHelper.cxx +++ b/reportdesign/source/ui/report/ScrollHelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,8 +38,8 @@ namespace rptui { -#define LINE_SIZE 50 -#define SECTION_OFFSET 3 +#define LINE_SIZE 50 +#define SECTION_OFFSET 3 #define SCR_LINE_SIZE 10 using namespace ::com::sun::star; @@ -53,7 +53,7 @@ void lcl_setScrollBar(sal_Int32 _nNewValue,const Point& _aPos,const Size& _aSize // ----------------------------------------------------------------------------- DBG_NAME( rpt_OScrollWindowHelper ); -OScrollWindowHelper::OScrollWindowHelper( ODesignView* _pDesignView) +OScrollWindowHelper::OScrollWindowHelper( ODesignView* _pDesignView) : OScrollWindowHelper_BASE( _pDesignView,WB_DIALOGCONTROL) ,OPropertyChangeListener(m_aMutex) ,m_aHScroll( this, WB_HSCROLL|WB_REPEAT|WB_DRAG ) @@ -65,7 +65,7 @@ OScrollWindowHelper::OScrollWindowHelper( ODesignView* _pDesignView) { DBG_CTOR( rpt_OScrollWindowHelper,NULL); SetMapMode( MapMode( MAP_100TH_MM ) ); - + impl_initScrollBar( m_aHScroll ); impl_initScrollBar( m_aVScroll ); @@ -93,9 +93,10 @@ void OScrollWindowHelper::impl_initScrollBar( ScrollBar& _rScrollBar ) const aStyle.SetDragFullOptions( aStyle.GetDragFullOptions() | DRAGFULL_OPTION_SCROLL ); // live scrolling aSettings.SetStyleSettings( aStyle ); _rScrollBar.SetSettings( aSettings ); + //_rScrollBar.SetMapMode( MapMode( MAP_100TH_MM ) ); _rScrollBar.SetScrollHdl( LINK( this, OScrollWindowHelper, ScrollHdl ) ); - _rScrollBar.SetLineSize( SCR_LINE_SIZE ); + _rScrollBar.SetLineSize( SCR_LINE_SIZE ); } // ----------------------------------------------------------------------------- @@ -103,7 +104,7 @@ void OScrollWindowHelper::initialize() { uno::Reference<report::XReportDefinition> xReportDefinition = m_pParent->getController().getReportDefinition(); m_pReportDefintionMultiPlexer = addStyleListener(xReportDefinition,this); - + m_aReportWindow.initialize(); } //------------------------------------------------------------------------------ @@ -117,7 +118,7 @@ void OScrollWindowHelper::setTotalSize(sal_Int32 _nWidth ,sal_Int32 _nHeight) long nWidth = long(_nWidth - (double)aStartWidth); m_aHScroll.SetRangeMax( nWidth ); m_aVScroll.SetRangeMax( m_aTotalPixelSize.Height() ); - + Resize(); } //------------------------------------------------------------------------------ @@ -133,14 +134,14 @@ Size OScrollWindowHelper::ResizeScrollBars() const long nScrSize = GetSettings().GetStyleSettings().GetScrollBarSize(); bool bVVisible = false; // by default no vertical-ScrollBar bool bHVisible = false; // by default no horizontal-ScrollBar - bool bChanged; // determines if a visiblility was changed + bool bChanged; // determines if a visiblility was changed do { bChanged = false; // does we need a vertical ScrollBar if ( aOutPixSz.Width() < m_aTotalPixelSize.Width() && !bHVisible ) - { + { bHVisible = true; aOutPixSz.Height() -= nScrSize; bChanged = true; @@ -148,7 +149,7 @@ Size OScrollWindowHelper::ResizeScrollBars() // does we need a horizontal ScrollBar if ( aOutPixSz.Height() < m_aTotalPixelSize.Height() && !bVVisible ) - { + { bVVisible = true; aOutPixSz.Width() -= nScrSize; bChanged = true; @@ -174,7 +175,7 @@ Size OScrollWindowHelper::ResizeScrollBars() const Point aOffset = LogicToPixel( Point( SECTION_OFFSET, SECTION_OFFSET ), MAP_APPFONT ); // resize scrollbars and set their ranges - { + { Fraction aStartWidth(long(REPORT_STARTMARKER_WIDTH*m_pParent->getController().getZoomValue()),100); const sal_Int32 nNewWidth = aOutPixSz.Width() - aOffset.X() - (long)aStartWidth; lcl_setScrollBar(nNewWidth,Point( (long)aStartWidth + aOffset.X(), aOutPixSz.Height() ),Size( nNewWidth, nScrSize ),m_aHScroll); @@ -203,12 +204,12 @@ IMPL_LINK( OScrollWindowHelper, ScrollHdl, ScrollBar*, /*pScroll*/ ) //------------------------------------------------------------------------------ void OScrollWindowHelper::addSection(const uno::Reference< report::XSection >& _xSection ,const ::rtl::OUString& _sColorEntry - ,sal_uInt16 _nPosition) + ,USHORT _nPosition) { m_aReportWindow.addSection(_xSection,_sColorEntry,_nPosition); } //------------------------------------------------------------------------------ -void OScrollWindowHelper::removeSection(sal_uInt16 _nPosition) +void OScrollWindowHelper::removeSection(USHORT _nPosition) { m_aReportWindow.removeSection(_nPosition); } @@ -218,12 +219,12 @@ void OScrollWindowHelper::toggleGrid(sal_Bool _bVisible) m_aReportWindow.toggleGrid(_bVisible); } //------------------------------------------------------------------------------ -sal_uInt16 OScrollWindowHelper::getSectionCount() const +USHORT OScrollWindowHelper::getSectionCount() const { return m_aReportWindow.getSectionCount(); } //------------------------------------------------------------------------------ -void OScrollWindowHelper::SetInsertObj( sal_uInt16 eObj,const ::rtl::OUString& _sShapeType ) +void OScrollWindowHelper::SetInsertObj( USHORT eObj,const ::rtl::OUString& _sShapeType ) { m_aReportWindow.SetInsertObj(eObj,_sShapeType); } @@ -238,7 +239,7 @@ void OScrollWindowHelper::SetMode( DlgEdMode _eNewMode ) m_aReportWindow.SetMode(_eNewMode); } //------------------------------------------------------------------------------ -sal_Bool OScrollWindowHelper::HasSelection() const +BOOL OScrollWindowHelper::HasSelection() const { return m_aReportWindow.HasSelection(); } @@ -249,7 +250,7 @@ void OScrollWindowHelper::Delete() } //---------------------------------------------------------------------------- void OScrollWindowHelper::Copy() -{ +{ m_aReportWindow.Copy(); } //---------------------------------------------------------------------------- @@ -258,7 +259,7 @@ void OScrollWindowHelper::Paste() m_aReportWindow.Paste(); } //---------------------------------------------------------------------------- -sal_Bool OScrollWindowHelper::IsPasteAllowed() const +BOOL OScrollWindowHelper::IsPasteAllowed() const { return m_aReportWindow.IsPasteAllowed(); } @@ -313,7 +314,7 @@ void OScrollWindowHelper::setMarked(const uno::Sequence< uno::Reference< report: return m_aReportWindow.getSectionWindow(_xSection); } // ------------------------------------------------------------------------- -void OScrollWindowHelper::markSection(const sal_uInt16 _nPos) +void OScrollWindowHelper::markSection(const sal_uInt16 _nPos) { m_aReportWindow.markSection(_nPos); } @@ -331,19 +332,19 @@ void OScrollWindowHelper::collapseSections(const uno::Sequence< ::com::sun::star long OScrollWindowHelper::Notify( NotifyEvent& rNEvt ) { const CommandEvent* pCommandEvent = rNEvt.GetCommandEvent(); - if ( pCommandEvent && + if ( pCommandEvent && ( ((pCommandEvent->GetCommand() == COMMAND_WHEEL) || (pCommandEvent->GetCommand() == COMMAND_STARTAUTOSCROLL) || (pCommandEvent->GetCommand() == COMMAND_AUTOSCROLL))) ) - { + { ScrollBar* pHScrBar = NULL; ScrollBar* pVScrBar = NULL; if ( m_aHScroll.IsVisible() ) pHScrBar = &m_aHScroll; - + if ( m_aVScroll.IsVisible() ) pVScrBar = &m_aVScroll; - + if ( HandleScrollCommand( *pCommandEvent, pHScrBar, pVScrBar ) ) return 1L; } @@ -358,6 +359,7 @@ void OScrollWindowHelper::alignMarkedObjects(sal_Int32 _nControlModification,boo void OScrollWindowHelper::ImplInitSettings() { SetBackground( Wallpaper( Application::GetSettings().GetStyleSettings().GetFaceColor() )); + // SetBackground( Wallpaper( COL_LIGHTRED )); SetFillColor( Application::GetSettings().GetStyleSettings().GetFaceColor() ); SetTextFillColor( Application::GetSettings().GetStyleSettings().GetFaceColor() ); } @@ -369,7 +371,7 @@ void OScrollWindowHelper::DataChanged( const DataChangedEvent& rDCEvt ) if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) ) { - ImplInitSettings(); + ImplInitSettings(); Invalidate(); } } @@ -379,12 +381,12 @@ void OScrollWindowHelper::_propertyChanged(const beans::PropertyChangeEvent& /*_ m_aReportWindow.notifySizeChanged(); } // ----------------------------------------------------------------------------- -void OScrollWindowHelper::setGridSnap(sal_Bool bOn) +void OScrollWindowHelper::setGridSnap(BOOL bOn) { m_aReportWindow.setGridSnap(bOn); } // ----------------------------------------------------------------------------- -void OScrollWindowHelper::setDragStripes(sal_Bool bOn) +void OScrollWindowHelper::setDragStripes(BOOL bOn) { m_aReportWindow.setDragStripes(bOn); } diff --git a/reportdesign/source/ui/report/SectionView.cxx b/reportdesign/source/ui/report/SectionView.cxx index a0355349e361..f47df1521b36 100644 --- a/reportdesign/source/ui/report/SectionView.cxx +++ b/reportdesign/source/ui/report/SectionView.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,14 +57,14 @@ OSectionView::OSectionView( SdrModel* pModel, OReportSection* _pSectionWindow, O SetBufferedOverlayAllowed(true); SetPageBorderVisible(false); SetBordVisible(); - SetQuickTextEditMode(sal_False); + SetQuickTextEditMode(FALSE); } //---------------------------------------------------------------------------- OSectionView::~OSectionView() { - DBG_DTOR( rpt_OSectionView,NULL); + DBG_DTOR( rpt_OSectionView,NULL); } //---------------------------------------------------------------------------- @@ -73,9 +73,10 @@ void OSectionView::MarkListHasChanged() { DBG_CHKTHIS( rpt_OSectionView,NULL); SdrView::MarkListHasChanged(); - + if ( m_pReportWindow && m_pSectionWindow && !m_pSectionWindow->getPage()->getSpecialMode() ) { + //m_pReportWindow->unmarkAllObjects(this); // WHY DlgEdHint aHint( RPTUI_HINT_SELECTIONCHANGED ); m_pReportWindow->getReportView()->Broadcast( aHint ); m_pReportWindow->getReportView()->UpdatePropertyBrowserDelayed(*this); @@ -162,16 +163,16 @@ void OSectionView::ObjectRemovedInAliveMode( const SdrObject* _pObject ) { DBG_CHKTHIS( rpt_OSectionView,NULL); const SdrMarkList& rMarkedList = GetMarkedObjectList(); - const sal_uLong nMark = rMarkedList.GetMarkCount(); + const ULONG nMark = rMarkedList.GetMarkCount(); - for( sal_uLong i = 0; i < nMark; i++ ) + for( ULONG i = 0; i < nMark; i++ ) { SdrObject* pSdrObj = rMarkedList.GetMark(i)->GetMarkedSdrObj(); if (_pObject == pSdrObj) { SdrPageView* pPgView = GetSdrPageView(); BrkAction(); - MarkObj( pSdrObj, pPgView, sal_True ); + MarkObj( pSdrObj, pPgView, TRUE ); break; } } @@ -182,13 +183,13 @@ void OSectionView::SetMarkedToLayer( SdrLayerID _nLayerNo ) { if (AreObjectsMarked()) { - // #i11702# use SdrUndoObjectLayerChange for undo - // STR_UNDO_SELATTR is "Attributes" - should use a different text later + // #i11702# use SdrUndoObjectLayerChange for undo + // STR_UNDO_SELATTR is "Attributes" - should use a different text later BegUndo( ); const SdrMarkList& rMark = GetMarkedObjectList(); - sal_uLong nCount = rMark.GetMarkCount(); - for (sal_uLong i=0; i<nCount; i++) + ULONG nCount = rMark.GetMarkCount(); + for (ULONG i=0; i<nCount; i++) { SdrObject* pObj = rMark.GetMark(i)->GetMarkedSdrObj(); if ( pObj->ISA(OCustomShape) ) @@ -209,7 +210,7 @@ void OSectionView::SetMarkedToLayer( SdrLayerID _nLayerNo ) EndUndo(); - // check mark list now instead of later in a timer + // #84073# check mark list now instead of later in a timer CheckMarked(); MarkListHasChanged(); } @@ -218,10 +219,10 @@ void OSectionView::SetMarkedToLayer( SdrLayerID _nLayerNo ) bool OSectionView::OnlyShapesMarked() const { const SdrMarkList& rMark = GetMarkedObjectList(); - const sal_uLong nCount = rMark.GetMarkCount(); + const ULONG nCount = rMark.GetMarkCount(); if ( !nCount ) return false; - sal_uLong i=0; + ULONG i=0; for (; i<nCount; i++) { SdrObject* pObj = rMark.GetMark(i)->GetMarkedSdrObj(); @@ -229,7 +230,7 @@ bool OSectionView::OnlyShapesMarked() const { break; } - } + } // for (ULONG i=0; i<nCount; i++) return i == nCount; } @@ -253,7 +254,7 @@ short OSectionView::GetLayerIdOfMarkedObjects() const { short nRet = SHRT_MAX; const SdrMarkList &rMrkList = GetMarkedObjectList(); - for ( sal_uInt16 i = 0; i < rMrkList.GetMarkCount(); ++i ) + for ( USHORT i = 0; i < rMrkList.GetMarkCount(); ++i ) { const SdrObject *pObj = rMrkList.GetMark( i )->GetMarkedSdrObj(); if ( nRet == SHRT_MAX ) diff --git a/reportdesign/source/ui/report/SectionWindow.cxx b/reportdesign/source/ui/report/SectionWindow.cxx index c80f3af70db5..7a72e6e075ac 100644 --- a/reportdesign/source/ui/report/SectionWindow.cxx +++ b/reportdesign/source/ui/report/SectionWindow.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,7 +51,7 @@ namespace rptui { -#define SECTION_OFFSET 3 +#define SECTION_OFFSET 3 using namespace ::com::sun::star; using namespace ::comphelper; @@ -78,8 +78,8 @@ OSectionWindow::OSectionWindow( OViewsWindow* _pParent,const uno::Reference< rep m_aSplitter.SetEndSplitHdl(LINK(this, OSectionWindow,EndSplitHdl)); m_aSplitter.SetBackground( Wallpaper( Application::GetSettings().GetStyleSettings().GetFaceColor() )); m_aSplitter.SetSplitPosPixel(m_aSplitter.LogicToPixel(Size(0,_xSection->getHeight())).Height()); - - + + m_aStartMarker.setCollapsedHdl(LINK(this,OSectionWindow,Collapsed)); m_aStartMarker.zoom(rMapMode.GetScaleX()); @@ -108,9 +108,9 @@ OSectionWindow::OSectionWindow( OViewsWindow* _pParent,const uno::Reference< rep aEvent.Source = xGroup; aEvent.PropertyName = PROPERTY_EXPRESSION; } - + _propertyChanged(aEvent); - SetPaintTransparent(sal_True); + SetPaintTransparent(TRUE); } // ----------------------------------------------------------------------------- OSectionWindow::~OSectionWindow() @@ -125,7 +125,7 @@ OSectionWindow::~OSectionWindow() } catch (uno::Exception&) { - } + } } // ----------------------------------------------------------------------------- void OSectionWindow::_propertyChanged(const beans::PropertyChangeEvent& _rEvent) throw( uno::RuntimeException) @@ -136,20 +136,23 @@ void OSectionWindow::_propertyChanged(const beans::PropertyChangeEvent& _rEvent) const uno::Reference< report::XSection> xCurrentSection = m_aReportSection.getSection(); if ( _rEvent.PropertyName.equals(PROPERTY_HEIGHT) ) { - m_pParent->getView()->SetUpdateMode(sal_False); + m_pParent->getView()->SetUpdateMode(FALSE); Resize(); m_pParent->getView()->notifySizeChanged(); m_pParent->resize(*this); - m_pParent->getView()->SetUpdateMode(sal_True); + m_pParent->getView()->SetUpdateMode(TRUE); m_aStartMarker.Invalidate(INVALIDATE_NOERASE); m_aEndMarker.Invalidate(INVALIDATE_NOERASE); m_aReportSection.Invalidate(/*INVALIDATE_NOERASE*/); getViewsWindow()->getView()->getReportView()->getController().resetZoomType(); + // Invalidate(INVALIDATE_NOCHILDREN | INVALIDATE_TRANSPARENT); + // m_pParent->Invalidate(INVALIDATE_NOCHILDREN|INVALIDATE_NOERASE|INVALIDATE_TRANSPARENT); + // m_pParent->Invalidate(/*INVALIDATE_NOCHILDREN | INVALIDATE_NOERASE |*/ INVALIDATE_NOCHILDREN | INVALIDATE_TRANSPARENT); } else if ( _rEvent.PropertyName.equals(PROPERTY_NAME) && !xSection->getGroup().is() ) { uno::Reference< report::XReportDefinition > xReport = xSection->getReportDefinition(); - if ( setReportSectionTitle(xReport,RID_STR_REPORT_HEADER,::std::mem_fun(&OReportHelper::getReportHeader),::std::mem_fun(&OReportHelper::getReportHeaderOn)) + if ( setReportSectionTitle(xReport,RID_STR_REPORT_HEADER,::std::mem_fun(&OReportHelper::getReportHeader),::std::mem_fun(&OReportHelper::getReportHeaderOn)) || setReportSectionTitle(xReport,RID_STR_REPORT_FOOTER,::std::mem_fun(&OReportHelper::getReportFooter),::std::mem_fun(&OReportHelper::getReportFooterOn)) || setReportSectionTitle(xReport,RID_STR_PAGE_HEADER,::std::mem_fun(&OReportHelper::getPageHeader),::std::mem_fun(&OReportHelper::getPageHeaderOn)) || setReportSectionTitle(xReport,RID_STR_PAGE_FOOTER,::std::mem_fun(&OReportHelper::getPageFooter),::std::mem_fun(&OReportHelper::getPageFooterOn)) ) @@ -161,7 +164,7 @@ void OSectionWindow::_propertyChanged(const beans::PropertyChangeEvent& _rEvent) m_aStartMarker.Invalidate(INVALIDATE_CHILDREN); } } - } + } // if ( xSection.is() ) else if ( _rEvent.PropertyName.equals(PROPERTY_EXPRESSION) ) { uno::Reference< report::XGroup > xGroup(_rEvent.Source,uno::UNO_QUERY); @@ -173,7 +176,7 @@ void OSectionWindow::_propertyChanged(const beans::PropertyChangeEvent& _rEvent) } } // ----------------------------------------------------------------------------- -bool OSectionWindow::setReportSectionTitle(const uno::Reference< report::XReportDefinition>& _xReport,sal_uInt16 _nResId,::std::mem_fun_t<uno::Reference<report::XSection> , OReportHelper> _pGetSection,::std::mem_fun_t<sal_Bool,OReportHelper> _pIsSectionOn) +bool OSectionWindow::setReportSectionTitle(const uno::Reference< report::XReportDefinition>& _xReport,USHORT _nResId,::std::mem_fun_t<uno::Reference<report::XSection> , OReportHelper> _pGetSection,::std::mem_fun_t<sal_Bool,OReportHelper> _pIsSectionOn) { OReportHelper aReportHelper(_xReport); const bool bRet = _pIsSectionOn(&aReportHelper) && _pGetSection(&aReportHelper) == m_aReportSection.getSection(); @@ -182,11 +185,11 @@ bool OSectionWindow::setReportSectionTitle(const uno::Reference< report::XReport String sTitle = String(ModuleRes(_nResId)); m_aStartMarker.setTitle(sTitle); m_aStartMarker.Invalidate(INVALIDATE_CHILDREN); - } + } // if ( bRet ) return bRet; } // ----------------------------------------------------------------------------- -bool OSectionWindow::setGroupSectionTitle(const uno::Reference< report::XGroup>& _xGroup,sal_uInt16 _nResId,::std::mem_fun_t<uno::Reference<report::XSection> , OGroupHelper> _pGetSection,::std::mem_fun_t<sal_Bool,OGroupHelper> _pIsSectionOn) +bool OSectionWindow::setGroupSectionTitle(const uno::Reference< report::XGroup>& _xGroup,USHORT _nResId,::std::mem_fun_t<uno::Reference<report::XSection> , OGroupHelper> _pGetSection,::std::mem_fun_t<sal_Bool,OGroupHelper> _pIsSectionOn) { OGroupHelper aGroupHelper(_xGroup); const bool bRet = _pIsSectionOn(&aGroupHelper) && _pGetSection(&aGroupHelper) == m_aReportSection.getSection() ; @@ -203,13 +206,14 @@ bool OSectionWindow::setGroupSectionTitle(const uno::Reference< report::XGroup>& sTitle.SearchAndReplace('#',sExpression); m_aStartMarker.setTitle(sTitle); m_aStartMarker.Invalidate(INVALIDATE_CHILDREN); - } + } // if ( _pIsSectionOn(&aGroupHelper) ) return bRet; } //------------------------------------------------------------------------------ void OSectionWindow::ImplInitSettings() { SetBackground( ); + //SetBackground( Wallpaper( COL_RED )); } //----------------------------------------------------------------------------- void OSectionWindow::DataChanged( const DataChangedEvent& rDCEvt ) @@ -219,15 +223,15 @@ void OSectionWindow::DataChanged( const DataChangedEvent& rDCEvt ) if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) ) { - ImplInitSettings(); + ImplInitSettings(); Invalidate(); } } //------------------------------------------------------------------------------ void OSectionWindow::Resize() { - Window::Resize(); - + Window::Resize(); + Size aOutputSize = GetOutputSizePixel(); Fraction aEndWidth(long(REPORT_ENDMARKER_WIDTH)); aEndWidth *= GetMapMode().GetScaleX(); @@ -242,9 +246,9 @@ void OSectionWindow::Resize() m_aStartMarker.SetPosSizePixel(aPos,aOutputSize); } else - { + { const bool bShowEndMarker = m_pParent->getView()->GetTotalWidth() <= (aThumbPos.X() + aOutputSize.Width() ); - + Fraction aStartWidth(long(REPORT_STARTMARKER_WIDTH)); aStartWidth *= GetMapMode().GetScaleX(); @@ -305,6 +309,8 @@ IMPL_LINK( OSectionWindow, Collapsed, OColorListener *, _pMarker ) m_pParent->resize(*this); Resize(); + // TRY + // m_pParent->Invalidate(INVALIDATE_TRANSPARENT | INVALIDATE_NOCHILDREN); Invalidate(); } return 0L; @@ -318,19 +324,21 @@ void OSectionWindow::zoom(const Fraction& _aZoom) setZoomFactor(_aZoom,m_aReportSection); setZoomFactor(_aZoom,m_aSplitter); setZoomFactor(_aZoom,m_aEndMarker); - Invalidate(); + //Resize(); + Invalidate(/*INVALIDATE_UPDATE |*/ /* | INVALIDATE_TRANSPARENT *//*INVALIDATE_NOCHILDREN*/); } //----------------------------------------------------------------------------- IMPL_LINK( OSectionWindow, StartSplitHdl, Splitter*, ) { - const String sUndoAction( ModuleRes( RID_STR_UNDO_CHANGE_SIZE ) ); - getViewsWindow()->getView()->getReportView()->getController().getUndoManager().EnterListAction( sUndoAction, String() ); + const String sEmpty(ModuleRes(RID_STR_UNDO_CHANGE_SIZE)); + getViewsWindow()->getView()->getReportView()->getController().getUndoMgr()->EnterListAction(sEmpty,String()); return 0L; } //------------------------------------------------------------------------------ IMPL_LINK( OSectionWindow, EndSplitHdl, Splitter*, ) { - getViewsWindow()->getView()->getReportView()->getController().getUndoManager().LeaveListAction(); + getViewsWindow()->getView()->getReportView()->getController().getUndoMgr()->LeaveListAction(); + /*getViewsWindow()->Resize();*/ return 0L; } //----------------------------------------------------------------------------- @@ -342,19 +350,22 @@ IMPL_LINK( OSectionWindow, SplitHdl, Splitter*, _pSplitter ) } sal_Int32 nSplitPos = _pSplitter->GetSplitPosPixel(); + const Point aPos = _pSplitter->GetPosPixel(); + const uno::Reference< report::XSection> xSection = m_aReportSection.getSection(); nSplitPos = m_aSplitter.PixelToLogic(Size(0,nSplitPos)).Height(); - + // nSplitPos = xSection->getHeight() + m_aSplitter.PixelToLogic(Size(0,nSplitPos - aPos.Y() )).Height(); + const sal_Int32 nCount = xSection->getCount(); for (sal_Int32 i = 0; i < nCount; ++i) { uno::Reference<report::XReportComponent> xReportComponent(xSection->getByIndex(i),uno::UNO_QUERY); - if ( xReportComponent.is() ) + if ( xReportComponent.is() /*&& nSplitPos < (xReportComponent->getPositionY() + xReportComponent->getHeight())*/ ) { nSplitPos = ::std::max(nSplitPos,xReportComponent->getPositionY() + xReportComponent->getHeight()); } - } + } // for (sal_Int32 i = 0; i < nCount; ++i) if ( nSplitPos < 0 ) nSplitPos = 0; @@ -367,7 +378,7 @@ IMPL_LINK( OSectionWindow, SplitHdl, Splitter*, _pSplitter ) // ----------------------------------------------------------------------------- void lcl_scroll(Window& _rWindow,const Point& _aDelta) { - _rWindow.Scroll(-_aDelta.X(),-_aDelta.Y()); + _rWindow.Scroll(-_aDelta.X(),-_aDelta.Y()/*,SCROLL_CHILDREN*//*|SCROLL_CLIP*/); _rWindow.Invalidate(INVALIDATE_TRANSPARENT); } // ----------------------------------------------------------------------------- @@ -390,11 +401,13 @@ void OSectionWindow::scrollChildren(long _nX) const Point aNew = aMapMode.GetOrigin(); const Point aDiff = aOld - aNew; { + //OWindowPositionCorrector aCorrector(&m_aReportSection,-aDelta.Width(),0); lcl_scroll(m_aReportSection,aDiff); } - + + //lcl_setOrigin(m_aEndMarker,_nDeltaX, 0); lcl_scroll(m_aEndMarker,m_aEndMarker.PixelToLogic(Point(_nX,0))); - + lcl_setOrigin(m_aSplitter,_nX, 0); lcl_scroll(m_aSplitter,aDiff); diff --git a/reportdesign/source/ui/report/StartMarker.cxx b/reportdesign/source/ui/report/StartMarker.cxx index b27fcdec1f13..0cd74a8988bd 100644 --- a/reportdesign/source/ui/report/StartMarker.cxx +++ b/reportdesign/source/ui/report/StartMarker.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,16 +42,18 @@ #include <unotools/syslocale.hxx> #include <svl/smplhint.hxx> -#define CORNER_SPACE 5 +#define CORNER_SPACE 5 //===================================================================== namespace rptui { //===================================================================== -Image* OStartMarker::s_pDefCollapsed = NULL; -Image* OStartMarker::s_pDefExpanded = NULL; -oslInterlockedCount OStartMarker::s_nImageRefCount = 0; +Image* OStartMarker::s_pDefCollapsed = NULL; +Image* OStartMarker::s_pDefExpanded = NULL; +Image* OStartMarker::s_pDefCollapsedHC = NULL; +Image* OStartMarker::s_pDefExpandedHC = NULL; +oslInterlockedCount OStartMarker::s_nImageRefCount = 0; DBG_NAME( rpt_OStartMarker ) // ----------------------------------------------------------------------------- @@ -82,17 +84,19 @@ OStartMarker::OStartMarker(OSectionWindow* _pParent,const ::rtl::OUString& _sCol m_aVRuler.SetMargin2(); const MeasurementSystem eSystem = SvtSysLocale().GetLocaleData().getMeasurementSystemEnum(); m_aVRuler.SetUnit(MEASURE_METRIC == eSystem ? FUNIT_CM : FUNIT_INCH); - SetPaintTransparent(sal_True); + SetPaintTransparent(TRUE); } // ----------------------------------------------------------------------------- OStartMarker::~OStartMarker() { - DBG_DTOR( rpt_OStartMarker,NULL); + DBG_DTOR( rpt_OStartMarker,NULL); if ( osl_decrementInterlockedCount(&s_nImageRefCount) == 0 ) { DELETEZ(s_pDefCollapsed); DELETEZ(s_pDefExpanded); - } + DELETEZ(s_pDefCollapsedHC); + DELETEZ(s_pDefExpandedHC); + } // if ( osl_decrementInterlockedCount(&s_nImageRefCount) == 0 ) } // ----------------------------------------------------------------------------- sal_Int32 OStartMarker::getMinHeight() const @@ -105,6 +109,7 @@ sal_Int32 OStartMarker::getMinHeight() const void OStartMarker::Paint( const Rectangle& rRect ) { Window::Paint( rRect ); + //SetUpdateMode(FALSE); Size aSize = GetOutputSizePixel(); long nSize = aSize.Width(); const long nCornerWidth = long(CORNER_SPACE * (double)GetMapMode().GetScaleX()); @@ -112,10 +117,10 @@ void OStartMarker::Paint( const Rectangle& rRect ) if ( !isCollapsed() ) { const long nVRulerWidth = m_aVRuler.GetSizePixel().Width(); - nSize = aSize.Width() - nVRulerWidth; + nSize = aSize.Width() - nVRulerWidth/* - m_nCornerSize*/; SetClipRegion(Region(PixelToLogic(Rectangle(Point(),Size( nSize,aSize.Height()))))); aSize.Width() += nCornerWidth; - } + } // if ( !isCollapsed() ) else SetClipRegion(); @@ -128,14 +133,14 @@ void OStartMarker::Paint( const Rectangle& rRect ) Color aStartColor(m_nColor); aStartColor.IncreaseLuminance(10); - sal_uInt16 nHue = 0; - sal_uInt16 nSat = 0; - sal_uInt16 nBri = 0; + USHORT nHue = 0; + USHORT nSat = 0; + USHORT nBri = 0; aStartColor.RGBtoHSB(nHue, nSat, nBri); nSat += 40; Color aEndColor(Color::HSBtoRGB(nHue, nSat, nBri)); Gradient aGradient(GRADIENT_LINEAR,aStartColor,aEndColor); - aGradient.SetSteps(static_cast<sal_uInt16>(aSize.Height())); + aGradient.SetSteps(static_cast<USHORT>(aSize.Height())); DrawGradient(PixelToLogic(aPoly) ,aGradient); } @@ -163,7 +168,7 @@ void OStartMarker::MouseButtonUp( const MouseEvent& rMEvt ) { if ( !rMEvt.IsLeft() ) return; - + Point aPos( rMEvt.GetPosPixel()); const Size aOutputSize = GetOutputSizePixel(); @@ -173,7 +178,7 @@ void OStartMarker::MouseButtonUp( const MouseEvent& rMEvt ) if ( rMEvt.GetClicks() == 2 || aRect.IsInside( aPos ) ) { m_bCollapsed = !m_bCollapsed; - + changeImage(); m_aVRuler.Show(!m_bCollapsed && m_bShowRuler); @@ -186,7 +191,11 @@ void OStartMarker::MouseButtonUp( const MouseEvent& rMEvt ) // ----------------------------------------------------------------------------- void OStartMarker::changeImage() { - Image* pImage = m_bCollapsed ? s_pDefCollapsed : s_pDefExpanded; + Image* pImage = NULL; + if ( GetSettings().GetStyleSettings().GetHighContrastMode() ) + pImage = m_bCollapsed ? s_pDefCollapsedHC : s_pDefExpandedHC; + else + pImage = m_bCollapsed ? s_pDefCollapsed : s_pDefExpanded; m_aImage.SetImage(*pImage); } // ----------------------------------------------------------------------- @@ -195,19 +204,30 @@ void OStartMarker::initDefaultNodeImages() if ( !s_pDefCollapsed ) { s_pDefCollapsed = new Image( ModuleRes( RID_IMG_TREENODE_COLLAPSED ) ); + s_pDefCollapsedHC = new Image( ModuleRes( RID_IMG_TREENODE_COLLAPSED_HC ) ); s_pDefExpanded = new Image( ModuleRes( RID_IMG_TREENODE_EXPANDED ) ); + s_pDefExpandedHC = new Image( ModuleRes( RID_IMG_TREENODE_EXPANDED_HC ) ); } - Image* pImage = m_bCollapsed ? s_pDefCollapsed : s_pDefExpanded; + Image* pImage = NULL; + if ( GetSettings().GetStyleSettings().GetHighContrastMode() ) + { + pImage = m_bCollapsed ? s_pDefCollapsedHC : s_pDefExpandedHC; + } + else + { + pImage = m_bCollapsed ? s_pDefCollapsed : s_pDefExpanded; + } m_aImage.SetImage(*pImage); - m_aImage.SetMouseTransparent(sal_True); + m_aImage.SetMouseTransparent(TRUE); m_aImage.SetBackground(); m_aText.SetBackground(); - m_aText.SetMouseTransparent(sal_True); + m_aText.SetMouseTransparent(TRUE); } // ----------------------------------------------------------------------- void OStartMarker::ImplInitSettings() { + // SetBackground( Wallpaper( COL_YELLOW )); SetBackground( ); SetFillColor( Application::GetSettings().GetStyleSettings().GetDialogColor() ); setColor(); @@ -216,7 +236,7 @@ void OStartMarker::ImplInitSettings() void OStartMarker::Resize() { const Size aOutputSize( GetOutputSizePixel() ); - const long nOutputWidth = aOutputSize.Width(); + const long nOutputWidth = aOutputSize.Width(); const long nOutputHeight = aOutputSize.Height(); const long nVRulerWidth = m_aVRuler.GetSizePixel().Width(); @@ -253,6 +273,7 @@ void OStartMarker::Notify(SfxBroadcaster & rBc, SfxHint const & rHint) == SFX_HINT_COLORS_CHANGED)) { setColor(); + //m_aText.Invalidate(); Invalidate(INVALIDATE_CHILDREN); } } @@ -269,6 +290,7 @@ void OStartMarker::RequestHelp( const HelpEvent& rHEvt ) { // Hilfe anzeigen Rectangle aItemRect(rHEvt.GetMousePosPixel(),Size(GetSizePixel().Width(),getMinHeight())); + //aItemRect = LogicToPixel( aItemRect ); Point aPt = OutputToScreenPixel( aItemRect.TopLeft() ); aItemRect.Left() = aPt.X(); aItemRect.Top() = aPt.Y(); @@ -283,7 +305,7 @@ void OStartMarker::RequestHelp( const HelpEvent& rHEvt ) } // ----------------------------------------------------------------------------- void OStartMarker::setCollapsed(sal_Bool _bCollapsed) -{ +{ OColorListener::setCollapsed(_bCollapsed); showRuler(_bCollapsed); changeImage(); diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx index 7e66ceab829a..df456b102770 100644 --- a/reportdesign/source/ui/report/ViewsWindow.cxx +++ b/reportdesign/source/ui/report/ViewsWindow.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,7 +57,6 @@ #include <toolkit/helper/convert.hxx> #include <algorithm> #include <numeric> -#include <o3tl/compat_functional.hxx> namespace rptui { @@ -69,7 +68,7 @@ using namespace ::comphelper; bool lcl_getNewRectSize(const Rectangle& _aObjRect,long& _nXMov, long& _nYMov,SdrObject* _pObj,SdrView* _pView,sal_Int32 _nControlModification, bool _bBoundRects) { bool bMoveAllowed = _nXMov != 0 || _nYMov != 0; - if ( bMoveAllowed ) + if ( bMoveAllowed ) { Rectangle aNewRect = _aObjRect; SdrObject* pOverlappedObj = NULL; @@ -88,7 +87,7 @@ bool lcl_getNewRectSize(const Rectangle& _aObjRect,long& _nXMov, long& _nYMov,Sd break; } if ( dynamic_cast<OUnoObject*>(_pObj) ) - { + { pOverlappedObj = isOver(aNewRect,*_pObj->GetPage(),*_pView,true,_pObj); if ( pOverlappedObj && _pObj != pOverlappedObj ) { @@ -98,7 +97,7 @@ bool lcl_getNewRectSize(const Rectangle& _aObjRect,long& _nXMov, long& _nYMov,Sd switch(_nControlModification) { case ControlModification::LEFT: - nXTemp += aOverlappingRect.Right() - aNewRect.Left(); + nXTemp += aOverlappingRect.Right() - aNewRect.Left(); bMoveAllowed = _nXMov != nXTemp; break; case ControlModification::RIGHT: @@ -165,7 +164,7 @@ bool lcl_getNewRectSize(const Rectangle& _aObjRect,long& _nXMov, long& _nYMov,Sd default: break; } - + _nXMov = nXTemp; _nYMov = nYTemp; } @@ -180,13 +179,13 @@ bool lcl_getNewRectSize(const Rectangle& _aObjRect,long& _nXMov, long& _nYMov,Sd // ----------------------------------------------------------------------------- DBG_NAME( rpt_OViewsWindow ); -OViewsWindow::OViewsWindow( OReportWindow* _pReportWindow) +OViewsWindow::OViewsWindow( OReportWindow* _pReportWindow) : Window( _pReportWindow,WB_DIALOGCONTROL) ,m_pParent(_pReportWindow) ,m_bInUnmark(sal_False) { DBG_CTOR( rpt_OViewsWindow,NULL); - SetPaintTransparent(sal_True); + SetPaintTransparent(TRUE); SetUniqueId(UID_RPT_VIEWSWINDOW); SetMapMode( MapMode( MAP_100TH_MM ) ); m_aColorConfig.AddListener(this); @@ -203,7 +202,7 @@ OViewsWindow::~OViewsWindow() // ----------------------------------------------------------------------------- void OViewsWindow::initialize() { - + } // ----------------------------------------------------------------------------- void OViewsWindow::impl_resizeSectionWindow(OSectionWindow& _rSectionWindow,Point& _rStartPoint,bool _bSet) @@ -212,7 +211,7 @@ void OViewsWindow::impl_resizeSectionWindow(OSectionWindow& _rSectionWindow,Poin Size aSectionSize = _rSectionWindow.LogicToPixel( Size( 0,xSection->getHeight() ) ); aSectionSize.Width() = getView()->GetTotalWidth(); - + const sal_Int32 nMinHeight = _rSectionWindow.getStartMarker().getMinHeight(); if ( _rSectionWindow.getStartMarker().isCollapsed() || nMinHeight > aSectionSize.Height() ) { @@ -241,61 +240,62 @@ void OViewsWindow::resize(const OSectionWindow& _rSectionWindow) { aStartPoint = pSectionWindow->GetPosPixel(); bSet = true; - } - + } // if ( pSectionWindow.get() == &_rSectionWindow ) + if ( bSet ) { impl_resizeSectionWindow(*pSectionWindow.get(),aStartPoint,bSet); pSectionWindow->Invalidate(INVALIDATE_NOERASE | INVALIDATE_NOCHILDREN | INVALIDATE_TRANSPARENT); pSectionWindow->getStartMarker().Invalidate(INVALIDATE_NOERASE | INVALIDATE_NOCHILDREN | INVALIDATE_TRANSPARENT ); } - } + } // for (;aIter != aEnd ; ++aIter,++nPos) Fraction aStartWidth(long(REPORT_STARTMARKER_WIDTH)); aStartWidth *= GetMapMode().GetScaleX(); Size aOut = GetOutputSizePixel(); aOut.Width() = aStartWidth; aOut = PixelToLogic(aOut); m_pParent->notifySizeChanged(); - + Rectangle aRect(PixelToLogic(Point(0,0)),aOut); Invalidate(aRect,INVALIDATE_NOERASE | INVALIDATE_NOCHILDREN | INVALIDATE_TRANSPARENT); } //------------------------------------------------------------------------------ void OViewsWindow::Resize() { - Window::Resize(); + Window::Resize(); if ( !m_aSections.empty() ) { const Point aOffset(m_pParent->getThumbPos()); - Point aStartPoint(0,-aOffset.Y()); + Point aStartPoint(0,-aOffset.Y()); TSectionsMap::iterator aIter = m_aSections.begin(); TSectionsMap::iterator aEnd = m_aSections.end(); - for (;aIter != aEnd ; ++aIter) + for (USHORT nPos=0;aIter != aEnd ; ++aIter,++nPos) { const ::boost::shared_ptr<OSectionWindow> pSectionWindow = (*aIter); impl_resizeSectionWindow(*pSectionWindow.get(),aStartPoint,true); - } + } // for (;aIter != aEnd ; ++aIter) } } // ----------------------------------------------------------------------------- void OViewsWindow::Paint( const Rectangle& rRect ) { Window::Paint( rRect ); - + Size aOut = GetOutputSizePixel(); Fraction aStartWidth(long(REPORT_STARTMARKER_WIDTH)); aStartWidth *= GetMapMode().GetScaleX(); aOut.Width() -= (long)aStartWidth; aOut = PixelToLogic(aOut); - + Rectangle aRect(PixelToLogic(Point(aStartWidth,0)),aOut); Wallpaper aWall( m_aColorConfig.GetColorValue(::svtools::APPBACKGROUND).nColor ); DrawWallpaper(aRect,aWall); } //------------------------------------------------------------------------------ void OViewsWindow::ImplInitSettings() -{ +{ + // SetBackground( Wallpaper( COL_LIGHTBLUE )); SetBackground( ); SetFillColor( Application::GetSettings().GetStyleSettings().GetDialogColor() ); SetTextFillColor( Application::GetSettings().GetStyleSettings().GetDialogColor() ); @@ -313,7 +313,7 @@ void OViewsWindow::DataChanged( const DataChangedEvent& rDCEvt ) } } //---------------------------------------------------------------------------- -void OViewsWindow::addSection(const uno::Reference< report::XSection >& _xSection,const ::rtl::OUString& _sColorEntry,sal_uInt16 _nPosition) +void OViewsWindow::addSection(const uno::Reference< report::XSection >& _xSection,const ::rtl::OUString& _sColorEntry,USHORT _nPosition) { ::boost::shared_ptr<OSectionWindow> pSectionWindow( new OSectionWindow(this,_xSection,_sColorEntry) ); m_aSections.insert(getIteratorAtPos(_nPosition) , TSectionsMap::value_type(pSectionWindow)); @@ -322,7 +322,7 @@ void OViewsWindow::addSection(const uno::Reference< report::XSection >& _xSectio Resize(); } //---------------------------------------------------------------------------- -void OViewsWindow::removeSection(sal_uInt16 _nPosition) +void OViewsWindow::removeSection(USHORT _nPosition) { if ( _nPosition < m_aSections.size() ) { @@ -330,18 +330,18 @@ void OViewsWindow::removeSection(sal_uInt16 _nPosition) TSectionsMap::iterator aNew = getIteratorAtPos(_nPosition == 0 ? _nPosition+1: _nPosition - 1); m_pParent->getReportView()->UpdatePropertyBrowserDelayed((*aNew)->getReportSection().getSectionView()); - + m_aSections.erase(aPos); Resize(); - } + } // if ( _nPosition < m_aSections.size() ) } //------------------------------------------------------------------------------ -void OViewsWindow::toggleGrid(sal_Bool _bVisible) +void OViewsWindow::toggleGrid(BOOL _bVisible) { ::std::for_each(m_aSections.begin(),m_aSections.end(), - ::o3tl::compose1(::boost::bind(&OReportSection::SetGridVisible,_1,_bVisible),TReportPairHelper())); + ::std::compose1(::boost::bind(&OReportSection::SetGridVisible,_1,_bVisible),TReportPairHelper())); ::std::for_each(m_aSections.begin(),m_aSections.end(), - ::o3tl::compose1(::boost::bind(&OReportSection::Window::Invalidate,_1,INVALIDATE_NOERASE),TReportPairHelper())); + ::std::compose1(::boost::bind(&OReportSection::Window::Invalidate,_1,INVALIDATE_NOERASE),TReportPairHelper())); } //------------------------------------------------------------------------------ sal_Int32 OViewsWindow::getTotalHeight() const @@ -356,12 +356,12 @@ sal_Int32 OViewsWindow::getTotalHeight() const return nHeight; } //---------------------------------------------------------------------------- -sal_uInt16 OViewsWindow::getSectionCount() const +USHORT OViewsWindow::getSectionCount() const { - return static_cast<sal_uInt16>(m_aSections.size()); + return static_cast<USHORT>(m_aSections.size()); } //---------------------------------------------------------------------------- -void OViewsWindow::SetInsertObj( sal_uInt16 eObj,const ::rtl::OUString& _sShapeType ) +void OViewsWindow::SetInsertObj( USHORT eObj,const ::rtl::OUString& _sShapeType ) { TSectionsMap::iterator aIter = m_aSections.begin(); TSectionsMap::iterator aEnd = m_aSections.end(); @@ -380,23 +380,23 @@ rtl::OUString OViewsWindow::GetInsertObjString() const void OViewsWindow::SetMode( DlgEdMode eNewMode ) { ::std::for_each(m_aSections.begin(),m_aSections.end(), - ::o3tl::compose1(::boost::bind(&OReportSection::SetMode,_1,eNewMode),TReportPairHelper())); + ::std::compose1(::boost::bind(&OReportSection::SetMode,_1,eNewMode),TReportPairHelper())); } //---------------------------------------------------------------------------- -sal_Bool OViewsWindow::HasSelection() const +BOOL OViewsWindow::HasSelection() const { TSectionsMap::const_iterator aIter = m_aSections.begin(); TSectionsMap::const_iterator aEnd = m_aSections.end(); for (;aIter != aEnd && !(*aIter)->getReportSection().getSectionView().AreObjectsMarked(); ++aIter) ; - return aIter != aEnd; + return aIter != aEnd; } //---------------------------------------------------------------------------- void OViewsWindow::Delete() { m_bInUnmark = sal_True; ::std::for_each(m_aSections.begin(),m_aSections.end(), - ::o3tl::compose1(::boost::mem_fn(&OReportSection::Delete),TReportPairHelper())); + ::std::compose1(::boost::mem_fn(&OReportSection::Delete),TReportPairHelper())); m_bInUnmark = sal_False; } //---------------------------------------------------------------------------- @@ -404,20 +404,24 @@ void OViewsWindow::Copy() { uno::Sequence< beans::NamedValue > aAllreadyCopiedObjects; ::std::for_each(m_aSections.begin(),m_aSections.end(), - ::o3tl::compose1(::boost::bind(&OReportSection::Copy,_1,::boost::ref(aAllreadyCopiedObjects)),TReportPairHelper())); + ::std::compose1(::boost::bind(&OReportSection::Copy,_1,::boost::ref(aAllreadyCopiedObjects)),TReportPairHelper())); + //TSectionsMap::iterator aIter = m_aSections.begin(); + //TSectionsMap::iterator aEnd = m_aSections.end(); + //for (; aIter != aEnd; ++aIter) + // (*aIter)->getReportSection().Copy(aAllreadyCopiedObjects); OReportExchange* pCopy = new OReportExchange(aAllreadyCopiedObjects); uno::Reference< datatransfer::XTransferable> aEnsureDelete = pCopy; pCopy->CopyToClipboard(this); } //---------------------------------------------------------------------------- void OViewsWindow::Paste() -{ +{ TransferableDataHelper aTransferData(TransferableDataHelper::CreateFromSystemClipboard(this)); OReportExchange::TSectionElements aCopies = OReportExchange::extractCopies(aTransferData); if ( aCopies.getLength() > 1 ) ::std::for_each(m_aSections.begin(),m_aSections.end(), - ::o3tl::compose1(::boost::bind(&OReportSection::Paste,_1,aCopies,false),TReportPairHelper())); + ::std::compose1(::boost::bind(&OReportSection::Paste,_1,aCopies,false),TReportPairHelper())); else { ::boost::shared_ptr<OSectionWindow> pMarkedSection = getMarkedSection(); @@ -441,7 +445,7 @@ void OViewsWindow::Paste() break; } } - + return pSectionWindow; } @@ -451,7 +455,7 @@ void OViewsWindow::Paste() ::boost::shared_ptr<OSectionWindow> pRet; TSectionsMap::const_iterator aIter = m_aSections.begin(); TSectionsMap::const_iterator aEnd = m_aSections.end(); - sal_uInt32 nCurrentPosition = 0; + sal_uInt32 nCurrentPosition = 0; for (; aIter != aEnd ; ++aIter) { if ( (*aIter)->getStartMarker().isMarked() ) @@ -460,7 +464,7 @@ void OViewsWindow::Paste() { pRet = (*aIter); break; - } + } else if ( nsa == PREVIOUS ) { if (nCurrentPosition > 0) @@ -496,20 +500,20 @@ void OViewsWindow::Paste() } break; } - } + } // ( (*aIter).second->isMarked() ) ++nCurrentPosition; - } - + } // for (; aIter != aEnd ; ++aIter) + return pRet; } // ------------------------------------------------------------------------- -void OViewsWindow::markSection(const sal_uInt16 _nPos) +void OViewsWindow::markSection(const sal_uInt16 _nPos) { if ( _nPos < m_aSections.size() ) m_pParent->setMarked(m_aSections[_nPos]->getReportSection().getSection(),sal_True); } //---------------------------------------------------------------------------- -sal_Bool OViewsWindow::IsPasteAllowed() const +BOOL OViewsWindow::IsPasteAllowed() const { TransferableDataHelper aTransferData( TransferableDataHelper::CreateFromSystemClipboard( const_cast< OViewsWindow* >( this ) ) ); return aTransferData.HasFormat(OReportExchange::getDescriptorFormatId()); @@ -519,7 +523,7 @@ void OViewsWindow::SelectAll(const sal_uInt16 _nObjectType) { m_bInUnmark = sal_True; ::std::for_each(m_aSections.begin(),m_aSections.end(), - ::o3tl::compose1(::boost::bind(::boost::mem_fn(&OReportSection::SelectAll),_1,_nObjectType),TReportPairHelper())); + ::std::compose1(::boost::bind(::boost::mem_fn(&OReportSection::SelectAll),_1,_nObjectType),TReportPairHelper())); m_bInUnmark = sal_False; } //----------------------------------------------------------------------------- @@ -537,10 +541,29 @@ void OViewsWindow::unmarkAllObjects(OSectionView* _pSectionView) (*aIter)->getReportSection().deactivateOle(); (*aIter)->getReportSection().getSectionView().UnmarkAllObj(); } - } + } // for (; aIter != aEnd ; ++aIter) m_bInUnmark = sal_False; } } +//----------------------------------------------------------------------------- +/* +::boost::shared_ptr<OSectionWindow> OViewsWindow::getReportSection(const uno::Reference< report::XSection >& _xSection) +{ + OSL_ENSURE(_xSection.is(),"Section is NULL!"); + ::boost::shared_ptr<OSectionWindow> pRet; + TSectionsMap::iterator aIter = m_aSections.begin(); + TSectionsMap::iterator aEnd = m_aSections.end(); + for (; aIter != aEnd ; ++aIter) + { + if ( (*aIter)->getReportSection().getSection() == _xSection ) + { + pRet = (*aIter); + break; + } // if ( (*aIter)->getSection() == _xSection ) + } // for (; aIter != aEnd ; ++aIter) + return pRet; +} +*/ // ----------------------------------------------------------------------- void OViewsWindow::ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32) { @@ -562,9 +585,9 @@ void OViewsWindow::MouseButtonDown( const MouseEvent& rMEvt ) void OViewsWindow::showRuler(sal_Bool _bShow) { ::std::for_each(m_aSections.begin(),m_aSections.end(), - ::o3tl::compose1(::boost::bind(&OStartMarker::showRuler,_1,_bShow),TStartMarkerHelper())); + ::std::compose1(::boost::bind(&OStartMarker::showRuler,_1,_bShow),TStartMarkerHelper())); ::std::for_each(m_aSections.begin(),m_aSections.end(), - ::o3tl::compose1(::boost::bind(&OStartMarker::Window::Invalidate, _1, sal_uInt16(INVALIDATE_NOERASE)), TStartMarkerHelper())); + ::std::compose1(::boost::bind(&OStartMarker::Window::Invalidate,_1,USHORT(INVALIDATE_NOERASE)),TStartMarkerHelper())); } //---------------------------------------------------------------------------- void OViewsWindow::MouseButtonUp( const MouseEvent& rMEvt ) @@ -586,7 +609,7 @@ void OViewsWindow::MouseButtonUp( const MouseEvent& rMEvt ) for (aIter = m_aSections.begin();aIter != aEnd ; ++aIter) { (*aIter)->getReportSection().getPage()->resetSpecialMode(); - } + } } } //------------------------------------------------------------------------------ @@ -597,6 +620,7 @@ sal_Bool OViewsWindow::handleKeyEvent(const KeyEvent& _rEvent) TSectionsMap::iterator aEnd = m_aSections.end(); for (;aIter != aEnd ; ++aIter) { + //if ( (*aIter).getReportSection().getSectionView().->AreObjectsMarked() ) if ( (*aIter)->getStartMarker().isMarked() ) { bRet = (*aIter)->getReportSection().handleKeyEvent(_rEvent); @@ -605,7 +629,7 @@ sal_Bool OViewsWindow::handleKeyEvent(const KeyEvent& _rEvent) return bRet; } //---------------------------------------------------------------------------- -OViewsWindow::TSectionsMap::iterator OViewsWindow::getIteratorAtPos(sal_uInt16 _nPos) +OViewsWindow::TSectionsMap::iterator OViewsWindow::getIteratorAtPos(USHORT _nPos) { TSectionsMap::iterator aRet = m_aSections.end(); if ( _nPos < m_aSections.size() ) @@ -652,7 +676,7 @@ void OViewsWindow::setMarked(const uno::Sequence< uno::Reference< report::XRepor bFirst = false; m_pParent->setMarked(xSection,_bMark); } - ::boost::shared_ptr<OSectionWindow> pSectionWindow = getSectionWindow(xSection); + ::boost::shared_ptr<OSectionWindow> pSectionWindow = getSectionWindow(xSection); if ( pSectionWindow ) { SvxShape* pShape = SvxShape::getImplementation( *pIter ); @@ -676,7 +700,7 @@ void OViewsWindow::collectRectangles(TRectangleMap& _rSortRectangles, bool _bBo { rView.SortMarkedObjects(); const sal_uInt32 nCount = rView.GetMarkedObjectCount(); - for (sal_uInt32 i=0; i < nCount; ++i) + for (sal_uInt32 i=0; i < nCount; ++i) { const SdrMark* pM = rView.GetSdrMarkByIndex(i); SdrObject* pObj = pM->GetMarkedSdrObj(); @@ -720,8 +744,8 @@ void OViewsWindow::collectBoundResizeRect(const TRectangleMap& _rSortRectangles, SdrObjTransformInfoRec aInfo; const SdrObject* pObj = aRectIter->second.first; pObj->TakeObjInfo(aInfo); - sal_Bool bHasFixed = !aInfo.bMoveAllowed || pObj->IsMoveProtect(); - if ( bHasFixed ) + BOOL bHasFixed = !aInfo.bMoveAllowed || pObj->IsMoveProtect(); + if ( bHasFixed ) _rBound.Union(aObjRect); else { @@ -741,12 +765,12 @@ void OViewsWindow::collectBoundResizeRect(const TRectangleMap& _rSortRectangles, } catch(uno::Exception){} } - } - else + } + else { - if (_bBoundRects) + if (_bBoundRects) _rBound.Union(aRectIter->second.second->GetMarkedObjBoundRect()); - else + else _rBound.Union(aRectIter->second.second->GetMarkedObjRect()); } } @@ -760,7 +784,7 @@ void OViewsWindow::alignMarkedObjects(sal_Int32 _nControlModification,bool _bAli Point aRefPoint; RectangleLess::CompareMode eCompareMode = RectangleLess::POS_LEFT; - switch (_nControlModification) + switch (_nControlModification) { case ControlModification::TOP : eCompareMode = RectangleLess::POS_UPPER; break; case ControlModification::BOTTOM: eCompareMode = RectangleLess::POS_DOWN; break; @@ -769,7 +793,7 @@ void OViewsWindow::alignMarkedObjects(sal_Int32 _nControlModification,bool _bAli case ControlModification::CENTER_HORIZONTAL : case ControlModification::CENTER_VERTICAL : { - eCompareMode = (ControlModification::CENTER_VERTICAL == _nControlModification) ? RectangleLess::POS_CENTER_VERTICAL : RectangleLess::POS_CENTER_HORIZONTAL; + eCompareMode = (ControlModification::CENTER_VERTICAL == _nControlModification) ? RectangleLess::POS_CENTER_VERTICAL : RectangleLess::POS_CENTER_HORIZONTAL; uno::Reference<report::XSection> xSection = (*m_aSections.begin())->getReportSection().getSection(); uno::Reference<report::XReportDefinition> xReportDefinition = xSection->getReportDefinition(); aRefPoint = Rectangle(getStyleProperty<sal_Int32>(xReportDefinition,PROPERTY_LEFTMARGIN),0, @@ -782,7 +806,7 @@ void OViewsWindow::alignMarkedObjects(sal_Int32 _nControlModification,bool _bAli RectangleLess aCompare(eCompareMode,aRefPoint); TRectangleMap aSortRectangles(aCompare); collectRectangles(aSortRectangles,_bBoundRects); - + Rectangle aBound; Rectangle aResize; collectBoundResizeRect(aSortRectangles,_nControlModification,_bAlignAtSection,_bBoundRects,aBound,aResize); @@ -801,36 +825,36 @@ void OViewsWindow::alignMarkedObjects(sal_Int32 _nControlModification,bool _bAli Point aCenter(aBound.Center()); SdrObjTransformInfoRec aInfo; pObj->TakeObjInfo(aInfo); - if (aInfo.bMoveAllowed && !pObj->IsMoveProtect()) + if (aInfo.bMoveAllowed && !pObj->IsMoveProtect()) { long nXMov = 0; long nYMov = 0; long* pValue = &nXMov; switch(_nControlModification) { - case ControlModification::TOP : + case ControlModification::TOP : aGetFun = ::std::mem_fun<long&,Rectangle>(&Rectangle::Top); aRefFun = ::std::mem_fun<long&,Rectangle>(&Rectangle::Bottom); pValue = &nYMov; break; - case ControlModification::BOTTOM: + case ControlModification::BOTTOM: // defaults are already set pValue = &nYMov; break; - case ControlModification::CENTER_VERTICAL: - nYMov = aCenter.Y() - aObjRect.Center().Y(); + case ControlModification::CENTER_VERTICAL: + nYMov = aCenter.Y() - aObjRect.Center().Y(); pValue = &nYMov; bMove = false; break; - case ControlModification::RIGHT : + case ControlModification::RIGHT : aGetFun = ::std::mem_fun<long&,Rectangle>(&Rectangle::Right); aRefFun = ::std::mem_fun<long&,Rectangle>(&Rectangle::Left); break; - case ControlModification::CENTER_HORIZONTAL: + case ControlModification::CENTER_HORIZONTAL: nXMov = aCenter.X() - aObjRect.Center().X(); bMove = false; break; - case ControlModification::LEFT : + case ControlModification::LEFT : aGetFun = ::std::mem_fun<long&,Rectangle>(&Rectangle::Left); aRefFun = ::std::mem_fun<long&,Rectangle>(&Rectangle::Right); break; @@ -859,7 +883,7 @@ void OViewsWindow::alignMarkedObjects(sal_Int32 _nControlModification,bool _bAli if ( aInterSectRectIter == aRectIter ) *pValue = aGetFun(&aBound) - aGetFun(&aObjRect); } - + if ( lcl_getNewRectSize(aObjRect,nXMov,nYMov,pObj,pView,_nControlModification,_bBoundRects) ) { const Size aSize(nXMov,nYMov); @@ -893,12 +917,14 @@ void OViewsWindow::alignMarkedObjects(sal_Int32 _nControlModification,bool _bAli { if ( _nControlModification == ControlModification::WIDTH_SMALLEST || _nControlModification == ControlModification::WIDTH_GREATEST ) pObjBase->getReportComponent()->setSize(awt::Size(nXMov,aObjRect.getHeight())); + //pObj->Resize(aObjRect.TopLeft(),Fraction(nXMov,aObjRect.getWidth()),Fraction(1,1)); else if ( _nControlModification == ControlModification::HEIGHT_GREATEST || _nControlModification == ControlModification::HEIGHT_SMALLEST ) pObjBase->getReportComponent()->setSize(awt::Size(aObjRect.getWidth(),nYMov)); + //pObj->Resize(aObjRect.TopLeft(),Fraction(1,1),Fraction(nYMov,aObjRect.getHeight())); } } break; - default: + default: break; } } @@ -914,7 +940,7 @@ void OViewsWindow::createDefault() pMarkedSection->getReportSection().createDefault(m_sShapeType); } // ----------------------------------------------------------------------------- -void OViewsWindow::setGridSnap(sal_Bool bOn) +void OViewsWindow::setGridSnap(BOOL bOn) { TSectionsMap::iterator aIter = m_aSections.begin(); TSectionsMap::iterator aEnd = m_aSections.end(); @@ -925,7 +951,7 @@ void OViewsWindow::setGridSnap(sal_Bool bOn) } } // ----------------------------------------------------------------------------- -void OViewsWindow::setDragStripes(sal_Bool bOn) +void OViewsWindow::setDragStripes(BOOL bOn) { TSectionsMap::iterator aIter = m_aSections.begin(); TSectionsMap::iterator aEnd = m_aSections.end(); @@ -933,11 +959,11 @@ void OViewsWindow::setDragStripes(sal_Bool bOn) (*aIter)->getReportSection().getSectionView().SetDragStripes(bOn); } // ----------------------------------------------------------------------------- -sal_uInt16 OViewsWindow::getPosition(const OSectionWindow* _pSectionWindow) const +USHORT OViewsWindow::getPosition(const OSectionWindow* _pSectionWindow) const { TSectionsMap::const_iterator aIter = m_aSections.begin(); TSectionsMap::const_iterator aEnd = m_aSections.end(); - sal_uInt16 nPosition = 0; + USHORT nPosition = 0; for (; aIter != aEnd ; ++aIter) { if ( _pSectionWindow == (*aIter).get() ) @@ -949,10 +975,10 @@ sal_uInt16 OViewsWindow::getPosition(const OSectionWindow* _pSectionWindow) cons return nPosition; } // ----------------------------------------------------------------------------- -::boost::shared_ptr<OSectionWindow> OViewsWindow::getSectionWindow(const sal_uInt16 _nPos) const +::boost::shared_ptr<OSectionWindow> OViewsWindow::getSectionWindow(const USHORT _nPos) const { ::boost::shared_ptr<OSectionWindow> aReturn; - + if ( _nPos < m_aSections.size() ) aReturn = m_aSections[_nPos]; @@ -987,12 +1013,12 @@ namespace OSectionView& rView( _rhs->getReportSection().getSectionView() ); switch ( m_eAction ) { - case eEndDragObj: + case eEndDragObj: rView.EndDragObj( m_bCopy ); break; case eEndAction: - if ( rView.IsAction() ) - rView.EndAction ( ); + if ( rView.IsAction() ) + rView.EndAction ( ); break; case eMoveAction: rView.MovAction ( m_aPoint ); @@ -1004,11 +1030,11 @@ namespace rView.ForceMarkedToAnotherPage(); break; case eBreakAction: - if ( rView.IsAction() ) - rView.BrkAction ( ); + if ( rView.IsAction() ) + rView.BrkAction ( ); break; // default: - + } } }; @@ -1031,25 +1057,32 @@ void OViewsWindow::BegDragObj_createInvisibleObjectAtPosition(const Rectangle& _ OReportSection& rReportSection = (*aIter)->getReportSection(); rReportSection.getPage()->setSpecialMode(); OSectionView& rView = rReportSection.getSectionView(); - + if ( &rView != &_rSection ) { +// SdrRectObj *pNewObj = new SdrRectObj(OBJ_RECT, _aRect); +// SdrObject *pNewObj = new SdrUnoObj(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Temp Label"))); SdrObject *pNewObj = new SdrUnoObj(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FixedText"))); if (pNewObj) { pNewObj->SetLogicRect(_aRect); + // pNewObj->SetSize(_aRect.GetSize()); + // pNewObj->Move(Size(_aRect.Left(), _aRect.Top())); pNewObj->Move(Size(0, aNewPos.Y())); - sal_Bool bChanged = rView.GetModel()->IsChanged(); + BOOL bChanged = rView.GetModel()->IsChanged(); rReportSection.getPage()->InsertObject(pNewObj); rView.GetModel()->SetChanged(bChanged); m_aBegDragTempList.push_back(pNewObj); + Rectangle aRect = pNewObj->GetLogicRect(); + // pNewObj->SetText(String::CreateFromAscii("Drag helper")); rView.MarkObj( pNewObj, rView.GetSdrPageView() ); } } const long nSectionHeight = rReportSection.PixelToLogic(rReportSection.GetOutputSizePixel()).Height(); aNewPos.Y() -= nSectionHeight; +// aNewPos.Y() -= PixelToLogic(aIter->second.second->GetSizePixel()).Height(); } } // ----------------------------------------------------------------------------- @@ -1060,7 +1093,7 @@ bool OViewsWindow::isObjectInMyTempList(SdrObject *_pObj) // ----------------------------------------------------------------------------- void OViewsWindow::BegDragObj(const Point& _aPnt, SdrHdl* _pHdl,const OSectionView* _pSection) -{ +{ OSL_TRACE("BegDragObj Clickpoint X:%d Y:%d\n", _aPnt.X(), _aPnt.Y() ); m_aBegDragTempList.clear(); @@ -1071,7 +1104,7 @@ void OViewsWindow::BegDragObj(const Point& _aPnt, SdrHdl* _pHdl,const OSectionVi TSectionsMap::iterator aEnd = m_aSections.end(); for (; aIter != aEnd; ++aIter) { - OReportSection& rReportSection = (*aIter)->getReportSection(); + OReportSection& rReportSection = (*aIter)->getReportSection(); OSectionView* pView = &rReportSection.getSectionView(); if (pView == _pSection) break; @@ -1084,7 +1117,7 @@ void OViewsWindow::BegDragObj(const Point& _aPnt, SdrHdl* _pHdl,const OSectionVi // Create drag lines over all viewable Views // Therefore we need to identify the marked objects // and create temporary objects on all other views at the same position - // relative to its occurrence. + // relative to its occurance. OSL_TRACE("BegDragObj createInvisible Objects\n" ); int nViewCount = 0; @@ -1093,13 +1126,13 @@ void OViewsWindow::BegDragObj(const Point& _aPnt, SdrHdl* _pHdl,const OSectionVi for (aIter = m_aSections.begin(); aIter != aEnd; ++aIter) { OReportSection& rReportSection = (*aIter)->getReportSection(); - + OSectionView& rView = rReportSection.getSectionView(); - + if ( rView.AreObjectsMarked() ) { const sal_uInt32 nCount = rView.GetMarkedObjectCount(); - for (sal_uInt32 i=0; i < nCount; ++i) + for (sal_uInt32 i=0; i < nCount; ++i) { const SdrMark* pM = rView.GetSdrMarkByIndex(i); SdrObject* pObj = pM->GetMarkedSdrObj(); @@ -1112,10 +1145,18 @@ void OViewsWindow::BegDragObj(const Point& _aPnt, SdrHdl* _pHdl,const OSectionVi aLeftTop.Y() = ::std::min( aRect.Top(), aLeftTop.Y() ); OSL_TRACE("BegDragObj createInvisible X:%d Y:%d on View #%d\n", aRect.Left(), aRect.Top(), nViewCount ); - + BegDragObj_createInvisibleObjectAtPosition(aRect, rView); + + // calculate the clickpoint +// const sal_Int32 nDeltaX = abs(aRect.Left() - aAbsolutePnt.X()); +// const sal_Int32 nDeltaY = abs(aRect.Top() - aAbsolutePnt.Y()); +// if (m_aDragDelta.X() > nDeltaX) +// m_aDragDelta.X() = nDeltaX; +// if (m_aDragDelta.Y() > nDeltaY) +// m_aDragDelta.Y() = nDeltaY; } - } + } } ++nViewCount; Rectangle aClipRect = rView.GetWorkArea(); @@ -1124,21 +1165,49 @@ void OViewsWindow::BegDragObj(const Point& _aPnt, SdrHdl* _pHdl,const OSectionVi const long nSectionHeight = rReportSection.PixelToLogic(rReportSection.GetOutputSizePixel()).Height(); aNewObjPos.Y() += nSectionHeight; - } + // don't subtract the height of the lines between the views + // aNewObjPos.Y() -= PixelToLogic(aIter->second.second->GetSizePixel()).Height(); + } + const sal_Int32 nDeltaX = abs(aLeftTop.X() - aAbsolutePnt.X()); const sal_Int32 nDeltaY = abs(aLeftTop.Y() - aAbsolutePnt.Y()); m_aDragDelta.X() = nDeltaX; m_aDragDelta.Y() = nDeltaY; Point aNewPos = aAbsolutePnt; + // for (aIter = m_aSections.begin(); aIter != aEnd; ++aIter) + // { + // OReportSection& rReportSection = (*aIter)->getReportSection(); + // if ( &rReportSection.getSectionView() == _pSection ) + // break; + // aNewPos.Y() += rReportSection.PixelToLogic(rReportSection.GetOutputSizePixel()).Height(); + // } const short nDrgLog = static_cast<short>(PixelToLogic(Size(3,0)).Width()); + // long nLastSectionHeight = 0; + // bool bAdd = true; nViewCount = 0; for (aIter = m_aSections.begin(); aIter != aEnd; ++aIter) { OReportSection& rReportSection = (*aIter)->getReportSection(); + // if ( &rReportSection.getSectionView() == _pSection ) + // { + // bAdd = false; + // aNewPos = _aPnt; + // } + // else if ( bAdd ) + // { + // const long nSectionHeight = rReportSection.PixelToLogic(rReportSection.GetOutputSizePixel()).Height(); + // aNewPos.Y() += nSectionHeight; + // } + // else + // { + // aNewPos.Y() -= nLastSectionHeight; + // } + + //? SdrHdl* pHdl = _pHdl; if ( pHdl ) { @@ -1153,6 +1222,8 @@ void OViewsWindow::BegDragObj(const Point& _aPnt, SdrHdl* _pHdl,const OSectionVi const long nSectionHeight = rReportSection.PixelToLogic(rReportSection.GetOutputSizePixel()).Height(); aNewPos.Y() -= nSectionHeight; + // subtract the height between the views, because they are visible but not from interest here. + // aNewPos.Y() -= PixelToLogic(aIter->second.second->GetSizePixel()).Height(); } } @@ -1176,7 +1247,7 @@ void OViewsWindow::BegMarkObj(const Point& _aPnt,const OSectionView* _pSection) if ( &rReportSection.getSectionView() == _pSection ) { bAdd = false; - aNewPos = _aPnt; // 2,2 + aNewPos = _aPnt; // 2,2 } else if ( bAdd ) { @@ -1189,7 +1260,10 @@ void OViewsWindow::BegMarkObj(const Point& _aPnt,const OSectionView* _pSection) } rReportSection.getSectionView().BegMarkObj ( aNewPos ); nLastSectionHeight = rReportSection.PixelToLogic(rReportSection.GetOutputSizePixel()).Height(); + + // aNewPos.Y() -= PixelToLogic(aIter->second.second->GetSizePixel()).Height(); } + //::std::for_each( m_aSections.begin(), m_aSections.end(), ApplySectionViewAction( _aPnt , eMarkAction) ); } // ----------------------------------------------------------------------------- OSectionView* OViewsWindow::getSectionRelativeToPosition(const OSectionView* _pSection,Point& _rPnt) @@ -1253,10 +1327,10 @@ void OViewsWindow::EndDragObj_removeInvisibleObjects() } } // ----------------------------------------------------------------------------- -void OViewsWindow::EndDragObj(sal_Bool _bControlKeyPressed, const OSectionView* _pSection,const Point& _aPnt) +void OViewsWindow::EndDragObj(BOOL _bControlKeyPressed, const OSectionView* _pSection,const Point& _aPnt) { const String sUndoAction = String((ModuleRes(RID_STR_UNDO_CHANGEPOSITION))); - const UndoContext aUndoContext( getView()->getReportView()->getController().getUndoManager(), sUndoAction ); + UndoManagerListAction aListAction(*getView()->getReportView()->getController().getUndoMgr(),sUndoAction); Point aNewPos = _aPnt; OSectionView* pInSection = getSectionRelativeToPosition(_pSection, aNewPos); @@ -1267,6 +1341,9 @@ void OViewsWindow::EndDragObj(sal_Bool _bControlKeyPressed, const OSectionView* EndDragObj_removeInvisibleObjects(); // we need to manipulate the current clickpoint, we substract the old delta from BeginDrag + // OSectionView* pInSection = getSectionRelativeToPosition(_pSection, aPnt); + // aNewPos.X() -= m_aDragDelta.X(); + // aNewPos.Y() -= m_aDragDelta.Y(); aNewPos -= m_aDragDelta; uno::Sequence< beans::NamedValue > aAllreadyCopiedObjects; @@ -1281,8 +1358,8 @@ void OViewsWindow::EndDragObj(sal_Bool _bControlKeyPressed, const OSectionView* rReportSection.Copy(aAllreadyCopiedObjects,true); } else - pInSection->EndDragObj(sal_False); - } + pInSection->EndDragObj(FALSE); + } // for (; aIter != aEnd; ++aIter) if ( aAllreadyCopiedObjects.getLength() ) { @@ -1299,7 +1376,7 @@ void OViewsWindow::EndDragObj(sal_Bool _bControlKeyPressed, const OSectionView* aNewPos.X() = nLeftMargin; if ( aNewPos.Y() < 0 ) aNewPos.Y() = 0; - + Point aPrevious; for (; pIter != pEnd; ++pIter) { @@ -1352,7 +1429,7 @@ void OViewsWindow::EndDragObj(sal_Bool _bControlKeyPressed, const OSectionView* } else { - ::std::for_each( m_aSections.begin(), m_aSections.end(), ApplySectionViewAction( sal_False ) ); + ::std::for_each( m_aSections.begin(), m_aSections.end(), ApplySectionViewAction( FALSE ) ); EndDragObj_removeInvisibleObjects(); } m_aDragDelta = Point(SAL_MAX_INT32, SAL_MAX_INT32); @@ -1378,9 +1455,11 @@ void OViewsWindow::MovAction(const Point& _aPnt,const OSectionView* _pSection,bo aHdlPos = pHdl->GetPos(); } - TSectionsMap::iterator aIter; + TSectionsMap::iterator aIter/* = m_aSections.begin() */; TSectionsMap::iterator aEnd = m_aSections.end(); + //if ( _bMove ) + //{ for (aIter = m_aSections.begin(); aIter != aEnd; ++aIter) { OReportSection& rReportSection = (*aIter)->getReportSection(); @@ -1388,7 +1467,8 @@ void OViewsWindow::MovAction(const Point& _aPnt,const OSectionView* _pSection,bo break; const long nSectionHeight = (*aIter)->PixelToLogic(rReportSection.GetOutputSizePixel()).Height(); aCurrentSectionPos.Y() += nSectionHeight; - } + } // for (aIter = m_aSections.begin(); aIter != aEnd; ++aIter) + //} aRealMousePos += aCurrentSectionPos; // If control key is pressed the work area is limited to the section with the current selection. @@ -1403,6 +1483,7 @@ void OViewsWindow::MovAction(const Point& _aPnt,const OSectionView* _pSection,bo { Rectangle aClipRect = rView.GetWorkArea(); aClipRect.Top() = aCurrentSectionPos.Y() - aPosForWorkArea.Y(); + // if (aClipRect.Top() < 0) aClipRect.Top() = 0; aClipRect.Bottom() = aClipRect.Top() + nSectionHeight; rView.SetWorkArea( aClipRect ); } @@ -1413,8 +1494,9 @@ void OViewsWindow::MovAction(const Point& _aPnt,const OSectionView* _pSection,bo rView.SetWorkArea( aClipRect ); } aPosForWorkArea.Y() += nSectionHeight; + // aNewPos.Y() += PixelToLogic(aIter->second.second->GetSizePixel()).Height(); } - + for (aIter = m_aSections.begin(); aIter != aEnd; ++aIter) { @@ -1431,9 +1513,9 @@ void OViewsWindow::MovAction(const Point& _aPnt,const OSectionView* _pSection,bo } } // ----------------------------------------------------------------------------- -sal_Bool OViewsWindow::IsAction() const +BOOL OViewsWindow::IsAction() const { - sal_Bool bAction = sal_False; + BOOL bAction = FALSE; TSectionsMap::const_iterator aIter = m_aSections.begin(); TSectionsMap::const_iterator aEnd = m_aSections.end(); for (; !bAction && aIter != aEnd; ++aIter) @@ -1441,9 +1523,9 @@ sal_Bool OViewsWindow::IsAction() const return bAction; } // ----------------------------------------------------------------------------- -sal_Bool OViewsWindow::IsDragObj() const +BOOL OViewsWindow::IsDragObj() const { - sal_Bool bAction = sal_False; + BOOL bAction = FALSE; TSectionsMap::const_iterator aIter = m_aSections.begin(); TSectionsMap::const_iterator aEnd = m_aSections.end(); for (; !bAction && aIter != aEnd; ++aIter) @@ -1463,7 +1545,7 @@ sal_uInt32 OViewsWindow::getMarkedObjectCount() const // ----------------------------------------------------------------------------- void OViewsWindow::handleKey(const KeyCode& _rCode) { - const sal_uInt16 nCode = _rCode.GetCode(); + const USHORT nCode = _rCode.GetCode(); if ( _rCode.IsMod1() ) { // scroll page @@ -1546,7 +1628,7 @@ void OViewsWindow::handleKey(const KeyCode& _rCode) SdrMark* pMark = rMarkList.GetMark(i); bCheck = dynamic_cast<OUnoObject*>(pMark->GetMarkedSdrObj()) != NULL; } - + if ( bCheck && isOver(aMarkRect,*rReportSection.getPage(),rView) ) break; } @@ -1573,13 +1655,13 @@ void OViewsWindow::handleKey(const KeyCode& _rCode) if ( rView.IsDragObj() ) { const bool bWasNoSnap = rDragStat.IsNoSnap(); - const sal_Bool bWasSnapEnabled = rView.IsSnapEnabled(); + const BOOL bWasSnapEnabled = rView.IsSnapEnabled(); // switch snapping off if ( !bWasNoSnap ) - ((SdrDragStat&)rDragStat).SetNoSnap( sal_True ); + ((SdrDragStat&)rDragStat).SetNoSnap( TRUE ); if ( bWasSnapEnabled ) - rView.SetSnapEnabled( sal_False ); + rView.SetSnapEnabled( FALSE ); Rectangle aNewRect; bool bCheck = false; @@ -1591,7 +1673,7 @@ void OViewsWindow::handleKey(const KeyCode& _rCode) if ( bCheck ) aNewRect.Union(pMark->GetMarkedSdrObj()->GetLastBoundRect()); } - + switch(pHdl->GetKind()) { case HDL_LEFT: @@ -1614,7 +1696,7 @@ void OViewsWindow::handleKey(const KeyCode& _rCode) if ( !(bCheck && isOver(aNewRect,*rReportSection.getPage(),rView)) ) rView.MovAction(aEndPoint); rView.EndDragObj(); - + // restore snap if ( !bWasNoSnap ) ((SdrDragStat&)rDragStat).SetNoSnap( bWasNoSnap ); @@ -1635,7 +1717,7 @@ void OViewsWindow::handleKey(const KeyCode& _rCode) void OViewsWindow::stopScrollTimer() { ::std::for_each(m_aSections.begin(),m_aSections.end(), - ::o3tl::compose1(::boost::mem_fn(&OReportSection::stopScrollTimer),TReportPairHelper())); + ::std::compose1(::boost::mem_fn(&OReportSection::stopScrollTimer),TReportPairHelper())); } // ----------------------------------------------------------------------------- void OViewsWindow::fillCollapsedSections(::std::vector<sal_uInt16>& _rCollapsedPositions) const @@ -1666,7 +1748,7 @@ void OViewsWindow::collapseSections(const uno::Sequence< beans::PropertyValue>& void OViewsWindow::zoom(const Fraction& _aZoom) { const MapMode& aMapMode = GetMapMode(); - + Fraction aStartWidth(long(REPORT_STARTMARKER_WIDTH)); if ( _aZoom < aMapMode.GetScaleX() ) aStartWidth *= aMapMode.GetScaleX(); @@ -1680,16 +1762,16 @@ void OViewsWindow::zoom(const Fraction& _aZoom) for (;aIter != aEnd ; ++aIter) { (*aIter)->zoom(_aZoom); - } + } // for (;aIter != aEnd ; ++aIter) Resize(); - + Size aOut = GetOutputSizePixel(); aOut.Width() = aStartWidth; aOut = PixelToLogic(aOut); - + Rectangle aRect(PixelToLogic(Point(0,0)),aOut); - Invalidate(aRect,INVALIDATE_NOCHILDREN); + Invalidate(aRect,/*INVALIDATE_NOERASE | */INVALIDATE_NOCHILDREN /*| INVALIDATE_TRANSPARENT*/); } //---------------------------------------------------------------------------- void OViewsWindow::scrollChildren(const Point& _aThumbPos) @@ -1701,9 +1783,10 @@ void OViewsWindow::scrollChildren(const Point& _aThumbPos) aMapMode.SetOrigin(m_pParent->GetMapMode().GetOrigin()); const Point aPosY(m_pParent->PixelToLogic(_aThumbPos,aMapMode)); - + aMapMode.SetOrigin( Point(aOld.X() , - aPosY.Y())); SetMapMode( aMapMode ); + //OWindowPositionCorrector aCorrector(this,0,-( aOld.Y() + aPosY.Y())); Scroll(0, -( aOld.Y() + aPosY.Y()),SCROLL_CHILDREN); Resize(); Invalidate(INVALIDATE_NOCHILDREN|INVALIDATE_TRANSPARENT); @@ -1714,7 +1797,7 @@ void OViewsWindow::scrollChildren(const Point& _aThumbPos) for (;aIter != aEnd ; ++aIter) { (*aIter)->scrollChildren(aPos.X()); - } + } // for (;aIter != aEnd ; ++aIter) } // ----------------------------------------------------------------------------- void OViewsWindow::fillControlModelSelection(::std::vector< uno::Reference< uno::XInterface > >& _rSelection) const diff --git a/reportdesign/source/ui/report/dlgedclip.cxx b/reportdesign/source/ui/report/dlgedclip.cxx index b18c645aa18e..0b36df5c4672 100644 --- a/reportdesign/source/ui/report/dlgedclip.cxx +++ b/reportdesign/source/ui/report/dlgedclip.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -65,7 +65,7 @@ void OReportExchange::AddSupportedFormats() sal_Bool OReportExchange::GetData( const datatransfer::DataFlavor& _rFlavor ) { const sal_uInt32 nFormatId = SotExchange::GetFormat(_rFlavor); - return (nFormatId == getDescriptorFormatId()) ? + return (nFormatId == getDescriptorFormatId()) ? SetAny( uno::Any(m_aCopyElements), _rFlavor ) : sal_False; } diff --git a/reportdesign/source/ui/report/dlgedfac.cxx b/reportdesign/source/ui/report/dlgedfac.cxx index d5db6eb1d101..259191396d11 100644 --- a/reportdesign/source/ui/report/dlgedfac.cxx +++ b/reportdesign/source/ui/report/dlgedfac.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,24 +64,24 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory ) { case OBJ_DLG_FIXEDTEXT: pObjFactory->pNewObj = new OUnoObject( SERVICE_FIXEDTEXT - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FixedText")) + ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FixedText")) ,OBJ_DLG_FIXEDTEXT); break; case OBJ_DLG_IMAGECONTROL: pObjFactory->pNewObj = new OUnoObject( SERVICE_IMAGECONTROL - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.DatabaseImageControl")) + ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.DatabaseImageControl")) ,OBJ_DLG_IMAGECONTROL); break; case OBJ_DLG_FORMATTEDFIELD: pObjFactory->pNewObj = new OUnoObject( SERVICE_FORMATTEDFIELD - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FormattedField")) + ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FormattedField")) ,OBJ_DLG_FORMATTEDFIELD); break; case OBJ_DLG_VFIXEDLINE: case OBJ_DLG_HFIXEDLINE: { OUnoObject* pObj = new OUnoObject( SERVICE_FIXEDLINE - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlFixedLineModel")) + ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlFixedLineModel")) ,pObjFactory->nIdentifier); pObjFactory->pNewObj = pObj; if ( pObjFactory->nIdentifier == OBJ_DLG_HFIXEDLINE ) @@ -101,7 +101,7 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory ) pObjFactory->pNewObj = new OOle2Obj(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart2.ChartDocument")),OBJ_OLE2); break; default: - OSL_FAIL("Unknown object id"); + OSL_ENSURE(0,"Unknown object id"); break; } } diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx b/reportdesign/source/ui/report/dlgedfunc.cxx index 70f130c2afe4..ad0aa4a1803b 100644 --- a/reportdesign/source/ui/report/dlgedfunc.cxx +++ b/reportdesign/source/ui/report/dlgedfunc.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -87,15 +87,16 @@ void DlgEdFunc::ForceScroll( const Point& rPos ) OReportWindow* pReportWindow = m_pParent->getSectionWindow()->getViewsWindow()->getView(); OScrollWindowHelper* pScrollWindow = pReportWindow->getScrollWindow(); - + Size aOut = pReportWindow->GetOutputSizePixel(); Fraction aStartWidth(long(REPORT_STARTMARKER_WIDTH)); aStartWidth *= m_pParent->GetMapMode().GetScaleX(); aOut.Width() -= (long)aStartWidth; - + Rectangle aOutRect( pScrollWindow->getThumbPos(), aOut ); aOutRect = m_pParent->PixelToLogic( aOutRect ); + //Rectangle aWorkArea = m_pParent->getView()->GetWorkArea(); Point aGcc3WorkaroundTemporary; Rectangle aWorkArea(aGcc3WorkaroundTemporary,pScrollWindow->getTotalSize()); aWorkArea.Right() -= (long)aStartWidth; @@ -133,6 +134,7 @@ DlgEdFunc::DlgEdFunc( OReportSection* _pParent ) m_bUiActive(false), m_bShowPropertyBrowser(false) { + // m_pParent = _pParent; aScrollTimer.SetTimeoutHdl( LINK( this, DlgEdFunc, ScrollTimeout ) ); m_rView.SetActualWin( m_pParent); aScrollTimer.SetTimeout( SELENG_AUTOREPEAT_INTERVAL ); @@ -150,7 +152,14 @@ sal_Int32 lcl_setColorOfObject(uno::Reference< uno::XInterface > _xObj, long _nC try { uno::Reference<report::XReportComponent> xComponent(_xObj, uno::UNO_QUERY_THROW); + // NOT NEED if UNO_QUERY_THROW: + // if (xComponent.is()) + // { uno::Reference< beans::XPropertySet > xProp(xComponent, uno::UNO_QUERY_THROW); + // if (xProp.is()) + // { + // ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ControlBackground")) + // is PROPERTY_CONTROLBACKGROUND uno::Any aAny = xProp->getPropertyValue(PROPERTY_CONTROLBACKGROUND); if (aAny.hasValue()) { @@ -159,9 +168,12 @@ sal_Int32 lcl_setColorOfObject(uno::Reference< uno::XInterface > _xObj, long _nC uno::Any aBlackColorAny = uno::makeAny(_nColorTRGB); xProp->setPropertyValue(PROPERTY_CONTROLBACKGROUND, aBlackColorAny); } + // aCopies.push_back(xComponent->createClone()); } catch(uno::Exception&) { + // bit my shiny metal as! + // OSL_ENSURE(0,"Can't copy report elements!"); } return nBackColor; } @@ -174,11 +186,11 @@ DlgEdFunc::~DlgEdFunc() //---------------------------------------------------------------------------- -sal_Bool DlgEdFunc::MouseButtonDown( const MouseEvent& rMEvt ) +BOOL DlgEdFunc::MouseButtonDown( const MouseEvent& rMEvt ) { m_aMDPos = m_pParent->PixelToLogic( rMEvt.GetPosPixel() ); m_pParent->GrabFocus(); - sal_Bool bHandled = sal_False; + BOOL bHandled = FALSE; if ( rMEvt.IsLeft() ) { if ( rMEvt.GetClicks() > 1 ) @@ -195,18 +207,19 @@ sal_Bool DlgEdFunc::MouseButtonDown( const MouseEvent& rMEvt ) // SdrViewEvent aVEvt; // m_rView.PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt); // if ( aVEvt.pRootObj && aVEvt.pRootObj->ISA(SdrTextObj) ) - // SetInEditMode(static_cast<SdrTextObj *>(aVEvt.pRootObj),rMEvt, sal_False); - bHandled = sal_True; + // SetInEditMode(static_cast<SdrTextObj *>(aVEvt.pRootObj),rMEvt, FALSE); + bHandled = TRUE; } } else { SdrHdl* pHdl = m_rView.PickHandle(m_aMDPos); + //m_pParent->getSectionWindow()->getViewsWindow()->unmarkAllObjects(m_pView); // if selected object was hit, drag object if ( pHdl!=NULL || m_rView.IsMarkedHit(m_aMDPos) ) { - bHandled = sal_True; + bHandled = TRUE; m_pParent->CaptureMouse(); m_pParent->getSectionWindow()->getViewsWindow()->BegDragObj(m_aMDPos, pHdl,&m_rView); } @@ -223,10 +236,10 @@ sal_Bool DlgEdFunc::MouseButtonDown( const MouseEvent& rMEvt ) else m_pParent->getSectionWindow()->getViewsWindow()->unmarkAllObjects(NULL); - bHandled = sal_True; + bHandled = TRUE; } else if( !rMEvt.IsLeft() ) - bHandled = sal_True; + bHandled = TRUE; if ( !bHandled ) m_pParent->CaptureMouse(); return bHandled; @@ -234,9 +247,9 @@ sal_Bool DlgEdFunc::MouseButtonDown( const MouseEvent& rMEvt ) //---------------------------------------------------------------------------- -sal_Bool DlgEdFunc::MouseButtonUp( const MouseEvent& /*rMEvt*/ ) +BOOL DlgEdFunc::MouseButtonUp( const MouseEvent& /*rMEvt*/ ) { - sal_Bool bHandled = sal_False; + BOOL bHandled = FALSE; m_pParent->getSectionWindow()->getViewsWindow()->stopScrollTimer(); return bHandled; } @@ -245,7 +258,7 @@ void DlgEdFunc::checkTwoCklicks(const MouseEvent& rMEvt) { deactivateOle(); - const sal_uInt16 nClicks = rMEvt.GetClicks(); + const USHORT nClicks = rMEvt.GetClicks(); if ( nClicks == 2 && rMEvt.IsLeft() ) { if ( m_rView.AreObjectsMarked() ) @@ -256,8 +269,8 @@ void DlgEdFunc::checkTwoCklicks(const MouseEvent& rMEvt) const SdrMark* pMark = rMarkList.GetMark(0); SdrObject* pObj = pMark->GetMarkedSdrObj(); activateOle(pObj); - } - } + } // if (rMarkList.GetMarkCount() == 1) + } // if ( pView->AreObjectsMarked() ) } } // ----------------------------------------------------------------------------- @@ -270,19 +283,19 @@ void DlgEdFunc::stopScrollTimer() } //---------------------------------------------------------------------------- -sal_Bool DlgEdFunc::MouseMove( const MouseEvent& /*rMEvt*/ ) +BOOL DlgEdFunc::MouseMove( const MouseEvent& /*rMEvt*/ ) { - return sal_False; + return FALSE; } //------------------------------------------------------------------------------ sal_Bool DlgEdFunc::handleKeyEvent(const KeyEvent& _rEvent) { - sal_Bool bReturn = sal_False; + BOOL bReturn = FALSE; if ( !m_bUiActive ) { const KeyCode& rCode = _rEvent.GetKeyCode(); - sal_uInt16 nCode = rCode.GetCode(); + USHORT nCode = rCode.GetCode(); switch ( nCode ) { @@ -291,12 +304,12 @@ sal_Bool DlgEdFunc::handleKeyEvent(const KeyEvent& _rEvent) if ( m_pParent->getSectionWindow()->getViewsWindow()->IsAction() ) { m_pParent->getSectionWindow()->getViewsWindow()->BrkAction(); - bReturn = sal_True; + bReturn = TRUE; } else if ( m_rView.IsTextEdit() ) { m_rView.SdrEndTextEdit(); - bReturn = sal_True; + bReturn = TRUE; } else if ( m_rView.AreObjectsMarked() ) { @@ -306,9 +319,10 @@ sal_Bool DlgEdFunc::handleKeyEvent(const KeyEvent& _rEvent) ((SdrHdlList&)rHdlList).ResetFocusHdl(); else m_pParent->getSectionWindow()->getViewsWindow()->unmarkAllObjects(NULL); - + //m_rView.UnmarkAll(); + deactivateOle(true); - bReturn = sal_False; + bReturn = FALSE; } else { @@ -331,7 +345,7 @@ sal_Bool DlgEdFunc::handleKeyEvent(const KeyEvent& _rEvent) if ( m_rView.AreObjectsMarked() ) m_rView.MakeVisible( m_rView.GetAllMarkedRect(), *m_pParent); - bReturn = sal_True; + bReturn = TRUE; } else if ( rCode.IsMod1() && rCode.IsMod2()) { @@ -348,7 +362,7 @@ sal_Bool DlgEdFunc::handleKeyEvent(const KeyEvent& _rEvent) m_rView.MakeVisible( aVisRect, *m_pParent); } - bReturn = sal_True; + bReturn = TRUE; } } break; @@ -358,7 +372,7 @@ sal_Bool DlgEdFunc::handleKeyEvent(const KeyEvent& _rEvent) case KEY_RIGHT: { m_pParent->getSectionWindow()->getViewsWindow()->handleKey(rCode); - bReturn = sal_True; + bReturn = TRUE; } break; case KEY_RETURN: @@ -375,9 +389,9 @@ sal_Bool DlgEdFunc::handleKeyEvent(const KeyEvent& _rEvent) case KEY_DELETE: if ( !rCode.IsMod1() && !rCode.IsMod2() ) { - bReturn = sal_True; + bReturn = TRUE; break; - } + } // if ( !rCode.IsMod1() && !rCode.IsMod2() ) // run through default: { @@ -397,9 +411,9 @@ void DlgEdFunc::activateOle(SdrObject* _pObj) { if ( _pObj ) { - const sal_uInt16 nSdrObjKind = _pObj->GetObjIdentifier(); + const UINT16 nSdrObjKind = _pObj->GetObjIdentifier(); // - // OLE: activate + // OLE: activate // if (nSdrObjKind == OBJ_OLE2) { @@ -431,15 +445,15 @@ void DlgEdFunc::activateOle(SdrObject* _pObj) } } } - } - } + } // if (nSdrObjKind == OBJ_OLE2) + } // if ( _pObj ) } // ----------------------------------------------------------------------------- void DlgEdFunc::deactivateOle(bool _bSelect) { OLEObjCache& rObjCache = GetSdrGlobalData().GetOLEObjCache(); - const sal_uLong nCount = rObjCache.Count(); - for(sal_uLong i = 0 ; i< nCount;++i) + const ULONG nCount = rObjCache.Count(); + for(ULONG i = 0 ; i< nCount;++i) { SdrOle2Obj* pObj = reinterpret_cast<SdrOle2Obj*>(rObjCache.GetObject(i)); if ( m_pParent->getPage() == pObj->GetPage() ) @@ -460,9 +474,9 @@ void DlgEdFunc::deactivateOle(bool _bSelect) SdrPageView* pPV = m_rView.GetSdrPageView(); m_rView.MarkObj(pObj, pPV); } - } + } // if ( xObj.is() && xObj->getCurrentState() == embed::EmbedStates::UI_ACTIVE ) } - } + } // for(ULONG i = 0 ; i< nCount;++i) } // ----------------------------------------------------------------------------- void DlgEdFunc::colorizeOverlappedObject(SdrObject* _pOverlappedObj) @@ -519,7 +533,7 @@ bool DlgEdFunc::isOverlapping(const MouseEvent& rMEvt) { unColorizeOverlappedObj(); } - + return bOverlapping; } // ----------------------------------------------------------------------------- @@ -570,6 +584,7 @@ bool DlgEdFunc::isOnlyCustomShapeMarked() for (sal_uInt32 i = 0; i < rMarkList.GetMarkCount();++i ) { SdrMark* pMark = rMarkList.GetMark(i); + // bCheck = dynamic_cast<OUnoObject*>(pMark->GetMarkedSdrObj()) != NULL; SdrObject* pObj = pMark->GetMarkedSdrObj(); if (pObj->GetObjIdentifier() != OBJ_CUSTOMSHAPE) { @@ -594,15 +609,16 @@ bool DlgEdFunc::isRectangleHit(const MouseEvent& rMEvt) if ( !bIsSetPoint ) { // no drag rect, we have to check every single select rect + //const Rectangle& rRect = m_rView.GetDragStat().GetActionRect(); const SdrDragStat& rDragStat = m_rView.GetDragStat(); if (rDragStat.GetDragMethod() != NULL) { SdrObjListIter aIter(*m_pParent->getPage(),IM_DEEPNOGROUPS); - SdrObject* pObjIter = NULL; + SdrObject* pObjIter = NULL; // loop through all marked objects and check if there new rect overlapps an old one. while( (pObjIter = aIter.Next()) != NULL && !bIsSetPoint) { - if ( m_rView.IsObjMarked(pObjIter) + if ( m_rView.IsObjMarked(pObjIter) && dynamic_cast<OUnoObject*>(pObjIter) != NULL ) { Rectangle aNewRect = pObjIter->GetLastBoundRect(); @@ -617,8 +633,8 @@ bool DlgEdFunc::isRectangleHit(const MouseEvent& rMEvt) aNewRect.Move(nDx,nDy); else ::ResizeRect(aNewRect,rDragStat.GetRef1(),rDragStat.GetXFact(),rDragStat.GetYFact()); - - + + SdrObject* pObjOverlapped = isOver(aNewRect,*m_pParent->getPage(),m_rView,false,pObjIter, ISOVER_IGNORE_CUSTOMSHAPES); bIsSetPoint = pObjOverlapped ? true : false; if (pObjOverlapped && !m_bSelectionMode) @@ -658,34 +674,39 @@ bool DlgEdFunc::setMovementPointer(const MouseEvent& rMEvt) DlgEdFuncInsert::DlgEdFuncInsert( OReportSection* _pParent ) : DlgEdFunc( _pParent ) { - m_rView.SetCreateMode( sal_True ); + m_rView.SetCreateMode( TRUE ); } //---------------------------------------------------------------------------- DlgEdFuncInsert::~DlgEdFuncInsert() { - m_rView.SetEditMode( sal_True ); + m_rView.SetEditMode( TRUE ); } //---------------------------------------------------------------------------- -sal_Bool DlgEdFuncInsert::MouseButtonDown( const MouseEvent& rMEvt ) +BOOL DlgEdFuncInsert::MouseButtonDown( const MouseEvent& rMEvt ) { if ( DlgEdFunc::MouseButtonDown(rMEvt) ) - return sal_True; + return TRUE; SdrViewEvent aVEvt; sal_Int16 nId = m_rView.GetCurrentObjIdentifier(); const SdrHitKind eHit = m_rView.PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt); +// eHit == SDRHIT_UNMARKEDOBJECT under the mouse cursor is a unmarked object + if (eHit == SDRHIT_UNMARKEDOBJECT && nId != OBJ_CUSTOMSHAPE) { // there is an object under the mouse cursor, but not a customshape + // rtl::OUString suWasN = m_rView.getInsertObjString(); + // rtl::OUString suWasN2 = m_pParent->getSectionWindow()->getViewsWindow()->GetInsertObjString(); + m_pParent->getSectionWindow()->getViewsWindow()->BrkAction(); - return sal_False; + return FALSE; } if( eHit != SDRHIT_UNMARKEDOBJECT || nId == OBJ_CUSTOMSHAPE) @@ -710,19 +731,19 @@ sal_Bool DlgEdFuncInsert::MouseButtonDown( const MouseEvent& rMEvt ) m_pParent->getSectionWindow()->getViewsWindow()->BegMarkObj( m_aMDPos,&m_rView ); } - return sal_True; + return TRUE; } //---------------------------------------------------------------------------- -sal_Bool DlgEdFuncInsert::MouseButtonUp( const MouseEvent& rMEvt ) +BOOL DlgEdFuncInsert::MouseButtonUp( const MouseEvent& rMEvt ) { if ( DlgEdFunc::MouseButtonUp( rMEvt ) ) - return sal_True; + return TRUE; - const Point aPos( m_pParent->PixelToLogic( rMEvt.GetPosPixel() ) ); - const sal_uInt16 nHitLog = sal_uInt16 ( m_pParent->PixelToLogic(Size(3,0)).Width() ); + const Point aPos( m_pParent->PixelToLogic( rMEvt.GetPosPixel() ) ); + const USHORT nHitLog = USHORT ( m_pParent->PixelToLogic(Size(3,0)).Width() ); - sal_Bool bReturn = sal_True; + BOOL bReturn = TRUE; // object creation active? if ( m_rView.IsCreateObj() ) { @@ -730,10 +751,10 @@ sal_Bool DlgEdFuncInsert::MouseButtonUp( const MouseEvent& rMEvt ) { m_pParent->getSectionWindow()->getViewsWindow()->BrkAction(); // BrkAction disables the create mode - m_rView.SetCreateMode( sal_True ); - return sal_True; + m_rView.SetCreateMode( TRUE ); + return TRUE; } - + m_rView.EndCreateObj(SDRCREATE_FORCEEND); if ( !m_rView.AreObjectsMarked() ) @@ -749,6 +770,7 @@ sal_Bool DlgEdFuncInsert::MouseButtonUp( const MouseEvent& rMEvt ) for (sal_uInt32 i = 0; i < rMarkList.GetMarkCount();++i ) { SdrMark* pMark = rMarkList.GetMark(i); + // bCheck = dynamic_cast<OUnoObject*>(pMark->GetMarkedSdrObj()) != NULL; OOle2Obj* pObj = dynamic_cast<OOle2Obj*>(pMark->GetMarkedSdrObj()); if ( pObj && !pObj->IsEmpty() ) { @@ -759,7 +781,7 @@ sal_Bool DlgEdFuncInsert::MouseButtonUp( const MouseEvent& rMEvt ) } else checkMovementAllowed(rMEvt); - + if ( !m_rView.AreObjectsMarked() && Abs(m_aMDPos.X() - aPos.X()) < nHitLog && Abs(m_aMDPos.Y() - aPos.Y()) < nHitLog && @@ -769,7 +791,7 @@ sal_Bool DlgEdFuncInsert::MouseButtonUp( const MouseEvent& rMEvt ) SdrViewEvent aVEvt; m_rView.PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt); m_rView.MarkObj(aVEvt.pRootObj, pPV); - } + } // ift() && !rMEvt.IsMod2() ) checkTwoCklicks(rMEvt); m_pParent->getSectionWindow()->getViewsWindow()->getView()->getReportView()->UpdatePropertyBrowserDelayed(m_rView); return bReturn; @@ -777,11 +799,11 @@ sal_Bool DlgEdFuncInsert::MouseButtonUp( const MouseEvent& rMEvt ) //---------------------------------------------------------------------------- -sal_Bool DlgEdFuncInsert::MouseMove( const MouseEvent& rMEvt ) +BOOL DlgEdFuncInsert::MouseMove( const MouseEvent& rMEvt ) { if ( DlgEdFunc::MouseMove(rMEvt ) ) - return sal_True; - Point aPos( m_pParent->PixelToLogic( rMEvt.GetPosPixel() ) ); + return TRUE; + Point aPos( m_pParent->PixelToLogic( rMEvt.GetPosPixel() ) ); if ( m_rView.IsCreateObj() ) { @@ -805,10 +827,13 @@ sal_Bool DlgEdFuncInsert::MouseMove( const MouseEvent& rMEvt ) m_pParent->getSectionWindow()->getViewsWindow()->MovAction(aPos,&m_rView, m_rView.GetDragMethod() == NULL, false); } + //if ( isOver(m_rView.GetCreateObj(),*m_pParent->getPage(),*m_pView) ) + // m_pParent->SetPointer( Pointer(POINTER_NOTALLOWED)); + //else if ( !bIsSetPoint ) m_pParent->SetPointer( m_rView.GetPreferedPointer( aPos, m_pParent) ); - return sal_True; + return TRUE; } //---------------------------------------------------------------------------- @@ -826,12 +851,12 @@ DlgEdFuncSelect::~DlgEdFuncSelect() //---------------------------------------------------------------------------- -sal_Bool DlgEdFuncSelect::MouseButtonDown( const MouseEvent& rMEvt ) +BOOL DlgEdFuncSelect::MouseButtonDown( const MouseEvent& rMEvt ) { m_bSelectionMode = false; if ( DlgEdFunc::MouseButtonDown(rMEvt) ) - return sal_True; - + return TRUE; + SdrViewEvent aVEvt; const SdrHitKind eHit = m_rView.PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt); if( eHit == SDRHIT_UNMARKEDOBJECT ) @@ -855,6 +880,7 @@ sal_Bool DlgEdFuncSelect::MouseButtonDown( const MouseEvent& rMEvt ) { if( !rMEvt.IsShift() ) m_pParent->getSectionWindow()->getViewsWindow()->unmarkAllObjects(NULL); + //m_rView.UnmarkAll(); if ( rMEvt.GetClicks() == 1 ) { @@ -867,15 +893,15 @@ sal_Bool DlgEdFuncSelect::MouseButtonDown( const MouseEvent& rMEvt ) } } - return sal_True; + return TRUE; } //---------------------------------------------------------------------------- -sal_Bool DlgEdFuncSelect::MouseButtonUp( const MouseEvent& rMEvt ) +BOOL DlgEdFuncSelect::MouseButtonUp( const MouseEvent& rMEvt ) { if ( DlgEdFunc::MouseButtonUp( rMEvt ) ) - return sal_True; + return TRUE; // get view from parent const Point aPnt( m_pParent->PixelToLogic( rMEvt.GetPosPixel() ) ); @@ -887,19 +913,19 @@ sal_Bool DlgEdFuncSelect::MouseButtonUp( const MouseEvent& rMEvt ) checkTwoCklicks(rMEvt); m_pParent->SetPointer( m_rView.GetPreferedPointer( aPnt, m_pParent) ); - + if ( !m_bUiActive ) m_pParent->getSectionWindow()->getViewsWindow()->getView()->getReportView()->UpdatePropertyBrowserDelayed(m_rView); m_bSelectionMode = false; - return sal_True; + return TRUE; } //---------------------------------------------------------------------------- -sal_Bool DlgEdFuncSelect::MouseMove( const MouseEvent& rMEvt ) +BOOL DlgEdFuncSelect::MouseMove( const MouseEvent& rMEvt ) { if ( DlgEdFunc::MouseMove(rMEvt ) ) - return sal_True; + return TRUE; Point aPnt( m_pParent->PixelToLogic( rMEvt.GetPosPixel() ) ); bool bIsSetPoint = false; @@ -922,13 +948,22 @@ sal_Bool DlgEdFuncSelect::MouseMove( const MouseEvent& rMEvt ) { aPnt.Y() = 0; } + // grow section if it is under the current section +// else +// { +// const Size& aSectionSize = m_rView->GetSizePixel(); +// if ( aPnt.Y() > aSectionSize.Height() ) +// { +// aPnt.Y() = aSectionSize.Height(); +// } +// } } // drag or resize an object bool bControlKey = rMEvt.IsMod1(); m_pParent->getSectionWindow()->getViewsWindow()->MovAction(aPnt, &m_rView, false, bControlKey); } - } - + } + if ( !bIsSetPoint ) { m_pParent->SetPointer( m_rView.GetPreferedPointer( aPnt, m_pParent) ); @@ -937,8 +972,149 @@ sal_Bool DlgEdFuncSelect::MouseMove( const MouseEvent& rMEvt ) unColorizeOverlappedObj(); } - return sal_True; + return TRUE; } +// ----------------------------------------------------------------------------- +//void DlgEdFuncSelect::SetInEditMode(SdrTextObj* _pTextObj,const MouseEvent& rMEvt, BOOL bQuickDrag) +//{ +// +// SdrPageView* pPV = m_rView.GetSdrPageView(); +// if( _pTextObj && _pTextObj->GetPage() == pPV->GetPage() ) +// { +// m_rView.SetCurrentObj(OBJ_TEXT); +// m_rView.SetEditMode(SDREDITMODE_EDIT); +// +// BOOL bEmptyOutliner = FALSE; +// +// if (!_pTextObj->GetOutlinerParaObject() && m_rView.GetTextEditOutliner()) +// { +// ::SdrOutliner* pOutl = m_rView.GetTextEditOutliner(); +// ULONG nParaAnz = pOutl->GetParagraphCount(); +// Paragraph* p1stPara = pOutl->GetParagraph( 0 ); +// +// if (nParaAnz==1 && p1stPara) +// { +// // Bei nur einem Pararaph +// if (pOutl->GetText(p1stPara).Len() == 0) +// { +// bEmptyOutliner = TRUE; +// } +// } +// } +// +// if (_pTextObj != m_rView.GetTextEditObject() || bEmptyOutliner) +// { +// UINT32 nInv = _pTextObj->GetObjInventor(); +// UINT16 nSdrObjKind = _pTextObj->GetObjIdentifier(); +// +// if (nInv == SdrInventor && _pTextObj->HasTextEdit() && +// (nSdrObjKind == OBJ_TEXT || +// nSdrObjKind == OBJ_TITLETEXT || +// nSdrObjKind == OBJ_OUTLINETEXT || +// (_pTextObj->ISA(SdrTextObj) && !_pTextObj->IsEmptyPresObj()))) +// { +// // Neuen Outliner machen (gehoert der SdrObjEditView) +// SdrModel* pModel = _pTextObj->GetModel(); +// SdrOutliner* pOutl = SdrMakeOutliner( OUTLINERMODE_OUTLINEOBJECT, pModel ); +// pOutl->SetMinDepth(0); +// pOutl->SetStyleSheetPool((SfxStyleSheetPool*) pModel->GetStyleSheetPool()); +// //pOutl->SetCalcFieldValueHdl(LINK(SD_MOD(), SdModule, CalcFieldValueHdl)); +// ULONG nCntrl = pOutl->GetControlWord(); +// nCntrl |= EE_CNTRL_ALLOWBIGOBJS; +// nCntrl |= EE_CNTRL_URLSFXEXECUTE; +// nCntrl |= EE_CNTRL_MARKFIELDS; +// nCntrl |= EE_CNTRL_AUTOCORRECT; +// +// nCntrl &= ~EE_CNTRL_ULSPACESUMMATION; +// //if ( pModel->IsSummationOfParagraphs() ) +// // nCntrl |= EE_CNTRL_ULSPACESUMMATION; +// +// //SetSpellOptions( nCntrl ); +// +// pOutl->SetControlWord(nCntrl); +// +// uno::Reference< linguistic2::XSpellChecker1 > xSpellChecker( LinguMgr::GetSpellChecker() ); +// if ( xSpellChecker.is() ) +// pOutl->SetSpeller( xSpellChecker ); +// +// uno::Reference< linguistic2::XHyphenator > xHyphenator( LinguMgr::GetHyphenator() ); +// if( xHyphenator.is() ) +// pOutl->SetHyphenator( xHyphenator ); +// +// pOutl->SetDefaultLanguage( Application::GetSettings().GetLanguage() ); +// +// // in einem Gliederungstext darf nicht auf die 0-te +// // Ebene ausgerueckt werden +// if (_pTextObj->GetObjInventor() == SdrInventor && +// _pTextObj->GetObjIdentifier() == OBJ_OUTLINETEXT) +// { +// pOutl->SetMinDepth(1); +// } +// +// if (bEmptyOutliner) +// { +// m_rView.SdrEndTextEdit(sal_True); +// } +// +// if( _pTextObj ) +// { +// OutlinerParaObject* pOPO = _pTextObj->GetOutlinerParaObject(); +// if( ( pOPO && pOPO->IsVertical() ) /*|| +// nSlotId == SID_ATTR_CHAR_VERTICAL || +// nSlotId == SID_TEXT_FITTOSIZE_VERTICAL */) +// pOutl->SetVertical( TRUE ); +// +// +// if (m_rView.SdrBeginTextEdit(_pTextObj, pPV, pParent, sal_True, pOutl) && _pTextObj->GetObjInventor() == SdrInventor) +// { +// //bFirstObjCreated = TRUE; +// //DeleteDefaultText(); +// +// OutlinerView* pOLV = m_rView.GetTextEditOutlinerView(); +// +// nSdrObjKind = _pTextObj->GetObjIdentifier(); +// +// SdrViewEvent aVEvt; +// SdrHitKind eHit = m_rView.PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt); +// +// if (eHit == SDRHIT_TEXTEDIT) +// { +// // Text getroffen +// if (nSdrObjKind == OBJ_TEXT || +// nSdrObjKind == OBJ_TITLETEXT || +// nSdrObjKind == OBJ_OUTLINETEXT || +// //nSlotId == SID_TEXTEDIT || +// !bQuickDrag) +// { +// pOLV->MouseButtonDown(rMEvt); +// pOLV->MouseMove(rMEvt); +// pOLV->MouseButtonUp(rMEvt); +// } +// +// if ( bQuickDrag && _pTextObj->GetOutlinerParaObject()) +// { +// pOLV->MouseButtonDown(rMEvt); +// } +// } +// else +// { +// // #98198# Move cursor to end of text +// ESelection aNewSelection(EE_PARA_NOT_FOUND, EE_INDEX_NOT_FOUND, EE_PARA_NOT_FOUND, EE_INDEX_NOT_FOUND); +// pOLV->SetSelection(aNewSelection); +// } +// } +// else +// { +// //RestoreDefaultText(); +// } +// } +// } +// } +// } +// else +// _pTextObj = NULL; +//} + //---------------------------------------------------------------------------- } diff --git a/reportdesign/source/ui/report/makefile.mk b/reportdesign/source/ui/report/makefile.mk index 0383a98be4a8..3c19923f4c19 100644 --- a/reportdesign/source/ui/report/makefile.mk +++ b/reportdesign/source/ui/report/makefile.mk @@ -36,6 +36,7 @@ VISIBILITY_HIDDEN=TRUE # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk +# .INCLUDE : $(PRJ)$/util$/dll.pmk IMGLST_SRS=$(SRS)$/$(TARGET).srs # --- Files -------------------------------------------------------- diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx index 1d5564cace0d..5bfb868973f0 100644 --- a/reportdesign/source/ui/report/propbrw.cxx +++ b/reportdesign/source/ui/report/propbrw.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -102,12 +102,12 @@ DBG_NAME( rpt_PropBrw ) //---------------------------------------------------------------------------- -PropBrw::PropBrw(const Reference< XMultiServiceFactory >& _xORB,Window* pParent,ODesignView* _pDesignView) +PropBrw::PropBrw(const Reference< XMultiServiceFactory >& _xORB,Window* pParent,ODesignView* _pDesignView) :DockingWindow(pParent,WinBits(WB_STDMODELESS|WB_SIZEABLE|WB_3DLOOK|WB_ROLLABLE)) ,m_xORB(_xORB) ,m_pDesignView(_pDesignView) ,m_pView( NULL ) - ,m_bInitialStateChange(sal_True) + ,m_bInitialStateChange(sal_True) { DBG_CTOR( rpt_PropBrw,NULL); @@ -121,12 +121,12 @@ PropBrw::PropBrw(const Reference< XMultiServiceFactory >& _xORB,Window* pParen if (m_xMeAsFrame.is()) { m_xMeAsFrame->initialize( VCLUnoHelper::GetInterface ( this ) ); - m_xMeAsFrame->setName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("report property browser"))); // change name! + m_xMeAsFrame->setName(::rtl::OUString::createFromAscii("report property browser")); // change name! } } catch (Exception&) { - OSL_FAIL("PropBrw::PropBrw: could not create/initialize my frame!"); + DBG_ERROR("PropBrw::PropBrw: could not create/initialize my frame!"); m_xMeAsFrame.clear(); } @@ -141,6 +141,9 @@ PropBrw::PropBrw(const Reference< XMultiServiceFactory >& _xORB,Window* pParen xFactoryProperties->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ) ) ), UNO_QUERY_THROW ); + /*uno::Reference< XComponent> xModel = new OContextHelper(m_xORB,uno::Reference< XComponent>(m_pDesignView->getController().getModel(),uno::UNO_QUERY) ); + uno::Reference< XComponent> xDialogParentWindow = new OContextHelper(m_xORB,uno::Reference< XComponent>(VCLUnoHelper::GetInterface ( this ),uno::UNO_QUERY) ); + uno::Reference< XComponent> xConnection = new OContextHelper(m_xORB,uno::Reference< XComponent>(m_pDesignView->getController().getConnection(),uno::UNO_QUERY) );*/ // a ComponentContext for the ::cppu::ContextEntry_Init aHandlerContextInfo[] = { @@ -156,7 +159,7 @@ PropBrw::PropBrw(const Reference< XMultiServiceFactory >& _xORB,Window* pParen Reference< inspection::XObjectInspectorModel> xInspectorModel( bEnableHelpSection ? report::inspection::DefaultComponentInspectorModel::createWithHelpSection( m_xInspectorContext, 3, 8 ) : report::inspection::DefaultComponentInspectorModel::createDefault( m_xInspectorContext ) ); - + m_xBrowserController = inspection::ObjectInspector::createWithModel(m_xInspectorContext, xInspectorModel); if ( !m_xBrowserController.is() ) { @@ -179,7 +182,7 @@ PropBrw::PropBrw(const Reference< XMultiServiceFactory >& _xORB,Window* pParen } catch (Exception&) { - OSL_FAIL("PropBrw::PropBrw: could not create/initialize the browser controller!"); + DBG_ERROR("PropBrw::PropBrw: could not create/initialize the browser controller!"); try { ::comphelper::disposeComponent(m_xBrowserController); @@ -196,7 +199,7 @@ PropBrw::PropBrw(const Reference< XMultiServiceFactory >& _xORB,Window* pParen if (m_xBrowserComponentWindow.is()) { - + m_xBrowserComponentWindow->setPosSize(0, 0, aPropWinSize.Width(), aPropWinSize.Height(), awt::PosSize::WIDTH | awt::PosSize::HEIGHT | awt::PosSize::X | awt::PosSize::Y); Resize(); @@ -232,9 +235,9 @@ PropBrw::~PropBrw() DBG_DTOR( rpt_PropBrw,NULL); } // ----------------------------------------------------------------------------- -void PropBrw::setCurrentPage(const ::rtl::OUString& _sLastActivePage) -{ - m_sLastActivePage = _sLastActivePage; +void PropBrw::setCurrentPage(const ::rtl::OUString& _sLastActivePage) +{ + m_sLastActivePage = _sLastActivePage; } //---------------------------------------------------------------------------- @@ -269,7 +272,7 @@ void PropBrw::implDetachController() } catch( const Exception& ) { - OSL_FAIL( "PropBrw::getCurrentPage: caught an exception while retrieving the current page!" ); + OSL_ENSURE( sal_False, "PropBrw::getCurrentPage: caught an exception while retrieving the current page!" ); } return sCurrentPage; } @@ -289,7 +292,7 @@ sal_Bool PropBrw::Close() } catch( const Exception& ) { - OSL_FAIL( "FmPropBrw::Close: caught an exception while asking the controller!" ); + OSL_ENSURE( sal_False, "FmPropBrw::Close: caught an exception while asking the controller!" ); } } implDetachController(); @@ -299,7 +302,7 @@ sal_Bool PropBrw::Close() m_pDesignView->getController().executeUnChecked(SID_PROPERTYBROWSER_LAST_PAGE,uno::Sequence< beans::PropertyValue>()); - return sal_True; + return TRUE; } //---------------------------------------------------------------------------- @@ -308,7 +311,7 @@ uno::Sequence< Reference<uno::XInterface> > PropBrw::CreateCompPropSet(const Sdr { sal_uInt32 nMarkCount = _rMarkList.GetMarkCount(); ::std::vector< uno::Reference< uno::XInterface> > aSets; - aSets.reserve(nMarkCount); + aSets.reserve(nMarkCount); for(sal_uInt32 i=0;i<nMarkCount;++i) { @@ -346,8 +349,10 @@ void PropBrw::implSetNewObject( const uno::Sequence< Reference<uno::XInterface> } catch( const Exception& ) { - OSL_FAIL( "FmPropBrw::StateChanged: caught an exception while setting the initial page!" ); + OSL_ENSURE( sal_False, "FmPropBrw::StateChanged: caught an exception while setting the initial page!" ); } + + //Resize(); } SetText( GetHeadlineName(_aObjects) ); } @@ -363,13 +368,13 @@ void PropBrw::implSetNewObject( const uno::Sequence< Reference<uno::XInterface> } else if ( _aObjects.getLength() == 1 ) // single selection { + sal_uInt16 nResId = 0; aName = String(ModuleRes(RID_STR_BRWTITLE_PROPERTIES)); uno::Reference< container::XNameContainer > xNameCont(_aObjects[0],uno::UNO_QUERY); Reference< lang::XServiceInfo > xServiceInfo( xNameCont->getByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReportComponent"))), UNO_QUERY ); if ( xServiceInfo.is() ) { - sal_uInt16 nResId = 0; if ( xServiceInfo->supportsService( SERVICE_FIXEDTEXT ) ) { nResId = RID_STR_PROPTITLE_FIXEDTEXT; @@ -408,7 +413,7 @@ void PropBrw::implSetNewObject( const uno::Sequence< Reference<uno::XInterface> } else { - OSL_FAIL("Unknown service name!"); + OSL_ENSURE(0,"Unknown service name!"); nResId = RID_STR_CLASS_FORMATTEDFIELD; } @@ -519,7 +524,7 @@ void PropBrw::Update( OSectionView* pNewView ) } catch( const Exception& ) { - OSL_FAIL( "FmPropBrw::StateChanged: caught an exception while setting the initial page!" ); + OSL_ENSURE( sal_False, "FmPropBrw::StateChanged: caught an exception while setting the initial page!" ); } } } @@ -531,8 +536,8 @@ void PropBrw::Update( OSectionView* pNewView ) uno::Sequence< Reference<uno::XInterface> > aMarkedObjects; OViewsWindow* pViews = m_pView->getReportSection()->getSectionWindow()->getViewsWindow(); - const sal_uInt16 nSectionCount = pViews->getSectionCount(); - for (sal_uInt16 i = 0; i < nSectionCount; ++i) + const USHORT nSectionCount = pViews->getSectionCount(); + for (USHORT i = 0; i < nSectionCount; ++i) { ::boost::shared_ptr<OSectionWindow> pSectionWindow = pViews->getSectionWindow(i); if ( pSectionWindow ) @@ -562,7 +567,7 @@ void PropBrw::Update( OSectionView* pNewView ) } catch ( Exception& ) { - OSL_FAIL( "PropBrw::Update: Exception occurred!" ); + DBG_ERROR( "PropBrw::Update: Exception occured!" ); } } //---------------------------------------------------------------------------- @@ -577,14 +582,14 @@ void PropBrw::Update( const uno::Reference< uno::XInterface>& _xReportComponent) { EndListening( *(m_pView->GetModel()) ); m_pView = NULL; - } - + } // if ( m_pView ) + uno::Reference< uno::XInterface> xTemp(CreateComponentPair(_xReportComponent,_xReportComponent)); implSetNewObject( uno::Sequence< uno::Reference< uno::XInterface> >(&xTemp,1) ); } catch ( Exception& ) { - OSL_FAIL( "PropBrw::Update: Exception occurred!" ); + DBG_ERROR( "PropBrw::Update: Exception occured!" ); } } } @@ -599,7 +604,7 @@ IMPL_LINK( PropBrw, OnAsyncGetFocus, void*, ) void PropBrw::LoseFocus() { DockingWindow::LoseFocus(); - m_pDesignView->getController().InvalidateAll(); + m_pDesignView->getController().InvalidateAll(); } //---------------------------------------------------------------------------- } diff --git a/reportdesign/source/ui/report/report.src b/reportdesign/source/ui/report/report.src index c4c64b83d1c6..536579d7fb7b 100644 --- a/reportdesign/source/ui/report/report.src +++ b/reportdesign/source/ui/report/report.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ #ifndef _SBASLTID_HRC #include <svx/svxids.hrc> #endif -#include "helpids.hrc" + // Dialog Controls --------------------------------------------------------------- @@ -112,13 +112,25 @@ String RID_STR_PROPTITLE_GROUP Image RID_IMG_TREENODE_COLLAPSED { - ImageBitmap = Bitmap { File = "plus.png"; } ; + ImageBitmap = Bitmap { File = "plus.bmp"; } ; MaskColor = Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; }; }; Image RID_IMG_TREENODE_EXPANDED { - ImageBitmap = Bitmap { File = "minus.png"; } ; + ImageBitmap = Bitmap { File = "minus.bmp"; } ; + MaskColor = Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; }; +}; + +Image RID_IMG_TREENODE_COLLAPSED_HC +{ + ImageBitmap = Bitmap { File = "plus_sch.bmp"; } ; + MaskColor = Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; }; +}; + +Image RID_IMG_TREENODE_EXPANDED_HC +{ + ImageBitmap = Bitmap { File = "minus_sch.bmp"; } ; MaskColor = Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; }; }; @@ -286,6 +298,7 @@ Menu RID_MENU_REPORT MenuItem { Identifier = SID_SORTINGANDGROUPING; + HelpId = SID_SORTINGANDGROUPING ; Command = ".uno:DbSortingAndGrouping"; Text [ en-US ] = "Sorting and Grouping..."; }; @@ -296,12 +309,14 @@ Menu RID_MENU_REPORT MenuItem { Identifier = SID_ATTR_CHAR_COLOR_BACKGROUND; + HelpId = SID_ATTR_CHAR_COLOR_BACKGROUND ; Command = ".uno:DBBackgroundColor"; Text [ en-US ] = "Background Color..."; }; MenuItem { Identifier = SID_RULER; + HelpId = SID_RULER ; Command = ".uno:ShowRuler"; Checkable = TRUE; Text [ en-US ] = "Ruler..."; @@ -309,6 +324,7 @@ Menu RID_MENU_REPORT MenuItem { Identifier = SID_GRID_VISIBLE; + HelpId = SID_GRID_VISIBLE ; Command = ".uno:GridVisible"; Checkable = TRUE; Text [ en-US ] = "Grid..."; @@ -320,12 +336,14 @@ Menu RID_MENU_REPORT MenuItem { Identifier = SID_PAGEHEADERFOOTER; + HelpId = SID_PAGEHEADERFOOTER ; Command = ".uno:PageHeaderFooter"; Checkable = TRUE; }; MenuItem { Identifier = SID_REPORTHEADERFOOTER; + HelpId = SID_REPORTHEADERFOOTER ; Command = ".uno:ReportHeaderFooter"; Checkable = TRUE; }; @@ -335,12 +353,13 @@ Menu RID_MENU_REPORT }; MenuItem { - Identifier = SID_ARRANGEMENU ; - Command = ".uno:ArrangeMenu" ; - Text [ en-US ] = "~Arrange" ; + Identifier = SID_ARRANGEMENU ; + HelpID = SID_ARRANGEMENU ; + Command = ".uno:ArrangeMenu" ; + Text [ en-US ] = "~Arrange" ; SubMenu = Menu { - ItemList = + ItemList = { MenuItem { @@ -348,14 +367,14 @@ Menu RID_MENU_REPORT }; MenuItem { - Identifier = SID_FRAME_UP ; - HelpId = ".uno:ObjectForwardOne"; + Identifier = SID_FRAME_UP ; + HelpID = SID_FRAME_UP ; Text [ en-US ] = "Bring ~Forward" ; }; MenuItem { - Identifier = SID_FRAME_DOWN ; - HelpId = ".uno:ObjectBackOne"; + Identifier = SID_FRAME_DOWN ; + HelpID = SID_FRAME_DOWN ; Text [ en-US ] = "Send Back~ward" ; }; MenuItem @@ -382,7 +401,7 @@ Menu RID_MENU_REPORT ITEM_FORMAT_OBJECT_ALIGN SubMenu = Menu { - ItemList = + ItemList = { MenuItem { @@ -422,18 +441,20 @@ Menu RID_MENU_REPORT MenuItem { - Identifier = SID_OBJECT_RESIZING ; - Command = ".uno:ObjectResize" ; + Identifier = SID_OBJECT_RESIZING ; + Command = ".uno:ObjectResize" ; + HelpID = SID_OBJECT_RESIZING ; Text [ en-US ] = "~Object Resizing" ; - Text [ x-comment ] = " "; + Text [ x-comment ] = " "; SubMenu = Menu { - ItemList = + ItemList = { MenuItem { Identifier = SID_OBJECT_SMALLESTWIDTH ; Command = ".uno:SmallestWidth" ; + HelpID = SID_OBJECT_SMALLESTWIDTH ; Text [ en-US ] = "~Fit to smallest width" ; Text [ x-comment ] = " "; }; @@ -441,6 +462,7 @@ Menu RID_MENU_REPORT { Identifier = SID_OBJECT_GREATESTWIDTH ; Command = ".uno:GreatestWidth" ; + HelpID = SID_OBJECT_GREATESTWIDTH ; Text [ en-US ] = "~Fit to greatest width" ; Text [ x-comment ] = " "; }; @@ -452,6 +474,7 @@ Menu RID_MENU_REPORT { Identifier = SID_OBJECT_SMALLESTHEIGHT ; Command = ".uno:SmallestHeight" ; + HelpID = SID_OBJECT_SMALLESTHEIGHT ; Text [ en-US ] = "~Fit to smallest height" ; Text [ x-comment ] = " "; }; @@ -459,6 +482,7 @@ Menu RID_MENU_REPORT { Identifier = SID_OBJECT_GREATESTHEIGHT ; Command = ".uno:GreatestHeight" ; + HelpID = SID_OBJECT_GREATESTHEIGHT ; Text [ en-US ] = "~Fit to greatest height" ; Text [ x-comment ] = " "; }; @@ -472,18 +496,20 @@ Menu RID_MENU_REPORT }; MenuItem { - Identifier = SID_SECTION_SHRINK_MENU ; - Command = ".uno:SectionShrinkMenu" ; + Identifier = SID_SECTION_SHRINK_MENU ; + Command = ".uno:SectionShrinkMenu" ; + HelpID = SID_SECTION_SHRINK_MENU ; Text [ en-US ] = "Section" ; - Text [ x-comment ] = " "; + Text [ x-comment ] = " "; SubMenu = Menu { - ItemList = + ItemList = { MenuItem { Identifier = SID_SECTION_SHRINK ; Command = ".uno:SectionShrink" ; + HelpID = SID_SECTION_SHRINK ; Text [ en-US ] = "Shrink" ; Text [ x-comment ] = " "; }; @@ -491,6 +517,7 @@ Menu RID_MENU_REPORT { Identifier = SID_SECTION_SHRINK_TOP ; Command = ".uno:SectionShrinkTop" ; + HelpID = SID_SECTION_SHRINK_TOP ; Text [ en-US ] = "Shrink from top" ; Text [ x-comment ] = " "; }; @@ -498,6 +525,7 @@ Menu RID_MENU_REPORT { Identifier = SID_SECTION_SHRINK_BOTTOM ; Command = ".uno:SectionShrinkBottom" ; + HelpID = SID_SECTION_SHRINK_BOTTOM ; Text [ en-US ] = "Shrink from bottom" ; Text [ x-comment ] = " "; }; @@ -511,6 +539,7 @@ Menu RID_MENU_REPORT MenuItem { Identifier = SID_DISTRIBUTION; + HelpId = SID_DISTRIBUTION ; Command = ".uno:Distribution"; Text [ en-US ] = "Distribution..." ; }; @@ -521,6 +550,7 @@ Menu RID_MENU_REPORT MenuItem { Identifier = SID_SHOW_PROPERTYBROWSER; + HelpId = SID_SHOW_PROPERTYBROWSER ; Command = ".uno:FormProperties"; Text [ en-US ] = "Properties..."; }; diff --git a/reportdesign/uiconfig/dbreport/toolbar/arrowshapes.xml b/reportdesign/uiconfig/dbreport/toolbar/arrowshapes.xml index 62f2e5e2d534..3d64100d1636 100644 --- a/reportdesign/uiconfig/dbreport/toolbar/arrowshapes.xml +++ b/reportdesign/uiconfig/dbreport/toolbar/arrowshapes.xml @@ -18,17 +18,17 @@ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.notched-right-arrow"/> <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.pentagon-right"/> <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.chevron"/> - <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow-callout"/> - <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow-callout"/> - <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow-callout"/> + <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow-callout"/> + <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow-callout"/> + <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow-callout"/> <toolbar:toolbarbreak/> - <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow-callout"/> - <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow-callout"/> - <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow-callout"/> - <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow-callout"/> - <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow-callout"/> - <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.circular-arrow"/> + <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow-callout"/> + <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow-callout"/> + <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow-callout"/> + <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow-callout"/> + <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow-callout"/> + <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.circular-arrow"/> <toolbar:toolbarbreak/> - <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-round-arrow"/> - <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.s-sharped-arrow"/> + <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-round-arrow"/> + <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.s-sharped-arrow"/> </toolbar:toolbar>
\ No newline at end of file diff --git a/reportdesign/uiconfig/dbreport/toolbar/basicshapes.xml b/reportdesign/uiconfig/dbreport/toolbar/basicshapes.xml index e26df54f29ab..4d1e847a8f2f 100644 --- a/reportdesign/uiconfig/dbreport/toolbar/basicshapes.xml +++ b/reportdesign/uiconfig/dbreport/toolbar/basicshapes.xml @@ -18,12 +18,12 @@ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.pentagon"/> <toolbar:toolbaritem xlink:href=".uno:BasicShapes.hexagon"/> <toolbar:toolbaritem xlink:href=".uno:BasicShapes.octagon"/> - <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cross"/> - <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ring"/> - <toolbar:toolbaritem xlink:href=".uno:BasicShapes.block-arc"/> + <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cross"/> + <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ring"/> + <toolbar:toolbaritem xlink:href=".uno:BasicShapes.block-arc"/> <toolbar:toolbarbreak/> - <toolbar:toolbaritem xlink:href=".uno:BasicShapes.can"/> - <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cube"/> - <toolbar:toolbaritem xlink:href=".uno:BasicShapes.paper"/> - <toolbar:toolbaritem xlink:href=".uno:BasicShapes.frame"/> + <toolbar:toolbaritem xlink:href=".uno:BasicShapes.can"/> + <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cube"/> + <toolbar:toolbaritem xlink:href=".uno:BasicShapes.paper"/> + <toolbar:toolbaritem xlink:href=".uno:BasicShapes.frame"/> </toolbar:toolbar>
\ No newline at end of file diff --git a/reportdesign/uiconfig/dbreport/toolbar/flowchartshapes.xml b/reportdesign/uiconfig/dbreport/toolbar/flowchartshapes.xml index d3e649930942..3e9c2140baac 100644 --- a/reportdesign/uiconfig/dbreport/toolbar/flowchartshapes.xml +++ b/reportdesign/uiconfig/dbreport/toolbar/flowchartshapes.xml @@ -18,19 +18,19 @@ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-connector"/> <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-off-page-connector"/> <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-card"/> - <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-punched-tape"/> - <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-summing-junction"/> - <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-or"/> + <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-punched-tape"/> + <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-summing-junction"/> + <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-or"/> <toolbar:toolbarbreak/> - <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-collate"/> - <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sort"/> - <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-extract"/> - <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-merge"/> - <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-stored-data"/> - <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-delay"/> + <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-collate"/> + <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sort"/> + <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-extract"/> + <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-merge"/> + <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-stored-data"/> + <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-delay"/> <toolbar:toolbarbreak/> - <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sequential-access"/> - <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-magnetic-disk"/> - <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-direct-access-storage"/> - <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-display"/> + <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sequential-access"/> + <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-magnetic-disk"/> + <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-direct-access-storage"/> + <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-display"/> </toolbar:toolbar>
\ No newline at end of file diff --git a/reportdesign/uiconfig/dbreport/toolbar/reportcontrols.xml b/reportdesign/uiconfig/dbreport/toolbar/reportcontrols.xml index ac460a3ba77c..9b7673730c5a 100644 --- a/reportdesign/uiconfig/dbreport/toolbar/reportcontrols.xml +++ b/reportdesign/uiconfig/dbreport/toolbar/reportcontrols.xml @@ -11,7 +11,7 @@ <toolbar:toolbaritem xlink:href=".uno:InsertObjectChart" toolbar:style="radio auto" /> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:HFixedLine" toolbar:style="radio" /> - <toolbar:toolbaritem xlink:href=".uno:VFixedLine" toolbar:style="radio" /> + <toolbar:toolbaritem xlink:href=".uno:VFixedLine" toolbar:style="radio" /> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:GridVisible" toolbar:style="radio auto" toolbar:visible="false"/> <toolbar:toolbaritem xlink:href=".uno:GridUse" toolbar:visible="false"/> diff --git a/reportdesign/uiconfig/dbreport/toolbar/symbolshapes.xml b/reportdesign/uiconfig/dbreport/toolbar/symbolshapes.xml index 4269c1d42e08..a3dd6264966d 100644 --- a/reportdesign/uiconfig/dbreport/toolbar/symbolshapes.xml +++ b/reportdesign/uiconfig/dbreport/toolbar/symbolshapes.xml @@ -18,7 +18,7 @@ <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.brace-pair"/> <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.left-brace"/> <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.right-brace"/> - <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.quad-bevel"/> - <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.octagon-bevel"/> - <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.diamond-bevel"/> + <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.quad-bevel"/> + <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.octagon-bevel"/> + <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.diamond-bevel"/> </toolbar:toolbar>
\ No newline at end of file diff --git a/reportdesign/util/hidother.src b/reportdesign/util/hidother.src index 3c52ed77c852..398f247c8f4f 100644 --- a/reportdesign/util/hidother.src +++ b/reportdesign/util/hidother.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,46 +26,48 @@ ************************************************************************/ #include "../inc/helpids.hrc" +#include "../inc/rptui_slotid.hrc" -hidspecial UID_RPT_RPT_APP_VIEW { HelpId = UID_RPT_RPT_APP_VIEW ; }; -hidspecial UID_RPT_SCROLLWINDOW { HelpId = UID_RPT_SCROLLWINDOW ; }; -hidspecial UID_RPT_REPORTWINDOW { HelpId = UID_RPT_REPORTWINDOW ; }; -hidspecial HID_RPT_HORZ_RULER { HelpId = HID_RPT_HORZ_RULER ; }; -hidspecial UID_RPT_SECTIONSWINDOW { HelpId = UID_RPT_SECTIONSWINDOW ; }; -hidspecial UID_RPT_VIEWSWINDOW { HelpId = UID_RPT_VIEWSWINDOW ; }; -hidspecial HID_RPT_ENDMARKER { HelpId = HID_RPT_ENDMARKER ; }; -hidspecial HID_RPT_SPLITTER { HelpId = HID_RPT_SPLITTER ; }; -hidspecial HID_REPORTSECTION { HelpId = HID_REPORTSECTION ; }; -hidspecial HID_RPT_HORZ_SCROLLBAR { HelpId = HID_RPT_HORZ_SCROLLBAR ; }; -hidspecial HID_RPT_VERT_SCROLLBAR { HelpId = HID_RPT_VERT_SCROLLBAR ; }; -hidspecial HID_RPT_STARTMARKER { HelpId = HID_RPT_STARTMARKER ; }; +#ifndef _SBASLTID_HRC +#include <svx/svxids.hrc> +#endif -/* -hidspecial SID_RPT_SHOWREPORTEXPLORER { HelpId = SID_RPT_SHOWREPORTEXPLORER ; }; -hidspecial SID_PAGEHEADERFOOTER { HelpId = SID_PAGEHEADERFOOTER ; }; -hidspecial SID_REPORTHEADERFOOTER { HelpId = SID_REPORTHEADERFOOTER ; }; -hidspecial SID_SORTINGANDGROUPING { HelpId = SID_SORTINGANDGROUPING ; }; -hidspecial SID_INSERT_FLD_PGNUMBER { HelpId = SID_INSERT_FLD_PGNUMBER ; }; -hidspecial SID_CONDITIONALFORMATTING { HelpId = SID_CONDITIONALFORMATTING ; }; -hidspecial SID_PAGEDIALOG { HelpId = SID_PAGEDIALOG ; }; -hidspecial SID_SETCONTROLDEFAULTS { HelpId = SID_SETCONTROLDEFAULTS ; }; -hidspecial SID_INSERTBREAK { HelpId = SID_INSERTBREAK ; }; -hidspecial SID_ESCAPE { HelpId = SID_ESCAPE ; }; -*/ +hidspecial UID_RPT_RPT_APP_VIEW { HelpId = UID_RPT_RPT_APP_VIEW ; }; +hidspecial UID_RPT_SCROLLWINDOW { HelpId = UID_RPT_SCROLLWINDOW ; }; +hidspecial UID_RPT_REPORTWINDOW { HelpId = UID_RPT_REPORTWINDOW ; }; +hidspecial HID_RPT_HORZ_RULER { HelpId = HID_RPT_HORZ_RULER ; }; +hidspecial UID_RPT_SECTIONSWINDOW { HelpId = UID_RPT_SECTIONSWINDOW ; }; +hidspecial UID_RPT_VIEWSWINDOW { HelpId = UID_RPT_VIEWSWINDOW ; }; +hidspecial HID_RPT_ENDMARKER { HelpId = HID_RPT_ENDMARKER ; }; +hidspecial HID_RPT_SPLITTER { HelpId = HID_RPT_SPLITTER ; }; +hidspecial HID_REPORTSECTION { HelpId = HID_REPORTSECTION ; }; +hidspecial HID_RPT_HORZ_SCROLLBAR { HelpId = HID_RPT_HORZ_SCROLLBAR ; }; +hidspecial HID_RPT_VERT_SCROLLBAR { HelpId = HID_RPT_VERT_SCROLLBAR ; }; +hidspecial HID_RPT_STARTMARKER { HelpId = HID_RPT_STARTMARKER ; }; -hidspecial HID_RPT_FIELDEXPRESSION { HelpId = HID_RPT_FIELDEXPRESSION ; }; -hidspecial HID_RPT_SORTORDER { HelpId = HID_RPT_SORTORDER ; }; -hidspecial HID_RPT_GROUPSBRW { HelpId = HID_RPT_GROUPSBRW ; }; -hidspecial HID_RPT_GROUPSSORTING_DLG { HelpId = HID_RPT_GROUPSSORTING_DLG ; }; -hidspecial HID_RPT_PAGENUMBERS_DLG { HelpId = HID_RPT_PAGENUMBERS_DLG ; }; -hidspecial HID_RPT_DATETIME_DLG { HelpId = HID_RPT_DATETIME_DLG ; }; -hidspecial HID_RPT_CONDFORMAT_DLG { HelpId = HID_RPT_CONDFORMAT_DLG ; }; -hidspecial HID_RPT_CRTL_FORMAT_PREVIEW { HelpId = HID_RPT_CRTL_FORMAT_PREVIEW ; }; -hidspecial HID_RPT_COND_DLG { HelpId = HID_RPT_COND_DLG ; }; +hidspecial SID_RPT_SHOWREPORTEXPLORER { HelpId = SID_RPT_SHOWREPORTEXPLORER ; }; +hidspecial SID_PAGEHEADERFOOTER { HelpId = SID_PAGEHEADERFOOTER ; }; +hidspecial SID_REPORTHEADERFOOTER { HelpId = SID_REPORTHEADERFOOTER ; }; +hidspecial SID_SORTINGANDGROUPING { HelpId = SID_SORTINGANDGROUPING ; }; +hidspecial SID_INSERT_FLD_PGNUMBER { HelpId = SID_INSERT_FLD_PGNUMBER ; }; +hidspecial SID_CONDITIONALFORMATTING { HelpId = SID_CONDITIONALFORMATTING ; }; +hidspecial SID_PAGEDIALOG { HelpId = SID_PAGEDIALOG ; }; +hidspecial SID_SETCONTROLDEFAULTS { HelpId = SID_SETCONTROLDEFAULTS ; }; +hidspecial SID_INSERTBREAK { HelpId = SID_INSERTBREAK ; }; +hidspecial HID_RPT_FIELDEXPRESSION { HelpId = HID_RPT_FIELDEXPRESSION ; }; +hidspecial HID_RPT_SORTORDER { HelpId = HID_RPT_SORTORDER ; }; +hidspecial HID_RPT_GROUPSBRW { HelpId = HID_RPT_GROUPSBRW ; }; +hidspecial HID_RPT_GROUPSSORTING_DLG { HelpId = HID_RPT_GROUPSSORTING_DLG ; }; +hidspecial HID_RPT_PAGENUMBERS_DLG { HelpId = HID_RPT_PAGENUMBERS_DLG ; }; +hidspecial HID_RPT_DATETIME_DLG { HelpId = HID_RPT_DATETIME_DLG ; }; +hidspecial HID_RPT_CONDFORMAT_DLG { HelpId = HID_RPT_CONDFORMAT_DLG ; }; +hidspecial HID_RPT_CRTL_FORMAT_PREVIEW { HelpId = HID_RPT_CRTL_FORMAT_PREVIEW ; }; +hidspecial HID_RPT_COND_DLG { HelpId = HID_RPT_COND_DLG ; }; hidspecial HID_RPT_POPUP_COLOR_CTRL { HelpId = HID_RPT_POPUP_COLOR_CTRL ; }; hidspecial HID_RPT_POPUP_COLOR { HelpId = HID_RPT_POPUP_COLOR ; }; -hidspecial HID_RPT_PROPDLG_TAB_GENERAL { HelpId = HID_RPT_PROPDLG_TAB_GENERAL ; }; -hidspecial HID_RPT_PROPDLG_TAB_DATA { HelpId = HID_RPT_PROPDLG_TAB_DATA ; }; +hidspecial SID_ESCAPE { HelpId = SID_ESCAPE ; }; +hidspecial HID_RPT_PROPDLG_TAB_GENERAL { HelpId = HID_RPT_PROPDLG_TAB_GENERAL ; }; +hidspecial HID_RPT_PROPDLG_TAB_DATA { HelpId = HID_RPT_PROPDLG_TAB_DATA ; }; hidspecial HID_RPT_PROP_FORCENEWPAGE { HelpId = HID_RPT_PROP_FORCENEWPAGE; }; hidspecial HID_RPT_PROP_NEWROWORCOL { HelpId = HID_RPT_PROP_NEWROWORCOL; }; @@ -91,18 +93,15 @@ hidspecial HID_RPT_PROP_RPT_WIDTH { HelpId = HID_RPT_PROP_RPT_WIDTH; }; hidspecial HID_RPT_PROP_RPT_HEIGHT { HelpId = HID_RPT_PROP_RPT_HEIGHT; }; hidspecial HID_RPT_START_TITLE { HelpId = HID_RPT_START_TITLE; }; hidspecial HID_RPT_START_IMAGE { HelpId = HID_RPT_START_IMAGE; }; - -/* hidspecial SID_EXECUTE_REPORT { HelpId = SID_EXECUTE_REPORT; }; + hidspecial SID_RPT_TEXTDOCUMENT { HelpId = SID_RPT_TEXTDOCUMENT; }; hidspecial SID_RPT_SPREADSHEET { HelpId = SID_RPT_SPREADSHEET; }; -hidspecial SID_RPT_NEW_FUNCTION { HelpId = SID_RPT_NEW_FUNCTION; }; -*/ - hidspecial HID_RPT_PROP_DEEPTRAVERSING { HelpId = HID_RPT_PROP_DEEPTRAVERSING; }; hidspecial HID_RPT_PROP_PREEVALUATED { HelpId = HID_RPT_PROP_PREEVALUATED; }; hidspecial HID_RPT_NAVIGATOR_DLG { HelpId = HID_RPT_NAVIGATOR_DLG; }; hidspecial HID_REPORT_NAVIGATOR_TREE { HelpId = HID_REPORT_NAVIGATOR_TREE; }; +hidspecial SID_RPT_NEW_FUNCTION { HelpId = SID_RPT_NEW_FUNCTION; }; hidspecial HID_RPT_PROP_FORMULA { HelpId = HID_RPT_PROP_FORMULA; }; hidspecial HID_RPT_PROP_INITIALFORMULA { HelpId = HID_RPT_PROP_INITIALFORMULA; };x hidspecial HID_RPT_PROP_DATAFIELD { HelpId = HID_RPT_PROP_DATAFIELD; }; @@ -111,32 +110,29 @@ hidspecial UID_RPT_RPT_PROP_DLG_FONT_TYPE { HelpId = UID_RPT_RPT_PROP_DLG_FONT_T hidspecial HID_RPT_PROP_BACKCOLOR { HelpId = HID_RPT_PROP_BACKCOLOR; }; hidspecial HID_RPT_PROP_PRESERVEIRI { HelpId = HID_RPT_PROP_PRESERVEIRI; }; -/* hidspecial SID_OBJECT_SMALLESTWIDTH { HelpId = SID_OBJECT_SMALLESTWIDTH; }; hidspecial SID_OBJECT_SMALLESTHEIGHT { HelpId = SID_OBJECT_SMALLESTHEIGHT; }; hidspecial SID_OBJECT_GREATESTWIDTH { HelpId = SID_OBJECT_GREATESTWIDTH; }; hidspecial SID_OBJECT_GREATESTHEIGHT { HelpId = SID_OBJECT_GREATESTHEIGHT; }; -*/ hidspecial HID_RPT_PROP_BACKTRANSPARENT { HelpId = HID_RPT_PROP_BACKTRANSPARENT; }; hidspecial HID_RPT_PROP_CONTROLBACKGROUNDTRANSPARENT { HelpId = HID_RPT_PROP_CONTROLBACKGROUNDTRANSPARENT; }; -/* hidspecial SID_ARRANGEMENU { HelpId = SID_ARRANGEMENU; }; hidspecial SID_SELECTALL_IN_SECTION { HelpId = SID_SELECTALL_IN_SECTION; }; -hidspecial SID_SECTION_ALIGN { HelpId = SID_SECTION_ALIGN; }; -hidspecial SID_SECTION_ALIGN_LEFT { HelpId = SID_SECTION_ALIGN_LEFT; }; -hidspecial SID_SECTION_ALIGN_CENTER { HelpId = SID_SECTION_ALIGN_CENTER; }; -hidspecial SID_SECTION_ALIGN_RIGHT { HelpId = SID_SECTION_ALIGN_RIGHT; }; -hidspecial SID_SECTION_ALIGN_UP { HelpId = SID_SECTION_ALIGN_UP; }; -hidspecial SID_SECTION_ALIGN_MIDDLE { HelpId = SID_SECTION_ALIGN_MIDDLE; }; -hidspecial SID_SECTION_ALIGN_DOWN { HelpId = SID_SECTION_ALIGN_DOWN; }; -hidspecial SID_NEXT_MARK { HelpId = SID_NEXT_MARK; }; +hidspecial SID_SECTION_ALIGN { HelpId = SID_SECTION_ALIGN; }; +hidspecial SID_SECTION_ALIGN_LEFT { HelpId = SID_SECTION_ALIGN_LEFT; }; +hidspecial SID_SECTION_ALIGN_CENTER { HelpId = SID_SECTION_ALIGN_CENTER; }; +hidspecial SID_SECTION_ALIGN_RIGHT { HelpId = SID_SECTION_ALIGN_RIGHT; }; +hidspecial SID_SECTION_ALIGN_UP { HelpId = SID_SECTION_ALIGN_UP; }; +hidspecial SID_SECTION_ALIGN_MIDDLE { HelpId = SID_SECTION_ALIGN_MIDDLE; }; +hidspecial SID_SECTION_ALIGN_DOWN { HelpId = SID_SECTION_ALIGN_DOWN; }; +hidspecial SID_NEXT_MARK { HelpId = SID_NEXT_MARK; }; hidspecial SID_PREV_MARK { HelpId = SID_PREV_MARK; }; + hidspecial SID_SECTION_SHRINK { HelpId = SID_SECTION_SHRINK; }; hidspecial SID_SECTION_SHRINK_TOP { HelpId = SID_SECTION_SHRINK_TOP; }; hidspecial SID_SECTION_SHRINK_BOTTOM { HelpId = SID_SECTION_SHRINK_BOTTOM; }; -*/ hidspecial UID_RPT_PROP_CHARTTYPE_DLG { HelpId = UID_RPT_PROP_CHARTTYPE_DLG; }; hidspecial HID_RPT_PROP_CHARTTYPE { HelpId = HID_RPT_PROP_CHARTTYPE; }; @@ -166,9 +162,9 @@ hidspecial HID_RPT_PROP_AREA { HelpId = HID_RPT_PROP_AREA; }; hidspecial UID_RPT_RPT_PROP_DLG_AREA { HelpId = UID_RPT_RPT_PROP_DLG_AREA; }; hidspecial UID_RPT_PROP_FORMULA { HelpId = UID_RPT_PROP_FORMULA; }; -hidspecial HID_RPT_GROUPSORT_MOVE_UP { HelpId = HID_RPT_GROUPSORT_MOVE_UP; }; -hidspecial HID_RPT_GROUPSORT_MOVE_DOWN { HelpId = HID_RPT_GROUPSORT_MOVE_DOWN; }; -hidspecial HID_RPT_GROUPSORT_DELETE { HelpId = HID_RPT_GROUPSORT_DELETE; }; +hidspecial HID_RPT_GROUPSORT_MOVE_UP { HelpId = HID_RPT_GROUPSORT_MOVE_UP; }; +hidspecial HID_RPT_GROUPSORT_MOVE_DOWN { HelpId = HID_RPT_GROUPSORT_MOVE_DOWN; }; +hidspecial HID_RPT_GROUPSORT_DELETE { HelpId = HID_RPT_GROUPSORT_DELETE; }; hidspecial HID_RPT_PROP_MIMETYPE { HelpId = HID_RPT_PROP_MIMETYPE; }; hidspecial HID_RPT_PROP_VERTICALALIGN { HelpId = HID_RPT_PROP_VERTICALALIGN; }; hidspecial HID_RPT_PROP_PARAADJUST { HelpId = HID_RPT_PROP_PARAADJUST; }; diff --git a/reportdesign/util/makefile.mk b/reportdesign/util/makefile.mk index dc58db3f61a0..fd6a31699268 100644 --- a/reportdesign/util/makefile.mk +++ b/reportdesign/util/makefile.mk @@ -230,23 +230,3 @@ DEF3NAME=$(SHL3TARGET) .INCLUDE : target.mk - -ALLTAR : $(MISC)/rpt.component $(MISC)/rptui.component $(MISC)/rptxml.component - -$(MISC)/rpt.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - rpt.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt rpt.component - -$(MISC)/rptui.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - rptui.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL2TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt rptui.component - -$(MISC)/rptxml.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - rptxml.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL3TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt rptxml.component diff --git a/reportdesign/util/rpt.component b/reportdesign/util/rpt.component deleted file mode 100644 index ef5b2cc4c78d..000000000000 --- a/reportdesign/util/rpt.component +++ /dev/null @@ -1,58 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!--********************************************************************** -* -* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* -* Copyright 2000, 2010 Oracle and/or its affiliates. -* -* OpenOffice.org - a multi-platform office productivity suite -* -* This file is part of OpenOffice.org. -* -* OpenOffice.org is free software: you can redistribute it and/or modify -* it under the terms of the GNU Lesser General Public License version 3 -* only, as published by the Free Software Foundation. -* -* OpenOffice.org is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU Lesser General Public License version 3 for more details -* (a copy is included in the LICENSE file that accompanied this code). -* -* You should have received a copy of the GNU Lesser General Public License -* version 3 along with OpenOffice.org. If not, see -* <http://www.openoffice.org/license.html> -* for a copy of the LGPLv3 License. -* -**********************************************************************--> - -<component loader="com.sun.star.loader.SharedLibrary" - xmlns="http://openoffice.org/2010/uno-components"> - <implementation name="com.sun.star.comp.report.OFixedLine"> - <service name="com.sun.star.report.FixedLine"/> - </implementation> - <implementation name="com.sun.star.comp.report.OFixedText"> - <service name="com.sun.star.report.FixedText"/> - </implementation> - <implementation name="com.sun.star.comp.report.OFormatCondition"> - <service name="com.sun.star.report.FormatCondition"/> - </implementation> - <implementation name="com.sun.star.comp.report.OFormattedField"> - <service name="com.sun.star.report.FormattedField"/> - </implementation> - <implementation name="com.sun.star.comp.report.OFunction"> - <service name="com.sun.star.report.Function"/> - </implementation> - <implementation name="com.sun.star.comp.report.OImageControl"> - <service name="com.sun.star.report.ImageControl"/> - </implementation> - <implementation name="com.sun.star.comp.report.OReportDefinition"> - <service name="com.sun.star.report.ReportDefinition"/> - </implementation> - <implementation name="com.sun.star.comp.report.OReportEngineJFree"> - <service name="com.sun.star.report.ReportEngine"/> - </implementation> - <implementation name="com.sun.star.comp.report.Shape"> - <service name="com.sun.star.report.Shape"/> - </implementation> -</component> diff --git a/reportdesign/util/rptui.component b/reportdesign/util/rptui.component deleted file mode 100644 index 593f06d0b582..000000000000 --- a/reportdesign/util/rptui.component +++ /dev/null @@ -1,52 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!--********************************************************************** -* -* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* -* Copyright 2000, 2010 Oracle and/or its affiliates. -* -* OpenOffice.org - a multi-platform office productivity suite -* -* This file is part of OpenOffice.org. -* -* OpenOffice.org is free software: you can redistribute it and/or modify -* it under the terms of the GNU Lesser General Public License version 3 -* only, as published by the Free Software Foundation. -* -* OpenOffice.org is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU Lesser General Public License version 3 for more details -* (a copy is included in the LICENSE file that accompanied this code). -* -* You should have received a copy of the GNU Lesser General Public License -* version 3 along with OpenOffice.org. If not, see -* <http://www.openoffice.org/license.html> -* for a copy of the LGPLv3 License. -* -**********************************************************************--> - -<component loader="com.sun.star.loader.SharedLibrary" - xmlns="http://openoffice.org/2010/uno-components"> - <implementation name="com.sun.star.comp.report.DataProviderHandler"> - <service name="com.sun.star.report.inspection.DataProviderHandler"/> - </implementation> - <implementation name="com.sun.star.comp.report.DefaultComponentInspectorModel"> - <service name="com.sun.star.report.inspection.DefaultComponentInspectorModel"/> - </implementation> - <implementation name="com.sun.star.comp.report.GeometryHandler"> - <service name="com.sun.star.report.inspection.GeometryHandler"/> - </implementation> - <implementation name="com.sun.star.comp.report.ReportComponentHandler"> - <service name="com.sun.star.report.inspection.ReportComponentHandler"/> - </implementation> - <implementation name="com.sun.star.report.comp.ReportDesign"> - <service name="com.sun.star.sdb.ReportDesign"/> - </implementation> - <implementation name="com.sun.star.report.comp.ReportToolboxController"> - <service name="com.sun.star.report.ReportToolboxController"/> - </implementation> - <implementation name="com.sun.star.report.comp.StatusbarController"> - <service name="com.sun.star.frame.StatusbarController"/> - </implementation> -</component> diff --git a/reportdesign/util/rptxml.component b/reportdesign/util/rptxml.component deleted file mode 100644 index 8a0021ecdf9a..000000000000 --- a/reportdesign/util/rptxml.component +++ /dev/null @@ -1,73 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!--********************************************************************** -* -* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* -* Copyright 2000, 2010 Oracle and/or its affiliates. -* -* OpenOffice.org - a multi-platform office productivity suite -* -* This file is part of OpenOffice.org. -* -* OpenOffice.org is free software: you can redistribute it and/or modify -* it under the terms of the GNU Lesser General Public License version 3 -* only, as published by the Free Software Foundation. -* -* OpenOffice.org is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU Lesser General Public License version 3 for more details -* (a copy is included in the LICENSE file that accompanied this code). -* -* You should have received a copy of the GNU Lesser General Public License -* version 3 along with OpenOffice.org. If not, see -* <http://www.openoffice.org/license.html> -* for a copy of the LGPLv3 License. -* -**********************************************************************--> - -<component loader="com.sun.star.loader.SharedLibrary" - xmlns="http://openoffice.org/2010/uno-components"> - <implementation name="com.sun.star.comp.Report.XMLOasisContentImporter"> - <service name="com.sun.star.comp.document.ImportFilter"/> - </implementation> - <implementation name="com.sun.star.comp.Report.XMLOasisMetaImporter"> - <service name="com.sun.star.comp.document.ImportFilter"/> - </implementation> - <implementation name="com.sun.star.comp.Report.XMLOasisSettingsImporter"> - <service name="com.sun.star.comp.document.ImportFilter"/> - </implementation> - <implementation name="com.sun.star.comp.Report.XMLOasisStylesImporter"> - <service name="com.sun.star.comp.document.ImportFilter"/> - </implementation> - <implementation name="com.sun.star.comp.report.ExportDocumentHandler"> - <service name="com.sun.star.report.ExportDocumentHandler"/> - </implementation> - <implementation name="com.sun.star.comp.report.ExportFilter"> - <service name="com.sun.star.document.ExportFilter"/> - </implementation> - <implementation name="com.sun.star.comp.report.ImportDocumentHandler"> - <service name="com.sun.star.report.ImportDocumentHandler"/> - </implementation> - <implementation name="com.sun.star.comp.report.OReportFilter"> - <service name="com.sun.star.comp.document.ImportFilter"/> - </implementation> - <implementation name="com.sun.star.comp.report.ORptTypeDetection"> - <service name="com.sun.star.document.ExtendedTypeDetection"/> - </implementation> - <implementation name="com.sun.star.comp.report.XMLContentExporter"> - <service name="com.sun.star.document.ExportFilter"/> - </implementation> - <implementation name="com.sun.star.comp.report.XMLFullExporter"> - <service name="com.sun.star.document.ExportFilter"/> - </implementation> - <implementation name="com.sun.star.comp.report.XMLMetaExporter"> - <service name="com.sun.star.document.ExportFilter"/> - </implementation> - <implementation name="com.sun.star.comp.report.XMLSettingsExporter"> - <service name="com.sun.star.document.ExportFilter"/> - </implementation> - <implementation name="com.sun.star.comp.report.XMLStylesExporter"> - <service name="com.sun.star.document.ExportFilter"/> - </implementation> -</component> |