diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:03:39 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:03:39 +0200 |
| commit | 53aa87381a4df49d2d2c34328dc61716b4261ec7 (patch) | |
| tree | 960b32cda2755f988d0d34e568f1019ad2bce0d2 /dbaccess/source/ui/misc/RtfReader.cxx | |
| parent | 2cfb9101ab66d1521faa19f4f7e7174aea66a972 (diff) | |
recreated tag libreoffice-3.3.3.1 which had these commits:
commit 38f9e030925fc02a8e00bdd5985d4375439e199c (tag: refs/tags/libreoffice-3.3.3.1)
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue May 31 17:39:02 2011 +0200
Version 3.3.3.1, tag libreoffice-3.3.3.1 (3.3.3-rc1)
Notes
Notes:
split repo tag: base_libreoffice-3.3.3.1
split repo tag: base_libreoffice-3.3.4.1
Diffstat (limited to 'dbaccess/source/ui/misc/RtfReader.cxx')
| -rw-r--r-- | dbaccess/source/ui/misc/RtfReader.cxx | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/dbaccess/source/ui/misc/RtfReader.cxx b/dbaccess/source/ui/misc/RtfReader.cxx index f4f1ae4013cb..725b82297a5e 100644 --- a/dbaccess/source/ui/misc/RtfReader.cxx +++ b/dbaccess/source/ui/misc/RtfReader.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 @@ -69,13 +69,13 @@ DBG_NAME(ORTFReader) // ========================================================================== // ORTFReader // ========================================================================== -ORTFReader::ORTFReader( SvStream& rIn, +ORTFReader::ORTFReader( SvStream& rIn, const SharedConnection& _rxConnection, const Reference< ::com::sun::star::util::XNumberFormatter >& _rxNumberF, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rM, const TColumnVector* pList, const OTypeInfoMap* _pInfoMap) - :SvRTFParser(rIn) + :SvRTFParser(rIn) ,ODatabaseExport( _rxConnection, _rxNumberF, _rM, pList, _pInfoMap, rIn ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ORTFReader::ORTFReader" ); @@ -91,7 +91,7 @@ ORTFReader::ORTFReader(SvStream& rIn, const TColumnVector* pList, const OTypeInfoMap* _pInfoMap, sal_Bool _bAutoIncrementEnabled) - :SvRTFParser(rIn) + :SvRTFParser(rIn) ,ODatabaseExport( nRows, _rColumnPositions, _rxNumberF, _rM, pList, _pInfoMap, _bAutoIncrementEnabled, rIn ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ORTFReader::ORTFReader" ); @@ -122,7 +122,7 @@ void ORTFReader::NextToken( int nToken ) if(m_bError || !m_nRows) // falls Fehler oder keine Rows mehr zur "Uberpr"ufung dann gleich zur"uck return; - if(m_xConnection.is()) // gibt an welcher CTOR gerufen wurde und damit, ob eine Tabelle erstellt werden soll + if(m_xConnection.is()) // gibt an welcher CTOR gerufen wurde und damit, ob eine Tabelle erstellt werden soll { switch(nToken) { @@ -138,9 +138,9 @@ void ORTFReader::NextToken( int nToken ) { switch(nTmpToken2) { - case RTF_RED: aColor.SetRed((sal_uInt8)nTokenValue); break; - case RTF_BLUE: aColor.SetBlue((sal_uInt8)nTokenValue); break; - case RTF_GREEN: aColor.SetGreen((sal_uInt8)nTokenValue); break; + case RTF_RED: aColor.SetRed((sal_uInt8)nTokenValue); break; + case RTF_BLUE: aColor.SetBlue((sal_uInt8)nTokenValue); break; + case RTF_GREEN: aColor.SetGreen((sal_uInt8)nTokenValue); break; default: bNext = sal_False; } @@ -278,7 +278,7 @@ sal_Bool ORTFReader::CreateTable(int nToken) String aTableName(ModuleRes(STR_TBL_TITLE)); aTableName = aTableName.GetToken(0,' '); aTableName = String(::dbtools::createUniqueName(m_xTables,::rtl::OUString(aTableName))); - + int nTmpToken2 = nToken; String aColumnName; @@ -315,8 +315,8 @@ sal_Bool ORTFReader::CreateTable(int nToken) } break; case RTF_CF: - // if(nTokenValue < m_vecColor.size()) - // m_xTable->setPropertyValue(PROPERTY_TEXTCOLOR,makeAny(m_vecColor[nTokenValue])); + // if(nTokenValue < m_vecColor.size()) + // m_xTable->setPropertyValue(PROPERTY_TEXTCOLOR,makeAny(m_vecColor[nTokenValue])); break; case RTF_B: aFont.Weight = ::com::sun::star::awt::FontWeight::BOLD; @@ -344,15 +344,15 @@ sal_Bool ORTFReader::CreateTable(int nToken) CreateDefaultColumn(aColumnName); } - m_bInTbl = sal_False; - m_bFoundTable = sal_True; + m_bInTbl = sal_False; + m_bFoundTable = sal_True; if ( isCheckEnabled() ) return sal_True; Any aTextColor; if(!m_vecColor.empty()) aTextColor <<= m_vecColor[0]; - + bOk = !executeWizard(aTableName,aTextColor,aFont) && m_xTable.is(); } return bOk; |