mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dba34c: pulled and merged DEV300.m100

Browse Source
This commit is contained in:
Frank Schoenheit [fs]
2011-02-14 22:22:46 +01:00
parent 68c3462b26 b1708ffb49
commit ac6e971d8a
250 changed files with 1428 additions and 1439 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dbaccess/source/ui/querydesign/QueryDesignView.cxx
View File

@@ -800,7 +800,7 @@ namespace
}
Reference< XConnection> xConnection = static_cast<OQueryController&>(_pView->getController()).getConnection();
if(!xConnection.is())
return FALSE;
return sal_False;
try
{
const Reference< XDatabaseMetaData > xMetaData = xConnection->getMetaData();
@@ -1025,7 +1025,7 @@ namespace
aWorkStr += ::dbtools::quoteName(aQuote, aColumnName);
}
aWorkStr += ::rtl::OUString(' ');
aWorkStr += String::CreateFromAscii( ";ASC;DESC" ).GetToken( (USHORT)eOrder );
aWorkStr += String::CreateFromAscii( ";ASC;DESC" ).GetToken( (sal_uInt16)eOrder );
aWorkStr += ::rtl::OUString(',');
}
}
@@ -2544,7 +2544,7 @@ namespace
//------------------------------------------------------------------------------
String getParseErrorMessage( SqlParseError _eErrorCode )
{
USHORT nResId;
sal_uInt16 nResId;
switch(_eErrorCode)
{
case eIllegalJoin: