diff options
Diffstat (limited to 'reportdesign/inc')
| -rw-r--r-- | reportdesign/inc/ModuleHelper.hxx | 22 | ||||
| -rw-r--r-- | reportdesign/inc/PropertyForward.hxx | 22 | ||||
| -rw-r--r-- | reportdesign/inc/ReportDefinition.hxx | 26 | ||||
| -rw-r--r-- | reportdesign/inc/ReportHelperDefines.hxx | 4 | ||||
| -rw-r--r-- | reportdesign/inc/ReportVisitor.hxx | 4 | ||||
| -rw-r--r-- | reportdesign/inc/RptDef.hxx | 10 | ||||
| -rw-r--r-- | reportdesign/inc/RptModel.hxx | 8 | ||||
| -rw-r--r-- | reportdesign/inc/RptObject.hxx | 46 | ||||
| -rw-r--r-- | reportdesign/inc/RptPage.hxx | 12 | ||||
| -rw-r--r-- | reportdesign/inc/RptResId.hrc | 386 | ||||
| -rw-r--r-- | reportdesign/inc/UndoActions.hxx | 48 | ||||
| -rw-r--r-- | reportdesign/inc/UndoEnv.hxx | 14 | ||||
| -rw-r--r-- | reportdesign/inc/conditionalexpression.hxx | 2 | ||||
| -rw-r--r-- | reportdesign/inc/dllapi.h | 8 | ||||
| -rw-r--r-- | reportdesign/inc/helpids.hrc | 158 | ||||
| -rw-r--r-- | reportdesign/inc/pch/precompiled_reportdesign.cxx | 2 | ||||
| -rw-r--r-- | reportdesign/inc/pch/precompiled_reportdesign.hxx | 2 | ||||
| -rw-r--r-- | reportdesign/inc/reportformula.hxx | 2 | ||||
| -rw-r--r-- | reportdesign/inc/rptui_slotid.hrc | 300 |
19 files changed, 538 insertions, 538 deletions
diff --git a/reportdesign/inc/ModuleHelper.hxx b/reportdesign/inc/ModuleHelper.hxx index cf3ccafded7d..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(); } }; //========================================================================= @@ -93,7 +93,7 @@ namespace rptui 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 79582a215b3f..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 @@ -82,23 +82,23 @@ namespace reportdesign * \ingroup reportdesign_api * */ - class REPORTDESIGN_DLLPUBLIC OReportDefinition : public ::cppu::BaseMutex, + class REPORTDESIGN_DLLPUBLIC OReportDefinition : public ::cppu::BaseMutex, public ReportDefinitionBase, public ReportDefinitionPropertySet, public ::comphelper::IEmbeddedHelper { - ::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) { @@ -116,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, @@ -125,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(...)) @@ -178,7 +178,7 @@ namespace reportdesign /** return the SdrModel of the real model * - * \return + * \return */ ::boost::shared_ptr<rptui::OReportModel> getSdrModel() const; @@ -257,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); } @@ -328,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); 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 2e86a5d80e04..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,8 +46,8 @@ 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 @@ -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 544e1a6e251e..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 @@ -56,8 +56,8 @@ class REPORTDESIGN_DLLPUBLIC OReportModel : public SdrModel friend class OReportPage; private: - OXUndoEnvironment* m_pUndoEnv; - ::dbaui::OSingleDocumentController* 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(); @@ -88,7 +88,7 @@ public: /** 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 0b16890ef982..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,8 +171,8 @@ 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(); @@ -199,7 +199,7 @@ public: protected: 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,8 +213,8 @@ 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(); @@ -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); diff --git a/reportdesign/inc/RptPage.hxx b/reportdesign/inc/RptPage.hxx index ca90ae3b2521..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 @@ -50,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); @@ -65,7 +65,7 @@ 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; @@ -74,12 +74,12 @@ public: 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 */ 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); @@ -89,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 3c5920f37a59..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,65 +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_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 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 ) +#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) -#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 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) #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 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 4b884424444b..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 @@ -69,7 +69,7 @@ namespace rptui enum Action { Inserted = 1, - Removed = 2 + Removed = 2 }; /** Helper class to allow std::mem_fun for SAL_CALL @@ -84,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(); } @@ -108,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(); } @@ -140,18 +140,18 @@ namespace rptui 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 + 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 @@ -164,12 +164,12 @@ 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 @@ -192,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: @@ -214,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: @@ -237,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. * @@ -255,7 +255,7 @@ namespace rptui virtual void Undo(); virtual void Redo(); - virtual String GetComment() const; + virtual String GetComment() const; }; //================================================================== @@ -263,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: @@ -282,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 f73782a1d8d4..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 @@ -28,102 +28,102 @@ #define RTPUI_REPORTDESIGN_HELPID_HRC #ifndef _SOLAR_HRC -#include <svl/solar.hrc> // HID_RPT_DBACCESS_START +#include <svl/solar.hrc> // HID_RPT_DBACCESS_START #endif -#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 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_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 (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_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) +#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 (HID_RPT_START + 44) -#define HID_RPT_PROP_CONDITIONALPRINTEXPRESSION (HID_RPT_START + 45) +#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_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) +#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 (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_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_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_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_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 (HID_RPT_START + 82) -#define HID_RPT_GROUPSORT_MOVE_DOWN (HID_RPT_START + 83) -#define HID_RPT_GROUPSORT_DELETE (HID_RPT_START + 84) +#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) -#if UID_RPT_PROP_FORMULA > HID_RPT_END -#error Help-Id Ueberlauf in #file, #line -#endif +#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 8d26195f2010..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 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 ) |