summaryrefslogtreecommitdiff
path: root/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:14:05 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:14:05 +0200
commit4b5ea19aa23b5dbb675b74614fa1e7a2cc33f0e0 (patch)
treed33144cc3c63fd7e73168a81c38f6be300cda103 /connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
parent648eb69046db96c3dd675543740a95859a0c4d02 (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/ado/ADatabaseMetaDataImpl.cxx')
-rw-r--r--connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx24
1 files changed, 12 insertions, 12 deletions
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
index c31e40f44922..4b9282748377 100644
--- a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.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
@@ -72,7 +72,7 @@ void ODatabaseMetaData::fillLiterals()
LiteralInfo aInfo;
while(!aRecordset.IsAtEOF())
{
- WpOLEAppendCollection<ADOFields, ADOField, WpADOField> aFields(aRecordset.GetFields());
+ WpOLEAppendCollection<ADOFields, ADOField, WpADOField> aFields(aRecordset.GetFields());
WpADOField aField(aFields.GetItem(1));
aInfo.pwszLiteralValue = aField.get_Value();
aField = aFields.GetItem(5);
@@ -423,10 +423,10 @@ void OAdoIndex::fillPropertyValues()
{
if(m_aIndex.IsValid())
{
- m_Name = m_aIndex.get_Name();
- m_IsUnique = m_aIndex.get_Unique();
+ m_Name = m_aIndex.get_Name();
+ m_IsUnique = m_aIndex.get_Unique();
m_IsPrimaryKeyIndex = m_aIndex.get_PrimaryKey();
- m_IsClustered = m_aIndex.get_Clustered();
+ m_IsClustered = m_aIndex.get_Clustered();
}
}
// -----------------------------------------------------------------------------
@@ -452,11 +452,11 @@ void OAdoKey::fillPropertyValues()
{
if(m_aKey.IsValid())
{
- m_aProps->m_Type = MapKeyRule(m_aKey.get_Type());
- m_Name = m_aKey.get_Name();
- m_aProps->m_ReferencedTable = m_aKey.get_RelatedTable();
- m_aProps->m_UpdateRule = MapRule(m_aKey.get_UpdateRule());
- m_aProps->m_DeleteRule = MapRule(m_aKey.get_DeleteRule());
+ m_aProps->m_Type = MapKeyRule(m_aKey.get_Type());
+ m_Name = m_aKey.get_Name();
+ m_aProps->m_ReferencedTable = m_aKey.get_RelatedTable();
+ m_aProps->m_UpdateRule = MapRule(m_aKey.get_UpdateRule());
+ m_aProps->m_DeleteRule = MapRule(m_aKey.get_DeleteRule());
}
}
// -------------------------------------------------------------------------
@@ -572,8 +572,8 @@ void OAdoTable::fillPropertyValues()
{
if(m_aTable.IsValid())
{
- m_Name = m_aTable.get_Name();
- m_Type = m_aTable.get_Type();
+ m_Name = m_aTable.get_Name();
+ m_Type = m_aTable.get_Type();
{
WpADOCatalog aCat(m_aTable.get_ParentCatalog());
if(aCat.IsValid())