summaryrefslogtreecommitdiff
path: root/connectivity/source/drivers/calc
diff options
context:
space:
mode:
Diffstat (limited to 'connectivity/source/drivers/calc')
-rw-r--r--connectivity/source/drivers/calc/CCatalog.cxx4
-rw-r--r--connectivity/source/drivers/calc/CColumns.cxx4
-rw-r--r--connectivity/source/drivers/calc/CConnection.cxx18
-rw-r--r--connectivity/source/drivers/calc/CDatabaseMetaData.cxx48
-rw-r--r--connectivity/source/drivers/calc/CDriver.cxx6
-rw-r--r--connectivity/source/drivers/calc/CPreparedStatement.cxx2
-rw-r--r--connectivity/source/drivers/calc/CResultSet.cxx11
-rw-r--r--connectivity/source/drivers/calc/CStatement.cxx2
-rw-r--r--connectivity/source/drivers/calc/CTable.cxx18
-rw-r--r--connectivity/source/drivers/calc/CTables.cxx6
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/calc/CalcDriver.xml2
-rw-r--r--connectivity/source/drivers/calc/Cservices.cxx6
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/calc/calc.component0
-rw-r--r--[-rwxr-xr-x]connectivity/source/drivers/calc/calc.xcu0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/calc/exports.dxp0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/calc/makefile.mk9
16 files changed, 58 insertions, 78 deletions
diff --git a/connectivity/source/drivers/calc/CCatalog.cxx b/connectivity/source/drivers/calc/CCatalog.cxx
index 449e720f18c4..96345a020f30 100644
--- a/connectivity/source/drivers/calc/CCatalog.cxx
+++ b/connectivity/source/drivers/calc/CCatalog.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -57,7 +58,7 @@ void OCalcCatalog::refreshTables()
Sequence< ::rtl::OUString > aTypes;
OCalcConnection::ODocHolder aDocHodler(((OCalcConnection*)m_pConnection));
Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),
- ::rtl::OUString::createFromAscii("%"),::rtl::OUString::createFromAscii("%"),aTypes);
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")),aTypes);
if(xResult.is())
{
@@ -78,3 +79,4 @@ void OCalcCatalog::refreshTables()
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/calc/CColumns.cxx b/connectivity/source/drivers/calc/CColumns.cxx
index 394302c2aeb8..019361e3d12f 100644
--- a/connectivity/source/drivers/calc/CColumns.cxx
+++ b/connectivity/source/drivers/calc/CColumns.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -43,7 +44,7 @@ using namespace ::com::sun::star::container;
sdbcx::ObjectType OCalcColumns::createObject(const ::rtl::OUString& _rName)
{
OCalcTable* pTable = (OCalcTable*)m_pTable;
- ::vos::ORef<OSQLColumns> aCols = pTable->getTableColumns();
+ ::rtl::Reference<OSQLColumns> aCols = pTable->getTableColumns();
OSQLColumns::Vector::const_iterator aIter = find(aCols->get().begin(),aCols->get().end(),_rName,::comphelper::UStringMixEqual(isCaseSensitive()));
sdbcx::ObjectType xRet;
@@ -53,3 +54,4 @@ sdbcx::ObjectType OCalcColumns::createObject(const ::rtl::OUString& _rName)
}
// -------------------------------------------------------------------------
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/calc/CConnection.cxx b/connectivity/source/drivers/calc/CConnection.cxx
index 2d5e1a93d3ee..4fdb00bd52cc 100644
--- a/connectivity/source/drivers/calc/CConnection.cxx
+++ b/connectivity/source/drivers/calc/CConnection.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,12 +31,8 @@
#include "calc/CConnection.hxx"
#include "calc/CDatabaseMetaData.hxx"
#include "calc/CCatalog.hxx"
-#ifndef _CONNECTIVITY_CALC_ODRIVER_HXX_
#include "calc/CDriver.hxx"
-#endif
-#ifndef CONNECTIVITY_RESOURCE_CALC_HRC
#include "resource/calc_res.hrc"
-#endif
#include "resource/sharedresources.hxx"
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/frame/XComponentLoader.hpp>
@@ -127,24 +124,24 @@ Reference< XSpreadsheetDocument> OCalcConnection::acquireDoc()
}
// open read-only as long as updating isn't implemented
Sequence<PropertyValue> aArgs(2);
- aArgs[0].Name = ::rtl::OUString::createFromAscii("Hidden");
+ aArgs[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Hidden"));
aArgs[0].Value <<= (sal_Bool) sal_True;
- aArgs[1].Name = ::rtl::OUString::createFromAscii("ReadOnly");
+ aArgs[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReadOnly"));
aArgs[1].Value <<= (sal_Bool) sal_True;
if ( m_sPassword.getLength() )
{
const sal_Int32 nPos = aArgs.getLength();
aArgs.realloc(nPos+1);
- aArgs[nPos].Name = ::rtl::OUString::createFromAscii("Password");
+ aArgs[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Password"));
aArgs[nPos].Value <<= m_sPassword;
}
Reference< XComponentLoader > xDesktop( getDriver()->getFactory()->createInstance(
- ::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop")), UNO_QUERY );
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop"))), UNO_QUERY );
if (!xDesktop.is())
{
- OSL_ASSERT("no desktop");
+ OSL_FAIL("no desktop");
throw SQLException();
}
Reference< XComponent > xComponent;
@@ -152,7 +149,7 @@ Reference< XSpreadsheetDocument> OCalcConnection::acquireDoc()
try
{
xComponent = xDesktop->loadComponentFromURL(
- m_aFileName, ::rtl::OUString::createFromAscii("_blank"), 0, aArgs );
+ m_aFileName, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_blank")), 0, aArgs );
}
catch( const Exception& )
{
@@ -293,3 +290,4 @@ Reference< XPreparedStatement > SAL_CALL OCalcConnection::prepareCall( const ::r
}
// -----------------------------------------------------------------------------
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
index 274597ebb72c..ca361392498d 100644
--- a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -91,7 +92,7 @@ Reference< XResultSet > OCalcDatabaseMetaData::impl_getTypeInfo_throw( )
aRow.reserve(18);
aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue());
- aRow.push_back(new ORowSetValueDecorator(::rtl::OUString::createFromAscii("VARCHAR")));
+ aRow.push_back(new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VARCHAR"))));
aRow.push_back(new ORowSetValueDecorator(DataType::VARCHAR));
aRow.push_back(new ORowSetValueDecorator((sal_Int32)65535));
aRow.push_back(ODatabaseMetaDataResultSet::getQuoteValue());
@@ -113,35 +114,35 @@ Reference< XResultSet > OCalcDatabaseMetaData::impl_getTypeInfo_throw( )
aRows.push_back(aRow);
- aRow[1] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("DECIMAL"));
+ aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DECIMAL")));
aRow[2] = new ORowSetValueDecorator(DataType::DECIMAL);
aRow[3] = ODatabaseMetaDataResultSet::get0Value();
aRow[9] = ODatabaseMetaDataResultSet::getBasicValue();
aRow[15] = ODatabaseMetaDataResultSet::get0Value();
aRows.push_back(aRow);
- aRow[1] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("BOOL"));
+ aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BOOL")));
aRow[2] = new ORowSetValueDecorator(DataType::BIT);
aRow[3] = new ORowSetValueDecorator((sal_Int32)20);
aRow[9] = ODatabaseMetaDataResultSet::getBasicValue();
aRow[15] = new ORowSetValueDecorator((sal_Int32)15);
aRows.push_back(aRow);
- aRow[1] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("DATE"));
+ aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DATE")));
aRow[2] = new ORowSetValueDecorator(DataType::DATE);
aRow[3] = ODatabaseMetaDataResultSet::get0Value();
aRow[9] = ODatabaseMetaDataResultSet::getBasicValue();
aRow[15] = ODatabaseMetaDataResultSet::get0Value();
aRows.push_back(aRow);
- aRow[1] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("TIME"));
+ aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TIME")));
aRow[2] = new ORowSetValueDecorator(DataType::TIME);
aRow[3] = ODatabaseMetaDataResultSet::get0Value();
aRow[9] = ODatabaseMetaDataResultSet::getBasicValue();
aRow[15] = ODatabaseMetaDataResultSet::get0Value();
aRows.push_back(aRow);
- aRow[1] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("TIMESTAMP"));
+ aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TIMESTAMP")));
aRow[2] = new ORowSetValueDecorator(DataType::TIMESTAMP);
aRow[3] = ODatabaseMetaDataResultSet::get0Value();
aRow[9] = ODatabaseMetaDataResultSet::getBasicValue();
@@ -230,10 +231,10 @@ Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getColumns(
switch(sal_Int32(aRow[11]->getValue()))
{
case ColumnValue::NO_NULLS:
- aRow[18] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("NO"));
+ aRow[18] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NO")));
break;
case ColumnValue::NULLABLE:
- aRow[18] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("YES"));
+ aRow[18] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("YES")));
break;
default:
aRow[18] = new ORowSetValueDecorator(::rtl::OUString());
@@ -309,34 +310,12 @@ sal_Bool lcl_IsEmptyOrHidden( const Reference<XSpreadsheets>& xSheets, const ::r
if (xProp.is())
{
sal_Bool bVisible = sal_Bool();
- Any aVisAny = xProp->getPropertyValue( ::rtl::OUString::createFromAscii("IsVisible") );
+ Any aVisAny = xProp->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsVisible")) );
if ( aVisAny >>= bVisible )
if (!bVisible)
return sal_True; // hidden
}
-#if 0
- // test if whole sheet is empty
-
- Reference<XCellRangeAddressable> xAddr( xSheet, UNO_QUERY );
- Reference<XCellRangesQuery> xQuery( xSheet, UNO_QUERY );
- if ( xAddr.is() && xQuery.is() )
- {
- CellRangeAddress aTotalRange = xAddr->getRangeAddress();
- // queryIntersection to get a ranges object
- Reference<XSheetCellRanges> xRanges = xQuery->queryIntersection( aTotalRange );
- if (xRanges.is())
- {
- Reference<XEnumerationAccess> xCells = xRanges->getCells();
- if (xCells.is())
- {
- if ( !xCells->hasElements() )
- return sal_True; // empty
- }
- }
- }
-#endif
-
// use the same data area as in OCalcTable to test for empty table
Reference<XSheetCellCursor> xCursor = xSheet->createCursor();
@@ -374,7 +353,7 @@ sal_Bool lcl_IsUnnamed( const Reference<XDatabaseRanges>& xRanges, const ::rtl::
{
try
{
- Any aUserAny = xRangeProp->getPropertyValue( ::rtl::OUString::createFromAscii("IsUserDefined") );
+ Any aUserAny = xRangeProp->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsUserDefined")) );
sal_Bool bUserDefined = sal_Bool();
if ( aUserAny >>= bUserDefined )
bUnnamed = !bUserDefined;
@@ -405,7 +384,7 @@ Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getTables(
// check if ORowSetValue type is given
// when no types are given then we have to return all tables e.g. TABLE
- ::rtl::OUString aTable(::rtl::OUString::createFromAscii("TABLE"));
+ ::rtl::OUString aTable(RTL_CONSTASCII_USTRINGPARAM("TABLE"));
sal_Bool bTableFound = sal_True;
sal_Int32 nLength = types.getLength();
@@ -459,7 +438,7 @@ Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getTables(
Reference<XPropertySet> xDocProp( xDoc, UNO_QUERY );
if ( xDocProp.is() )
{
- Any aRangesAny = xDocProp->getPropertyValue( ::rtl::OUString::createFromAscii("DatabaseRanges") );
+ Any aRangesAny = xDocProp->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DatabaseRanges")) );
Reference<XDatabaseRanges> xRanges;
if ( aRangesAny >>= xRanges )
{
@@ -488,3 +467,4 @@ Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getTables(
// -----------------------------------------------------------------------------
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/calc/CDriver.cxx b/connectivity/source/drivers/calc/CDriver.cxx
index f3ae81ad6670..ecfd79a736c1 100644
--- a/connectivity/source/drivers/calc/CDriver.cxx
+++ b/connectivity/source/drivers/calc/CDriver.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -48,7 +49,7 @@ using namespace ::com::sun::star::lang;
rtl::OUString ODriver::getImplementationName_Static( ) throw(RuntimeException)
{
- return rtl::OUString::createFromAscii("com.sun.star.comp.sdbc.calc.ODriver");
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.sdbc.calc.ODriver"));
}
::rtl::OUString SAL_CALL ODriver::getImplementationName( ) throw(RuntimeException)
@@ -88,7 +89,7 @@ Reference< XConnection > SAL_CALL ODriver::connect( const ::rtl::OUString& url,
sal_Bool SAL_CALL ODriver::acceptsURL( const ::rtl::OUString& url )
throw(SQLException, RuntimeException)
{
- return url.compareTo(::rtl::OUString::createFromAscii("sdbc:calc:"),10) == 0;
+ return url.compareTo(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:calc:")),10) == 0;
}
Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const ::rtl::OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException)
@@ -103,3 +104,4 @@ Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const ::rtl::O
}
// -----------------------------------------------------------------------------
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/calc/CPreparedStatement.cxx b/connectivity/source/drivers/calc/CPreparedStatement.cxx
index 46f5b8342a71..b80353dc151a 100644
--- a/connectivity/source/drivers/calc/CPreparedStatement.cxx
+++ b/connectivity/source/drivers/calc/CPreparedStatement.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -41,3 +42,4 @@ OResultSet* OCalcPreparedStatement::createResultSet()
// -------------------------------------------------------------------------
IMPLEMENT_SERVICE_INFO(OCalcPreparedStatement,"com.sun.star.sdbc.driver.calc.PreparedStatement","com.sun.star.sdbc.PreparedStatement");
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/calc/CResultSet.cxx b/connectivity/source/drivers/calc/CResultSet.cxx
index 6f2566c5ff94..3085e135cd0f 100644
--- a/connectivity/source/drivers/calc/CResultSet.cxx
+++ b/connectivity/source/drivers/calc/CResultSet.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -43,8 +44,7 @@ using namespace com::sun::star::lang;
using namespace com::sun::star::beans;
using namespace com::sun::star::sdbc;
using namespace com::sun::star::sdbcx;
-// using namespace com::sun::star::container;
-// using namespace com::sun::star::util;
+
//------------------------------------------------------------------------------
OCalcResultSet::OCalcResultSet( OStatement_Base* pStmt,connectivity::OSQLParseTreeIterator& _aSQLIterator)
: file::OResultSet(pStmt,_aSQLIterator)
@@ -55,14 +55,14 @@ OCalcResultSet::OCalcResultSet( OStatement_Base* pStmt,connectivity::OSQLParseTr
// -------------------------------------------------------------------------
::rtl::OUString SAL_CALL OCalcResultSet::getImplementationName( ) throw ( RuntimeException)
{
- return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.calc.ResultSet");
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.calc.ResultSet"));
}
// -------------------------------------------------------------------------
Sequence< ::rtl::OUString > SAL_CALL OCalcResultSet::getSupportedServiceNames( ) throw( RuntimeException)
{
Sequence< ::rtl::OUString > aSupported(2);
- aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbc.ResultSet");
- aSupported[1] = ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.ResultSet");
+ aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.ResultSet"));
+ aSupported[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.ResultSet"));
return aSupported;
}
// -------------------------------------------------------------------------
@@ -189,3 +189,4 @@ void SAL_CALL OCalcResultSet::release() throw()
// -----------------------------------------------------------------------------
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/calc/CStatement.cxx b/connectivity/source/drivers/calc/CStatement.cxx
index 95eece44ddca..1005d0c8af90 100644
--- a/connectivity/source/drivers/calc/CStatement.cxx
+++ b/connectivity/source/drivers/calc/CStatement.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -41,3 +42,4 @@ OResultSet* OCalcStatement::createResultSet()
// -------------------------------------------------------------------------
IMPLEMENT_SERVICE_INFO(OCalcStatement,"com.sun.star.sdbc.driver.calc.Statement","com.sun.star.sdbc.Statement");
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx
index ef150f126060..cbfb9f976ba1 100644
--- a/connectivity/source/drivers/calc/CTable.cxx
+++ b/connectivity/source/drivers/calc/CTable.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,9 +31,6 @@
#include "calc/CTable.hxx"
#include <com/sun/star/sdbc/ColumnValue.hpp>
#include <com/sun/star/sdbc/DataType.hpp>
-//#ifndef _COM_SUN_STAR_UCB_XCONTENTACCESS_HPP_
-//#include <com/sun/star/ucb/XContentAccess.hpp>
-//#endif
#include <com/sun/star/sdbc/XRow.hpp>
#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
#include <com/sun/star/sheet/XSpreadsheet.hpp>
@@ -79,7 +77,6 @@ using namespace ::com::sun::star::table;
using namespace ::com::sun::star::text;
using namespace ::com::sun::star::util;
-// -------------------------------------------------------------------------
void lcl_UpdateArea( const Reference<XCellRange>& xUsedRange, sal_Int32& rEndCol, sal_Int32& rEndRow )
{
@@ -497,22 +494,22 @@ void OCalcTable::fillColumns()
}
break;
case DataType::DECIMAL:
- aTypeName = ::rtl::OUString::createFromAscii("DECIMAL");
+ aTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DECIMAL"));
break;
case DataType::BIT:
- aTypeName = ::rtl::OUString::createFromAscii("BOOL");
+ aTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BOOL"));
break;
case DataType::DATE:
- aTypeName = ::rtl::OUString::createFromAscii("DATE");
+ aTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DATE"));
break;
case DataType::TIME:
- aTypeName = ::rtl::OUString::createFromAscii("TIME");
+ aTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TIME"));
break;
case DataType::TIMESTAMP:
- aTypeName = ::rtl::OUString::createFromAscii("TIMESTAMP");
+ aTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TIMESTAMP"));
break;
default:
- OSL_ASSERT("missing type name");
+ OSL_FAIL("missing type name");
aTypeName = ::rtl::OUString();
}
@@ -869,3 +866,4 @@ void OCalcTable::FileClose()
}
// -------------------------------------------------------------------------
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/calc/CTables.cxx b/connectivity/source/drivers/calc/CTables.cxx
index 64066b681728..edc9bc1bdd8c 100644
--- a/connectivity/source/drivers/calc/CTables.cxx
+++ b/connectivity/source/drivers/calc/CTables.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,9 +31,7 @@
#include "calc/CTables.hxx"
#include "calc/CTable.hxx"
#include "file/FCatalog.hxx"
-#ifndef _CONNECTIVITY_FILE_BCONNECTION_HXX_
#include "file/FConnection.hxx"
-#endif
#include "calc/CCatalog.hxx"
#include <comphelper/types.hxx>
#include <rtl/logfile.hxx>
@@ -53,10 +52,11 @@ sdbcx::ObjectType OCalcTables::createObject(const ::rtl::OUString& _rName)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen@sun.com", "OCalcTables::createObject" );
OCalcTable* pTable = new OCalcTable(this,(OCalcConnection*)static_cast<OFileCatalog&>(m_rParent).getConnection(),
- _rName,::rtl::OUString::createFromAscii("TABLE"));
+ _rName,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TABLE")));
sdbcx::ObjectType xRet = pTable;
pTable->construct();
return xRet;
}
// -------------------------------------------------------------------------
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/calc/CalcDriver.xml b/connectivity/source/drivers/calc/CalcDriver.xml
index a8d5715f8e44..c6ff0d00fe55 100644..100755
--- a/connectivity/source/drivers/calc/CalcDriver.xml
+++ b/connectivity/source/drivers/calc/CalcDriver.xml
@@ -17,11 +17,9 @@
<project-build-dependency>cppuhelper</project-build-dependency>
<project-build-dependency>cppu</project-build-dependency>
<project-build-dependency>sal</project-build-dependency>
- <project-build-dependency>vos</project-build-dependency>
<runtime-module-dependency>cppuhelper</runtime-module-dependency>
<runtime-module-dependency>cppu</runtime-module-dependency>
<runtime-module-dependency>sal</runtime-module-dependency>
- <runtime-module-dependency>vos</runtime-module-dependency>
<runtime-module-dependency>osl</runtime-module-dependency>
<runtime-module-dependency>svtools-light1</runtime-module-dependency>
<runtime-module-dependency>svtools</runtime-module-dependency>
diff --git a/connectivity/source/drivers/calc/Cservices.cxx b/connectivity/source/drivers/calc/Cservices.cxx
index 5f0338b55aae..cb74522ba4ff 100644
--- a/connectivity/source/drivers/calc/Cservices.cxx
+++ b/connectivity/source/drivers/calc/Cservices.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -85,9 +86,7 @@ struct ProviderRequest
};
//---------------------------------------------------------------------------------------
-
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL
-component_getImplementationEnvironment(
+extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
const sal_Char **ppEnvTypeName,
uno_Environment ** /*ppEnv*/
)
@@ -121,3 +120,4 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
return pRet;
};
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/calc/calc.component b/connectivity/source/drivers/calc/calc.component
index be949f70de14..be949f70de14 100644..100755
--- a/connectivity/source/drivers/calc/calc.component
+++ b/connectivity/source/drivers/calc/calc.component
diff --git a/connectivity/source/drivers/calc/calc.xcu b/connectivity/source/drivers/calc/calc.xcu
index b7b494fdfa56..b7b494fdfa56 100755..100644
--- a/connectivity/source/drivers/calc/calc.xcu
+++ b/connectivity/source/drivers/calc/calc.xcu
diff --git a/connectivity/source/drivers/calc/exports.dxp b/connectivity/source/drivers/calc/exports.dxp
index f0e1c69934bc..f0e1c69934bc 100644..100755
--- a/connectivity/source/drivers/calc/exports.dxp
+++ b/connectivity/source/drivers/calc/exports.dxp
diff --git a/connectivity/source/drivers/calc/makefile.mk b/connectivity/source/drivers/calc/makefile.mk
index a7393b3c8e82..d36438a277b8 100644..100755
--- a/connectivity/source/drivers/calc/makefile.mk
+++ b/connectivity/source/drivers/calc/makefile.mk
@@ -34,6 +34,7 @@ ENABLE_EXCEPTIONS=TRUE
VISIBILITY_HIDDEN=TRUE
# --- Settings ----------------------------------
+
.IF "$(DBGUTIL_OJ)"!=""
ENVCFLAGS+=/FR$(SLO)$/
.ENDIF
@@ -41,7 +42,6 @@ ENVCFLAGS+=/FR$(SLO)$/
.INCLUDE : $(PRJ)$/makefile.pmk
.INCLUDE : $(PRJ)$/version.mk
-
# --- Files -------------------------------------
SLOFILES=\
@@ -66,20 +66,16 @@ SHL1OBJS=$(SLOFILES)
SHL1STDLIBS=\
$(CPPULIB) \
$(CPPUHELPERLIB) \
- $(VOSLIB) \
$(SVLLIB) \
$(TOOLSLIB) \
$(UNOTOOLSLIB) \
$(SALLIB) \
+ $(SALHELPERLIB) \
$(DBTOOLSLIB) \
$(DBFILELIB) \
$(COMPHELPERLIB)
-#.IF "$(DBFILELIB)" == ""
-#SHL1STDLIBS+= ifile.lib
-#.ENDIF
-
SHL1DEPN=
SHL1IMPLIB= i$(TARGET)
@@ -88,7 +84,6 @@ SHL1DEF= $(MISC)$/$(SHL1TARGET).def
DEF1NAME= $(SHL1TARGET)
DEF1EXPORTFILE= exports.dxp
-
# --- Targets ----------------------------------
.INCLUDE : $(PRJ)$/target.pmk
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-27 17:38:37 +0000