Tag: cws_src680_oj14
User: oj      
Date: 2007-06-04 18:29:22+0000
Log:
 RESYNC: (1.32-1.33); FILE MERGED

File Changes:

Directory: /dba/dbaccess/source/ui/dlg/
=======================================

File [changed]: queryfilter.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/queryfilter.cxx?r1=1.28.8.6&r2=1.28.8.7
Delta lines:  +22 -22
---------------------
--- queryfilter.cxx     2006-12-18 16:21:13+0000        1.28.8.6
+++ queryfilter.cxx     2007-06-04 18:29:14+0000        1.28.8.7
@@ -141,27 +141,27 @@
                                                         const Reference< 
XNameAccess>& _rxCols
                                                         )
        :ModalDialog( pParent, ModuleRes( DLG_FILTERCRIT ) )
-       ,aLB_WHEREFIELD1        ( this, ResId( LB_WHEREFIELD1 ) )
-       ,aLB_WHERECOMP1         ( this, ResId( LB_WHERECOMP1 ) )
-       ,aET_WHEREVALUE1        ( this, ResId( ET_WHEREVALUE1 ) )
-       ,aLB_WHERECOND2         ( this, ResId( LB_WHERECOND2 ) )
-       ,aLB_WHEREFIELD2        ( this, ResId( LB_WHEREFIELD2 ) )
-       ,aLB_WHERECOMP2         ( this, ResId( LB_WHERECOMP2 ) )
-       ,aET_WHEREVALUE2        ( this, ResId( ET_WHEREVALUE2 ) )
-       ,aLB_WHERECOND3         ( this, ResId( LB_WHERECOND3 ) )
-       ,aLB_WHEREFIELD3        ( this, ResId( LB_WHEREFIELD3 ) )
-       ,aLB_WHERECOMP3         ( this, ResId( LB_WHERECOMP3 ) )
-       ,aET_WHEREVALUE3        ( this, ResId( ET_WHEREVALUE3 ) )
-       ,aFT_WHEREFIELD         ( this, ResId( FT_WHEREFIELD ) )
-       ,aFT_WHERECOMP          ( this, ResId( FT_WHERECOMP ) )
-       ,aFT_WHEREVALUE         ( this, ResId( FT_WHEREVALUE ) )
-       ,aFT_WHEREOPER          ( this, ResId( FT_WHEREOPER ) )
-       ,aFL_FIELDS         ( this, ResId( FL_FIELDS ) )
-       ,aBT_OK                         ( this, ResId( BT_OK ) )
-       ,aBT_CANCEL                     ( this, ResId( BT_CANCEL ) )
-       ,aBT_HELP                       ( this, ResId( BT_HELP ) )
-       ,aSTR_NOENTRY           ( ResId( STR_NOENTRY ) )
-       ,aSTR_COMPARE_OPERATORS( ResId( STR_COMPARE_OPERATORS ) )
+       ,aLB_WHEREFIELD1        ( this, ModuleRes( LB_WHEREFIELD1 ) )
+       ,aLB_WHERECOMP1         ( this, ModuleRes( LB_WHERECOMP1 ) )
+       ,aET_WHEREVALUE1        ( this, ModuleRes( ET_WHEREVALUE1 ) )
+       ,aLB_WHERECOND2         ( this, ModuleRes( LB_WHERECOND2 ) )
+       ,aLB_WHEREFIELD2        ( this, ModuleRes( LB_WHEREFIELD2 ) )
+       ,aLB_WHERECOMP2         ( this, ModuleRes( LB_WHERECOMP2 ) )
+       ,aET_WHEREVALUE2        ( this, ModuleRes( ET_WHEREVALUE2 ) )
+       ,aLB_WHERECOND3         ( this, ModuleRes( LB_WHERECOND3 ) )
+       ,aLB_WHEREFIELD3        ( this, ModuleRes( LB_WHEREFIELD3 ) )
+       ,aLB_WHERECOMP3         ( this, ModuleRes( LB_WHERECOMP3 ) )
+       ,aET_WHEREVALUE3        ( this, ModuleRes( ET_WHEREVALUE3 ) )
+       ,aFT_WHEREFIELD         ( this, ModuleRes( FT_WHEREFIELD ) )
+       ,aFT_WHERECOMP          ( this, ModuleRes( FT_WHERECOMP ) )
+       ,aFT_WHEREVALUE         ( this, ModuleRes( FT_WHEREVALUE ) )
+       ,aFT_WHEREOPER          ( this, ModuleRes( FT_WHEREOPER ) )
+       ,aFL_FIELDS         ( this, ModuleRes( FL_FIELDS ) )
+       ,aBT_OK                         ( this, ModuleRes( BT_OK ) )
+       ,aBT_CANCEL                     ( this, ModuleRes( BT_CANCEL ) )
+       ,aBT_HELP                       ( this, ModuleRes( BT_HELP ) )
+       ,aSTR_NOENTRY           ( ModuleRes( STR_NOENTRY ) )
+       ,aSTR_COMPARE_OPERATORS( ModuleRes( STR_COMPARE_OPERATORS ) )
        ,m_xQueryComposer(_rxComposer)
        ,m_xColumns( _rxCols )
        ,m_xConnection( _rxConnection )
@@ -785,7 +785,7 @@
                }
                else
                {
-                       DBG_ASSERT(0,"DlgFilterCrit::ListSelectHdl: Diese 
Column dürfte garnicht vorhanden sein!");
+                       DBG_ASSERT(0,"DlgFilterCrit::ListSelectHdl: Diese 
Column d�rfte garnicht vorhanden sein!");
                }
        }
        pComp->SelectEntryPos(0);




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to