diff options
Diffstat (limited to 'extensions/source/dbpilots')
28 files changed, 457 insertions, 457 deletions
diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx index 8554dc52500f..4ec5568481db 100644 --- a/extensions/source/dbpilots/commonpagesdbp.cxx +++ b/extensions/source/dbpilots/commonpagesdbp.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,13 +69,13 @@ namespace dbp //--------------------------------------------------------------------- OTableSelectionPage::OTableSelectionPage(OControlWizard* _pParent) :OControlWizardPage(_pParent, ModuleRes(RID_PAGE_TABLESELECTION)) - ,m_aData (this, ModuleRes(FL_DATA)) - ,m_aExplanation (this, ModuleRes(FT_EXPLANATION)) - ,m_aDatasourceLabel (this, ModuleRes(FT_DATASOURCE)) - ,m_aDatasource (this, ModuleRes(LB_DATASOURCE)) - ,m_aSearchDatabase (this, ModuleRes(PB_FORMDATASOURCE)) - ,m_aTableLabel (this, ModuleRes(FT_TABLE)) - ,m_aTable (this, ModuleRes(LB_TABLE)) + ,m_aData (this, ModuleRes(FL_DATA)) + ,m_aExplanation (this, ModuleRes(FT_EXPLANATION)) + ,m_aDatasourceLabel (this, ModuleRes(FT_DATASOURCE)) + ,m_aDatasource (this, ModuleRes(LB_DATASOURCE)) + ,m_aSearchDatabase (this, ModuleRes(PB_FORMDATASOURCE)) + ,m_aTableLabel (this, ModuleRes(FT_TABLE)) + ,m_aTable (this, ModuleRes(LB_TABLE)) { FreeResource(); @@ -234,7 +234,7 @@ namespace dbp IMPL_LINK( OTableSelectionPage, OnListboxSelection, ListBox*, _pBox ) { if (&m_aDatasource == _pBox) - { // new data source selected + { // new data source selected implFillTables(); } else @@ -296,7 +296,7 @@ namespace dbp } if (m_xDSContext->getByName(sCurrentDatasource) >>= xDatasource) - { // connect + { // connect // get the default SDB interaction handler Reference< XInteractionHandler > xHandler = getDialog()->getInteractionHandler(this); if (!xHandler.is() ) @@ -353,7 +353,7 @@ namespace dbp if ( aSQLException.hasValue() ) - { // an SQLException (or derivee) was thrown ... + { // an SQLException (or derivee) was thrown ... Reference< XInteractionRequest > xRequest = new OInteractionRequest(aSQLException); try { @@ -466,12 +466,12 @@ namespace dbp //--------------------------------------------------------------------- ODBFieldPage::ODBFieldPage( OControlWizard* _pParent ) :OMaybeListSelectionPage(_pParent, ModuleRes(RID_PAGE_OPTION_DBFIELD)) - ,m_aFrame (this, ModuleRes(FL_DATABASEFIELD_EXPL)) - ,m_aDescription (this, ModuleRes(FT_DATABASEFIELD_EXPL)) - ,m_aQuestion (this, ModuleRes(FT_DATABASEFIELD_QUEST)) - ,m_aStoreYes (this, ModuleRes(RB_STOREINFIELD_YES)) - ,m_aStoreNo (this, ModuleRes(LB_STOREINFIELD)) - ,m_aStoreWhere (this, ModuleRes(RB_STOREINFIELD_NO)) + ,m_aFrame (this, ModuleRes(FL_DATABASEFIELD_EXPL)) + ,m_aDescription (this, ModuleRes(FT_DATABASEFIELD_EXPL)) + ,m_aQuestion (this, ModuleRes(FT_DATABASEFIELD_QUEST)) + ,m_aStoreYes (this, ModuleRes(RB_STOREINFIELD_YES)) + ,m_aStoreNo (this, ModuleRes(LB_STOREINFIELD)) + ,m_aStoreWhere (this, ModuleRes(RB_STOREINFIELD_NO)) { FreeResource(); announceControls(m_aStoreYes, m_aStoreNo, m_aStoreWhere); @@ -501,7 +501,7 @@ namespace dbp } //......................................................................... -} // namespace dbp +} // namespace dbp //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/dbpilots/commonpagesdbp.hxx b/extensions/source/dbpilots/commonpagesdbp.hxx index 7dd210de79e4..bdeb59fff3ec 100644 --- a/extensions/source/dbpilots/commonpagesdbp.hxx +++ b/extensions/source/dbpilots/commonpagesdbp.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,13 +45,13 @@ namespace dbp class OTableSelectionPage : public OControlWizardPage { protected: - FixedLine m_aData; - FixedText m_aExplanation; - FixedText m_aDatasourceLabel; - ListBox m_aDatasource; - PushButton m_aSearchDatabase; - FixedText m_aTableLabel; - ListBox m_aTable; + FixedLine m_aData; + FixedText m_aExplanation; + FixedText m_aDatasourceLabel; + ListBox m_aDatasource; + PushButton m_aSearchDatabase; + FixedText m_aTableLabel; + ListBox m_aTable; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xDSContext; @@ -64,8 +64,8 @@ namespace dbp void ActivatePage(); // OWizardPage overridables - virtual void initializePage(); - virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ); + virtual void initializePage(); + virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ); protected: DECL_LINK( OnListboxSelection, ListBox* ); @@ -73,7 +73,7 @@ namespace dbp DECL_LINK( OnSearchClicked, PushButton* ); void implCollectDatasource(); - void implFillTables(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& + void implFillTables(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConn = ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >()); // OControlWizardPage overridables @@ -86,9 +86,9 @@ namespace dbp class OMaybeListSelectionPage : public OControlWizardPage { protected: - RadioButton* m_pYes; - RadioButton* m_pNo; - ListBox* m_pList; + RadioButton* m_pYes; + RadioButton* m_pNo; + ListBox* m_pList; public: OMaybeListSelectionPage( OControlWizard* _pParent, const ResId& _rId ); @@ -100,7 +100,7 @@ namespace dbp void ActivatePage(); // own helper - void announceControls( + void announceControls( RadioButton& _rYesButton, RadioButton& _rNoButton, ListBox& _rSelection); @@ -117,12 +117,12 @@ namespace dbp class ODBFieldPage : public OMaybeListSelectionPage { protected: - FixedLine m_aFrame; - FixedText m_aDescription; - FixedText m_aQuestion; - RadioButton m_aStoreYes; - RadioButton m_aStoreNo; - ListBox m_aStoreWhere; + FixedLine m_aFrame; + FixedText m_aDescription; + FixedText m_aQuestion; + RadioButton m_aStoreYes; + RadioButton m_aStoreNo; + ListBox m_aStoreWhere; public: ODBFieldPage( OControlWizard* _pParent ); @@ -139,7 +139,7 @@ namespace dbp }; //......................................................................... -} // namespace dbp +} // namespace dbp //......................................................................... diff --git a/extensions/source/dbpilots/commonpagesdbp.src b/extensions/source/dbpilots/commonpagesdbp.src index 41d199a70209..783bdb48b65f 100644 --- a/extensions/source/dbpilots/commonpagesdbp.src +++ b/extensions/source/dbpilots/commonpagesdbp.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 @@ -39,7 +39,7 @@ TabPage RID_PAGE_TABLESELECTION { Pos = MAP_APPFONT ( 4 , 3 ) ; Size = MAP_APPFONT ( WINDOW_SIZE_X - 8 , 8 ) ; - Text [ en-US ] = "Data"; + Text [ en-US ] = "Data"; }; FixedText FT_EXPLANATION { @@ -65,14 +65,14 @@ TabPage RID_PAGE_TABLESELECTION DropDown = TRUE ; AutoHScroll = TRUE ; }; - + PushButton PB_FORMDATASOURCE { Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X + 3 + WINDOW_HALF_SIZE_X - 24 , 25 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; Text [ en-US ] = "~..."; }; - + FixedText FT_TABLE { Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X + 3, 46 ) ; diff --git a/extensions/source/dbpilots/controlwizard.cxx b/extensions/source/dbpilots/controlwizard.cxx index 202263cff749..45e436d28fd0 100644 --- a/extensions/source/dbpilots/controlwizard.cxx +++ b/extensions/source/dbpilots/controlwizard.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 @@ -192,13 +192,13 @@ namespace dbp ModuleRes aModuleRes(RID_PAGE_FORM_DATASOURCE_STATUS); OLocalResourceAccess aLocalControls(aModuleRes, RSC_TABPAGE); - m_pFormSettingsSeparator = new FixedLine(this, ModuleRes(FL_FORMSETINGS)); - m_pFormDatasourceLabel = new FixedText(this, ModuleRes(FT_FORMDATASOURCELABEL)); - m_pFormDatasource = new FixedText(this, ModuleRes(FT_FORMDATASOURCE)); - m_pFormContentTypeLabel = new FixedText(this, ModuleRes(FT_FORMCONTENTTYPELABEL)); - m_pFormContentType = new FixedText(this, ModuleRes(FT_FORMCONTENTTYPE)); - m_pFormTableLabel = new FixedText(this, ModuleRes(FT_FORMTABLELABEL)); - m_pFormTable = new FixedText(this, ModuleRes(FT_FORMTABLE)); + m_pFormSettingsSeparator = new FixedLine(this, ModuleRes(FL_FORMSETINGS)); + m_pFormDatasourceLabel = new FixedText(this, ModuleRes(FT_FORMDATASOURCELABEL)); + m_pFormDatasource = new FixedText(this, ModuleRes(FT_FORMDATASOURCE)); + m_pFormContentTypeLabel = new FixedText(this, ModuleRes(FT_FORMCONTENTTYPELABEL)); + m_pFormContentType = new FixedText(this, ModuleRes(FT_FORMCONTENTTYPE)); + m_pFormTableLabel = new FixedText(this, ModuleRes(FT_FORMTABLELABEL)); + m_pFormTable = new FixedText(this, ModuleRes(FT_FORMTABLE)); const OControlWizardContext& rContext = getContext(); if ( rContext.bEmbedded ) @@ -347,7 +347,7 @@ namespace dbp for (sal_Int32 i=0; i<nObjects; ++i) { if (xPageObjects->getByIndex(i) >>= xControlShape) - { // it _is_ a control shape + { // it _is_ a control shape xControlModel = xControlShape->getControl(); DBG_ASSERT(xControlModel.is(), "OControlWizard::implDetermineShape: control shape without model!"); if (xModelCompare.get() == xControlModel.get()) @@ -398,7 +398,7 @@ namespace dbp Reference< XDrawPageSupplier > xPageSupp(xModel, UNO_QUERY); if (xPageSupp.is()) - { // it's a document with only one page -> Writer + { // it's a document with only one page -> Writer xPage = xPageSupp->getDrawPage(); } else @@ -410,7 +410,7 @@ namespace dbp // maybe it's a spredsheet Reference< XSpreadsheetView > xView(xController, UNO_QUERY); if (xView.is()) - { // okay, it is one + { // okay, it is one Reference< XSpreadsheet > xSheet = xView->getActiveSheet(); xPageSupp = Reference< XDrawPageSupplier >(xSheet, UNO_QUERY); DBG_ASSERT(xPageSupp.is(), "OControlWizard::implDeterminePage: a spreadsheet which is no page supplier!"); @@ -418,7 +418,7 @@ namespace dbp xPage = xPageSupp->getDrawPage(); } else - { // can be a draw/impress doc only + { // can be a draw/impress doc only Reference< XDrawView > xDrawView(xController, UNO_QUERY); DBG_ASSERT(xDrawView.is(), "OControlWizard::implDeterminePage: no alternatives left ... can't determine the page!"); if (xDrawView.is()) @@ -427,7 +427,7 @@ namespace dbp } } else - { + { DBG_ASSERT(xPage.is(), "OControlWizard::implDeterminePage: can't determine the page (no model)!"); } m_aContext.xDrawPage = xPage; @@ -462,7 +462,7 @@ namespace dbp //--------------------------------------------------------------------- Reference< XConnection > OControlWizard::getFormConnection(const OAccessRegulator&) const - { + { return getFormConnection(); } //--------------------------------------------------------------------- @@ -472,7 +472,7 @@ namespace dbp try { if ( !::dbtools::isEmbeddedInDatabase(m_aContext.xForm,xConn) ) - m_aContext.xForm->getPropertyValue(::rtl::OUString::createFromAscii("ActiveConnection")) >>= xConn; + m_aContext.xForm->getPropertyValue(::rtl::OUString::createFromAscii("ActiveConnection")) >>= xConn; } catch(const Exception&) { @@ -632,9 +632,9 @@ namespace dbp if (xColumns.is()) { m_aContext.aFieldNames = xColumns->getElementNames(); - static const ::rtl::OUString s_sFieldTypeProperty = ::rtl::OUString::createFromAscii("Type"); + static const ::rtl::OUString s_sFieldTypeProperty = ::rtl::OUString::createFromAscii("Type"); const ::rtl::OUString* pBegin = m_aContext.aFieldNames.getConstArray(); - const ::rtl::OUString* pEnd = pBegin + m_aContext.aFieldNames.getLength(); + const ::rtl::OUString* pEnd = pBegin + m_aContext.aFieldNames.getLength(); for(;pBegin != pEnd;++pBegin) { sal_Int32 nFieldType = DataType::OTHER; @@ -663,7 +663,7 @@ namespace dbp ::comphelper::disposeComponent(xStatement); if (aSQLException.hasValue()) - { // an SQLException (or derivee) was thrown ... + { // an SQLException (or derivee) was thrown ... // prepend an extra SQLContext explaining what we were doing SQLContext aContext; @@ -745,35 +745,35 @@ namespace dbp // lemme see ... return (0 == getContext().aFieldNames.getLength()); // if we got fields, the data source is valid ... -// try -// { -// // first, we need a valid data source name -// ::rtl::OUString sDataSourceName; -// m_aContext.xForm->getPropertyValue(::rtl::OUString::createFromAscii("DataSourceName")) >>= sDataSourceName; -// if (m_aContext.xDatasourceContext.is() && m_aContext.xDatasourceContext->hasByName(sDataSourceName)) -// { // at least the data source name is valid ... -// // then, a CommandType "table" would be nice ... -// sal_Int32 nCommandType = CommandType::COMMAND; -// m_aContext.xForm->getPropertyValue(::rtl::OUString::createFromAscii("CommandType")) >>= nCommandType; -// if (CommandType::TABLE == nCommandType) -// { // okay .... -// // now the table itself should be valid -// ::rtl::OUString sTableName; -// m_aContext.xForm->getPropertyValue(::rtl::OUString::createFromAscii("Command")) >>= sTableName; -// if (m_aContext.xObjectContainer.is() && m_aContext.xObjectContainer->hasByName(sTableName)) -// return sal_False; -// } -// } -// } -// catch(Exception&) -// { -// DBG_ERROR("OControlWizard::needDatasourceSelection: caught an exception while checking the form settings!"); -// } -// return sal_True; +// try +// { +// // first, we need a valid data source name +// ::rtl::OUString sDataSourceName; +// m_aContext.xForm->getPropertyValue(::rtl::OUString::createFromAscii("DataSourceName")) >>= sDataSourceName; +// if (m_aContext.xDatasourceContext.is() && m_aContext.xDatasourceContext->hasByName(sDataSourceName)) +// { // at least the data source name is valid ... +// // then, a CommandType "table" would be nice ... +// sal_Int32 nCommandType = CommandType::COMMAND; +// m_aContext.xForm->getPropertyValue(::rtl::OUString::createFromAscii("CommandType")) >>= nCommandType; +// if (CommandType::TABLE == nCommandType) +// { // okay .... +// // now the table itself should be valid +// ::rtl::OUString sTableName; +// m_aContext.xForm->getPropertyValue(::rtl::OUString::createFromAscii("Command")) >>= sTableName; +// if (m_aContext.xObjectContainer.is() && m_aContext.xObjectContainer->hasByName(sTableName)) +// return sal_False; +// } +// } +// } +// catch(Exception&) +// { +// DBG_ERROR("OControlWizard::needDatasourceSelection: caught an exception while checking the form settings!"); +// } +// return sal_True; } //......................................................................... -} // namespace dbp +} // namespace dbp //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/dbpilots/controlwizard.hxx b/extensions/source/dbpilots/controlwizard.hxx index 292515c46f9b..0c5eb649d9dc 100644 --- a/extensions/source/dbpilots/controlwizard.hxx +++ b/extensions/source/dbpilots/controlwizard.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 dbp //===================================================================== struct OControlWizardSettings { - String sControlLabel; + String sControlLabel; }; //===================================================================== @@ -66,20 +66,20 @@ namespace dbp class OControlWizardPage : public OControlWizardPage_Base { protected: - FixedLine* m_pFormSettingsSeparator; - FixedText* m_pFormDatasourceLabel; - FixedText* m_pFormDatasource; - FixedText* m_pFormContentTypeLabel; - FixedText* m_pFormContentType; - FixedText* m_pFormTableLabel; - FixedText* m_pFormTable; + FixedLine* m_pFormSettingsSeparator; + FixedText* m_pFormDatasourceLabel; + FixedText* m_pFormDatasource; + FixedText* m_pFormContentTypeLabel; + FixedText* m_pFormContentType; + FixedText* m_pFormTableLabel; + FixedText* m_pFormTable; protected: - OControlWizard* getDialog(); - const OControlWizard* getDialog() const; - const OControlWizardContext& getContext(); - sal_Bool updateContext(); - void setFormConnection(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConn, sal_Bool _bAutoDispose = sal_True ); + OControlWizard* getDialog(); + const OControlWizard* getDialog() const; + const OControlWizardContext& getContext(); + sal_Bool updateContext(); + void setFormConnection(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConn, sal_Bool _bAutoDispose = sal_True ); ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > getFormConnection() const; @@ -103,7 +103,7 @@ namespace dbp protected: // OWizardPage overridables - virtual void initializePage(); + virtual void initializePage(); }; struct OAccessRegulator; @@ -114,7 +114,7 @@ namespace dbp class OControlWizard : public OControlWizard_Base { private: - OControlWizardContext m_aContext; + OControlWizardContext m_aContext; protected: ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > @@ -130,15 +130,15 @@ namespace dbp ~OControlWizard(); // make the some base class methods public - sal_Bool travelNext() { return OControlWizard_Base::travelNext(); } + sal_Bool travelNext() { return OControlWizard_Base::travelNext(); } public: ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getServiceFactory() const { return m_xORB; } - const OControlWizardContext& getContext() const { return m_aContext; } - sal_Bool updateContext(const OAccessRegulator&); - void setFormConnection(const OAccessRegulator&, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConn, sal_Bool _bAutoDispose = sal_True ); + const OControlWizardContext& getContext() const { return m_aContext; } + sal_Bool updateContext(const OAccessRegulator&); + void setFormConnection(const OAccessRegulator&, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConn, sal_Bool _bAutoDispose = sal_True ); ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > getFormConnection(const OAccessRegulator&) const; @@ -162,7 +162,7 @@ namespace dbp virtual sal_Bool approveControl(sal_Int16 _nClassId) = 0; // ModalDialog overridables - virtual short Execute(); + virtual short Execute(); private: sal_Bool initContext(); @@ -177,7 +177,7 @@ namespace dbp }; //......................................................................... -} // namespace dbp +} // namespace dbp //......................................................................... #endif // _EXTENSIONS_DBP_CONTROLWIZARD_HXX diff --git a/extensions/source/dbpilots/dbpilots.src b/extensions/source/dbpilots/dbpilots.src index fa96cbead1eb..fcdda32e0747 100644 --- a/extensions/source/dbpilots/dbpilots.src +++ b/extensions/source/dbpilots/dbpilots.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 @@ -33,29 +33,29 @@ ModalDialog RID_DLG_GROUPBOXWIZARD { Text [ en-US ] = "Group Element Wizard"; - OutputSize = TRUE ; - SVLook = TRUE ; - Moveable = TRUE ; - Closeable = TRUE ; - Hide = TRUE; + OutputSize = TRUE ; + SVLook = TRUE ; + Moveable = TRUE ; + Closeable = TRUE ; + Hide = TRUE; }; ModalDialog RID_DLG_LISTCOMBOWIZARD { - OutputSize = TRUE ; - SVLook = TRUE ; - Moveable = TRUE ; - Closeable = TRUE ; - Hide = TRUE; + OutputSize = TRUE ; + SVLook = TRUE ; + Moveable = TRUE ; + Closeable = TRUE ; + Hide = TRUE; }; ModalDialog RID_DLG_GRIDWIZARD { - OutputSize = TRUE ; - SVLook = TRUE ; - Moveable = TRUE ; - Closeable = TRUE ; - Hide = TRUE; + OutputSize = TRUE ; + SVLook = TRUE ; + Moveable = TRUE ; + Closeable = TRUE ; + Hide = TRUE; Text [ en-US ] = "Table Element Wizard"; }; diff --git a/extensions/source/dbpilots/dbpresid.hrc b/extensions/source/dbpilots/dbpresid.hrc index ecb424c5e3b7..81f61d49c96b 100644 --- a/extensions/source/dbpilots/dbpresid.hrc +++ b/extensions/source/dbpilots/dbpresid.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,63 +33,63 @@ //======================================================================== // basics -#define RID_DIALOG_START RID_DBP_START -#define RID_PAGE_START RID_DBP_START -#define RID_STRING_START RID_DBP_START -#define RID_ERRORBOX_START RID_DBP_START +#define RID_DIALOG_START RID_DBP_START +#define RID_PAGE_START RID_DBP_START +#define RID_STRING_START RID_DBP_START +#define RID_ERRORBOX_START RID_DBP_START //======================================================================== // strings -#define RID_STR_GROUPWIZ_DBFIELD (RID_STRING_START + 1 ) -#define RID_STR_COMBOWIZ_DBFIELD (RID_STRING_START + 2 ) -#define RID_STR_LISTWIZARD_TITLE (RID_STRING_START + 3 ) -#define RID_STR_COMBOWIZARD_TITLE (RID_STRING_START + 4 ) -#define RID_STR_COULDNOTOPENTABLE (RID_STRING_START + 5 ) -#define RID_STR_DATEPOSTFIX (RID_STRING_START + 6 ) -#define RID_STR_TIMEPOSTFIX (RID_STRING_START + 7 ) -#define RID_STR_TYPE_QUERY (RID_STRING_START + 8 ) -#define RID_STR_TYPE_TABLE (RID_STRING_START + 9 ) -#define RID_STR_TYPE_COMMAND (RID_STRING_START + 10 ) +#define RID_STR_GROUPWIZ_DBFIELD (RID_STRING_START + 1 ) +#define RID_STR_COMBOWIZ_DBFIELD (RID_STRING_START + 2 ) +#define RID_STR_LISTWIZARD_TITLE (RID_STRING_START + 3 ) +#define RID_STR_COMBOWIZARD_TITLE (RID_STRING_START + 4 ) +#define RID_STR_COULDNOTOPENTABLE (RID_STRING_START + 5 ) +#define RID_STR_DATEPOSTFIX (RID_STRING_START + 6 ) +#define RID_STR_TIMEPOSTFIX (RID_STRING_START + 7 ) +#define RID_STR_TYPE_QUERY (RID_STRING_START + 8 ) +#define RID_STR_TYPE_TABLE (RID_STRING_START + 9 ) +#define RID_STR_TYPE_COMMAND (RID_STRING_START + 10 ) // please adjust RID_STRING_END (below) when adding new strings -#define RID_STRING_END RID_STR_TIMEPOSTFIX +#define RID_STRING_END RID_STR_TIMEPOSTFIX //======================================================================== // dialogs -#define RID_DLG_GROUPBOXWIZARD ( RID_DIALOG_START + 1 ) -#define RID_DLG_LISTCOMBOWIZARD ( RID_DIALOG_START + 2 ) -#define RID_DLG_GRIDWIZARD ( RID_DIALOG_START + 3 ) +#define RID_DLG_GROUPBOXWIZARD ( RID_DIALOG_START + 1 ) +#define RID_DLG_LISTCOMBOWIZARD ( RID_DIALOG_START + 2 ) +#define RID_DLG_GRIDWIZARD ( RID_DIALOG_START + 3 ) // please adjust RID_DIALOG_END (below) when adding new dialogs -#define RID_DIALOG_END RID_DLG_GRIDWIZARD +#define RID_DIALOG_END RID_DLG_GRIDWIZARD //======================================================================== // tab pages -#define RID_PAGE_TABLESELECTION ( RID_PAGE_START + 1 ) -#define RID_PAGE_GROUPRADIOSELECTION ( RID_PAGE_START + 2 ) -#define RID_PAGE_DEFAULTFIELDSELECTION ( RID_PAGE_START + 3 ) -#define RID_PAGE_OPTIONVALUES ( RID_PAGE_START + 4 ) -#define RID_PAGE_OPTION_DBFIELD ( RID_PAGE_START + 5 ) -#define RID_PAGE_OPTIONS_FINAL ( RID_PAGE_START + 6 ) -#define RID_PAGE_LCW_CONTENTSELECTION_TABLE ( RID_PAGE_START + 7 ) -#define RID_PAGE_LCW_CONTENTSELECTION_FIELD ( RID_PAGE_START + 8 ) -#define RID_PAGE_LCW_FIELDLINK ( RID_PAGE_START + 9 ) -#define RID_PAGE_GW_FIELDSELECTION ( RID_PAGE_START + 10 ) -#define RID_PAGE_FORM_DATASOURCE_STATUS ( RID_PAGE_START + 11 ) +#define RID_PAGE_TABLESELECTION ( RID_PAGE_START + 1 ) +#define RID_PAGE_GROUPRADIOSELECTION ( RID_PAGE_START + 2 ) +#define RID_PAGE_DEFAULTFIELDSELECTION ( RID_PAGE_START + 3 ) +#define RID_PAGE_OPTIONVALUES ( RID_PAGE_START + 4 ) +#define RID_PAGE_OPTION_DBFIELD ( RID_PAGE_START + 5 ) +#define RID_PAGE_OPTIONS_FINAL ( RID_PAGE_START + 6 ) +#define RID_PAGE_LCW_CONTENTSELECTION_TABLE ( RID_PAGE_START + 7 ) +#define RID_PAGE_LCW_CONTENTSELECTION_FIELD ( RID_PAGE_START + 8 ) +#define RID_PAGE_LCW_FIELDLINK ( RID_PAGE_START + 9 ) +#define RID_PAGE_GW_FIELDSELECTION ( RID_PAGE_START + 10 ) +#define RID_PAGE_FORM_DATASOURCE_STATUS ( RID_PAGE_START + 11 ) // please adjust RID_PAGE_END (below) when adding new tab pages -#define RID_PAGE_END RID_PAGE_GW_FIELDSELECTION +#define RID_PAGE_END RID_PAGE_GW_FIELDSELECTION //======================================================================== // ErrorBox -#define RID_ERR_INVALID_FORM_CONNECTION ( RID_ERRORBOX_START + 1 ) +#define RID_ERR_INVALID_FORM_CONNECTION ( RID_ERRORBOX_START + 1 ) // please adjust RID_ERRORBOX_END (below) when adding new error boxes -#define RID_ERRORBOX_END RID_ERR_INVALID_FORM_CONNECTION +#define RID_ERRORBOX_END RID_ERR_INVALID_FORM_CONNECTION //======================================================================== @@ -115,96 +115,96 @@ //........................................................................ // FixedLine -#define FL_DATA 1 -#define FL_DEFAULTSELECTION 2 -#define FL_OPTIONVALUES 3 -#define FL_DATABASEFIELD_EXPL 4 -#define FL_NAMEIT 5 -#define FL_FRAME 6 -#define FL_FORMSETINGS 7 +#define FL_DATA 1 +#define FL_DEFAULTSELECTION 2 +#define FL_OPTIONVALUES 3 +#define FL_DATABASEFIELD_EXPL 4 +#define FL_NAMEIT 5 +#define FL_FRAME 6 +#define FL_FORMSETINGS 7 //........................................................................ // FixedText -#define FT_DATASOURCE 1 -#define FT_TABLE 2 -#define FT_RADIOLABELS 3 -#define FT_RADIOBUTTONS 4 -#define FT_DEFAULTSELECTION 5 -#define FT_OPTIONVALUES_EXPL 6 -#define FT_OPTIONVALUES 7 -#define FT_DATABASEFIELD_EXPL 8 -#define FT_DATABASEFIELD_QUEST 9 -#define FT_NAMEIT 10 -#define FT_THATSALL 11 -#define FT_SELECTTABLE_LABEL 12 -#define FT_TABLEFIELDS 13 -#define FT_DISPLAYEDFIELD 14 -#define FT_CONTENTFIELD_INFO 15 -#define FT_VALUELISTFIELD 16 -#define FT_TABLEFIELD 17 -#define FT_EXPLANATION 18 -#define FT_EXISTING_FIELDS 19 -#define FT_SELECTED_FIELDS 20 -#define FT_FIELDLINK_DESC 21 -#define FT_FORMDATASOURCELABEL 22 -#define FT_FORMDATASOURCE 23 -#define FT_FORMTABLELABEL 24 -#define FT_FORMTABLE 25 -#define FT_FORMCONTENTTYPELABEL 26 -#define FT_FORMCONTENTTYPE 27 +#define FT_DATASOURCE 1 +#define FT_TABLE 2 +#define FT_RADIOLABELS 3 +#define FT_RADIOBUTTONS 4 +#define FT_DEFAULTSELECTION 5 +#define FT_OPTIONVALUES_EXPL 6 +#define FT_OPTIONVALUES 7 +#define FT_DATABASEFIELD_EXPL 8 +#define FT_DATABASEFIELD_QUEST 9 +#define FT_NAMEIT 10 +#define FT_THATSALL 11 +#define FT_SELECTTABLE_LABEL 12 +#define FT_TABLEFIELDS 13 +#define FT_DISPLAYEDFIELD 14 +#define FT_CONTENTFIELD_INFO 15 +#define FT_VALUELISTFIELD 16 +#define FT_TABLEFIELD 17 +#define FT_EXPLANATION 18 +#define FT_EXISTING_FIELDS 19 +#define FT_SELECTED_FIELDS 20 +#define FT_FIELDLINK_DESC 21 +#define FT_FORMDATASOURCELABEL 22 +#define FT_FORMDATASOURCE 23 +#define FT_FORMTABLELABEL 24 +#define FT_FORMTABLE 25 +#define FT_FORMCONTENTTYPELABEL 26 +#define FT_FORMCONTENTTYPE 27 //........................................................................ // ListBox -#define LB_DATASOURCE 1 -#define LB_TABLE 2 -#define LB_RADIOBUTTONS 3 -#define LB_DEFSELECTIONFIELD 3 -#define LB_STOREINFIELD 4 -#define LB_SELECTTABLE 5 -#define LB_SELECTFIELD 6 -#define LB_EXISTING_FIELDS 7 -#define LB_SELECTED_FIELDS 8 +#define LB_DATASOURCE 1 +#define LB_TABLE 2 +#define LB_RADIOBUTTONS 3 +#define LB_DEFSELECTIONFIELD 3 +#define LB_STOREINFIELD 4 +#define LB_SELECTTABLE 5 +#define LB_SELECTFIELD 6 +#define LB_EXISTING_FIELDS 7 +#define LB_SELECTED_FIELDS 8 //........................................................................ // Edit -#define ET_RADIOLABELS 1 -#define ET_OPTIONVALUE 2 -#define ET_NAMEIT 3 -#define ET_DISPLAYEDFIELD 4 +#define ET_RADIOLABELS 1 +#define ET_OPTIONVALUE 2 +#define ET_NAMEIT 3 +#define ET_DISPLAYEDFIELD 4 //........................................................................ // PushButton -#define PB_MOVETORIGHT 1 -#define PB_MOVETOLEFT 2 -#define PB_FIELDRIGHT 3 -#define PB_ALLFIELDSRIGHT 4 -#define PB_FIELDLEFT 5 -#define PB_ALLFIELDSLEFT 6 -#define PB_FORMDATASOURCE 7 +#define PB_MOVETORIGHT 1 +#define PB_MOVETOLEFT 2 +#define PB_FIELDRIGHT 3 +#define PB_ALLFIELDSRIGHT 4 +#define PB_FIELDLEFT 5 +#define PB_ALLFIELDSLEFT 6 +#define PB_FORMDATASOURCE 7 //........................................................................ // RadioButton -#define RB_DEFSELECTION_YES 1 -#define RB_DEFSELECTION_NO 2 -#define RB_STOREINFIELD_YES 3 -#define RB_STOREINFIELD_NO 4 +#define RB_DEFSELECTION_YES 1 +#define RB_DEFSELECTION_NO 2 +#define RB_STOREINFIELD_YES 3 +#define RB_STOREINFIELD_NO 4 //........................................................................ // ComboBox -#define CMB_VALUELISTFIELD 1 -#define CMB_TABLEFIELD 2 +#define CMB_VALUELISTFIELD 1 +#define CMB_TABLEFIELD 2 //........................................................................ // String -#define STR_FIELDINFO_LISTBOX 1 -#define STR_FIELDINFO_COMBOBOX 2 +#define STR_FIELDINFO_LISTBOX 1 +#define STR_FIELDINFO_COMBOBOX 2 //........................................................................ // Image @@ -217,15 +217,15 @@ //======================================================================== // defines -#define WINDOW_SIZE_X 260 -#define WINDOW_SIZE_Y 185 -#define WINDOW_HALF_SIZE_X ( WINDOW_SIZE_X / 2 ) +#define WINDOW_SIZE_X 260 +#define WINDOW_SIZE_Y 185 +#define WINDOW_HALF_SIZE_X ( WINDOW_SIZE_X / 2 ) -#define BUTTON_SIZE_X 50 -#define BUTTON_SIZE_Y 14 +#define BUTTON_SIZE_X 50 +#define BUTTON_SIZE_Y 14 -#define ITEM_BUTTON_SIZE_X 20 -#define ITEM_BUTTON_SIZE_Y 12 +#define ITEM_BUTTON_SIZE_X 20 +#define ITEM_BUTTON_SIZE_Y 12 diff --git a/extensions/source/dbpilots/dbpservices.cxx b/extensions/source/dbpilots/dbpservices.cxx index 3b251c144eb7..e1e41725af25 100644 --- a/extensions/source/dbpilots/dbpservices.cxx +++ b/extensions/source/dbpilots/dbpservices.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 @@ extern "C" void SAL_CALL dbp_initializeModule() extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char **ppEnvTypeName, - uno_Environment ** /*ppEnv*/ + const sal_Char **ppEnvTypeName, + uno_Environment ** /*ppEnv*/ ) { dbp_initializeModule(); @@ -76,8 +76,8 @@ extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( void* pRegistryKey ) { - if (pRegistryKey) - try + if (pRegistryKey) + try { return ::dbp::OModule::writeComponentInfos( static_cast<XMultiServiceFactory*>(pServiceManager), diff --git a/extensions/source/dbpilots/dbptools.cxx b/extensions/source/dbpilots/dbptools.cxx index 6bf34b177643..05d85f5c8790 100644 --- a/extensions/source/dbpilots/dbptools.cxx +++ b/extensions/source/dbpilots/dbptools.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 @@ -66,7 +66,7 @@ namespace dbp } //......................................................................... -} // namespace dbp +} // namespace dbp //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/dbpilots/dbptools.hxx b/extensions/source/dbpilots/dbptools.hxx index 971b37fe10c9..7c37e7edd305 100644 --- a/extensions/source/dbpilots/dbptools.hxx +++ b/extensions/source/dbpilots/dbptools.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 dbp ::rtl::OUString& _rElementsName); //......................................................................... -} // namespace dbp +} // namespace dbp //......................................................................... diff --git a/extensions/source/dbpilots/dbptypes.hxx b/extensions/source/dbpilots/dbptypes.hxx index ef5676f9fea9..be188f63fdf0 100644 --- a/extensions/source/dbpilots/dbptypes.hxx +++ b/extensions/source/dbpilots/dbptypes.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,7 +42,7 @@ namespace dbp DECLARE_STL_STDKEY_MAP( sal_uInt32, String, MapInt2String ); //......................................................................... -} // namespace dbp +} // namespace dbp //......................................................................... #endif // _EXTENSIONS_DBP_DBPTYPES_HXX_ diff --git a/extensions/source/dbpilots/gridpages.src b/extensions/source/dbpilots/gridpages.src index 5aca75b77d55..5b5d557ca18a 100644 --- a/extensions/source/dbpilots/gridpages.src +++ b/extensions/source/dbpilots/gridpages.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/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx index f3bd194a27c3..6c39ac373524 100644 --- a/extensions/source/dbpilots/gridwizard.cxx +++ b/extensions/source/dbpilots/gridwizard.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 @@ -40,8 +40,8 @@ #include "dbptools.hxx" #include "dbpilots.hrc" -#define GW_STATE_DATASOURCE_SELECTION 0 -#define GW_STATE_FIELDSELECTION 1 +#define GW_STATE_DATASOURCE_SELECTION 0 +#define GW_STATE_FIELDSELECTION 1 //......................................................................... namespace dbp @@ -75,7 +75,7 @@ namespace dbp // if we do not need the data source selection page ... if (!needDatasourceSelection()) - { // ... skip it! + { // ... skip it! skip(1); m_bHadDataSelection = sal_False; } @@ -111,17 +111,17 @@ namespace dbp if (!xColumnFactory.is() || !xColumnContainer.is()) return; - static const ::rtl::OUString s_sDataFieldProperty = ::rtl::OUString::createFromAscii("DataField"); - static const ::rtl::OUString s_sLabelProperty = ::rtl::OUString::createFromAscii("Label"); - static const ::rtl::OUString s_sWidthProperty = ::rtl::OUString::createFromAscii("Width"); + static const ::rtl::OUString s_sDataFieldProperty = ::rtl::OUString::createFromAscii("DataField"); + static const ::rtl::OUString s_sLabelProperty = ::rtl::OUString::createFromAscii("Label"); + static const ::rtl::OUString s_sWidthProperty = ::rtl::OUString::createFromAscii("Width"); static const ::rtl::OUString s_sMouseWheelBehavior = ::rtl::OUString::createFromAscii("MouseWheelBehavior"); static const ::rtl::OUString s_sEmptyString; // collect "descriptors" for the to-be-created (grid)columns DECLARE_STL_VECTOR( ::rtl::OUString, StringArray ); - StringArray aColumnServiceNames; // service names to be used with the XGridColumnFactory - StringArray aColumnLabelPostfixes; // postfixes to append to the column labels - StringArray aFormFieldNames; // data field names + StringArray aColumnServiceNames; // service names to be used with the XGridColumnFactory + StringArray aColumnLabelPostfixes; // postfixes to append to the column labels + StringArray aFormFieldNames; // data field names aColumnServiceNames.reserve(getSettings().aSelectedFields.getLength()); aColumnLabelPostfixes.reserve(getSettings().aSelectedFields.getLength()); @@ -188,8 +188,8 @@ namespace dbp } } - DBG_ASSERT( aFormFieldNames.size() == aColumnServiceNames.size() - && aColumnServiceNames.size() == aColumnLabelPostfixes.size(), + DBG_ASSERT( aFormFieldNames.size() == aColumnServiceNames.size() + && aColumnServiceNames.size() == aColumnLabelPostfixes.size(), "OGridWizard::implApplySettings: inconsistent descriptor sequences!"); // now loop through the descriptions and create the (grid)columns out of th descriptors @@ -227,9 +227,9 @@ namespace dbp } catch(Exception&) { - DBG_ERROR( ::rtl::OString("OGridWizard::implApplySettings: unexpected exception while creating the grid column for field ") - += ::rtl::OString(pFormFieldName->getStr(), pFormFieldName->getLength(), gsl_getSystemTextEncoding()) - += ::rtl::OString("!")); + DBG_ERROR( ::rtl::OString("OGridWizard::implApplySettings: unexpected exception while creating the grid column for field ") + += ::rtl::OString(pFormFieldName->getStr(), pFormFieldName->getLength(), gsl_getSystemTextEncoding()) + += ::rtl::OString("!")); } } } @@ -306,15 +306,15 @@ namespace dbp //--------------------------------------------------------------------- OGridFieldsSelection::OGridFieldsSelection( OGridWizard* _pParent ) :OGridPage(_pParent, ModuleRes(RID_PAGE_GW_FIELDSELECTION)) - ,m_aFrame (this, ModuleRes(FL_FRAME)) - ,m_aExistFieldsLabel (this, ModuleRes(FT_EXISTING_FIELDS)) - ,m_aExistFields (this, ModuleRes(LB_EXISTING_FIELDS)) - ,m_aSelectOne (this, ModuleRes(PB_FIELDRIGHT)) - ,m_aSelectAll (this, ModuleRes(PB_ALLFIELDSRIGHT)) - ,m_aDeselectOne (this, ModuleRes(PB_FIELDLEFT)) - ,m_aDeselectAll (this, ModuleRes(PB_ALLFIELDSLEFT)) - ,m_aSelFieldsLabel (this, ModuleRes(FT_SELECTED_FIELDS)) - ,m_aSelFields (this, ModuleRes(LB_SELECTED_FIELDS)) + ,m_aFrame (this, ModuleRes(FL_FRAME)) + ,m_aExistFieldsLabel (this, ModuleRes(FT_EXISTING_FIELDS)) + ,m_aExistFields (this, ModuleRes(LB_EXISTING_FIELDS)) + ,m_aSelectOne (this, ModuleRes(PB_FIELDRIGHT)) + ,m_aSelectAll (this, ModuleRes(PB_ALLFIELDSRIGHT)) + ,m_aDeselectOne (this, ModuleRes(PB_FIELDLEFT)) + ,m_aDeselectAll (this, ModuleRes(PB_ALLFIELDSLEFT)) + ,m_aSelFieldsLabel (this, ModuleRes(FT_SELECTED_FIELDS)) + ,m_aSelFields (this, ModuleRes(LB_SELECTED_FIELDS)) { FreeResource(); @@ -426,7 +426,7 @@ namespace dbp USHORT nInsertPos = LISTBOX_APPEND; if (!bMoveRight) - { // need to determine an insert pos which reflects the original + { // need to determine an insert pos which reflects the original nInsertPos = 0; while (nInsertPos < rMoveTo.GetEntryCount()) { @@ -481,7 +481,7 @@ namespace dbp } //......................................................................... -} // namespace dbp +} // namespace dbp //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/dbpilots/gridwizard.hxx b/extensions/source/dbpilots/gridwizard.hxx index 8af95be86aa0..085762ce4f7c 100644 --- a/extensions/source/dbpilots/gridwizard.hxx +++ b/extensions/source/dbpilots/gridwizard.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,7 +42,7 @@ namespace dbp //===================================================================== struct OGridSettings : public OControlWizardSettings { - ::com::sun::star::uno::Sequence< ::rtl::OUString > aSelectedFields; + ::com::sun::star::uno::Sequence< ::rtl::OUString > aSelectedFields; }; //===================================================================== @@ -51,8 +51,8 @@ namespace dbp class OGridWizard : public OControlWizard { protected: - OGridSettings m_aSettings; - sal_Bool m_bHadDataSelection : 1; + OGridSettings m_aSettings; + sal_Bool m_bHadDataSelection : 1; public: OGridWizard( @@ -65,10 +65,10 @@ namespace dbp protected: // OWizardMachine overridables - virtual ::svt::OWizardPage* createPage( WizardState _nState ); - virtual WizardState determineNextState( WizardState _nCurrentState ) const; - virtual void enterState( WizardState _nState ); - virtual sal_Bool leaveState( WizardState _nState ); + virtual ::svt::OWizardPage* createPage( WizardState _nState ); + virtual WizardState determineNextState( WizardState _nCurrentState ) const; + virtual void enterState( WizardState _nState ); + virtual sal_Bool leaveState( WizardState _nState ); virtual sal_Bool onFinish(); virtual sal_Bool approveControl(sal_Int16 _nClassId); @@ -95,15 +95,15 @@ namespace dbp class OGridFieldsSelection : public OGridPage { protected: - FixedLine m_aFrame; - FixedText m_aExistFieldsLabel; - ListBox m_aExistFields; - PushButton m_aSelectOne; - PushButton m_aSelectAll; - PushButton m_aDeselectOne; - PushButton m_aDeselectAll; - FixedText m_aSelFieldsLabel; - ListBox m_aSelFields; + FixedLine m_aFrame; + FixedText m_aExistFieldsLabel; + ListBox m_aExistFields; + PushButton m_aSelectOne; + PushButton m_aSelectAll; + PushButton m_aDeselectOne; + PushButton m_aDeselectAll; + FixedText m_aSelFieldsLabel; + ListBox m_aSelFields; public: OGridFieldsSelection( OGridWizard* _pParent ); @@ -113,8 +113,8 @@ namespace dbp virtual void ActivatePage(); // OWizardPage overridables - virtual void initializePage(); - virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ); + virtual void initializePage(); + virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ); virtual bool canAdvance() const; protected: @@ -130,7 +130,7 @@ namespace dbp }; //......................................................................... -} // namespace dbp +} // namespace dbp //......................................................................... #endif // _EXTENSIONS_DBP_GRIDWIZARD_HXX_ diff --git a/extensions/source/dbpilots/groupboxpages.src b/extensions/source/dbpilots/groupboxpages.src index 6b651e848010..f5538e2a14af 100644 --- a/extensions/source/dbpilots/groupboxpages.src +++ b/extensions/source/dbpilots/groupboxpages.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/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx index f8cd1c509ebf..8bda68c04c72 100644 --- a/extensions/source/dbpilots/groupboxwiz.cxx +++ b/extensions/source/dbpilots/groupboxwiz.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,12 +37,12 @@ #include "dbpilots.hrc" -//#define GBW_STATE_DATASELECTION 0 -#define GBW_STATE_OPTIONLIST 0 -#define GBW_STATE_DEFAULTOPTION 1 -#define GBW_STATE_OPTIONVALUES 2 -#define GBW_STATE_DBFIELD 3 -#define GBW_STATE_FINALIZE 4 +//#define GBW_STATE_DATASELECTION 0 +#define GBW_STATE_OPTIONLIST 0 +#define GBW_STATE_DEFAULTOPTION 1 +#define GBW_STATE_OPTIONVALUES 2 +#define GBW_STATE_DBFIELD 3 +#define GBW_STATE_FINALIZE 4 //......................................................................... namespace dbp @@ -84,8 +84,8 @@ namespace dbp { switch (_nState) { -// case GBW_STATE_DATASELECTION: -// return new OTableSelectionPage(this); +// case GBW_STATE_DATASELECTION: +// return new OTableSelectionPage(this); // case GBW_STATE_OPTIONLIST: return new ORadioSelectionPage(this); @@ -111,8 +111,8 @@ namespace dbp { switch (_nCurrentState) { -// case GBW_STATE_DATASELECTION: -// return GBW_STATE_OPTIONLIST; +// case GBW_STATE_DATASELECTION: +// return GBW_STATE_OPTIONLIST; // case GBW_STATE_OPTIONLIST: return GBW_STATE_DEFAULTOPTION; @@ -141,7 +141,7 @@ namespace dbp { case GBW_STATE_DEFAULTOPTION: if (!m_bVisitedDefault) - { // assume that the first of the radio buttons should be selected + { // assume that the first of the radio buttons should be selected DBG_ASSERT(m_aSettings.aLabels.size(), "OGroupBoxWizard::enterState: should never have reached this state!"); m_aSettings.sDefaultField = m_aSettings.aLabels[0]; } @@ -150,7 +150,7 @@ namespace dbp case GBW_STATE_DBFIELD: if (!m_bVisitedDB) - { // try to generate a default for the DB field + { // try to generate a default for the DB field // (simply use the first field in the DB names collection) if (getContext().aFieldNames.getLength()) m_aSettings.sDBField = getContext().aFieldNames[0]; @@ -205,13 +205,13 @@ namespace dbp //--------------------------------------------------------------------- ORadioSelectionPage::ORadioSelectionPage( OControlWizard* _pParent ) :OGBWPage(_pParent, ModuleRes(RID_PAGE_GROUPRADIOSELECTION)) - ,m_aFrame (this, ModuleRes(FL_DATA)) - ,m_aRadioNameLabel (this, ModuleRes(FT_RADIOLABELS)) - ,m_aRadioName (this, ModuleRes(ET_RADIOLABELS)) - ,m_aMoveRight (this, ModuleRes(PB_MOVETORIGHT)) - ,m_aMoveLeft (this, ModuleRes(PB_MOVETOLEFT)) - ,m_aExistingRadiosLabel (this, ModuleRes(FT_RADIOBUTTONS)) - ,m_aExistingRadios (this, ModuleRes(LB_RADIOBUTTONS)) + ,m_aFrame (this, ModuleRes(FL_DATA)) + ,m_aRadioNameLabel (this, ModuleRes(FT_RADIOLABELS)) + ,m_aRadioName (this, ModuleRes(ET_RADIOLABELS)) + ,m_aMoveRight (this, ModuleRes(PB_MOVETORIGHT)) + ,m_aMoveLeft (this, ModuleRes(PB_MOVETOLEFT)) + ,m_aExistingRadiosLabel (this, ModuleRes(FT_RADIOBUTTONS)) + ,m_aExistingRadios (this, ModuleRes(LB_RADIOBUTTONS)) { FreeResource(); @@ -359,11 +359,11 @@ namespace dbp //--------------------------------------------------------------------- ODefaultFieldSelectionPage::ODefaultFieldSelectionPage( OControlWizard* _pParent ) :OMaybeListSelectionPage(_pParent, ModuleRes(RID_PAGE_DEFAULTFIELDSELECTION)) - ,m_aFrame (this, ModuleRes(FL_DEFAULTSELECTION)) - ,m_aDefaultSelectionLabel (this, ModuleRes(FT_DEFAULTSELECTION)) - ,m_aDefSelYes (this, ModuleRes(RB_DEFSELECTION_YES)) - ,m_aDefSelNo (this, ModuleRes(RB_DEFSELECTION_NO)) - ,m_aDefSelection (this, ModuleRes(LB_DEFSELECTIONFIELD)) + ,m_aFrame (this, ModuleRes(FL_DEFAULTSELECTION)) + ,m_aDefaultSelectionLabel (this, ModuleRes(FT_DEFAULTSELECTION)) + ,m_aDefSelYes (this, ModuleRes(RB_DEFSELECTION_YES)) + ,m_aDefSelNo (this, ModuleRes(RB_DEFSELECTION_NO)) + ,m_aDefSelection (this, ModuleRes(LB_DEFSELECTIONFIELD)) { FreeResource(); @@ -380,7 +380,7 @@ namespace dbp // fill the listbox m_aDefSelection.Clear(); - for ( ConstStringArrayIterator aLoop = rSettings.aLabels.begin(); + for ( ConstStringArrayIterator aLoop = rSettings.aLabels.begin(); aLoop != rSettings.aLabels.end(); ++aLoop ) @@ -408,12 +408,12 @@ namespace dbp //--------------------------------------------------------------------- OOptionValuesPage::OOptionValuesPage( OControlWizard* _pParent ) :OGBWPage(_pParent, ModuleRes(RID_PAGE_OPTIONVALUES)) - ,m_aFrame (this, ModuleRes(FL_OPTIONVALUES)) - ,m_aDescription (this, ModuleRes(FT_OPTIONVALUES_EXPL)) - ,m_aValueLabel (this, ModuleRes(FT_OPTIONVALUES)) - ,m_aValue (this, ModuleRes(ET_OPTIONVALUE)) - ,m_aOptionsLabel (this, ModuleRes(FT_RADIOBUTTONS)) - ,m_aOptions (this, ModuleRes(LB_RADIOBUTTONS)) + ,m_aFrame (this, ModuleRes(FL_OPTIONVALUES)) + ,m_aDescription (this, ModuleRes(FT_OPTIONVALUES_EXPL)) + ,m_aValueLabel (this, ModuleRes(FT_OPTIONVALUES)) + ,m_aValue (this, ModuleRes(ET_OPTIONVALUE)) + ,m_aOptionsLabel (this, ModuleRes(FT_RADIOBUTTONS)) + ,m_aOptions (this, ModuleRes(LB_RADIOBUTTONS)) ,m_nLastSelection((::svt::WizardTypes::WizardState)-1) { FreeResource(); @@ -462,7 +462,7 @@ namespace dbp // fill the list with all available options m_aOptions.Clear(); m_nLastSelection = -1; - for ( ConstStringArrayIterator aLoop = rSettings.aLabels.begin(); + for ( ConstStringArrayIterator aLoop = rSettings.aLabels.begin(); aLoop != rSettings.aLabels.end(); ++aLoop ) @@ -515,10 +515,10 @@ namespace dbp //--------------------------------------------------------------------- OFinalizeGBWPage::OFinalizeGBWPage( OControlWizard* _pParent ) :OGBWPage(_pParent, ModuleRes(RID_PAGE_OPTIONS_FINAL)) - ,m_aFrame (this, ModuleRes(FL_NAMEIT)) - ,m_aNameLabel (this, ModuleRes(FT_NAMEIT)) - ,m_aName (this, ModuleRes(ET_NAMEIT)) - ,m_aThatsAll (this, ModuleRes(FT_THATSALL)) + ,m_aFrame (this, ModuleRes(FL_NAMEIT)) + ,m_aNameLabel (this, ModuleRes(FT_NAMEIT)) + ,m_aName (this, ModuleRes(ET_NAMEIT)) + ,m_aThatsAll (this, ModuleRes(FT_THATSALL)) { FreeResource(); } @@ -557,7 +557,7 @@ namespace dbp } //......................................................................... -} // namespace dbp +} // namespace dbp //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/dbpilots/groupboxwiz.hxx b/extensions/source/dbpilots/groupboxwiz.hxx index 725e36e6d8e1..2b762e1f96ce 100644 --- a/extensions/source/dbpilots/groupboxwiz.hxx +++ b/extensions/source/dbpilots/groupboxwiz.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,11 +42,11 @@ namespace dbp //===================================================================== struct OOptionGroupSettings : public OControlWizardSettings { - StringArray aLabels; - StringArray aValues; - String sDefaultField; - String sDBField; - String sName; + StringArray aLabels; + StringArray aValues; + String sDefaultField; + String sDBField; + String sName; }; //===================================================================== @@ -55,10 +55,10 @@ namespace dbp class OGroupBoxWizard : public OControlWizard { protected: - OOptionGroupSettings m_aSettings; + OOptionGroupSettings m_aSettings; - sal_Bool m_bVisitedDefault : 1; - sal_Bool m_bVisitedDB : 1; + sal_Bool m_bVisitedDefault : 1; + sal_Bool m_bVisitedDB : 1; public: OGroupBoxWizard( @@ -71,9 +71,9 @@ namespace dbp protected: // OWizardMachine overridables - virtual ::svt::OWizardPage* createPage( WizardState _nState ); - virtual WizardState determineNextState( WizardState _nCurrentState ) const; - virtual void enterState( WizardState _nState ); + virtual ::svt::OWizardPage* createPage( WizardState _nState ); + virtual WizardState determineNextState( WizardState _nCurrentState ) const; + virtual void enterState( WizardState _nState ); virtual sal_Bool onFinish(); virtual sal_Bool approveControl(sal_Int16 _nClassId); @@ -100,13 +100,13 @@ namespace dbp class ORadioSelectionPage : public OGBWPage { protected: - FixedLine m_aFrame; - FixedText m_aRadioNameLabel; - Edit m_aRadioName; - PushButton m_aMoveRight; - PushButton m_aMoveLeft; - FixedText m_aExistingRadiosLabel; - ListBox m_aExistingRadios; + FixedLine m_aFrame; + FixedText m_aRadioNameLabel; + Edit m_aRadioName; + PushButton m_aMoveRight; + PushButton m_aMoveLeft; + FixedText m_aExistingRadiosLabel; + ListBox m_aExistingRadios; public: ORadioSelectionPage( OControlWizard* _pParent ); @@ -116,8 +116,8 @@ namespace dbp void ActivatePage(); // OWizardPage overridables - virtual void initializePage(); - virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ); + virtual void initializePage(); + virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ); virtual bool canAdvance() const; DECL_LINK( OnMoveEntry, PushButton* ); @@ -133,19 +133,19 @@ namespace dbp class ODefaultFieldSelectionPage : public OMaybeListSelectionPage { protected: - FixedLine m_aFrame; - FixedText m_aDefaultSelectionLabel; - RadioButton m_aDefSelYes; - RadioButton m_aDefSelNo; - ListBox m_aDefSelection; + FixedLine m_aFrame; + FixedText m_aDefaultSelectionLabel; + RadioButton m_aDefSelYes; + RadioButton m_aDefSelNo; + ListBox m_aDefSelection; public: ODefaultFieldSelectionPage( OControlWizard* _pParent ); protected: // OWizardPage overridables - virtual void initializePage(); - virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ); + virtual void initializePage(); + virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ); OOptionGroupSettings& getSettings() { return static_cast<OGroupBoxWizard*>(getDialog())->getSettings(); } }; @@ -156,14 +156,14 @@ namespace dbp class OOptionValuesPage : public OGBWPage { protected: - FixedLine m_aFrame; - FixedText m_aDescription; - FixedText m_aValueLabel; - Edit m_aValue; - FixedText m_aOptionsLabel; - ListBox m_aOptions; - - StringArray m_aUncommittedValues; + FixedLine m_aFrame; + FixedText m_aDescription; + FixedText m_aValueLabel; + Edit m_aValue; + FixedText m_aOptionsLabel; + ListBox m_aOptions; + + StringArray m_aUncommittedValues; ::svt::WizardTypes::WizardState m_nLastSelection; @@ -175,8 +175,8 @@ namespace dbp void ActivatePage(); // OWizardPage overridables - virtual void initializePage(); - virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ); + virtual void initializePage(); + virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ); void implTraveledOptions(); @@ -204,10 +204,10 @@ namespace dbp class OFinalizeGBWPage : public OGBWPage { protected: - FixedLine m_aFrame; - FixedText m_aNameLabel; - Edit m_aName; - FixedText m_aThatsAll; + FixedLine m_aFrame; + FixedText m_aNameLabel; + Edit m_aName; + FixedText m_aThatsAll; public: OFinalizeGBWPage( OControlWizard* _pParent ); @@ -217,13 +217,13 @@ namespace dbp void ActivatePage(); // OWizardPage overridables - virtual void initializePage(); - virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ); + virtual void initializePage(); + virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ); virtual bool canAdvance() const; }; //......................................................................... -} // namespace dbp +} // namespace dbp //......................................................................... #endif // _EXTENSIONS_DBP_GROUPBOXWIZ_HXX_ diff --git a/extensions/source/dbpilots/listcombopages.src b/extensions/source/dbpilots/listcombopages.src index eb83140de316..7e48fef2cca9 100644 --- a/extensions/source/dbpilots/listcombopages.src +++ b/extensions/source/dbpilots/listcombopages.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/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx index d70fdcb97378..93c71ba16085 100644 --- a/extensions/source/dbpilots/listcombowizard.cxx +++ b/extensions/source/dbpilots/listcombowizard.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 @@ namespace dbp // if we do not need the data source selection page ... if (!needDatasourceSelection()) - { // ... skip it! + { // ... skip it! skip(1); m_bHadDataSelection = sal_False; } @@ -293,9 +293,9 @@ namespace dbp //--------------------------------------------------------------------- OContentTableSelection::OContentTableSelection( OListComboWizard* _pParent ) :OLCPage(_pParent, ModuleRes(RID_PAGE_LCW_CONTENTSELECTION_TABLE)) - ,m_aFrame (this, ModuleRes(FL_FRAME)) - ,m_aSelectTableLabel (this, ModuleRes(FT_SELECTTABLE_LABEL)) - ,m_aSelectTable (this, ModuleRes(LB_SELECTTABLE)) + ,m_aFrame (this, ModuleRes(FL_FRAME)) + ,m_aSelectTableLabel (this, ModuleRes(FT_SELECTTABLE_LABEL)) + ,m_aSelectTable (this, ModuleRes(LB_SELECTTABLE)) { FreeResource(); @@ -380,12 +380,12 @@ namespace dbp //--------------------------------------------------------------------- OContentFieldSelection::OContentFieldSelection( OListComboWizard* _pParent ) :OLCPage(_pParent, ModuleRes(RID_PAGE_LCW_CONTENTSELECTION_FIELD)) - ,m_aFrame (this, ModuleRes(FL_FRAME)) - ,m_aTableFields (this, ModuleRes(FT_TABLEFIELDS)) - ,m_aSelectTableField (this, ModuleRes(LB_SELECTFIELD)) - ,m_aDisplayedFieldLabel (this, ModuleRes(FT_DISPLAYEDFIELD)) - ,m_aDisplayedField (this, ModuleRes(ET_DISPLAYEDFIELD)) - ,m_aInfo (this, ModuleRes(FT_CONTENTFIELD_INFO)) + ,m_aFrame (this, ModuleRes(FL_FRAME)) + ,m_aTableFields (this, ModuleRes(FT_TABLEFIELDS)) + ,m_aSelectTableField (this, ModuleRes(LB_SELECTFIELD)) + ,m_aDisplayedFieldLabel (this, ModuleRes(FT_DISPLAYEDFIELD)) + ,m_aDisplayedField (this, ModuleRes(ET_DISPLAYEDFIELD)) + ,m_aInfo (this, ModuleRes(FT_CONTENTFIELD_INFO)) { m_aInfo.SetText(String(ModuleRes( isListBox() ? STR_FIELDINFO_LISTBOX : STR_FIELDINFO_COMBOBOX))); FreeResource(); @@ -454,12 +454,12 @@ namespace dbp //--------------------------------------------------------------------- OLinkFieldsPage::OLinkFieldsPage( OListComboWizard* _pParent ) :OLCPage(_pParent, ModuleRes(RID_PAGE_LCW_FIELDLINK)) - ,m_aDescription (this, ModuleRes(FT_FIELDLINK_DESC)) - ,m_aFrame (this, ModuleRes(FL_FRAME)) - ,m_aValueListFieldLabel (this, ModuleRes(FT_VALUELISTFIELD)) - ,m_aValueListField (this, ModuleRes(CMB_VALUELISTFIELD)) - ,m_aTableFieldLabel (this, ModuleRes(FT_TABLEFIELD)) - ,m_aTableField (this, ModuleRes(CMB_TABLEFIELD)) + ,m_aDescription (this, ModuleRes(FT_FIELDLINK_DESC)) + ,m_aFrame (this, ModuleRes(FL_FRAME)) + ,m_aValueListFieldLabel (this, ModuleRes(FT_VALUELISTFIELD)) + ,m_aValueListField (this, ModuleRes(CMB_VALUELISTFIELD)) + ,m_aTableFieldLabel (this, ModuleRes(FT_TABLEFIELD)) + ,m_aTableField (this, ModuleRes(CMB_TABLEFIELD)) { FreeResource(); @@ -558,7 +558,7 @@ namespace dbp } //......................................................................... -} // namespace dbp +} // namespace dbp //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/dbpilots/listcombowizard.hxx b/extensions/source/dbpilots/listcombowizard.hxx index 67e32b50ba88..2f0ff8f85be1 100644 --- a/extensions/source/dbpilots/listcombowizard.hxx +++ b/extensions/source/dbpilots/listcombowizard.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,21 +37,21 @@ namespace dbp { //......................................................................... -#define LCW_STATE_DATASOURCE_SELECTION 0 -#define LCW_STATE_TABLESELECTION 1 -#define LCW_STATE_FIELDSELECTION 2 -#define LCW_STATE_FIELDLINK 3 -#define LCW_STATE_COMBODBFIELD 4 +#define LCW_STATE_DATASOURCE_SELECTION 0 +#define LCW_STATE_TABLESELECTION 1 +#define LCW_STATE_FIELDSELECTION 2 +#define LCW_STATE_FIELDLINK 3 +#define LCW_STATE_COMBODBFIELD 4 //===================================================================== //= OListComboSettings //===================================================================== struct OListComboSettings : public OControlWizardSettings { - String sListContentTable; - String sListContentField; - String sLinkedFormField; - String sLinkedListField; + String sListContentTable; + String sListContentField; + String sLinkedFormField; + String sLinkedListField; }; //===================================================================== @@ -60,9 +60,9 @@ namespace dbp class OListComboWizard : public OControlWizard { protected: - OListComboSettings m_aSettings; - sal_Bool m_bListBox : 1; - sal_Bool m_bHadDataSelection : 1; + OListComboSettings m_aSettings; + sal_Bool m_bListBox : 1; + sal_Bool m_bHadDataSelection : 1; public: OListComboWizard( @@ -77,10 +77,10 @@ namespace dbp protected: // OWizardMachine overridables - virtual ::svt::OWizardPage* createPage( WizardState _nState ); - virtual WizardState determineNextState( WizardState _nCurrentState ) const; - virtual void enterState( WizardState _nState ); - virtual sal_Bool leaveState( WizardState _nState ); + virtual ::svt::OWizardPage* createPage( WizardState _nState ); + virtual WizardState determineNextState( WizardState _nCurrentState ) const; + virtual void enterState( WizardState _nState ); + virtual sal_Bool leaveState( WizardState _nState ); virtual sal_Bool onFinish(); virtual sal_Bool approveControl(sal_Int16 _nClassId); @@ -116,9 +116,9 @@ namespace dbp class OContentTableSelection : public OLCPage { protected: - FixedLine m_aFrame; - FixedText m_aSelectTableLabel; - ListBox m_aSelectTable; + FixedLine m_aFrame; + FixedText m_aSelectTableLabel; + ListBox m_aSelectTable; public: OContentTableSelection( OListComboWizard* _pParent ); @@ -128,8 +128,8 @@ namespace dbp virtual void ActivatePage(); // OWizardPage overridables - virtual void initializePage(); - virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ); + virtual void initializePage(); + virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ); virtual bool canAdvance() const; protected: @@ -143,12 +143,12 @@ namespace dbp class OContentFieldSelection : public OLCPage { protected: - FixedLine m_aFrame; - FixedText m_aTableFields; - ListBox m_aSelectTableField; - FixedText m_aDisplayedFieldLabel; - Edit m_aDisplayedField; - FixedText m_aInfo; + FixedLine m_aFrame; + FixedText m_aTableFields; + ListBox m_aSelectTableField; + FixedText m_aDisplayedFieldLabel; + Edit m_aDisplayedField; + FixedText m_aInfo; public: @@ -162,8 +162,8 @@ namespace dbp virtual void ActivatePage(); // OWizardPage overridables - virtual void initializePage(); - virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ); + virtual void initializePage(); + virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ); virtual bool canAdvance() const; }; @@ -173,12 +173,12 @@ namespace dbp class OLinkFieldsPage : public OLCPage { protected: - FixedText m_aDescription; - FixedLine m_aFrame; - FixedText m_aValueListFieldLabel; - ComboBox m_aValueListField; - FixedText m_aTableFieldLabel; - ComboBox m_aTableField; + FixedText m_aDescription; + FixedLine m_aFrame; + FixedText m_aValueListFieldLabel; + ComboBox m_aValueListField; + FixedText m_aTableFieldLabel; + ComboBox m_aTableField; public: @@ -189,8 +189,8 @@ namespace dbp virtual void ActivatePage(); // OWizardPage overridables - virtual void initializePage(); - virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ); + virtual void initializePage(); + virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ); virtual bool canAdvance() const; private: @@ -221,7 +221,7 @@ namespace dbp }; //......................................................................... -} // namespace dbp +} // namespace dbp //......................................................................... #endif // _EXTENSIONS_DBP_LISTCOMBOWIZARD_HXX_ diff --git a/extensions/source/dbpilots/moduledbp.cxx b/extensions/source/dbpilots/moduledbp.cxx index 6fb06c7f68ac..ead9753193f4 100644 --- a/extensions/source/dbpilots/moduledbp.cxx +++ b/extensions/source/dbpilots/moduledbp.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/extensions/source/dbpilots/optiongrouplayouter.cxx b/extensions/source/dbpilots/optiongrouplayouter.cxx index 13c453243d0f..7bc1f84cf91d 100644 --- a/extensions/source/dbpilots/optiongrouplayouter.cxx +++ b/extensions/source/dbpilots/optiongrouplayouter.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,11 +48,11 @@ namespace dbp { //......................................................................... -#define BUTTON_HEIGHT 300 -#define TOP_HEIGHT 300 -#define HEIGHT 450 -#define OFFSET 300 -#define MIN_WIDTH 600 +#define BUTTON_HEIGHT 300 +#define TOP_HEIGHT 300 +#define HEIGHT 450 +#define OFFSET 300 +#define MIN_WIDTH 600 using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing; @@ -212,7 +212,7 @@ namespace dbp } //......................................................................... -} // namespace dbp +} // namespace dbp //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/dbpilots/optiongrouplayouter.hxx b/extensions/source/dbpilots/optiongrouplayouter.hxx index 0d38149146a5..52b6e7bfc315 100644 --- a/extensions/source/dbpilots/optiongrouplayouter.hxx +++ b/extensions/source/dbpilots/optiongrouplayouter.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,19 +57,19 @@ namespace dbp ); public: - void doLayout( + void doLayout( const OControlWizardContext& _rContext, const OOptionGroupSettings& _rSettings ); protected: - void implAnchorShape( + void implAnchorShape( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxShapeProps ); }; //......................................................................... -} // namespace dbp +} // namespace dbp //......................................................................... #endif // _EXTENSIONS_DBP_OPTIONGROUPLAYOUTER_HXX_ diff --git a/extensions/source/dbpilots/unoautopilot.hxx b/extensions/source/dbpilots/unoautopilot.hxx index b55d9ae34b7d..bfa4e0cfed6d 100644 --- a/extensions/source/dbpilots/unoautopilot.hxx +++ b/extensions/source/dbpilots/unoautopilot.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,7 +49,7 @@ namespace dbp struct IServiceInfo { public: - ::rtl::OUString getImplementationName() const; + ::rtl::OUString getImplementationName() const; ::com::sun::star::uno::Sequence< ::rtl::OUString > getServiceNames() const; }; @@ -57,7 +57,7 @@ namespace dbp //===================================================================== //= OUnoAutoPilot //===================================================================== - typedef ::svt::OGenericUnoDialog OUnoAutoPilot_Base; + typedef ::svt::OGenericUnoDialog OUnoAutoPilot_Base; template <class TYPE, class SERVICEINFO> class OUnoAutoPilot :public OUnoAutoPilot_Base @@ -93,14 +93,14 @@ namespace dbp protected: // OGenericUnoDialog overridables - virtual Dialog* createDialog(Window* _pParent); + virtual Dialog* createDialog(Window* _pParent); virtual void implInitialize(const com::sun::star::uno::Any& _rValue); }; #include "unoautopilot.inl" //......................................................................... -} // namespace dbp +} // namespace dbp //......................................................................... #endif // _EXTENSIONS_DBP_UNOAUTOPILOT_HXX_ diff --git a/extensions/source/dbpilots/unoautopilot.inl b/extensions/source/dbpilots/unoautopilot.inl index 0e3a953bcad1..cc1fa0eba310 100644 --- a/extensions/source/dbpilots/unoautopilot.inl +++ b/extensions/source/dbpilots/unoautopilot.inl @@ -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 @@ -111,7 +111,7 @@ template <class TYPE, class SERVICEINFO> //-------------------------------------------------------------------------- template <class TYPE, class SERVICEINFO> -Dialog* OUnoAutoPilot<TYPE, SERVICEINFO>::createDialog(Window* _pParent) +Dialog* OUnoAutoPilot<TYPE, SERVICEINFO>::createDialog(Window* _pParent) { return new TYPE(_pParent, m_xObjectModel, m_aContext.getLegacyServiceFactory()); } diff --git a/extensions/source/dbpilots/wizardcontext.hxx b/extensions/source/dbpilots/wizardcontext.hxx index 07d8fb0920c2..93cc936bdd73 100644 --- a/extensions/source/dbpilots/wizardcontext.hxx +++ b/extensions/source/dbpilots/wizardcontext.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 @@ -86,7 +86,7 @@ namespace dbp }; //......................................................................... -} // namespace dbp +} // namespace dbp //......................................................................... #endif // _EXTENSIONS_DBP_WIZARDCONTEXT_HXX_ diff --git a/extensions/source/dbpilots/wizardservices.cxx b/extensions/source/dbpilots/wizardservices.cxx index 23d0c2b6c80b..b90e47478fc3 100644 --- a/extensions/source/dbpilots/wizardservices.cxx +++ b/extensions/source/dbpilots/wizardservices.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,7 +116,7 @@ namespace dbp } //......................................................................... -} // namespace dbp +} // namespace dbp //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/dbpilots/wizardservices.hxx b/extensions/source/dbpilots/wizardservices.hxx index 23f71d2722cc..48c57115b1c8 100644 --- a/extensions/source/dbpilots/wizardservices.hxx +++ b/extensions/source/dbpilots/wizardservices.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 dbp struct OGroupBoxSI { public: - ::rtl::OUString getImplementationName() const; + ::rtl::OUString getImplementationName() const; ::com::sun::star::uno::Sequence< ::rtl::OUString > getServiceNames() const; }; @@ -56,7 +56,7 @@ namespace dbp struct OListComboSI { public: - ::rtl::OUString getImplementationName() const; + ::rtl::OUString getImplementationName() const; ::com::sun::star::uno::Sequence< ::rtl::OUString > getServiceNames() const; }; @@ -68,13 +68,13 @@ namespace dbp struct OGridSI { public: - ::rtl::OUString getImplementationName() const; + ::rtl::OUString getImplementationName() const; ::com::sun::star::uno::Sequence< ::rtl::OUString > getServiceNames() const; }; //......................................................................... -} // namespace dbp +} // namespace dbp //......................................................................... #endif // _EXTENSIONS_DBW_WIZARDSERVICES_HXX_ |