diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-05-05 15:49:02 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-05-05 15:50:12 +0300 |
| commit | 3a93807bdc14d06aa0178f078a045b359d170f45 (patch) | |
| tree | aedc9131c7a5a6f3cad5edd11ec16543489c280a /extensions | |
| parent | 2be3b8bd883ce2df2f1a9edce6292ad749d96fd4 (diff) | |
Improve GroupWise warning in address book data source wizard, bnc#573994
Commit an old patch from i#110071, to prevent it being lost presumably
forever in an old tiny CWS of mine.
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/abpilot/abpresid.hrc | 4 | ||||
| -rw-r--r-- | extensions/source/abpilot/abspilot.cxx | 2 | ||||
| -rw-r--r-- | extensions/source/abpilot/abspilot.src | 9 |
3 files changed, 13 insertions, 2 deletions
diff --git a/extensions/source/abpilot/abpresid.hrc b/extensions/source/abpilot/abpresid.hrc index e6a648a28423..00d7992b03fa 100644 --- a/extensions/source/abpilot/abpresid.hrc +++ b/extensions/source/abpilot/abpresid.hrc @@ -89,7 +89,9 @@ #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 +#define RID_QRY_NO_EVO_GW ( RID_QUERYBOX_START + 1 ) + +#define RID_QUERYBOX_END RID_QRY_NO_EVO_GW //======================================================================== // untyped resources diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx index 005c736f9f7e..44b7eebff431 100644 --- a/extensions/source/abpilot/abspilot.cxx +++ b/extensions/source/abpilot/abspilot.cxx @@ -280,7 +280,7 @@ namespace abp if ( aTables.empty() ) { - if ( RET_YES != QueryBox( this, ModuleRes( RID_QRY_NOTABLES ) ).Execute() ) + if ( RET_YES != QueryBox( this, ModuleRes( ( getSettings().eType == AST_EVOLUTION_GROUPWISE ? RID_QRY_NO_EVO_GW : 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; diff --git a/extensions/source/abpilot/abspilot.src b/extensions/source/abpilot/abspilot.src index a612a2051075..289e466ea9e7 100644 --- a/extensions/source/abpilot/abspilot.src +++ b/extensions/source/abpilot/abspilot.src @@ -362,6 +362,15 @@ QueryBox RID_QRY_NOTABLES }; //........................................................................ +QueryBox RID_QRY_NO_EVO_GW +{ + Buttons = WB_YES_NO; + DefButton = WB_DEF_NO; + + Message [ en-US ] = "You don't seem to have any GroupWise account configured in Evolution.\nDo you want to set it up as an address data source, anyway?"; +}; + +//........................................................................ String RID_STR_DEFAULT_NAME { Text [ en-US ] = "Addresses"; |