This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new d2d0e2ee81 Remove leftover from Mozilla address book (#401)
d2d0e2ee81 is described below
commit d2d0e2ee816f936c53ac783946a9d4e6e28d15d8
Author: Matthias Seidel <[email protected]>
AuthorDate: Fri Aug 22 17:15:17 2025 +0200
Remove leftover from Mozilla address book (#401)
* Remove leftover from Mozilla address book
* Additional files
* Update datasourcehandling.hxx
* Fix error
(cherry picked from commit 7dbe28d420f41caf4208fa0a77115d7601de2198)
---
.../connectivity/source/inc/resource/mozab_res.hrc | 2 +-
main/extensions/source/abpilot/abpresid.hrc | 70 ++---
main/extensions/source/abpilot/abspilot.cxx | 349 ++++++++++-----------
main/extensions/source/abpilot/addresssettings.hxx | 12 +-
.../source/abpilot/datasourcehandling.cxx | 100 +++---
.../source/abpilot/datasourcehandling.hxx | 68 ++--
.../source/abpilot/typeselectionpage.cxx | 66 ++--
7 files changed, 317 insertions(+), 350 deletions(-)
diff --git a/main/connectivity/source/inc/resource/mozab_res.hrc
b/main/connectivity/source/inc/resource/mozab_res.hrc
index 9b218d9528..527763a086 100644
--- a/main/connectivity/source/inc/resource/mozab_res.hrc
+++ b/main/connectivity/source/inc/resource/mozab_res.hrc
@@ -28,7 +28,7 @@
// mozab driver resource strings
-//#define STR_MOZILLA_ADDRESSBOOKS ( STR_MOZAB_BASE + 0 )
+// FREE
#define STR_THUNDERBIRD_ADDRESSBOOKS ( STR_MOZAB_BASE + 1 )
#define STR_OE_ADDRESSBOOK ( STR_MOZAB_BASE + 2 )
#define STR_OUTLOOK_MAPI_ADDRESSBOOK ( STR_MOZAB_BASE + 3 )
diff --git a/main/extensions/source/abpilot/abpresid.hrc
b/main/extensions/source/abpilot/abpresid.hrc
index 1bcb070b4b..de1906257d 100644
--- a/main/extensions/source/abpilot/abpresid.hrc
+++ b/main/extensions/source/abpilot/abpresid.hrc
@@ -25,7 +25,6 @@
#include "abpilot.hrc"
#include "extensio.hrc"
-//========================================================================
// basics
#define RID_DIALOG_START RID_ABP_START
@@ -36,74 +35,65 @@
#define RID_QUERYBOX_START RID_ABP_START
#define RID_BITMAP_START RID_ABP_START
-//========================================================================
// dialogs
-#define RID_DLG_ADDRESSBOOKSOURCEPILOT ( RID_DIALOG_START + 0 )
+#define RID_DLG_ADDRESSBOOKSOURCEPILOT ( RID_DIALOG_START + 0 )
// please adjust RID_DIALOG_END (below) when adding new dialogs
#define RID_DIALOG_END
RID_DLG_ADDRESSBOOKSOURCEPILOT
-//========================================================================
// tab pages
-#define RID_PAGE_SELECTABTYPE ( RID_PAGE_START + 0 )
-#define RID_PAGE_ADMININVOKATION ( RID_PAGE_START + 1 )
-#define RID_PAGE_TABLESELECTION_AB ( RID_PAGE_START + 2 )
-#define RID_PAGE_FIELDMAPPING ( RID_PAGE_START + 3 )
-#define RID_PAGE_FINAL ( RID_PAGE_START + 4 )
+#define RID_PAGE_SELECTABTYPE ( RID_PAGE_START + 0 )
+#define RID_PAGE_ADMININVOKATION ( RID_PAGE_START + 1 )
+#define RID_PAGE_TABLESELECTION_AB ( RID_PAGE_START + 2 )
+#define RID_PAGE_FIELDMAPPING ( RID_PAGE_START + 3 )
+#define RID_PAGE_FINAL ( RID_PAGE_START + 4 )
// please adjust RID_PAGE_END (below) when adding new tab pages
#define RID_PAGE_END RID_PAGE_FINAL
-//========================================================================
// strings
-#define RID_STR_DEFAULT_NAME ( RID_STRING_START + 0 )
-#define RID_STR_ADMINDIALOGTITLE ( RID_STRING_START + 1 )
-#define RID_STR_NOCONNECTION ( RID_STRING_START + 2 )
-#define RID_STR_PLEASECHECKSETTINGS ( RID_STRING_START + 3 )
-#define RID_STR_FIELDDIALOGTITLE ( RID_STRING_START + 4 )
-#define RID_STR_NOFIELDSASSIGNED ( RID_STRING_START + 5 )
+#define RID_STR_DEFAULT_NAME ( RID_STRING_START + 0 )
+#define RID_STR_ADMINDIALOGTITLE ( RID_STRING_START + 1 )
+#define RID_STR_NOCONNECTION ( RID_STRING_START + 2 )
+#define RID_STR_PLEASECHECKSETTINGS ( RID_STRING_START + 3 )
+#define RID_STR_FIELDDIALOGTITLE ( RID_STRING_START + 4 )
+#define RID_STR_NOFIELDSASSIGNED ( RID_STRING_START + 5 )
// please adjust RID_STRING_END (below) when adding new strings
#define RID_STRING_END RID_STR_NOFIELDSASSIGNED
-//========================================================================
// error boxes
-#define RID_ERR_NEEDTYPESELECTION ( RID_ERRORBOX_START + 0 )
+#define RID_ERR_NEEDTYPESELECTION ( RID_ERRORBOX_START + 0 )
// please adjust RID_ERRORBOX_END (below) when adding new error boxes
#define RID_ERRORBOX_END
RID_ERR_NEEDTYPESELECTION
-//========================================================================
// query boxes
-#define RID_QRY_NOTABLES ( RID_QUERYBOX_START +
0 )
+#define RID_QRY_NOTABLES ( RID_QUERYBOX_START +
0 )
// please adjust RID_QUERYBOX_END (below) when adding new query boxes
#define RID_QUERYBOX_END RID_QRY_NOTABLES
-//========================================================================
// untyped resources
-#define RID_RSC_NOTUSEDYET ( RID_UNTYPED_START +
0 )
+#define RID_RSC_NOTUSEDYET ( RID_UNTYPED_START + 0
)
// please adjust RID_UNTYPED_END (below) when adding new untyped resources
#define RID_UNTYPED_END
RID_RSC_NOTUSEDYET
-//========================================================================
// bitmaps
-#define BMP_HEADERIMAGE (
RID_BITMAP_START + 0 )
+#define BMP_HEADERIMAGE (
RID_BITMAP_START + 0 )
// please adjust RID_BITMAP_END (below) when adding new bitmaps
#define RID_BITMAP_END BMP_HEADERIMAGE
-//========================================================================
-//========================================================================
-//= range checks
+// range checks
#if RID_DIALOG_END > RID_ABP_END
#error "please adjust the resource id ranges!!"
@@ -127,7 +117,6 @@
#error "please adjust the resource id ranges!!"
#endif
-//========================================================================
// local resource ids
//........................................................................
@@ -141,14 +130,14 @@
#define FT_NAME_EXPL 4
#define FT_ERROR 5
#define FL_TOOMUCHTABLES 6
-#define FT_FIELDASSIGMENTEXPL 7
+#define FT_FIELDASSIGMENTEXPL 7
#define FT_ASSIGNEDFIELDS 8
#define FT_FINISH_EXPL 9
#define FT_DUPLICATENAME 10
#define FT_LOCATION 11
//........................................................................
-//#define RB_MORK 1
+// FREE
#define RB_THUNDERBIRD 2
#define RB_EVOLUTION 3
#define RB_KAB 4
@@ -179,24 +168,23 @@
#define CBB_LOCATION 1
//........................................................................
-#define STR_SELECT_ABTYPE 1
-#define STR_INVOKE_ADMIN_DIALOG 2
-#define STR_TABLE_SELECTION 3
-#define STR_MANUAL_FIELD_MAPPING 4
-#define STR_FINAL_CONFIRM 5
+#define STR_SELECT_ABTYPE 1
+#define STR_INVOKE_ADMIN_DIALOG 2
+#define STR_TABLE_SELECTION 3
+#define STR_MANUAL_FIELD_MAPPING 4
+#define STR_FINAL_CONFIRM 5
-//========================================================================
// some defines
//........................................................................
#define WINDOW_SIZE_X 240
#define WINDOW_SIZE_Y 185
-#define WINDOW_BORDER_X 12
-#define WINDOW_BORDER_Y 14
+#define WINDOW_BORDER_X 12
+#define WINDOW_BORDER_Y 14
-#define BUTTON_SIZE_X 50
-#define BUTTON_SIZE_Y 14
+#define BUTTON_SIZE_X 50
+#define BUTTON_SIZE_Y 14
#define HEADER_SIZE_Y 30
@@ -209,5 +197,5 @@
/*************************************************************************
* history:
*
- * Revision 1.0 30.01.01 16:38:29 fs
+ * Revision 1.0 30.01.01 16:38:29 fs
************************************************************************/
diff --git a/main/extensions/source/abpilot/abspilot.cxx
b/main/extensions/source/abpilot/abspilot.cxx
index d089e305ec..dba0ce86f5 100644
--- a/main/extensions/source/abpilot/abspilot.cxx
+++ b/main/extensions/source/abpilot/abspilot.cxx
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_extensions.hxx"
#include "abspilot.hxx"
@@ -38,21 +36,20 @@
#include "fieldmappingpage.hxx"
#include "fieldmappingimpl.hxx"
-//.........................................................................
namespace abp
{
//.........................................................................
-#define STATE_SELECT_ABTYPE 0
-#define STATE_INVOKE_ADMIN_DIALOG 1
-#define STATE_TABLE_SELECTION 2
-#define STATE_MANUAL_FIELD_MAPPING 3
-#define STATE_FINAL_CONFIRM 4
+#define STATE_SELECT_ABTYPE 0
+#define STATE_INVOKE_ADMIN_DIALOG 1
+#define STATE_TABLE_SELECTION 2
+#define STATE_MANUAL_FIELD_MAPPING 3
+#define STATE_FINAL_CONFIRM 4
-#define PATH_COMPLETE 1
-#define PATH_NO_SETTINGS 2
-#define PATH_NO_FIELDS 3
-#define PATH_NO_SETTINGS_NO_FIELDS 4
+#define PATH_COMPLETE 1
+#define PATH_NO_SETTINGS 2
+#define PATH_NO_FIELDS 3
+#define PATH_NO_SETTINGS_NO_FIELDS 4
using namespace ::svt;
using namespace ::com::sun::star::uno;
@@ -64,7 +61,7 @@ namespace abp
//---------------------------------------------------------------------
OAddessBookSourcePilot::OAddessBookSourcePilot(Window* _pParent, const
Reference< XMultiServiceFactory >& _rxORB)
:OAddessBookSourcePilot_Base( _pParent, ModuleRes(
RID_DLG_ADDRESSBOOKSOURCEPILOT ),
- WZB_HELP | WZB_FINISH | WZB_CANCEL | WZB_NEXT | WZB_PREVIOUS )
+ WZB_HELP | WZB_FINISH | WZB_CANCEL | WZB_NEXT |
WZB_PREVIOUS )
,m_xORB(_rxORB)
,m_aNewDataSource(_rxORB)
,m_eNewDataSourceType( AST_INVALID )
@@ -73,34 +70,34 @@ namespace abp
ShowButtonFixedLine(sal_True);
- declarePath( PATH_COMPLETE,
- STATE_SELECT_ABTYPE,
- STATE_INVOKE_ADMIN_DIALOG,
- STATE_TABLE_SELECTION,
- STATE_MANUAL_FIELD_MAPPING,
- STATE_FINAL_CONFIRM,
- WZS_INVALID_STATE
- );
- declarePath( PATH_NO_SETTINGS,
- STATE_SELECT_ABTYPE,
- STATE_TABLE_SELECTION,
- STATE_MANUAL_FIELD_MAPPING,
- STATE_FINAL_CONFIRM,
- WZS_INVALID_STATE
- );
- declarePath( PATH_NO_FIELDS,
- STATE_SELECT_ABTYPE,
- STATE_INVOKE_ADMIN_DIALOG,
- STATE_TABLE_SELECTION,
- STATE_FINAL_CONFIRM,
- WZS_INVALID_STATE
- );
- declarePath( PATH_NO_SETTINGS_NO_FIELDS,
- STATE_SELECT_ABTYPE,
- STATE_TABLE_SELECTION,
- STATE_FINAL_CONFIRM,
- WZS_INVALID_STATE
- );
+ declarePath( PATH_COMPLETE,
+ STATE_SELECT_ABTYPE,
+ STATE_INVOKE_ADMIN_DIALOG,
+ STATE_TABLE_SELECTION,
+ STATE_MANUAL_FIELD_MAPPING,
+ STATE_FINAL_CONFIRM,
+ WZS_INVALID_STATE
+ );
+ declarePath( PATH_NO_SETTINGS,
+ STATE_SELECT_ABTYPE,
+ STATE_TABLE_SELECTION,
+ STATE_MANUAL_FIELD_MAPPING,
+ STATE_FINAL_CONFIRM,
+ WZS_INVALID_STATE
+ );
+ declarePath( PATH_NO_FIELDS,
+ STATE_SELECT_ABTYPE,
+ STATE_INVOKE_ADMIN_DIALOG,
+ STATE_TABLE_SELECTION,
+ STATE_FINAL_CONFIRM,
+ WZS_INVALID_STATE
+ );
+ declarePath( PATH_NO_SETTINGS_NO_FIELDS,
+ STATE_SELECT_ABTYPE,
+ STATE_TABLE_SELECTION,
+ STATE_FINAL_CONFIRM,
+ WZS_INVALID_STATE
+ );
m_pPrevPage->SetHelpId(HID_ABSPILOT_PREVIOUS);
m_pNextPage->SetHelpId(HID_ABSPILOT_NEXT);
@@ -112,10 +109,10 @@ namespace abp
// some initial settings
#ifdef MACOSX
- m_aSettings.eType = AST_MACAB;
+ m_aSettings.eType = AST_MACAB;
#elif WITH_MOZILLA
#ifdef UNX
- m_aSettings.eType = AST_MORK;
+ m_aSettings.eType = AST_THUNDERBIRD;
#else
m_aSettings.eType = AST_OE;
#endif
@@ -130,32 +127,32 @@ namespace abp
enableButtons(WZB_FINISH, sal_False);
ActivatePage();
- typeSelectionChanged( m_aSettings.eType );
+ typeSelectionChanged( m_aSettings.eType );
}
//---------------------------------------------------------------------
String OAddessBookSourcePilot::getStateDisplayName( WizardState _nState
) const
- {
- sal_uInt16 nResId = 0;
- switch ( _nState )
- {
- case STATE_SELECT_ABTYPE: nResId = STR_SELECT_ABTYPE; break;
- case STATE_INVOKE_ADMIN_DIALOG: nResId = STR_INVOKE_ADMIN_DIALOG;
break;
- case STATE_TABLE_SELECTION: nResId = STR_TABLE_SELECTION;
break;
- case STATE_MANUAL_FIELD_MAPPING: nResId =
STR_MANUAL_FIELD_MAPPING; break;
- case STATE_FINAL_CONFIRM: nResId = STR_FINAL_CONFIRM; break;
- }
- DBG_ASSERT( nResId, "OAddessBookSourcePilot::getStateDisplayName:
don't know this state!" );
-
- String sDisplayName;
- if ( nResId )
- {
- svt::OLocalResourceAccess aAccess( ModuleRes(
RID_DLG_ADDRESSBOOKSOURCEPILOT ), RSC_MODALDIALOG );
- sDisplayName = String( ModuleRes( nResId ) );
- }
-
- return sDisplayName;
- }
+ {
+ sal_uInt16 nResId = 0;
+ switch ( _nState )
+ {
+ case STATE_SELECT_ABTYPE: nResId =
STR_SELECT_ABTYPE; break;
+ case STATE_INVOKE_ADMIN_DIALOG: nResId =
STR_INVOKE_ADMIN_DIALOG; break;
+ case STATE_TABLE_SELECTION: nResId =
STR_TABLE_SELECTION; break;
+ case STATE_MANUAL_FIELD_MAPPING: nResId =
STR_MANUAL_FIELD_MAPPING; break;
+ case STATE_FINAL_CONFIRM: nResId =
STR_FINAL_CONFIRM; break;
+ }
+ DBG_ASSERT( nResId,
"OAddessBookSourcePilot::getStateDisplayName: don't know this state!" );
+
+ String sDisplayName;
+ if ( nResId )
+ {
+ svt::OLocalResourceAccess aAccess( ModuleRes(
RID_DLG_ADDRESSBOOKSOURCEPILOT ), RSC_MODALDIALOG );
+ sDisplayName = String( ModuleRes( nResId ) );
+ }
+
+ return sDisplayName;
+ }
//---------------------------------------------------------------------
void OAddessBookSourcePilot::implCommitAll()
@@ -194,7 +191,7 @@ namespace abp
// reset the click hdl
m_pCancel->SetClickHdl( Link() );
- // simulate the click again - this time, the default handling
of the button will strike ....
+ // simulate the click again - this time, the default handling
of the button will strike...
m_pCancel->Click();
return 0L;
@@ -227,8 +224,8 @@ namespace abp
switch ( _nState )
{
case STATE_SELECT_ABTYPE:
- impl_updateRoadmap( static_cast< TypeSelectionPage* >(
GetPage( STATE_SELECT_ABTYPE ) )->getSelectedType() );
- break;
+ impl_updateRoadmap( static_cast<
TypeSelectionPage* >( GetPage( STATE_SELECT_ABTYPE ) )->getSelectedType() );
+ break;
case STATE_FINAL_CONFIRM:
if ( !needManualFieldMapping( ) )
@@ -243,59 +240,59 @@ namespace abp
OAddessBookSourcePilot_Base::enterState(_nState);
}
- //---------------------------------------------------------------------
- sal_Bool OAddessBookSourcePilot::prepareLeaveCurrentState(
CommitPageReason _eReason )
- {
- if ( !OAddessBookSourcePilot_Base::prepareLeaveCurrentState( _eReason
) )
- return sal_False;
-
- if ( _eReason == eTravelBackward )
- return sal_True;
-
- sal_Bool bAllow = sal_True;
-
- switch ( getCurrentState() )
- {
- case STATE_SELECT_ABTYPE:
- implCreateDataSource();
- if ( needAdminInvokationPage() )
- break;
- // no break here
-
- case STATE_INVOKE_ADMIN_DIALOG:
- if ( !connectToDataSource( sal_False ) )
- {
- // connecting did not succeed -> do not allow proceeding
- bAllow = sal_False;
- break;
- }
-
- // ........................................................
- // now that we connected to the data source, check whether we need
the "table selection" page
- const StringBag& aTables = m_aNewDataSource.getTableNames();
+ //---------------------------------------------------------------------
+ sal_Bool OAddessBookSourcePilot::prepareLeaveCurrentState(
CommitPageReason _eReason )
+ {
+ if ( !OAddessBookSourcePilot_Base::prepareLeaveCurrentState(
_eReason ) )
+ return sal_False;
+
+ if ( _eReason == eTravelBackward )
+ return sal_True;
+
+ sal_Bool bAllow = sal_True;
+
+ switch ( getCurrentState() )
+ {
+ case STATE_SELECT_ABTYPE:
+ implCreateDataSource();
+ if ( needAdminInvokationPage() )
+ break;
+ // no break here
+
+ case STATE_INVOKE_ADMIN_DIALOG:
+ if ( !connectToDataSource( sal_False ) )
+ {
+ // connecting did not succeed -> do not allow
proceeding
+ bAllow = sal_False;
+ break;
+ }
+
+ //
........................................................
+ // now that we connected to the data source, check
whether we need the "table selection" page
+ const StringBag& aTables =
m_aNewDataSource.getTableNames();
if ( aTables.empty() )
- {
- if ( RET_YES != QueryBox( this, ModuleRes( RID_QRY_NOTABLES )
).Execute() )
- {
- // cannot ask the user, or the user chose to use this data
source, though there are no tables
- bAllow = sal_False;
- break;
- }
-
- m_aSettings.bIgnoreNoTable = true;
+ {
+ if ( RET_YES != QueryBox( this, ModuleRes(
RID_QRY_NOTABLES ) ).Execute() )
+ {
+ // cannot ask the user, or the user
chose to use this data source, though there are no tables
+ bAllow = sal_False;
+ break;
+ }
+
+ m_aSettings.bIgnoreNoTable = true;
}
- if ( aTables.size() == 1 )
- // remember the one and only table we have
- m_aSettings.sSelectedTable = *aTables.begin();
+ if ( aTables.size() == 1 )
+ // remember the one and only table we have
+ m_aSettings.sSelectedTable = *aTables.begin();
- break;
- }
+ break;
+ }
- impl_updateRoadmap( m_aSettings.eType );
- return bAllow;
- }
+ impl_updateRoadmap( m_aSettings.eType );
+ return bAllow;
+ }
//---------------------------------------------------------------------
void OAddessBookSourcePilot::implDefaultTableName()
@@ -308,15 +305,14 @@ namespace abp
const sal_Char* pGuess = NULL;
switch ( getSettings().eType )
{
- case AST_MORK :
case AST_THUNDERBIRD : pGuess = "Personal
Address book"; break;
case AST_LDAP : pGuess = "LDAP
Directory"; break;
case AST_EVOLUTION :
case AST_EVOLUTION_GROUPWISE:
case AST_EVOLUTION_LDAP : pGuess = "Personal";
break;
- default:
- DBG_ERROR( "OAddessBookSourcePilot::implDefaultTableName:
unhandled case!" );
- return;
+ default:
+ DBG_ERROR(
"OAddessBookSourcePilot::implDefaultTableName: unhandled case!" );
+ return;
}
const ::rtl::OUString sGuess =
::rtl::OUString::createFromAscii( pGuess );
if ( rTableNames.end() != rTableNames.find( sGuess ) )
@@ -349,10 +345,6 @@ namespace abp
switch (m_aSettings.eType)
{
- case AST_MORK:
- m_aNewDataSource = aContext.createNewMORK(
m_aSettings.sDataSourceName );
- break;
-
case AST_THUNDERBIRD:
m_aNewDataSource =
aContext.createNewThunderbird( m_aSettings.sDataSourceName );
break;
@@ -393,9 +385,9 @@ namespace abp
m_aNewDataSource = aContext.createNewDBase(
m_aSettings.sDataSourceName );
break;
- case AST_INVALID:
- DBG_ERROR( "OAddessBookSourcePilot::implCreateDataSource:
illegal data source type!" );
- break;
+ case AST_INVALID:
+ DBG_ERROR(
"OAddessBookSourcePilot::implCreateDataSource: illegal data source type!" );
+ break;
}
m_eNewDataSourceType = m_aSettings.eType;
}
@@ -438,58 +430,59 @@ namespace abp
}
}
- //---------------------------------------------------------------------
- void OAddessBookSourcePilot::impl_updateRoadmap( AddressSourceType _eType )
- {
- bool bSettingsPage = needAdminInvokationPage( _eType );
- bool bTablesPage = needTableSelection( _eType );
- bool bFieldsPage = needManualFieldMapping( _eType );
-
- bool bConnected = m_aNewDataSource.isConnected();
- bool bCanSkipTables =
- ( m_aNewDataSource.hasTable( m_aSettings.sSelectedTable )
- || m_aSettings.bIgnoreNoTable
- );
-
- enableState( STATE_INVOKE_ADMIN_DIALOG, bSettingsPage );
-
- enableState( STATE_TABLE_SELECTION,
- bTablesPage && ( bConnected ? !bCanSkipTables : !bSettingsPage )
- // if we do not need a settings page, we connect upon "Next" on
the first page
- );
-
- enableState( STATE_MANUAL_FIELD_MAPPING,
- bFieldsPage && bConnected && m_aNewDataSource.hasTable(
m_aSettings.sSelectedTable )
- );
-
- enableState( STATE_FINAL_CONFIRM,
- bConnected && bCanSkipTables
- );
- }
-
- //---------------------------------------------------------------------
- void OAddessBookSourcePilot::typeSelectionChanged( AddressSourceType
_eType )
- {
- PathId nCurrentPathID( PATH_COMPLETE );
- bool bSettingsPage = needAdminInvokationPage( _eType );
- bool bFieldsPage = needManualFieldMapping( _eType );
- if ( !bSettingsPage )
- if ( !bFieldsPage )
- nCurrentPathID = PATH_NO_SETTINGS_NO_FIELDS;
- else
- nCurrentPathID = PATH_NO_SETTINGS;
- else
- if ( !bFieldsPage )
- nCurrentPathID = PATH_NO_FIELDS;
- else
- nCurrentPathID = PATH_COMPLETE;
- activatePath( nCurrentPathID, true );
-
- m_aNewDataSource.disconnect();
- m_aSettings.bIgnoreNoTable = false;
- impl_updateRoadmap( _eType );
- }
+ //---------------------------------------------------------------------
+ void OAddessBookSourcePilot::impl_updateRoadmap( AddressSourceType
_eType )
+ {
+ bool bSettingsPage = needAdminInvokationPage( _eType );
+ bool bTablesPage = needTableSelection( _eType );
+ bool bFieldsPage = needManualFieldMapping( _eType );
+
+ bool bConnected = m_aNewDataSource.isConnected();
+ bool bCanSkipTables =
+ ( m_aNewDataSource.hasTable(
m_aSettings.sSelectedTable )
+ || m_aSettings.bIgnoreNoTable
+ );
+
+ enableState( STATE_INVOKE_ADMIN_DIALOG, bSettingsPage );
+
+ enableState( STATE_TABLE_SELECTION,
+ bTablesPage && ( bConnected ? !bCanSkipTables :
!bSettingsPage )
+ // if we do not need a settings page, we connect upon
"Next" on the first page
+ );
+
+ enableState( STATE_MANUAL_FIELD_MAPPING,
+ bFieldsPage && bConnected &&
m_aNewDataSource.hasTable( m_aSettings.sSelectedTable )
+ );
+
+ enableState( STATE_FINAL_CONFIRM,
+ bConnected && bCanSkipTables
+ );
+ }
+
+ //---------------------------------------------------------------------
+ void OAddessBookSourcePilot::typeSelectionChanged( AddressSourceType
_eType )
+ {
+ PathId nCurrentPathID( PATH_COMPLETE );
+ bool bSettingsPage = needAdminInvokationPage( _eType );
+ bool bFieldsPage = needManualFieldMapping( _eType );
+ if ( !bSettingsPage )
+ if ( !bFieldsPage )
+ nCurrentPathID = PATH_NO_SETTINGS_NO_FIELDS;
+ else
+ nCurrentPathID = PATH_NO_SETTINGS;
+ else
+ if ( !bFieldsPage )
+ nCurrentPathID = PATH_NO_FIELDS;
+ else
+ nCurrentPathID = PATH_COMPLETE;
+ activatePath( nCurrentPathID, true );
+
+ m_aNewDataSource.disconnect();
+ m_aSettings.bIgnoreNoTable = false;
+ impl_updateRoadmap( _eType );
+ }
//.........................................................................
} // namespace abp
-//.........................................................................
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/extensions/source/abpilot/addresssettings.hxx
b/main/extensions/source/abpilot/addresssettings.hxx
index 0450947c12..6b8c1b7e36 100644
--- a/main/extensions/source/abpilot/addresssettings.hxx
+++ b/main/extensions/source/abpilot/addresssettings.hxx
@@ -19,15 +19,12 @@
*
*************************************************************/
-
-
#ifndef EXTENSIONS_ABP_ADDRESSSETTINGS_HXX
#define EXTENSIONS_ABP_ADDRESSSETTINGS_HXX
#include <rtl/ustring.hxx>
#include "abptypes.hxx"
-//.........................................................................
namespace abp
{
//.........................................................................
@@ -37,8 +34,7 @@ namespace abp
//=====================================================================
enum AddressSourceType
{
- AST_MORK,
- AST_THUNDERBIRD,
+ AST_THUNDERBIRD,
AST_EVOLUTION,
AST_EVOLUTION_GROUPWISE,
AST_EVOLUTION_LDAP,
@@ -62,9 +58,9 @@ namespace abp
::rtl::OUString sDataSourceName;
::rtl::OUString sRegisteredDataSourceName;
::rtl::OUString sSelectedTable;
- bool bIgnoreNoTable;
+ bool bIgnoreNoTable;
MapString2String aFieldMapping;
- bool bRegisterDataSource;
+ bool bRegisterDataSource;
};
//.........................................................................
@@ -72,3 +68,5 @@ namespace abp
//.........................................................................
#endif // EXTENSIONS_ABP_ADDRESSSETTINGS_HXX
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/extensions/source/abpilot/datasourcehandling.cxx
b/main/extensions/source/abpilot/datasourcehandling.cxx
index cbdcf8f3ab..8e53a70fef 100644
--- a/main/extensions/source/abpilot/datasourcehandling.cxx
+++ b/main/extensions/source/abpilot/datasourcehandling.cxx
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_extensions.hxx"
@@ -52,7 +50,6 @@
#include <unotools/sharedunocomponent.hxx>
#include <vcl/stdtext.hxx>
-//.........................................................................
namespace abp
{
//.........................................................................
@@ -73,7 +70,7 @@ namespace abp
struct PackageAccessControl { };
//=====================================================================
- //---------------------------------------------------------------------
+ //---------------------------------------------------------------------
static Reference< XNameAccess > lcl_getDataSourceContext( const
Reference< XMultiServiceFactory >& _rxORB ) SAL_THROW (( Exception ))
{
Reference< XNameAccess > xContext( _rxORB->createInstance(
::rtl::OUString::createFromAscii( "com.sun.star.sdb.DatabaseContext" ) ),
UNO_QUERY );
@@ -82,7 +79,7 @@ namespace abp
}
//---------------------------------------------------------------------
- /// creates a new data source and inserts it into the context
+ // creates a new data source and inserts it into the context
static void lcl_implCreateAndInsert(
const Reference< XMultiServiceFactory >& _rxORB, const
::rtl::OUString& _rName,
Reference< XPropertySet >& /* [out] */ _rxNewDataSource )
SAL_THROW (( ::com::sun::star::uno::Exception ))
@@ -92,7 +89,7 @@ namespace abp
Reference< XNameAccess > xContext = lcl_getDataSourceContext(
_rxORB );
DBG_ASSERT( !xContext->hasByName( _rName ),
"lcl_implCreateAndInsert: name already used!" );
- (void)_rName;
+ (void)_rName;
//.............................................................
// create a new data source
@@ -114,7 +111,7 @@ namespace abp
}
//---------------------------------------------------------------------
- /// creates and inserts a data source, and sets it's URL property to
the string given
+ // creates and inserts a data source, and sets its URL property to the
string given
static ODataSource lcl_implCreateAndSetURL(
const Reference< XMultiServiceFactory >& _rxORB, const
::rtl::OUString& _rName,
const sal_Char* _pInitialAsciiURL ) SAL_THROW (( ))
@@ -150,24 +147,24 @@ namespace abp
const Reference< XMultiServiceFactory >& _rxORB, const
::rtl::OUString& _sName,
const ::rtl::OUString& _sURL ) SAL_THROW ((
::com::sun::star::uno::Exception ))
{
- OSL_ENSURE( _sName.getLength(), "lcl_registerDataSource: invalid
name!" );
- OSL_ENSURE( _sURL.getLength(), "lcl_registerDataSource: invalid URL!"
);
- try
- {
+ OSL_ENSURE( _sName.getLength(), "lcl_registerDataSource:
invalid name!" );
+ OSL_ENSURE( _sURL.getLength(), "lcl_registerDataSource: invalid
URL!" );
+ try
+ {
- ::comphelper::ComponentContext aContext( _rxORB );
- Reference< XDatabaseRegistrations > xRegistrations(
- aContext.createComponent( "com.sun.star.sdb.DatabaseContext"
), UNO_QUERY_THROW );
+ ::comphelper::ComponentContext aContext( _rxORB );
+ Reference< XDatabaseRegistrations > xRegistrations(
+ aContext.createComponent(
"com.sun.star.sdb.DatabaseContext" ), UNO_QUERY_THROW );
- if ( xRegistrations->hasRegisteredDatabase( _sName ) )
- xRegistrations->changeDatabaseLocation( _sName, _sURL );
- else
- xRegistrations->registerDatabaseLocation( _sName, _sURL );
- }
- catch( const Exception& )
- {
- DBG_UNHANDLED_EXCEPTION();
- }
+ if ( xRegistrations->hasRegisteredDatabase( _sName ) )
+ xRegistrations->changeDatabaseLocation( _sName,
_sURL );
+ else
+ xRegistrations->registerDatabaseLocation(
_sName, _sURL );
+ }
+ catch( const Exception& )
+ {
+ DBG_UNHANDLED_EXCEPTION();
+ }
}
//=====================================================================
@@ -176,8 +173,8 @@ namespace abp
struct ODataSourceContextImpl
{
Reference< XMultiServiceFactory > xORB;
- Reference< XNameAccess > xContext;
/// the UNO data source context
- StringBag
aDataSourceNames; /// for quicker name checks (without the UNO overhead)
+ Reference< XNameAccess > xContext;
// the UNO data source context
+ StringBag
aDataSourceNames; // for quicker name checks (without the UNO overhead)
ODataSourceContextImpl( const Reference< XMultiServiceFactory
>& _rxORB ) : xORB( _rxORB ) { }
ODataSourceContextImpl( const ODataSourceContextImpl& _rSource )
@@ -247,12 +244,6 @@ namespace abp
return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName,
"sdbc:address:ldap:" );
}
- //---------------------------------------------------------------------
- ODataSource ODataSourceContext::createNewMORK( const
::rtl::OUString& _rName) SAL_THROW (( ))
- {
- return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName,
"sdbc:address:mozilla" );
- }
-
//---------------------------------------------------------------------
ODataSource ODataSourceContext::createNewThunderbird( const
::rtl::OUString& _rName ) SAL_THROW (( ))
{
@@ -311,10 +302,10 @@ namespace abp
struct ODataSourceImpl
{
public:
- Reference< XMultiServiceFactory > xORB;
/// the service factory
- Reference< XPropertySet >
xDataSource; /// the UNO data source
- ::utl::SharedUNOComponent< XConnection >
- xConnection;
+ Reference< XMultiServiceFactory > xORB;
// the service factory
+ Reference< XPropertySet >
xDataSource; // the UNO data source
+ ::utl::SharedUNOComponent< XConnection >
+
xConnection;
StringBag
aTables; // the cached table names
::rtl::OUString
sName;
sal_Bool
bTablesUpToDate; // table name cache up-to-date?
@@ -379,9 +370,9 @@ namespace abp
try
{
Reference< XDocumentDataSource > xDocAccess(
m_pImpl->xDataSource, UNO_QUERY );
- Reference< XStorable > xStorable;
- if ( xDocAccess.is() )
- xStorable = xStorable.query( xDocAccess->getDatabaseDocument()
);
+ Reference< XStorable > xStorable;
+ if ( xDocAccess.is() )
+ xStorable = xStorable.query(
xDocAccess->getDatabaseDocument() );
OSL_ENSURE( xStorable.is(),"DataSource is no
XStorable!" );
if ( xStorable.is() )
xStorable->storeAsURL(m_pImpl->sName,Sequence<PropertyValue>());
@@ -461,14 +452,14 @@ namespace abp
}
//---------------------------------------------------------------------
- bool ODataSource::hasTable( const ::rtl::OUString& _rTableName ) const
- {
- if ( !isConnected() )
- return false;
+ bool ODataSource::hasTable( const ::rtl::OUString& _rTableName ) const
+ {
+ if ( !isConnected() )
+ return false;
- const StringBag& aTables( getTableNames() );
- return aTables.find( _rTableName ) != aTables.end();
- }
+ const StringBag& aTables( getTableNames() );
+ return aTables.find( _rTableName ) != aTables.end();
+ }
//---------------------------------------------------------------------
const StringBag& ODataSource::getTableNames() const SAL_THROW (( ))
@@ -567,20 +558,20 @@ namespace abp
try
{
SQLException aException;
- aError >>= aException;
- if ( !aException.Message.getLength() )
- {
- // prepend some context info
+ aError >>= aException;
+ if ( !aException.Message.getLength() )
+ {
+ // prepend some context info
SQLContext aDetailedError;
aDetailedError.Message = String(
ModuleRes( RID_STR_NOCONNECTION ) );
aDetailedError.Details = String(
ModuleRes( RID_STR_PLEASECHECKSETTINGS ) );
aDetailedError.NextException = aError;
// handle (aka display) the new context
info
xInteractions->handle( new
OInteractionRequest( makeAny( aDetailedError ) ) );
- }
- else
- {
- // handle (aka display) the original
error
+ }
+ else
+ {
+ // handle (aka display) the original
error
xInteractions->handle( new
OInteractionRequest( makeAny( aException ) ) );
}
}
@@ -629,4 +620,5 @@ namespace abp
//.........................................................................
} // namespace abp
-//.........................................................................
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/extensions/source/abpilot/datasourcehandling.hxx
b/main/extensions/source/abpilot/datasourcehandling.hxx
index 5cade2ffce..d756933422 100644
--- a/main/extensions/source/abpilot/datasourcehandling.hxx
+++ b/main/extensions/source/abpilot/datasourcehandling.hxx
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
#ifndef EXTENSIONS_ABP_DATASOURCEHANDLING_HXX
#define EXTENSIONS_ABP_DATASOURCEHANDLING_HXX
@@ -39,7 +37,6 @@ namespace com { namespace sun { namespace star {
class Window;
-
//.........................................................................
namespace abp
{
@@ -50,7 +47,7 @@ namespace abp
//=====================================================================
struct ODataSourceContextImpl;
class ODataSource;
- /// a non-UNO wrapper for the data source context
+ // an non-UNO wrapper for the data source context
class ODataSourceContext
{
private:
@@ -61,43 +58,40 @@ namespace abp
const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XMultiServiceFactory >& _rxORB
);
- /// retrieves the names of all data sources
+ // retrieves the names of all data sources
void getDataSourceNames( StringBag& _rNames ) const
SAL_THROW (( ));
- /// disambiguates the given name by appending auccessive numbers
+ // disambiguate the given name by appending successive numbers
::rtl::OUString& disambiguate(::rtl::OUString&
_rDataSourceName);
- /// creates a new MORK data source
- ODataSource createNewMORK( const ::rtl::OUString& _rName )
SAL_THROW (( ));
-
- /// creates a new Thunderbird data source
+ // creates a new Thunderbird data source
ODataSource createNewThunderbird( const ::rtl::OUString& _rName
) SAL_THROW (( ));
- /// creates a new Evolution local data source
+ // creates a new Evolution local data source
ODataSource createNewEvolution( const ::rtl::OUString& _rName )
SAL_THROW (( ));
- /// creates a new Evolution LDAP data source
+ // creates a new Evolution LDAP data source
ODataSource createNewEvolutionLdap( const ::rtl::OUString&
_rName ) SAL_THROW (( ));
- /// creates a new Evolution GROUPWISE data source
+ // creates a new Evolution GROUPWISE data source
ODataSource createNewEvolutionGroupwise( const ::rtl::OUString&
_rName ) SAL_THROW (( ));
- /// creates a new KDE address book data source
+ // creates a new KDE address book data source
ODataSource createNewKab( const ::rtl::OUString& _rName )
SAL_THROW (( ));
- /// creates a new Mac OS X address book data source
+ // creates a new macOS address book data source
ODataSource createNewMacab( const ::rtl::OUString& _rName )
SAL_THROW (( ));
- /// creates a new LDAP data source
+ // creates a new LDAP data source
ODataSource createNewLDAP( const ::rtl::OUString& _rName )
SAL_THROW (( ));
- /// creates a new Outlook data source
+ // creates a new Outlook data source
ODataSource createNewOutlook( const ::rtl::OUString& _rName
) SAL_THROW (( ));
- /// creates a new Outlook express data source
+ // creates a new Outlook express data source
ODataSource createNewOE( const ::rtl::OUString& _rName )
SAL_THROW (( ));
- /// creates a new dBase data source
+ // creates a new dBASE data source
ODataSource createNewDBase( const ::rtl::OUString& _rName )
SAL_THROW (( ));
};
@@ -121,34 +115,34 @@ namespace abp
//
----------------------------------------------------------------
// - ctor/dtor/assignment
//
----------------------------------------------------------------
- /// constructs an object which is initially invalid
+ // constructs an object which is initially invalid
ODataSource(
const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XMultiServiceFactory >& _rxORB
);
- /// copy ctor
+ // copy ctor
ODataSource( const ODataSource& _rSource );
- /// dtor
+ // dtor
~ODataSource( );
- /// assignment
+ // assignment
ODataSource& operator=( const ODataSource& _rSource );
//
----------------------------------------------------------------
- /// checks whether or not the object represents a valid data
source
+ // checks whether or not the object represents a valid data
source
sal_Bool isValid() const SAL_THROW (( ));
//
----------------------------------------------------------------
- /// removes the data source represented by the object from the
data source context
+ // removes the data source represented by the object from the
data source context
void remove() SAL_THROW (( ));
// TODO: put this into the context class
- /// returns the name of the data source
+ // returns the name of the data source
::rtl::OUString
getName() const SAL_THROW (( ));
- /// renames the data source
+ // renames the data source
sal_Bool rename( const ::rtl::OUString& _rName )
SAL_THROW (( ));
// TODO: put this into the context class
@@ -163,17 +157,17 @@ namespace abp
*/
sal_Bool connect( Window* _pMessageParent ) SAL_THROW ((
));
- /// returns <TRUE/> if the object has a valid connection,
obtained from it's data source
+ // returns <TRUE/> if the object has a valid connection,
obtained from its data source
sal_Bool isConnected( ) const SAL_THROW (( ));
- /// disconnects from the data source (i.e. disposes the UNO
connection hold internally)
+ // disconnects from the data source (i.e. disposes the UNO
connection hold internally)
void disconnect( ) SAL_THROW (( ));
- /// stores the database file
+ // stores the database file
void store() SAL_THROW (( ));
- /// register the data source under the given name in the
configuration
- void registerDataSource( const ::rtl::OUString&
_sRegisteredDataSourceName ) SAL_THROW (( ));
+ // register the data source under the given name in the
configuration
+ void registerDataSource( const ::rtl::OUString&
_sRegisteredDataSourceName ) SAL_THROW (( ));
//
----------------------------------------------------------------
/** retrieves the tables names from the connection
@@ -181,11 +175,11 @@ namespace abp
*/
const StringBag& getTableNames() const SAL_THROW (( ));
- /** determines whether a given table exists
- */
- bool hasTable( const ::rtl::OUString& _rTableName ) const;
+ /** determines whether a given table exists
+ */
+ bool hasTable( const ::rtl::OUString& _rTableName ) const;
- /// return the intern data source object
+ // return the intern data source object
::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > getDataSource() const SAL_THROW (( ));
@@ -208,3 +202,5 @@ namespace abp
//.........................................................................
#endif // EXTENSIONS_ABP_DATASOURCEHANDLING_HXX
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/extensions/source/abpilot/typeselectionpage.cxx
b/main/extensions/source/abpilot/typeselectionpage.cxx
index 054ae1239d..8d0c9aad43 100644
--- a/main/extensions/source/abpilot/typeselectionpage.cxx
+++ b/main/extensions/source/abpilot/typeselectionpage.cxx
@@ -27,7 +27,6 @@
#include <vcl/msgbox.hxx>
#include <com/sun/star/sdbc/XDriverAccess.hpp>
-//.........................................................................
namespace abp
{
//.........................................................................
@@ -41,24 +40,24 @@ namespace abp
//---------------------------------------------------------------------
TypeSelectionPage::TypeSelectionPage( OAddessBookSourcePilot* _pParent )
:AddressBookSourcePage(_pParent,
ModuleRes(RID_PAGE_SELECTABTYPE))
- ,m_aHint (this,
ModuleRes(FT_TYPE_HINTS))
- ,m_aTypeSep (this, ModuleRes(FL_TYPE))
- ,m_aEvolution (this, ModuleRes(RB_EVOLUTION))
- ,m_aEvolutionGroupwise (this, ModuleRes(RB_EVOLUTION_GROUPWISE))
- ,m_aEvolutionLdap (this, ModuleRes(RB_EVOLUTION_LDAP))
- ,m_aThunderbird (this, ModuleRes(RB_THUNDERBIRD))
- ,m_aKab (this,
ModuleRes(RB_KAB))
- ,m_aMacab (this, ModuleRes(RB_MACAB))
- ,m_aLDAP (this, ModuleRes(RB_LDAP))
- ,m_aOutlook (this, ModuleRes(RB_OUTLOOK))
- ,m_aOE (this,
ModuleRes(RB_OUTLOOKEXPRESS))
- ,m_aOther (this, ModuleRes(RB_OTHER))
- {
+ ,m_aHint (this,
ModuleRes(FT_TYPE_HINTS))
+ ,m_aTypeSep (this,
ModuleRes(FL_TYPE))
+ ,m_aEvolution (this, ModuleRes(RB_EVOLUTION))
+ ,m_aEvolutionGroupwise (this,
ModuleRes(RB_EVOLUTION_GROUPWISE))
+ ,m_aEvolutionLdap (this,
ModuleRes(RB_EVOLUTION_LDAP))
+ ,m_aThunderbird (this,
ModuleRes(RB_THUNDERBIRD))
+ ,m_aKab (this,
ModuleRes(RB_KAB))
+ ,m_aMacab (this,
ModuleRes(RB_MACAB))
+ ,m_aLDAP (this,
ModuleRes(RB_LDAP))
+ ,m_aOutlook (this,
ModuleRes(RB_OUTLOOK))
+ ,m_aOE (this,
ModuleRes(RB_OUTLOOKEXPRESS))
+ ,m_aOther (this,
ModuleRes(RB_OTHER))
+ {
FreeResource();
Point aTopLeft( LogicToPixel( Point( 15, 68 ), MAP_APPFONT ) );
- Size aItemSize( LogicToPixel( Size( 0, 8 ), MAP_APPFONT ) );
- aItemSize.Width() = GetOutputSizePixel().Width() - 30;
+ Size aItemSize( LogicToPixel( Size( 0, 8 ), MAP_APPFONT ) );
+ aItemSize.Width() = GetOutputSizePixel().Width() - 30;
bool bWithMozilla = true, bUnx = true;
bool bHaveEvolution = true, bHaveKab = true;
@@ -85,7 +84,7 @@ namespace abp
if ( !xDriver.is() )
bHaveKab = false;
- // check whether Mac OS X address book is available
+ // check whether macOS address book is available
xDriver =
xManager->getDriverByURL(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:address:macab")));
if ( !xDriver.is() )
bHaveMacab = false;
@@ -103,9 +102,9 @@ namespace abp
m_aAllTypes.push_back( ButtonItem( &m_aOE, AST_OE, bWithMozilla
&& !bUnx ) );
m_aAllTypes.push_back( ButtonItem( &m_aOther, AST_OTHER, true )
);
- bool bFirstVisible = true;
+ bool bFirstVisible = true;
Link aTypeSelectionHandler = LINK(this, TypeSelectionPage,
OnTypeSelected );
- const Size aSpacing( LogicToPixel( Size( 0, 3 ), MAP_APPFONT ) );
+ const Size aSpacing( LogicToPixel( Size( 0, 3 ), MAP_APPFONT )
);
for ( ::std::vector< ButtonItem >::const_iterator loop =
m_aAllTypes.begin();
loop != m_aAllTypes.end(); ++loop )
{
@@ -119,24 +118,24 @@ namespace abp
aItem.m_pItem->SetClickHdl(
aTypeSelectionHandler );
aItem.m_pItem->Show();
- if ( bFirstVisible )
- {
- aItem.m_pItem->SetStyle( aItem.m_pItem->GetStyle() |
WB_GROUP );
- bFirstVisible = false;
- }
+ if ( bFirstVisible )
+ {
+ aItem.m_pItem->SetStyle(
aItem.m_pItem->GetStyle() | WB_GROUP );
+ bFirstVisible = false;
+ }
}
}
}
//---------------------------------------------------------------------
- TypeSelectionPage::~TypeSelectionPage()
- {
+ TypeSelectionPage::~TypeSelectionPage()
+ {
for ( ::std::vector< ButtonItem >::iterator loop =
m_aAllTypes.begin();
loop != m_aAllTypes.end(); ++loop )
{
loop->m_bVisible = false;
- }
- }
+ }
+ }
//---------------------------------------------------------------------
void TypeSelectionPage::ActivatePage()
@@ -150,11 +149,11 @@ namespace abp
if( rItem.m_pItem->IsChecked() && rItem.m_bVisible )
{
rItem.m_pItem->GrabFocus();
- break;
- }
+ break;
+ }
}
- getDialog()->enableButtons(WZB_PREVIOUS, sal_False);
+ getDialog()->enableButtons(WZB_PREVIOUS, sal_False);
}
//---------------------------------------------------------------------
@@ -227,11 +226,12 @@ namespace abp
//---------------------------------------------------------------------
IMPL_LINK( TypeSelectionPage, OnTypeSelected, void*,
/*NOTINTERESTEDIN*/ )
{
- getDialog()->typeSelectionChanged( getSelectedType() );
+ getDialog()->typeSelectionChanged( getSelectedType() );
updateDialogTravelUI();
return 0L;
}
//.........................................................................
} // namespace abp
-//.........................................................................
+
+/* vim: set noet sw=4 ts=4: */
