diff options
Diffstat (limited to 'svtools/source/dialogs')
| -rw-r--r-- | svtools/source/dialogs/addresstemplate.cxx | 96 | ||||
| -rw-r--r-- | svtools/source/dialogs/colrdlg.cxx | 10 | ||||
| -rw-r--r-- | svtools/source/dialogs/insdlg.cxx | 10 | ||||
| -rw-r--r-- | svtools/source/dialogs/mcvmath.cxx | 2 | ||||
| -rw-r--r-- | svtools/source/dialogs/prnsetup.cxx | 30 | ||||
| -rw-r--r-- | svtools/source/dialogs/roadmapwizard.cxx | 60 | ||||
| -rw-r--r-- | svtools/source/dialogs/wizardmachine.cxx | 84 | ||||
| -rw-r--r-- | svtools/source/dialogs/wizdlg.cxx | 50 |
8 files changed, 171 insertions, 171 deletions
diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index c623be09debe..2c0d731bb6d8 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -124,7 +124,7 @@ namespace svt virtual void setCommand(const OUString& _rCommand) = 0; }; - // ------------------------------------------------------------------- + IAssigmentData::~IAssigmentData() { } @@ -162,7 +162,7 @@ public: virtual void setCommand(const OUString& _rCommand); }; - // ------------------------------------------------------------------- + AssigmentTransientData::AssigmentTransientData( const Reference< XDataSource >& _rxDataSource, const OUString& _rDataSourceName, const OUString& _rTableName, const Sequence< AliasProgrammaticPair >& _rFields ) @@ -204,25 +204,25 @@ public: } } - // ------------------------------------------------------------------- + OUString AssigmentTransientData::getDatasourceName() const { return m_sDSName; } - // ------------------------------------------------------------------- + OUString AssigmentTransientData::getCommand() const { return m_sTableName; } - // ------------------------------------------------------------------- + sal_Int32 AssigmentTransientData::getCommandType() const { return CommandType::TABLE; } - // ------------------------------------------------------------------- + sal_Bool AssigmentTransientData::hasFieldAssignment(const OUString& _rLogicalName) { MapString2String::const_iterator aPos = m_aAliases.find( _rLogicalName ); @@ -230,7 +230,7 @@ public: && ( !aPos->second.isEmpty() ); } - // ------------------------------------------------------------------- + OUString AssigmentTransientData::getFieldAssignment(const OUString& _rLogicalName) { OUString sReturn; @@ -241,13 +241,13 @@ public: return sReturn; } - // ------------------------------------------------------------------- + void AssigmentTransientData::setFieldAssignment(const OUString& _rLogicalName, const OUString& _rAssignment) { m_aAliases[ _rLogicalName ] = _rAssignment; } - // ------------------------------------------------------------------- + void AssigmentTransientData::clearFieldAssignment(const OUString& _rLogicalName) { MapString2String::iterator aPos = m_aAliases.find( _rLogicalName ); @@ -255,13 +255,13 @@ public: m_aAliases.erase( aPos ); } - // ------------------------------------------------------------------- + void AssigmentTransientData::setDatasourceName(const OUString&) { OSL_FAIL( "AssigmentTransientData::setDatasourceName: cannot be implemented for transient data!" ); } - // ------------------------------------------------------------------- + void AssigmentTransientData::setCommand(const OUString&) { OSL_FAIL( "AssigmentTransientData::setCommand: cannot be implemented for transient data!" ); @@ -320,7 +320,7 @@ void AssignmentPersistentData::Commit() { } - // ------------------------------------------------------------------- + AssignmentPersistentData::AssignmentPersistentData() :ConfigItem( OUString( "Office.DataAccess/AddressBook" )) { @@ -330,18 +330,18 @@ void AssignmentPersistentData::Commit() m_aStoredFields.insert(*pStoredNames); } - // ------------------------------------------------------------------- + AssignmentPersistentData::~AssignmentPersistentData() { } - // ------------------------------------------------------------------- + sal_Bool AssignmentPersistentData::hasFieldAssignment(const OUString& _rLogicalName) { return (m_aStoredFields.end() != m_aStoredFields.find(_rLogicalName)); } - // ------------------------------------------------------------------- + OUString AssignmentPersistentData::getFieldAssignment(const OUString& _rLogicalName) { OUString sAssignment; @@ -355,13 +355,13 @@ void AssignmentPersistentData::Commit() return sAssignment; } - // ------------------------------------------------------------------- + Any AssignmentPersistentData::getProperty(const sal_Char* _pLocalName) const { return getProperty(OUString::createFromAscii(_pLocalName)); } - // ------------------------------------------------------------------- + Any AssignmentPersistentData::getProperty(const OUString& _rLocalName) const { Sequence< OUString > aProperties(&_rLocalName, 1); @@ -370,7 +370,7 @@ void AssignmentPersistentData::Commit() return aValues[0]; } - // ------------------------------------------------------------------- + OUString AssignmentPersistentData::getStringProperty(const OUString& _rLocalName) const { OUString sReturn; @@ -378,7 +378,7 @@ void AssignmentPersistentData::Commit() return sReturn; } - // ------------------------------------------------------------------- + OUString AssignmentPersistentData::getStringProperty(const sal_Char* _pLocalName) const { OUString sReturn; @@ -386,7 +386,7 @@ void AssignmentPersistentData::Commit() return sReturn; } - // ------------------------------------------------------------------- + sal_Int32 AssignmentPersistentData::getInt32Property(const sal_Char* _pLocalName) const { sal_Int32 nReturn = 0; @@ -394,7 +394,7 @@ void AssignmentPersistentData::Commit() return nReturn; } - // ------------------------------------------------------------------- + void AssignmentPersistentData::setStringProperty(const sal_Char* _pLocalName, const OUString& _rValue) { Sequence< OUString > aNames(1); @@ -404,7 +404,7 @@ void AssignmentPersistentData::Commit() PutProperties(aNames, aValues); } - // ------------------------------------------------------------------- + void AssignmentPersistentData::setFieldAssignment(const OUString& _rLogicalName, const OUString& _rAssignment) { if (_rAssignment.isEmpty()) @@ -441,7 +441,7 @@ void AssignmentPersistentData::Commit() DBG_ASSERT(bSuccess, "AssignmentPersistentData::setFieldAssignment: could not commit the changes a field!"); } - // ------------------------------------------------------------------- + void AssignmentPersistentData::clearFieldAssignment(const OUString& _rLogicalName) { if (!hasFieldAssignment(_rLogicalName)) @@ -453,31 +453,31 @@ void AssignmentPersistentData::Commit() ClearNodeElements(sDescriptionNodePath, aNames); } - // ------------------------------------------------------------------- + OUString AssignmentPersistentData::getDatasourceName() const { return getStringProperty( "DataSourceName" ); } - // ------------------------------------------------------------------- + OUString AssignmentPersistentData::getCommand() const { return getStringProperty( "Command" ); } - // ------------------------------------------------------------------- + void AssignmentPersistentData::setDatasourceName(const OUString& _rName) { setStringProperty( "DataSourceName", _rName ); } - // ------------------------------------------------------------------- + void AssignmentPersistentData::setCommand(const OUString& _rCommand) { setStringProperty( "Command", _rCommand ); } - // ------------------------------------------------------------------- + sal_Int32 AssignmentPersistentData::getCommandType() const { return getInt32Property( "CommandType" ); @@ -545,7 +545,7 @@ void AssignmentPersistentData::Commit() // = AddressBookSourceDialog // =================================================================== - // ------------------------------------------------------------------- + AddressBookSourceDialog::AddressBookSourceDialog(Window* _pParent, const Reference< XComponentContext >& _rxORB ) : ModalDialog(_pParent, "AddressTemplateDialog", "svt/ui/addresstemplatedialog.ui") @@ -556,7 +556,7 @@ void AssignmentPersistentData::Commit() implConstruct(); } - // ------------------------------------------------------------------- + AddressBookSourceDialog::AddressBookSourceDialog( Window* _pParent, const Reference< XComponentContext >& _rxORB, const Reference< XDataSource >& _rxTransientDS, const OUString& _rDataSourceName, const OUString& _rTable, const Sequence< AliasProgrammaticPair >& _rMapping ) @@ -568,7 +568,7 @@ void AssignmentPersistentData::Commit() implConstruct(); } - // ------------------------------------------------------------------- + void AddressBookSourceDialog::implConstruct() { get(m_pDatasource, "datasource"); @@ -714,7 +714,7 @@ void AssignmentPersistentData::Commit() } } - // ------------------------------------------------------------------- + void AddressBookSourceDialog::getFieldMapping(Sequence< AliasProgrammaticPair >& _rMapping) const { _rMapping.realloc( m_pImpl->aLogicalFieldNames.size() ); @@ -739,7 +739,7 @@ void AssignmentPersistentData::Commit() _rMapping.realloc( pPair - _rMapping.getArray() ); } - // ------------------------------------------------------------------- + void AddressBookSourceDialog::loadConfiguration() { OUString sName = m_pImpl->pConfigData->getDatasourceName(); @@ -767,13 +767,13 @@ void AssignmentPersistentData::Commit() *aAssignment = m_pImpl->pConfigData->getFieldAssignment(*aLogical); } - // ------------------------------------------------------------------- + AddressBookSourceDialog::~AddressBookSourceDialog() { delete m_pImpl; } - // ------------------------------------------------------------------- + void AddressBookSourceDialog::initializeDatasources() { if (!m_xDatabaseContext.is()) @@ -812,14 +812,14 @@ void AssignmentPersistentData::Commit() m_pDatasource->InsertEntry(*pDatasourceNames); } - // ------------------------------------------------------------------- + IMPL_LINK(AddressBookSourceDialog, OnFieldScroll, ScrollBar*, _pScrollBar) { implScrollFields( _pScrollBar->GetThumbPos(), sal_True, sal_True ); return 0L; } - // ------------------------------------------------------------------- + void AddressBookSourceDialog::resetTables() { if (!m_xDatabaseContext.is()) @@ -925,7 +925,7 @@ void AssignmentPersistentData::Commit() resetFields(); } - // ------------------------------------------------------------------- + void AddressBookSourceDialog::resetFields() { WaitObject aWaitCursor(this); @@ -1006,7 +1006,7 @@ void AssignmentPersistentData::Commit() (*aAdjust) = ""; } - // ------------------------------------------------------------------- + IMPL_LINK(AddressBookSourceDialog, OnFieldSelect, ListBox*, _pListbox) { // the index of the affected list box in our array @@ -1025,7 +1025,7 @@ void AssignmentPersistentData::Commit() return 0L; } - // ------------------------------------------------------------------- + void AddressBookSourceDialog::implScrollFields(sal_Int32 _nPos, sal_Bool _bAdjustFocus, sal_Bool _bAdjustScrollbar) { if (_nPos == m_pImpl->nFieldScrollPos) @@ -1122,7 +1122,7 @@ void AssignmentPersistentData::Commit() m_pFieldScroller->SetThumbPos(m_pImpl->nFieldScrollPos); } - // ------------------------------------------------------------------- + void AddressBookSourceDialog::implSelectField(ListBox* _pBox, const OUString& _rText) { if (!_rText.isEmpty()) @@ -1133,7 +1133,7 @@ void AssignmentPersistentData::Commit() _pBox->SelectEntryPos(0); } - // ------------------------------------------------------------------- + IMPL_LINK_NOARG(AddressBookSourceDialog, OnDelayedInitialize) { // load the initial data from the configuration @@ -1148,7 +1148,7 @@ void AssignmentPersistentData::Commit() return 0L; } - // ------------------------------------------------------------------- + IMPL_LINK(AddressBookSourceDialog, OnComboSelect, ComboBox*, _pBox) { if (_pBox == m_pDatasource) @@ -1158,14 +1158,14 @@ void AssignmentPersistentData::Commit() return 0; } - // ------------------------------------------------------------------- + IMPL_LINK(AddressBookSourceDialog, OnComboGetFocus, ComboBox*, _pBox) { _pBox->SaveValue(); return 0L; } - // ------------------------------------------------------------------- + IMPL_LINK(AddressBookSourceDialog, OnComboLoseFocus, ComboBox*, _pBox) { if (_pBox->GetSavedValue() != _pBox->GetText()) @@ -1178,7 +1178,7 @@ void AssignmentPersistentData::Commit() return 0L; } - // ------------------------------------------------------------------- + IMPL_LINK_NOARG(AddressBookSourceDialog, OnOkClicked) { OUString sSelectedDS = lcl_getSelectedDataSource(*m_pDatasource); @@ -1205,7 +1205,7 @@ void AssignmentPersistentData::Commit() return 0L; } - // ------------------------------------------------------------------- + IMPL_LINK_NOARG(AddressBookSourceDialog, OnAdministrateDatasources) { // create the dialog object @@ -1260,7 +1260,7 @@ void AssignmentPersistentData::Commit() return 0L; } - // ------------------------------------------------------------------- + bool AddressBookSourceDialog::PreNotify( NotifyEvent& _rNEvt ) { switch (_rNEvt.GetType()) diff --git a/svtools/source/dialogs/colrdlg.cxx b/svtools/source/dialogs/colrdlg.cxx index 2cc7f72734e1..a25ccac6972e 100644 --- a/svtools/source/dialogs/colrdlg.cxx +++ b/svtools/source/dialogs/colrdlg.cxx @@ -35,9 +35,9 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::ui::dialogs; -// --------------- + // - ColorDialog - -// --------------- + SvColorDialog::SvColorDialog( Window* pWindow ) : mpParent( pWindow ) @@ -54,21 +54,21 @@ void SvColorDialog::SetColor( const Color& rColor ) maColor = rColor; } -// ----------------------------------------------------------------------- + const Color& SvColorDialog::GetColor() const { return maColor; } -// ----------------------------------------------------------------------- + void SvColorDialog::SetMode( sal_Int16 eMode ) { meMode = eMode; } -// ----------------------------------------------------------------------- + short SvColorDialog::Execute() { diff --git a/svtools/source/dialogs/insdlg.cxx b/svtools/source/dialogs/insdlg.cxx index e312e6af09f9..615c96922d1b 100644 --- a/svtools/source/dialogs/insdlg.cxx +++ b/svtools/source/dialogs/insdlg.cxx @@ -34,11 +34,11 @@ using namespace ::com::sun::star; -//--------------------------------------------- + // this struct conforms to the Microsoft // OBJECTDESCRIPTOR -> see oleidl.h // (MS platform sdk) -//--------------------------------------------- + struct OleObjectDescriptor { @@ -91,7 +91,7 @@ void SvObjectServerList::Remove( const SvGlobalName & rName ) } } -//--------------------------------------------------------------------- + void SvObjectServerList::FillInsertObjects() /* [Description] @@ -282,7 +282,7 @@ OUString SvPasteObjectHelper::GetSotFormatUIName( SotFormatStringId nId ) return aUIName; } -// ----------------------------------------------------------------------------- + sal_Bool SvPasteObjectHelper::GetEmbeddedName(const TransferableDataHelper& rData, OUString& _rName, OUString& _rSource, SotFormatStringId& _nFormat) { sal_Bool bRet = sal_False; @@ -339,6 +339,6 @@ sal_Bool SvPasteObjectHelper::GetEmbeddedName(const TransferableDataHelper& rDat } return bRet; } -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/dialogs/mcvmath.cxx b/svtools/source/dialogs/mcvmath.cxx index 16551a55140c..5a3548665dec 100644 --- a/svtools/source/dialogs/mcvmath.cxx +++ b/svtools/source/dialogs/mcvmath.cxx @@ -20,7 +20,7 @@ #include <mcvmath.hxx> -// --------------------------------------------------------------------- + // die folgenden Tabellen enthalten sin(phi) * 2**14 // fuer phi= 360Grad*2**-32 bis 360 Grad // def. fuer x: phi=360Grad * 2**(x-16) diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx index a493c719e94e..a378b92d2adf 100644 --- a/svtools/source/dialogs/prnsetup.cxx +++ b/svtools/source/dialogs/prnsetup.cxx @@ -42,7 +42,7 @@ void ImplFillPrnDlgListBox( const Printer* pPrinter, pPropBtn->Show( pPrinter->HasSupport( SUPPORT_SETUPDIALOG ) ); } -// ----------------------------------------------------------------------- + void ImplFreePrnDlgListBox( ListBox* pBox, sal_Bool bClear ) { @@ -50,7 +50,7 @@ void ImplFreePrnDlgListBox( ListBox* pBox, sal_Bool bClear ) pBox->Clear(); } -// ----------------------------------------------------------------------- + Printer* ImplPrnDlgListBoxSelect( ListBox* pBox, PushButton* pPropBtn, Printer* pPrinter, Printer* pTempPrinter ) @@ -89,7 +89,7 @@ Printer* ImplPrnDlgListBoxSelect( ListBox* pBox, PushButton* pPropBtn, return pTempPrinter; } -// ----------------------------------------------------------------------- + Printer* ImplPrnDlgUpdatePrinter( Printer* pPrinter, Printer* pTempPrinter ) { @@ -109,7 +109,7 @@ Printer* ImplPrnDlgUpdatePrinter( Printer* pPrinter, Printer* pTempPrinter ) return pTempPrinter; } -// ----------------------------------------------------------------------- + void ImplPrnDlgUpdateQueueInfo( ListBox* pBox, QueueInfo& rInfo ) { @@ -121,7 +121,7 @@ void ImplPrnDlgUpdateQueueInfo( ListBox* pBox, QueueInfo& rInfo ) } } -// ----------------------------------------------------------------------- + static OUString ImplPrnDlgAddString(const OUString& rStr, const OUString& rAddStr) { @@ -131,14 +131,14 @@ static OUString ImplPrnDlgAddString(const OUString& rStr, const OUString& rAddSt return aStr + rAddStr; } -// ----------------------------------------------------------------------- + static OUString ImplPrnDlgAddResString(const OUString& rStr, sal_uInt16 nResId) { return ImplPrnDlgAddString(rStr, SVT_RESSTR(nResId)); } -// ----------------------------------------------------------------------- + OUString ImplPrnDlgGetStatusText( const QueueInfo& rInfo ) { @@ -241,7 +241,7 @@ PrinterSetupDialog::PrinterSetupDialog(Window* pParent) m_pLbName->SetSelectHdl( LINK( this, PrinterSetupDialog, ImplChangePrinterHdl ) ); } -// ----------------------------------------------------------------------- + PrinterSetupDialog::~PrinterSetupDialog() { @@ -249,7 +249,7 @@ PrinterSetupDialog::~PrinterSetupDialog() delete mpTempPrinter; } -// ----------------------------------------------------------------------- + void PrinterSetupDialog::SetOptionsHdl( const Link& rLink ) { @@ -277,7 +277,7 @@ void PrinterSetupDialog::ImplSetInfo() } } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(PrinterSetupDialog, ImplStatusHdl) { @@ -288,7 +288,7 @@ IMPL_LINK_NOARG(PrinterSetupDialog, ImplStatusHdl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(PrinterSetupDialog, ImplPropertiesHdl) { @@ -299,7 +299,7 @@ IMPL_LINK_NOARG(PrinterSetupDialog, ImplPropertiesHdl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(PrinterSetupDialog, ImplChangePrinterHdl) { @@ -309,7 +309,7 @@ IMPL_LINK_NOARG(PrinterSetupDialog, ImplChangePrinterHdl) return 0; } -// ----------------------------------------------------------------------- + bool PrinterSetupDialog::Notify( NotifyEvent& rNEvt ) { @@ -319,7 +319,7 @@ bool PrinterSetupDialog::Notify( NotifyEvent& rNEvt ) return ModalDialog::Notify( rNEvt ); } -// ----------------------------------------------------------------------- + void PrinterSetupDialog::DataChanged( const DataChangedEvent& rDCEvt ) { @@ -338,7 +338,7 @@ void PrinterSetupDialog::DataChanged( const DataChangedEvent& rDCEvt ) ModalDialog::DataChanged( rDCEvt ); } -// ----------------------------------------------------------------------- + short PrinterSetupDialog::Execute() { diff --git a/svtools/source/dialogs/roadmapwizard.cxx b/svtools/source/dialogs/roadmapwizard.cxx index b1d86bf20049..20800aef3e8c 100644 --- a/svtools/source/dialogs/roadmapwizard.cxx +++ b/svtools/source/dialogs/roadmapwizard.cxx @@ -85,7 +85,7 @@ namespace svt sal_Int32 getFirstDifferentIndex( const WizardPath& _rLHS, const WizardPath& _rRHS ); }; - //-------------------------------------------------------------------- + sal_Int32 RoadmapWizardImpl::getStateIndexInPath( WizardTypes::WizardState _nState, const WizardPath& _rPath ) { sal_Int32 nStateIndexInPath = 0; @@ -98,7 +98,7 @@ namespace svt return nStateIndexInPath; } - //-------------------------------------------------------------------- + sal_Int32 RoadmapWizardImpl::getStateIndexInPath( WizardTypes::WizardState _nState, PathId _nPathId ) { sal_Int32 nStateIndexInPath = -1; @@ -108,7 +108,7 @@ namespace svt return nStateIndexInPath; } - //-------------------------------------------------------------------- + sal_Int32 RoadmapWizardImpl::getFirstDifferentIndex( const WizardPath& _rLHS, const WizardPath& _rRHS ) { sal_Int32 nMinLength = ::std::min( _rLHS.size(), _rRHS.size() ); @@ -124,14 +124,14 @@ namespace svt //= RoadmapWizard //==================================================================== DBG_NAME( RoadmapWizard ) - //-------------------------------------------------------------------- + #ifdef DBG_UTIL const char* CheckInvariants( const void* pVoid ) { return static_cast< const RoadmapWizard* >( pVoid )->checkInvariants(); } - //-------------------------------------------------------------------- + const sal_Char* RoadmapWizard::checkInvariants() const { // all paths have to start with the same state @@ -166,7 +166,7 @@ namespace svt } #endif - //-------------------------------------------------------------------- + RoadmapWizard::RoadmapWizard( Window* _pParent, const ResId& _rRes, sal_uInt32 _nButtonFlags ) :OWizardMachine( _pParent, _rRes, _nButtonFlags ) ,m_pImpl( new RoadmapWizardImpl ) @@ -175,7 +175,7 @@ namespace svt impl_construct(); } - //-------------------------------------------------------------------- + RoadmapWizard::RoadmapWizard( Window* _pParent, const WinBits i_nStyle, sal_uInt32 _nButtonFlags ) :OWizardMachine( _pParent, i_nStyle, _nButtonFlags ) ,m_pImpl( new RoadmapWizardImpl ) @@ -184,7 +184,7 @@ namespace svt impl_construct(); } - //-------------------------------------------------------------------- + void RoadmapWizard::impl_construct() { SetLeftAlignedButtonCount( 1 ); @@ -209,26 +209,26 @@ namespace svt m_pImpl->pRoadmap->Show(); } - //-------------------------------------------------------------------- + RoadmapWizard::~RoadmapWizard() { delete m_pImpl; DBG_DTOR( RoadmapWizard, CheckInvariants ); } - //-------------------------------------------------------------------- + void RoadmapWizard::SetRoadmapHelpId( const OString& _rId ) { m_pImpl->pRoadmap->SetHelpId( _rId ); } - //-------------------------------------------------------------------- + void RoadmapWizard::SetRoadmapInteractive( sal_Bool _bInteractive ) { m_pImpl->pRoadmap->SetRoadmapInteractive( _bInteractive ); } - //-------------------------------------------------------------------- + void RoadmapWizard::declarePath( PathId _nPathId, const WizardPath& _lWizardStates) { DBG_CHKTHIS( RoadmapWizard, CheckInvariants ); @@ -242,7 +242,7 @@ namespace svt implUpdateRoadmap( ); } - //-------------------------------------------------------------------- + void RoadmapWizard::declarePath( PathId _nPathId, WizardState _nFirstState, ... ) { DBG_CHKTHIS( RoadmapWizard, CheckInvariants ); @@ -272,7 +272,7 @@ namespace svt declarePath( _nPathId, aNewPath ); } - //-------------------------------------------------------------------- + void RoadmapWizard::describeState( WizardState _nState, const OUString& _rStateDisplayName, RoadmapPageFactory _pPageFactory ) { OSL_ENSURE( m_pImpl->aStateDescriptors.find( _nState ) == m_pImpl->aStateDescriptors.end(), @@ -280,7 +280,7 @@ namespace svt m_pImpl->aStateDescriptors[ _nState ] = StateDescriptions::mapped_type( _rStateDisplayName, _pPageFactory ); } - //-------------------------------------------------------------------- + void RoadmapWizard::activatePath( PathId _nPathId, bool _bDecideForIt ) { DBG_CHKTHIS( RoadmapWizard, CheckInvariants ); @@ -325,7 +325,7 @@ namespace svt implUpdateRoadmap( ); } - //-------------------------------------------------------------------- + void RoadmapWizard::implUpdateRoadmap( ) { DBG_CHKTHIS( RoadmapWizard, CheckInvariants ); @@ -432,7 +432,7 @@ namespace svt m_pImpl->pRoadmap->SetRoadmapComplete( !bIncompletePath ); } - //-------------------------------------------------------------------- + WizardTypes::WizardState RoadmapWizard::determineNextState( WizardState _nCurrentState ) const { DBG_CHKTHIS( RoadmapWizard, CheckInvariants ); @@ -463,7 +463,7 @@ namespace svt return aActivePathPos->second[ nNextStateIndex ]; } - //--------------------------------------------------------------------- + bool RoadmapWizard::canAdvance() const { if ( !m_pImpl->bActivePathIsDefinite ) @@ -500,7 +500,7 @@ namespace svt return true; } - //--------------------------------------------------------------------- + void RoadmapWizard::updateTravelUI() { OWizardMachine::updateTravelUI(); @@ -523,7 +523,7 @@ namespace svt implUpdateRoadmap(); } - //-------------------------------------------------------------------- + IMPL_LINK_NOARG(RoadmapWizard, OnRoadmapItemSelected) { DBG_CHKTHIS( RoadmapWizard, CheckInvariants ); @@ -568,7 +568,7 @@ namespace svt return 1L; } - //-------------------------------------------------------------------- + void RoadmapWizard::enterState( WizardState _nState ) { DBG_CHKTHIS( RoadmapWizard, CheckInvariants ); @@ -580,7 +580,7 @@ namespace svt m_pImpl->pRoadmap->SelectRoadmapItemByID( getCurrentState() ); } - //-------------------------------------------------------------------- + OUString RoadmapWizard::getStateDisplayName( WizardState _nState ) const { OUString sDisplayName; @@ -594,7 +594,7 @@ namespace svt return sDisplayName; } - //-------------------------------------------------------------------- + TabPage* RoadmapWizard::createPage( WizardState _nState ) { TabPage* pPage( NULL ); @@ -611,7 +611,7 @@ namespace svt return pPage; } - //-------------------------------------------------------------------- + void RoadmapWizard::enableState( WizardState _nState, bool _bEnable ) { DBG_CHKTHIS( RoadmapWizard, CheckInvariants ); @@ -629,7 +629,7 @@ namespace svt m_pImpl->pRoadmap->EnableRoadmapItem( (RoadmapTypes::ItemId)_nState, _bEnable ); } - //-------------------------------------------------------------------- + bool RoadmapWizard::knowsState( WizardState i_nState ) const { for ( Paths::const_iterator path = m_pImpl->aPaths.begin(); @@ -649,13 +649,13 @@ namespace svt return false; } - //-------------------------------------------------------------------- + bool RoadmapWizard::isStateEnabled( WizardState _nState ) const { return m_pImpl->aDisabledStates.find( _nState ) == m_pImpl->aDisabledStates.end(); } - //-------------------------------------------------------------------- + void RoadmapWizard::Resize() { OWizardMachine::Resize(); @@ -665,7 +665,7 @@ namespace svt } - //-------------------------------------------------------------------- + void RoadmapWizard::StateChanged( StateChangedType nType ) { WizardDialog::StateChanged( nType ); @@ -674,7 +674,7 @@ namespace svt ResizeFixedLine(); } - //-------------------------------------------------------------------- + void RoadmapWizard::ResizeFixedLine() { Size aSize( m_pImpl->pRoadmap->GetSizePixel() ); @@ -682,7 +682,7 @@ namespace svt m_pImpl->pFixedLine->SetSizePixel( aSize ); } - //-------------------------------------------------------------------- + void RoadmapWizard::updateRoadmapItemLabel( WizardState _nState ) { const WizardPath& rActivePath( m_pImpl->aPaths[ m_pImpl->nActivePath ] ); diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx index 84467ab8b12a..d05030fa517e 100644 --- a/svtools/source/dialogs/wizardmachine.cxx +++ b/svtools/source/dialogs/wizardmachine.cxx @@ -56,25 +56,25 @@ namespace svt { } - //--------------------------------------------------------------------- + OWizardPage::~OWizardPage() { delete m_pImpl; } - //--------------------------------------------------------------------- + void OWizardPage::initializePage() { } - //--------------------------------------------------------------------- + void OWizardPage::ActivatePage() { TabPage::ActivatePage(); updateDialogTravelUI(); } - //--------------------------------------------------------------------- + void OWizardPage::updateDialogTravelUI() { OWizardMachine* pWizardMachine = dynamic_cast< OWizardMachine* >( GetParent() ); @@ -82,13 +82,13 @@ namespace svt pWizardMachine->updateTravelUI(); } - //--------------------------------------------------------------------- + bool OWizardPage::canAdvance() const { return true; } - //--------------------------------------------------------------------- + sal_Bool OWizardPage::commitPage( WizardTypes::CommitPageReason ) { return sal_True; @@ -121,7 +121,7 @@ namespace svt //===================================================================== //= OWizardMachine //===================================================================== - //--------------------------------------------------------------------- + OWizardMachine::OWizardMachine(Window* _pParent, const ResId& _rRes, sal_uInt32 _nButtonFlags ) :WizardDialog( _pParent, _rRes ) ,m_pFinish(NULL) @@ -134,7 +134,7 @@ namespace svt implConstruct( _nButtonFlags ); } - //--------------------------------------------------------------------- + OWizardMachine::OWizardMachine(Window* _pParent, const WinBits i_nStyle, sal_uInt32 _nButtonFlags ) :WizardDialog( _pParent, i_nStyle ) ,m_pFinish(NULL) @@ -147,7 +147,7 @@ namespace svt implConstruct( _nButtonFlags ); } - //--------------------------------------------------------------------- + void OWizardMachine::implConstruct( const sal_uInt32 _nButtonFlags ) { m_pImpl->sTitleBase = GetText(); @@ -216,7 +216,7 @@ namespace svt } } - //--------------------------------------------------------------------- + OWizardMachine::~OWizardMachine() { delete m_pFinish; @@ -231,7 +231,7 @@ namespace svt delete m_pImpl; } - //--------------------------------------------------------------------- + void OWizardMachine::implUpdateTitle() { OUString sCompleteTitle(m_pImpl->sTitleBase); @@ -246,14 +246,14 @@ namespace svt SetText(sCompleteTitle); } - //--------------------------------------------------------------------- + void OWizardMachine::setTitleBase(const OUString& _rTitleBase) { m_pImpl->sTitleBase = _rTitleBase; implUpdateTitle(); } - //--------------------------------------------------------------------- + TabPage* OWizardMachine::GetOrCreatePage( const WizardState i_nState ) { if ( NULL == GetPage( i_nState ) ) @@ -281,7 +281,7 @@ namespace svt return GetPage( i_nState ); } - //--------------------------------------------------------------------- + void OWizardMachine::ActivatePage() { WizardDialog::ActivatePage(); @@ -292,7 +292,7 @@ namespace svt enterState( nCurrentLevel ); } - //--------------------------------------------------------------------- + long OWizardMachine::DeactivatePage() { WizardState nCurrentState = getCurrentState(); @@ -301,7 +301,7 @@ namespace svt return sal_True; } - //--------------------------------------------------------------------- + void OWizardMachine::defaultButton(sal_uInt32 _nWizardButtonFlags) { // the new default button @@ -323,7 +323,7 @@ namespace svt implResetDefault( this ); } - //--------------------------------------------------------------------- + void OWizardMachine::implResetDefault(Window* _pWindow) { Window* pChildLoop = _pWindow->GetWindow(WINDOW_FIRSTCHILD); @@ -353,7 +353,7 @@ namespace svt } } - //--------------------------------------------------------------------- + void OWizardMachine::defaultButton(PushButton* _pNewDefButton) { // loop through all (direct and indirect) descendants which participate in our tabbing order, and @@ -365,7 +365,7 @@ namespace svt _pNewDefButton->SetStyle(_pNewDefButton->GetStyle() | WB_DEFBUTTON); } - //--------------------------------------------------------------------- + void OWizardMachine::enableButtons(sal_uInt32 _nWizardButtonFlags, sal_Bool _bEnable) { if (m_pFinish && (_nWizardButtonFlags & WZB_FINISH)) @@ -380,7 +380,7 @@ namespace svt m_pCancel->Enable(_bEnable); } - //--------------------------------------------------------------------- + void OWizardMachine::enterState(WizardState _nState) { // tell the page @@ -398,7 +398,7 @@ namespace svt implUpdateTitle(); } - //--------------------------------------------------------------------- + sal_Bool OWizardMachine::leaveState(WizardState) { // no need to ask the page here. @@ -408,13 +408,13 @@ namespace svt return sal_True; } - //--------------------------------------------------------------------- + sal_Bool OWizardMachine::onFinish() { return Finnish( RET_OK ); } - //--------------------------------------------------------------------- + IMPL_LINK_NOARG(OWizardMachine, OnFinish) { if ( isTravelingSuspended() ) @@ -427,13 +427,13 @@ namespace svt return onFinish() ? 1L : 0L; } - //--------------------------------------------------------------------- + OWizardMachine::WizardState OWizardMachine::determineNextState( WizardState _nCurrentState ) const { return _nCurrentState + 1; } - //--------------------------------------------------------------------- + sal_Bool OWizardMachine::prepareLeaveCurrentState( CommitPageReason _eReason ) { IWizardPageController* pController = getPageController( GetPage( getCurrentState() ) ); @@ -441,7 +441,7 @@ namespace svt return pController->commitPage( _eReason ); } - //--------------------------------------------------------------------- + sal_Bool OWizardMachine::skipBackwardUntil( WizardState _nTargetState ) { // alowed to leave the current page? @@ -468,7 +468,7 @@ namespace svt return sal_True; } - //--------------------------------------------------------------------- + sal_Bool OWizardMachine::skipUntil( WizardState _nTargetState ) { WizardState nCurrentState = getCurrentState(); @@ -508,7 +508,7 @@ namespace svt return sal_True; } - //--------------------------------------------------------------------- + sal_Bool OWizardMachine::skip(sal_Int32 _nSteps) { DBG_ASSERT(_nSteps > 0, "OWizardMachine::skip: invalid number of steps!"); @@ -548,7 +548,7 @@ namespace svt return sal_True; } - //--------------------------------------------------------------------- + sal_Bool OWizardMachine::travelNext() { // allowed to leave the current page? @@ -573,7 +573,7 @@ namespace svt return sal_True; } - //--------------------------------------------------------------------- + sal_Bool OWizardMachine::travelPrevious() { DBG_ASSERT(m_pImpl->aStateHistory.size() > 0, "OWizardMachine::travelPrevious: have no previous page!"); @@ -598,7 +598,7 @@ namespace svt return sal_True; } - //--------------------------------------------------------------------- + void OWizardMachine::removePageFromHistory( WizardState nToRemove ) { @@ -619,19 +619,19 @@ namespace svt } } - //--------------------------------------------------------------------- + void OWizardMachine::enableAutomaticNextButtonState( bool _bEnable ) { m_pImpl->m_bAutoNextButtonState = _bEnable; } - //--------------------------------------------------------------------- + bool OWizardMachine::isAutomaticNextButtonStateEnabled() const { return m_pImpl->m_bAutoNextButtonState; } - //--------------------------------------------------------------------- + IMPL_LINK_NOARG(OWizardMachine, OnPrevPage) { if ( isTravelingSuspended() ) @@ -641,7 +641,7 @@ namespace svt return nRet; } - //--------------------------------------------------------------------- + IMPL_LINK_NOARG(OWizardMachine, OnNextPage) { if ( isTravelingSuspended() ) @@ -651,14 +651,14 @@ namespace svt return nRet; } - //--------------------------------------------------------------------- + IWizardPageController* OWizardMachine::getPageController( TabPage* _pCurrentPage ) const { IWizardPageController* pController = dynamic_cast< IWizardPageController* >( _pCurrentPage ); return pController; } - //--------------------------------------------------------------------- + void OWizardMachine::getStateHistory( ::std::vector< WizardState >& _out_rHistory ) { ::std::stack< WizardState > aHistoryCopy( m_pImpl->aStateHistory ); @@ -669,13 +669,13 @@ namespace svt } } - //--------------------------------------------------------------------- + bool OWizardMachine::canAdvance() const { return WZS_INVALID_STATE != determineNextState( getCurrentState() ); } - //--------------------------------------------------------------------- + void OWizardMachine::updateTravelUI() { const IWizardPageController* pController = getPageController( GetPage( getCurrentState() ) ); @@ -687,20 +687,20 @@ namespace svt enableButtons( WZB_NEXT, bCanAdvance ); } - //--------------------------------------------------------------------- + bool OWizardMachine::isTravelingSuspended() const { return m_pImpl->m_bTravelingSuspended; } - //--------------------------------------------------------------------- + void OWizardMachine::suspendTraveling( AccessGuard ) { DBG_ASSERT( !m_pImpl->m_bTravelingSuspended, "OWizardMachine::suspendTraveling: already suspended!" ); m_pImpl->m_bTravelingSuspended = true; } - //--------------------------------------------------------------------- + void OWizardMachine::resumeTraveling( AccessGuard ) { DBG_ASSERT( m_pImpl->m_bTravelingSuspended, "OWizardMachine::resumeTraveling: nothing to resume!" ); diff --git a/svtools/source/dialogs/wizdlg.cxx b/svtools/source/dialogs/wizdlg.cxx index 48440f2fefb6..de29f6ba5f85 100644 --- a/svtools/source/dialogs/wizdlg.cxx +++ b/svtools/source/dialogs/wizdlg.cxx @@ -37,7 +37,7 @@ struct ImplWizPageData TabPage* mpPage; }; -// ----------------------------------------------------------------------- + struct ImplWizButtonData { @@ -66,20 +66,20 @@ void WizardDialog::ImplInitData() maWizardLayoutTimer.SetTimeoutHdl( LINK( this, WizardDialog, ImplHandleWizardLayoutTimerHdl ) ); } -// ----------------------------------------------------------------------- + void WizardDialog::SetLeftAlignedButtonCount( sal_Int16 _nCount ) { mnLeftAlignCount = _nCount; } -// ----------------------------------------------------------------------- + void WizardDialog::SetEmptyViewMargin() { mbEmptyViewMargin = true; } -// ----------------------------------------------------------------------- + void WizardDialog::ImplCalcSize( Size& rSize ) { @@ -258,7 +258,7 @@ long WizardDialog::LogicalCoordinateToPixel(int iCoordinate){ } -// ----------------------------------------------------------------------- + void WizardDialog::ImplPosTabPage() { @@ -316,7 +316,7 @@ void WizardDialog::ImplPosTabPage() mpCurTabPage->SetPosSizePixel( aPos, aDlgSize ); } -// ----------------------------------------------------------------------- + void WizardDialog::ImplShowTabPage( TabPage* pTabPage ) { @@ -339,7 +339,7 @@ void WizardDialog::ImplShowTabPage( TabPage* pTabPage ) pOldTabPage->Hide(); } -// ----------------------------------------------------------------------- + TabPage* WizardDialog::ImplGetPage( sal_uInt16 nLevel ) const { @@ -367,7 +367,7 @@ WizardDialog::WizardDialog( Window* pParent, WinBits nStyle ) : ImplInitData(); } -// ----------------------------------------------------------------------- + WizardDialog::WizardDialog( Window* pParent, const ResId& rResId ) : ModalDialog( pParent, rResId ) @@ -375,7 +375,7 @@ WizardDialog::WizardDialog( Window* pParent, const ResId& rResId ) : ImplInitData(); } -// ----------------------------------------------------------------------- + WizardDialog::~WizardDialog() { @@ -392,7 +392,7 @@ WizardDialog::~WizardDialog() RemovePage( mpFirstPage->mpPage ); } -// ----------------------------------------------------------------------- + void WizardDialog::Resize() { @@ -405,7 +405,7 @@ void WizardDialog::Resize() Dialog::Resize(); } -// ----------------------------------------------------------------------- + void WizardDialog::StateChanged( StateChangedType nType ) { @@ -443,7 +443,7 @@ void WizardDialog::StateChanged( StateChangedType nType ) Dialog::StateChanged( nType ); } -// ----------------------------------------------------------------------- + bool WizardDialog::Notify( NotifyEvent& rNEvt ) { @@ -489,14 +489,14 @@ bool WizardDialog::Notify( NotifyEvent& rNEvt ) return Dialog::Notify( rNEvt ); } -// ----------------------------------------------------------------------- + void WizardDialog::ActivatePage() { maActivateHdl.Call( this ); } -// ----------------------------------------------------------------------- + long WizardDialog::DeactivatePage() { @@ -506,14 +506,14 @@ long WizardDialog::DeactivatePage() return sal_True; } -// ----------------------------------------------------------------------- + sal_Bool WizardDialog::ShowNextPage() { return ShowPage( mnCurLevel+1 ); } -// ----------------------------------------------------------------------- + sal_Bool WizardDialog::ShowPrevPage() { @@ -522,7 +522,7 @@ sal_Bool WizardDialog::ShowPrevPage() return ShowPage( mnCurLevel-1 ); } -// ----------------------------------------------------------------------- + sal_Bool WizardDialog::ShowPage( sal_uInt16 nLevel ) { @@ -537,7 +537,7 @@ sal_Bool WizardDialog::ShowPage( sal_uInt16 nLevel ) return sal_False; } -// ----------------------------------------------------------------------- + sal_Bool WizardDialog::Finnish( long nResult ) { @@ -556,7 +556,7 @@ sal_Bool WizardDialog::Finnish( long nResult ) return sal_False; } -// ----------------------------------------------------------------------- + void WizardDialog::AddPage( TabPage* pPage ) { @@ -575,7 +575,7 @@ void WizardDialog::AddPage( TabPage* pPage ) } } -// ----------------------------------------------------------------------- + void WizardDialog::RemovePage( TabPage* pPage ) { @@ -602,7 +602,7 @@ void WizardDialog::RemovePage( TabPage* pPage ) OSL_FAIL( "WizardDialog::RemovePage() - Page not in list" ); } -// ----------------------------------------------------------------------- + void WizardDialog::SetPage( sal_uInt16 nLevel, TabPage* pPage ) { @@ -625,7 +625,7 @@ void WizardDialog::SetPage( sal_uInt16 nLevel, TabPage* pPage ) } } -// ----------------------------------------------------------------------- + TabPage* WizardDialog::GetPage( sal_uInt16 nLevel ) const { @@ -643,7 +643,7 @@ TabPage* WizardDialog::GetPage( sal_uInt16 nLevel ) const return NULL; } -// ----------------------------------------------------------------------- + void WizardDialog::AddButton( Button* pButton, long nOffset ) { @@ -663,7 +663,7 @@ void WizardDialog::AddButton( Button* pButton, long nOffset ) } } -// ----------------------------------------------------------------------- + void WizardDialog::RemoveButton( Button* pButton ) { @@ -688,7 +688,7 @@ void WizardDialog::RemoveButton( Button* pButton ) OSL_FAIL( "WizardDialog::RemoveButton() - Button not in list" ); } -// ----------------------------------------------------------------------- + void WizardDialog::ShowButtonFixedLine( sal_Bool bVisible ) { |