CWS-TOOLING: integrate CWS evoab2def

2009-05-28 16:00:19 +0200 fs  r272412 : don't use createFalse - Evo 2.22 simply hangs when ask for all contacts without a first name. Instead, in the WHERE 0=1 case, simply create an empty result set
2009-05-22 14:25:51 +0200 fs  r272193 : #i10000#
2009-05-22 14:25:37 +0200 fs  r272192 : oops, ENABLE_EVOAB2 for some platforms only, not generically
2009-05-22 14:19:00 +0200 fs  r272191 : #i10000#
2009-05-22 12:42:38 +0200 fs  r272183 : when sorting, properly use a syslocale collator, instead of comparing the numerical values of the string's UTF-16 code points
2009-05-20 15:09:00 +0200 fs  r272131 : clear/getWarnings: also allowed without cache
2009-05-20 14:11:19 +0200 fs  r272128 : removed debug traces
2009-05-20 14:03:31 +0200 fs  r272126 : #i55701# +STR_SORT_BY_COL_ONLY
2009-05-20 14:02:29 +0200 fs  r272125 : implement sorting
2009-05-20 10:10:19 +0200 fs  r272107 : #i10000#
2009-05-19 16:02:17 +0200 fs  r272089 : #i10000#
2009-05-19 16:02:02 +0200 fs  r272088 : #i55701# strings for new error condition DATA_CANNOT_SELECT_UNFILTERED
2009-05-19 16:01:31 +0200 fs  r272087 : #i55701# use DATA_CANNOT_SELECT_UNFILTERED as standardized error code
2009-05-19 15:59:59 +0200 fs  r272086 : #i55701# +DATA_CANNOT_SELECT_UNFILTERED
2009-05-19 15:46:12 +0200 fs  r272084 : #i55701# recognize the DATA_CANNOT_SELECT_UNFILTERED error condition, and allow filtering in this case, even when the result set is empty
2009-05-19 09:06:50 +0200 fs  r272059 : merging changes from CWS dba32b, to prevent future conflicts with upcoming local changes
2009-05-18 21:48:58 +0200 fs  r272054 : accessing a non-local unfiltered address book now returns an empty result set, and reports a warning, instead of ungracefully failing
2009-05-18 21:48:42 +0200 fs  r272053 : accessing a non-local unfiltered address book now returns an empty result set, and reports a warning, instead of ungracefully failing
2009-05-18 21:47:41 +0200 fs  r272052 : +setExternalWarnings
2009-05-18 21:47:12 +0200 fs  r272051 : #i55701# when re/loading the form, display any possible warnings
2009-05-18 21:43:26 +0200 fs  r272050 : #i55701# implement XWarningsSupplier, exposing the warnings of our result set
2009-05-18 21:42:51 +0200 fs  r272049 : #i55701# implement XWarningsSupplier, exposing the warnings of our aggregate RowSet
2009-05-18 17:53:59 +0200 fs  r272041 : #i55701# moved the (I)WarningsContainer from dbaccess to connectivity, to be able to use it in the latter module, too
2009-05-18 17:24:10 +0200 fs  r272040 : #i55701# properly enable the various Evolution types
2009-05-18 14:52:19 +0200 fs  r272024 : #i55701# properly enable the Evolution types
2009-05-18 13:57:10 +0200 fs  r272018 : fixed/extended whereAnalysis (column searching still not enabled, as neither LIKE nor = seem to work with my (somewhat older) Evolution version)
2009-05-18 13:56:08 +0200 fs  r272017 : extended showParseTree
2009-05-18 13:55:25 +0200 fs  r272016 : extended showParseTree
2009-05-18 11:40:16 +0200 fs  r272008 : #i55701#
2009-05-18 11:39:02 +0200 fs  r272006 : let the PreparedStatement return proper meta data, too
2009-05-18 10:05:37 +0200 fs  r271999 : moved the XStatement interface to from OCommonStatement to OStatement - the former class is also the base for other classes which should not have this interface
2009-05-15 21:53:22 +0200 fs  r271973 : collectColumnInformation: report invalid meta data as assertion
2009-05-15 21:51:40 +0200 fs  r271972 : showParseTree should be const
2009-05-15 21:51:26 +0200 fs  r271971 : showParseTree should be const
2009-05-15 21:51:03 +0200 fs  r271970 : properly recognize the 'WHERE 0 = 1' clause, this way having proper statement meta data, this way saving much much calls from the DBA framework
2009-05-15 20:29:03 +0200 fs  r271969 : cleaned up the mess with the statement classes
2009-05-15 15:51:11 +0200 fs  r271944 : let the result set properly init its meta data
2009-05-15 15:29:54 +0200 fs  r271939 : proper property implementations for the resultset class
2009-05-15 15:01:31 +0200 fs  r271936 : proper property implementations for the statement class
2009-05-08 14:46:33 +0200 fs  r271717 : component_foo must be PUBLIC
2009-05-06 09:20:05 +0200 fs  r271565 : #i10000# (warnings on unxlngi6)
2009-05-06 09:01:30 +0200 fs  r271564 : #i101493#
2009-05-05 23:08:12 +0200 fs  r271560 : #i55701# merging the changes from the ancient (CVS-based) CWS evoab2default into this CWS here

7 files changed, 63 insertions, 67 deletions

diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx
index 2477970ed1b6..c28d28481884 100644
--- a/extensions/source/abpilot/abspilot.cxx
+++ b/extensions/source/abpilot/abspilot.cxx
@@ -324,9 +324,12 @@ 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_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;
diff --git a/extensions/source/abpilot/abspilot.hxx b/extensions/source/abpilot/abspilot.hxx
index 0bcce1d6a11a..7429f10d91cc 100644
--- a/extensions/source/abpilot/abspilot.hxx
+++ b/extensions/source/abpilot/abspilot.hxx
@@ -117,7 +117,9 @@ namespace abp
 
         inline sal_Bool needManualFieldMapping( AddressSourceType _eType ) const
         {
-            return ( AST_OTHER == _eType ) || ( AST_KAB == _eType );
+            return  ( AST_OTHER == _eType ) || ( AST_KAB == _eType ) ||
+                    ( AST_EVOLUTION == _eType ) || ( AST_EVOLUTION_GROUPWISE == _eType ) ||
+                    ( AST_EVOLUTION_LDAP == _eType );
         }
         /// checks if we need a manual (user-guided) field mapping
         inline sal_Bool needManualFieldMapping() const
@@ -128,8 +130,7 @@ namespace abp
         /// determines whether the given address book type does provide one table only
         inline bool needTableSelection( AddressSourceType _eType ) const
         {
-            return  ( AST_LDAP != _eType ) && ( AST_KAB != _eType ) && ( AST_EVOLUTION != _eType )
-                &&  ( AST_EVOLUTION_GROUPWISE != _eType ) && ( AST_EVOLUTION_LDAP != _eType );
+            return  ( AST_LDAP != _eType ) && ( AST_KAB != _eType );
         }
 
         inline bool needTableSelection() const
diff --git a/extensions/source/abpilot/abspilot.src b/extensions/source/abpilot/abspilot.src
index 5a5bb53e2abd..3bfa6ea844d6 100644
--- a/extensions/source/abpilot/abspilot.src
+++ b/extensions/source/abpilot/abspilot.src
@@ -94,83 +94,59 @@ TabPage RID_PAGE_SELECTABTYPE
         Text [ en-US ] = "Please select the type of your external address book:";
     };
 
-    RadioButton RB_MORK
-    {
-        Pos     = MAP_APPFONT ( 15, 68 ) ;
-        Size    = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
-        Group = TRUE;
-
-        Text [ en-US ] = "Mozilla / Netscape";
-    };
-// All position & size/height data below this is not used
-    RadioButton RB_THUNDERBIRD
-    {
-        Pos     = MAP_APPFONT ( 15, 79 ) ;
-        Size    = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
-
-        Text [ en-US ] = "Thunderbird";
-    };
     RadioButton RB_EVOLUTION
      {
-         Pos        = MAP_APPFONT ( 15, 90 ) ;
          Size   = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
-
         Text [ en-US ] = "Evolution";
     };
     RadioButton RB_EVOLUTION_GROUPWISE
      {
-         Pos        = MAP_APPFONT ( 15, 90 ) ;
          Size   = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
-
         Text [ en-US ] = "Groupwise";
     };
     RadioButton RB_EVOLUTION_LDAP
      {
-         Pos        = MAP_APPFONT ( 15, 90 ) ;
          Size   = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
-
         Text [ en-US ] = "Evolution LDAP";
     };
+    RadioButton RB_MORK
+    {
+        Size    = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
+        Text [ en-US ] = "Mozilla / Netscape";
+    };
+    RadioButton RB_THUNDERBIRD
+    {
+        Size    = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
+        Text [ en-US ] = "Thunderbird";
+    };
     RadioButton RB_KAB
      {
-         Pos        = MAP_APPFONT ( 15, 101 ) ;
          Size   = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
-
         Text [ en-US ] = "KDE address book";
     };
     RadioButton RB_MACAB
     {
-        Pos     = MAP_APPFONT ( 15, 101 ) ;
         Size    = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
-
         Text [ en-US ] = "Mac OS X address book";
     };
     RadioButton RB_LDAP
     {
-        Pos     = MAP_APPFONT ( 15, 112 ) ;
         Size    = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
-
         Text [ en-US ] = "LDAP address data";
     };
     RadioButton RB_OUTLOOK
     {
-        Pos     = MAP_APPFONT ( 15, 123 ) ;
         Size    = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
-
         Text [ en-US ] = "Outlook address book";
     };
     RadioButton RB_OUTLOOKEXPRESS
     {
-        Pos     = MAP_APPFONT ( 15,134 ) ;
         Size    = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
-
         Text [ en-US ] = "Windows system address book";
     };
     RadioButton RB_OTHER
     {
-        Pos     = MAP_APPFONT ( 15, 145 ) ;
         Size    = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
-
         Text [ en-US ] = "Other external data source";
     };
 };
diff --git a/extensions/source/abpilot/typeselectionpage.cxx b/extensions/source/abpilot/typeselectionpage.cxx
index e521ebd96fe1..f7cfafe39c10 100644
--- a/extensions/source/abpilot/typeselectionpage.cxx
+++ b/extensions/source/abpilot/typeselectionpage.cxx
@@ -50,27 +50,25 @@ 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_aMORK            (this,  ModuleRes(RB_MORK))
-        ,m_aThunderbird     (this,  ModuleRes(RB_THUNDERBIRD))
-        ,m_aEvolutionGroupwise (this,   ModuleRes(RB_EVOLUTION_GROUPWISE))
-        ,m_aEvolutionLdap      (this,   ModuleRes(RB_EVOLUTION_LDAP))
-        ,m_aEvolution       (this,  ModuleRes(RB_EVOLUTION))
-        ,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_aMORK                (this,  ModuleRes(RB_MORK))
+        ,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))
     {
-        Point aTopLeft;
-        Size  aItemSize;
-
         FreeResource();
 
-        aTopLeft = m_aMORK.GetPosPixel();
-        aItemSize = m_aMORK.GetSizePixel();
+        Point aTopLeft( LogicToPixel( Point( 15, 68 ), MAP_APPFONT ) );
+        Size  aItemSize( LogicToPixel( Size( 0, 8 ), MAP_APPFONT ) );
+        aItemSize.Width() = GetOutputSizePixel().Width() - 30;
 
         bool bWithMozilla = true, bUnx = true;
         bool bHaveEvolution = true, bHaveKab = true;
@@ -116,6 +114,7 @@ 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;
         Link aTypeSelectionHandler = LINK(this, TypeSelectionPage, OnTypeSelected );
         for ( ::std::vector< ButtonItem >::const_iterator loop = m_aAllTypes.begin();
               loop != m_aAllTypes.end(); ++loop )
@@ -126,14 +125,30 @@ namespace abp
             else
             {
                 aItem.m_pItem->SetPosPixel( aTopLeft );
-                aTopLeft.Y() += (aItemSize.Height() * 5) / 4;
+                aTopLeft.Y() += aItemSize.Height();
                 aItem.m_pItem->SetClickHdl( aTypeSelectionHandler );
                 aItem.m_pItem->Show();
+
+                if ( bFirstVisible )
+                {
+                    aItem.m_pItem->SetStyle( aItem.m_pItem->GetStyle() | WB_GROUP );
+                    bFirstVisible = false;
+                }
             }
         }
     }
 
     //---------------------------------------------------------------------
+    TypeSelectionPage::~TypeSelectionPage()
+    {
+        for ( ::std::vector< ButtonItem >::iterator loop = m_aAllTypes.begin();
+              loop != m_aAllTypes.end(); ++loop )
+        {
+            loop->m_bVisible = false;
+        }
+    }
+
+    //---------------------------------------------------------------------
     void TypeSelectionPage::ActivatePage()
     {
         AddressBookSourcePage::ActivatePage();
@@ -141,10 +156,10 @@ namespace abp
         for ( ::std::vector< ButtonItem >::const_iterator loop = m_aAllTypes.begin();
               loop != m_aAllTypes.end(); ++loop )
         {
-            ButtonItem aItem = (*loop);
-            if( aItem.m_pItem->IsChecked() && aItem.m_bVisible )
+            const ButtonItem& rItem = (*loop);
+            if( rItem.m_pItem->IsChecked() && rItem.m_bVisible )
             {
-                aItem.m_pItem->GrabFocus();
+                rItem.m_pItem->GrabFocus();
                 break;
             }
         }
diff --git a/extensions/source/abpilot/typeselectionpage.hxx b/extensions/source/abpilot/typeselectionpage.hxx
index 66fb449657fd..0d647f696a39 100644
--- a/extensions/source/abpilot/typeselectionpage.hxx
+++ b/extensions/source/abpilot/typeselectionpage.hxx
@@ -48,11 +48,11 @@ namespace abp
     protected:
         FixedText       m_aHint;
         FixedLine       m_aTypeSep;
-        RadioButton     m_aMORK;
-        RadioButton     m_aThunderbird;
+        RadioButton     m_aEvolution;
         RadioButton     m_aEvolutionGroupwise;
         RadioButton     m_aEvolutionLdap;
-        RadioButton     m_aEvolution;
+        RadioButton     m_aMORK;
+        RadioButton     m_aThunderbird;
         RadioButton     m_aKab;
         RadioButton     m_aMacab;
         RadioButton     m_aLDAP;
@@ -78,6 +78,7 @@ namespace abp
 
     public:
         TypeSelectionPage( OAddessBookSourcePilot* _pParent );
+        ~TypeSelectionPage();
 
         // retrieves the currently selected type
         AddressSourceType   getSelectedType() const;
diff --git a/extensions/source/scanner/sane.cxx b/extensions/source/scanner/sane.cxx
index a20a915a6cc3..97a30043c1c7 100644
--- a/extensions/source/scanner/sane.cxx
+++ b/extensions/source/scanner/sane.cxx
@@ -763,7 +763,7 @@ BOOL Sane::Start( BitmapTransporter& rBitmap )
                 if( ! nHeightMM )
                     nHeightMM = (int)(((double)nHeight / fResl) * 25.4);
 #if OSL_DEBUG_LEVEL > 1
-                fprintf( stderr, "set dimensions to (%d, %d) Pixel, (%d, %d) mm, resolution is %lg\n", nWidth, nHeight, nWidthMM, nHeightMM, fResl );
+                fprintf( stderr, "set dimensions to (%d, %d) Pixel, (%d, %d) mm, resolution is %lg\n", (int)nWidth, (int)nHeight, (int)nWidthMM, (int)nHeightMM, fResl );
 #endif
 
                 aConverter.Seek( 18 );
diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx
index e5417db939b4..c0374bbb3ce5 100644
--- a/extensions/source/scanner/sanedlg.cxx
+++ b/extensions/source/scanner/sanedlg.cxx
@@ -722,7 +722,7 @@ void SaneDlg::AcquirePreview()
     {
 #if OSL_DEBUG_LEVEL > 1
         aTransporter.getStream().Seek( STREAM_SEEK_TO_END );
-        fprintf( stderr, "Previewbitmapstream contains %d bytes\n", aTransporter.getStream().Tell() );
+        fprintf( stderr, "Previewbitmapstream contains %d bytes\n", (int)aTransporter.getStream().Tell() );
 #endif
         aTransporter.getStream().Seek( STREAM_SEEK_TO_BEGIN );
         maPreviewBitmap.Read( aTransporter.getStream(), TRUE );