From 53aa87381a4df49d2d2c34328dc61716b4261ec7 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Tue, 23 Aug 2011 15:03:39 +0200 Subject: recreated tag libreoffice-3.3.3.1 which had these commits: commit 38f9e030925fc02a8e00bdd5985d4375439e199c (tag: refs/tags/libreoffice-3.3.3.1) Author: Petr Mladek Date: Tue May 31 17:39:02 2011 +0200 Version 3.3.3.1, tag libreoffice-3.3.3.1 (3.3.3-rc1) --- reportdesign/inc/ModuleHelper.hxx | 22 +- reportdesign/inc/PropertyForward.hxx | 22 +- reportdesign/inc/ReportDefinition.hxx | 26 +- reportdesign/inc/ReportHelperDefines.hxx | 4 +- reportdesign/inc/ReportVisitor.hxx | 4 +- reportdesign/inc/RptDef.hxx | 10 +- reportdesign/inc/RptModel.hxx | 8 +- reportdesign/inc/RptObject.hxx | 46 +- reportdesign/inc/RptPage.hxx | 12 +- reportdesign/inc/RptResId.hrc | 386 +++++++------- reportdesign/inc/UndoActions.hxx | 48 +- reportdesign/inc/UndoEnv.hxx | 14 +- reportdesign/inc/conditionalexpression.hxx | 2 +- reportdesign/inc/dllapi.h | 8 +- reportdesign/inc/helpids.hrc | 158 +++--- reportdesign/inc/pch/precompiled_reportdesign.cxx | 2 +- reportdesign/inc/pch/precompiled_reportdesign.hxx | 2 +- reportdesign/inc/reportformula.hxx | 2 +- reportdesign/inc/rptui_slotid.hrc | 300 +++++------ reportdesign/qa/complex/ReportDesignerTest.java | 122 ++--- reportdesign/source/core/api/FixedLine.cxx | 44 +- reportdesign/source/core/api/FixedText.cxx | 10 +- reportdesign/source/core/api/FormatCondition.cxx | 10 +- reportdesign/source/core/api/FormattedField.cxx | 12 +- reportdesign/source/core/api/Function.cxx | 10 +- reportdesign/source/core/api/Functions.cxx | 18 +- reportdesign/source/core/api/Group.cxx | 22 +- reportdesign/source/core/api/Groups.cxx | 22 +- reportdesign/source/core/api/ImageControl.cxx | 100 ++-- reportdesign/source/core/api/ReportComponent.cxx | 2 +- .../source/core/api/ReportControlModel.cxx | 2 +- reportdesign/source/core/api/ReportDefinition.cxx | 394 +++++++-------- reportdesign/source/core/api/ReportEngineJFree.cxx | 2 +- reportdesign/source/core/api/ReportVisitor.cxx | 4 +- reportdesign/source/core/api/Section.cxx | 26 +- reportdesign/source/core/api/Shape.cxx | 22 +- reportdesign/source/core/api/Tools.cxx | 2 +- reportdesign/source/core/api/services.cxx | 6 +- reportdesign/source/core/inc/FixedLine.hxx | 32 +- reportdesign/source/core/inc/FixedText.hxx | 20 +- reportdesign/source/core/inc/FormatCondition.hxx | 22 +- reportdesign/source/core/inc/FormattedField.hxx | 24 +- reportdesign/source/core/inc/Function.hxx | 18 +- reportdesign/source/core/inc/Functions.hxx | 26 +- reportdesign/source/core/inc/Group.hxx | 34 +- reportdesign/source/core/inc/Groups.hxx | 28 +- reportdesign/source/core/inc/ImageControl.hxx | 22 +- reportdesign/source/core/inc/ReportComponent.hxx | 28 +- .../source/core/inc/ReportControlModel.hxx | 58 +-- reportdesign/source/core/inc/ReportDrawPage.hxx | 2 +- reportdesign/source/core/inc/ReportEngineJFree.hxx | 26 +- reportdesign/source/core/inc/ReportHelperImpl.hxx | 2 +- reportdesign/source/core/inc/ReportUndoFactory.hxx | 6 +- reportdesign/source/core/inc/RptObjectListener.hxx | 6 +- reportdesign/source/core/inc/Section.hxx | 62 +-- reportdesign/source/core/inc/Shape.hxx | 16 +- reportdesign/source/core/inc/Tools.hxx | 4 +- reportdesign/source/core/inc/conditionupdater.hxx | 2 +- reportdesign/source/core/inc/core_resource.hrc | 36 +- reportdesign/source/core/inc/core_resource.hxx | 4 +- .../source/core/misc/conditionalexpression.cxx | 2 +- reportdesign/source/core/misc/conditionupdater.cxx | 2 +- reportdesign/source/core/misc/reportformula.cxx | 10 +- .../source/core/resource/core_resource.cxx | 6 +- reportdesign/source/core/resource/strings.src | 2 +- reportdesign/source/core/sdr/ModuleHelper.cxx | 22 +- reportdesign/source/core/sdr/PropertyForward.cxx | 14 +- reportdesign/source/core/sdr/ReportDrawPage.cxx | 4 +- reportdesign/source/core/sdr/ReportUndoFactory.cxx | 10 +- reportdesign/source/core/sdr/RptModel.cxx | 8 +- reportdesign/source/core/sdr/RptObject.cxx | 74 +-- reportdesign/source/core/sdr/RptObjectListener.cxx | 6 +- reportdesign/source/core/sdr/RptPage.cxx | 28 +- reportdesign/source/core/sdr/UndoActions.cxx | 20 +- reportdesign/source/core/sdr/UndoEnv.cxx | 34 +- reportdesign/source/core/sdr/formatnormalizer.cxx | 8 +- reportdesign/source/core/sdr/formatnormalizer.hxx | 2 +- reportdesign/source/filter/xml/dbloader2.cxx | 4 +- reportdesign/source/filter/xml/dbloader2.hxx | 8 +- reportdesign/source/filter/xml/xmlAutoStyle.cxx | 4 +- reportdesign/source/filter/xml/xmlAutoStyle.hxx | 4 +- reportdesign/source/filter/xml/xmlCell.cxx | 18 +- reportdesign/source/filter/xml/xmlCell.hxx | 4 +- reportdesign/source/filter/xml/xmlColumn.cxx | 12 +- reportdesign/source/filter/xml/xmlColumn.hxx | 2 +- reportdesign/source/filter/xml/xmlComponent.cxx | 16 +- reportdesign/source/filter/xml/xmlComponent.hxx | 6 +- reportdesign/source/filter/xml/xmlCondPrtExpr.cxx | 6 +- reportdesign/source/filter/xml/xmlCondPrtExpr.hxx | 4 +- .../source/filter/xml/xmlControlProperty.cxx | 66 +-- .../source/filter/xml/xmlControlProperty.hxx | 6 +- reportdesign/source/filter/xml/xmlEnums.hxx | 66 +-- reportdesign/source/filter/xml/xmlExport.cxx | 96 ++-- reportdesign/source/filter/xml/xmlExport.hxx | 94 ++-- .../source/filter/xml/xmlExportDocumentHandler.cxx | 4 +- .../source/filter/xml/xmlExportDocumentHandler.hxx | 2 +- reportdesign/source/filter/xml/xmlFixedContent.cxx | 10 +- reportdesign/source/filter/xml/xmlFixedContent.hxx | 2 +- .../source/filter/xml/xmlFormatCondition.cxx | 6 +- .../source/filter/xml/xmlFormatCondition.hxx | 4 +- .../source/filter/xml/xmlFormattedField.cxx | 6 +- .../source/filter/xml/xmlFormattedField.hxx | 2 +- reportdesign/source/filter/xml/xmlFunction.cxx | 10 +- reportdesign/source/filter/xml/xmlFunction.hxx | 10 +- reportdesign/source/filter/xml/xmlGroup.cxx | 18 +- reportdesign/source/filter/xml/xmlGroup.hxx | 8 +- reportdesign/source/filter/xml/xmlHelper.cxx | 234 ++++----- reportdesign/source/filter/xml/xmlHelper.hxx | 28 +- reportdesign/source/filter/xml/xmlImage.cxx | 2 +- reportdesign/source/filter/xml/xmlImage.hxx | 2 +- .../source/filter/xml/xmlImportDocumentHandler.cxx | 24 +- .../source/filter/xml/xmlImportDocumentHandler.hxx | 6 +- reportdesign/source/filter/xml/xmlMasterFields.cxx | 4 +- reportdesign/source/filter/xml/xmlMasterFields.hxx | 2 +- .../source/filter/xml/xmlPropertyHandler.cxx | 2 +- .../source/filter/xml/xmlPropertyHandler.hxx | 2 +- reportdesign/source/filter/xml/xmlReport.cxx | 16 +- reportdesign/source/filter/xml/xmlReport.hxx | 4 +- .../source/filter/xml/xmlReportElement.cxx | 6 +- .../source/filter/xml/xmlReportElement.hxx | 4 +- .../source/filter/xml/xmlReportElementBase.cxx | 4 +- .../source/filter/xml/xmlReportElementBase.hxx | 6 +- reportdesign/source/filter/xml/xmlRow.cxx | 16 +- reportdesign/source/filter/xml/xmlRow.hxx | 2 +- reportdesign/source/filter/xml/xmlSection.cxx | 8 +- reportdesign/source/filter/xml/xmlSection.hxx | 8 +- reportdesign/source/filter/xml/xmlStyleImport.cxx | 10 +- reportdesign/source/filter/xml/xmlStyleImport.hxx | 20 +- reportdesign/source/filter/xml/xmlSubDocument.cxx | 16 +- reportdesign/source/filter/xml/xmlSubDocument.hxx | 6 +- reportdesign/source/filter/xml/xmlTable.cxx | 12 +- reportdesign/source/filter/xml/xmlTable.hxx | 10 +- reportdesign/source/filter/xml/xmlfilter.cxx | 244 ++++----- reportdesign/source/filter/xml/xmlfilter.hxx | 70 +-- reportdesign/source/filter/xml/xmlservices.cxx | 4 +- reportdesign/source/inc/GroupProperties.hxx | 18 +- reportdesign/source/inc/constasciistring.hxx | 10 +- reportdesign/source/inc/corestrings.hrc | 2 +- reportdesign/source/inc/stringconstants.hrc | 268 +++++----- reportdesign/source/inc/uistrings.hrc | 44 +- reportdesign/source/inc/xmlstrings.hrc | 2 +- reportdesign/source/shared/corestrings.cxx | 2 +- reportdesign/source/shared/stringconstants.cxx | 334 ++++++------ reportdesign/source/shared/uistrings.cxx | 36 +- reportdesign/source/shared/xmlstrings.cxx | 20 +- reportdesign/source/ui/dlg/AddField.cxx | 24 +- reportdesign/source/ui/dlg/CondFormat.cxx | 22 +- reportdesign/source/ui/dlg/CondFormat.hrc | 4 +- reportdesign/source/ui/dlg/CondFormat.src | 10 +- reportdesign/source/ui/dlg/Condition.cxx | 2 +- reportdesign/source/ui/dlg/Condition.hxx | 6 +- reportdesign/source/ui/dlg/DateTime.cxx | 30 +- reportdesign/source/ui/dlg/DateTime.hrc | 42 +- reportdesign/source/ui/dlg/DateTime.src | 12 +- reportdesign/source/ui/dlg/Formula.cxx | 16 +- reportdesign/source/ui/dlg/GroupExchange.cxx | 2 +- reportdesign/source/ui/dlg/GroupExchange.hxx | 8 +- reportdesign/source/ui/dlg/GroupsSorting.cxx | 72 +-- reportdesign/source/ui/dlg/GroupsSorting.hrc | 76 +-- reportdesign/source/ui/dlg/GroupsSorting.src | 106 ++-- reportdesign/source/ui/dlg/Navigator.cxx | 64 +-- reportdesign/source/ui/dlg/Navigator.src | 12 +- reportdesign/source/ui/dlg/PageNumber.cxx | 14 +- reportdesign/source/ui/dlg/PageNumber.hrc | 54 +- reportdesign/source/ui/dlg/PageNumber.src | 18 +- reportdesign/source/ui/dlg/dlgpage.cxx | 28 +- reportdesign/source/ui/dlg/dlgpage.src | 10 +- reportdesign/source/ui/inc/AddField.hxx | 18 +- reportdesign/source/ui/inc/ColorChanger.hxx | 4 +- reportdesign/source/ui/inc/ColorListener.hxx | 30 +- reportdesign/source/ui/inc/ColumnInfo.hxx | 6 +- reportdesign/source/ui/inc/CondFormat.hxx | 2 +- reportdesign/source/ui/inc/DataProviderHandler.hxx | 4 +- reportdesign/source/ui/inc/DateTime.hxx | 36 +- reportdesign/source/ui/inc/DefaultInspection.hxx | 2 +- reportdesign/source/ui/inc/DesignView.hxx | 98 ++-- reportdesign/source/ui/inc/EndMarker.hxx | 4 +- reportdesign/source/ui/inc/FixedTextColor.hxx | 2 +- .../source/ui/inc/FormattedFieldBeautifier.hxx | 2 +- reportdesign/source/ui/inc/Formula.hxx | 8 +- reportdesign/source/ui/inc/FunctionHelper.hxx | 2 +- reportdesign/source/ui/inc/GeometryHandler.hxx | 18 +- reportdesign/source/ui/inc/GroupsSorting.hxx | 94 ++-- .../source/ui/inc/IReportControllerObserver.hxx | 6 +- reportdesign/source/ui/inc/InsertFunctions.hxx | 4 +- reportdesign/source/ui/inc/MarkedSection.hxx | 6 +- reportdesign/source/ui/inc/Navigator.hxx | 6 +- reportdesign/source/ui/inc/PageNumber.hxx | 38 +- .../source/ui/inc/ReportComponentHandler.hxx | 4 +- reportdesign/source/ui/inc/ReportController.hxx | 106 ++-- .../source/ui/inc/ReportControllerObserver.hxx | 14 +- reportdesign/source/ui/inc/ReportDefines.hxx | 8 +- reportdesign/source/ui/inc/ReportRuler.hxx | 12 +- reportdesign/source/ui/inc/ReportSection.hxx | 80 +-- reportdesign/source/ui/inc/ReportWindow.hxx | 82 +-- reportdesign/source/ui/inc/ScrollHelper.hxx | 86 ++-- reportdesign/source/ui/inc/SectionView.hxx | 10 +- reportdesign/source/ui/inc/SectionWindow.hxx | 36 +- reportdesign/source/ui/inc/StartMarker.hxx | 34 +- reportdesign/source/ui/inc/UITools.hxx | 36 +- reportdesign/source/ui/inc/Undo.hxx | 48 +- reportdesign/source/ui/inc/ViewsWindow.hxx | 68 +-- reportdesign/source/ui/inc/dlgedclip.hxx | 18 +- reportdesign/source/ui/inc/dlgedfac.hxx | 2 +- reportdesign/source/ui/inc/dlgedfunc.hxx | 18 +- reportdesign/source/ui/inc/dlgpage.hxx | 4 +- reportdesign/source/ui/inc/metadata.hxx | 32 +- reportdesign/source/ui/inc/propbrw.hxx | 22 +- reportdesign/source/ui/inc/statusbarcontroller.hxx | 22 +- reportdesign/source/ui/inc/toolboxcontroller.hxx | 10 +- .../source/ui/inspection/DataProviderHandler.cxx | 16 +- .../source/ui/inspection/DefaultInspection.cxx | 18 +- .../source/ui/inspection/GeometryHandler.cxx | 112 ++--- .../ui/inspection/ReportComponentHandler.cxx | 4 +- reportdesign/source/ui/inspection/inspection.src | 18 +- reportdesign/source/ui/inspection/metadata.cxx | 22 +- reportdesign/source/ui/misc/ColorListener.cxx | 18 +- reportdesign/source/ui/misc/FunctionHelper.cxx | 14 +- reportdesign/source/ui/misc/UITools.cxx | 14 +- reportdesign/source/ui/misc/Undo.cxx | 20 +- reportdesign/source/ui/misc/rptuiservices.cxx | 4 +- .../source/ui/misc/statusbarcontroller.cxx | 10 +- reportdesign/source/ui/misc/toolboxcontroller.cxx | 6 +- reportdesign/source/ui/report/DesignView.cxx | 16 +- reportdesign/source/ui/report/EndMarker.cxx | 8 +- reportdesign/source/ui/report/FixedTextColor.cxx | 40 +- .../source/ui/report/FormattedFieldBeautifier.cxx | 18 +- reportdesign/source/ui/report/ReportController.cxx | 560 ++++++++++----------- .../source/ui/report/ReportControllerObserver.cxx | 46 +- reportdesign/source/ui/report/ReportRuler.cxx | 6 +- reportdesign/source/ui/report/ReportSection.cxx | 48 +- reportdesign/source/ui/report/ReportWindow.cxx | 66 +-- reportdesign/source/ui/report/ScrollHelper.cxx | 38 +- reportdesign/source/ui/report/SectionView.cxx | 12 +- reportdesign/source/ui/report/SectionWindow.cxx | 36 +- reportdesign/source/ui/report/StartMarker.cxx | 26 +- reportdesign/source/ui/report/ViewsWindow.cxx | 150 +++--- reportdesign/source/ui/report/dlgedclip.cxx | 4 +- reportdesign/source/ui/report/dlgedfac.cxx | 10 +- reportdesign/source/ui/report/dlgedfunc.cxx | 258 +++++----- reportdesign/source/ui/report/propbrw.cxx | 24 +- reportdesign/source/ui/report/report.src | 40 +- .../uiconfig/dbreport/toolbar/arrowshapes.xml | 22 +- .../uiconfig/dbreport/toolbar/basicshapes.xml | 14 +- .../uiconfig/dbreport/toolbar/flowchartshapes.xml | 26 +- .../uiconfig/dbreport/toolbar/reportcontrols.xml | 2 +- .../uiconfig/dbreport/toolbar/symbolshapes.xml | 6 +- reportdesign/util/hidother.src | 90 ++-- 248 files changed, 4129 insertions(+), 4129 deletions(-) (limited to 'reportdesign') 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 m_aProps; + ::boost::shared_ptr m_aProps; ::boost::shared_ptr 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 void set( const ::rtl::OUString& _sProperty + template 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 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 > 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 when tīno 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 then the properties from the uno control will be copied into report control + @param _bReverse when set to 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 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 #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 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 // HID_RPT_DBACCESS_START +#include // 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 -#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/qa/complex/ReportDesignerTest.java b/reportdesign/qa/complex/ReportDesignerTest.java index 3bbb9a42fe26..2a652fa460d9 100755 --- a/reportdesign/qa/complex/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 @@ -62,15 +62,15 @@ import convwatch.DB; // 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; @@ -86,7 +86,7 @@ class PropertySetHelper { m_xPropertySet = (XPropertySet)UnoRuntime.queryInterface(XPropertySet.class, _aObj); } - + /** get a property and don't convert it @param _sName the string name of the property @@ -153,10 +153,10 @@ class PropertyHelper } public class ReportDesignerTest extends ComplexTestCase { - + String mTestDocumentPath; - public String[] getTestMethodNames() + public String[] getTestMethodNames() { return new String[] {"firsttest"}; } @@ -177,7 +177,7 @@ public class ReportDesignerTest extends ComplexTestCase { sOfficePath = _sOfficePathWithTrash.substring(0, nIndex + 7); } } - + log.println(sOfficePath); File sOffice = new File(sOfficePath); if (! sOffice.exists()) @@ -186,20 +186,20 @@ public class ReportDesignerTest extends ComplexTestCase { System.exit(0); } } - - + + private static XDesktop m_xDesktop = null; public static XDesktop getXDesktop() { - if (m_xDesktop == null) + if (m_xDesktop == null) { - try + try { 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) + catch (com.sun.star.uno.Exception e) { log.println("ERROR: uno.Exception caught"); log.println("Message: " + e.getMessage()); @@ -207,7 +207,7 @@ public class ReportDesignerTest extends ComplexTestCase { } return m_xDesktop; } - + private void showElements(XNameAccess _xNameAccess) { if (_xNameAccess != null) @@ -223,8 +223,8 @@ public class ReportDesignerTest extends ComplexTestCase { System.out.println("Warning: Given object is null."); } } - - + + private OfficeProvider m_aProvider = null; private static XMultiServiceFactory m_xXMultiServiceFactory = null; private void startOffice() @@ -248,7 +248,7 @@ public class ReportDesignerTest extends ComplexTestCase { m_aProvider = null; } } - + private String m_sMailAddress = null; private String m_sUPDMinor; private String m_sCWS_WORK_STAMP; @@ -256,19 +256,19 @@ public class ReportDesignerTest extends ComplexTestCase { private static final int WRITER = 1; private static final int CALC = 2; - public void firsttest() + public void firsttest() { 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"; @@ -284,22 +284,22 @@ public class ReportDesignerTest extends ComplexTestCase { 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); @@ -311,57 +311,57 @@ public class ReportDesignerTest extends ComplexTestCase { stopOffice(); throw new AssureException(e.getMessage()); } - + // ------------------------------ Office shutdown ------------------------------ stopOffice(); } - + // ----------------------------------------------------------------------------- private void startTestForFile(String _sDocument, int _nType) { 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); log.println("Load done"); -// context = createUnoService("com.sun.star.sdb.DatabaseContext") +// 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() +// +// 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)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); // 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(); - + // 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(); 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) @@ -373,28 +373,28 @@ public class ReportDesignerTest extends ComplexTestCase { // System.out.println("false"); // } // log.println("4"); - + // aHelper = new PropertySetHelper(aController); - + // Object aActiveConnectionObj = aHelper.getPropertyValueAsObject("ActiveConnection"); - Object aActiveConnectionObj = aDBDocUI.getActiveConnection(); + Object aActiveConnectionObj = aDBDocUI.getActiveConnection(); assure("ActiveConnection is empty", aActiveConnectionObj != null); // log.println("5"); - + XReportDocumentsSupplier xSupplier = (XReportDocumentsSupplier)UnoRuntime.queryInterface(XReportDocumentsSupplier.class, xOfficeDBDoc); xNameAccess = xSupplier.getReportDocuments(); assure("xOfficeDatabaseDocument returns no Report Document", xNameAccess != null); // log.println("5"); - + showElements(xNameAccess); - + ArrayList aPropertyList = new ArrayList(); - + PropertyValue aActiveConnection = new PropertyValue(); aActiveConnection.Name = "ActiveConnection"; aActiveConnection.Value = aActiveConnectionObj; aPropertyList.add(aActiveConnection); - + loadAndStoreReports(xNameAccess, aPropertyList, _nType); createDBEntry(_nType); } @@ -402,12 +402,12 @@ public class ReportDesignerTest extends ComplexTestCase { { 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); } @@ -416,7 +416,7 @@ public class ReportDesignerTest extends ComplexTestCase { { return getFileFormat(_nType); } - + // ----------------------------------------------------------------------------- private void createDBEntry(int _nType) { @@ -443,7 +443,7 @@ public class ReportDesignerTest extends ComplexTestCase { // DB.test(); // System.exit(1); } - + private void loadAndStoreReports(XNameAccess _xNameAccess, ArrayList _aPropertyList, int _nType) { if (_xNameAccess != null) @@ -492,7 +492,7 @@ public class ReportDesignerTest extends ComplexTestCase { } return sFileType; } - + private String getOutputPath(int _nType) { String sOutputPath = (String)param.get( convwatch.PropertyName.DOC_COMPARATOR_OUTPUT_PATH ); @@ -513,7 +513,7 @@ public class ReportDesignerTest extends ComplexTestCase { return sOutputPath; } - + /* store given _xComponent under the given Name in DOC_COMPARATOR_INPUTPATH */ @@ -530,7 +530,7 @@ public class ReportDesignerTest extends ComplexTestCase { sOutputPath += _sName; sOutputPath += getFormatExtension(_nType); - + String sOutputURL = URLHelper.getFileURLFromSystemPath(sOutputPath); ArrayList aPropertyList = new ArrayList(); // set some properties for storeAsURL @@ -562,7 +562,7 @@ public class ReportDesignerTest extends ComplexTestCase { } } } - + private XComponent loadComponent(String _sName, Object _xComponent, ArrayList _aPropertyList) { XComponent xDocComponent = null; @@ -604,5 +604,5 @@ public class ReportDesignerTest extends ComplexTestCase { log.println("Message: " + e.getMessage()); } } - + } diff --git a/reportdesign/source/core/api/FixedLine.cxx b/reportdesign/source/core/api/FixedLine.cxx index 4b5f26f9cd96..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) @@ -212,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) @@ -233,7 +233,7 @@ uno::Sequence< ::rtl::OUString > OFixedLine::getSupportedServiceNames_Static( ) { uno::Sequence< ::rtl::OUString > aServices(1); aServices.getArray()[0] = SERVICE_FIXEDLINE; - + return aServices; } //------------------------------------------------------------------------------ @@ -539,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 4414508dcd04..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) { @@ -99,7 +99,7 @@ uno::Any SAL_CALL OFixedText::queryInterface( const uno::Type& _rType ) throw (u //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(); @@ -122,7 +122,7 @@ uno::Sequence< ::rtl::OUString > OFixedText::getSupportedServiceNames_Static( ) 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 100ded84e8ab..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) @@ -106,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(); @@ -130,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; } //-------------------------------------------------------------------------- @@ -231,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(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 d7c208c98634..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); @@ -109,14 +109,14 @@ 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(); @@ -180,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; @@ -193,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; @@ -294,7 +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 uno::Reference< beans::XPropertySetInfo >(); return GroupPropertySet::getPropertySetInfo(); } // ----------------------------------------------------------------------------- @@ -328,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 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(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 60498b766b12..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; } //------------------------------------------------------------------------------ @@ -220,61 +220,61 @@ 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(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(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 78361152a82d..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 diff --git a/reportdesign/source/core/api/ReportControlModel.cxx b/reportdesign/source/core/api/ReportControlModel.cxx index c247742d9870..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 diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index fd9360e30b3c..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 @@ -125,74 +125,74 @@ #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,10 +243,10 @@ void lcl_extractAndStartStatusIndicator( const ::comphelper::MediaDescriptor& _r } } // ----------------------------------------------------------------------------- -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 @@ -317,109 +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(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(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_FTRBACKCOL), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nTransparent); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFFILT), ++i,nBound,::getCppuType((const ::rtl::OUString*)0) ,&sEmpty); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFLOC), ++i,nBound,::getCppuType((const style::GraphicLocation*)0) ,&eGraphicLocation); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFURL), ++i,nBound,::getCppuType((const ::rtl::OUString*)0) ,&sEmpty); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBACKTRAN), ++i,nBound,::getBooleanCppuType() ,&bTrue); + //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_FTRBACKCOL), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBODYDIST), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBRDDIST), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBOTTBOR), ++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBOTTBDIS), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); + //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_FTRDYNAMIC), ++i,nBound,::getBooleanCppuType() ,&bFalse); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRHEIGHT), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRDYNAMIC), ++i,nBound,::getBooleanCppuType() ,&bFalse); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRON), ++i,nBound,::getBooleanCppuType() ,&bFalse); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRSHARED), ++i,nBound,::getBooleanCppuType() ,&bFalse); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRLEFTBOR), ++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRLEFTBDIS), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRLEFTMAR), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); + //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_FTRON), ++i,nBound,::getBooleanCppuType() ,&bFalse); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRRIGHTBOR), ++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRRIGHTBDIS),++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRRIGHTMAR), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRSHADOW), ++i,nBound,::getCppuType((const table::ShadowFormat*)0) ,&eShadowFormat); - //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_FTRSHARED), ++i,nBound,::getBooleanCppuType() ,&bFalse); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRTOPBOR), ++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRTOPBDIS), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_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(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_HDRBACKCOL), ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nTransparent); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFFILT), ++i,nBound|nMayBeVoid,::getCppuType((const ::rtl::OUString*)0) ,&sEmpty); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFLOC), ++i,nBound|nMayBeVoid,::getCppuType((const style::GraphicLocation*)0) ,&eGraphicLocation); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFURL), ++i,nBound|nMayBeVoid,::getCppuType((const ::rtl::OUString*)0) ,&sEmpty); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRBACKTRAN), ++i,nBound|nMayBeVoid,::getBooleanCppuType() ,&bTrue); + //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_HDRBACKCOL), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRBODYDIST), ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRBRDDIST), ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRBOTTBOR), ++i,nBound|nMayBeVoid,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRBOTTBDIS), ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero); + //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_HDRDYNAMIC), ++i,nBound,::getBooleanCppuType() ,&bFalse); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRHEIGHT), ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRDYNAMIC), ++i,nBound|nMayBeVoid,::getBooleanCppuType() ,&bFalse); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRON), ++i,nBound|nMayBeVoid,::getBooleanCppuType() ,&bFalse); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRSHARED), ++i,nBound|nMayBeVoid,::getBooleanCppuType() ,&bFalse); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRLEFTBOR), ++i,nBound|nMayBeVoid,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRLEFTBDIS), ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRLEFTMAR), ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero); + //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_HDRON), ++i,nBound,::getBooleanCppuType() ,&bFalse); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRRIGHTBOR), ++i,nBound|nMayBeVoid,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRRIGHTBDIS),++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRRIGHTMAR), ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRSHADOW), ++i,nBound|nMayBeVoid,::getCppuType((const table::ShadowFormat*)0) ,&eShadowFormat); - //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_HDRSHARED), ++i,nBound,::getBooleanCppuType() ,&bFalse); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRTOPBOR), ++i,nBound|nMayBeVoid,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRTOPBDIS), ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero); + 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(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); + 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_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(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*)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); + registerPropertyNoMember(MAP_CHAR_LEN("UserDefinedAttributes"), ++i,nBound,::getCppuType((uno::Reference*)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 aSe; - registerPropertyNoMember(MAP_CHAR_LEN("PrinterSetup"), ++i,nBound,::getCppuType((const uno::Sequence*)0),&aSe); + registerPropertyNoMember(MAP_CHAR_LEN("PrinterSetup"), ++i,nBound,::getCppuType((const uno::Sequence*)0),&aSe); } @@ -487,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); } @@ -496,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; @@ -572,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; @@ -608,21 +608,21 @@ struct OReportDefinitionImpl ::boost::shared_ptr< ::comphelper::EmbeddedObjectContainer> m_pObjectContainer; ::boost::shared_ptr m_pReportModel; - ::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) @@ -1217,7 +1217,7 @@ uno::Reference< util::XCloneable > SAL_CALL OReportDefinition::createClone( ) t 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) @@ -1409,8 +1409,8 @@ 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); +// ::osl::MutexGuard aGuard(m_aMutex); +// ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed); // m_pImpl->m_xStorage = _xStorageToLoadFrom; diff --git a/reportdesign/source/core/api/ReportEngineJFree.cxx b/reportdesign/source/core/api/ReportEngineJFree.cxx index feb94419f337..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 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 54e5cd8847ca..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 @@ -139,8 +139,8 @@ OSection::OSection(const uno::Reference< report::XReportDefinition >& _xParent //.getSdrModel()->createNewPage(m_xSection); } //-------------------------------------------------------------------------- -// TODO: VirtualFunctionFinder: This is virtual function! -// +// TODO: VirtualFunctionFinder: This is virtual function! +// OSection::~OSection() { DBG_DTOR( rpt_OSection,NULL); @@ -164,16 +164,16 @@ 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 ) ); @@ -191,7 +191,7 @@ void SAL_CALL OSection::disposing() uno::Reference< drawing::XShape> xShape(m_xDrawPage->getByIndex(0),uno::UNO_QUERY); m_xDrawPage->remove(xShape); ::comphelper::disposeComponent(xShape); - } + } catch(const uno::Exception&) {} } @@ -243,7 +243,7 @@ void OSection::init() { ::comphelper::query_aggregation(m_xProxy,m_xDrawPage); } - + // set ourself as delegator { if ( m_xProxy.is() ) @@ -379,7 +379,7 @@ void SAL_CALL OSection::setNewRowOrCol( ::sal_Int16 _newroworcol ) throw (lang:: ,1 ,m_xContext); checkNotPageHeaderFooter(); - + set(PROPERTY_NEWROWORCOL,_newroworcol,m_nNewRowOrCol); } // ----------------------------------------------------------------------------- @@ -396,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); } // ----------------------------------------------------------------------------- @@ -516,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 4ed2b8aabb9d..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() ); } @@ -480,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 32fa29152634..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) 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 void set( const ::rtl::OUString& _sProperty + template 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 void set( const ::rtl::OUString& _sProperty + template 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 void set( const ::rtl::OUString& _sProperty + template 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 void set( const ::rtl::OUString& _sProperty + template 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 void set( const ::rtl::OUString& _sProperty + template 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 void set( const ::rtl::OUString& _sProperty + template 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 void set( const ::rtl::OUString& _sProperty + template 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 void set( const ::rtl::OUString& _sProperty + template 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 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 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 void set( const ::rtl::OUString& _sProperty + + template 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 void set( const ::rtl::OUString& _sProperty + template 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 343acfbdf859..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 @@ -168,7 +168,7 @@ namespace reportdesign if ( xChild.is() ) xChild->setParent(Parent); } - template static com::sun::star::uno::Reference< com::sun::star::uno::XInterface > getParent( T* _pShape ) + template 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 0804c1814487..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 diff --git a/reportdesign/source/core/misc/conditionupdater.cxx b/reportdesign/source/core/misc/conditionupdater.cxx index 69246f36e654..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 diff --git a/reportdesign/source/core/misc/reportformula.cxx b/reportdesign/source/core/misc/reportformula.cxx index cd101b0a3be0..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 @@ -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 90db1ef61e91..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,8 +62,8 @@ 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(); rtl::OString sResLibName = rtl::OString( "rpt" ); diff --git a/reportdesign/source/core/resource/strings.src b/reportdesign/source/core/resource/strings.src index d6191e2f381e..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 diff --git a/reportdesign/source/core/sdr/ModuleHelper.cxx b/reportdesign/source/core/sdr/ModuleHelper.cxx index d132304be477..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 #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,7 +83,7 @@ OModuleImpl::~OModuleImpl() } //------------------------------------------------------------------------- -ResMgr* OModuleImpl::getResManager() +ResMgr* OModuleImpl::getResManager() { // note that this method is not threadsafe, which counts for the whole class ! @@ -99,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(); @@ -136,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 307b6f26c390..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 @@ -42,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) @@ -53,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!"); @@ -100,7 +100,7 @@ OPropertyMediator::OPropertyMediator(const Reference< XPropertySet>& _xSource // ----------------------------------------------------------------------------- OPropertyMediator::~OPropertyMediator() { - DBG_DTOR( rpt_OPropertyMediator,NULL); + DBG_DTOR( rpt_OPropertyMediator,NULL); } // ----------------------------------------------------------------------------- void SAL_CALL OPropertyMediator::propertyChange( const PropertyChangeEvent& evt ) throw(RuntimeException) @@ -141,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 @@ -201,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 2aa9cca9d187..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!"); diff --git a/reportdesign/source/core/sdr/ReportUndoFactory.cxx b/reportdesign/source/core/sdr/ReportUndoFactory.cxx index a16963c95573..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 @@ -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 @@ -146,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 ); } @@ -177,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 7b98042f9aeb..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 @@ -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 @@ -120,7 +120,7 @@ Window* OReportModel::GetCurDocViewWin() } //---------------------------------------------------------------------------- -OXUndoEnvironment& OReportModel::GetUndoEnv() +OXUndoEnvironment& OReportModel::GetUndoEnv() { return *m_pUndoEnv; } @@ -230,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 9e7a83a5b557..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 @@ -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 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: @@ -323,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; } //---------------------------------------------------------------------------- @@ -336,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(); @@ -370,7 +370,7 @@ void OObjectBase::StartListening() if ( !isListening() && m_xReportComponent.is() ) { m_bIsListening = sal_True; - + if ( !m_xPropertyChangeListener.is() ) { m_xPropertyChangeListener = new OObjectListener( this ); @@ -551,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; @@ -728,7 +728,7 @@ sal_Int32 OUnoObject::GetStep() const void OUnoObject::NbcMove( const Size& rSize ) { DBG_CHKTHIS( rpt_OUnoObject,NULL); - + if ( m_bIsListening ) { // stop listening @@ -775,7 +775,7 @@ void OUnoObject::NbcMove( const Size& rSize ) // } // } } - // set geometry properties + // set geometry properties SetPropsFromRect(GetLogicRect()); // start listening @@ -794,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 @@ -807,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 @@ -823,7 +823,7 @@ bool OUnoObject::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) if ( bResult ) { impl_setReportComponent_nothrow(); - // set labels + // set labels if ( m_xReportComponent.is() ) { try @@ -840,7 +840,7 @@ bool OUnoObject::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) impl_initializeModel_nothrow(); } - // set geometry properties + // set geometry properties SetPropsFromRect(GetLogicRect()); } @@ -848,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 ) ) @@ -869,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; } @@ -928,7 +928,7 @@ void OUnoObject::_propertyChange( const beans::PropertyChangeEvent& evt ) throw OObjectBase::StartListening(); } } - } + } } } // ----------------------------------------------------------------------------- @@ -1035,7 +1035,7 @@ sal_Int32 OOle2Obj::GetStep() const void OOle2Obj::NbcMove( const Size& rSize ) { DBG_CHKTHIS( rpt_OOle2Obj,NULL); - + if ( m_bIsListening ) { // stop listening @@ -1048,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 @@ -1068,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 @@ -1081,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 @@ -1103,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()); } @@ -1150,7 +1150,7 @@ SdrObject* OOle2Obj::Clone() const OReportModel* pRptModel = static_cast(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() ) @@ -1190,7 +1190,7 @@ void OOle2Obj::initializeOle() uno::Reference < embed::XEmbeddedObject > xObj = GetObjRef(); OReportModel* pRptModel = static_cast(GetModel()); pRptModel->GetUndoEnv().AddElement(lcl_getDataProvider(xObj)); - + uno::Reference< embed::XComponentSupplier > xCompSupp( xObj, uno::UNO_QUERY ); if( xCompSupp.is() ) { @@ -1238,11 +1238,11 @@ uno::Reference< style::XStyle> getUsedStyle(const uno::Reference< report::XRepor { uno::Reference xStyles = _xReport->getStyleFamilies(); uno::Reference 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 01ba228ffb96..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 diff --git a/reportdesign/source/core/sdr/RptPage.cxx b/reportdesign/source/core/sdr/RptPage.cxx index fe9ae18cdb52..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 @@ -134,17 +134,17 @@ SdrObject* OReportPage::RemoveObject(ULONG nObjNum) //---------------------------------------------------------------------------- //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")); +// ::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(); -// } +// 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) @@ -197,14 +197,14 @@ void OReportPage::resetSpecialMode() const sal_Bool bChanged = rModel.IsChanged(); ::std::vector::iterator aIter = m_aTemporaryObjectList.begin(); ::std::vector::iterator aEnd = m_aTemporaryObjectList.end(); - + for (; aIter != aEnd; ++aIter) { removeTempObject(*aIter); } m_aTemporaryObjectList.clear(); rModel.SetChanged(bChanged); - + m_bSpecialInsertMode = false; } // ----------------------------------------------------------------------------- @@ -218,7 +218,7 @@ void OReportPage::NbcInsertObject(SdrObject* pObj, ULONG nPos, const SdrInsertRe m_aTemporaryObjectList.push_back(pObj); return; } - + if ( pUnoObj ) { pUnoObj->CreateMediator(); diff --git a/reportdesign/source/core/sdr/UndoActions.cxx b/reportdesign/source/core/sdr/UndoActions.cxx index 737e43af74be..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 @@ -97,17 +97,17 @@ namespace rptui TYPEINIT1( OCommentUndoAction, SdrUndoAction ); DBG_NAME(rpt_OCommentUndoAction) //---------------------------------------------------------------------------- -OCommentUndoAction::OCommentUndoAction(SdrModel& _rMod,USHORT 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() @@ -170,7 +170,7 @@ OUndoContainerAction::~OUndoContainerAction() } //------------------------------------------------------------------------------ void OUndoContainerAction::implReInsert( ) SAL_THROW( ( Exception ) ) -{ +{ if ( m_xContainer.is() ) { // insert the element @@ -277,7 +277,7 @@ OUndoGroupSectionAction::OUndoGroupSectionAction(SdrModel& _rMod } //------------------------------------------------------------------------------ void OUndoGroupSectionAction::implReInsert( ) SAL_THROW( ( Exception ) ) -{ +{ OXUndoEnvironment& rEnv = static_cast< OReportModel& >( rMod ).GetUndoEnv(); try { @@ -323,7 +323,7 @@ OUndoReportSectionAction::OUndoReportSectionAction(SdrModel& _rMod } //------------------------------------------------------------------------------ void OUndoReportSectionAction::implReInsert( ) SAL_THROW( ( Exception ) ) -{ +{ OXUndoEnvironment& rEnv = static_cast< OReportModel& >( rMod ).GetUndoEnv(); try { @@ -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 780113958495..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 @@ -87,7 +87,7 @@ public: ::osl::Mutex m_aMutex; ::std::vector< uno::Reference< container::XChild> > m_aSections; oslInterlockedCount m_nLocks; - sal_Bool m_bReadOnly; + sal_Bool m_bReadOnly; sal_Bool m_bIsUndo; OXUndoEnvironmentImpl(OReportModel& _rModel); @@ -118,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; } // ----------------------------------------------------------------------------- @@ -174,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(); @@ -200,7 +200,7 @@ void OXUndoEnvironment::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) ModeChanged(); } // ----------------------------------------------------------------------------- -// XEventListener +// XEventListener //------------------------------------------------------------------------------ void SAL_CALL OXUndoEnvironment::disposing(const EventObject& e) throw( RuntimeException ) { @@ -236,7 +236,7 @@ void SAL_CALL OXUndoEnvironment::propertyChange( const PropertyChangeEvent& _rEv 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(); @@ -257,7 +257,7 @@ void SAL_CALL OXUndoEnvironment::propertyChange( const PropertyChangeEvent& _rEv AllProperties& rPropInfos = aSetPos->second; AllPropertiesIterator aPropertyPos = rPropInfos.find( _rEvent.PropertyName ); if (aPropertyPos == rPropInfos.end()) - { // nothing 'til now ... have to change this .... + { // nothing 'til now ... have to change this .... // the attributes INT32 nAttributes = xSet->getPropertySetInfo()->getPropertyByName( _rEvent.PropertyName ).Attributes; bool bTransReadOnly = ((nAttributes & PropertyAttribute::READONLY) != 0) || ((nAttributes & PropertyAttribute::TRANSIENT) != 0); @@ -316,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 xParent(_xContainer->getParent(),uno::UNO_QUERY); @@ -342,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); @@ -357,7 +357,7 @@ void SAL_CALL OXUndoEnvironment::elementInserted(const ContainerEvent& evt) thro { DBG_UNHANDLED_EXCEPTION(); } - + } } else @@ -414,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() ) { @@ -445,7 +445,7 @@ void SAL_CALL OXUndoEnvironment::elementRemoved(const ContainerEvent& evt) throw } } } - + if ( xIface.is() ) RemoveElement(xIface); diff --git a/reportdesign/source/core/sdr/formatnormalizer.cxx b/reportdesign/source/core/sdr/formatnormalizer.cxx index 3620f29bf554..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 @@ -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); } //-------------------------------------------------------------------- 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 fae4e234bdb3..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 @@ -78,7 +78,7 @@ ORptTypeDetection::ORptTypeDetection(Reference< XComponentContext > const & xCon return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StarBaseReport")); ::comphelper::disposeComponent(xProp); } // if ( xProp.is() ) - } + } catch(Exception&) { } diff --git a/reportdesign/source/filter/xml/dbloader2.hxx b/reportdesign/source/filter/xml/dbloader2.hxx index 442017d9a940..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,9 +84,9 @@ 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 ) 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 diff --git a/reportdesign/source/filter/xml/xmlCell.cxx b/reportdesign/source/filter/xml/xmlCell.cxx index f47f360c4687..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 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(); @@ -258,8 +258,8 @@ ORptFilter& OXMLCell::GetOwnImport() return static_cast(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(PROPERTY_WIDTH.length), PROPERTY_ID_WIDTH, &::getCppuType(static_cast< sal_Int32* >( NULL )) ,PropertyAttribute::BOUND,0}, - {PROPERTY_HEIGHT, static_cast(PROPERTY_HEIGHT.length), PROPERTY_ID_HEIGHT, &::getCppuType(static_cast< sal_Int32* >( NULL )) ,PropertyAttribute::BOUND,0}, + { + {PROPERTY_WIDTH, static_cast(PROPERTY_WIDTH.length), PROPERTY_ID_WIDTH, &::getCppuType(static_cast< sal_Int32* >( NULL )) ,PropertyAttribute::BOUND,0}, + {PROPERTY_HEIGHT, static_cast(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 dd1387db40da..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: @@ -100,13 +100,13 @@ OXMLComponent::OXMLComponent( ORptFilter& _rImport { 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 1daca10d9a2a..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,10 +38,10 @@ 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&); void operator =(const OXMLComponent&); public: diff --git a/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx b/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx index 16135095268a..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,13 +70,13 @@ 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&) 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 6e717557aca8..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 #include -#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(); @@ -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 ) ) { @@ -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 @@ -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) 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 a8fdacf51e9e..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 @@ -151,7 +151,7 @@ namespace rptxml aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.document.ExportFilter"); return aSupported; } - + //--------------------------------------------------------------------- Reference< XInterface > ODBFullExportHelper::create(Reference< XComponentContext > const & xContext) { @@ -169,7 +169,7 @@ namespace rptxml 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,14 +275,14 @@ 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); @@ -336,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; } //-------------------------------------------------------------------------- @@ -388,7 +388,7 @@ void ORptExport::exportMasterDetailFields(const Reference& _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 ); @@ -398,7 +398,7 @@ void ORptExport::exportMasterDetailFields(const Reference& _xR } } } -// ----------------------------------------------------------------------------- +// ----------------------------------------------------------------------------- void ORptExport::exportReport(const Reference& _xReportDefinition) { if ( _xReportDefinition.is() ) @@ -406,7 +406,7 @@ void ORptExport::exportReport(const Reference& _xReportDefini 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); @@ -419,7 +419,7 @@ void ORptExport::exportReport(const Reference& _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() ) @@ -441,7 +441,7 @@ void ORptExport::exportReport(const Reference& _xReportDefini 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) @@ -451,7 +451,7 @@ void ORptExport::exportComponent(const Reference& _xReportComp return; AddAttribute(XML_NAMESPACE_DRAW, XML_NAME,_xReportComponent->getName()); - + SvXMLElementExport aElem(*this,XML_NAMESPACE_REPORT, XML_REPORT_COMPONENT, sal_False, sal_False); } // ----------------------------------------------------------------------------- @@ -473,7 +473,7 @@ void ORptExport::exportFormatConditions(const Reference& _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_ENSURE(0,"Can not access format condition!"); @@ -491,7 +491,7 @@ void ORptExport::exportReportElement(const Reference& _xRep SvXMLElementExport aElem(*this,XML_NAMESPACE_REPORT, XML_REPORT_ELEMENT, sal_True, sal_True); if ( _xReportElement->getCount() ) - { + { exportFormatConditions(_xReportElement); } @@ -558,7 +558,7 @@ void ORptExport::exportSectionAutoStyle(const Reference& _xProp) aRowPos.reserve(2*(nCount + 1)); aRowPos.push_back(0); aRowPos.push_back(_xProp->getHeight()); - + sal_Int32 i; for (i = 0 ; i< nCount ; ++i) { @@ -615,7 +615,7 @@ void ORptExport::exportSectionAutoStyle(const Reference& _xProp) sal_Int32 xi = 0; sal_Int32 yi = 0; bool isOverlap = false; - + for (i = 0 ; i< nCount ; ++i) { Reference xReportElement(_xProp->getByIndex(i),uno::UNO_QUERY); @@ -675,7 +675,7 @@ void ORptExport::exportSectionAutoStyle(const Reference& _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? @@ -720,7 +720,7 @@ void ORptExport::exportReportComponentAutoStyles(const Reference& _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_ENSURE(0,"Can not access format condition!"); @@ -735,7 +735,7 @@ void ORptExport::exportSection(const Reference& _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); @@ -752,12 +752,12 @@ void ORptExport::exportSection(const Reference& _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() ) { @@ -797,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(); @@ -813,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; @@ -831,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); } @@ -862,7 +862,7 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection) } if ( aColIter->xElement.is() ) exportStyleName(aColIter->xElement.get(),GetAttrList(),m_sTableStyle); - + // start Reference xFormattedField(aColIter->xElement,uno::UNO_QUERY); if ( xFormattedField.is() ) @@ -901,7 +901,7 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection) Reference xReportDefinition(xElement,uno::UNO_QUERY); Reference< XImageControl > xImage(xElement,uno::UNO_QUERY); Reference xSection(xElement,uno::UNO_QUERY); - + XMLTokenEnum eToken = XML_SECTION; sal_Bool bExportData = sal_False; if ( xElement->supportsService(SERVICE_FIXEDTEXT) ) @@ -978,8 +978,8 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection) exportShapes(_xSection); } aColIter = aColIter + (aColIter->nColSpan - 1); - } - else + } + else ++nEmptyCellColSpan; if ( bCoveredCell ) { @@ -987,7 +987,7 @@ 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 ) @@ -1065,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; } // ----------------------------------------------------------------------------- @@ -1138,7 +1138,7 @@ sal_Bool ORptExport::exportGroup(const Reference& _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() ) @@ -1306,8 +1306,8 @@ void ORptExport::exportAutoStyle(XPropertySet* _xProp,const ReferenceAdd( XML_STYLE_FAMILY_TABLE_CELL, aPropertyStates ))); } @@ -1326,7 +1326,7 @@ void ORptExport::SetBodyAttributes() } // ----------------------------------------------------------------------------- void ORptExport::exportReportAttributes(const Reference& _xReport) -{ +{ if ( _xReport.is() ) { ::rtl::OUStringBuffer sValue; @@ -1379,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() ) @@ -1415,14 +1415,14 @@ void ORptExport::_ExportAutoStyles() ,GetMM100UnitConverter() ,GetNamespaceMap() ); - + GetAutoStylePool()->exportXML(XML_STYLE_FAMILY_TABLE_CELL ,GetDocHandler() ,GetMM100UnitConverter() ,GetNamespaceMap() ); - - + + /*GetAutoStylePool()->exportXML(XML_STYLE_FAMILY_REPORT_ID ,GetDocHandler() ,GetMM100UnitConverter() @@ -1478,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(); } @@ -1520,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() ) @@ -1569,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 ); @@ -1653,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 3d71e8deac69..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 ,TGrid > TSectionsGrid; typedef ::std::map< Reference ,Reference > 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 m_xReportDefinition; - sal_Bool m_bAllreadyFilled; + Reference m_xReportDefinition; + sal_Bool m_bAllreadyFilled; - void exportReport(const Reference& _xReportDefinition); /// + void exportReport(const Reference& _xReportDefinition); /// void exportReportAttributes(const Reference& _xReport); - void exportFunctions(const Reference& _xFunctions); /// + void exportFunctions(const Reference& _xFunctions); /// void exportFunction(const Reference< XFunction>& _xFunction); - void exportMasterDetailFields(const Reference& _xReportComponet); - void exportComponent(const Reference& _xReportComponent); - sal_Bool exportGroup(const Reference& _xReportDefinition,sal_Int32 _nPos,sal_Bool _bExportAutoStyle = sal_False); - void exportStyleName(XPropertySet* _xProp,SvXMLAttributeList& _rAtt,const ::rtl::OUString& _sName); - void exportSection(const Reference& _xProp,bool bHeader = false); + void exportMasterDetailFields(const Reference& _xReportComponet); + void exportComponent(const Reference& _xReportComponent); + sal_Bool exportGroup(const Reference& _xReportDefinition,sal_Int32 _nPos,sal_Bool _bExportAutoStyle = sal_False); + void exportStyleName(XPropertySet* _xProp,SvXMLAttributeList& _rAtt,const ::rtl::OUString& _sName); + void exportSection(const Reference& _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& _xProp); - void exportReportElement(const Reference& _xReportElement); - void exportFormatConditions(const Reference& _xReportElement); - void exportAutoStyle(XPropertySet* _xProp,const Reference& _xParentFormattedField = Reference()); - void exportAutoStyle(const Reference& _xProp); + void exportSectionAutoStyle(const Reference& _xProp); + void exportReportElement(const Reference& _xReportElement); + void exportFormatConditions(const Reference& _xReportElement); + void exportAutoStyle(XPropertySet* _xProp,const Reference& _xParentFormattedField = Reference()); + void exportAutoStyle(const Reference& _xProp); void exportReportComponentAutoStyles(const Reference& _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( 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 9abb4056108b..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 @@ -330,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()); 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 c30c3344b9e0..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 @@ -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 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 42e9eaeefb4f..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 diff --git a/reportdesign/source/filter/xml/xmlFormatCondition.cxx b/reportdesign/source/filter/xml/xmlFormatCondition.cxx index 6d70a78ec147..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: 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 65fdbe1ee81f..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: 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 fd0ede7b2244..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: diff --git a/reportdesign/source/filter/xml/xmlFunction.hxx b/reportdesign/source/filter/xml/xmlFunction.hxx index 2e6b33215b85..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,10 +40,10 @@ 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&); @@ -54,7 +54,7 @@ namespace rptxml , 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 c5fad4d165cd..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; } @@ -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 ) ) { diff --git a/reportdesign/source/filter/xml/xmlGroup.hxx b/reportdesign/source/filter/xml/xmlGroup.hxx index 06dfedf87785..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,9 +38,9 @@ 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&); diff --git a/reportdesign/source/filter/xml/xmlHelper.cxx b/reportdesign/source/filter/xml/xmlHelper.cxx index 9e4569704d9c..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 @@ -93,9 +93,9 @@ const XMLPropertyHandler* OPropertyHandlerFactory::GetPropertyHandler(sal_Int32 { 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 ), @@ -202,7 +202,7 @@ const XMLPropertyMapEntry* OXMLHelper::GetColumnStyleProps() //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( "OptimalWidth", XML_NAMESPACE_STYLE, XML_USE_OPTIMAL_COLUMN_WIDTH, XML_TYPE_PROP_TABLE_COLUMN|XML_TYPE_BOOL, 0), MAP_END() }; return aXMLColumnStylesProperties; @@ -212,10 +212,10 @@ const SvXMLEnumMapEntry* OXMLHelper::GetReportPrintOptions() { static SvXMLEnumMapEntry s_aXML_EnumMap[] = { - // { 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_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; @@ -225,10 +225,10 @@ const SvXMLEnumMapEntry* OXMLHelper::GetForceNewPageOptions() { static SvXMLEnumMapEntry s_aXML_EnumMap[] = { - // { 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_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; @@ -238,9 +238,9 @@ const SvXMLEnumMapEntry* OXMLHelper::GetKeepTogetherOptions() { static SvXMLEnumMapEntry s_aXML_EnumMap[] = { - // { XML_NO, report::KeepTogether::NO }, // default - { 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; @@ -258,22 +258,22 @@ const SvXMLEnumMapEntry* OXMLHelper::GetCommandTypeOptions() 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& _xProp) { if ( !_xProp.is() || !_sStyleName.getLength() || !_pAutoStyles ) @@ -283,30 +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(PROPERTY_FONTNAME.length), PROPERTY_ID_FONTNAME, &::getCppuType(&aFont.Name) ,PropertyAttribute::BOUND,0}, - {PROPERTY_CHARFONTHEIGHT, static_cast(PROPERTY_CHARFONTHEIGHT.length), PROPERTY_ID_FONTHEIGHT, &::getCppuType(&aFont.Height) ,PropertyAttribute::BOUND,0}, - {PROPERTY_FONTWIDTH, static_cast(PROPERTY_FONTWIDTH.length), PROPERTY_ID_FONTWIDTH, &::getCppuType(&aFont.Width) ,PropertyAttribute::BOUND,0}, - {PROPERTY_FONTSTYLENAME, static_cast(PROPERTY_FONTSTYLENAME.length), PROPERTY_ID_FONTSTYLENAME, &::getCppuType(&aFont.StyleName) ,PropertyAttribute::BOUND,0}, - {PROPERTY_FONTFAMILY, static_cast(PROPERTY_FONTFAMILY.length), PROPERTY_ID_FONTFAMILY, &::getCppuType(&aFont.Family) ,PropertyAttribute::BOUND,0}, - {PROPERTY_FONTCHARSET, static_cast(PROPERTY_FONTCHARSET.length), PROPERTY_ID_FONTCHARSET, &::getCppuType(&aFont.CharSet) ,PropertyAttribute::BOUND,0}, - {PROPERTY_FONTPITCH, static_cast(PROPERTY_FONTPITCH.length), PROPERTY_ID_FONTPITCH, &::getCppuType(&aFont.Pitch) ,PropertyAttribute::BOUND,0}, - {PROPERTY_FONTCHARWIDTH, static_cast(PROPERTY_FONTCHARWIDTH.length), PROPERTY_ID_FONTCHARWIDTH, &::getCppuType(&aFont.CharacterWidth),PropertyAttribute::BOUND,0}, - {PROPERTY_FONTWEIGHT, static_cast(PROPERTY_FONTWEIGHT.length), PROPERTY_ID_FONTWEIGHT, &::getCppuType(&aFont.Weight) ,PropertyAttribute::BOUND,0}, - {PROPERTY_CHARPOSTURE, static_cast(PROPERTY_CHARPOSTURE.length), PROPERTY_ID_FONTSLANT, &::getCppuType(&aFont.Slant) ,PropertyAttribute::BOUND,0}, - {PROPERTY_FONTUNDERLINE, static_cast(PROPERTY_FONTUNDERLINE.length), PROPERTY_ID_FONTUNDERLINE, &::getCppuType(&aFont.Underline) ,PropertyAttribute::BOUND,0}, - {PROPERTY_CHARSTRIKEOUT, static_cast(PROPERTY_CHARSTRIKEOUT.length), PROPERTY_ID_FONTSTRIKEOUT, &::getCppuType(&aFont.Strikeout) ,PropertyAttribute::BOUND,0}, - {PROPERTY_FONTORIENTATION, static_cast(PROPERTY_FONTORIENTATION.length), PROPERTY_ID_FONTORIENTATION, &::getCppuType(&aFont.Orientation) ,PropertyAttribute::BOUND,0}, - {PROPERTY_FONTKERNING, static_cast(PROPERTY_FONTKERNING.length), PROPERTY_ID_FONTKERNING, &::getCppuType(&aFont.Kerning) ,PropertyAttribute::BOUND,0}, - {PROPERTY_CHARWORDMODE, static_cast(PROPERTY_CHARWORDMODE.length), PROPERTY_ID_FONTWORDLINEMODE, &::getCppuType(&aFont.WordLineMode) ,PropertyAttribute::BOUND,0}, - {PROPERTY_FONTTYPE, static_cast(PROPERTY_FONTTYPE.length), PROPERTY_ID_FONTTYPE, &::getCppuType(&aFont.Type) ,PropertyAttribute::BOUND,0}, - //{PROPERTY_BACKGROUNDCOLOR, static_cast(PROPERTY_BACKGROUNDCOLOR.length), PROPERTY_ID_BACKGROUNDCOLOR, &::getCppuType(&nBackgroundColor) ,PropertyAttribute::BOUND,0},, - //{PROPERTY_PARAADJUST, static_cast(PROPERTY_PARAADJUST.length), PROPERTY_ID_ALIGN, &::getCppuType(&nAlign) ,PropertyAttribute::BOUND,0},, - //{PROPERTY_CONTROLBORDER, static_cast(PROPERTY_CONTROLBORDER.length), PROPERTY_ID_BORDER, &::getCppuType(&aFont.Type) ,PropertyAttribute::BOUND,0},, - //{PROPERTY_CONTROLBORDERCOLOR, static_cast(PROPERTY_CONTROLBORDERCOLOR.length), PROPERTY_ID_BORDERCOLOR, &::getCppuType(&aFont.Type) ,PropertyAttribute::BOUND,0},, - //{PROPERTY_CHARCOLOR, static_cast(PROPERTY_TEXTCOLOR.length), PROPERTY_ID_TEXTCOLOR, &::getCppuType(&aFont.Type) ,PropertyAttribute::BOUND,0},, - //{PROPERTY_FORMATKEY, static_cast(PROPERTY_FORMATKEY.length), PROPERTY_ID_FORMATKEY, &::getCppuType(&aFont.Type) ,PropertyAttribute::BOUND,0},, - //{PROPERTY_CHARUNDERLINECOLOR, static_cast(PROPERTY_CHARUNDERLINECOLOR.length), PROPERTY_ID_TEXTLINECOLOR, &::getCppuType(&aFont.Type) ,PropertyAttribute::BOUND,0},, + { + {PROPERTY_FONTNAME, static_cast(PROPERTY_FONTNAME.length), PROPERTY_ID_FONTNAME, &::getCppuType(&aFont.Name) ,PropertyAttribute::BOUND,0}, + {PROPERTY_CHARFONTHEIGHT, static_cast(PROPERTY_CHARFONTHEIGHT.length), PROPERTY_ID_FONTHEIGHT, &::getCppuType(&aFont.Height) ,PropertyAttribute::BOUND,0}, + {PROPERTY_FONTWIDTH, static_cast(PROPERTY_FONTWIDTH.length), PROPERTY_ID_FONTWIDTH, &::getCppuType(&aFont.Width) ,PropertyAttribute::BOUND,0}, + {PROPERTY_FONTSTYLENAME, static_cast(PROPERTY_FONTSTYLENAME.length), PROPERTY_ID_FONTSTYLENAME, &::getCppuType(&aFont.StyleName) ,PropertyAttribute::BOUND,0}, + {PROPERTY_FONTFAMILY, static_cast(PROPERTY_FONTFAMILY.length), PROPERTY_ID_FONTFAMILY, &::getCppuType(&aFont.Family) ,PropertyAttribute::BOUND,0}, + {PROPERTY_FONTCHARSET, static_cast(PROPERTY_FONTCHARSET.length), PROPERTY_ID_FONTCHARSET, &::getCppuType(&aFont.CharSet) ,PropertyAttribute::BOUND,0}, + {PROPERTY_FONTPITCH, static_cast(PROPERTY_FONTPITCH.length), PROPERTY_ID_FONTPITCH, &::getCppuType(&aFont.Pitch) ,PropertyAttribute::BOUND,0}, + {PROPERTY_FONTCHARWIDTH, static_cast(PROPERTY_FONTCHARWIDTH.length), PROPERTY_ID_FONTCHARWIDTH, &::getCppuType(&aFont.CharacterWidth),PropertyAttribute::BOUND,0}, + {PROPERTY_FONTWEIGHT, static_cast(PROPERTY_FONTWEIGHT.length), PROPERTY_ID_FONTWEIGHT, &::getCppuType(&aFont.Weight) ,PropertyAttribute::BOUND,0}, + {PROPERTY_CHARPOSTURE, static_cast(PROPERTY_CHARPOSTURE.length), PROPERTY_ID_FONTSLANT, &::getCppuType(&aFont.Slant) ,PropertyAttribute::BOUND,0}, + {PROPERTY_FONTUNDERLINE, static_cast(PROPERTY_FONTUNDERLINE.length), PROPERTY_ID_FONTUNDERLINE, &::getCppuType(&aFont.Underline) ,PropertyAttribute::BOUND,0}, + {PROPERTY_CHARSTRIKEOUT, static_cast(PROPERTY_CHARSTRIKEOUT.length), PROPERTY_ID_FONTSTRIKEOUT, &::getCppuType(&aFont.Strikeout) ,PropertyAttribute::BOUND,0}, + {PROPERTY_FONTORIENTATION, static_cast(PROPERTY_FONTORIENTATION.length), PROPERTY_ID_FONTORIENTATION, &::getCppuType(&aFont.Orientation) ,PropertyAttribute::BOUND,0}, + {PROPERTY_FONTKERNING, static_cast(PROPERTY_FONTKERNING.length), PROPERTY_ID_FONTKERNING, &::getCppuType(&aFont.Kerning) ,PropertyAttribute::BOUND,0}, + {PROPERTY_CHARWORDMODE, static_cast(PROPERTY_CHARWORDMODE.length), PROPERTY_ID_FONTWORDLINEMODE, &::getCppuType(&aFont.WordLineMode) ,PropertyAttribute::BOUND,0}, + {PROPERTY_FONTTYPE, static_cast(PROPERTY_FONTTYPE.length), PROPERTY_ID_FONTTYPE, &::getCppuType(&aFont.Type) ,PropertyAttribute::BOUND,0}, + //{PROPERTY_BACKGROUNDCOLOR, static_cast(PROPERTY_BACKGROUNDCOLOR.length), PROPERTY_ID_BACKGROUNDCOLOR, &::getCppuType(&nBackgroundColor) ,PropertyAttribute::BOUND,0},, + //{PROPERTY_PARAADJUST, static_cast(PROPERTY_PARAADJUST.length), PROPERTY_ID_ALIGN, &::getCppuType(&nAlign) ,PropertyAttribute::BOUND,0},, + //{PROPERTY_CONTROLBORDER, static_cast(PROPERTY_CONTROLBORDER.length), PROPERTY_ID_BORDER, &::getCppuType(&aFont.Type) ,PropertyAttribute::BOUND,0},, + //{PROPERTY_CONTROLBORDERCOLOR, static_cast(PROPERTY_CONTROLBORDERCOLOR.length), PROPERTY_ID_BORDERCOLOR, &::getCppuType(&aFont.Type) ,PropertyAttribute::BOUND,0},, + //{PROPERTY_CHARCOLOR, static_cast(PROPERTY_TEXTCOLOR.length), PROPERTY_ID_TEXTCOLOR, &::getCppuType(&aFont.Type) ,PropertyAttribute::BOUND,0},, + //{PROPERTY_FORMATKEY, static_cast(PROPERTY_FORMATKEY.length), PROPERTY_ID_FORMATKEY, &::getCppuType(&aFont.Type) ,PropertyAttribute::BOUND,0},, + //{PROPERTY_CHARUNDERLINECOLOR, static_cast(PROPERTY_CHARUNDERLINECOLOR.length), PROPERTY_ID_TEXTLINECOLOR, &::getCppuType(&aFont.Type) ,PropertyAttribute::BOUND,0},, { NULL, 0, 0, NULL, 0, 0 } }; try @@ -317,22 +317,22 @@ void OXMLHelper::copyStyleElements(const bool _bOld,const ::rtl::OUString& _sSty uno::Reference 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 xReportControlModel(_xProp,uno::UNO_QUERY); if ( xReportControlModel.is() && aFont.Name.getLength() ) { @@ -353,11 +353,11 @@ void OXMLHelper::copyStyleElements(const bool _bOld,const ::rtl::OUString& _sSty uno::Reference OXMLHelper::createBorderPropertySet() { static comphelper::PropertyMapEntry pMap[] = - { - {PROPERTY_BORDERLEFT, static_cast(PROPERTY_BORDERLEFT.length), 0, &::getCppuType((const table::BorderLine*)0) ,PropertyAttribute::BOUND,0}, - {PROPERTY_BORDERRIGHT, static_cast(PROPERTY_BORDERRIGHT.length), 1, &::getCppuType((const table::BorderLine*)0) ,PropertyAttribute::BOUND,0}, - {PROPERTY_BORDERTOP, static_cast(PROPERTY_BORDERTOP.length), 2, &::getCppuType((const table::BorderLine*)0) ,PropertyAttribute::BOUND,0}, - {PROPERTY_BORDERBOTTOM, static_cast(PROPERTY_BORDERBOTTOM.length), 3, &::getCppuType((const table::BorderLine*)0) ,PropertyAttribute::BOUND,0}, + { + {PROPERTY_BORDERLEFT, static_cast(PROPERTY_BORDERLEFT.length), 0, &::getCppuType((const table::BorderLine*)0) ,PropertyAttribute::BOUND,0}, + {PROPERTY_BORDERRIGHT, static_cast(PROPERTY_BORDERRIGHT.length), 1, &::getCppuType((const table::BorderLine*)0) ,PropertyAttribute::BOUND,0}, + {PROPERTY_BORDERTOP, static_cast(PROPERTY_BORDERTOP.length), 2, &::getCppuType((const table::BorderLine*)0) ,PropertyAttribute::BOUND,0}, + {PROPERTY_BORDERBOTTOM, static_cast(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)); @@ -367,24 +367,24 @@ SvXMLTokenMap* OXMLHelper::GetReportElemTokenMap() { 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 ); @@ -394,9 +394,9 @@ SvXMLTokenMap* OXMLHelper::GetSubDocumentElemTokenMap() { 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 ); 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 -#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 m_pDisplayHandler; - mutable ::std::auto_ptr m_pTextAlignHandler; + mutable ::std::auto_ptr m_pDisplayHandler; + mutable ::std::auto_ptr 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 ab7567214fdf..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 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 a61c4b21928b..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 @@ -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(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: @@ -219,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; } @@ -281,9 +281,9 @@ void SAL_CALL ImportDocumentHandler::startElement(const ::rtl::OUString & _sName 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); } @@ -304,7 +304,7 @@ 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.equalsAscii("rpt:detail") + else if ( _sName.equalsAscii("rpt:detail") || _sName.equalsAscii("rpt:formatted-text") || _sName.equalsAscii("rpt:master-detail-field") || _sName.equalsAscii("rpt:report-component") @@ -361,8 +361,8 @@ void SAL_CALL ImportDocumentHandler::initialize( const uno::Sequence< uno::Any > } // 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 m_pReportElemTokenMap; + + ::std::auto_ptr 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(GetImport()).GetSubDocumentElemTokenMap(); + const SvXMLTokenMap& rTokenMap = static_cast(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 6990c9144b20..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(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: @@ -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 2ef2ad192423..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: @@ -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 01de1e714bf9..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 ) ) { 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(PROPERTY_WIDTH.length), 0, &::getCppuType(static_cast< sal_Int32* >( NULL )) ,PropertyAttribute::BOUND,0}, - {PROPERTY_HEIGHT, static_cast(PROPERTY_HEIGHT.length), 0, &::getCppuType(static_cast< sal_Int32* >( NULL )) ,PropertyAttribute::BOUND,0}, + { + {PROPERTY_WIDTH, static_cast(PROPERTY_WIDTH.length), 0, &::getCppuType(static_cast< sal_Int32* >( NULL )) ,PropertyAttribute::BOUND,0}, + {PROPERTY_HEIGHT, static_cast(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 098858190d28..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)); @@ -113,7 +113,7 @@ OXMLSection::OXMLSection( ORptFilter& rImport, } // ----------------------------------------------------------------------------- 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 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 afb2ceff5431..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 @@ -229,7 +229,7 @@ UniReference < SvXMLImportPropertyMapper > { m_xCellImpPropMapper = new XMLTextImportPropertyMapper/*OSpecialHanldeXMLImportPropertyMapper*/( rImport.GetCellStylesPropertySetMapper(), m_rImport , const_cast(m_rImport.GetFontDecls())); - + m_xCellImpPropMapper->ChainImportMapper(XMLTextImportHelper::CreateParaExtPropMapper(m_rImport, const_cast(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; @@ -266,7 +266,7 @@ UniReference < SvXMLImportPropertyMapper > break; } } - + return xMapper; } // ----------------------------------------------------------------------------- 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 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 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 623eceaa849f..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(GetImport()).GetReportElemTokenMap(); + const SvXMLTokenMap& rTokenMap = static_cast(GetImport()).GetReportElemTokenMap(); switch( rTokenMap.Get( _nPrefix, _rLocalName ) ) { @@ -122,7 +122,7 @@ void OXMLSubDocument::EndElement() { // #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() ) @@ -130,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(); @@ -144,12 +144,12 @@ void OXMLSubDocument::EndElement() ::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_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 f70a65d98bcc..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 @@ -127,7 +127,7 @@ OXMLTable::OXMLTable( ORptFilter& rImport } // ----------------------------------------------------------------------------- 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 xFactor = rImport.getServiceFactory(); switch( rTokenMap.Get( _nPrefix, _rLocalName ) ) @@ -265,7 +265,7 @@ 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) { @@ -310,8 +310,8 @@ void OXMLTable::addCell(const Reference& _xElement) } // ----------------------------------------------------------------------------- void OXMLTable::incrementRowIndex() -{ - ++m_nRowIndex; +{ + ++m_nRowIndex; m_nColumnIndex = 0; m_aGrid.push_back(::std::vector(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 > m_aGrid; ::std::vector m_aHeight; ::std::vector 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 1e1f2ba71305..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 @@ -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() @@ -182,10 +182,10 @@ sal_Int32 ReadThroughComponent( { xParser->parseStream( aParserInput ); } - catch( SAXParseException& + catch( SAXParseException& #if OSL_DEBUG_LEVEL > 1 -r +r #endif ) { @@ -240,7 +240,7 @@ sal_Int32 ReadThroughComponent( { 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,11 +475,11 @@ 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.equalsAscii( "FileName" ) ) @@ -491,7 +491,7 @@ sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) 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.equalsAscii( "ActiveConnection" ) ) @@ -503,20 +503,20 @@ sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) } } } - + if ( sFileName.getLength() != 0 ) { uno::Reference xCom(GetModel(),UNO_QUERY); SfxMediumRef pMedium = new SfxMedium( sFileName, ( STREAM_READ | STREAM_NOCREATE ), FALSE, 0 ); - + if( pMedium ) { try { xStorage = pMedium->GetStorage(); - // nError = pMedium->GetError(); + // nError = pMedium->GetError(); } catch(const Exception&) { @@ -535,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 xEmbeddedObjectResolver; uno::Reference< lang::XMultiServiceFactory > xServiceFactory( getServiceFactory(), uno::UNO_QUERY); @@ -560,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 *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 }, { MAP_LEN( "BaseURI"), 0, &::getCppuType( (::rtl::OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 }, @@ -590,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 )))); @@ -642,11 +642,11 @@ sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) ,xProp ); } - + bRet = nRet == 0; - if ( bRet ) + if ( bRet ) { m_xReportDefinition->setModified(sal_False); } @@ -740,22 +740,22 @@ SvXMLImportContext* ORptFilter::CreateContext( sal_uInt16 nPrefix, // ----------------------------------------------------------------------------- const SvXMLTokenMap& ORptFilter::GetDocElemTokenMap() const { - if ( !m_pDocElemTokenMap.get() ) + if ( !m_pDocElemTokenMap.get() ) { static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= { - { 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_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 )); @@ -765,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; } @@ -783,11 +783,11 @@ const SvXMLTokenMap& ORptFilter::GetFunctionElemTokenMap() const { 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 )); @@ -801,15 +801,15 @@ const SvXMLTokenMap& ORptFilter::GetFormatElemTokenMap() const { 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 { @@ -817,19 +817,19 @@ const SvXMLTokenMap& ORptFilter::GetGroupElemTokenMap() const { 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_ , XML_TOK_ }, + { 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 )); @@ -843,11 +843,11 @@ const SvXMLTokenMap& ORptFilter::GetReportElementElemTokenMap() const { 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 )); @@ -861,15 +861,15 @@ const SvXMLTokenMap& ORptFilter::GetControlElemTokenMap() const { 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 )); @@ -883,15 +883,15 @@ const SvXMLTokenMap& ORptFilter::GetControlPropertyElemTokenMap() const { 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 )); @@ -905,9 +905,9 @@ const SvXMLTokenMap& ORptFilter::GetComponentElemTokenMap() const { 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 )); @@ -921,17 +921,17 @@ const SvXMLTokenMap& ORptFilter::GetColumnTokenMap() const { 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 )); @@ -945,15 +945,15 @@ const SvXMLTokenMap& ORptFilter::GetSectionElemTokenMap() const { 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 }; @@ -968,18 +968,18 @@ const SvXMLTokenMap& ORptFilter::GetCellElemTokenMap() const { 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 )); @@ -1004,7 +1004,7 @@ SvXMLImportContext* ORptFilter::CreateStylesContext(const ::rtl::OUString& rLoca return pContext; } // ----------------------------------------------------------------------------- -SvXMLImport& ORptFilter::getGlobalContext() +SvXMLImport& ORptFilter::getGlobalContext() { return *this; } 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,TPropertyNameMap); DECLARE_STL_USTRINGACCESS_MAP( Reference ,TGroupFunctionMap); private: - + TGroupFunctionMap m_aFunctions; - com::sun::star::uno::Any m_aViewSettings; - Reference< XComponent > m_xSrcDoc; - mutable ::std::auto_ptr m_pDocElemTokenMap; - mutable ::std::auto_ptr m_pReportElemTokenMap; - mutable ::std::auto_ptr m_pGroupsElemTokenMap; - mutable ::std::auto_ptr m_pGroupElemTokenMap; - mutable ::std::auto_ptr m_pSectionElemTokenMap; - mutable ::std::auto_ptr m_pComponentElemTokenMap; - mutable ::std::auto_ptr m_pElemTokenMap; - mutable ::std::auto_ptr m_pControlElemTokenMap; - mutable ::std::auto_ptr m_pFunctionElemTokenMap; - mutable ::std::auto_ptr m_pSubDocumentElemTokenMap; - mutable ::std::auto_ptr m_pFormatElemTokenMap; - mutable ::std::auto_ptr m_pColumnTokenMap; - mutable ::std::auto_ptr m_pCellElemTokenMap; - - UniReference < XMLPropertyHandlerFactory > m_xPropHdlFactory; - UniReference < XMLPropertySetMapper > m_xCellStylesPropertySetMapper; - UniReference < XMLPropertySetMapper > m_xColumnStylesPropertySetMapper; - UniReference < XMLPropertySetMapper > m_xRowStylesPropertySetMapper; - UniReference < XMLPropertySetMapper > m_xTableStylesPropertySetMapper; - - Reference m_xReportDefinition; + com::sun::star::uno::Any m_aViewSettings; + Reference< XComponent > m_xSrcDoc; + mutable ::std::auto_ptr m_pDocElemTokenMap; + mutable ::std::auto_ptr m_pReportElemTokenMap; + mutable ::std::auto_ptr m_pGroupsElemTokenMap; + mutable ::std::auto_ptr m_pGroupElemTokenMap; + mutable ::std::auto_ptr m_pSectionElemTokenMap; + mutable ::std::auto_ptr m_pComponentElemTokenMap; + mutable ::std::auto_ptr m_pElemTokenMap; + mutable ::std::auto_ptr m_pControlElemTokenMap; + mutable ::std::auto_ptr m_pFunctionElemTokenMap; + mutable ::std::auto_ptr m_pSubDocumentElemTokenMap; + mutable ::std::auto_ptr m_pFormatElemTokenMap; + mutable ::std::auto_ptr m_pColumnTokenMap; + mutable ::std::auto_ptr m_pCellElemTokenMap; + + UniReference < XMLPropertyHandlerFactory > m_xPropHdlFactory; + UniReference < XMLPropertySetMapper > m_xCellStylesPropertySetMapper; + UniReference < XMLPropertySetMapper > m_xColumnStylesPropertySetMapper; + UniReference < XMLPropertySetMapper > m_xRowStylesPropertySetMapper; + UniReference < XMLPropertySetMapper > m_xTableStylesPropertySetMapper; + + Reference m_xReportDefinition; ::boost::shared_ptr 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 getReportDefinition() const { return m_xReportDefinition; } /** return the SdrModel of the real model * - * \return + * \return */ ::boost::shared_ptr 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 3e4a09d3993a..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 } }; } 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/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 43ad175d827d..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,14 +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 ); +// virtual void Command( const CommandEvent& rEvt ); public: OAddFieldWindowListBox( OAddFieldWindow* _pParent ); @@ -172,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) @@ -192,7 +192,7 @@ OAddFieldWindow::OAddFieldWindow(Window* pParent setToolBox(&m_aActions); m_aActions.CheckItem(SID_FM_SORTUP); 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 ) ); @@ -232,7 +232,7 @@ OAddFieldWindow::~OAddFieldWindow() { if ( m_pListBox.get() ) { - SvLBoxTreeList* pModel = m_pListBox->GetModel(); + SvLBoxTreeList* pModel = m_pListBox->GetModel(); ULONG nCount = pModel->GetEntryCount(); for(ULONG i = 0; i< nCount;++i) { @@ -332,7 +332,7 @@ void OAddFieldWindow::Update() { m_aActions.EnableItem(m_aActions.GetItemId(j),FALSE); } - + String aTitle(ModuleRes(RID_STR_FIELDSELECTION)); SetText(aTitle); if ( m_xRowSet.is() ) @@ -347,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; @@ -558,11 +558,11 @@ IMPL_LINK( OAddFieldWindow, OnSortAction, ToolBox*, /*NOTINTERESTEDIN*/ ) 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 898779094953..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 @@ -99,7 +99,7 @@ namespace rptui //======================================================================== // 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,7 +391,7 @@ namespace rptui pCon->updateToolbar( xCond.get() ); m_aConditions.push_back( pCon ); } - } + } catch(Exception&) { OSL_ENSURE(0,"Can not access format condition!"); @@ -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(); @@ -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 89e0e1b88246..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 diff --git a/reportdesign/source/ui/dlg/CondFormat.src b/reportdesign/source/ui/dlg/CondFormat.src index 14fe6649aff1..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 ; }; @@ -243,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"; @@ -434,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 a61b2fdb08cb..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 diff --git a/reportdesign/source/ui/dlg/Condition.hxx b/reportdesign/source/ui/dlg/Condition.hxx index d382722ba818..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; diff --git a/reportdesign/source/ui/dlg/DateTime.cxx b/reportdesign/source/ui/dlg/DateTime.cxx index b70e49140d2e..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 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,12 +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); + // 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(reinterpret_cast(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); + // nFormat = m_aTimeF1.IsChecked() ? i18n::NumberFormatIndex::TIME_HHMMSS : (m_aTimeF2.IsChecked() ? i18n::NumberFormatIndex::TIME_HHMMSSAMPM : i18n::NumberFormatIndex::TIME_HHMM); nFormatKey = static_cast(reinterpret_cast(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 0e30747fb78c..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,7 +44,7 @@ ModalDialog RID_DATETIME_DLG HelpId = HID_RPT_DATETIME_DLG; Moveable = TRUE ; Closeable = TRUE ; - + CheckBox CB_DATE { Pos = MAP_APPFONT ( UNRELATED_CONTROLS , RELATED_CONTROLS /* + UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT */) ; @@ -52,7 +52,7 @@ ModalDialog RID_DATETIME_DLG 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 ); @@ -74,7 +74,7 @@ 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"; + // Text [ en-US ] = "Time"; }; CheckBox CB_TIME { @@ -83,7 +83,7 @@ ModalDialog RID_DATETIME_DLG 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); @@ -120,7 +120,7 @@ ModalDialog RID_DATETIME_DLG }; 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 c199f8c3f7c3..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& _xServiceFactory @@ -108,9 +108,9 @@ FormulaDialog::~FormulaDialog() } } -// -------------------------------------------------------------------------- -// Funktionen fuer rechte Seite -// -------------------------------------------------------------------------- +// -------------------------------------------------------------------------- +// Funktionen fuer rechte Seite +// -------------------------------------------------------------------------- bool FormulaDialog::calculateValue( const String& rStrExp, String& rStrResult ) { rStrResult = rStrExp; @@ -120,7 +120,7 @@ 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*/) diff --git a/reportdesign/source/ui/dlg/GroupExchange.cxx b/reportdesign/source/ui/dlg/GroupExchange.cxx index efa70b6b7e61..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 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 f2334687e4f3..8996e0f62f0c 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.cxx +++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx @@ -62,9 +62,9 @@ #include -#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,12 +100,12 @@ class OFieldExpressionControl : public TContainerListenerBase ::osl::Mutex m_aMutex; ::std::vector m_aGroupPositions; ::std::vector m_aColumnInfo; - ::svt::ComboBoxControl* m_pComboCell; - sal_Int32 m_nDataPos; - sal_Int32 m_nCurrentPos; - ULONG m_nPasteEvent; - 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; @@ -125,17 +125,17 @@ 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 @@ -164,7 +164,7 @@ protected: 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 ); @@ -295,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 ); @@ -394,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); @@ -634,7 +634,7 @@ EditBrowseBox::RowStatus OFieldExpressionControl::GetRowStatus(long nRow) const } return EditBrowseBox::CLEAN; } -// XEventListener +// XEventListener //------------------------------------------------------------------------------ void SAL_CALL OFieldExpressionControl::disposing(const lang::EventObject& /*e*/) throw( uno::RuntimeException ) { @@ -727,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()) { @@ -1027,7 +1027,7 @@ OGroupsSortingDialog::OGroupsSortingDialog( Window* _pParent for (size_t i = 0; i < (SAL_N_ELEMENTS(pControlsLst))-1; ++i) static_cast(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; @@ -1049,7 +1049,7 @@ OGroupsSortingDialog::OGroupsSortingDialog( Window* _pParent Size aOutSize(nMaxTextWidth + m_aHeader.GetSizePixel().Width() + 3*aSpace.Width(),aSpace.Height()); SetMinOutputSizePixel(aOutSize); SetOutputSizePixel(aOutSize); -// Resize(); +// Resize(); m_pReportListener = new OPropertyChangeMultiplexer(this,m_pController->getReportDefinition().get()); m_pReportListener->addProperty(PROPERTY_COMMAND); @@ -1071,8 +1071,8 @@ OGroupsSortingDialog::OGroupsSortingDialog( Window* _pParent //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); + //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); @@ -1424,7 +1424,7 @@ void OGroupsSortingDialog::displayGroup(const uno::Reference& _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); @@ -1438,8 +1438,8 @@ 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) { @@ -1461,14 +1461,14 @@ void OGroupsSortingDialog::Resize() 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 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 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())); +//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())); diff --git a/reportdesign/source/ui/dlg/GroupsSorting.hrc b/reportdesign/source/ui/dlg/GroupsSorting.hrc index 8dfbfd3224a4..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,32 +27,32 @@ #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) -//BTN #define IMG_UP_H (24) -//BTN #define IMG_DOWN_H (25) -//BTN #define PB_DELETE (26) +#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) @@ -63,17 +63,17 @@ // #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 2c73fff07de4..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,62 +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 ] = "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; +// 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; +// }; +// +// 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; +// +// }; +// +// 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; +// Align = BOXALIGN_TOP; +// HelpId = HID_RPT_CONDFORMAT_TB; Customize = FALSE; ItemList = { @@ -124,7 +124,7 @@ 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; @@ -132,7 +132,7 @@ FloatingWindow RID_GROUPS_SORTING 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; @@ -156,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 ) ; @@ -178,7 +178,7 @@ FloatingWindow RID_GROUPS_SORTING < "Ascending" ; 0 ; > ; < "Descending" ; 1 ; > ; }; - + }; FixedText FT_HEADER { @@ -186,7 +186,7 @@ FloatingWindow RID_GROUPS_SORTING Size = MAP_APPFONT ( FIXEDTEXT_WIDTH , FIXEDTEXT_HEIGHT ) ; Hide = TRUE; Text [ en-US ] = "Group Header" ; - + }; ListBox LST_HEADERLST { @@ -209,7 +209,7 @@ FloatingWindow RID_GROUPS_SORTING Size = MAP_APPFONT ( FIXEDTEXT_WIDTH , FIXEDTEXT_HEIGHT ) ; Hide = TRUE; Text [ en-US ] = "Group Footer" ; - + }; ListBox LST_FOOTERLST { @@ -232,7 +232,7 @@ FloatingWindow RID_GROUPS_SORTING Size = MAP_APPFONT ( FIXEDTEXT_WIDTH , FIXEDTEXT_HEIGHT ) ; Hide = TRUE; Text [ en-US ] = "Group On" ; - + }; ListBox LST_GROUPONLST { @@ -263,7 +263,7 @@ FloatingWindow RID_GROUPS_SORTING 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) ; @@ -287,29 +287,29 @@ 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 }; + +//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 }; }; @@ -395,7 +395,7 @@ Menu RID_GROUPSROWPOPUPMENU { ItemList = { -/* +/* MenuItem { ITEM_EDIT_CUT @@ -469,7 +469,7 @@ ImageList IMGLST_GROUPSORT_DLG_SCH // }; // DEF_MASKCOLOR; // }; -// +// // Image IMG_GROUPSORT_MOVEUP_H // { // ImageBitmap = Bitmap diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx index cca1a5a2fbdb..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 @@ -62,8 +62,8 @@ #include #include -#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 @@ -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; @@ -159,8 +159,8 @@ class NavigatorTree : public ::cppu::BaseMutex 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; @@ -171,12 +171,12 @@ class NavigatorTree : public ::cppu::BaseMutex 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); @@ -205,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); @@ -232,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); @@ -277,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 ) @@ -317,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 ) ); - + USHORT nCount = aContextMenu.GetItemCount(); for (USHORT i = 0; i < nCount; ++i) { if ( MENUITEM_SEPARATOR != aContextMenu.GetItemType(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 ) @@ -372,7 +372,7 @@ sal_Int8 NavigatorTree::AcceptDrop( const AcceptDropEvent& _rEvt ) { if (m_aDropActionTimer.IsActive()) m_aDropActionTimer.Stop(); - } + } else { bool bNeedTrigger = false; @@ -381,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)) { @@ -409,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(); } @@ -480,8 +480,8 @@ IMPL_LINK(NavigatorTree, OnEntrySelDesel, NavigatorTree*, /*pThis*/) aSelection <<= static_cast(pEntry->GetUserData())->getContent(); m_rController.select(aSelection); m_pSelectionListener->unlock(); - } - + } + return 0L; } // ----------------------------------------------------------------------------- @@ -699,7 +699,7 @@ void NavigatorTree::_propertyChanged(const beans::PropertyChangeEvent& _rEvent) } } // ----------------------------------------------------------------------------- -void NavigatorTree::_elementInserted( const container::ContainerEvent& _rEvent ) +void NavigatorTree::_elementInserted( const container::ContainerEvent& _rEvent ) { SvLBoxEntry* pEntry = find(_rEvent.Source); uno::Reference xProp(_rEvent.Element,uno::UNO_QUERY_THROW); @@ -780,13 +780,13 @@ void NavigatorTree::removeEntry(SvLBoxEntry* _pEntry,bool _bRemove) } DBG_NAME(rpt_NavigatorTree_UserData) // ----------------------------------------------------------------------------- -NavigatorTree::UserData::UserData(NavigatorTree* _pTree,const uno::Reference& _xContent) +NavigatorTree::UserData::UserData(NavigatorTree* _pTree,const uno::Reference& _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 xProp(m_xContent,uno::UNO_QUERY); if ( xProp.is() ) { @@ -817,7 +817,7 @@ NavigatorTree::UserData::UserData(NavigatorTree* _pTree,const uno::Referencedispose(); if ( m_pListener.is() ) @@ -844,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) ) { @@ -902,11 +902,11 @@ public: virtual ~ONavigatorImpl(); uno::Reference< report::XReportDefinition> m_xReport; - ::rptui::OReportController& m_rController; + ::rptui::OReportController& m_rController; ::std::auto_ptr 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)) @@ -936,7 +936,7 @@ 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); @@ -946,14 +946,14 @@ ONavigator::ONavigator( Window* _pParent 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 496bae3b0ab7..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 -#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 ); @@ -181,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 31c5bdb4026c..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,14 +44,14 @@ 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 { Pos = MAP_APPFONT ( UNRELATED_CONTROLS + RELATED_CONTROLS, 2*RELATED_CONTROLS + FIXEDTEXT_HEIGHT) ; @@ -66,14 +66,14 @@ ModalDialog RID_PAGENUMBERS 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 { Pos = MAP_APPFONT ( UNRELATED_CONTROLS + RELATED_CONTROLS, 4*RELATED_CONTROLS + UNRELATED_CONTROLS + 4*FIXEDTEXT_HEIGHT) ; @@ -85,17 +85,17 @@ ModalDialog RID_PAGENUMBERS RadioButton 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) ; @@ -146,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 383078a377f5..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 #include -#include -#include -#include +#include +#include +#include #include "dlgpage.hxx" #include "ModuleHelper.hxx" #include "RptResId.hrc" -#include //add CHINA001 +#include //add CHINA001 #include -#include +#include namespace rptui { @@ -50,9 +50,9 @@ namespace rptui ORptPageDialog::ORptPageDialog( Window* pParent, const SfxItemSet* pAttr,USHORT _nPageId) : SfxTabDialog ( pParent, ModuleRes( _nPageId ), pAttr ), - rOutAttrs ( *pAttr ) -{ - SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); + rOutAttrs ( *pAttr ) +{ + SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); DBG_ASSERT(pFact, "Dialogdiet fail!"); switch( _nPageId ) { @@ -63,16 +63,16 @@ SfxTabDialog ( pParent, ModuleRes( _nPageId ), pAttr ), //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 ); diff --git a/reportdesign/source/ui/dlg/dlgpage.src b/reportdesign/source/ui/dlg/dlgpage.src index b8dfcd377994..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 @@ -84,7 +84,7 @@ TabDialog RID_PAGEDIALOG_PAGE TabStop = TRUE ; }; Text [ x-comment ] = " "; - + String 1 { Text [ en-US ] = "Page" ; @@ -135,7 +135,7 @@ TabDialog RID_PAGEDIALOG_BACKGROUND Text [ x-comment ] = " "; }; Text [ x-comment ] = " "; - + String 1 { Text [ en-US ] = "Background" ; @@ -224,7 +224,7 @@ TabDialog RID_PAGEDIALOG_CHAR Text [ x-comment ] = " "; }; Text [ x-comment ] = " "; - + String 1 { Text [ en-US ] = "Character" ; @@ -296,7 +296,7 @@ TabDialog RID_PAGEDIALOG_LINE 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 cbfc8608d1bb..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 m_pListBox; + ::std::auto_ptr 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; } 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 215797729b1c..eddde4c724fa 100644 --- a/reportdesign/source/ui/inc/ColumnInfo.hxx +++ b/reportdesign/source/ui/inc/ColumnInfo.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -40,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 20156d51b01d..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 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 c73f366ea619..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,41 +47,41 @@ class OReportController; |* Groups and Sorting dialog |* \************************************************************************/ -class ODateTimeDialog : public ModalDialog +class ODateTimeDialog : public ModalDialog { - // FixedLine m_aFLDate; - 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; @@ -96,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 ffe4b5f37cb1..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 #include #include -#include +#include #include #include #include @@ -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; - USHORT m_nCurrentPosition; - USHORT m_eActObj; - 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; - BOOL m_bGridVisible; - BOOL m_bGridSnap; - 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( USHORT eObj,const ::rtl::OUString& _sShapeType = ::rtl::OUString()); - USHORT 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,7 +139,7 @@ namespace rptui */ void Copy(); - /** returns if paste is allowed + /** returns if paste is allowed * * \return if paste is allowed */ @@ -163,59 +163,59 @@ namespace rptui void SelectAll(const sal_uInt16 _nObjectType); /// checks if a selection exists - BOOL HasSelection() const; + BOOL HasSelection() const; void UpdatePropertyBrowserDelayed(OSectionView& _rView); - USHORT getSectionCount() const; + USHORT getSectionCount() const; /** removes the section at the given position. * * \param _nPosition Zero based. */ - void removeSection(USHORT _nPosition); + void removeSection(USHORT _nPosition); /** adds a new section at position _nPosition. If the section is 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 ,USHORT _nPosition = USHRT_MAX); inline Size getGridSizeCoarse() const { return m_aGridSizeCoarse; } inline Size getGridSizeFine() const { return m_aGridSizeFine; } - inline BOOL isGridSnap() const { return m_bGridSnap; } + 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); - BOOL isAddFieldVisible() const; - void toggleAddField(); + BOOL isAddFieldVisible() const; + void toggleAddField(); - 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 if the keycode is handled otherwise */ - 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 7a9916e5a499..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 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 da5471fbce52..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; @@ -74,7 +74,7 @@ public: virtual void fill(); virtual bool calculateValue(const String& _sExpression,String& _rResult); virtual void doClose(BOOL _bOk); - virtual void insertEntryToLRUList(const formula::IFunctionDescription* pDesc); + virtual void insertEntryToLRUList(const formula::IFunctionDescription* pDesc); virtual void showReference(const String& _sFormula); virtual void dispatch(BOOL _bOK,BOOL _bMartixChecked); virtual void setDispatcherLock( BOOL bLock ); @@ -102,7 +102,7 @@ public: 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 743cd1a755b6..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 diff --git a/reportdesign/source/ui/inc/GeometryHandler.hxx b/reportdesign/source/ui/inc/GeometryHandler.hxx index e6d5d51a4485..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); @@ -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 84178a76feaa..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 @@ -64,49 +64,49 @@ class OReportController; |* \************************************************************************/ -class OGroupsSortingDialog : public FloatingWindow - , public ::cppu::BaseMutex - , public ::comphelper::OPropertyChangeListener +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; -//BTN ImageButton m_aPB_Up; -//BTN ImageButton m_aPB_Down; -//BTN ImageButton m_aPB_Delete; + 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* ); +//BTN DECL_LINK( ClickHdl, ImageButton* ); DECL_LINK( OnFormatAction, ToolBox* ); /** returns the groups @@ -114,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 ); @@ -140,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(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(); @@ -161,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 @@ -171,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); @@ -180,15 +180,15 @@ 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 - @param _bHiContast + @param _bHiContast when in high contrast mode. */ virtual ImageList getImageList(sal_Int16 _eSymbolsSize,sal_Bool _bHiContast) const; 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 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 c55e32cb2dd5..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 @@ -79,55 +79,55 @@ namespace rptui class OAddFieldWindow; class OSectionWindow; - typedef ::dbaui::OSingleDocumentController 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 > { 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::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 + ::boost::shared_ptr 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; @@ -142,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. */ @@ -161,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); @@ -176,7 +176,7 @@ namespace rptui /** add or remove me as listener at the report definition * - * \param _bAdd + * \param _bAdd */ void listen(const bool _bAdd); @@ -197,17 +197,17 @@ 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 the header and footer will be shown otherwise not + @param _rEvent the group + @param _bShow when 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 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 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 @@ -224,14 +224,14 @@ namespace rptui 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(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(); @@ -244,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); @@ -256,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); @@ -308,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; @@ -328,9 +328,9 @@ 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); @@ -338,7 +338,7 @@ namespace rptui 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); - + virtual ~OReportController(); public: OReportController(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & the_context); @@ -355,26 +355,26 @@ namespace rptui virtual void impl_onModifyChanged(); - // const ::connectivity::OSQLParseNode* getParseTree() const { return m_aSqlIterator.getParseTree();} + // const ::connectivity::OSQLParseNode* getParseTree() const { return m_aSqlIterator.getParseTree();} // need for undo's and redo's SfxUndoManager* getUndoMgr(); /** returns 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,11 +450,11 @@ 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 getSdrModel(); diff --git a/reportdesign/source/ui/inc/ReportControllerObserver.hxx b/reportdesign/source/ui/inc/ReportControllerObserver.hxx index 8c3d827110ba..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 @@ -50,9 +50,9 @@ namespace rptui //======================================================================== class /* REPORTDESIGN_DLLPUBLIC */ OXReportControllerObserver - : 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*/ { @@ -120,11 +120,11 @@ namespace rptui // 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 97962a336ee5..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,8 +49,8 @@ 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 * diff --git a/reportdesign/source/ui/inc/ReportSection.hxx b/reportdesign/source/ui/inc/ReportSection.hxx index e8f64642afc6..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 m_pFunc; + OReportPage* m_pPage; + OSectionView* m_pView; + OSectionWindow* m_pParent; + ::std::auto_ptr m_pFunc; ::boost::shared_ptr 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; - 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. @@ -120,21 +120,21 @@ namespace rptui */ 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( BOOL bChanged = TRUE ) { m_bDialogModelChanged = bChanged; } - 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 if the keycode is handled otherwise */ - sal_Bool handleKeyEvent(const KeyEvent& _rEvent); + sal_Bool handleKeyEvent(const KeyEvent& _rEvent); /** returns the current control report model or */ @@ -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 11af785dc6a7..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 + Ruler m_aHRuler; + ODesignView* m_pView; + OScrollWindowHelper* m_pParent; + OViewsWindow m_aViewsWindow; + ::std::auto_ptr m_pObjFac; - + void ImplInitSettings(); - + sal_Int32 GetTotalHeight() const; sal_Int32 impl_getRealPixelWidth() const; - + OReportWindow(OReportWindow&); void operator =(OReportWindow&); protected: @@ -83,11 +83,11 @@ 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( USHORT 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(BOOL bOn); void setDragStripes(BOOL bOn); @@ -96,7 +96,7 @@ namespace rptui */ void Copy(); - /** returns if paste is allowed + /** returns if paste is allowed * * \return if paste is allowed */ @@ -119,76 +119,76 @@ namespace rptui */ BOOL HasSelection() const; - Point getThumbPos() const; + Point getThumbPos() const; /** removes the section at the given position. * * \param _nPosition Zero based. */ - void removeSection(USHORT _nPosition); + void removeSection(USHORT _nPosition); /** adds a new section at position _nPosition. If the section is 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 ,USHORT _nPosition = USHRT_MAX); - USHORT 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 the end marker will be used for calculation as well otherwise not. + * @param _bWithEnd if 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 if the keycode is handled otherwise */ - 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 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 ecb117488bd4..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 m_pReportDefintionMultiPlexer; // listener for property changes @@ -79,28 +79,28 @@ 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( USHORT 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(BOOL bOn); void setDragStripes(BOOL bOn); @@ -108,7 +108,7 @@ namespace rptui */ void Copy(); - /** returns if paste is allowed + /** returns if paste is allowed * * \return if paste is allowed */ @@ -135,55 +135,55 @@ namespace rptui * * \param _nPosition Zero based. */ - void removeSection(USHORT _nPosition); + void removeSection(USHORT _nPosition); /** adds a new section at position _nPosition. If the section is 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 ,USHORT _nPosition = USHRT_MAX); - USHORT 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 the end marker will be used for calculation as well otherwise not. + * @param _bWithEnd if 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 if the keycode is handled otherwise */ - 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 getMarkedSection(NearSectionAccess nsa = CURRENT) const; ::boost::shared_ptr 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 637b245097fd..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,20 +72,20 @@ namespace rptui /** set the title of the group header or footer * - * \param _xGroup - * \param _nResId - * \param _pGetSection - * \param _pIsSectionOn + * \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,USHORT _nResId,::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> , OGroupHelper> _pGetSection,::std::mem_fun_t _pIsSectionOn); /** set the title of the (report/page) header or footer * - * \param _xGroup - * \param _nResId - * \param _pGetSection - * \param _pIsSectionOn + * \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,USHORT _nResId,::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> , OReportHelper> _pGetSection,::std::mem_fun_t _pIsSectionOn); @@ -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 50d4311d9ed4..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,18 +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 Image* s_pDefCollapsedHC; - static Image* s_pDefExpandedHC; - 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(); @@ -66,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 6e600c4307da..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,16 +54,16 @@ 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 sal_Int32 getPositionInIndexAccess( + template 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 xObject(_xCollection->getByIndex(i),::com::sun::star::uno::UNO_QUERY); @@ -74,15 +74,15 @@ namespace rptui } /** 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 all objects are taken into account, otherwise only not marked ones * \return the object which is overlapped, otherwise */ @@ -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 all objects are taken into account, otherwise only not marked ones * \return the object which is overlapped, otherwise . If the given object is not of type OUnoObject will be returned. */ diff --git a/reportdesign/source/ui/inc/Undo.hxx b/reportdesign/source/ui/inc/Undo.hxx index 199ecd92c1f8..4e3a35e161aa 100644 --- a/reportdesign/source/ui/inc/Undo.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 ,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,8 +89,8 @@ 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 @@ -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,8 +116,8 @@ 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 @@ -125,7 +125,7 @@ namespace rptui ,Action _eAction ,USHORT nCommentID); - virtual String GetComment() const; + virtual String GetComment() const; }; /** /class OGroupUndo @@ -133,10 +133,10 @@ namespace rptui */ class OGroupUndo : public OCommentUndoAction { - ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup> m_xGroup; /// m_xReportDefinition; /// m_xGroup; /// m_xReportDefinition; ///& _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 dfa2f6ec7cdf..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) { @@ -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,RectangleLess> TRectangleMap; public: - typedef ::std::vector< ::boost::shared_ptr > TSectionsMap; + typedef ::std::vector< ::boost::shared_ptr > TSectionsMap; struct TReportPairHelper : public ::std::unary_function< TSectionsMap::value_type, OReportSection > { @@ -131,18 +131,18 @@ 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() @@ -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,26 +176,26 @@ 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(USHORT _nPosition); + void removeSection(USHORT _nPosition); /** adds a new section at position _nPosition. If the section is 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 ,USHORT _nPosition = USHRT_MAX); - USHORT 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 getSectionWindow(const USHORT _nPos) const; @@ -204,23 +204,23 @@ namespace rptui * * \param _bVisible */ - void toggleGrid(sal_Bool _bVisible); + 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( USHORT 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 if paste is allowed */ @@ -247,27 +247,27 @@ namespace rptui * * @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 getReportSection(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection); + // ::boost::shared_ptr getReportSection(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection); ::boost::shared_ptr 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 if the keycode is handled otherwise */ - 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 getMarkedSection(NearSectionAccess nsa = CURRENT) 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 4300beaf4d16..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 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 when the pointer was already set. */ bool setMovementPointer(const MouseEvent& rMEvt); @@ -99,14 +99,14 @@ public: 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 if the keycode is handled otherwise */ - virtual sal_Bool handleKeyEvent(const KeyEvent& _rEvent); + virtual sal_Bool handleKeyEvent(const KeyEvent& _rEvent); /** returns if the mouse event is over an existing object * - * \param rMEvt + * \param rMEvt * \return if overlapping, otherwise */ bool isOverlapping(const MouseEvent& rMEvt); @@ -122,7 +122,7 @@ protected: void colorizeOverlappedObject(SdrObject* _pOverlappedObj); void unColorizeOverlappedObj(); - + }; //============================================================================ diff --git a/reportdesign/source/ui/inc/dlgpage.hxx b/reportdesign/source/ui/inc/dlgpage.hxx index fb1a01e42301..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,7 +40,7 @@ namespace rptui class ORptPageDialog : public SfxTabDialog { private: - const SfxItemSet& rOutAttrs; + const SfxItemSet& rOutAttrs; ORptPageDialog(const ORptPageDialog&); void operator =(const ORptPageDialog&); diff --git a/reportdesign/source/ui/inc/metadata.hxx b/reportdesign/source/ui/inc/metadata.hxx index 727cd5bb1c62..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; - sal_Int32 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); @@ -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 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 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 f2a87ea06bde..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 @@ -169,7 +169,7 @@ 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) ) //{ @@ -205,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 ); @@ -267,7 +267,7 @@ 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); } @@ -398,7 +398,7 @@ uno::Sequence< beans::Property > SAL_CALL DataProviderHandler::getSupportedPrope ,PROPERTY_PREVIEW_COUNT //,PROPERTY_TITLE }; - + for (size_t nPos = 0; nPos < SAL_N_ELEMENTS(s_pProperties) ;++nPos ) { aValue.Name = s_pProperties[nPos]; @@ -452,7 +452,7 @@ inspection::InteractiveSelectionResult SAL_CALL DataProviderHandler::onInteracti default: eResult = m_xFormComponentHandler->onInteractivePropertySelection(PropertyName, Primary, out_Data, _rxInspectorUI); } - + return eResult; } @@ -493,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: @@ -559,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 368aa7cac239..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 @@ -61,7 +61,7 @@ namespace rptui //==================================================================== //= DefaultComponentInspectorModel //==================================================================== - DBG_NAME(DefaultComponentInspectorModel) + DBG_NAME(DefaultComponentInspectorModel) //-------------------------------------------------------------------- DefaultComponentInspectorModel::DefaultComponentInspectorModel( const Reference< XComponentContext >& _rxContext) :m_xContext( _rxContext ) @@ -72,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); } //------------------------------------------------------------------------ @@ -124,7 +124,7 @@ namespace rptui { ::osl::MutexGuard aGuard( m_aMutex ); - + // service names for all our handlers const struct { @@ -135,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 ); @@ -156,7 +156,7 @@ namespace rptui ::osl::MutexGuard aGuard(m_aMutex); return m_bHasHelpSection; } - + //-------------------------------------------------------------------- ::sal_Int32 SAL_CALL DefaultComponentInspectorModel::getMinHelpTextLines() throw (RuntimeException) { @@ -175,7 +175,7 @@ namespace rptui ::osl::MutexGuard aGuard(m_aMutex); m_bIsReadOnly = _isreadonly; } - + //-------------------------------------------------------------------- ::sal_Int32 SAL_CALL DefaultComponentInspectorModel::getMaxHelpTextLines() throw (RuntimeException) { diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx index a90a80a26f65..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 @@ -85,9 +85,9 @@ #include #include -#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 #include #include @@ -104,9 +104,9 @@ #include #include -#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 #define ITEMID_BRUSH SID_ATTR_BRUSH #include @@ -176,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); @@ -249,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) @@ -300,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(); @@ -398,7 +398,7 @@ uno::Any SAL_CALL GeometryHandler::getPropertyValue(const ::rtl::OUString & Prop aPropertyValue = uno::Any(); break; } - + } break; case PROPERTY_ID_TYPE: @@ -434,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: @@ -494,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; @@ -592,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 { @@ -618,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); } } @@ -645,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); } } @@ -690,7 +690,7 @@ void GeometryHandler::implCreateListLikeControl( { ::std::vector< ::rtl::OUString > aList; tools::StringListResource aRes(ModuleRes(_nResId),aList); - + implCreateListLikeControl(_rxControlFactory,out_Descriptor,aList,_bReadOnlyControl,_bTrueIfListBoxFalseIfComboBox); } // ----------------------------------------------------------------------------- @@ -755,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: @@ -845,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) ? @@ -855,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 ) @@ -974,7 +974,7 @@ uno::Any SAL_CALL GeometryHandler::convertToPropertyValue(const ::rtl::OUString aPropertyValue <<= static_cast(COL_TRANSPARENT); break; } - // run through + // run through case PROPERTY_ID_KEEPTOGETHER: if ( uno::Reference< report::XGroup>(m_xReportComponent,uno::UNO_QUERY).is()) @@ -982,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: @@ -999,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 ); } @@ -1025,7 +1025,7 @@ uno::Any SAL_CALL GeometryHandler::convertToPropertyValue(const ::rtl::OUString } } } - + break; } case PROPERTY_ID_CONDITIONALPRINTEXPRESSION: @@ -1336,10 +1336,10 @@ uno::Sequence< beans::Property > SAL_CALL GeometryHandler::getSupportedPropertie // { // 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()); } @@ -1384,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; @@ -1395,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; @@ -1413,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 ) ) { @@ -1437,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; @@ -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); @@ -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) @@ -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); @@ -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 aFind = m_aFunctionNames.equal_range(_sQuotedFunction); while ( aFind.first != aFind.second ) { @@ -1891,7 +1891,7 @@ sal_Bool GeometryHandler::impl_isDefaultFunction_nothrow( const uno::Reference< break; } } - + bDefaultFunction = aIter != aDeEnd; } catch(uno::Exception&) @@ -2039,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 ) @@ -2050,7 +2050,7 @@ void GeometryHandler::resetOwnProperties(::osl::ResettableMutexGuard& _aGuard,co aScopeEvent.NewValue <<= sNewScope; m_aPropertyListeners.notify( aScopeEvent, &beans::XPropertyChangeListener::propertyChange ); } - + _aGuard.reset(); } //------------------------------------------------------------------------ @@ -2168,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)))); } @@ -2185,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) ) @@ -2237,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 d42be56e7656..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 @@ -190,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 5915362f753e..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 @@ -51,19 +51,19 @@ namespace rptui //======================================================================== struct OPropertyInfoImpl { - String sName; - String sTranslation; + 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, - sal_uInt32 nHelpId, + const ::rtl::OUString& rName, + sal_Int32 _nId, + const String& aTranslation, + sal_uInt16 nPosId, + sal_uInt32 nHelpId, sal_uInt32 _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 ) 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 #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 1de40751f9c1..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 @@ -217,36 +217,36 @@ void FunctionDescription::initArgumentInfo() const { } // ----------------------------------------------------------------------------- -::rtl::OUString FunctionDescription::getSignature() const +::rtl::OUString FunctionDescription::getSignature() const { return m_xFunctionDescription->getSignature(); } // ----------------------------------------------------------------------------- -long FunctionDescription::getHelpId() const +long FunctionDescription::getHelpId() const { 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(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(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(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 6e1ed17c4e2e..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 #include #include -#include // XColorTable +#include // XColorTable #include #include #include @@ -717,15 +717,15 @@ bool openCharDialog( const uno::Reference& _rxRep }; 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 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() ) @@ -763,7 +763,7 @@ bool openAreaDialog( const uno::Reference& _xShape,const uno::R //static USHORT pRanges[] = //{ - // XATTR_START,XATTR_END, + // XATTR_START,XATTR_END, // 0 //}; @@ -775,7 +775,7 @@ bool openAreaDialog( const uno::Reference& _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 pDialog(pFact->CreateSvxAreaTabDialog( pParent,pDescriptor.get(),pModel.get() )); // #i74099# by default, the dialog deletes the current color table if a different one is loaded diff --git a/reportdesign/source/ui/misc/Undo.cxx b/reportdesign/source/ui/misc/Undo.cxx index 3a434d179985..b66511816dcb 100644 --- a/reportdesign/source/ui/misc/Undo.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 @@ -130,7 +130,7 @@ OSectionUndo::OSectionUndo(OReportModel& _rMod ,m_nSlot(_nSlot) ,m_bInserted(false) { - DBG_CTOR(rpt_OSectionUndo,NULL); + DBG_CTOR(rpt_OSectionUndo,NULL); } // ----------------------------------------------------------------------------- OSectionUndo::~OSectionUndo() @@ -160,19 +160,19 @@ OSectionUndo::~OSectionUndo() } } } - 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) ) @@ -262,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; } //---------------------------------------------------------------------------- @@ -294,7 +294,7 @@ String OGroupSectionUndo::GetComment() const try { uno::Reference< report::XSection > xSection = const_cast(this)->m_pMemberFunction(&const_cast(this)->m_aGroupHelper); - + if ( xSection.is() ) m_sName = xSection->getName(); } @@ -331,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,7 +340,7 @@ TYPEINIT1( OGroupUndo, OCommentUndoAction ); //---------------------------------------------------------------------------- OGroupUndo::OGroupUndo(OReportModel& _rMod ,USHORT nCommentID - ,Action _eAction + ,Action _eAction ,const uno::Reference< report::XGroup>& _xGroup ,const uno::Reference< report::XReportDefinition >& _xReportDefinition) : OCommentUndoAction(_rMod,nCommentID) @@ -387,7 +387,7 @@ void OGroupUndo::Undo() implReInsert(); break; } - + } //---------------------------------------------------------------------------- void OGroupUndo::Redo() diff --git a/reportdesign/source/ui/misc/rptuiservices.cxx b/reportdesign/source/ui/misc/rptuiservices.cxx index ee0fc6512c32..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 } }; } diff --git a/reportdesign/source/ui/misc/statusbarcontroller.cxx b/reportdesign/source/ui/misc/statusbarcontroller.cxx index a169c8279026..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; } // ----------------------------------------------------------------------------- @@ -111,11 +111,11 @@ void SAL_CALL OStatusbarController::initialize( const Sequence< Any >& _rArgumen } } if ( m_aCommandURL.equalsAscii(".uno:ZoomSlider") ) - { + { m_pController = TStatusbarHelper::createFromQuery(new SvxZoomSliderControl(m_nSlotId = SID_ATTR_ZOOMSLIDER,m_nId,*pStatusBar)); } // 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)); } diff --git a/reportdesign/source/ui/misc/toolboxcontroller.cxx b/reportdesign/source/ui/misc/toolboxcontroller.cxx index a009e4393de0..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 #include #include -#define ITEMID_COLOR 1 +#define ITEMID_COLOR 1 #define ITEMID_BRUSH 2 #define ITEMID_FONT 3 #define ITEMID_FONTHEIGHT 4 @@ -228,7 +228,7 @@ 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 ( USHORT i = 0; i < rTb.GetItemCount(); i++ ) diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx index 3e97c4e0f002..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(GetItemWindow(TASKPANE_ID))->getMinimumWidth(); + long nTaskPaneMinSplitSize = static_cast(GetItemWindow(TASKPANE_ID))->getMinimumWidth(); nTaskPaneMinSplitSize = static_cast(nTaskPaneMinSplitSize*100/nOutWidth); if ( !nTaskPaneMinSplitSize ) nTaskPaneMinSplitSize = START_SIZE_TASKPANE; @@ -114,7 +114,7 @@ public: long nReportSize = GetItemSize( REPORT_ID ); long nTaskPaneSize = GetItemSize( TASKPANE_ID ); - BOOL bMod = FALSE; + BOOL bMod = FALSE; if( nReportSize < nReportMinSplitSize ) { nReportSize = nReportMinSplitSize; @@ -157,7 +157,7 @@ ODesignView::ODesignView( Window* pParent, ,m_nCurrentPosition(USHRT_MAX) ,m_eActObj( OBJ_NONE ) ,m_bFirstDraw(FALSE) - ,m_aGridSizeCoarse( 1000, 1000 ) // #i93595# 100TH_MM changed to grid using coarse 1 cm grid + ,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(TRUE) ,m_bGridSnap(TRUE) @@ -281,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(0.1*aPlaygroundSize.Width()); diff --git a/reportdesign/source/ui/report/EndMarker.cxx b/reportdesign/source/ui/report/EndMarker.cxx index 92b6b716860f..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,16 +35,16 @@ #include -#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(TRUE); diff --git a/reportdesign/source/ui/report/FixedTextColor.cxx b/reportdesign/source/ui/report/FixedTextColor.cxx index 67c6829b75ec..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 @@ -73,7 +73,7 @@ namespace rptui // { // const StyleSettings& aStyleSettings = Application::GetSettings().GetStyleSettings(); // BOOL bHighContrast = aStyleSettings.GetHighContrastMode(); - // + // // Color aGetFaceColor = aStyleSettings.GetFaceColor(); // Color aGetCheckedColor = aStyleSettings.GetCheckedColor(); // Color aGetLightColor = aStyleSettings.GetLightColor(); @@ -118,11 +118,11 @@ namespace rptui // Color aGetHighlightLinkColor = aStyleSettings.GetHighlightLinkColor(); // Color aGetMonoColor = aStyleSettings.GetMonoColor(); // Color aGetActiveTabColor = aStyleSettings.GetActiveTabColor(); - // Color aGetInactiveTabColor = aStyleSettings.GetInactiveTabColor(); - // + // Color aGetInactiveTabColor = aStyleSettings.GetInactiveTabColor(); + // // Color aWindowColor = aStyleSettings.GetWindowColor(); // Color aLabelColor = aStyleSettings.GetLabelTextColor(); - // + // // // if (m_nTextColor == -1) // // { // // svtools::ExtendedColorConfig aConfig; @@ -130,14 +130,14 @@ namespace rptui // // } // return aLabelColor.GetColor(); // } - + //-------------------------------------------------------------------- FixedTextColor::~FixedTextColor() { DBG_DTOR(rpt_FixedTextColor,NULL); } // ----------------------------------------------------------------------------- - + void FixedTextColor::notifyPropertyChange( const beans::PropertyChangeEvent& _rEvent ) { // (void)_rEvent; @@ -160,7 +160,7 @@ namespace rptui DBG_UNHANDLED_EXCEPTION(); } } - + // ----------------------------------------------------------------------------- void FixedTextColor::setPropertyTextColor(const uno::Reference< awt::XVclWindowPeer >& _xVclWindowPeer, sal_Int32 _nTextColor) { @@ -172,7 +172,7 @@ namespace rptui { handle(_rxElement); } - + // ----------------------------------------------------------------------------- void FixedTextColor::handle( const uno::Reference< uno::XInterface >& _rxElement ) { @@ -188,9 +188,9 @@ namespace rptui sal_Bool bIsDark = sal_False; const sal_Int32 nBackColor( xFixedText->getControlBackground() ); if ((sal_uInt32)nBackColor == COL_TRANSPARENT) - { + { uno::Reference xSection(xFixedText->getParent(), uno::UNO_QUERY_THROW); - + sal_Bool bSectionBackColorIsTransparent = xSection->getBackTransparent(); if (bSectionBackColorIsTransparent) { @@ -210,8 +210,8 @@ namespace rptui { Color aLabelBackColor(nBackColor); bIsDark = aLabelBackColor.IsDark(); - } - + } + uno::Reference xVclWindowPeer = getVclWindowPeer(xFixedText); if (bIsDark) { @@ -224,25 +224,25 @@ namespace rptui util::Color aLabelColor = xFixedText->getCharColor(); setPropertyTextColor(xVclWindowPeer, aLabelColor); } - + } catch( const uno::Exception& ) { DBG_UNHANDLED_EXCEPTION(); } } - + // ----------------------------------------------------------------------------- // XPropertyChangeListener uno::Reference FixedTextColor::getXControl(const uno::Reference< report::XFixedText >& _xFixedText) throw(uno::RuntimeException) { - + uno::Reference xControl; OReportController *pController = (OReportController *)&m_rReportController; - + ::boost::shared_ptr pModel = pController->getSdrModel(); - + uno::Reference xSection(_xFixedText->getSection()); if ( xSection.is() ) { @@ -266,7 +266,7 @@ namespace rptui } return xControl; } - + // ----------------------------------------------------------------------------- uno::Reference FixedTextColor::getVclWindowPeer(const uno::Reference< report::XFixedText >& _xComponent) throw(uno::RuntimeException) { @@ -280,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 4cb76497d7f8..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,7 +146,7 @@ namespace rptui aFontDescriptorStructure.Slant = ::com::sun::star::awt::FontSlant_ITALIC; _xVclWindowPeer->setProperty(PROPERTY_FONTDESCRIPTOR, uno::makeAny(aFontDescriptorStructure)); } - + // ----------------------------------------------------------------------------- void FormattedFieldBeautifier::notifyPropertyChange( const beans::PropertyChangeEvent& _rEvent ) { @@ -156,7 +156,7 @@ namespace rptui setPlaceholderText( _rEvent.Source ); } - + // ----------------------------------------------------------------------------- void FormattedFieldBeautifier::handle( const uno::Reference< uno::XInterface >& _rxElement ) { @@ -168,17 +168,17 @@ namespace rptui { handle( _rxElement ); } - + // ----------------------------------------------------------------------------- uno::Reference FormattedFieldBeautifier::getVclWindowPeer(const uno::Reference< report::XReportComponent >& _xComponent) throw(uno::RuntimeException) - { + { uno::Reference xVclWindowPeer; ::boost::shared_ptr pModel = const_cast< OReportController& >( m_rReportController ).getSdrModel(); - + uno::Reference xSection(_xComponent->getSection()); if ( xSection.is() ) - { + { OReportPage *pPage = pModel->getPage(xSection); ULONG nIndex = pPage->getIndexOf(_xComponent); if (nIndex < pPage->GetObjCount() ) diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index 4b520a915a9a..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" @@ -373,7 +373,7 @@ void OReportController::disposing() pSectionWindow = getDesignView()->getMarkedSection(); if ( pSectionWindow ) pSectionWindow->getReportSection().deactivateOle(); - getUndoMgr()->Clear(); // clear all undo redo things + getUndoMgr()->Clear(); // clear all undo redo things if ( m_aReportModel ) listen(false); m_pReportControllerObserver->Clear(); @@ -1641,7 +1641,7 @@ 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; @@ -1703,8 +1703,8 @@ void OReportController::impl_initialize( ) if ( m_xReportDefinition.is() ) { //m_sName = m_xReportDefinition->getName(); - getView()->initialize(); // show the windows and fill with our informations - getUndoMgr()->Clear(); // clear all undo redo things + getView()->initialize(); // show the windows and fill with our informations + getUndoMgr()->Clear(); // clear all undo redo things getSdrModel(); if ( !m_aReportModel ) throw Exception(); @@ -1776,7 +1776,7 @@ void OReportController::impl_initialize( ) 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 @@ -1861,265 +1861,265 @@ void OReportController::describeSupportedFeatures() { 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: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() @@ -2429,16 +2429,16 @@ void OReportController::openPageDialog(const uno::Reference& _ // 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(); @@ -2463,8 +2463,8 @@ void OReportController::openPageDialog(const uno::Reference& _ 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 { @@ -2495,7 +2495,7 @@ void OReportController::openPageDialog(const uno::Reference& _ } } - { // 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()) { @@ -3594,7 +3594,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs) OUnoObject* pObj = dynamic_cast(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()); @@ -3642,7 +3642,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs) // this should never happen. // else // { - // DBG_ERROR("unhandled case."); + // DBG_ERROR("unhandled case."); // } } } @@ -3717,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) @@ -4275,8 +4275,8 @@ void OReportController::openZoomDialog() 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 pDescriptor(new SfxItemSet(*pPool, pRanges)); @@ -4291,7 +4291,7 @@ 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 ) diff --git a/reportdesign/source/ui/report/ReportControllerObserver.cxx b/reportdesign/source/ui/report/ReportControllerObserver.cxx index 45c389f94bef..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 @@ -78,7 +78,7 @@ public: ,m_bReadOnly(sal_False) { } - + OXReportControllerObserverImpl::~OXReportControllerObserverImpl() { } @@ -119,7 +119,7 @@ public: nEvent == VCLEVENT_WINDOW_RESIZE || nEvent == VCLEVENT_WINDOW_SHOW || nEvent == VCLEVENT_WINDOW_MOUSEMOVE || - nEvent == VCLEVENT_WINDOW_FRAMETITLECHANGED || + nEvent == VCLEVENT_WINDOW_FRAMETITLECHANGED || nEvent == VCLEVENT_WINDOW_HIDE || nEvent == VCLEVENT_EDIT_MODIFY || nEvent == VCLEVENT_SCROLLBAR_ENDSCROLL || @@ -136,18 +136,18 @@ public: return 0L; } */ - + if (nEvent == VCLEVENT_APPLICATION_DATACHANGED ) { DataChangedEvent* pData = reinterpret_cast(_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(); @@ -159,7 +159,7 @@ public: { uno::Reference xSection(xChild, uno::UNO_QUERY); if (xSection.is()) - { + { const sal_Int32 nCount = xSection->getCount(); for (sal_Int32 i = 0; i < nCount; ++i) { @@ -177,7 +177,7 @@ public: } } } - + return 0L; } @@ -196,14 +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) { @@ -214,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; } @@ -379,7 +379,7 @@ void OXReportControllerObserver::AddElement(const uno::Reference< uno::XInterfac 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() ) @@ -405,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 xParent(_xContainer->getParent(),uno::UNO_QUERY); diff --git a/reportdesign/source/ui/report/ReportRuler.cxx b/reportdesign/source/ui/report/ReportRuler.cxx index 2867f9fee662..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(); } //------------------------------------------------------------------------------ diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx index 875adf1118e3..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 & _xSection) +OReportSection::OReportSection(OSectionWindow* _pParent,const uno::Reference< report::XSection >& _xSection) : Window(_pParent,WB_DIALOGCONTROL) , ::comphelper::OPropertyChangeListener(m_aMutex) , DropTargetHelper(this) @@ -104,7 +104,7 @@ OReportSection::OReportSection(OSectionWindow* _pParent,const uno::Reference< re EnableChildTransparentMode(); SetHelpId(HID_REPORTSECTION); SetMapMode( MapMode( MAP_100TH_MM ) ); - + try { fill(); @@ -125,11 +125,11 @@ OReportSection::~OReportSection() //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(); - + { ::std::auto_ptr aTemp( m_pView); if ( m_pView ) @@ -227,7 +227,7 @@ void OReportSection::fill() const Fraction aY(aGridSizeFine.B()); m_pView->SetSnapGridWidth(aX, aY); - m_pView->SetGridSnap( pDesignView->isGridSnap() ); + m_pView->SetGridSnap( pDesignView->isGridSnap() ); m_pView->SetGridFront( FALSE ); m_pView->SetDragStripes( TRUE ); m_pView->SetPageVisible(); @@ -244,7 +244,7 @@ void OReportSection::fill() // LLA: TODO // m_pPage->SetUppBorder(-10000); - m_pView->SetDesignMode( TRUE ); + m_pView->SetDesignMode( TRUE ); m_pView->StartListening( *m_pModel ); /*Resize();*/ @@ -290,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 ); @@ -354,16 +354,16 @@ 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; @@ -379,7 +379,7 @@ void OReportSection::Copy(uno::Sequence< beans::NamedValue >& _rAllreadyCopiedOb aCopies.reserve(nMark); SdrUndoFactory& rUndo = m_pView->GetModel()->GetSdrUndoFactory(); - + for( ULONG i = nMark; i > 0; ) { --i; @@ -452,13 +452,13 @@ 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& _rFrame,BOOL _bHiContrast) @@ -506,9 +506,9 @@ void OReportSection::Command( const CommandEvent& _rCEvt ) BOOL bHiContrast = rSettings.GetHighContrastMode(); OReportController& rController = m_pParent->getViewsWindow()->getView()->getReportView()->getController(); uno::Reference 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,bHiContrast); Point aPos = _rCEvt.GetMousePosPixel(); @@ -595,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); @@ -616,7 +616,7 @@ void OReportSection::_propertyChanged(const beans::PropertyChangeEvent& _rEvent) Resize(); } - } + } } //------------------------------------------------------------------------------ sal_Bool OReportSection::handleKeyEvent(const KeyEvent& _rEvent) @@ -662,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, @@ -779,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; @@ -827,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(); } // if ( !bMultipleFormat ) - else + else aValues = ::svx::OMultiColumnTransferable::extractDescriptor(aDropped); - + beans::PropertyValue* pIter = aValues.getArray(); beans::PropertyValue* pEnd = pIter + aValues.getLength(); for(;pIter != pEnd; ++pIter) @@ -846,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 cd9363e05d57..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 -#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(); @@ -103,7 +103,7 @@ void OReportWindow::initialize() //---------------------------------------------------------------------------- void OReportWindow::SetInsertObj( USHORT eObj,const ::rtl::OUString& _sShapeType ) { - m_aViewsWindow.SetInsertObj( eObj,_sShapeType); + m_aViewsWindow.SetInsertObj( eObj,_sShapeType); } //---------------------------------------------------------------------------- @@ -114,7 +114,7 @@ rtl::OUString OReportWindow::GetInsertObjString() const //------------------------------------------------------------------------------ void OReportWindow::SetMode( DlgEdMode eNewMode ) { - m_aViewsWindow.SetMode(eNewMode); + m_aViewsWindow.SetMode(eNewMode); } //---------------------------------------------------------------------------- void OReportWindow::removeSection(USHORT _nPosition) @@ -129,9 +129,9 @@ void OReportWindow::addSection(const uno::Reference< report::XSection >& _xSecti { if ( !_xSection.is() ) return; - - m_aViewsWindow.addSection(_xSection,_sColorEntry,_nPosition); - + + m_aViewsWindow.addSection(_xSection,_sColorEntry,_nPosition); + m_pParent->setTotalSize(GetTotalWidth(),GetTotalHeight()); } //------------------------------------------------------------------------------ @@ -143,7 +143,7 @@ void OReportWindow::toggleGrid(sal_Bool _bVisible) void OReportWindow::showRuler(sal_Bool _bShow) { m_aHRuler.Show(_bShow); - + m_aViewsWindow.showRuler(_bShow); } //------------------------------------------------------------------------------ @@ -157,7 +157,7 @@ sal_Int32 OReportWindow::getMaxMarkerWidth(sal_Bool _bWithEnd) const } //------------------------------------------------------------------------------ sal_Int32 OReportWindow::GetTotalWidth() const -{ +{ sal_Int32 nWidth = 0; if ( !m_aViewsWindow.empty() ) { @@ -170,7 +170,7 @@ sal_Int32 OReportWindow::GetTotalWidth() const const Size aPageSize = LogicToPixel(Size(aPaperWidth,0)); nWidth = aPageSize.Width() + long(aStartWidth); } - return nWidth; + return nWidth; } //------------------------------------------------------------------------------ void OReportWindow::Resize() @@ -200,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)); } } @@ -227,7 +227,7 @@ void OReportWindow::DataChanged( const DataChangedEvent& rDCEvt ) if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) ) { - ImplInitSettings(); + ImplInitSettings(); Invalidate(); } } @@ -269,19 +269,19 @@ BOOL OReportWindow::HasSelection() const //---------------------------------------------------------------------------- void OReportWindow::Delete() { - + m_aViewsWindow.Delete(); } //---------------------------------------------------------------------------- void OReportWindow::Copy() -{ - +{ + m_aViewsWindow.Copy(); } //---------------------------------------------------------------------------- void OReportWindow::Paste() { - + m_aViewsWindow.Paste(); } //---------------------------------------------------------------------------- @@ -292,13 +292,13 @@ BOOL OReportWindow::IsPasteAllowed() const //----------------------------------------------------------------------------- void OReportWindow::SelectAll(const sal_uInt16 _nObjectType) { - + m_aViewsWindow.SelectAll(_nObjectType); } //----------------------------------------------------------------------------- void OReportWindow::unmarkAllObjects(OSectionView* _pSectionView) { - + m_aViewsWindow.unmarkAllObjects(_pSectionView); } //----------------------------------------------------------------------------- @@ -321,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); } //----------------------------------------------------------------------------- @@ -341,33 +341,33 @@ 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& _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(BOOL bOn) { - + m_aViewsWindow.setGridSnap(bOn); } // ----------------------------------------------------------------------------- @@ -388,13 +388,13 @@ void OReportWindow::zoom(const Fraction& _aZoom) //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); } // ----------------------------------------------------------------------------- @@ -437,10 +437,10 @@ sal_uInt16 OReportWindow::getZoomFactor(SvxZoomType _eType) const 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 82988a764f99..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 ); @@ -96,7 +96,7 @@ void OScrollWindowHelper::impl_initScrollBar( ScrollBar& _rScrollBar ) const //_rScrollBar.SetMapMode( MapMode( MAP_100TH_MM ) ); _rScrollBar.SetScrollHdl( LINK( this, OScrollWindowHelper, ScrollHdl ) ); - _rScrollBar.SetLineSize( SCR_LINE_SIZE ); + _rScrollBar.SetLineSize( SCR_LINE_SIZE ); } // ----------------------------------------------------------------------------- @@ -104,7 +104,7 @@ void OScrollWindowHelper::initialize() { uno::Reference xReportDefinition = m_pParent->getController().getReportDefinition(); m_pReportDefintionMultiPlexer = addStyleListener(xReportDefinition,this); - + m_aReportWindow.initialize(); } //------------------------------------------------------------------------------ @@ -118,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(); } //------------------------------------------------------------------------------ @@ -134,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; @@ -149,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; @@ -175,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); @@ -250,7 +250,7 @@ void OScrollWindowHelper::Delete() } //---------------------------------------------------------------------------- void OScrollWindowHelper::Copy() -{ +{ m_aReportWindow.Copy(); } //---------------------------------------------------------------------------- @@ -314,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); } @@ -332,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; } @@ -371,7 +371,7 @@ void OScrollWindowHelper::DataChanged( const DataChangedEvent& rDCEvt ) if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) ) { - ImplInitSettings(); + ImplInitSettings(); Invalidate(); } } diff --git a/reportdesign/source/ui/report/SectionView.cxx b/reportdesign/source/ui/report/SectionView.cxx index b0c9a080ea3a..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 @@ -64,7 +64,7 @@ OSectionView::OSectionView( SdrModel* pModel, OReportSection* _pSectionWindow, O OSectionView::~OSectionView() { - DBG_DTOR( rpt_OSectionView,NULL); + DBG_DTOR( rpt_OSectionView,NULL); } //---------------------------------------------------------------------------- @@ -73,7 +73,7 @@ void OSectionView::MarkListHasChanged() { DBG_CHKTHIS( rpt_OSectionView,NULL); SdrView::MarkListHasChanged(); - + if ( m_pReportWindow && m_pSectionWindow && !m_pSectionWindow->getPage()->getSpecialMode() ) { //m_pReportWindow->unmarkAllObjects(this); // WHY @@ -183,8 +183,8 @@ 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(); @@ -210,7 +210,7 @@ void OSectionView::SetMarkedToLayer( SdrLayerID _nLayerNo ) EndUndo(); - // #84073# check mark list now instead of later in a timer + // #84073# check mark list now instead of later in a timer CheckMarked(); MarkListHasChanged(); } diff --git a/reportdesign/source/ui/report/SectionWindow.cxx b/reportdesign/source/ui/report/SectionWindow.cxx index 0a829c73f01e..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,7 +108,7 @@ OSectionWindow::OSectionWindow( OViewsWindow* _pParent,const uno::Reference< rep aEvent.Source = xGroup; aEvent.PropertyName = PROPERTY_EXPRESSION; } - + _propertyChanged(aEvent); SetPaintTransparent(TRUE); } @@ -125,7 +125,7 @@ OSectionWindow::~OSectionWindow() } catch (uno::Exception&) { - } + } } // ----------------------------------------------------------------------------- void OSectionWindow::_propertyChanged(const beans::PropertyChangeEvent& _rEvent) throw( uno::RuntimeException) @@ -152,7 +152,7 @@ void OSectionWindow::_propertyChanged(const beans::PropertyChangeEvent& _rEvent) 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)) ) @@ -223,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(); @@ -246,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(); @@ -331,13 +331,13 @@ void OSectionWindow::zoom(const Fraction& _aZoom) IMPL_LINK( OSectionWindow, StartSplitHdl, Splitter*, ) { const String sEmpty(ModuleRes(RID_STR_UNDO_CHANGE_SIZE)); - getViewsWindow()->getView()->getReportView()->getController().getUndoMgr()->EnterListAction(sEmpty,String()); + getViewsWindow()->getView()->getReportView()->getController().getUndoMgr()->EnterListAction(sEmpty,String()); return 0L; } //------------------------------------------------------------------------------ IMPL_LINK( OSectionWindow, EndSplitHdl, Splitter*, ) { - getViewsWindow()->getView()->getReportView()->getController().getUndoMgr()->LeaveListAction(); + getViewsWindow()->getView()->getReportView()->getController().getUndoMgr()->LeaveListAction(); /*getViewsWindow()->Resize();*/ return 0L; } @@ -351,12 +351,12 @@ 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) { @@ -404,10 +404,10 @@ void OSectionWindow::scrollChildren(long _nX) //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 da2e56a178e8..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,18 +42,18 @@ #include #include -#define CORNER_SPACE 5 +#define CORNER_SPACE 5 //===================================================================== namespace rptui { //===================================================================== -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; +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 ) // ----------------------------------------------------------------------------- @@ -89,7 +89,7 @@ OStartMarker::OStartMarker(OSectionWindow* _pParent,const ::rtl::OUString& _sCol // ----------------------------------------------------------------------------- OStartMarker::~OStartMarker() { - DBG_DTOR( rpt_OStartMarker,NULL); + DBG_DTOR( rpt_OStartMarker,NULL); if ( osl_decrementInterlockedCount(&s_nImageRefCount) == 0 ) { DELETEZ(s_pDefCollapsed); @@ -168,7 +168,7 @@ void OStartMarker::MouseButtonUp( const MouseEvent& rMEvt ) { if ( !rMEvt.IsLeft() ) return; - + Point aPos( rMEvt.GetPosPixel()); const Size aOutputSize = GetOutputSizePixel(); @@ -178,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); @@ -209,7 +209,7 @@ void OStartMarker::initDefaultNodeImages() s_pDefExpandedHC = new Image( ModuleRes( RID_IMG_TREENODE_EXPANDED_HC ) ); } - Image* pImage = NULL; + Image* pImage = NULL; if ( GetSettings().GetStyleSettings().GetHighContrastMode() ) { pImage = m_bCollapsed ? s_pDefCollapsedHC : s_pDefExpandedHC; @@ -236,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(); @@ -305,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 8571adceb816..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 @@ -68,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; @@ -87,7 +87,7 @@ bool lcl_getNewRectSize(const Rectangle& _aObjRect,long& _nXMov, long& _nYMov,Sd break; } if ( dynamic_cast(_pObj) ) - { + { pOverlappedObj = isOver(aNewRect,*_pObj->GetPage(),*_pView,true,_pObj); if ( pOverlappedObj && _pObj != pOverlappedObj ) { @@ -97,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: @@ -164,7 +164,7 @@ bool lcl_getNewRectSize(const Rectangle& _aObjRect,long& _nXMov, long& _nYMov,Sd default: break; } - + _nXMov = nXTemp; _nYMov = nYTemp; } @@ -179,7 +179,7 @@ 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) @@ -202,7 +202,7 @@ OViewsWindow::~OViewsWindow() // ----------------------------------------------------------------------------- void OViewsWindow::initialize() { - + } // ----------------------------------------------------------------------------- void OViewsWindow::impl_resizeSectionWindow(OSectionWindow& _rSectionWindow,Point& _rStartPoint,bool _bSet) @@ -211,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,7 +241,7 @@ void OViewsWindow::resize(const OSectionWindow& _rSectionWindow) aStartPoint = pSectionWindow->GetPosPixel(); bSet = true; } // if ( pSectionWindow.get() == &_rSectionWindow ) - + if ( bSet ) { impl_resizeSectionWindow(*pSectionWindow.get(),aStartPoint,bSet); @@ -255,18 +255,18 @@ void OViewsWindow::resize(const OSectionWindow& _rSectionWindow) 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 (USHORT nPos=0;aIter != aEnd ; ++aIter,++nPos) @@ -280,21 +280,21 @@ void OViewsWindow::Resize() 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() ); @@ -330,7 +330,7 @@ void OViewsWindow::removeSection(USHORT _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() ) @@ -389,7 +389,7 @@ BOOL OViewsWindow::HasSelection() const TSectionsMap::const_iterator aEnd = m_aSections.end(); for (;aIter != aEnd && !(*aIter)->getReportSection().getSectionView().AreObjectsMarked(); ++aIter) ; - return aIter != aEnd; + return aIter != aEnd; } //---------------------------------------------------------------------------- void OViewsWindow::Delete() @@ -416,7 +416,7 @@ void OViewsWindow::Copy() } //---------------------------------------------------------------------------- void OViewsWindow::Paste() -{ +{ TransferableDataHelper aTransferData(TransferableDataHelper::CreateFromSystemClipboard(this)); OReportExchange::TSectionElements aCopies = OReportExchange::extractCopies(aTransferData); if ( aCopies.getLength() > 1 ) @@ -445,7 +445,7 @@ void OViewsWindow::Paste() break; } } - + return pSectionWindow; } @@ -455,7 +455,7 @@ void OViewsWindow::Paste() ::boost::shared_ptr 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() ) @@ -464,7 +464,7 @@ void OViewsWindow::Paste() { pRet = (*aIter); break; - } + } else if ( nsa == PREVIOUS ) { if (nCurrentPosition > 0) @@ -503,11 +503,11 @@ void OViewsWindow::Paste() } // ( (*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); @@ -547,10 +547,10 @@ void OViewsWindow::unmarkAllObjects(OSectionView* _pSectionView) } //----------------------------------------------------------------------------- /* -::boost::shared_ptr OViewsWindow::getReportSection(const uno::Reference< report::XSection >& _xSection) +::boost::shared_ptr OViewsWindow::getReportSection(const uno::Reference< report::XSection >& _xSection) { OSL_ENSURE(_xSection.is(),"Section is NULL!"); - ::boost::shared_ptr pRet; + ::boost::shared_ptr pRet; TSectionsMap::iterator aIter = m_aSections.begin(); TSectionsMap::iterator aEnd = m_aSections.end(); for (; aIter != aEnd ; ++aIter) @@ -609,7 +609,7 @@ void OViewsWindow::MouseButtonUp( const MouseEvent& rMEvt ) for (aIter = m_aSections.begin();aIter != aEnd ; ++aIter) { (*aIter)->getReportSection().getPage()->resetSpecialMode(); - } + } } } //------------------------------------------------------------------------------ @@ -676,7 +676,7 @@ void OViewsWindow::setMarked(const uno::Sequence< uno::Reference< report::XRepor bFirst = false; m_pParent->setMarked(xSection,_bMark); } - ::boost::shared_ptr pSectionWindow = getSectionWindow(xSection); + ::boost::shared_ptr pSectionWindow = getSectionWindow(xSection); if ( pSectionWindow ) { SvxShape* pShape = SvxShape::getImplementation( *pIter ); @@ -700,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(); @@ -745,7 +745,7 @@ void OViewsWindow::collectBoundResizeRect(const TRectangleMap& _rSortRectangles, const SdrObject* pObj = aRectIter->second.first; pObj->TakeObjInfo(aInfo); BOOL bHasFixed = !aInfo.bMoveAllowed || pObj->IsMoveProtect(); - if ( bHasFixed ) + if ( bHasFixed ) _rBound.Union(aObjRect); else { @@ -765,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()); } } @@ -784,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; @@ -793,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 xSection = (*m_aSections.begin())->getReportSection().getSection(); uno::Reference xReportDefinition = xSection->getReportDefinition(); aRefPoint = Rectangle(getStyleProperty(xReportDefinition,PROPERTY_LEFTMARGIN),0, @@ -806,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); @@ -825,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(&Rectangle::Top); aRefFun = ::std::mem_fun(&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(&Rectangle::Right); aRefFun = ::std::mem_fun(&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(&Rectangle::Left); aRefFun = ::std::mem_fun(&Rectangle::Right); break; @@ -883,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); @@ -924,7 +924,7 @@ void OViewsWindow::alignMarkedObjects(sal_Int32 _nControlModification,bool _bAli } } break; - default: + default: break; } } @@ -978,7 +978,7 @@ USHORT OViewsWindow::getPosition(const OSectionWindow* _pSectionWindow) const ::boost::shared_ptr OViewsWindow::getSectionWindow(const USHORT _nPos) const { ::boost::shared_ptr aReturn; - + if ( _nPos < m_aSections.size() ) aReturn = m_aSections[_nPos]; @@ -1013,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 ); @@ -1030,11 +1030,11 @@ namespace rView.ForceMarkedToAnotherPage(); break; case eBreakAction: - if ( rView.IsAction() ) - rView.BrkAction ( ); + if ( rView.IsAction() ) + rView.BrkAction ( ); break; // default: - + } } }; @@ -1057,11 +1057,11 @@ 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("Temp Label"))); SdrObject *pNewObj = new SdrUnoObj(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FixedText"))); if (pNewObj) { @@ -1093,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(); @@ -1104,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; @@ -1126,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(); @@ -1145,10 +1145,10 @@ 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 + + // 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) @@ -1156,7 +1156,7 @@ void OViewsWindow::BegDragObj(const Point& _aPnt, SdrHdl* _pHdl,const OSectionVi // if (m_aDragDelta.Y() > nDeltaY) // m_aDragDelta.Y() = nDeltaY; } - } + } } ++nViewCount; Rectangle aClipRect = rView.GetWorkArea(); @@ -1169,7 +1169,7 @@ void OViewsWindow::BegDragObj(const Point& _aPnt, SdrHdl* _pHdl,const OSectionVi // 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; @@ -1247,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 ) { @@ -1376,7 +1376,7 @@ void OViewsWindow::EndDragObj(BOOL _bControlKeyPressed, const OSectionView* _pSe aNewPos.X() = nLeftMargin; if ( aNewPos.Y() < 0 ) aNewPos.Y() = 0; - + Point aPrevious; for (; pIter != pEnd; ++pIter) { @@ -1496,7 +1496,7 @@ void OViewsWindow::MovAction(const Point& _aPnt,const OSectionView* _pSection,bo aPosForWorkArea.Y() += nSectionHeight; // aNewPos.Y() += PixelToLogic(aIter->second.second->GetSizePixel()).Height(); } - + for (aIter = m_aSections.begin(); aIter != aEnd; ++aIter) { @@ -1628,7 +1628,7 @@ void OViewsWindow::handleKey(const KeyCode& _rCode) SdrMark* pMark = rMarkList.GetMark(i); bCheck = dynamic_cast(pMark->GetMarkedSdrObj()) != NULL; } - + if ( bCheck && isOver(aMarkRect,*rReportSection.getPage(),rView) ) break; } @@ -1673,7 +1673,7 @@ void OViewsWindow::handleKey(const KeyCode& _rCode) if ( bCheck ) aNewRect.Union(pMark->GetMarkedSdrObj()->GetLastBoundRect()); } - + switch(pHdl->GetKind()) { case HDL_LEFT: @@ -1696,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 ); @@ -1748,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(); @@ -1765,11 +1765,11 @@ void OViewsWindow::zoom(const Fraction& _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_NOERASE | */INVALIDATE_NOCHILDREN /*| INVALIDATE_TRANSPARENT*/); } @@ -1783,7 +1783,7 @@ 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())); 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 1ca2e5cadbee..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 ) diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx b/reportdesign/source/ui/report/dlgedfunc.cxx index 10fdbce9a06e..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,13 +87,13 @@ 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(); @@ -320,7 +320,7 @@ sal_Bool DlgEdFunc::handleKeyEvent(const KeyEvent& _rEvent) else m_pParent->getSectionWindow()->getViewsWindow()->unmarkAllObjects(NULL); //m_rView.UnmarkAll(); - + deactivateOle(true); bReturn = FALSE; } @@ -413,7 +413,7 @@ void DlgEdFunc::activateOle(SdrObject* _pObj) { const UINT16 nSdrObjKind = _pObj->GetObjIdentifier(); // - // OLE: activate + // OLE: activate // if (nSdrObjKind == OBJ_OLE2) { @@ -533,7 +533,7 @@ bool DlgEdFunc::isOverlapping(const MouseEvent& rMEvt) { unColorizeOverlappedObj(); } - + return bOverlapping; } // ----------------------------------------------------------------------------- @@ -614,11 +614,11 @@ bool DlgEdFunc::isRectangleHit(const MouseEvent& rMEvt) 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(pObjIter) != NULL ) { Rectangle aNewRect = pObjIter->GetLastBoundRect(); @@ -633,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) @@ -731,7 +731,7 @@ BOOL DlgEdFuncInsert::MouseButtonDown( const MouseEvent& rMEvt ) m_pParent->getSectionWindow()->getViewsWindow()->BegMarkObj( m_aMDPos,&m_rView ); } - return TRUE; + return TRUE; } //---------------------------------------------------------------------------- @@ -740,7 +740,7 @@ BOOL DlgEdFuncInsert::MouseButtonUp( const MouseEvent& rMEvt ) if ( DlgEdFunc::MouseButtonUp( rMEvt ) ) return TRUE; - const Point aPos( m_pParent->PixelToLogic( rMEvt.GetPosPixel() ) ); + const Point aPos( m_pParent->PixelToLogic( rMEvt.GetPosPixel() ) ); const USHORT nHitLog = USHORT ( m_pParent->PixelToLogic(Size(3,0)).Width() ); BOOL bReturn = TRUE; @@ -754,7 +754,7 @@ BOOL DlgEdFuncInsert::MouseButtonUp( const MouseEvent& rMEvt ) m_rView.SetCreateMode( TRUE ); return TRUE; } - + m_rView.EndCreateObj(SDRCREATE_FORCEEND); if ( !m_rView.AreObjectsMarked() ) @@ -781,7 +781,7 @@ 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 && @@ -803,7 +803,7 @@ BOOL DlgEdFuncInsert::MouseMove( const MouseEvent& rMEvt ) { if ( DlgEdFunc::MouseMove(rMEvt ) ) return TRUE; - Point aPos( m_pParent->PixelToLogic( rMEvt.GetPosPixel() ) ); + Point aPos( m_pParent->PixelToLogic( rMEvt.GetPosPixel() ) ); if ( m_rView.IsCreateObj() ) { @@ -856,7 +856,7 @@ BOOL DlgEdFuncSelect::MouseButtonDown( const MouseEvent& rMEvt ) m_bSelectionMode = false; if ( DlgEdFunc::MouseButtonDown(rMEvt) ) return TRUE; - + SdrViewEvent aVEvt; const SdrHitKind eHit = m_rView.PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt); if( eHit == SDRHIT_UNMARKEDOBJECT ) @@ -913,7 +913,7 @@ 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; @@ -962,8 +962,8 @@ BOOL DlgEdFuncSelect::MouseMove( const MouseEvent& rMEvt ) 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) ); @@ -978,141 +978,141 @@ BOOL DlgEdFuncSelect::MouseMove( const MouseEvent& rMEvt ) //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); +// SdrPageView* pPV = m_rView.GetSdrPageView(); +// if( _pTextObj && _pTextObj->GetPage() == pPV->GetPage() ) +// { +// m_rView.SetCurrentObj(OBJ_TEXT); +// m_rView.SetEditMode(SDREDITMODE_EDIT); // -// BOOL bEmptyOutliner = FALSE; +// BOOL bEmptyOutliner = FALSE; // -// if (!_pTextObj->GetOutlinerParaObject() && m_rView.GetTextEditOutliner()) -// { -// ::SdrOutliner* pOutl = m_rView.GetTextEditOutliner(); -// ULONG nParaAnz = pOutl->GetParagraphCount(); -// Paragraph* p1stPara = pOutl->GetParagraph( 0 ); +// 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 (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 (_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) +// 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; +// 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; +// nCntrl &= ~EE_CNTRL_ULSPACESUMMATION; +// //if ( pModel->IsSummationOfParagraphs() ) +// // nCntrl |= EE_CNTRL_ULSPACESUMMATION; // -// //SetSpellOptions( nCntrl ); +// //SetSpellOptions( nCntrl ); // -// pOutl->SetControlWord(nCntrl); +// pOutl->SetControlWord(nCntrl); // // uno::Reference< linguistic2::XSpellChecker1 > xSpellChecker( LinguMgr::GetSpellChecker() ); -// if ( xSpellChecker.is() ) -// pOutl->SetSpeller( xSpellChecker ); +// if ( xSpellChecker.is() ) +// pOutl->SetSpeller( xSpellChecker ); // // uno::Reference< linguistic2::XHyphenator > xHyphenator( LinguMgr::GetHyphenator() ); -// if( xHyphenator.is() ) -// pOutl->SetHyphenator( xHyphenator ); +// if( xHyphenator.is() ) +// pOutl->SetHyphenator( xHyphenator ); // -// pOutl->SetDefaultLanguage( Application::GetSettings().GetLanguage() ); +// 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); -// } +// // 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 (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( _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(); +// if (m_rView.SdrBeginTextEdit(_pTextObj, pPV, pParent, sal_True, pOutl) && _pTextObj->GetObjInventor() == SdrInventor) +// { +// //bFirstObjCreated = TRUE; +// //DeleteDefaultText(); // -// OutlinerView* pOLV = m_rView.GetTextEditOutlinerView(); +// OutlinerView* pOLV = m_rView.GetTextEditOutlinerView(); // -// nSdrObjKind = _pTextObj->GetObjIdentifier(); +// nSdrObjKind = _pTextObj->GetObjIdentifier(); // -// SdrViewEvent aVEvt; -// SdrHitKind eHit = m_rView.PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt); +// 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 (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; +// 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/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx index ac36078ff3cf..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); @@ -159,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() ) { @@ -199,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(); @@ -235,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; } //---------------------------------------------------------------------------- @@ -311,7 +311,7 @@ uno::Sequence< Reference > 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 OSL_ENSURE( sal_False, "FmPropBrw::StateChanged: caught an exception while setting the initial page!" ); } - //Resize(); + //Resize(); } SetText( GetHeadlineName(_aObjects) ); } @@ -583,7 +583,7 @@ 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) ); } @@ -604,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 4a84f7bd034d..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 @@ -353,13 +353,13 @@ Menu RID_MENU_REPORT }; MenuItem { - Identifier = SID_ARRANGEMENU ; - HelpID = 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 { @@ -367,13 +367,13 @@ Menu RID_MENU_REPORT }; MenuItem { - Identifier = SID_FRAME_UP ; - HelpID = SID_FRAME_UP ; + Identifier = SID_FRAME_UP ; + HelpID = SID_FRAME_UP ; Text [ en-US ] = "Bring ~Forward" ; }; MenuItem { - Identifier = SID_FRAME_DOWN ; + Identifier = SID_FRAME_DOWN ; HelpID = SID_FRAME_DOWN ; Text [ en-US ] = "Send Back~ward" ; }; @@ -401,7 +401,7 @@ Menu RID_MENU_REPORT ITEM_FORMAT_OBJECT_ALIGN SubMenu = Menu { - ItemList = + ItemList = { MenuItem { @@ -441,14 +441,14 @@ Menu RID_MENU_REPORT MenuItem { - Identifier = SID_OBJECT_RESIZING ; - Command = ".uno:ObjectResize" ; - HelpID = SID_OBJECT_RESIZING ; + 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 { @@ -496,14 +496,14 @@ Menu RID_MENU_REPORT }; MenuItem { - Identifier = SID_SECTION_SHRINK_MENU ; - Command = ".uno:SectionShrinkMenu" ; - HelpID = SID_SECTION_SHRINK_MENU ; + 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 { 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 @@ - - - + + + - - - - - - + + + + + + - - + + \ 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 @@ - - - + + + - - - - + + + + \ 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 @@ - - - + + + - - - - - - + + + + + + - - - - + + + + \ 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 @@ - + 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 @@ - - - + + + \ No newline at end of file diff --git a/reportdesign/util/hidother.src b/reportdesign/util/hidother.src index f7e08f34442e..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 @@ -32,42 +32,42 @@ #include #endif -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 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 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 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 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 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; }; @@ -120,14 +120,14 @@ hidspecial HID_RPT_PROP_CONTROLBACKGROUNDTRANSPARENT { HelpId = HID_RPT_PROP_ 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; }; @@ -162,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; }; -- cgit