diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:14:05 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:14:05 +0200 |
commit | 4b5ea19aa23b5dbb675b74614fa1e7a2cc33f0e0 (patch) | |
tree | d33144cc3c63fd7e73168a81c38f6be300cda103 /connectivity/source/drivers/calc/CDatabaseMetaData.cxx | |
parent | 648eb69046db96c3dd675543740a95859a0c4d02 (diff) |
recreated tag libreoffice-3.3.3.1 which had these commits:
commit 6f4f1c964ff6ea166412285a4cc0ea9f98da499e (tag: refs/tags/libreoffice-3.3.3.1)
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue May 31 17:39:06 2011 +0200
Version 3.3.3.1, tag libreoffice-3.3.3.1 (3.3.3-rc1)
commit abdccb1813c5eb8d27bd7e7ee8a4731f8ca55fcf
Author: Andras Timar <atimar@suse.com>
Date: Mon May 30 00:07:50 2011 +0200
replace "seagull" icons to LibreOffice icons fdo#37617
Signed-off-by: Tor Lillqvist <tlillqvist@novell.com>
.../icons/hicolor/16x16/apps/printeradmin.png | Bin 963 -> 544 bytes
.../icons/hicolor/32x32/apps/printeradmin.png | Bin 2534 -> 1104 bytes
.../icons/hicolor/48x48/apps/printeradmin.png | Bin 4058 -> 1629 bytes
.../icons/locolor/16x16/apps/printeradmin.png | Bin 395 -> 532 bytes
.../icons/locolor/32x32/apps/printeradmin.png | Bin 618 -> 1126 bytes
5 files changed, 0 insertions(+), 0 deletions(-)
commit 1a85a81e01b828881c09b76397dd06e121bbb824
Author: Andras Timar <atimar@suse.com>
Date: Tue May 24 12:05:59 2011 +0200
fdo#37001 - updated license information
Signed-off-by: Michael Meeks <michael.meeks@novell.com>
readlicense_oo/html/THIRDPARTYLICENSEREADME.html |17724 ++++++++++------------
readlicense_oo/odt/LICENSE.odt | Bin 154001 -> 115146 bytes
readlicense_oo/txt/license.txt |11684 +++++++++------
3 files changed, 15007 insertions(+), 14401 deletions(-)
commit 2833c4cb4dc6c6def3d3cb3b134f22eda3a87207
Author: Michael Meeks <michael.meeks@novell.com>
Date: Fri Apr 1 15:55:42 2011 +0100
fix evolution local addressbook integration, which uses a new local: uri
.../source/drivers/evoab2/NDatabaseMetaData.cxx | 13 +++++++------
connectivity/source/drivers/evoab2/NResultSet.cxx | 3 ++-
2 files changed, 9 insertions(+), 7 deletions(-)
commit 71bf17ecbaa46780b112b6307aab879a088910fe
Author: Tor Lillqvist <tlillqvist@novell.com>
Date: Tue Mar 29 18:59:05 2011 +0300
Don't pass potentially bogus file: URIs to libxml2
libxml2 doesn't understand our syntax for file: URIs in the case of
UNC paths. Fixes fdo#33970. Picked from OOo's fix for their issue
i#109096.
Signed-off-by: David Tardon <dtardon@redhat.com>
.../source/deployment/registry/dp_backenddb.cxx | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
commit 8424af3e1b69f00f442a5a49a964813ede2f09e7
Author: Luboš Luňák <l.lunak@suse.cz>
Date: Fri Mar 18 13:18:58 2011 +0100
use full path for kdefilepicker helper binary (bnc#31109)
ack by pmladek
fpicker/source/unx/kde_unx/UnxFilePicker.cxx | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
Notes
split repo tag: libs-core_libreoffice-3.3.3.1
split repo tag: libs-core_libreoffice-3.3.4.1
Diffstat (limited to 'connectivity/source/drivers/calc/CDatabaseMetaData.cxx')
-rw-r--r-- | connectivity/source/drivers/calc/CDatabaseMetaData.cxx | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx index 272ef85822cf..80f22f5f59ce 100644 --- a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx +++ b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -63,7 +63,7 @@ using namespace ::com::sun::star::sheet; // ------------------------------------------------------------------------- -OCalcDatabaseMetaData::OCalcDatabaseMetaData(OConnection* _pCon) :ODatabaseMetaData(_pCon) +OCalcDatabaseMetaData::OCalcDatabaseMetaData(OConnection* _pCon) :ODatabaseMetaData(_pCon) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen@sun.com", "OCalcDatabaseMetaData::OCalcDatabaseMetaData" ); } @@ -178,8 +178,8 @@ Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getColumns( aRow[10] = new ORowSetValueDecorator((sal_Int32)10); Sequence< ::rtl::OUString> aTabNames(xNames->getElementNames()); - const ::rtl::OUString* pTabIter = aTabNames.getConstArray(); - const ::rtl::OUString* pTabEnd = pTabIter + aTabNames.getLength(); + const ::rtl::OUString* pTabIter = aTabNames.getConstArray(); + const ::rtl::OUString* pTabEnd = pTabIter + aTabNames.getLength(); for(;pTabIter != pTabEnd;++pTabIter) { if(match(tableNamePattern,*pTabIter,'\0')) @@ -208,13 +208,13 @@ Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getColumns( aRow[5] = new ORowSetValueDecorator(::comphelper::getINT32(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)))); aRow[6] = new ORowSetValueDecorator(::comphelper::getString(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME)))); aRow[7] = new ORowSetValueDecorator(::comphelper::getINT32(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION)))); - // aRow[8] = xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME)); + // aRow[8] = xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME)); aRow[9] = new ORowSetValueDecorator(::comphelper::getINT32(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE)))); aRow[11] = new ORowSetValueDecorator(::comphelper::getINT32(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE)))); - // aRow[12] = xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME)); + // aRow[12] = xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME)); aRow[13] = new ORowSetValueDecorator(::comphelper::getString(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DEFAULTVALUE)))); - // aRow[14] = xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME)); - // aRow[15] = xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME)); + // aRow[14] = xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME)); + // aRow[15] = xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME)); switch(sal_Int32(aRow[5]->getValue())) { case DataType::CHAR: @@ -304,7 +304,7 @@ sal_Bool lcl_IsEmptyOrHidden( const Reference<XSpreadsheets>& xSheets, const ::r Reference<XSpreadsheet> xSheet; if ( aAny >>= xSheet ) { - // test if sheet is hidden + // test if sheet is hidden Reference<XPropertySet> xProp( xSheet, UNO_QUERY ); if (xProp.is()) @@ -313,23 +313,23 @@ sal_Bool lcl_IsEmptyOrHidden( const Reference<XSpreadsheets>& xSheets, const ::r Any aVisAny = xProp->getPropertyValue( ::rtl::OUString::createFromAscii("IsVisible") ); if ( aVisAny >>= bVisible ) if (!bVisible) - return sal_True; // hidden - } + return sal_True; // hidden + } - // use the same data area as in OCalcTable to test for empty table + // use the same data area as in OCalcTable to test for empty table Reference<XSheetCellCursor> xCursor = xSheet->createCursor(); Reference<XCellRangeAddressable> xRange( xCursor, UNO_QUERY ); if ( xRange.is() ) { - xCursor->collapseToSize( 1, 1 ); // single (first) cell - xCursor->collapseToCurrentRegion(); // contiguous data area + xCursor->collapseToSize( 1, 1 ); // single (first) cell + xCursor->collapseToCurrentRegion(); // contiguous data area CellRangeAddress aRangeAddr = xRange->getRangeAddress(); if ( aRangeAddr.StartColumn == aRangeAddr.EndColumn && aRangeAddr.StartRow == aRangeAddr.EndRow ) { - // single cell -> check content + // single cell -> check content Reference<XCell> xCell = xCursor->getCellByPosition( 0, 0 ); if ( xCell.is() && xCell->getType() == CellContentType_EMPTY ) return sal_True; @@ -361,7 +361,7 @@ sal_Bool lcl_IsUnnamed( const Reference<XDatabaseRanges>& xRanges, const ::rtl:: catch ( UnknownPropertyException& ) { // optional property - } + } } } @@ -391,9 +391,9 @@ Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getTables( if(nLength) { bTableFound = sal_False; - + const ::rtl::OUString* pIter = types.getConstArray(); - const ::rtl::OUString* pEnd = pIter + nLength; + const ::rtl::OUString* pEnd = pIter + nLength; for(;pIter != pEnd;++pIter) { if(*pIter == aTable) |