Skip to content

C
core
Kaydet (Commit) 8c9626c8 authored tarafından Frank Schönheit's avatar Frank Schönheit
Dosyalara gözat
Seçenekler

#87909# hold an ::rtl::OUString*, not an rtl_uString (cheapens the access to an… 

#87909# hold an ::rtl::OUString*, not an rtl_uString (cheapens the access to an ::rtl::OUString) constasciistring.hxx
üst 44657cbd
Hide whitespace changes
Inline Side-by-side
Showing with 90 additions and 87 deletions
dbaccess/source/inc/constasciistring.hxx
Dosyayı görüntüle @ 8c9626c8
......@@ -16,14 +16,14 @@ struct ConstAsciiString
const sal_Char* ascii;
sal_Int32 length;
inline operator ::rtl::OUString () const;
inline operator const ::rtl::OUString& () const;
inline operator const sal_Char* () const { return ascii; }
inline ConstAsciiString(const sal_Char* _pAsciiZeroTerminated, const sal_Int32 _nLength);
inline ~ConstAsciiString();
private:
mutable rtl_uString* ustring;
mutable ::rtl::OUString* ustring;
};
//------------------------------------------------------------
......@@ -37,19 +37,16 @@ inline ConstAsciiString::ConstAsciiString(const sal_Char* _pAsciiZeroTerminated,
//------------------------------------------------------------
inline ConstAsciiString::~ConstAsciiString()
{
if (ustring)
{
rtl_uString_release(ustring);
ustring = NULL;
}
delete ustring;
ustring = NULL;
}
//------------------------------------------------------------
inline ConstAsciiString::operator ::rtl::OUString () const
inline ConstAsciiString::operator const ::rtl::OUString& () const
{
if (!ustring)
rtl_uString_newFromAscii( &ustring, ascii );
return ::rtl::OUString(ustring);
ustring = new ::rtl::OUString(ascii, length, RTL_TEXTENCODING_ASCII_US);
return *ustring;
}
//============================================================
......
dbaccess/source/inc/dbastrings.hrc
Dosyayı görüntüle @ 8c9626c8
......@@ -2,9 +2,9 @@
*
* $RCSfile: dbastrings.hrc,v $
*
* $Revision: 1.2 $
* $Revision: 1.3 $
*
* last change: $Author: fs $ $Date: 2000-10-27 08:05:49 $
* last change: $Author: fs $ $Date: 2001-06-08 08:38:21 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
......@@ -70,6 +70,70 @@ namespace dbaccess
#define STRINGCONSTANTS_INCLUDED_INDIRECT
#include "stringconstants.hrc"
#undef STRINGCONSTANTS_INCLUDED_INDIRECT
//============================================================
//= SQLSTATE
//============================================================
DECLARE_CONSTASCII_USTRING(SQLSTATE_GENERAL);
//============================================================
//= configuration key names
//============================================================
// (we could use PROPERTY_* strings for this, but this would mean that
// our configuration scheme would change if a property name changes for
// any reason)
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DBLINK_CONNECTURL);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DBLINK_USER);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DBLINK_TABLEFILTER);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DBLINK_TABLETYEFILTER);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DBLINK_LOGINTIMEOUT);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DBLINK_PASSWORDREQUIRED);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DBLINK_SUPPRESSVERSIONCL);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DBLINK_INFO);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DBLINK_BOOKMARKS);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DBLINK_QUERYDOCUMENTS);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DBLINK_TABLES);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DBLINK_DOCUMENTLOCAITON);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_QRYDESCR_COMMAND);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_QRYDESCR_USE_ESCAPE_PROCESSING);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_QRYDESCR_UPDATE_TABLENAME);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_QRYDESCR_UPDATE_SCHEMANAME);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_QRYDESCR_UPDATE_CATALOGNAME);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_QRYDESCR_COLUMNS);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DEFSET_FILTER);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DEFSET_APPLYFILTER);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DEFSET_ORDER);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DEFSET_ROW_HEIGHT);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DEFSET_TEXTCOLOR);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DEFSET_FONT_NAME);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DEFSET_FONT_HEIGHT);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DEFSET_FONT_WIDTH);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DEFSET_FONT_STYLENAME);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DEFSET_FONT_FAMILY);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DEFSET_FONT_CHARSET);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DEFSET_FONT_PITCH);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DEFSET_FONT_CHARACTERWIDTH);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DEFSET_FONT_WEIGHT);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DEFSET_FONT_SLANT);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DEFSET_FONT_UNDERLINE);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DEFSET_FONT_STRIKEOUT);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DEFSET_FONT_ORIENTATION);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DEFSET_FONT_KERNING);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DEFSET_FONT_WORDLINEMODE);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DEFSET_FONT_TYPE);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DATASETTINGS_MAIN);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_SETTINGS);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_COLUMN_ALIGNMENT);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_COLUMN_WIDTH);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_COLUMN_NUMBERFORMAT);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_COLUMN_RELPOSITION);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_COLUMN_HIDDEN);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_LAYOUTINFORMATION);
}
#endif // DBACCESS_SHARED_DBASTRINGS_HRC
dbaccess/source/inc/dbustrings.hrc
Dosyayı görüntüle @ 8c9626c8
......@@ -2,9 +2,9 @@
*
* $RCSfile: dbustrings.hrc,v $
*
* $Revision: 1.2 $
* $Revision: 1.3 $
*
* last change: $Author: fs $ $Date: 2000-10-27 08:05:49 $
* last change: $Author: fs $ $Date: 2001-06-08 08:38:21 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
......@@ -70,6 +70,19 @@ namespace dbaui
#define STRINGCONSTANTS_INCLUDED_INDIRECT
#include "stringconstants.hrc"
#undef STRINGCONSTANTS_INCLUDED_INDIRECT
//============================================================
//= URLs
//============================================================
DECLARE_CONSTASCII_USTRING(URL_COMPONENT_QUERYDESIGN);
DECLARE_CONSTASCII_USTRING(URL_COMPONENT_TABLEDESIGN);
DECLARE_CONSTASCII_USTRING(URL_COMPONENT_RELATIONDESIGN);
//============================================================
//= other DBU relevant strings
//============================================================
DECLARE_CONSTASCII_USTRING(FRAME_NAME_QUERY_PREVIEW);
}
#endif // DBACCESS_SHARED_DBUSTRINGS_HRC
dbaccess/source/inc/stringconstants.hrc
Dosyayı görüntüle @ 8c9626c8
......@@ -2,9 +2,9 @@
*
* $RCSfile: stringconstants.hrc,v $
*
* $Revision: 1.25 $
* $Revision: 1.26 $
*
* last change: $Author: fs $ $Date: 2001-05-30 06:47:12 $
* last change: $Author: fs $ $Date: 2001-06-08 08:38:21 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
......@@ -326,77 +326,6 @@ DECLARE_CONSTASCII_USTRING(SERVICE_UI_FOLDERPICKER);
DECLARE_CONSTASCII_USTRING(SERVICE_I18N_COLLATOR);
DECLARE_CONSTASCII_USTRING(SERVICE_EXTENDED_ADABAS_DRIVER);
//============================================================
//= URLs
//============================================================
DECLARE_CONSTASCII_USTRING(URL_COMPONENT_QUERYDESIGN);
DECLARE_CONSTASCII_USTRING(URL_COMPONENT_TABLEDESIGN);
DECLARE_CONSTASCII_USTRING(URL_COMPONENT_RELATIONDESIGN);
//============================================================
//= configuration key names
//============================================================
// (we could use PROPERTY_* strings for this, but this would mean that
// our configuration scheme would change if a property name changes for
// any reason)
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DBLINK_CONNECTURL);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DBLINK_USER);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DBLINK_TABLEFILTER);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DBLINK_TABLETYEFILTER);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DBLINK_LOGINTIMEOUT);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DBLINK_PASSWORDREQUIRED);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DBLINK_SUPPRESSVERSIONCL);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DBLINK_INFO);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DBLINK_BOOKMARKS);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DBLINK_QUERYDOCUMENTS);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DBLINK_TABLES);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DBLINK_DOCUMENTLOCAITON);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_QRYDESCR_COMMAND);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_QRYDESCR_USE_ESCAPE_PROCESSING);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_QRYDESCR_UPDATE_TABLENAME);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_QRYDESCR_UPDATE_SCHEMANAME);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_QRYDESCR_UPDATE_CATALOGNAME);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_QRYDESCR_COLUMNS);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DEFSET_FILTER);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DEFSET_APPLYFILTER);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DEFSET_ORDER);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DEFSET_ROW_HEIGHT);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DEFSET_TEXTCOLOR);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DEFSET_FONT_NAME);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DEFSET_FONT_HEIGHT);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DEFSET_FONT_WIDTH);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DEFSET_FONT_STYLENAME);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DEFSET_FONT_FAMILY);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DEFSET_FONT_CHARSET);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DEFSET_FONT_PITCH);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DEFSET_FONT_CHARACTERWIDTH);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DEFSET_FONT_WEIGHT);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DEFSET_FONT_SLANT);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DEFSET_FONT_UNDERLINE);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DEFSET_FONT_STRIKEOUT);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DEFSET_FONT_ORIENTATION);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DEFSET_FONT_KERNING);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DEFSET_FONT_WORDLINEMODE);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DEFSET_FONT_TYPE);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_DATASETTINGS_MAIN);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_SETTINGS);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_COLUMN_ALIGNMENT);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_COLUMN_WIDTH);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_COLUMN_NUMBERFORMAT);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_COLUMN_RELPOSITION);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_COLUMN_HIDDEN);
DECLARE_CONSTASCII_USTRING(CONFIGKEY_LAYOUTINFORMATION);
//============================================================
//= SQLSTATE
//============================================================
DECLARE_CONSTASCII_USTRING(SQLSTATE_GENERAL);
#endif // _DBASHARED_STRINGCONSTANTS_HRC_
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment