diff options
Diffstat (limited to 'sc/source/ui/unoobj/chart2uno.cxx')
| -rw-r--r-- | sc/source/ui/unoobj/chart2uno.cxx | 228 |
1 files changed, 114 insertions, 114 deletions
diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index 227869efe48e..b228cee7897a 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.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 @@ -92,7 +92,7 @@ const SfxItemPropertyMapEntry* lcl_GetDataProviderPropertyMap() { static SfxItemPropertyMapEntry aDataProviderPropertyMap_Impl[] = { - {MAP_CHAR_LEN(SC_UNONAME_INCLUDEHIDDENCELLS), 0, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_INCLUDEHIDDENCELLS), 0, &getBooleanCppuType(), 0, 0 }, {0,0,0,0,0,0} }; return aDataProviderPropertyMap_Impl; @@ -102,9 +102,9 @@ const SfxItemPropertyMapEntry* lcl_GetDataSequencePropertyMap() { static SfxItemPropertyMapEntry aDataSequencePropertyMap_Impl[] = { - {MAP_CHAR_LEN(SC_UNONAME_HIDDENVALUES), 0, &getCppuType((uno::Sequence<sal_Int32>*)0 ), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_ROLE), 0, &getCppuType((::com::sun::star::chart2::data::DataSequenceRole*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_INCLUDEHIDDENCELLS), 0, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_HIDDENVALUES), 0, &getCppuType((uno::Sequence<sal_Int32>*)0 ), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_ROLE), 0, &getCppuType((::com::sun::star::chart2::data::DataSequenceRole*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_INCLUDEHIDDENCELLS), 0, &getBooleanCppuType(), 0, 0 }, {0,0,0,0,0,0} }; return aDataSequencePropertyMap_Impl; @@ -188,7 +188,7 @@ struct TokenTable { ::std::for_each(maTokens.begin(), maTokens.end(), DeleteInstance()); } - + void push_back( FormulaToken* pToken ) { maTokens.push_back( pToken ); @@ -834,7 +834,7 @@ void Chart2Positioner::createPositionMap() // ============================================================================ -/** +/** * Function object to create a range string from a token list. */ class Tokens2RangeString : public unary_function<ScSharedTokenRef, void> @@ -851,7 +851,7 @@ public: Tokens2RangeString(const Tokens2RangeString& r) : mpRangeStr(r.mpRangeStr), - mpDoc(r.mpDoc), + mpDoc(r.mpDoc), meGrammar(r.meGrammar), mcRangeSep(r.mcRangeSep), mbFirst(r.mbFirst) @@ -887,12 +887,12 @@ private: bool mbFirst; }; -/** +/** * Function object to convert a list of tokens into a string form suitable * for ODF export. In ODF, a range is expressed as - * + * * (start cell address):(end cell address) - * + * * and each address doesn't include any '$' symbols. */ class Tokens2RangeStringXML : public unary_function<ScSharedTokenRef, void> @@ -1076,13 +1076,13 @@ ScChart2LabeledDataSequence* lcl_createScChart2DataSequenceFromTokens( auto_ptr< } //---------------------------------------------------- -/** - * Check the current list of reference tokens, and add the upper left - * corner of the minimum range that encloses all ranges if certain - * conditions are met. +/** + * Check the current list of reference tokens, and add the upper left + * corner of the minimum range that encloses all ranges if certain + * conditions are met. * * @param rRefTokens list of reference tokens - * + * * @return true if the corner was added, false otherwise. */ bool lcl_addUpperLeftCornerIfMissing(vector<ScSharedTokenRef>& rRefTokens, @@ -1200,7 +1200,7 @@ bool lcl_addUpperLeftCornerIfMissing(vector<ScSharedTokenRef>& rRefTokens, break; case svExternalSingleRef: { - if (!bExternal) + if (!bExternal) return false; if (nFileId != pToken->GetIndex() || aExtTabName != pToken->GetString()) @@ -1216,7 +1216,7 @@ bool lcl_addUpperLeftCornerIfMissing(vector<ScSharedTokenRef>& rRefTokens, break; case svExternalDoubleRef: { - if (!bExternal) + if (!bExternal) return false; if (nFileId != pToken->GetIndex() || aExtTabName != pToken->GetString()) @@ -1240,7 +1240,7 @@ bool lcl_addUpperLeftCornerIfMissing(vector<ScSharedTokenRef>& rRefTokens, } } - if (nMinRow >= nMaxRow || nMinCol >= nMaxCol || + if (nMinRow >= nMaxRow || nMinCol >= nMaxCol || nMinRow >= MAXROWCOUNT || nMinCol >= MAXCOLCOUNT || nMaxRow >= MAXROWCOUNT || nMaxCol >= MAXCOLCOUNT) { @@ -1249,7 +1249,7 @@ bool lcl_addUpperLeftCornerIfMissing(vector<ScSharedTokenRef>& rRefTokens, } // Check if the following conditions are met: - // + // // 1) The upper-left corner cell is not included. // 2) The three adjacent cells of that corner cell are included. @@ -1354,7 +1354,7 @@ bool lcl_addUpperLeftCornerIfMissing(vector<ScSharedTokenRef>& rRefTokens, ScRefTokenHelper::join(rRefTokens, pCorner); } } - + return true; } @@ -1509,7 +1509,7 @@ ScChart2DataProvider::createDataSource( namespace { -/** +/** * Function object to create a list of table numbers from a token list. */ class InsertTabNumber : public unary_function<ScSharedTokenRef, void> @@ -1587,7 +1587,7 @@ void RangeAnalyzer::initRangeAnalyzer( const vector<ScSharedTokenRef>& rTokens ) return; } mbEmpty=false; - + vector<ScSharedTokenRef>::const_iterator itr = rTokens.begin(), itrEnd = rTokens.end(); for (; itr != itrEnd ; ++itr) { @@ -1654,7 +1654,7 @@ void RangeAnalyzer::analyzeRange( sal_Int32& rnDataInRows, bool RangeAnalyzer::inSameSingleRow( RangeAnalyzer& rOther ) { - if( mnStartRow==rOther.mnStartRow && + if( mnStartRow==rOther.mnStartRow && mnRowCount==1 && rOther.mnRowCount==1 ) return true; return false; @@ -1662,13 +1662,13 @@ bool RangeAnalyzer::inSameSingleRow( RangeAnalyzer& rOther ) bool RangeAnalyzer::inSameSingleColumn( RangeAnalyzer& rOther ) { - if( mnStartColumn==rOther.mnStartColumn && + if( mnStartColumn==rOther.mnStartColumn && mnColumnCount==1 && rOther.mnColumnCount==1 ) return true; return false; } -} //end anonymous namespace +} //end anonymous namespace uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArguments( const uno::Reference< chart2::data::XDataSource >& xDataSource ) @@ -1683,7 +1683,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum bool bHasCategoriesLabels = false; vector<ScSharedTokenRef> aAllCategoriesValuesTokens; vector<ScSharedTokenRef> aAllSeriesLabelTokens; - + chart::ChartDataRowSource eRowSource = chart::ChartDataRowSource_COLUMNS; vector<ScSharedTokenRef> aAllTokens; @@ -1698,7 +1698,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum sal_Int32 nDataInRows = 0; sal_Int32 nDataInCols = 0; bool bRowSourceAmbiguous = false; - + Sequence< Reference< chart2::data::XLabeledDataSequence > > aSequences( xDataSource->getDataSequences()); const sal_Int32 nCount( aSequences.getLength()); RangeAnalyzer aPrevLabel,aPrevValues; @@ -1785,7 +1785,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum aPrevLabel=aLabel; } } - + if (!bRowSourceAmbiguous) { bRowSourceDetected = true; @@ -1965,7 +1965,7 @@ uno::Reference< chart2::data::XDataSequence > SAL_CALL if(!m_pDocument || (aRangeRepresentation.getLength() == 0)) return xResult; - // Note: the range representation must be in Calc A1 format. The import + // Note: the range representation must be in Calc A1 format. The import // filters use this method to pass data ranges, and they have no idea what // the current formula syntax is. In the future we should add another // method to allow the client code to directly pass tokens representing @@ -2037,7 +2037,7 @@ rtl::OUString SAL_CALL ScChart2DataProvider::convertRangeFromXML( const rtl::OUS { // #i74062# When loading flat XML, this is called before the referenced sheets are in the document, // so the conversion has to take place directly with the strings, without looking up the sheets. - + rtl::OUStringBuffer sRet; sal_Int32 nOffset = 0; while( nOffset >= 0 ) @@ -2047,23 +2047,23 @@ rtl::OUString SAL_CALL ScChart2DataProvider::convertRangeFromXML( const rtl::OUS if( nOffset >= 0 ) { // convert one address (remove dots) - + String aUIString(sToken); - + sal_Int32 nIndex = ScRangeStringConverter::IndexOf( sToken, ':', 0, cQuote ); if ( nIndex >= 0 && nIndex < aUIString.Len() - 1 && aUIString.GetChar((xub_StrLen)nIndex + 1) == (sal_Unicode) '.' ) aUIString.Erase( (xub_StrLen)nIndex + 1, 1 ); - + if ( aUIString.GetChar(0) == (sal_Unicode) '.' ) aUIString.Erase( 0, 1 ); - + if( sRet.getLength() ) sRet.append( (sal_Unicode) ';' ); sRet.append( aUIString ); } } - + return sRet.makeStringAndClear(); } @@ -2407,7 +2407,7 @@ void ScChart2DataSequence::HiddenRangeListener::notify() } ScChart2DataSequence::ScChart2DataSequence( ScDocument* pDoc, - const uno::Reference < chart2::data::XDataProvider >& xDP, + const uno::Reference < chart2::data::XDataProvider >& xDP, vector<ScSharedTokenRef>* pTokens, bool bIncludeHiddenCells ) : m_bIncludeHiddenCells( bIncludeHiddenCells) @@ -2434,8 +2434,8 @@ ScChart2DataSequence::ScChart2DataSequence( ScDocument* pDoc, // Reuse ScChartListener? // BM: don't use names of named ranges but the UI range strings -// String aStr; -// rRangeList->Format( aStr, SCR_ABS_3D, m_pDocument ); +// String aStr; +// rRangeList->Format( aStr, SCR_ABS_3D, m_pDocument ); // m_aIdentifier = ::rtl::OUString( aStr ); // m_aIdentifier = ::rtl::OUString::createFromAscii( "ID_"); @@ -2509,7 +2509,7 @@ void ScChart2DataSequence::BuildDataCache() ::std::list<sal_Int32> aHiddenValues; sal_Int32 nDataCount = 0; sal_Int32 nHiddenValueCount = 0; - + for (vector<ScSharedTokenRef>::const_iterator itr = m_pTokens->begin(), itrEnd = m_pTokens->end(); itr != itrEnd; ++itr) { @@ -2547,21 +2547,21 @@ void ScChart2DataSequence::BuildDataCache() m_aDataArray.push_back(Item()); Item& rItem = m_aDataArray.back(); ++nDataCount; - + ScAddress aAdr(nCol, nRow, nTab); ScBaseCell* pCell = m_pDocument->GetCell(aAdr); if (!pCell) continue; - + if (pCell->HasStringData()) rItem.maString = pCell->GetStringData(); else - { + { String aStr; m_pDocument->GetString(nCol, nRow, nTab, aStr); rItem.maString = aStr; } - + switch (pCell->GetCellType()) { case CELLTYPE_VALUE: @@ -2574,7 +2574,7 @@ void ScChart2DataSequence::BuildDataCache() USHORT nErr = pFCell->GetErrCode(); if (nErr) break; - + if (pFCell->HasValueData()) { rItem.mfValue = pFCell->GetValue(); @@ -2644,14 +2644,14 @@ sal_Int32 ScChart2DataSequence::FillCacheFromExternalRef(const ScSharedTokenRef& sal_Int32 nDataCount = 0; for (FormulaToken* p = pArray->First(); p; p = pArray->Next()) { - // Cached external range is always represented as a single + // Cached external range is always represented as a single // matrix token, although that might change in the future when // we introduce a new token type to store multi-table range // data. if (p->GetType() != svMatrix) { - DBG_ERROR("Cached array is not a matrix token."); + DBG_ERROR("Cached array is not a matrix token."); continue; } @@ -2798,7 +2798,7 @@ void ScChart2DataSequence::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint // delayed broadcast as in ScCellRangesBase if ( m_bGotDataChangedHint && m_pDocument ) - { + { m_aDataArray.clear(); lang::EventObject aEvent; aEvent.Source.set((cppu::OWeakObject*)this); @@ -2841,7 +2841,7 @@ void ScChart2DataSequence::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint } } - DBG_ASSERT(m_pRangeIndices->size() == static_cast<size_t>(aRanges.Count()), + DBG_ASSERT(m_pRangeIndices->size() == static_cast<size_t>(aRanges.Count()), "range list and range index list have different sizes."); auto_ptr<ScRangeList> pUndoRanges; @@ -2854,7 +2854,7 @@ void ScChart2DataSequence::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint if (bChanged) { - DBG_ASSERT(m_pRangeIndices->size() == static_cast<size_t>(aRanges.Count()), + DBG_ASSERT(m_pRangeIndices->size() == static_cast<size_t>(aRanges.Count()), "range list and range index list have different sizes after the reference update."); // Bring the change back from the range list to the token list. @@ -2890,7 +2890,7 @@ void ScChart2DataSequence::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint DBG_ERROR("range count and range index count differ."); break; } - + UpdateTokensFromRanges(rRanges); } while (false); @@ -3052,7 +3052,7 @@ uno::Sequence< rtl::OUString > SAL_CALL ScChart2DataSequence::getTextualData( ) namespace { -/** +/** * This function object is used to accumulatively count the numbers of * columns and rows in all reference tokens. */ @@ -3082,7 +3082,7 @@ private: SCROW mnRows; }; -/** +/** * This function object is used to generate label strings from a list of * reference tokens. */ @@ -3090,14 +3090,14 @@ class GenerateLabelStrings : public unary_function<ScSharedTokenRef, void> { public: GenerateLabelStrings(sal_Int32 nSize, chart2::data::LabelOrigin eOrigin, bool bColumn) : - mpLabels(new Sequence<OUString>(nSize)), - meOrigin(eOrigin), - mnCount(0), + mpLabels(new Sequence<OUString>(nSize)), + meOrigin(eOrigin), + mnCount(0), mbColumn(bColumn) {} GenerateLabelStrings(const GenerateLabelStrings& r) : - mpLabels(r.mpLabels), - meOrigin(r.meOrigin), + mpLabels(r.mpLabels), + meOrigin(r.meOrigin), mnCount(r.mnCount), mbColumn(r.mbColumn) {} @@ -3348,7 +3348,7 @@ void SAL_CALL ScChart2DataSequence::addModifyListener( const uno::Reference< uti } } - acquire(); // don't lose this object (one ref for all listeners) + acquire(); // don't lose this object (one ref for all listeners) } } @@ -3361,7 +3361,7 @@ void SAL_CALL ScChart2DataSequence::removeModifyListener( const uno::Reference< if (!m_pTokens.get() || m_pTokens->empty()) return; - acquire(); // in case the listeners have the last ref - released below + acquire(); // in case the listeners have the last ref - released below USHORT nCount = m_aValueListeners.Count(); for ( USHORT n=nCount; n--; ) @@ -3383,14 +3383,14 @@ void SAL_CALL ScChart2DataSequence::removeModifyListener( const uno::Reference< pCLC->EndListeningHiddenRange(m_pHiddenListener.get()); } - release(); // release the ref for the listeners + release(); // release the ref for the listeners } break; } } - release(); // might delete this object + release(); // might delete this object } // DataSequence XPropertySet ------------------------------------------------- @@ -3443,7 +3443,7 @@ uno::Any SAL_CALL ScChart2DataSequence::getPropertyValue( aRet <<= m_bIncludeHiddenCells; else if ( rPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(SC_UNONAME_HIDDENVALUES))) { - // This property is read-only thus cannot be set externally via + // This property is read-only thus cannot be set externally via // setPropertyValue(...). BuildDataCache(); aRet <<= m_aHiddenValues; @@ -3510,42 +3510,42 @@ void ScChart2DataSequence::setDataChangedHint(bool b) // XUnoTunnel // sal_Int64 SAL_CALL ScChart2DataSequence::getSomething( -// const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException) +// const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException) // { -// if ( rId.getLength() == 16 && +// if ( rId.getLength() == 16 && // 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(), -// rId.getConstArray(), 16 ) ) -// { -// return (sal_Int64)this; -// } -// return 0; +// rId.getConstArray(), 16 ) ) +// { +// return (sal_Int64)this; +// } +// return 0; // } // // static // const uno::Sequence<sal_Int8>& ScChart2DataSequence::getUnoTunnelId() // { -// static uno::Sequence<sal_Int8> * pSeq = 0; -// if( !pSeq ) -// { -// osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() ); -// if( !pSeq ) -// { -// static uno::Sequence< sal_Int8 > aSeq( 16 ); -// rtl_createUuid( (sal_uInt8*)aSeq.getArray(), 0, sal_True ); -// pSeq = &aSeq; -// } -// } -// return *pSeq; +// static uno::Sequence<sal_Int8> * pSeq = 0; +// if( !pSeq ) +// { +// osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() ); +// if( !pSeq ) +// { +// static uno::Sequence< sal_Int8 > aSeq( 16 ); +// rtl_createUuid( (sal_uInt8*)aSeq.getArray(), 0, sal_True ); +// pSeq = &aSeq; +// } +// } +// return *pSeq; // } // // static // ScChart2DataSequence* ScChart2DataSequence::getImplementation( const uno::Reference<uno::XInterface> xObj ) // { -// ScChart2DataSequence* pRet = NULL; -// uno::Reference<lang::XUnoTunnel> xUT( xObj, uno::UNO_QUERY ); -// if (xUT.is()) -// pRet = (ScChart2DataSequence*) xUT->getSomething( getUnoTunnelId() ); -// return pRet; +// ScChart2DataSequence* pRet = NULL; +// uno::Reference<lang::XUnoTunnel> xUT( xObj, uno::UNO_QUERY ); +// if (xUT.is()) +// pRet = (ScChart2DataSequence*) xUT->getSomething( getUnoTunnelId() ); +// return pRet; // } #if USE_CHART2_EMPTYDATASEQUENCE @@ -3568,8 +3568,8 @@ ScChart2EmptyDataSequence::ScChart2EmptyDataSequence( ScDocument* pDoc, // Reuse ScChartListener? // BM: don't use names of named ranges but the UI range strings -// String aStr; -// rRangeList->Format( aStr, SCR_ABS_3D, m_pDocument ); +// String aStr; +// rRangeList->Format( aStr, SCR_ABS_3D, m_pDocument ); // m_aIdentifier = ::rtl::OUString( aStr ); // m_aIdentifier = ::rtl::OUString::createFromAscii( "ID_"); @@ -3656,7 +3656,7 @@ uno::Sequence< rtl::OUString > SAL_CALL ScChart2EmptyDataSequence::getTextualDat throw ( uno::RuntimeException) { SolarMutexGuard aGuard; - String aStr; + String aStr; DBG_ASSERT( m_pDocument, "No Document -> no SourceRangeRepresentation" ); if( m_pDocument ) m_xRanges->Format( aStr, SCR_ABS_3D, m_pDocument, m_pDocument->GetAddressConvention() ); @@ -3823,42 +3823,42 @@ void SAL_CALL ScChart2EmptyDataSequence::removeVetoableChangeListener( // XUnoTunnel // sal_Int64 SAL_CALL ScChart2EmptyDataSequence::getSomething( -// const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException) +// const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException) // { -// if ( rId.getLength() == 16 && +// if ( rId.getLength() == 16 && // 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(), -// rId.getConstArray(), 16 ) ) -// { -// return (sal_Int64)this; -// } -// return 0; +// rId.getConstArray(), 16 ) ) +// { +// return (sal_Int64)this; +// } +// return 0; // } // // static // const uno::Sequence<sal_Int8>& ScChart2EmptyDataSequence::getUnoTunnelId() // { -// static uno::Sequence<sal_Int8> * pSeq = 0; -// if( !pSeq ) -// { -// osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() ); -// if( !pSeq ) -// { -// static uno::Sequence< sal_Int8 > aSeq( 16 ); -// rtl_createUuid( (sal_uInt8*)aSeq.getArray(), 0, sal_True ); -// pSeq = &aSeq; -// } -// } -// return *pSeq; +// static uno::Sequence<sal_Int8> * pSeq = 0; +// if( !pSeq ) +// { +// osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() ); +// if( !pSeq ) +// { +// static uno::Sequence< sal_Int8 > aSeq( 16 ); +// rtl_createUuid( (sal_uInt8*)aSeq.getArray(), 0, sal_True ); +// pSeq = &aSeq; +// } +// } +// return *pSeq; // } // // static // ScChart2DataSequence* ScChart2EmptyDataSequence::getImplementation( const uno::Reference<uno::XInterface> xObj ) // { -// ScChart2DataSequence* pRet = NULL; -// uno::Reference<lang::XUnoTunnel> xUT( xObj, uno::UNO_QUERY ); -// if (xUT.is()) -// pRet = (ScChart2EmptyDataSequence*) xUT->getSomething( getUnoTunnelId() ); -// return pRet; +// ScChart2DataSequence* pRet = NULL; +// uno::Reference<lang::XUnoTunnel> xUT( xObj, uno::UNO_QUERY ); +// if (xUT.is()) +// pRet = (ScChart2EmptyDataSequence*) xUT->getSomething( getUnoTunnelId() ); +// return pRet; // } #endif |