diff options
| -rw-r--r-- | dbaccess/source/inc/dbastrings.hrc | 73 | ||||
| -rw-r--r-- | dbaccess/source/inc/dbustrings.hrc | 73 | ||||
| -rw-r--r-- | dbaccess/source/inc/stringconstants.hrc | 47 | ||||
| -rw-r--r-- | dbaccess/source/shared/dbastrings.cxx | 68 | ||||
| -rw-r--r-- | dbaccess/source/shared/dbustrings.cxx | 66 | ||||
| -rw-r--r-- | dbaccess/source/shared/stringconstants.cxx | 23 |
6 files changed, 309 insertions, 41 deletions
diff --git a/dbaccess/source/inc/dbastrings.hrc b/dbaccess/source/inc/dbastrings.hrc new file mode 100644 index 000000000000..a9edc762585a --- /dev/null +++ b/dbaccess/source/inc/dbastrings.hrc @@ -0,0 +1,73 @@ +/************************************************************************* + * + * $RCSfile: dbastrings.hrc,v $ + * + * $Revision: 1.1 $ + * + * last change: $Author: oj $ $Date: 2000-10-24 13:08:33 $ + * + * The Contents of this file are made available subject to the terms of + * either of the following licenses + * + * - GNU Lesser General Public License Version 2.1 + * - Sun Industry Standards Source License Version 1.1 + * + * Sun Microsystems Inc., October, 2000 + * + * GNU Lesser General Public License Version 2.1 + * ============================================= + * Copyright 2000 by Sun Microsystems, Inc. + * 901 San Antonio Road, Palo Alto, CA 94303, USA + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1, as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + * + * + * Sun Industry Standards Source License Version 1.1 + * ================================================= + * The contents of this file are subject to the Sun Industry Standards + * Source License Version 1.1 (the License); You may not use this file + * except in compliance with the License. You may obtain a copy of the + * License at http://www.openoffice.org/license.html. + * + * Software provided under this License is provided on an AS IS basis, + * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, + * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, + * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. + * See the License for the specific provisions governing your rights and + * obligations concerning the Software. + * + * The Initial Developer of the Original Code is: Sun Microsystems, Inc. + * + * Copyright: 2000 by Sun Microsystems, Inc. + * + * All Rights Reserved. + * + * Contributor(s): _______________________________________ + * + * + ************************************************************************/ +#ifndef DBACCESS_SHARED_DBASTRINGS_HRC +#define DBACCESS_SHARED_DBASTRINGS_HRC + +#ifndef _RTL_USTRING_HXX_ +#include <rtl/ustring.hxx> +#endif + +namespace dbaccess +{ +#include "stringconstants.hrc" +} + +#endif // DBACCESS_SHARED_DBASTRINGS_HRC diff --git a/dbaccess/source/inc/dbustrings.hrc b/dbaccess/source/inc/dbustrings.hrc new file mode 100644 index 000000000000..0d9c9583947c --- /dev/null +++ b/dbaccess/source/inc/dbustrings.hrc @@ -0,0 +1,73 @@ +/************************************************************************* + * + * $RCSfile: dbustrings.hrc,v $ + * + * $Revision: 1.1 $ + * + * last change: $Author: oj $ $Date: 2000-10-24 13:08:25 $ + * + * The Contents of this file are made available subject to the terms of + * either of the following licenses + * + * - GNU Lesser General Public License Version 2.1 + * - Sun Industry Standards Source License Version 1.1 + * + * Sun Microsystems Inc., October, 2000 + * + * GNU Lesser General Public License Version 2.1 + * ============================================= + * Copyright 2000 by Sun Microsystems, Inc. + * 901 San Antonio Road, Palo Alto, CA 94303, USA + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1, as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + * + * + * Sun Industry Standards Source License Version 1.1 + * ================================================= + * The contents of this file are subject to the Sun Industry Standards + * Source License Version 1.1 (the License); You may not use this file + * except in compliance with the License. You may obtain a copy of the + * License at http://www.openoffice.org/license.html. + * + * Software provided under this License is provided on an AS IS basis, + * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, + * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, + * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. + * See the License for the specific provisions governing your rights and + * obligations concerning the Software. + * + * The Initial Developer of the Original Code is: Sun Microsystems, Inc. + * + * Copyright: 2000 by Sun Microsystems, Inc. + * + * All Rights Reserved. + * + * Contributor(s): _______________________________________ + * + * + ************************************************************************/ +#ifndef DBACCESS_SHARED_DBUSTRINGS_HRC +#define DBACCESS_SHARED_DBUSTRINGS_HRC + +#ifndef _RTL_USTRING_HXX_ +#include <rtl/ustring.hxx> +#endif + +namespace dbaui +{ +#include "stringconstants.hrc" +} + +#endif // DBACCESS_SHARED_DBUSTRINGS_HRC diff --git a/dbaccess/source/inc/stringconstants.hrc b/dbaccess/source/inc/stringconstants.hrc index 7d636bcfe8d7..f9cd22d242a8 100644 --- a/dbaccess/source/inc/stringconstants.hrc +++ b/dbaccess/source/inc/stringconstants.hrc @@ -2,9 +2,9 @@ * * $RCSfile: stringconstants.hrc,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: fs $ $Date: 2000-10-20 09:49:37 $ + * last change: $Author: oj $ $Date: 2000-10-24 13:08:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,25 +61,18 @@ #ifndef _DBASHARED_STRINGCONSTANTS_HRC_ #define _DBASHARED_STRINGCONSTANTS_HRC_ - -#ifndef _RTL_USTRING_HXX_ -#include <rtl/ustring.hxx> -#endif - -namespace dbaccess +//============================================================ +//= a helper for static ascii pseudo-unicode strings +//============================================================ +// string constants +struct _ConstAsciiString_ { - //============================================================ - //= a helper for static ascii pseudo-unicode strings - //============================================================ - // string constants - struct _ConstAsciiString_ - { - sal_Int32 length; - sal_Char const* str; + sal_Int32 length; + sal_Char const* str; - operator ::rtl::OUString () const { return ::rtl::OUString(str, length, RTL_TEXTENCODING_ASCII_US); } - operator const sal_Char* () const { return str; } - }; + operator ::rtl::OUString () const { return ::rtl::OUString(str, length, RTL_TEXTENCODING_ASCII_US); } + operator const sal_Char* () const { return str; } +}; #define DECLARE_CONSTASCII_USTRING( name ) \ extern _ConstAsciiString_ const name @@ -180,7 +173,8 @@ namespace dbaccess #define PROPERTY_ID_REFERENCEDCOLUMN 89 #define PROPERTY_ID_PARENTWINDOW 90 #define PROPERTY_ID_SQLEXCEPTION 91 -#define PROPERTY_ID_SUPPRESSVERSIONCL 92 +#define PROPERTY_ID_ISHIDDEN 92 +#define PROPERTY_ID_SUPPRESSVERSIONCL 93 //============================================================ //= property names @@ -260,6 +254,7 @@ DECLARE_CONSTASCII_USTRING(PROPERTY_TEXTCOLOR); DECLARE_CONSTASCII_USTRING(PROPERTY_BOUNDFIELD); DECLARE_CONSTASCII_USTRING(PROPERTY_CONTROLSOURCE); DECLARE_CONSTASCII_USTRING(PROPERTY_REALNAME); +DECLARE_CONSTASCII_USTRING(PROPERTY_ISHIDDEN); DECLARE_CONSTASCII_USTRING(PROPERTY_HIDDEN); DECLARE_CONSTASCII_USTRING(PROPERTY_TABLETYPEFILTER); DECLARE_CONSTASCII_USTRING(PROPERTY_DOCUMENTLOCATION); @@ -279,6 +274,10 @@ DECLARE_CONSTASCII_USTRING(PROPERTY_REFERENCEDTABLE); DECLARE_CONSTASCII_USTRING(PROPERTY_REFERENCEDCOLUMN); DECLARE_CONSTASCII_USTRING(PROPERTY_PARENTWINDOW); DECLARE_CONSTASCII_USTRING(PROPERTY_SQLEXCEPTION); +DECLARE_CONSTASCII_USTRING(PROPERTY_BORDER); +DECLARE_CONSTASCII_USTRING(PROPERTY_THREADSAFE); +DECLARE_CONSTASCII_USTRING(PROPERTY_HELPTEXT); +DECLARE_CONSTASCII_USTRING(PROPERTY_DEFAULTSTATE); DECLARE_CONSTASCII_USTRING(PROPERTY_SUPPRESSVERSIONCL); //============================================================ @@ -380,15 +379,7 @@ DECLARE_CONSTASCII_USTRING(CONFIGKEY_COLUMN_HIDDEN); //= SQLSTATE //============================================================ DECLARE_CONSTASCII_USTRING(SQLSTATE_GENERAL); -DECLARE_CONSTASCII_USTRING(SQLSTATE_SEQUENCE); - - -//============================================================ -//= error messages -//============================================================ -DECLARE_CONSTASCII_USTRING(ERRORMSG_SEQUENCE); -} // dbaccess #endif // _DBASHARED_STRINGCONSTANTS_HRC_ diff --git a/dbaccess/source/shared/dbastrings.cxx b/dbaccess/source/shared/dbastrings.cxx new file mode 100644 index 000000000000..3b7ec923e7b8 --- /dev/null +++ b/dbaccess/source/shared/dbastrings.cxx @@ -0,0 +1,68 @@ +/************************************************************************* + * + * $RCSfile: dbastrings.cxx,v $ + * + * $Revision: 1.1 $ + * + * last change: $Author: oj $ $Date: 2000-10-24 13:04:00 $ + * + * The Contents of this file are made available subject to the terms of + * either of the following licenses + * + * - GNU Lesser General Public License Version 2.1 + * - Sun Industry Standards Source License Version 1.1 + * + * Sun Microsystems Inc., October, 2000 + * + * GNU Lesser General Public License Version 2.1 + * ============================================= + * Copyright 2000 by Sun Microsystems, Inc. + * 901 San Antonio Road, Palo Alto, CA 94303, USA + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1, as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + * + * + * Sun Industry Standards Source License Version 1.1 + * ================================================= + * The contents of this file are subject to the Sun Industry Standards + * Source License Version 1.1 (the License); You may not use this file + * except in compliance with the License. You may obtain a copy of the + * License at http://www.openoffice.org/license.html. + * + * Software provided under this License is provided on an AS IS basis, + * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, + * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, + * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. + * See the License for the specific provisions governing your rights and + * obligations concerning the Software. + * + * The Initial Developer of the Original Code is: Sun Microsystems, Inc. + * + * Copyright: 2000 by Sun Microsystems, Inc. + * + * All Rights Reserved. + * + * Contributor(s): _______________________________________ + * + * + ************************************************************************/ +#ifndef DBACCESS_SHARED_DBASTRINGS_HRC +#include "dbastrings.hrc" +#endif + +namespace dbaccess +{ +#include "stringconstants.cxx" +} diff --git a/dbaccess/source/shared/dbustrings.cxx b/dbaccess/source/shared/dbustrings.cxx new file mode 100644 index 000000000000..c7245ac74029 --- /dev/null +++ b/dbaccess/source/shared/dbustrings.cxx @@ -0,0 +1,66 @@ +/************************************************************************* + * + * $RCSfile: dbustrings.cxx,v $ + * + * $Revision: 1.1 $ + * + * last change: $Author: oj $ $Date: 2000-10-24 13:03:50 $ + * + * The Contents of this file are made available subject to the terms of + * either of the following licenses + * + * - GNU Lesser General Public License Version 2.1 + * - Sun Industry Standards Source License Version 1.1 + * + * Sun Microsystems Inc., October, 2000 + * + * GNU Lesser General Public License Version 2.1 + * ============================================= + * Copyright 2000 by Sun Microsystems, Inc. + * 901 San Antonio Road, Palo Alto, CA 94303, USA + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1, as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + * + * + * Sun Industry Standards Source License Version 1.1 + * ================================================= + * The contents of this file are subject to the Sun Industry Standards + * Source License Version 1.1 (the License); You may not use this file + * except in compliance with the License. You may obtain a copy of the + * License at http://www.openoffice.org/license.html. + * + * Software provided under this License is provided on an AS IS basis, + * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, + * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, + * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. + * See the License for the specific provisions governing your rights and + * obligations concerning the Software. + * + * The Initial Developer of the Original Code is: Sun Microsystems, Inc. + * + * Copyright: 2000 by Sun Microsystems, Inc. + * + * All Rights Reserved. + * + * Contributor(s): _______________________________________ + * + * + ************************************************************************/ +#include "dbustrings.hrc" + +namespace dbaui +{ +#include "stringconstants.cxx" +} diff --git a/dbaccess/source/shared/stringconstants.cxx b/dbaccess/source/shared/stringconstants.cxx index 2ae09958e62d..c94cc35c7966 100644 --- a/dbaccess/source/shared/stringconstants.cxx +++ b/dbaccess/source/shared/stringconstants.cxx @@ -2,9 +2,9 @@ * * $RCSfile: stringconstants.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: fs $ $Date: 2000-10-20 09:50:51 $ + * last change: $Author: oj $ $Date: 2000-10-24 13:05:23 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,10 +59,6 @@ * ************************************************************************/ -#include "stringconstants.hrc" - -namespace dbaccess -{ //============================================================ //= property names //============================================================ @@ -141,7 +137,7 @@ IMPLEMENT_CONSTASCII_USTRING(PROPERTY_TEXTCOLOR, "TextColor"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BOUNDFIELD, "BoundField"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CONTROLSOURCE, "DataField"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_REALNAME, "RealName"); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_HIDDEN, "IsHidden"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ISHIDDEN, "IsHidden"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_DOCUMENTLOCATION, "DocumentLocation"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_UPDATE_TABLENAME, "UpdateTableName"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_UPDATE_SCHEMANAME, "UpdateSchemaName"); @@ -159,6 +155,11 @@ IMPLEMENT_CONSTASCII_USTRING(PROPERTY_REFERENCEDTABLE, "ReferencedTable"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_REFERENCEDCOLUMN, "ReferencedColumn"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PARENTWINDOW, "ParentWindow"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_SQLEXCEPTION, "SQLException"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BORDER, "Border"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_THREADSAFE, "ThreadSafe"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_HELPTEXT ,"HelpText"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_HIDDEN ,"Hidden"); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_DEFAULTSTATE ,"DefaultState"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_SUPPRESSVERSIONCL, "SuppressVersionColumns"); //============================================================ @@ -258,12 +259,8 @@ IMPLEMENT_CONSTASCII_USTRING(CONFIGKEY_COLUMN_HIDDEN, "Hidden"); //= SQLSTATE //============================================================ IMPLEMENT_CONSTASCII_USTRING(SQLSTATE_GENERAL, "01000"); -IMPLEMENT_CONSTASCII_USTRING(SQLSTATE_SEQUENCE, "HY010"); -//============================================================ -//= error messages -//============================================================ -IMPLEMENT_CONSTASCII_USTRING(ERRORMSG_SEQUENCE, "Function sequence error"); -} + + |