diff options
author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-22 21:20:15 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-23 03:38:49 +0000 |
commit | 0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf (patch) | |
tree | 5024cba9f9ea5e3b23ea26025323f6aef39488d0 /extensions/source/dbpilots | |
parent | b81ac16e65b311d6e43c05c22c65d2040c9d7e04 (diff) |
Remove unneccessary comments
Change-Id: I939160ae72fecbe3d4a60ce755730bd4c38497fb
Reviewed-on: https://gerrit.libreoffice.org/8182
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'extensions/source/dbpilots')
-rw-r--r-- | extensions/source/dbpilots/commonpagesdbp.cxx | 42 | ||||
-rw-r--r-- | extensions/source/dbpilots/controlwizard.cxx | 60 | ||||
-rw-r--r-- | extensions/source/dbpilots/dbpservices.cxx | 8 | ||||
-rw-r--r-- | extensions/source/dbpilots/dbptools.cxx | 2 | ||||
-rw-r--r-- | extensions/source/dbpilots/gridwizard.cxx | 36 | ||||
-rw-r--r-- | extensions/source/dbpilots/groupboxwiz.cxx | 64 | ||||
-rw-r--r-- | extensions/source/dbpilots/listcombowizard.cxx | 70 | ||||
-rw-r--r-- | extensions/source/dbpilots/optiongrouplayouter.cxx | 6 | ||||
-rw-r--r-- | extensions/source/dbpilots/wizardservices.cxx | 12 |
9 files changed, 150 insertions, 150 deletions
diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx index 4f22bb08a27f..c620a1a95c16 100644 --- a/extensions/source/dbpilots/commonpagesdbp.cxx +++ b/extensions/source/dbpilots/commonpagesdbp.cxx @@ -57,7 +57,7 @@ namespace dbp //===================================================================== //= OTableSelectionPage //===================================================================== - //--------------------------------------------------------------------- + OTableSelectionPage::OTableSelectionPage(OControlWizard* _pParent) :OControlWizardPage(_pParent, ModuleRes(RID_PAGE_TABLESELECTION)) ,m_aData (this, ModuleRes(FL_DATA)) @@ -80,14 +80,14 @@ namespace dbp m_aDatasource.SetDropDownLineCount(10); } - //--------------------------------------------------------------------- + void OTableSelectionPage::ActivatePage() { OControlWizardPage::ActivatePage(); m_aDatasource.GrabFocus(); } - //--------------------------------------------------------------------- + bool OTableSelectionPage::canAdvance() const { if (!OControlWizardPage::canAdvance()) @@ -102,7 +102,7 @@ namespace dbp return true; } - //--------------------------------------------------------------------- + void OTableSelectionPage::initializePage() { OControlWizardPage::initializePage(); @@ -152,7 +152,7 @@ namespace dbp } } - //--------------------------------------------------------------------- + sal_Bool OTableSelectionPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) { if (!OControlWizardPage::commitPage(_eReason)) @@ -189,7 +189,7 @@ namespace dbp return sal_True; } - //--------------------------------------------------------------------- + IMPL_LINK( OTableSelectionPage, OnSearchClicked, PushButton*, /*_pButton*/ ) { ::sfx2::FileDialogHelper aFileDlg( @@ -214,7 +214,7 @@ namespace dbp } return 0L; } - //--------------------------------------------------------------------- + IMPL_LINK( OTableSelectionPage, OnListboxDoubleClicked, ListBox*, _pBox ) { if (_pBox->GetSelectEntryCount()) @@ -222,7 +222,7 @@ namespace dbp return 0L; } - //--------------------------------------------------------------------- + IMPL_LINK( OTableSelectionPage, OnListboxSelection, ListBox*, _pBox ) { if (&m_aDatasource == _pBox) @@ -238,7 +238,7 @@ namespace dbp return 0L; } - //--------------------------------------------------------------------- + namespace { void lcl_fillEntries( ListBox& _rListBox, const Sequence< OUString >& _rNames, const Image& _rImage, sal_Int32 _nCommandType ) @@ -254,7 +254,7 @@ namespace dbp } } - //--------------------------------------------------------------------- + void OTableSelectionPage::implFillTables(const Reference< XConnection >& _rxConn) { m_aTable.Clear(); @@ -369,7 +369,7 @@ namespace dbp lcl_fillEntries( m_aTable, aQueryNames, aQueryImage, CommandType::QUERY ); } - //--------------------------------------------------------------------- + void OTableSelectionPage::implCollectDatasource() { try @@ -387,7 +387,7 @@ namespace dbp //===================================================================== //= OMaybeListSelectionPage //===================================================================== - //--------------------------------------------------------------------- + OMaybeListSelectionPage::OMaybeListSelectionPage( OControlWizard* _pParent, const ResId& _rId ) :OControlWizardPage(_pParent, _rId) ,m_pYes(NULL) @@ -396,7 +396,7 @@ namespace dbp { } - //--------------------------------------------------------------------- + void OMaybeListSelectionPage::announceControls(RadioButton& _rYesButton, RadioButton& _rNoButton, ListBox& _rSelection) { m_pYes = &_rYesButton; @@ -408,14 +408,14 @@ namespace dbp implEnableWindows(); } - //--------------------------------------------------------------------- + IMPL_LINK( OMaybeListSelectionPage, OnRadioSelected, RadioButton*, /*NOTINTERESTEDIN*/ ) { implEnableWindows(); return 0L; } - //--------------------------------------------------------------------- + void OMaybeListSelectionPage::implInitialize(const OUString& _rSelection) { DBG_ASSERT(m_pYes, "OMaybeListSelectionPage::implInitialize: no controls announced!"); @@ -427,19 +427,19 @@ namespace dbp m_pList->SelectEntry(bIsSelection ? _rSelection : OUString()); } - //--------------------------------------------------------------------- + void OMaybeListSelectionPage::implCommit(OUString& _rSelection) { _rSelection = m_pYes->IsChecked() ? m_pList->GetSelectEntry() : OUString(); } - //--------------------------------------------------------------------- + void OMaybeListSelectionPage::implEnableWindows() { m_pList->Enable(m_pYes->IsChecked()); } - //--------------------------------------------------------------------- + void OMaybeListSelectionPage::ActivatePage() { OControlWizardPage::ActivatePage(); @@ -454,7 +454,7 @@ namespace dbp //===================================================================== //= ODBFieldPage //===================================================================== - //--------------------------------------------------------------------- + ODBFieldPage::ODBFieldPage( OControlWizard* _pParent ) :OMaybeListSelectionPage(_pParent, ModuleRes(RID_PAGE_OPTION_DBFIELD)) ,m_aFrame (this, ModuleRes(FL_DATABASEFIELD_EXPL)) @@ -469,7 +469,7 @@ namespace dbp m_aStoreWhere.SetDropDownLineCount(10); } - //--------------------------------------------------------------------- + void ODBFieldPage::initializePage() { OMaybeListSelectionPage::initializePage(); @@ -480,7 +480,7 @@ namespace dbp implInitialize(getDBFieldSetting()); } - //--------------------------------------------------------------------- + sal_Bool ODBFieldPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) { if (!OMaybeListSelectionPage::commitPage(_eReason)) diff --git a/extensions/source/dbpilots/controlwizard.cxx b/extensions/source/dbpilots/controlwizard.cxx index 1b7b1d6c0248..68eb40f83366 100644 --- a/extensions/source/dbpilots/controlwizard.cxx +++ b/extensions/source/dbpilots/controlwizard.cxx @@ -81,7 +81,7 @@ namespace dbp //===================================================================== //= OControlWizardPage //===================================================================== - //--------------------------------------------------------------------- + OControlWizardPage::OControlWizardPage( OControlWizard* _pParent, const ResId& _rResId ) :OControlWizardPage_Base( _pParent, _rResId ) ,m_pFormSettingsSeparator(NULL) @@ -94,7 +94,7 @@ namespace dbp { } - //--------------------------------------------------------------------- + OControlWizardPage::~OControlWizardPage() { delete m_pFormSettingsSeparator; @@ -106,43 +106,43 @@ namespace dbp delete m_pFormTable; } - //--------------------------------------------------------------------- + OControlWizard* OControlWizardPage::getDialog() { return static_cast< OControlWizard* >(GetParent()); } - //--------------------------------------------------------------------- + const OControlWizard* OControlWizardPage::getDialog() const { return static_cast< OControlWizard* >(GetParent()); } - //--------------------------------------------------------------------- + sal_Bool OControlWizardPage::updateContext() { return getDialog()->updateContext(OAccessRegulator()); } - //--------------------------------------------------------------------- + Reference< XConnection > OControlWizardPage::getFormConnection() const { return getDialog()->getFormConnection(OAccessRegulator()); } - //--------------------------------------------------------------------- + void OControlWizardPage::setFormConnection( const Reference< XConnection >& _rxConn, sal_Bool _bAutoDispose ) { getDialog()->setFormConnection( OAccessRegulator(), _rxConn, _bAutoDispose ); } - //--------------------------------------------------------------------- + const OControlWizardContext& OControlWizardPage::getContext() { return getDialog()->getContext(); } - //--------------------------------------------------------------------- + void OControlWizardPage::fillListBox(ListBox& _rList, const Sequence< OUString >& _rItems, sal_Bool _bClear) { if (_bClear) @@ -158,7 +158,7 @@ namespace dbp } } - //--------------------------------------------------------------------- + void OControlWizardPage::fillListBox(ComboBox& _rList, const Sequence< OUString >& _rItems, sal_Bool _bClear) { if (_bClear) @@ -174,7 +174,7 @@ namespace dbp } } - //--------------------------------------------------------------------- + void OControlWizardPage::enableFormDatasourceDisplay() { if (m_pFormSettingsSeparator) @@ -204,7 +204,7 @@ namespace dbp } } - //--------------------------------------------------------------------- + void OControlWizardPage::adjustControlForNoDSDisplay(Control* _pControl, sal_Bool _bConstLowerDistance) { ::Size aDistanceToMove = LogicToPixel( ::Size( 0, 37 ), MAP_APPFONT ); @@ -221,7 +221,7 @@ namespace dbp } } - //--------------------------------------------------------------------- + void OControlWizardPage::initializePage() { if (m_pFormDatasource && m_pFormContentTypeLabel && m_pFormTable) @@ -271,7 +271,7 @@ namespace dbp //===================================================================== //= OControlWizard //===================================================================== - //--------------------------------------------------------------------- + OControlWizard::OControlWizard( Window* _pParent, const ResId& _rId, const Reference< XPropertySet >& _rxObjectModel, const Reference< XComponentContext >& _rxContext ) :OWizardMachine(_pParent, _rId, WZB_CANCEL | WZB_PREVIOUS | WZB_NEXT | WZB_FINISH) @@ -286,12 +286,12 @@ namespace dbp enableButtons(WZB_FINISH, sal_False); } - //--------------------------------------------------------------------- + OControlWizard::~OControlWizard() { } - //--------------------------------------------------------------------- + short OControlWizard::Execute() { // get the class id of the control we're dealing with @@ -315,13 +315,13 @@ namespace dbp return OControlWizard_Base::Execute(); } - //--------------------------------------------------------------------- + void OControlWizard::ActivatePage() { OControlWizard_Base::ActivatePage(); } - //--------------------------------------------------------------------- + void OControlWizard::implDetermineShape() { Reference< XIndexAccess > xPageObjects(m_aContext.xDrawPage, UNO_QUERY); @@ -352,7 +352,7 @@ namespace dbp } } - //--------------------------------------------------------------------- + void OControlWizard::implDetermineForm() { Reference< XChild > xModelAsChild(m_aContext.xObjectModel, UNO_QUERY); @@ -367,7 +367,7 @@ namespace dbp } - //--------------------------------------------------------------------- + void OControlWizard::implDeterminePage() { try @@ -430,7 +430,7 @@ namespace dbp } } - //--------------------------------------------------------------------- + void OControlWizard::implGetDSContext() { try @@ -445,12 +445,12 @@ namespace dbp } } - //--------------------------------------------------------------------- + Reference< XConnection > OControlWizard::getFormConnection(const OAccessRegulator&) const { return getFormConnection(); } - //--------------------------------------------------------------------- + Reference< XConnection > OControlWizard::getFormConnection() const { Reference< XConnection > xConn; @@ -466,7 +466,7 @@ namespace dbp return xConn; } - //--------------------------------------------------------------------- + void OControlWizard::setFormConnection( const OAccessRegulator& _rAccess, const Reference< XConnection >& _rxConn, sal_Bool _bAutoDispose ) { try @@ -496,12 +496,12 @@ namespace dbp } } - //--------------------------------------------------------------------- + sal_Bool OControlWizard::updateContext(const OAccessRegulator&) { return initContext(); } - //--------------------------------------------------------------------- + Reference< XInteractionHandler > OControlWizard::getInteractionHandler(Window* _pWindow) const { Reference< XInteractionHandler > xHandler; @@ -517,7 +517,7 @@ namespace dbp } return xHandler; } - //--------------------------------------------------------------------- + sal_Bool OControlWizard::initContext() { DBG_ASSERT(m_aContext.xObjectModel.is(), "OGroupBoxWizard::initContext: have no control model to work with!"); @@ -673,7 +673,7 @@ namespace dbp return 0 != m_aContext.aFieldNames.getLength(); } - //--------------------------------------------------------------------- + void OControlWizard::commitControlSettings(OControlWizardSettings* _pSettings) { DBG_ASSERT(m_aContext.xObjectModel.is(), "OControlWizard::commitControlSettings: have no control model to work with!"); @@ -700,7 +700,7 @@ namespace dbp } } - //--------------------------------------------------------------------- + void OControlWizard::initControlSettings(OControlWizardSettings* _pSettings) { DBG_ASSERT(m_aContext.xObjectModel.is(), "OControlWizard::initControlSettings: have no control model to work with!"); @@ -725,7 +725,7 @@ namespace dbp } } - //--------------------------------------------------------------------- + sal_Bool OControlWizard::needDatasourceSelection() { // lemme see ... diff --git a/extensions/source/dbpilots/dbpservices.cxx b/extensions/source/dbpilots/dbpservices.cxx index 7446afc84901..ea8841218874 100644 --- a/extensions/source/dbpilots/dbpservices.cxx +++ b/extensions/source/dbpilots/dbpservices.cxx @@ -19,20 +19,20 @@ #include "componentmodule.hxx" -//--------------------------------------------------------------------------------------- + using namespace ::rtl; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::registry; -//--------------------------------------------------------------------------------------- + extern "C" void SAL_CALL createRegistryInfo_OGroupBoxWizard(); extern "C" void SAL_CALL createRegistryInfo_OListComboWizard(); extern "C" void SAL_CALL createRegistryInfo_OGridWizard(); -//--------------------------------------------------------------------------------------- + extern "C" void SAL_CALL dbp_initializeModule() { @@ -47,7 +47,7 @@ extern "C" void SAL_CALL dbp_initializeModule() } } -//--------------------------------------------------------------------------------------- + extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL dbp_component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, diff --git a/extensions/source/dbpilots/dbptools.cxx b/extensions/source/dbpilots/dbptools.cxx index c6dafd944dd1..b19f6fc8916a 100644 --- a/extensions/source/dbpilots/dbptools.cxx +++ b/extensions/source/dbpilots/dbptools.cxx @@ -28,7 +28,7 @@ namespace dbp using namespace ::com::sun::star::uno; using namespace ::com::sun::star::container; - //--------------------------------------------------------------------- + void disambiguateName(const Reference< XNameAccess >& _rxContainer, OUString& _rElementsName) { DBG_ASSERT(_rxContainer.is(), "::dbp::disambiguateName: invalid container!"); diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx index a0be0271591b..dbddd51b2e28 100644 --- a/extensions/source/dbpilots/gridwizard.cxx +++ b/extensions/source/dbpilots/gridwizard.cxx @@ -51,7 +51,7 @@ namespace dbp //===================================================================== //= OGridWizard //===================================================================== - //--------------------------------------------------------------------- + OGridWizard::OGridWizard( Window* _pParent, const Reference< XPropertySet >& _rxObjectModel, const Reference< XComponentContext >& _rxContext ) :OControlWizard(_pParent, ModuleRes(RID_DLG_GRIDWIZARD), _rxObjectModel, _rxContext) @@ -72,7 +72,7 @@ namespace dbp } } - //--------------------------------------------------------------------- + sal_Bool OGridWizard::approveControl(sal_Int16 _nClassId) { if (FormComponentType::GRIDCONTROL != _nClassId) @@ -85,7 +85,7 @@ namespace dbp return sal_True; } - //--------------------------------------------------------------------- + void OGridWizard::implApplySettings() { const OControlWizardContext& rContext = getContext(); @@ -225,7 +225,7 @@ namespace dbp } } - //--------------------------------------------------------------------- + OWizardPage* OGridWizard::createPage(WizardState _nState) { switch (_nState) @@ -239,7 +239,7 @@ namespace dbp return NULL; } - //--------------------------------------------------------------------- + WizardTypes::WizardState OGridWizard::determineNextState( WizardState _nCurrentState ) const { switch (_nCurrentState) @@ -253,7 +253,7 @@ namespace dbp return WZS_INVALID_STATE; } - //--------------------------------------------------------------------- + void OGridWizard::enterState(WizardState _nState) { OControlWizard::enterState(_nState); @@ -267,7 +267,7 @@ namespace dbp defaultButton(WZB_FINISH); } - //--------------------------------------------------------------------- + sal_Bool OGridWizard::leaveState(WizardState _nState) { if (!OControlWizard::leaveState(_nState)) @@ -279,7 +279,7 @@ namespace dbp return sal_True; } - //--------------------------------------------------------------------- + sal_Bool OGridWizard::onFinish() { if ( !OControlWizard::onFinish() ) @@ -293,7 +293,7 @@ namespace dbp //===================================================================== //= OGridFieldsSelection //===================================================================== - //--------------------------------------------------------------------- + OGridFieldsSelection::OGridFieldsSelection( OGridWizard* _pParent ) :OGridPage(_pParent, ModuleRes(RID_PAGE_GW_FIELDSELECTION)) ,m_aFrame (this, ModuleRes(FL_FRAME)) @@ -321,21 +321,21 @@ namespace dbp m_aSelFields.SetDoubleClickHdl(LINK(this, OGridFieldsSelection, OnEntryDoubleClicked)); } - //--------------------------------------------------------------------- + void OGridFieldsSelection::ActivatePage() { OGridPage::ActivatePage(); m_aExistFields.GrabFocus(); } - //--------------------------------------------------------------------- + bool OGridFieldsSelection::canAdvance() const { return false; // we're the last page in our wizard } - //--------------------------------------------------------------------- + void OGridFieldsSelection::initializePage() { OGridPage::initializePage(); @@ -356,7 +356,7 @@ namespace dbp implCheckButtons(); } - //--------------------------------------------------------------------- + sal_Bool OGridFieldsSelection::commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) { if (!OGridPage::commitPage(_eReason)) @@ -374,7 +374,7 @@ namespace dbp return sal_True; } - //--------------------------------------------------------------------- + void OGridFieldsSelection::implCheckButtons() { m_aSelectOne.Enable(m_aExistFields.GetSelectEntryCount() != 0); @@ -386,7 +386,7 @@ namespace dbp getDialog()->enableButtons(WZB_FINISH, 0 != m_aSelFields.GetEntryCount()); } - //--------------------------------------------------------------------- + IMPL_LINK(OGridFieldsSelection, OnEntryDoubleClicked, ListBox*, _pList) { PushButton* pSimulateButton = &m_aExistFields == _pList ? &m_aSelectOne : &m_aDeselectOne; @@ -396,14 +396,14 @@ namespace dbp return 1L; } - //--------------------------------------------------------------------- + IMPL_LINK(OGridFieldsSelection, OnEntrySelected, ListBox*, /*NOTINTERESTEDIN*/) { implCheckButtons(); return 0L; } - //--------------------------------------------------------------------- + IMPL_LINK(OGridFieldsSelection, OnMoveOneEntry, PushButton*, _pButton) { sal_Bool bMoveRight = (&m_aSelectOne == _pButton); @@ -458,7 +458,7 @@ namespace dbp return 0; } - //--------------------------------------------------------------------- + IMPL_LINK(OGridFieldsSelection, OnMoveAllEntries, PushButton*, _pButton) { sal_Bool bMoveRight = (&m_aSelectAll == _pButton); diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx index 9f108883050e..7c142f81525b 100644 --- a/extensions/source/dbpilots/groupboxwiz.cxx +++ b/extensions/source/dbpilots/groupboxwiz.cxx @@ -46,7 +46,7 @@ namespace dbp //===================================================================== //= OGroupBoxWizard //===================================================================== - //--------------------------------------------------------------------- + OGroupBoxWizard::OGroupBoxWizard( Window* _pParent, const Reference< XPropertySet >& _rxObjectModel, const Reference< XComponentContext >& _rxContext ) :OControlWizard(_pParent, ModuleRes(RID_DLG_GROUPBOXWIZARD), _rxObjectModel, _rxContext) @@ -61,13 +61,13 @@ namespace dbp m_pFinish->SetHelpId(HID_GROUPWIZARD_FINISH); } - //--------------------------------------------------------------------- + sal_Bool OGroupBoxWizard::approveControl(sal_Int16 _nClassId) { return FormComponentType::GROUPBOX == _nClassId; } - //--------------------------------------------------------------------- + OWizardPage* OGroupBoxWizard::createPage(::svt::WizardTypes::WizardState _nState) { switch (_nState) @@ -91,7 +91,7 @@ namespace dbp return NULL; } - //--------------------------------------------------------------------- + WizardTypes::WizardState OGroupBoxWizard::determineNextState( ::svt::WizardTypes::WizardState _nCurrentState ) const { switch (_nCurrentState) @@ -115,7 +115,7 @@ namespace dbp return WZS_INVALID_STATE; } - //--------------------------------------------------------------------- + void OGroupBoxWizard::enterState(::svt::WizardTypes::WizardState _nState) { // some stuff to do before calling the base class (modifying our settings) @@ -155,7 +155,7 @@ namespace dbp OControlWizard::enterState(_nState); } - //--------------------------------------------------------------------- + void OGroupBoxWizard::createRadios() { try @@ -169,7 +169,7 @@ namespace dbp } } - //--------------------------------------------------------------------- + sal_Bool OGroupBoxWizard::onFinish() { // commit the basic control setttings @@ -184,7 +184,7 @@ namespace dbp //===================================================================== //= ORadioSelectionPage //===================================================================== - //--------------------------------------------------------------------- + ORadioSelectionPage::ORadioSelectionPage( OControlWizard* _pParent ) :OGBWPage(_pParent, ModuleRes(RID_PAGE_GROUPRADIOSELECTION)) ,m_aFrame (this, ModuleRes(FL_DATA)) @@ -226,14 +226,14 @@ namespace dbp m_aExistingRadios.SetAccessibleRelationLabeledBy(&m_aExistingRadiosLabel); } - //--------------------------------------------------------------------- + void ORadioSelectionPage::ActivatePage() { OGBWPage::ActivatePage(); m_aRadioName.GrabFocus(); } - //--------------------------------------------------------------------- + void ORadioSelectionPage::initializePage() { OGBWPage::initializePage(); @@ -247,7 +247,7 @@ namespace dbp implCheckMoveButtons(); } - //--------------------------------------------------------------------- + sal_Bool ORadioSelectionPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) { if (!OGBWPage::commitPage(_eReason)) @@ -269,7 +269,7 @@ namespace dbp return sal_True; } - //--------------------------------------------------------------------- + IMPL_LINK( ORadioSelectionPage, OnMoveEntry, PushButton*, _pButton ) { sal_Bool bMoveLeft = (&m_aMoveLeft == _pButton); @@ -294,27 +294,27 @@ namespace dbp return 0L; } - //--------------------------------------------------------------------- + IMPL_LINK( ORadioSelectionPage, OnEntrySelected, ListBox*, /*_pList*/ ) { implCheckMoveButtons(); return 0L; } - //--------------------------------------------------------------------- + IMPL_LINK( ORadioSelectionPage, OnNameModified, Edit*, /*_pList*/ ) { implCheckMoveButtons(); return 0L; } - //--------------------------------------------------------------------- + bool ORadioSelectionPage::canAdvance() const { return 0 != m_aExistingRadios.GetEntryCount(); } - //--------------------------------------------------------------------- + void ORadioSelectionPage::implCheckMoveButtons() { sal_Bool bHaveSome = (0 != m_aExistingRadios.GetEntryCount()); @@ -341,7 +341,7 @@ namespace dbp //===================================================================== //= ODefaultFieldSelectionPage //===================================================================== - //--------------------------------------------------------------------- + ODefaultFieldSelectionPage::ODefaultFieldSelectionPage( OControlWizard* _pParent ) :OMaybeListSelectionPage(_pParent, ModuleRes(RID_PAGE_DEFAULTFIELDSELECTION)) ,m_aFrame (this, ModuleRes(FL_DEFAULTSELECTION)) @@ -358,7 +358,7 @@ namespace dbp m_aDefSelection.SetAccessibleRelationMemberOf(&m_aDefaultSelectionLabel); } - //--------------------------------------------------------------------- + void ODefaultFieldSelectionPage::initializePage() { OMaybeListSelectionPage::initializePage(); @@ -377,7 +377,7 @@ namespace dbp implInitialize(rSettings.sDefaultField); } - //--------------------------------------------------------------------- + sal_Bool ODefaultFieldSelectionPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) { if (!OMaybeListSelectionPage::commitPage(_eReason)) @@ -392,7 +392,7 @@ namespace dbp //===================================================================== //= OOptionValuesPage //===================================================================== - //--------------------------------------------------------------------- + OOptionValuesPage::OOptionValuesPage( OControlWizard* _pParent ) :OGBWPage(_pParent, ModuleRes(RID_PAGE_OPTIONVALUES)) ,m_aFrame (this, ModuleRes(FL_OPTIONVALUES)) @@ -411,21 +411,21 @@ namespace dbp m_aOptions.SetAccessibleRelationLabeledBy(&m_aOptionsLabel); } - //--------------------------------------------------------------------- + IMPL_LINK( OOptionValuesPage, OnOptionSelected, ListBox*, /*NOTINTERESTEDIN*/ ) { implTraveledOptions(); return 0L; } - //--------------------------------------------------------------------- + void OOptionValuesPage::ActivatePage() { OGBWPage::ActivatePage(); m_aValue.GrabFocus(); } - //--------------------------------------------------------------------- + void OOptionValuesPage::implTraveledOptions() { if ((::svt::WizardTypes::WizardState)-1 != m_nLastSelection) @@ -440,7 +440,7 @@ namespace dbp m_aValue.SetText(m_aUncommittedValues[m_nLastSelection]); } - //--------------------------------------------------------------------- + void OOptionValuesPage::initializePage() { OGBWPage::initializePage(); @@ -467,7 +467,7 @@ namespace dbp implTraveledOptions(); } - //--------------------------------------------------------------------- + sal_Bool OOptionValuesPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) { if (!OGBWPage::commitPage(_eReason)) @@ -486,14 +486,14 @@ namespace dbp //===================================================================== //= OOptionDBFieldPage //===================================================================== - //--------------------------------------------------------------------- + OOptionDBFieldPage::OOptionDBFieldPage( OControlWizard* _pParent ) :ODBFieldPage(_pParent) { setDescriptionText(ModuleRes(RID_STR_GROUPWIZ_DBFIELD).toString()); } - //--------------------------------------------------------------------- + OUString& OOptionDBFieldPage::getDBFieldSetting() { return getSettings().sDBField; @@ -502,7 +502,7 @@ namespace dbp //===================================================================== //= OFinalizeGBWPage //===================================================================== - //--------------------------------------------------------------------- + OFinalizeGBWPage::OFinalizeGBWPage( OControlWizard* _pParent ) :OGBWPage(_pParent, ModuleRes(RID_PAGE_OPTIONS_FINAL)) ,m_aFrame (this, ModuleRes(FL_NAMEIT)) @@ -513,20 +513,20 @@ namespace dbp FreeResource(); } - //--------------------------------------------------------------------- + void OFinalizeGBWPage::ActivatePage() { OGBWPage::ActivatePage(); m_aName.GrabFocus(); } - //--------------------------------------------------------------------- + bool OFinalizeGBWPage::canAdvance() const { return false; } - //--------------------------------------------------------------------- + void OFinalizeGBWPage::initializePage() { OGBWPage::initializePage(); @@ -535,7 +535,7 @@ namespace dbp m_aName.SetText(rSettings.sControlLabel); } - //--------------------------------------------------------------------- + sal_Bool OFinalizeGBWPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) { if (!OGBWPage::commitPage(_eReason)) diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx index 9f42d6b7b855..d132c7651cfb 100644 --- a/extensions/source/dbpilots/listcombowizard.cxx +++ b/extensions/source/dbpilots/listcombowizard.cxx @@ -48,7 +48,7 @@ namespace dbp //===================================================================== //= OListComboWizard //===================================================================== - //--------------------------------------------------------------------- + OListComboWizard::OListComboWizard( Window* _pParent, const Reference< XPropertySet >& _rxObjectModel, const Reference< XComponentContext >& _rxContext ) :OControlWizard(_pParent, ModuleRes(RID_DLG_LISTCOMBOWIZARD), _rxObjectModel, _rxContext) @@ -70,7 +70,7 @@ namespace dbp } } - //--------------------------------------------------------------------- + sal_Bool OListComboWizard::approveControl(sal_Int16 _nClassId) { switch (_nClassId) @@ -87,7 +87,7 @@ namespace dbp return sal_False; } - //--------------------------------------------------------------------- + OWizardPage* OListComboWizard::createPage(WizardState _nState) { switch (_nState) @@ -107,7 +107,7 @@ namespace dbp return NULL; } - //--------------------------------------------------------------------- + WizardTypes::WizardState OListComboWizard::determineNextState( WizardState _nCurrentState ) const { switch (_nCurrentState) @@ -123,7 +123,7 @@ namespace dbp return WZS_INVALID_STATE; } - //--------------------------------------------------------------------- + void OListComboWizard::enterState(WizardState _nState) { OControlWizard::enterState(_nState); @@ -137,7 +137,7 @@ namespace dbp defaultButton(WZB_FINISH); } - //--------------------------------------------------------------------- + sal_Bool OListComboWizard::leaveState(WizardState _nState) { if (!OControlWizard::leaveState(_nState)) @@ -149,7 +149,7 @@ namespace dbp return sal_True; } - //--------------------------------------------------------------------- + void OListComboWizard::implApplySettings() { try @@ -209,7 +209,7 @@ namespace dbp } } - //--------------------------------------------------------------------- + sal_Bool OListComboWizard::onFinish() { if ( !OControlWizard::onFinish() ) @@ -222,7 +222,7 @@ namespace dbp //===================================================================== //= OLCPage //===================================================================== - //--------------------------------------------------------------------- + Reference< XNameAccess > OLCPage::getTables(sal_Bool _bNeedIt) { Reference< XConnection > xConn = getFormConnection(); @@ -239,7 +239,7 @@ namespace dbp return xTables; } - //--------------------------------------------------------------------- + Sequence< OUString > OLCPage::getTableFields(sal_Bool _bNeedIt) { Reference< XNameAccess > xTables = getTables(_bNeedIt); @@ -273,7 +273,7 @@ namespace dbp //===================================================================== //= OContentTableSelection //===================================================================== - //--------------------------------------------------------------------- + OContentTableSelection::OContentTableSelection( OListComboWizard* _pParent ) :OLCPage(_pParent, ModuleRes(RID_PAGE_LCW_CONTENTSELECTION_TABLE)) ,m_aFrame (this, ModuleRes(FL_FRAME)) @@ -288,14 +288,14 @@ namespace dbp m_aSelectTable.SetSelectHdl(LINK(this, OContentTableSelection, OnTableSelected)); } - //--------------------------------------------------------------------- + void OContentTableSelection::ActivatePage() { OLCPage::ActivatePage(); m_aSelectTable.GrabFocus(); } - //--------------------------------------------------------------------- + bool OContentTableSelection::canAdvance() const { if (!OLCPage::canAdvance()) @@ -304,14 +304,14 @@ namespace dbp return 0 != m_aSelectTable.GetSelectEntryCount(); } - //--------------------------------------------------------------------- + IMPL_LINK( OContentTableSelection, OnTableSelected, ListBox*, /*_pListBox*/ ) { updateDialogTravelUI(); return 0L; } - //--------------------------------------------------------------------- + IMPL_LINK( OContentTableSelection, OnTableDoubleClicked, ListBox*, _pListBox ) { if (_pListBox->GetSelectEntryCount()) @@ -319,7 +319,7 @@ namespace dbp return 0L; } - //--------------------------------------------------------------------- + void OContentTableSelection::initializePage() { OLCPage::initializePage(); @@ -342,7 +342,7 @@ namespace dbp m_aSelectTable.SelectEntry(getSettings().sListContentTable); } - //--------------------------------------------------------------------- + sal_Bool OContentTableSelection::commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) { if (!OLCPage::commitPage(_eReason)) @@ -360,7 +360,7 @@ namespace dbp //===================================================================== //= OContentFieldSelection //===================================================================== - //--------------------------------------------------------------------- + OContentFieldSelection::OContentFieldSelection( OListComboWizard* _pParent ) :OLCPage(_pParent, ModuleRes(RID_PAGE_LCW_CONTENTSELECTION_FIELD)) ,m_aFrame (this, ModuleRes(FL_FRAME)) @@ -376,14 +376,14 @@ namespace dbp m_aSelectTableField.SetDoubleClickHdl(LINK(this, OContentFieldSelection, OnTableDoubleClicked)); } - //--------------------------------------------------------------------- + void OContentFieldSelection::ActivatePage() { OLCPage::ActivatePage(); m_aTableFields.GrabFocus(); } - //--------------------------------------------------------------------- + void OContentFieldSelection::initializePage() { OLCPage::initializePage(); @@ -395,7 +395,7 @@ namespace dbp m_aDisplayedField.SetText(getSettings().sListContentField); } - //--------------------------------------------------------------------- + bool OContentFieldSelection::canAdvance() const { if (!OLCPage::canAdvance()) @@ -404,7 +404,7 @@ namespace dbp return 0 != m_aSelectTableField.GetSelectEntryCount(); } - //--------------------------------------------------------------------- + IMPL_LINK( OContentFieldSelection, OnTableDoubleClicked, ListBox*, /*NOTINTERESTEDIN*/ ) { if (m_aSelectTableField.GetSelectEntryCount()) @@ -412,7 +412,7 @@ namespace dbp return 0L; } - //--------------------------------------------------------------------- + IMPL_LINK( OContentFieldSelection, OnFieldSelected, ListBox*, /*NOTINTERESTEDIN*/ ) { updateDialogTravelUI(); @@ -420,7 +420,7 @@ namespace dbp return 0L; } - //--------------------------------------------------------------------- + sal_Bool OContentFieldSelection::commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) { if (!OLCPage::commitPage(_eReason)) @@ -434,7 +434,7 @@ namespace dbp //===================================================================== //= OLinkFieldsPage //===================================================================== - //--------------------------------------------------------------------- + OLinkFieldsPage::OLinkFieldsPage( OListComboWizard* _pParent ) :OLCPage(_pParent, ModuleRes(RID_PAGE_LCW_FIELDLINK)) ,m_aDescription (this, ModuleRes(FT_FIELDLINK_DESC)) @@ -452,14 +452,14 @@ namespace dbp m_aTableField.SetSelectHdl(LINK(this, OLinkFieldsPage, OnSelectionModified)); } - //--------------------------------------------------------------------- + void OLinkFieldsPage::ActivatePage() { OLCPage::ActivatePage(); m_aValueListField.GrabFocus(); } - //--------------------------------------------------------------------- + void OLinkFieldsPage::initializePage() { OLCPage::initializePage(); @@ -476,14 +476,14 @@ namespace dbp implCheckFinish(); } - //--------------------------------------------------------------------- + bool OLinkFieldsPage::canAdvance() const { // we're on the last page here, no travelNext allowed ... return false; } - //--------------------------------------------------------------------- + void OLinkFieldsPage::implCheckFinish() { bool bInvalidSelection = (COMBOBOX_ENTRY_NOTFOUND == m_aValueListField.GetEntryPos(m_aValueListField.GetText())); @@ -491,14 +491,14 @@ namespace dbp getDialog()->enableButtons(WZB_FINISH, !bInvalidSelection); } - //--------------------------------------------------------------------- + IMPL_LINK_NOARG(OLinkFieldsPage, OnSelectionModified) { implCheckFinish(); return 0L; } - //--------------------------------------------------------------------- + sal_Bool OLinkFieldsPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) { if (!OLCPage::commitPage(_eReason)) @@ -513,27 +513,27 @@ namespace dbp //===================================================================== //= OComboDBFieldPage //===================================================================== - //--------------------------------------------------------------------- + OComboDBFieldPage::OComboDBFieldPage( OControlWizard* _pParent ) :ODBFieldPage(_pParent) { setDescriptionText(ModuleRes(RID_STR_COMBOWIZ_DBFIELD).toString()); } - //--------------------------------------------------------------------- + OUString& OComboDBFieldPage::getDBFieldSetting() { return getSettings().sLinkedFormField; } - //--------------------------------------------------------------------- + void OComboDBFieldPage::ActivatePage() { ODBFieldPage::ActivatePage(); getDialog()->enableButtons(WZB_FINISH, sal_True); } - //--------------------------------------------------------------------- + bool OComboDBFieldPage::canAdvance() const { // we're on the last page here, no travelNext allowed ... diff --git a/extensions/source/dbpilots/optiongrouplayouter.cxx b/extensions/source/dbpilots/optiongrouplayouter.cxx index 34c3260daf81..91e929351b17 100644 --- a/extensions/source/dbpilots/optiongrouplayouter.cxx +++ b/extensions/source/dbpilots/optiongrouplayouter.cxx @@ -53,13 +53,13 @@ namespace dbp //===================================================================== //= OOptionGroupLayouter //===================================================================== - //--------------------------------------------------------------------- + OOptionGroupLayouter::OOptionGroupLayouter(const Reference< XComponentContext >& _rxContext) :mxContext(_rxContext) { } - //--------------------------------------------------------------------- + void OOptionGroupLayouter::doLayout(const OControlWizardContext& _rContext, const OOptionGroupSettings& _rSettings) { Reference< XShapes > xPageShapes(_rContext.xDrawPage, UNO_QUERY); @@ -185,7 +185,7 @@ namespace dbp } } - //--------------------------------------------------------------------- + void OOptionGroupLayouter::implAnchorShape(const Reference< XPropertySet >& _rxShapeProps) { static const OUString s_sAnchorPropertyName("AnchorType"); diff --git a/extensions/source/dbpilots/wizardservices.cxx b/extensions/source/dbpilots/wizardservices.cxx index abb0dcd94496..12e706d78cf6 100644 --- a/extensions/source/dbpilots/wizardservices.cxx +++ b/extensions/source/dbpilots/wizardservices.cxx @@ -56,13 +56,13 @@ namespace dbp //===================================================================== //= OGroupBoxSI //===================================================================== - //--------------------------------------------------------------------- + OUString OGroupBoxSI::getImplementationName() const { return OUString("org.openoffice.comp.dbp.OGroupBoxWizard"); } - //--------------------------------------------------------------------- + Sequence< OUString > OGroupBoxSI::getServiceNames() const { Sequence< OUString > aReturn(1); @@ -73,13 +73,13 @@ namespace dbp //===================================================================== //= OListComboSI //===================================================================== - //--------------------------------------------------------------------- + OUString OListComboSI::getImplementationName() const { return OUString("org.openoffice.comp.dbp.OListComboWizard"); } - //--------------------------------------------------------------------- + Sequence< OUString > OListComboSI::getServiceNames() const { Sequence< OUString > aReturn(1); @@ -90,13 +90,13 @@ namespace dbp //===================================================================== //= OGridSI //===================================================================== - //--------------------------------------------------------------------- + OUString OGridSI::getImplementationName() const { return OUString("org.openoffice.comp.dbp.OGridWizard"); } - //--------------------------------------------------------------------- + Sequence< OUString > OGridSI::getServiceNames() const { Sequence< OUString > aReturn(1); |