[Libreoffice-commits] .: extensions/source

[Tor Lillqvist]

 extensions/source/abpilot/abpresid.hrc |    4 +++-
 extensions/source/abpilot/abspilot.cxx |    2 +-
 extensions/source/abpilot/abspilot.src |    9 +++++++++
 3 files changed, 13 insertions(+), 2 deletions(-)

New commits:
commit 378a863dc169d9efa1368250ea0d8c4e9ad2cf85
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu May 5 15:49:02 2011 +0300

    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.

diff --git a/extensions/source/abpilot/abpresid.hrc b/extensions/source/abpilot/abpresid.hrc
index 08ade5d..4a364a4 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 2da2a99..f9124a1 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 f159ff6..c21980a 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";