Tag: cws_src680_dba24lms
User: oj      
Date: 2007-11-14 12:39:37+0000
Modified:
   dba/dbaccess/source/core/dataaccess/ModelImpl.cxx
   dba/dbaccess/source/ui/dlg/DriverSettings.cxx
   dba/dbaccess/source/ui/dlg/advancedsettings.src
   dba/dbaccess/source/ui/dlg/datasourceui.cxx
   dba/dbaccess/source/ui/misc/dsmeta.cxx

Log:
 #i11746# insert Ignore Currency

File Changes:

Directory: /dba/dbaccess/source/core/dataaccess/
================================================

File [changed]: ModelImpl.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/ModelImpl.cxx?r1=1.19&r2=1.19.66.1
Delta lines:  +4 -3
-------------------
--- ModelImpl.cxx       2007-07-24 12:04:04+0000        1.19
+++ ModelImpl.cxx       2007-11-14 12:39:34+0000        1.19.66.1
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: ModelImpl.cxx,v $
  *
- *  $Revision: 1.19 $
+ *  $Revision: 1.19.66.1 $
  *
- *  last change: $Author: rt $ $Date: 2007/07/24 12:04:04 $
+ *  last change: $Author: oj $ $Date: 2007/11/14 12:39:34 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -995,6 +995,7 @@
         AsciiPropertyValue( "EnableOuterJoinEscape",      makeAny( 
(sal_Bool)sal_True ) ),
         AsciiPropertyValue( "PreferDosLikeLineEnds",      makeAny( 
(sal_Bool)sal_False ) ),
         AsciiPropertyValue( "FormsCheckRequiredFields",   makeAny( 
(sal_Bool)sal_True ) ),
+        AsciiPropertyValue( "IgnoreCurrency",             makeAny( 
(sal_Bool)sal_False ) ),
         AsciiPropertyValue( NULL, Any() )
     };
     return aKnownSettings;

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

File [changed]: DriverSettings.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/DriverSettings.cxx?r1=1.9.4.1&r2=1.9.4.2
Delta lines:  +2 -3
-------------------
--- DriverSettings.cxx  2007-11-12 15:20:47+0000        1.9.4.1
+++ DriverSettings.cxx  2007-11-14 12:39:35+0000        1.9.4.2
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: DriverSettings.cxx,v $
  *
- *  $Revision: 1.9.4.1 $
+ *  $Revision: 1.9.4.2 $
  *
- *  last change: $Author: oj $ $Date: 2007/11/12 15:20:47 $
+ *  last change: $Author: oj $ $Date: 2007/11/14 12:39:35 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -59,7 +59,6 @@
          DSID_CATALOG,
          DSID_SCHEMA,
          DSID_INDEXAPPENDIX,
-         DSID_DOSLINEENDS,
          DSID_CHECK_REQUIRED_FIELDS,
          DSID_AUTORETRIEVEENABLED,
          DSID_AUTOINCREMENTVALUE,

File [changed]: advancedsettings.src
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/advancedsettings.src?r1=1.3.6.2&r2=1.3.6.3
Delta lines:  +2 -13
--------------------
--- advancedsettings.src        2007-11-12 15:20:47+0000        1.3.6.2
+++ advancedsettings.src        2007-11-14 12:39:35+0000        1.3.6.3
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: advancedsettings.src,v $
  *
- *  $Revision: 1.3.6.2 $
+ *  $Revision: 1.3.6.3 $
  *
- *  last change: $Author: oj $ $Date: 2007/11/12 15:20:47 $
+ *  last change: $Author: oj $ $Date: 2007/11/14 12:39:35 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -193,17 +193,6 @@
        };
 
 //-------------------------------------------------------------------------
-#define AUTO_IGNORECURRENCY(AUTO_Y)                                            
                                                \
-       CheckBox CB_IGNORECURRENCY                                              
                                                                \
-       {                                                                       
                                                                                
        \
-               Pos             = MAP_APPFONT ( 6 , AUTO_Y ) ;                  
                                                        \
-               Size    = MAP_APPFONT ( ADVANCED_PAGE_X -12 , CHECKBOX_HEIGHT ) 
;                       \
-               TabStop = TRUE ;                                                
                                                                        \
-               HelpId = HID_DSADMIN_IGNORECURRENCY;                            
                                                \
-               Text [ en-US ] = "Ignore currency field information";           
                                \
-       };
-
-//-------------------------------------------------------------------------
 
 #define AUTO_CHECKREQUIRED(AUTO_Y)                                             
     \
     CheckBox CB_CHECK_REQUIRED                                                 
     \

File [changed]: datasourceui.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/datasourceui.cxx?r1=1.2&r2=1.2.6.1
Delta lines:  +3 -2
-------------------
--- datasourceui.cxx    2007-11-01 15:09:58+0000        1.2
+++ datasourceui.cxx    2007-11-14 12:39:35+0000        1.2.6.1
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: datasourceui.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.2.6.1 $
  *
- *  last change: $Author: hr $ $Date: 2007/11/01 15:09:58 $
+ *  last change: $Author: oj $ $Date: 2007/11/14 12:39:35 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -95,6 +95,7 @@
         case DSID_AUTORETRIEVEENABLED:  return 
rAdvancedSupport.bGeneratedValues;
         case DSID_AUTOINCREMENTVALUE:   return 
rAdvancedSupport.bGeneratedValues;
         case DSID_AUTORETRIEVEVALUE:    return 
rAdvancedSupport.bGeneratedValues;
+        case DSID_IGNORECURRENCY:      return rAdvancedSupport.bIgnoreCurrency;
         }
 
         OSL_ENSURE( false, "DataSourceUI::hasSetting: this item id is 
currently not supported!" );

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

File [changed]: dsmeta.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/dsmeta.cxx?r1=1.2.6.1&r2=1.2.6.2
Delta lines:  +3 -5
-------------------
--- dsmeta.cxx  2007-11-12 15:20:48+0000        1.2.6.1
+++ dsmeta.cxx  2007-11-14 12:39:35+0000        1.2.6.2
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: dsmeta.cxx,v $
  *
- *  $Revision: 1.2.6.1 $
+ *  $Revision: 1.2.6.2 $
  *
- *  last change: $Author: oj $ $Date: 2007/11/12 15:20:48 $
+ *  last change: $Author: oj $ $Date: 2007/11/14 12:39:35 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -125,7 +125,7 @@
             s_aSupport[ DST_MSACCESS            ] = InitAdvanced( 0, 1, 1, 0, 
1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0 );
             s_aSupport[ DST_MYSQL_ODBC          ] = InitAdvanced( 0, 0, 1, 0, 
1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0 );
             s_aSupport[ DST_MYSQL_JDBC          ] = InitAdvanced( 0, 0, 1, 0, 
1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0 );
-            s_aSupport[ DST_ORACLE_JDBC         ] = InitAdvanced( 
InitAdvanced::All );
+            s_aSupport[ DST_ORACLE_JDBC         ] = InitAdvanced( 1, 1, 1, 1, 
1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1 );
             s_aSupport[ DST_ADABAS              ] = InitAdvanced( 0, 1, 1, 0, 
0, 0, 0, 1, 0, 0, 0, 1, 1, 1, 0 );
             s_aSupport[ DST_CALC                ] = InitAdvanced( 
InitAdvanced::None );
             s_aSupport[ DST_DBASE               ] = InitAdvanced( 0, 1, 0, 0, 
0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0 );
@@ -153,8 +153,6 @@
             s_aSupport[ DST_USERDEFINE8         ] = InitAdvanced( 
InitAdvanced::All );
             s_aSupport[ DST_USERDEFINE9         ] = InitAdvanced( 
InitAdvanced::All );
             s_aSupport[ DST_USERDEFINE10        ] = InitAdvanced( 
InitAdvanced::All );
-
-            s_aSupport[ DST_ORACLE_JDBC         ].bIgnoreCurrency = true;
         }
         return s_aSupport[ _eType ];
     }




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

Reply via email to