diff options
Diffstat (limited to 'sc/source/filter/xml')
97 files changed, 1581 insertions, 1590 deletions
diff --git a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx index 98d7a41da7c7..f26dd20140f4 100644 --- a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx +++ b/sc/source/filter/xml/XMLCalculationSettingsContext.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 diff --git a/sc/source/filter/xml/XMLCalculationSettingsContext.hxx b/sc/source/filter/xml/XMLCalculationSettingsContext.hxx index 867c01a5d923..b9f3eeee711e 100644 --- a/sc/source/filter/xml/XMLCalculationSettingsContext.hxx +++ b/sc/source/filter/xml/XMLCalculationSettingsContext.hxx @@ -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 diff --git a/sc/source/filter/xml/XMLCellRangeSourceContext.cxx b/sc/source/filter/xml/XMLCellRangeSourceContext.cxx index 6b9bed748fb6..35e6efd67f2f 100644 --- a/sc/source/filter/xml/XMLCellRangeSourceContext.cxx +++ b/sc/source/filter/xml/XMLCellRangeSourceContext.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,15 +63,15 @@ ScXMLCellRangeSourceContext::ScXMLCellRangeSourceContext( { if( !xAttrList.is() ) return; - sal_Int16 nAttrCount = xAttrList->getLength(); - const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetTableCellRangeSourceAttrTokenMap(); + sal_Int16 nAttrCount = xAttrList->getLength(); + const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetTableCellRangeSourceAttrTokenMap(); for( sal_Int16 nIndex = 0; nIndex < nAttrCount; ++nIndex ) { const rtl::OUString& sAttrName(xAttrList->getNameByIndex( nIndex )); const OUString& sValue(xAttrList->getValueByIndex( nIndex )); OUString aLocalName; - USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); + USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { diff --git a/sc/source/filter/xml/XMLCellRangeSourceContext.hxx b/sc/source/filter/xml/XMLCellRangeSourceContext.hxx index 711e83c7ea55..7282802df0eb 100644 --- a/sc/source/filter/xml/XMLCellRangeSourceContext.hxx +++ b/sc/source/filter/xml/XMLCellRangeSourceContext.hxx @@ -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 @@ -38,13 +38,13 @@ class ScXMLImport; struct ScMyImpCellRangeSource { - ::rtl::OUString sSourceStr; - ::rtl::OUString sFilterName; - ::rtl::OUString sFilterOptions; - ::rtl::OUString sURL; - sal_Int32 nColumns; - sal_Int32 nRows; - sal_Int32 nRefresh; + ::rtl::OUString sSourceStr; + ::rtl::OUString sFilterName; + ::rtl::OUString sFilterOptions; + ::rtl::OUString sURL; + sal_Int32 nColumns; + sal_Int32 nRows; + sal_Int32 nRefresh; ScMyImpCellRangeSource(); }; @@ -55,8 +55,8 @@ struct ScMyImpCellRangeSource class ScXMLCellRangeSourceContext : public SvXMLImportContext { private: - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } + ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLCellRangeSourceContext( @@ -66,14 +66,14 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, ScMyImpCellRangeSource* pCellRangeSource ); - virtual ~ScXMLCellRangeSourceContext(); + virtual ~ScXMLCellRangeSourceContext(); - virtual SvXMLImportContext* CreateChildContext( + virtual SvXMLImportContext* CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); - virtual void EndElement(); + virtual void EndElement(); }; diff --git a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx index 9f129bd160dd..fe13d9a6f356 100644 --- a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx +++ b/sc/source/filter/xml/XMLChangeTrackingExportHelper.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 @@ -127,7 +127,7 @@ void ScChangeTrackingExportHelper::WriteChangeInfo(const ScChangeAction* pAction { SvXMLElementExport aCreatorElem( rExport, XML_NAMESPACE_DC, - XML_CREATOR, sal_True, + XML_CREATOR, sal_True, sal_False ); rtl::OUString sAuthor(pAction->GetUser()); rExport.Characters(sAuthor); @@ -137,10 +137,10 @@ void ScChangeTrackingExportHelper::WriteChangeInfo(const ScChangeAction* pAction rtl::OUStringBuffer sDate; ScXMLConverter::ConvertDateTimeToString(pAction->GetDateTimeUTC(), sDate); SvXMLElementExport aDateElem( rExport, XML_NAMESPACE_DC, - XML_DATE, sal_True, + XML_DATE, sal_True, sal_False ); rExport.Characters(sDate.makeStringAndClear()); - } + } rtl::OUString sComment(pAction->GetComment()); if (sComment.getLength()) @@ -334,7 +334,7 @@ void ScChangeTrackingExportHelper::WriteValueCell(const ScBaseCell* pCell, const { SetValueAttributes(pValueCell->GetValue(), sValue); SvXMLElementExport aElemC(rExport, XML_NAMESPACE_TABLE, XML_CHANGE_TRACK_TABLE_CELL, sal_True, sal_True); -/* if (sValue.Len()) +/* if (sValue.Len()) { SvXMLElementExport aElemC(rExport, XML_NAMESPACE_TEXT, XML_P, sal_True, sal_False); sal_Bool bPrevCharWasSpace(sal_True); @@ -420,12 +420,12 @@ void ScChangeTrackingExportHelper::WriteFormulaCell(const ScBaseCell* pCell, con rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_MATRIX_COVERED, XML_TRUE); } rtl::OUString sMatrixFormula = sOUFormula.copy(1, sOUFormula.getLength() - 2); - rtl::OUString sQValue = rExport.GetNamespaceMap().GetQNameByKey( nNamespacePrefix, sMatrixFormula, sal_False ); + rtl::OUString sQValue = rExport.GetNamespaceMap().GetQNameByKey( nNamespacePrefix, sMatrixFormula, sal_False ); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_FORMULA, sQValue); } else { - rtl::OUString sQValue = rExport.GetNamespaceMap().GetQNameByKey( nNamespacePrefix, sFormula, sal_False ); + rtl::OUString sQValue = rExport.GetNamespaceMap().GetQNameByKey( nNamespacePrefix, sFormula, sal_False ); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_FORMULA, sQValue); } if (pFormulaCell->IsValue()) @@ -793,7 +793,7 @@ void ScChangeTrackingExportHelper::CollectAndWriteChanges() { if (pChangeTrack) { -/* if (pChangeTrack->IsProtected()) +/* if (pChangeTrack->IsProtected()) { rtl::OUStringBuffer aBuffer; SvXMLUnitConverter::encodeBase64(aBuffer, pChangeTrack->GetProtection()); diff --git a/sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx b/sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx index cfb518e58b29..ed32a7ec93a6 100644 --- a/sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx +++ b/sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx @@ -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 @@ -49,13 +49,13 @@ typedef std::list<ScChangeActionDel*> ScMyDeletionsList; class ScChangeTrackingExportHelper { - ScXMLExport& rExport; + ScXMLExport& rExport; - ScChangeTrack* pChangeTrack; + ScChangeTrack* pChangeTrack; ScEditEngineTextObj* pEditTextObj; ScChangeActionTable* pDependings; - rtl::OUString sChangeIDPrefix; - com::sun::star::uno::Reference<com::sun::star::text::XText> xText; + rtl::OUString sChangeIDPrefix; + com::sun::star::uno::Reference<com::sun::star::text::XText> xText; rtl::OUString GetChangeID(const sal_uInt32 nActionNumber); void GetAcceptanceState(const ScChangeAction* pAction); diff --git a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx index 65294d496d87..c23846789258 100644 --- a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx +++ b/sc/source/filter/xml/XMLChangeTrackingImportHelper.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 @@ -481,7 +481,7 @@ void ScXMLChangeTrackingImportHelper::ConvertInfo(const ScMyActionInfo& aInfo, S rUser = aInfo.sUser; // shouldn't happen } -ScChangeAction* ScXMLChangeTrackingImportHelper::CreateInsertAction(ScMyInsAction* pAction) +ScChangeAction* ScXMLChangeTrackingImportHelper::CreateInsertAction(ScMyInsAction* pAction) { DateTime aDateTime( Date(0), Time(0) ); String aUser; @@ -494,7 +494,7 @@ ScChangeAction* ScXMLChangeTrackingImportHelper::CreateInsertAction(ScMyInsActio return pNewAction; } -ScChangeAction* ScXMLChangeTrackingImportHelper::CreateDeleteAction(ScMyDelAction* pAction) +ScChangeAction* ScXMLChangeTrackingImportHelper::CreateDeleteAction(ScMyDelAction* pAction) { DateTime aDateTime( Date(0), Time(0) ); String aUser; @@ -507,7 +507,7 @@ ScChangeAction* ScXMLChangeTrackingImportHelper::CreateDeleteAction(ScMyDelActio return pNewAction; } -ScChangeAction* ScXMLChangeTrackingImportHelper::CreateMoveAction(ScMyMoveAction* pAction) +ScChangeAction* ScXMLChangeTrackingImportHelper::CreateMoveAction(ScMyMoveAction* pAction) { DBG_ASSERT(pAction->pMoveRanges, "no move ranges"); if (pAction->pMoveRanges) @@ -525,7 +525,7 @@ ScChangeAction* ScXMLChangeTrackingImportHelper::CreateMoveAction(ScMyMoveAction return NULL; } -ScChangeAction* ScXMLChangeTrackingImportHelper::CreateRejectionAction(ScMyRejAction* pAction) +ScChangeAction* ScXMLChangeTrackingImportHelper::CreateRejectionAction(ScMyRejAction* pAction) { DateTime aDateTime( Date(0), Time(0) ); String aUser; @@ -538,7 +538,7 @@ ScChangeAction* ScXMLChangeTrackingImportHelper::CreateRejectionAction(ScMyRejAc return pNewAction; } -ScChangeAction* ScXMLChangeTrackingImportHelper::CreateContentAction(ScMyContentAction* pAction) +ScChangeAction* ScXMLChangeTrackingImportHelper::CreateContentAction(ScMyContentAction* pAction) { ScBaseCell* pCell = NULL; if (pAction->pCellInfo) diff --git a/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx b/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx index 5a98df08a2c7..937b8f9b7fb3 100644 --- a/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx +++ b/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx @@ -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 @@ -82,9 +82,9 @@ typedef std::list<ScMyDeleted*> ScMyDeletedList; struct ScMyGenerated { - ScBigRange aBigRange; - sal_uInt32 nID; - ScMyCellInfo* pCellInfo; + ScBigRange aBigRange; + sal_uInt32 nID; + ScMyCellInfo* pCellInfo; ScMyGenerated(ScMyCellInfo* pCellInfo, const ScBigRange& aBigRange); ~ScMyGenerated(); @@ -168,7 +168,7 @@ struct ScMyMoveAction : public ScMyBaseAction struct ScMyContentAction : public ScMyBaseAction { - ScMyCellInfo* pCellInfo; + ScMyCellInfo* pCellInfo; ScMyContentAction(); ~ScMyContentAction(); @@ -186,25 +186,25 @@ class ScChangeViewSettings; class ScXMLChangeTrackingImportHelper { - ScStrCollection aUsers; - ScMyActions aActions; - com::sun::star::uno::Sequence<sal_Int8> aProtect; - ScDocument* pDoc; - ScChangeTrack* pTrack; - ScMyBaseAction* pCurrentAction; - rtl::OUString sIDPrefix; - sal_uInt32 nPrefixLength; - sal_Int16 nMultiSpanned; - sal_Int16 nMultiSpannedSlaveCount; - sal_Bool bChangeTrack; + ScStrCollection aUsers; + ScMyActions aActions; + com::sun::star::uno::Sequence<sal_Int8> aProtect; + ScDocument* pDoc; + ScChangeTrack* pTrack; + ScMyBaseAction* pCurrentAction; + rtl::OUString sIDPrefix; + sal_uInt32 nPrefixLength; + sal_Int16 nMultiSpanned; + sal_Int16 nMultiSpannedSlaveCount; + sal_Bool bChangeTrack; private: void ConvertInfo(const ScMyActionInfo& aInfo, String& rUser, DateTime& aDateTime); - ScChangeAction* CreateInsertAction(ScMyInsAction* pAction); - ScChangeAction* CreateDeleteAction(ScMyDelAction* pAction); - ScChangeAction* CreateMoveAction(ScMyMoveAction* pAction); - ScChangeAction* CreateRejectionAction(ScMyRejAction* pAction); - ScChangeAction* CreateContentAction(ScMyContentAction* pAction); + ScChangeAction* CreateInsertAction(ScMyInsAction* pAction); + ScChangeAction* CreateDeleteAction(ScMyDelAction* pAction); + ScChangeAction* CreateMoveAction(ScMyMoveAction* pAction); + ScChangeAction* CreateRejectionAction(ScMyRejAction* pAction); + ScChangeAction* CreateContentAction(ScMyContentAction* pAction); void CreateGeneratedActions(ScMyGeneratedList& rList); diff --git a/sc/source/filter/xml/XMLCodeNameProvider.cxx b/sc/source/filter/xml/XMLCodeNameProvider.cxx index 2f971e547abf..9cfe67d81d11 100644 --- a/sc/source/filter/xml/XMLCodeNameProvider.cxx +++ b/sc/source/filter/xml/XMLCodeNameProvider.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 @@ -62,18 +62,18 @@ sal_Bool XMLCodeNameProvider::_getCodeName( const uno::Any& aAny, String& rCodeN } -XMLCodeNameProvider::XMLCodeNameProvider( ScDocument* pDoc ) : - mpDoc( pDoc ), +XMLCodeNameProvider::XMLCodeNameProvider( ScDocument* pDoc ) : + mpDoc( pDoc ), msDocName( RTL_CONSTASCII_USTRINGPARAM("*doc*") ), msCodeNameProp( RTL_CONSTASCII_USTRINGPARAM("CodeName") ) { } -XMLCodeNameProvider::~XMLCodeNameProvider() +XMLCodeNameProvider::~XMLCodeNameProvider() { } -::sal_Bool SAL_CALL XMLCodeNameProvider::hasByName( const OUString& aName ) +::sal_Bool SAL_CALL XMLCodeNameProvider::hasByName( const OUString& aName ) throw (uno::RuntimeException ) { if( aName == msDocName ) @@ -95,7 +95,7 @@ XMLCodeNameProvider::~XMLCodeNameProvider() } uno::Any SAL_CALL XMLCodeNameProvider::getByName( const OUString& aName ) - throw (container::NoSuchElementException, + throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { uno::Any aRet; @@ -131,7 +131,7 @@ uno::Sequence< OUString > SAL_CALL XMLCodeNameProvider::getElementNames( ) throw (uno::RuntimeException) { SCTAB nCount = mpDoc->GetTableCount() + 1; - uno::Sequence< rtl::OUString > aNames( nCount ); + uno::Sequence< rtl::OUString > aNames( nCount ); sal_Int32 nRealCount = 0; if( mpDoc->GetCodeName().Len() ) @@ -194,7 +194,7 @@ void XMLCodeNameProvider::set( const uno::Reference< container::XNameAccess>& xN String sSheetName; for( SCTAB i = 0; i < nCount; i++ ) { - if( pDoc->GetName( i, sSheetName ) && + if( pDoc->GetName( i, sSheetName ) && xNameAccess->hasByName( sSheetName ) ) { aAny = xNameAccess->getByName( sSheetName ); diff --git a/sc/source/filter/xml/XMLCodeNameProvider.hxx b/sc/source/filter/xml/XMLCodeNameProvider.hxx index 81a5b5e3ebdc..61e12770bf9b 100644 --- a/sc/source/filter/xml/XMLCodeNameProvider.hxx +++ b/sc/source/filter/xml/XMLCodeNameProvider.hxx @@ -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 @@ -41,19 +41,19 @@ class XMLCodeNameProvider : public ::cppu::WeakImplHelper1< ::com::sun::star::co ::rtl::OUString msDocName; ::rtl::OUString msCodeNameProp; - static sal_Bool _getCodeName( const ::com::sun::star::uno::Any& aAny, + static sal_Bool _getCodeName( const ::com::sun::star::uno::Any& aAny, String& rCodeName ); public: XMLCodeNameProvider( ScDocument* pDoc ); virtual ~XMLCodeNameProvider(); - virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) + virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) - throw (::com::sun::star::container::NoSuchElementException, - ::com::sun::star::lang::WrappedTargetException, + throw (::com::sun::star::container::NoSuchElementException, + ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) diff --git a/sc/source/filter/xml/XMLColumnRowGroupExport.cxx b/sc/source/filter/xml/XMLColumnRowGroupExport.cxx index bc53d9a373b2..2ce898512f10 100644 --- a/sc/source/filter/xml/XMLColumnRowGroupExport.cxx +++ b/sc/source/filter/xml/XMLColumnRowGroupExport.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 @@ -90,9 +90,9 @@ sal_Bool ScMyOpenCloseColumnRowGroup::IsGroupStart(const sal_Int32 nField) sal_Int32 nItrField = aItr->nField; if ( nItrField < nField ) { - // #103327# when used to find repeated rows at the beginning of a group, - // aTableStart may contain entries before nField. They must be skipped here - // (they will be used for OpenGroups later in the right order). + // #103327# when used to find repeated rows at the beginning of a group, + // aTableStart may contain entries before nField. They must be skipped here + // (they will be used for OpenGroups later in the right order). ScMyColumnRowGroupVec::iterator aEnd(aTableStart.end()); while ( aItr != aEnd && nItrField < nField ) diff --git a/sc/source/filter/xml/XMLColumnRowGroupExport.hxx b/sc/source/filter/xml/XMLColumnRowGroupExport.hxx index 37608b737f5e..f0d3d525b224 100644 --- a/sc/source/filter/xml/XMLColumnRowGroupExport.hxx +++ b/sc/source/filter/xml/XMLColumnRowGroupExport.hxx @@ -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 @@ -35,9 +35,9 @@ struct ScMyColumnRowGroup { - sal_Int32 nField; - sal_Int16 nLevel; - sal_Bool bDisplay; + sal_Int32 nField; + sal_Int16 nLevel; + sal_Bool bDisplay; ScMyColumnRowGroup(); sal_Bool operator< (const ScMyColumnRowGroup& rGroup) const; @@ -49,10 +49,10 @@ typedef std::list <sal_Int32> ScMyFieldGroupVec; class ScXMLExport; class ScMyOpenCloseColumnRowGroup { - ScXMLExport& rExport; - const rtl::OUString rName; - ScMyColumnRowGroupVec aTableStart; - ScMyFieldGroupVec aTableEnd; + ScXMLExport& rExport; + const rtl::OUString rName; + ScMyColumnRowGroupVec aTableStart; + ScMyFieldGroupVec aTableEnd; void OpenGroup(const ScMyColumnRowGroup& rGroup); void CloseGroup(); diff --git a/sc/source/filter/xml/XMLConsolidationContext.cxx b/sc/source/filter/xml/XMLConsolidationContext.cxx index f075dfc68129..157b263c473c 100644 --- a/sc/source/filter/xml/XMLConsolidationContext.cxx +++ b/sc/source/filter/xml/XMLConsolidationContext.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 @@ -60,15 +60,15 @@ ScXMLConsolidationContext::ScXMLConsolidationContext( rImport.LockSolarMutex(); if( !xAttrList.is() ) return; - sal_Int16 nAttrCount = xAttrList->getLength(); - const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetConsolidationAttrTokenMap(); + sal_Int16 nAttrCount = xAttrList->getLength(); + const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetConsolidationAttrTokenMap(); for( sal_Int16 nIndex = 0; nIndex < nAttrCount; ++nIndex ) { - const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); - const rtl::OUString& sValue (xAttrList->getValueByIndex( nIndex )); + const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); + const rtl::OUString& sValue (xAttrList->getValueByIndex( nIndex )); OUString aLocalName; - USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); + USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -130,7 +130,7 @@ void ScXMLConsolidationContext::EndElement() if ( !ScRangeStringConverter::GetAreaFromString( *ppAreas[ nIndex ], sSourceList, GetScImport().GetDocument(), ::formula::FormulaGrammar::CONV_OOO, nOffset ) ) { - bError = sal_True; //! handle error + bError = sal_True; //! handle error } } diff --git a/sc/source/filter/xml/XMLConsolidationContext.hxx b/sc/source/filter/xml/XMLConsolidationContext.hxx index a059c1309f04..d20bba79eb8f 100644 --- a/sc/source/filter/xml/XMLConsolidationContext.hxx +++ b/sc/source/filter/xml/XMLConsolidationContext.hxx @@ -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 @@ -41,16 +41,16 @@ class ScXMLImport; class ScXMLConsolidationContext : public SvXMLImportContext { private: - ::rtl::OUString sSourceList; - ::rtl::OUString sUseLabel; - ScAddress aTargetAddr; - ScSubTotalFunc eFunction; - sal_Bool bLinkToSource; - sal_Bool bTargetAddr; + ::rtl::OUString sSourceList; + ::rtl::OUString sUseLabel; + ScAddress aTargetAddr; + ScSubTotalFunc eFunction; + sal_Bool bLinkToSource; + sal_Bool bTargetAddr; protected: - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } + ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLConsolidationContext( @@ -59,14 +59,14 @@ public: const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); - virtual ~ScXMLConsolidationContext(); + virtual ~ScXMLConsolidationContext(); - virtual SvXMLImportContext* CreateChildContext( + virtual SvXMLImportContext* CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); - virtual void EndElement(); + virtual void EndElement(); }; diff --git a/sc/source/filter/xml/XMLConverter.cxx b/sc/source/filter/xml/XMLConverter.cxx index ee6a345fdc11..28b0caf5efa5 100644 --- a/sc/source/filter/xml/XMLConverter.cxx +++ b/sc/source/filter/xml/XMLConverter.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 @@ -49,7 +49,7 @@ using namespace xmloff::token; //___________________________________________________________________ -ScDocument* ScXMLConverter::GetScDocument( uno::Reference< frame::XModel > xModel ) +ScDocument* ScXMLConverter::GetScDocument( uno::Reference< frame::XModel > xModel ) { if (xModel.is()) { @@ -128,19 +128,19 @@ void ScXMLConverter::GetStringFromFunction( OUString sFuncStr; switch( eFunction ) { - case sheet::GeneralFunction_AUTO: sFuncStr = GetXMLToken( XML_AUTO ); break; - case sheet::GeneralFunction_AVERAGE: sFuncStr = GetXMLToken( XML_AVERAGE ); break; - case sheet::GeneralFunction_COUNT: sFuncStr = GetXMLToken( XML_COUNT ); break; - case sheet::GeneralFunction_COUNTNUMS: sFuncStr = GetXMLToken( XML_COUNTNUMS ); break; - case sheet::GeneralFunction_MAX: sFuncStr = GetXMLToken( XML_MAX ); break; - case sheet::GeneralFunction_MIN: sFuncStr = GetXMLToken( XML_MIN ); break; - case sheet::GeneralFunction_NONE: sFuncStr = GetXMLToken( XML_NONE ); break; - case sheet::GeneralFunction_PRODUCT: sFuncStr = GetXMLToken( XML_PRODUCT ); break; - case sheet::GeneralFunction_STDEV: sFuncStr = GetXMLToken( XML_STDEV ); break; - case sheet::GeneralFunction_STDEVP: sFuncStr = GetXMLToken( XML_STDEVP ); break; - case sheet::GeneralFunction_SUM: sFuncStr = GetXMLToken( XML_SUM ); break; - case sheet::GeneralFunction_VAR: sFuncStr = GetXMLToken( XML_VAR ); break; - case sheet::GeneralFunction_VARP: sFuncStr = GetXMLToken( XML_VARP ); break; + case sheet::GeneralFunction_AUTO: sFuncStr = GetXMLToken( XML_AUTO ); break; + case sheet::GeneralFunction_AVERAGE: sFuncStr = GetXMLToken( XML_AVERAGE ); break; + case sheet::GeneralFunction_COUNT: sFuncStr = GetXMLToken( XML_COUNT ); break; + case sheet::GeneralFunction_COUNTNUMS: sFuncStr = GetXMLToken( XML_COUNTNUMS ); break; + case sheet::GeneralFunction_MAX: sFuncStr = GetXMLToken( XML_MAX ); break; + case sheet::GeneralFunction_MIN: sFuncStr = GetXMLToken( XML_MIN ); break; + case sheet::GeneralFunction_NONE: sFuncStr = GetXMLToken( XML_NONE ); break; + case sheet::GeneralFunction_PRODUCT: sFuncStr = GetXMLToken( XML_PRODUCT ); break; + case sheet::GeneralFunction_STDEV: sFuncStr = GetXMLToken( XML_STDEV ); break; + case sheet::GeneralFunction_STDEVP: sFuncStr = GetXMLToken( XML_STDEVP ); break; + case sheet::GeneralFunction_SUM: sFuncStr = GetXMLToken( XML_SUM ); break; + case sheet::GeneralFunction_VAR: sFuncStr = GetXMLToken( XML_VAR ); break; + case sheet::GeneralFunction_VARP: sFuncStr = GetXMLToken( XML_VARP ); break; default: { // added to avoid warnings @@ -157,18 +157,18 @@ void ScXMLConverter::GetStringFromFunction( OUString sFuncStr; switch( eFunction ) { - case SUBTOTAL_FUNC_AVE: sFuncStr = GetXMLToken( XML_AVERAGE ); break; - case SUBTOTAL_FUNC_CNT: sFuncStr = GetXMLToken( XML_COUNT ); break; - case SUBTOTAL_FUNC_CNT2: sFuncStr = GetXMLToken( XML_COUNTNUMS ); break; - case SUBTOTAL_FUNC_MAX: sFuncStr = GetXMLToken( XML_MAX ); break; - case SUBTOTAL_FUNC_MIN: sFuncStr = GetXMLToken( XML_MIN ); break; - case SUBTOTAL_FUNC_NONE: sFuncStr = GetXMLToken( XML_NONE ); break; - case SUBTOTAL_FUNC_PROD: sFuncStr = GetXMLToken( XML_PRODUCT ); break; - case SUBTOTAL_FUNC_STD: sFuncStr = GetXMLToken( XML_STDEV ); break; - case SUBTOTAL_FUNC_STDP: sFuncStr = GetXMLToken( XML_STDEVP ); break; - case SUBTOTAL_FUNC_SUM: sFuncStr = GetXMLToken( XML_SUM ); break; - case SUBTOTAL_FUNC_VAR: sFuncStr = GetXMLToken( XML_VAR ); break; - case SUBTOTAL_FUNC_VARP: sFuncStr = GetXMLToken( XML_VARP ); break; + case SUBTOTAL_FUNC_AVE: sFuncStr = GetXMLToken( XML_AVERAGE ); break; + case SUBTOTAL_FUNC_CNT: sFuncStr = GetXMLToken( XML_COUNT ); break; + case SUBTOTAL_FUNC_CNT2: sFuncStr = GetXMLToken( XML_COUNTNUMS ); break; + case SUBTOTAL_FUNC_MAX: sFuncStr = GetXMLToken( XML_MAX ); break; + case SUBTOTAL_FUNC_MIN: sFuncStr = GetXMLToken( XML_MIN ); break; + case SUBTOTAL_FUNC_NONE: sFuncStr = GetXMLToken( XML_NONE ); break; + case SUBTOTAL_FUNC_PROD: sFuncStr = GetXMLToken( XML_PRODUCT ); break; + case SUBTOTAL_FUNC_STD: sFuncStr = GetXMLToken( XML_STDEV ); break; + case SUBTOTAL_FUNC_STDP: sFuncStr = GetXMLToken( XML_STDEVP ); break; + case SUBTOTAL_FUNC_SUM: sFuncStr = GetXMLToken( XML_SUM ); break; + case SUBTOTAL_FUNC_VAR: sFuncStr = GetXMLToken( XML_VAR ); break; + case SUBTOTAL_FUNC_VARP: sFuncStr = GetXMLToken( XML_VARP ); break; } ScRangeStringConverter::AssignString( rString, sFuncStr, bAppendStr ); } @@ -333,7 +333,7 @@ void ScXMLConverter::ParseFormula(OUString& sFormula, const sal_Bool bIsFormula) ++nCountBraces; else if (sFormula[i] == ']') nCountBraces--; - else if ((sFormula[i] != '.') || + else if ((sFormula[i] != '.') || ((nCountBraces == 0) && bIsFormula) || !((chPrevious == '[') || (chPrevious == ':') || (chPrevious == ' ') || (chPrevious == '='))) sBuffer.append(sFormula[i]); diff --git a/sc/source/filter/xml/XMLConverter.hxx b/sc/source/filter/xml/XMLConverter.hxx index f8d6f40ef6d0..037117f347ab 100644 --- a/sc/source/filter/xml/XMLConverter.hxx +++ b/sc/source/filter/xml/XMLConverter.hxx @@ -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 @@ -50,11 +50,11 @@ class SvXMLUnitConverter; class ScXMLConverter { public: - inline ScXMLConverter() {} - inline ~ScXMLConverter() {} + inline ScXMLConverter() {} + inline ~ScXMLConverter() {} // helper methods - static ScDocument* GetScDocument( + static ScDocument* GetScDocument( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > xModel ); // IMPORT: GeneralFunction / ScSubTotalFunc @@ -65,11 +65,11 @@ public: const ::rtl::OUString& rString ); // EXPORT: GeneralFunction / ScSubTotalFunc - static void GetStringFromFunction( + static void GetStringFromFunction( ::rtl::OUString& rString, const ::com::sun::star::sheet::GeneralFunction eFunction, sal_Bool bAppendStr = sal_False ); - static void GetStringFromFunction( + static void GetStringFromFunction( ::rtl::OUString& rString, const ScSubTotalFunc eFunction, sal_Bool bAppendStr = sal_False ); @@ -80,7 +80,7 @@ public: const ::rtl::OUString& rString ); // EXPORT: DataPilotFieldOrientation - static void GetStringFromOrientation( + static void GetStringFromOrientation( ::rtl::OUString& rString, const ::com::sun::star::sheet::DataPilotFieldOrientation eOrientation, sal_Bool bAppendStr = sal_False ); @@ -89,27 +89,27 @@ public: static ScDetectiveObjType GetDetObjTypeFromString( const ::rtl::OUString& rString ); - static sal_Bool GetDetOpTypeFromString( + static sal_Bool GetDetOpTypeFromString( ScDetOpType& rDetOpType, const ::rtl::OUString& rString ); // EXPORT: Detective - static void GetStringFromDetObjType( + static void GetStringFromDetObjType( ::rtl::OUString& rString, const ScDetectiveObjType eObjType, sal_Bool bAppendStr = sal_False ); - static void GetStringFromDetOpType( + static void GetStringFromDetOpType( ::rtl::OUString& rString, const ScDetOpType eOpType, sal_Bool bAppendStr = sal_False ); // IMPORT: Formulas - static void ParseFormula( + static void ParseFormula( ::rtl::OUString& sFormula, const sal_Bool bIsFormula = sal_True); // EXPORT: Core Date Time - static void ConvertDateTimeToString(const DateTime& aDateTime, rtl::OUStringBuffer& sDate); - static void ConvertCoreToAPIDateTime(const DateTime& aDateTime, com::sun::star::util::DateTime& rDateTime); + static void ConvertDateTimeToString(const DateTime& aDateTime, rtl::OUStringBuffer& sDate); + static void ConvertCoreToAPIDateTime(const DateTime& aDateTime, com::sun::star::util::DateTime& rDateTime); static void ConvertAPIToCoreDateTime(const com::sun::star::util::DateTime& aDateTime, DateTime& rDateTime); }; diff --git a/sc/source/filter/xml/XMLDDELinksContext.cxx b/sc/source/filter/xml/XMLDDELinksContext.cxx index 792c19b5e30a..269861a5c745 100644 --- a/sc/source/filter/xml/XMLDDELinksContext.cxx +++ b/sc/source/filter/xml/XMLDDELinksContext.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 @@ -165,10 +165,10 @@ void ScXMLDDELinkContext::EndElement() { bool bSizeMatch = (static_cast<size_t>(nColumns * nRows) == aDDELinkTable.size()); DBG_ASSERT( bSizeMatch, "ScXMLDDELinkContext::EndElement: matrix dimension doesn't match cells count"); - // Excel writes bad ODF in that it does not write the + // Excel writes bad ODF in that it does not write the // table:number-columns-repeated attribute of the - // <table:table-column> element, but apparently uses the number of - // <table:table-cell> elements within a <table:table-row> element to + // <table:table-column> element, but apparently uses the number of + // <table:table-cell> elements within a <table:table-row> element to // determine the column count instead. Be lenient ... if (!bSizeMatch && nColumns == 1) { @@ -220,14 +220,14 @@ ScXMLDDESourceContext::ScXMLDDESourceContext( ScXMLImport& rImport, { if( !xAttrList.is() ) return; - sal_Int16 nAttrCount = xAttrList->getLength(); + sal_Int16 nAttrCount = xAttrList->getLength(); for( sal_Int16 nIndex = 0; nIndex < nAttrCount; ++nIndex ) { - const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); - const rtl::OUString& sValue (xAttrList->getValueByIndex( nIndex )); + const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); + const rtl::OUString& sValue (xAttrList->getValueByIndex( nIndex )); OUString aLocalName; - USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); + USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); if (nPrefix == XML_NAMESPACE_OFFICE) { @@ -322,14 +322,14 @@ ScXMLDDEColumnContext::ScXMLDDEColumnContext( ScXMLImport& rImport, if( !xAttrList.is() ) return; sal_Int32 nCols(1); - sal_Int16 nAttrCount = xAttrList->getLength(); + sal_Int16 nAttrCount = xAttrList->getLength(); for( sal_Int16 nIndex = 0; nIndex < nAttrCount; ++nIndex ) { - const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); - const rtl::OUString& sValue (xAttrList->getValueByIndex( nIndex )); + const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); + const rtl::OUString& sValue (xAttrList->getValueByIndex( nIndex )); OUString aLocalName; - USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); + USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); if (nPrefix == XML_NAMESPACE_TABLE) if (IsXMLToken(aLocalName, XML_NUMBER_COLUMNS_REPEATED)) @@ -368,14 +368,14 @@ ScXMLDDERowContext::ScXMLDDERowContext( ScXMLImport& rImport, { if( !xAttrList.is() ) return; - sal_Int16 nAttrCount = xAttrList->getLength(); + sal_Int16 nAttrCount = xAttrList->getLength(); for( sal_Int16 nIndex = 0; nIndex < nAttrCount; ++nIndex ) { - const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); - const rtl::OUString& sValue (xAttrList->getValueByIndex( nIndex )); + const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); + const rtl::OUString& sValue (xAttrList->getValueByIndex( nIndex )); OUString aLocalName; - USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); + USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); if (nPrefix == XML_NAMESPACE_TABLE) if (IsXMLToken(aLocalName, XML_NUMBER_ROWS_REPEATED)) @@ -427,14 +427,14 @@ ScXMLDDECellContext::ScXMLDDECellContext( ScXMLImport& rImport, { if( !xAttrList.is() ) return; - sal_Int16 nAttrCount = xAttrList->getLength(); + sal_Int16 nAttrCount = xAttrList->getLength(); for( sal_Int16 nIndex = 0; nIndex < nAttrCount; ++nIndex ) { - const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); - const rtl::OUString& sTempValue (xAttrList->getValueByIndex( nIndex )); + const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); + const rtl::OUString& sTempValue (xAttrList->getValueByIndex( nIndex )); OUString aLocalName; - USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); + USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); if (nPrefix == XML_NAMESPACE_OFFICE) { diff --git a/sc/source/filter/xml/XMLDDELinksContext.hxx b/sc/source/filter/xml/XMLDDELinksContext.hxx index d296df83be2c..2ecb49370131 100644 --- a/sc/source/filter/xml/XMLDDELinksContext.hxx +++ b/sc/source/filter/xml/XMLDDELinksContext.hxx @@ -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 @@ -67,15 +67,15 @@ typedef std::list<ScDDELinkCell> ScDDELinkCells; class ScXMLDDELinkContext : public SvXMLImportContext { - ScDDELinkCells aDDELinkTable; - ScDDELinkCells aDDELinkRow; - rtl::OUString sApplication; - rtl::OUString sTopic; - rtl::OUString sItem; - sal_Int32 nPosition; - sal_Int32 nColumns; - sal_Int32 nRows; - sal_uInt8 nMode; + ScDDELinkCells aDDELinkTable; + ScDDELinkCells aDDELinkRow; + rtl::OUString sApplication; + rtl::OUString sTopic; + rtl::OUString sItem; + sal_Int32 nPosition; + sal_Int32 nColumns; + sal_Int32 nRows; + sal_uInt8 nMode; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -176,8 +176,8 @@ public: class ScXMLDDERowContext : public SvXMLImportContext { - ScXMLDDELinkContext* pDDELink; - sal_Int32 nRows; + ScXMLDDELinkContext* pDDELink; + sal_Int32 nRows; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -200,12 +200,12 @@ public: class ScXMLDDECellContext : public SvXMLImportContext { - rtl::OUString sValue; - double fValue; - sal_Int32 nCells; - sal_Bool bString; - sal_Bool bString2; - sal_Bool bEmpty; + rtl::OUString sValue; + double fValue; + sal_Int32 nCells; + sal_Bool bString; + sal_Bool bString2; + sal_Bool bEmpty; ScXMLDDELinkContext* pDDELink; diff --git a/sc/source/filter/xml/XMLDetectiveContext.cxx b/sc/source/filter/xml/XMLDetectiveContext.cxx index 131dea72379d..02a5ea00b549 100644 --- a/sc/source/filter/xml/XMLDetectiveContext.cxx +++ b/sc/source/filter/xml/XMLDetectiveContext.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 @@ -101,8 +101,8 @@ SvXMLImportContext *ScXMLDetectiveContext::CreateChildContext( const OUString& rLName, const uno::Reference< xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext* pContext = NULL; - const SvXMLTokenMap& rTokenMap = GetScImport().GetDetectiveElemTokenMap(); + SvXMLImportContext* pContext = NULL; + const SvXMLTokenMap& rTokenMap = GetScImport().GetDetectiveElemTokenMap(); switch( rTokenMap.Get( nPrefix, rLName ) ) { @@ -139,15 +139,15 @@ ScXMLDetectiveHighlightedContext::ScXMLDetectiveHighlightedContext( { if( !xAttrList.is() ) return; - sal_Int16 nAttrCount = xAttrList->getLength(); - const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDetectiveHighlightedAttrTokenMap(); + sal_Int16 nAttrCount = xAttrList->getLength(); + const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDetectiveHighlightedAttrTokenMap(); for( sal_Int16 nIndex = 0; nIndex < nAttrCount; ++nIndex ) { - const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); - const rtl::OUString& sValue (xAttrList->getValueByIndex( nIndex )); + const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); + const rtl::OUString& sValue (xAttrList->getValueByIndex( nIndex )); OUString aLocalName; - USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); + USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -219,15 +219,15 @@ ScXMLDetectiveOperationContext::ScXMLDetectiveOperationContext( { if( !xAttrList.is() ) return; - sal_Int16 nAttrCount = xAttrList->getLength(); - const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDetectiveOperationAttrTokenMap(); + sal_Int16 nAttrCount = xAttrList->getLength(); + const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDetectiveOperationAttrTokenMap(); for( sal_Int16 nIndex = 0; nIndex < nAttrCount; ++nIndex ) { - const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); - const rtl::OUString& sValue (xAttrList->getValueByIndex( nIndex )); + const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); + const rtl::OUString& sValue (xAttrList->getValueByIndex( nIndex )); OUString aLocalName; - USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); + USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { diff --git a/sc/source/filter/xml/XMLDetectiveContext.hxx b/sc/source/filter/xml/XMLDetectiveContext.hxx index 4e2d6b402574..67be1637ba01 100644 --- a/sc/source/filter/xml/XMLDetectiveContext.hxx +++ b/sc/source/filter/xml/XMLDetectiveContext.hxx @@ -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 @@ -43,9 +43,9 @@ class ScXMLImport; struct ScMyImpDetectiveObj { - ScRange aSourceRange; - ScDetectiveObjType eObjType; - sal_Bool bHasError; + ScRange aSourceRange; + ScDetectiveObjType eObjType; + sal_Bool bHasError; ScMyImpDetectiveObj(); }; @@ -57,12 +57,12 @@ typedef ::std::vector< ScMyImpDetectiveObj > ScMyImpDetectiveObjVec; struct ScMyImpDetectiveOp { - ScAddress aPosition; - ScDetOpType eOpType; - sal_Int32 nIndex; + ScAddress aPosition; + ScDetOpType eOpType; + sal_Int32 nIndex; - inline ScMyImpDetectiveOp() : nIndex( -1 ) {} - sal_Bool operator<(const ScMyImpDetectiveOp& rDetOp) const; + inline ScMyImpDetectiveOp() : nIndex( -1 ) {} + sal_Bool operator<(const ScMyImpDetectiveOp& rDetOp) const; }; typedef ::std::list< ScMyImpDetectiveOp > ScMyImpDetectiveOpList; @@ -70,17 +70,17 @@ typedef ::std::list< ScMyImpDetectiveOp > ScMyImpDetectiveOpList; class ScMyImpDetectiveOpArray { private: - ScMyImpDetectiveOpList aDetectiveOpList; + ScMyImpDetectiveOpList aDetectiveOpList; public: - inline ScMyImpDetectiveOpArray() : - aDetectiveOpList() {} + inline ScMyImpDetectiveOpArray() : + aDetectiveOpList() {} - inline void AddDetectiveOp( const ScMyImpDetectiveOp& rDetOp ) + inline void AddDetectiveOp( const ScMyImpDetectiveOp& rDetOp ) { aDetectiveOpList.push_back( rDetOp ); } - void Sort(); - sal_Bool GetFirstOp( ScMyImpDetectiveOp& rDetOp ); + void Sort(); + sal_Bool GetFirstOp( ScMyImpDetectiveOp& rDetOp ); }; @@ -89,10 +89,10 @@ public: class ScXMLDetectiveContext : public SvXMLImportContext { private: - ScMyImpDetectiveObjVec* pDetectiveObjVec; + ScMyImpDetectiveObjVec* pDetectiveObjVec; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } + ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLDetectiveContext( @@ -101,14 +101,14 @@ public: const ::rtl::OUString& rLName, ScMyImpDetectiveObjVec* pNewDetectiveObjVec ); - virtual ~ScXMLDetectiveContext(); + virtual ~ScXMLDetectiveContext(); - virtual SvXMLImportContext* CreateChildContext( + virtual SvXMLImportContext* CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); - virtual void EndElement(); + virtual void EndElement(); }; @@ -117,12 +117,12 @@ public: class ScXMLDetectiveHighlightedContext : public SvXMLImportContext { private: - ScMyImpDetectiveObjVec* pDetectiveObjVec; - ScMyImpDetectiveObj aDetectiveObj; - sal_Bool bValid; + ScMyImpDetectiveObjVec* pDetectiveObjVec; + ScMyImpDetectiveObj aDetectiveObj; + sal_Bool bValid; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } + ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLDetectiveHighlightedContext( @@ -132,14 +132,14 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, ScMyImpDetectiveObjVec* pNewDetectiveObjVec ); - virtual ~ScXMLDetectiveHighlightedContext(); + virtual ~ScXMLDetectiveHighlightedContext(); - virtual SvXMLImportContext* CreateChildContext( + virtual SvXMLImportContext* CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); - virtual void EndElement(); + virtual void EndElement(); }; @@ -148,11 +148,11 @@ public: class ScXMLDetectiveOperationContext : public SvXMLImportContext { private: - ScMyImpDetectiveOp aDetectiveOp; - sal_Bool bHasType; + ScMyImpDetectiveOp aDetectiveOp; + sal_Bool bHasType; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } + ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLDetectiveOperationContext( @@ -161,14 +161,14 @@ public: const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); - virtual ~ScXMLDetectiveOperationContext(); + virtual ~ScXMLDetectiveOperationContext(); - virtual SvXMLImportContext* CreateChildContext( + virtual SvXMLImportContext* CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); - virtual void EndElement(); + virtual void EndElement(); }; diff --git a/sc/source/filter/xml/XMLEmptyContext.cxx b/sc/source/filter/xml/XMLEmptyContext.cxx index 20bec1f097b2..6f5a74ad2698 100644 --- a/sc/source/filter/xml/XMLEmptyContext.cxx +++ b/sc/source/filter/xml/XMLEmptyContext.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 diff --git a/sc/source/filter/xml/XMLEmptyContext.hxx b/sc/source/filter/xml/XMLEmptyContext.hxx index 1b090c719281..0bfadc3d5e9e 100644 --- a/sc/source/filter/xml/XMLEmptyContext.hxx +++ b/sc/source/filter/xml/XMLEmptyContext.hxx @@ -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 @@ -34,8 +34,8 @@ class ScXMLImport; class ScXMLEmptyContext : public SvXMLImportContext { - rtl::OUString sPrintRanges; - sal_Bool bStartFormPage; + rtl::OUString sPrintRanges; + sal_Bool bStartFormPage; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } diff --git a/sc/source/filter/xml/XMLExportDDELinks.cxx b/sc/source/filter/xml/XMLExportDDELinks.cxx index f0b80840098c..11796bae510e 100644 --- a/sc/source/filter/xml/XMLExportDDELinks.cxx +++ b/sc/source/filter/xml/XMLExportDDELinks.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 diff --git a/sc/source/filter/xml/XMLExportDDELinks.hxx b/sc/source/filter/xml/XMLExportDDELinks.hxx index f7fd55574cf9..9f09d6236029 100644 --- a/sc/source/filter/xml/XMLExportDDELinks.hxx +++ b/sc/source/filter/xml/XMLExportDDELinks.hxx @@ -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 @@ -36,12 +36,12 @@ class ScXMLExport; class ScXMLExportDDELinks { - ScXMLExport& rExport; + ScXMLExport& rExport; - sal_Bool CellsEqual(const sal_Bool bPrevEmpty, const sal_Bool bPrevString, const String& sPrevValue, const double& fPrevValue, + sal_Bool CellsEqual(const sal_Bool bPrevEmpty, const sal_Bool bPrevString, const String& sPrevValue, const double& fPrevValue, const sal_Bool bEmpty, const sal_Bool bString, const String& sValue, const double& fValue); - void WriteCell(const sal_Bool bEmpty, const sal_Bool bString, const String& sValue, const double& fValue, const sal_Int32 nRepeat); - void WriteTable(const sal_Int32 nPos); + void WriteCell(const sal_Bool bEmpty, const sal_Bool bString, const String& sValue, const double& fValue, const sal_Int32 nRepeat); + void WriteTable(const sal_Int32 nPos); public: ScXMLExportDDELinks(ScXMLExport& rExport); ~ScXMLExportDDELinks(); diff --git a/sc/source/filter/xml/XMLExportDataPilot.cxx b/sc/source/filter/xml/XMLExportDataPilot.cxx index 0bfdafc4d566..6cb026c42531 100644 --- a/sc/source/filter/xml/XMLExportDataPilot.cxx +++ b/sc/source/filter/xml/XMLExportDataPilot.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 @@ -181,7 +181,7 @@ void ScXMLExportDataPilot::WriteDPFilter(const ScQueryParam& aQueryParam) if (nQueryEntryCount) { // There is never a target range in a data pilot. -/* if (!aQueryParam.bInplace) +/* if (!aQueryParam.bInplace) { ScAddress aTargetAddress(aQueryParam.nDestCol, aQueryParam.nDestRow, aQueryParam.nDestTab); rtl::OUString sAddress; diff --git a/sc/source/filter/xml/XMLExportDataPilot.hxx b/sc/source/filter/xml/XMLExportDataPilot.hxx index c1b9426f552d..2fa3187efa59 100644 --- a/sc/source/filter/xml/XMLExportDataPilot.hxx +++ b/sc/source/filter/xml/XMLExportDataPilot.hxx @@ -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 @@ -46,8 +46,8 @@ struct ScQueryParam; class ScXMLExportDataPilot { - ScXMLExport& rExport; - ScDocument* pDoc; + ScXMLExport& rExport; + ScDocument* pDoc; rtl::OUString getDPOperatorXML(const ScQueryOp aFilterOperator, const sal_Bool bUseRegularExpressions, const sal_Bool bIsString, const double dVal, const String& sVal) const; diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx index 530ea31e47c7..a8e6aa178809 100644 --- a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx +++ b/sc/source/filter/xml/XMLExportDatabaseRanges.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 @@ -423,7 +423,7 @@ void ScXMLExportDatabaseRanges::WriteSortDescriptor(const uno::Sequence <beans:: else if (aSortProperties[i].Name.compareToAscii(SC_UNONAME_COPYOUT) == 0) bCopyOutputData = ::cppu::any2bool(aSortProperties[i].Value); // no longer supported -/* else if (aSortProperties[i].Name.compareToAscii(SC_UNONAME_ISCASE) == 0) +/* else if (aSortProperties[i].Name.compareToAscii(SC_UNONAME_ISCASE) == 0) bIsCaseSensitive = ::cppu::any2bool(aSortProperties[i].Value);*/ else if (aSortProperties[i].Name.compareToAscii(SC_UNONAME_ISULIST) == 0) bIsUserListEnabled = ::cppu::any2bool(aSortProperties[i].Value); @@ -434,7 +434,7 @@ void ScXMLExportDatabaseRanges::WriteSortDescriptor(const uno::Sequence <beans:: else if (aSortProperties[i].Name.compareToAscii(SC_UNONAME_SORTFLD) == 0) aSortProperties[i].Value >>= aSortFields; // no longer supported -/* else if (aSortProperties[i].Name.compareToAscii(SC_UNONAME_COLLLOC) == 0) +/* else if (aSortProperties[i].Name.compareToAscii(SC_UNONAME_COLLLOC) == 0) aSortProperties[i].Value >>= aCollatorLocale; else if (aSortProperties[i].Name.compareToAscii(SC_UNONAME_COLLALG) == 0) aSortProperties[i].Value >>= sCollatorAlgorithm;*/ @@ -451,8 +451,8 @@ void ScXMLExportDatabaseRanges::WriteSortDescriptor(const uno::Sequence <beans:: rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_TARGET_RANGE_ADDRESS, sOUCellAddress); } // no longer supported -// if (bIsCaseSensitive) -// rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE, XML_TRUE); +// if (bIsCaseSensitive) +// rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE, XML_TRUE); if (aSortFields[0].IsCaseSensitive) rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE, XML_TRUE); @@ -464,7 +464,7 @@ void ScXMLExportDatabaseRanges::WriteSortDescriptor(const uno::Sequence <beans:: } #endif // no longer supported -/* if (aCollatorLocale.Language.getLength()) +/* if (aCollatorLocale.Language.getLength()) rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_LANGUAGE, aCollatorLocale.Language); if (aCollatorLocale.Country.getLength()) rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_COUNTRY, aCollatorLocale.Country); @@ -530,9 +530,9 @@ void ScXMLExportDatabaseRanges::WriteSubTotalDescriptor(const com::sun::star::un if (nSubTotalFields > 0) { uno::Reference <beans::XPropertySet> xPropertySet (xSubTotalDescriptor, uno::UNO_QUERY); -// sal_Bool bEnableUserSortList = sal_False; -// sal_Bool bSortAscending = sal_True; -// sal_Int32 nUserSortListIndex = 0; +// sal_Bool bEnableUserSortList = sal_False; +// sal_Bool bSortAscending = sal_True; +// sal_Int32 nUserSortListIndex = 0; if (xPropertySet.is()) { if (!::cppu::any2bool(xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_BINDFMT))))) @@ -541,9 +541,9 @@ void ScXMLExportDatabaseRanges::WriteSubTotalDescriptor(const com::sun::star::un rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_PAGE_BREAKS_ON_GROUP_CHANGE, XML_TRUE); if (::cppu::any2bool(xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_ISCASE))))) rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE, XML_TRUE); -// bSortAscending = ::cppu::any2bool(xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_SORTASCENDING)))); -// if (::cppu::any2bool(xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ENABLEUSERSORTLIST))))) -// xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_USERSORTLISTINDEX))) >>= nUserSortListIndex; +// bSortAscending = ::cppu::any2bool(xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_SORTASCENDING)))); +// if (::cppu::any2bool(xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ENABLEUSERSORTLIST))))) +// xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_USERSORTLISTINDEX))) >>= nUserSortListIndex; } SvXMLElementExport aElemSTRs(rExport, XML_NAMESPACE_TABLE, XML_SUBTOTAL_RULES, sal_True, sal_True); rExport.CheckAttrList(); @@ -642,7 +642,7 @@ void ScXMLExportDatabaseRanges::WriteDatabaseRanges(const com::sun::star::uno::R if (::cppu::any2bool(xPropertySetDatabaseRange->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_STRIPDAT))))) rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_HAS_PERSISTENT_DATA, XML_FALSE); } - + uno::Reference< sheet::XSheetFilterDescriptor2 > xSheetFilterDescriptor( xDatabaseRange->getFilterDescriptor(), uno::UNO_QUERY ); uno::Sequence <beans::PropertyValue> aSortProperties(xDatabaseRange->getSortDescriptor()); @@ -655,7 +655,7 @@ void ScXMLExportDatabaseRanges::WriteDatabaseRanges(const com::sun::star::uno::R rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_CONTAINS_HEADER, XML_FALSE); // #98317#; there is no orientation on the filter -/* table::TableOrientation eFilterOrient(table::TableOrientation_ROWS); +/* table::TableOrientation eFilterOrient(table::TableOrientation_ROWS); if (::cppu::any2bool(xFilterProperties->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_ORIENT))))) eFilterOrient = table::TableOrientation_ROWS;*/ diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.hxx b/sc/source/filter/xml/XMLExportDatabaseRanges.hxx index 31b27c4c87d2..e4d7813e8424 100644 --- a/sc/source/filter/xml/XMLExportDatabaseRanges.hxx +++ b/sc/source/filter/xml/XMLExportDatabaseRanges.hxx @@ -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 @@ -43,8 +43,8 @@ class ScMyEmptyDatabaseRangesContainer; class ScXMLExportDatabaseRanges { - ScXMLExport& rExport; - ScDocument* pDoc; + ScXMLExport& rExport; + ScDocument* pDoc; void WriteImportDescriptor(const com::sun::star::uno::Sequence <com::sun::star::beans::PropertyValue> aImportDescriptor); rtl::OUString getOperatorXML(const long aFilterOperator, const sal_Bool bUseRegularExpressions) const; diff --git a/sc/source/filter/xml/XMLExportIterator.cxx b/sc/source/filter/xml/XMLExportIterator.cxx index 57b2534ed6ad..d1594b355073 100644 --- a/sc/source/filter/xml/XMLExportIterator.cxx +++ b/sc/source/filter/xml/XMLExportIterator.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 @@ -297,7 +297,7 @@ void ScMyMergedRangesContainer::Sort() sal_Bool ScMyAreaLink::Compare( const ScMyAreaLink& rAreaLink ) const { - return (GetRowCount() == rAreaLink.GetRowCount()) && + return (GetRowCount() == rAreaLink.GetRowCount()) && (sFilter == rAreaLink.sFilter) && (sFilterOptions == rAreaLink.sFilterOptions) && (sURL == rAreaLink.sURL) && @@ -733,7 +733,7 @@ void ScMyNotEmptyCellsIterator::SetMatrixCellData( ScMyCell& rMyCell ) rMyCell.nType = table::CellContentType_FORMULA; break; default: - rMyCell.nType = table::CellContentType_EMPTY; + rMyCell.nType = table::CellContentType_EMPTY; } if (rMyCell.nType == table::CellContentType_FORMULA) @@ -767,7 +767,7 @@ void ScMyNotEmptyCellsIterator::HasAnnotation(ScMyCell& aCell) // test - bypass the API // if (xCellRange.is()) - // aCell.xCell.set(xCellRange->getCellByPosition(aCell.aCellAddress.Column, aCell.aCellAddress.Row)); + // aCell.xCell.set(xCellRange->getCellByPosition(aCell.aCellAddress.Column, aCell.aCellAddress.Row)); } void ScMyNotEmptyCellsIterator::SetCurrentTable(const SCTAB nTable, @@ -817,7 +817,7 @@ void ScMyNotEmptyCellsIterator::SkipTable(SCTAB nSkip) { // Skip entries for a sheet that is copied instead of saving normally. // Cells (including aAnnotations) are handled separately in SetCurrentTable. - + if( pShapes ) pShapes->SkipTable(nSkip); if( pNoteShapes ) @@ -836,7 +836,7 @@ void ScMyNotEmptyCellsIterator::SkipTable(SCTAB nSkip) sal_Bool ScMyNotEmptyCellsIterator::GetNext(ScMyCell& aCell, ScFormatRangeStyles* pCellStyles) { - table::CellAddress aAddress( nCurrentTable, MAXCOL + 1, MAXROW + 1 ); + table::CellAddress aAddress( nCurrentTable, MAXCOL + 1, MAXROW + 1 ); UpdateAddress( aAddress ); if( pShapes ) diff --git a/sc/source/filter/xml/XMLExportIterator.hxx b/sc/source/filter/xml/XMLExportIterator.hxx index 1334e42c3e5c..317546dbb8d3 100644 --- a/sc/source/filter/xml/XMLExportIterator.hxx +++ b/sc/source/filter/xml/XMLExportIterator.hxx @@ -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 @@ -42,10 +42,10 @@ #include "detfunc.hxx" #include "detdata.hxx" -class ScHorizontalCellIterator; -struct ScMyCell; -class ScXMLExport; -class ScFormatRangeStyles; +class ScHorizontalCellIterator; +struct ScMyCell; +class ScXMLExport; +class ScFormatRangeStyles; class ScBaseCell; //============================================================================== @@ -53,47 +53,47 @@ class ScBaseCell; class ScMyIteratorBase { protected: - virtual sal_Bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ) = 0; + virtual sal_Bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ) = 0; public: ScMyIteratorBase(); - virtual ~ScMyIteratorBase(); + virtual ~ScMyIteratorBase(); - virtual void SetCellData( ScMyCell& rMyCell ) = 0; - virtual void Sort() = 0; + virtual void SetCellData( ScMyCell& rMyCell ) = 0; + virtual void Sort() = 0; - virtual void UpdateAddress( ::com::sun::star::table::CellAddress& rCellAddress ); + virtual void UpdateAddress( ::com::sun::star::table::CellAddress& rCellAddress ); }; //============================================================================== struct ScMyShape { - ScAddress aAddress; - ScAddress aEndAddress; + ScAddress aAddress; + ScAddress aEndAddress; com::sun::star::uno::Reference<com::sun::star::drawing::XShape> xShape; sal_Bool operator<(const ScMyShape& aShape) const; }; -typedef std::list<ScMyShape> ScMyShapeList; +typedef std::list<ScMyShape> ScMyShapeList; class ScMyShapesContainer : ScMyIteratorBase { private: - ScMyShapeList aShapeList; + ScMyShapeList aShapeList; protected: - virtual sal_Bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ); + virtual sal_Bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ); public: ScMyShapesContainer(); - virtual ~ScMyShapesContainer(); + virtual ~ScMyShapesContainer(); using ScMyIteratorBase::UpdateAddress; - void AddNewShape(const ScMyShape& aShape); - sal_Bool HasShapes() { return !aShapeList.empty(); } - const ScMyShapeList* GetShapes() { return &aShapeList; } - virtual void SetCellData( ScMyCell& rMyCell ); - virtual void Sort(); + void AddNewShape(const ScMyShape& aShape); + sal_Bool HasShapes() { return !aShapeList.empty(); } + const ScMyShapeList* GetShapes() { return &aShapeList; } + virtual void SetCellData( ScMyCell& rMyCell ); + virtual void Sort(); void SkipTable(SCTAB nSkip); }; @@ -105,24 +105,24 @@ struct ScMyNoteShape sal_Bool operator<(const ScMyNoteShape& aNote) const; }; -typedef std::list<ScMyNoteShape> ScMyNoteShapeList; +typedef std::list<ScMyNoteShape> ScMyNoteShapeList; class ScMyNoteShapesContainer : ScMyIteratorBase { private: - ScMyNoteShapeList aNoteShapeList; + ScMyNoteShapeList aNoteShapeList; protected: - virtual sal_Bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ); + virtual sal_Bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ); public: ScMyNoteShapesContainer(); - virtual ~ScMyNoteShapesContainer(); + virtual ~ScMyNoteShapesContainer(); using ScMyIteratorBase::UpdateAddress; - void AddNewNote(const ScMyNoteShape& aNote); - sal_Bool HasNotes() { return !aNoteShapeList.empty(); } - const ScMyNoteShapeList* GetNotes() { return &aNoteShapeList; } - virtual void SetCellData( ScMyCell& rMyCell ); - virtual void Sort(); + void AddNewNote(const ScMyNoteShape& aNote); + sal_Bool HasNotes() { return !aNoteShapeList.empty(); } + const ScMyNoteShapeList* GetNotes() { return &aNoteShapeList; } + virtual void SetCellData( ScMyCell& rMyCell ); + virtual void Sort(); void SkipTable(SCTAB nSkip); }; @@ -131,27 +131,27 @@ public: struct ScMyMergedRange { com::sun::star::table::CellRangeAddress aCellRange; - sal_Int32 nRows; - sal_Bool bIsFirst; - sal_Bool operator<(const ScMyMergedRange& aRange) const; + sal_Int32 nRows; + sal_Bool bIsFirst; + sal_Bool operator<(const ScMyMergedRange& aRange) const; }; -typedef std::list<ScMyMergedRange> ScMyMergedRangeList; +typedef std::list<ScMyMergedRange> ScMyMergedRangeList; class ScMyMergedRangesContainer : ScMyIteratorBase { private: - ScMyMergedRangeList aRangeList; + ScMyMergedRangeList aRangeList; protected: - virtual sal_Bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ); + virtual sal_Bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ); public: ScMyMergedRangesContainer(); - virtual ~ScMyMergedRangesContainer(); - void AddRange(const com::sun::star::table::CellRangeAddress aMergedRange); + virtual ~ScMyMergedRangesContainer(); + void AddRange(const com::sun::star::table::CellRangeAddress aMergedRange); using ScMyIteratorBase::UpdateAddress; - virtual void SetCellData( ScMyCell& rMyCell ); - virtual void Sort(); // + remove doublets + virtual void SetCellData( ScMyCell& rMyCell ); + virtual void Sort(); // + remove doublets void SkipTable(SCTAB nSkip); }; @@ -159,20 +159,20 @@ public: struct ScMyAreaLink { - ::rtl::OUString sFilter; - ::rtl::OUString sFilterOptions; - ::rtl::OUString sURL; - ::rtl::OUString sSourceStr; + ::rtl::OUString sFilter; + ::rtl::OUString sFilterOptions; + ::rtl::OUString sURL; + ::rtl::OUString sSourceStr; ::com::sun::star::table::CellRangeAddress aDestRange; - sal_Int32 nRefresh; + sal_Int32 nRefresh; - inline ScMyAreaLink() : nRefresh( 0 ) {} + inline ScMyAreaLink() : nRefresh( 0 ) {} - inline sal_Int32 GetColCount() const { return aDestRange.EndColumn - aDestRange.StartColumn + 1; } - inline sal_Int32 GetRowCount() const { return aDestRange.EndRow - aDestRange.StartRow + 1; } + inline sal_Int32 GetColCount() const { return aDestRange.EndColumn - aDestRange.StartColumn + 1; } + inline sal_Int32 GetRowCount() const { return aDestRange.EndRow - aDestRange.StartRow + 1; } - sal_Bool Compare( const ScMyAreaLink& rAreaLink ) const; - sal_Bool operator<(const ScMyAreaLink& rAreaLink ) const; + sal_Bool Compare( const ScMyAreaLink& rAreaLink ) const; + sal_Bool operator<(const ScMyAreaLink& rAreaLink ) const; }; typedef ::std::list< ScMyAreaLink > ScMyAreaLinkList; @@ -180,19 +180,19 @@ typedef ::std::list< ScMyAreaLink > ScMyAreaLinkList; class ScMyAreaLinksContainer : ScMyIteratorBase { private: - ScMyAreaLinkList aAreaLinkList; + ScMyAreaLinkList aAreaLinkList; protected: - virtual sal_Bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ); + virtual sal_Bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ); public: ScMyAreaLinksContainer(); - virtual ~ScMyAreaLinksContainer(); + virtual ~ScMyAreaLinksContainer(); - inline void AddNewAreaLink( const ScMyAreaLink& rAreaLink ) + inline void AddNewAreaLink( const ScMyAreaLink& rAreaLink ) { aAreaLinkList.push_back( rAreaLink ); } using ScMyIteratorBase::UpdateAddress; - virtual void SetCellData( ScMyCell& rMyCell ); - virtual void Sort(); + virtual void SetCellData( ScMyCell& rMyCell ); + virtual void Sort(); void SkipTable(SCTAB nSkip); }; @@ -201,7 +201,7 @@ public: struct ScMyCellRangeAddress : com::sun::star::table::CellRangeAddress { ScMyCellRangeAddress(const com::sun::star::table::CellRangeAddress& rRange); - sal_Bool operator<(const ScMyCellRangeAddress& rCellRangeAddress ) const; + sal_Bool operator<(const ScMyCellRangeAddress& rCellRangeAddress ) const; }; typedef std::list<ScMyCellRangeAddress> ScMyEmptyDatabaseRangeList; @@ -209,17 +209,17 @@ typedef std::list<ScMyCellRangeAddress> ScMyEmptyDatabaseRangeList; class ScMyEmptyDatabaseRangesContainer : ScMyIteratorBase { private: - ScMyEmptyDatabaseRangeList aDatabaseList; + ScMyEmptyDatabaseRangeList aDatabaseList; protected: - virtual sal_Bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ); + virtual sal_Bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ); public: ScMyEmptyDatabaseRangesContainer(); - virtual ~ScMyEmptyDatabaseRangesContainer(); - void AddNewEmptyDatabaseRange(const com::sun::star::table::CellRangeAddress& aCellRangeAddress); + virtual ~ScMyEmptyDatabaseRangesContainer(); + void AddNewEmptyDatabaseRange(const com::sun::star::table::CellRangeAddress& aCellRangeAddress); using ScMyIteratorBase::UpdateAddress; - virtual void SetCellData( ScMyCell& rMyCell ); - virtual void Sort(); + virtual void SetCellData( ScMyCell& rMyCell ); + virtual void Sort(); void SkipTable(SCTAB nSkip); }; @@ -227,10 +227,10 @@ public: struct ScMyDetectiveObj { - ::com::sun::star::table::CellAddress aPosition; - ::com::sun::star::table::CellRangeAddress aSourceRange; - ScDetectiveObjType eObjType; - sal_Bool bHasError; + ::com::sun::star::table::CellAddress aPosition; + ::com::sun::star::table::CellRangeAddress aSourceRange; + ScDetectiveObjType eObjType; + sal_Bool bHasError; sal_Bool operator<(const ScMyDetectiveObj& rDetObj) const; }; @@ -240,14 +240,14 @@ typedef ::std::vector< ScMyDetectiveObj > ScMyDetectiveObjVec; class ScMyDetectiveObjContainer : ScMyIteratorBase { private: - ScMyDetectiveObjList aDetectiveObjList; + ScMyDetectiveObjList aDetectiveObjList; protected: - virtual sal_Bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ); + virtual sal_Bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ); public: ScMyDetectiveObjContainer(); - virtual ~ScMyDetectiveObjContainer(); + virtual ~ScMyDetectiveObjContainer(); - void AddObject( + void AddObject( ScDetectiveObjType eObjType, const SCTAB nSheet, const ScAddress& rPosition, @@ -255,8 +255,8 @@ public: sal_Bool bHasError ); using ScMyIteratorBase::UpdateAddress; - virtual void SetCellData( ScMyCell& rMyCell ); - virtual void Sort(); + virtual void SetCellData( ScMyCell& rMyCell ); + virtual void Sort(); void SkipTable(SCTAB nSkip); }; @@ -264,9 +264,9 @@ public: struct ScMyDetectiveOp { - ::com::sun::star::table::CellAddress aPosition; - ScDetOpType eOpType; - sal_Int32 nIndex; + ::com::sun::star::table::CellAddress aPosition; + ScDetOpType eOpType; + sal_Int32 nIndex; sal_Bool operator<(const ScMyDetectiveOp& rDetOp) const; }; @@ -276,18 +276,18 @@ typedef ::std::vector< ScMyDetectiveOp > ScMyDetectiveOpVec; class ScMyDetectiveOpContainer : ScMyIteratorBase { private: - ScMyDetectiveOpList aDetectiveOpList; + ScMyDetectiveOpList aDetectiveOpList; protected: - virtual sal_Bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ); + virtual sal_Bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ); public: ScMyDetectiveOpContainer(); - virtual ~ScMyDetectiveOpContainer(); + virtual ~ScMyDetectiveOpContainer(); - void AddOperation( ScDetOpType eOpType, const ScAddress& rPosition, sal_uInt32 nIndex ); + void AddOperation( ScDetOpType eOpType, const ScAddress& rPosition, sal_uInt32 nIndex ); using ScMyIteratorBase::UpdateAddress; - virtual void SetCellData( ScMyCell& rMyCell ); - virtual void Sort(); + virtual void SetCellData( ScMyCell& rMyCell ); + virtual void Sort(); void SkipTable(SCTAB nSkip); }; @@ -296,49 +296,49 @@ public: // contains data to export for the current cell position struct ScMyCell { -// com::sun::star::uno::Reference<com::sun::star::table::XCell> xCell; -// com::sun::star::uno::Reference<com::sun::star::text::XText> xText; +// com::sun::star::uno::Reference<com::sun::star::table::XCell> xCell; +// com::sun::star::uno::Reference<com::sun::star::text::XText> xText; com::sun::star::uno::Reference<com::sun::star::sheet::XSheetAnnotation> xAnnotation; com::sun::star::uno::Reference<com::sun::star::drawing::XShape> xNoteShape; - com::sun::star::table::CellAddress aCellAddress; - com::sun::star::table::CellRangeAddress aMergeRange; - com::sun::star::table::CellRangeAddress aMatrixRange; + com::sun::star::table::CellAddress aCellAddress; + com::sun::star::table::CellRangeAddress aMergeRange; + com::sun::star::table::CellRangeAddress aMatrixRange; - rtl::OUString sStringValue; - rtl::OUString sAnnotationText; + rtl::OUString sStringValue; + rtl::OUString sAnnotationText; - ScMyAreaLink aAreaLink; - ScMyShapeList aShapeList; - ScMyDetectiveObjVec aDetectiveObjVec; - ScMyDetectiveOpVec aDetectiveOpVec; + ScMyAreaLink aAreaLink; + ScMyShapeList aShapeList; + ScMyDetectiveObjVec aDetectiveObjVec; + ScMyDetectiveOpVec aDetectiveOpVec; - double fValue; - sal_Int32 nValidationIndex; - sal_Int32 nStyleIndex; - sal_Int32 nNumberFormat; - com::sun::star::table::CellContentType nType; + double fValue; + sal_Int32 nValidationIndex; + sal_Int32 nStyleIndex; + sal_Int32 nNumberFormat; + com::sun::star::table::CellContentType nType; ScBaseCell* pBaseCell; - sal_Bool bIsAutoStyle; + sal_Bool bIsAutoStyle; - sal_Bool bHasShape; - sal_Bool bIsMergedBase; - sal_Bool bIsCovered; - sal_Bool bHasAreaLink; - sal_Bool bHasEmptyDatabase; - sal_Bool bHasDetectiveObj; - sal_Bool bHasDetectiveOp; + sal_Bool bHasShape; + sal_Bool bIsMergedBase; + sal_Bool bIsCovered; + sal_Bool bHasAreaLink; + sal_Bool bHasEmptyDatabase; + sal_Bool bHasDetectiveObj; + sal_Bool bHasDetectiveOp; - sal_Bool bIsEditCell; - sal_Bool bKnowWhetherIsEditCell; - sal_Bool bHasStringValue; - sal_Bool bHasDoubleValue; - sal_Bool bHasXText; + sal_Bool bIsEditCell; + sal_Bool bKnowWhetherIsEditCell; + sal_Bool bHasStringValue; + sal_Bool bHasDoubleValue; + sal_Bool bHasXText; - sal_Bool bIsMatrixBase; - sal_Bool bIsMatrixCovered; - sal_Bool bHasAnnotation; + sal_Bool bIsMatrixBase; + sal_Bool bIsMatrixCovered; + sal_Bool bHasAnnotation; ScMyCell(); ~ScMyCell(); @@ -349,7 +349,7 @@ struct ScMyCell struct ScMyExportAnnotation { com::sun::star::uno::Reference<com::sun::star::sheet::XSheetAnnotation> xAnnotation; - com::sun::star::table::CellAddress aCellAddress; + com::sun::star::table::CellAddress aCellAddress; sal_Bool operator<(const ScMyExportAnnotation& rAnno) const; }; @@ -359,55 +359,55 @@ class ScMyNotEmptyCellsIterator { com::sun::star::uno::Reference<com::sun::star::sheet::XSpreadsheet> xTable; com::sun::star::uno::Reference<com::sun::star::table::XCellRange> xCellRange; - com::sun::star::table::CellAddress aLastAddress; - ScMyExportAnnotationList aAnnotations; + com::sun::star::table::CellAddress aLastAddress; + ScMyExportAnnotationList aAnnotations; - ScMyShapesContainer* pShapes; - ScMyNoteShapesContainer* pNoteShapes; - ScMyEmptyDatabaseRangesContainer* pEmptyDatabaseRanges; - ScMyMergedRangesContainer* pMergedRanges; - ScMyAreaLinksContainer* pAreaLinks; - ScMyDetectiveObjContainer* pDetectiveObj; - ScMyDetectiveOpContainer* pDetectiveOp; + ScMyShapesContainer* pShapes; + ScMyNoteShapesContainer* pNoteShapes; + ScMyEmptyDatabaseRangesContainer* pEmptyDatabaseRanges; + ScMyMergedRangesContainer* pMergedRanges; + ScMyAreaLinksContainer* pAreaLinks; + ScMyDetectiveObjContainer* pDetectiveObj; + ScMyDetectiveOpContainer* pDetectiveOp; - ScXMLExport& rExport; - ScHorizontalCellIterator* pCellItr; + ScXMLExport& rExport; + ScHorizontalCellIterator* pCellItr; - SCCOL nCellCol; - SCROW nCellRow; - SCTAB nCurrentTable; + SCCOL nCellCol; + SCROW nCellRow; + SCTAB nCurrentTable; - void UpdateAddress( ::com::sun::star::table::CellAddress& rAddress ); - void SetCellData( ScMyCell& rMyCell, ::com::sun::star::table::CellAddress& rAddress ); + void UpdateAddress( ::com::sun::star::table::CellAddress& rAddress ); + void SetCellData( ScMyCell& rMyCell, ::com::sun::star::table::CellAddress& rAddress ); - void SetMatrixCellData( ScMyCell& rMyCell ); - void HasAnnotation( ScMyCell& aCell ); + void SetMatrixCellData( ScMyCell& rMyCell ); + void HasAnnotation( ScMyCell& aCell ); public: ScMyNotEmptyCellsIterator(ScXMLExport& rExport); ~ScMyNotEmptyCellsIterator(); - void Clear(); + void Clear(); - inline void SetShapes(ScMyShapesContainer* pNewShapes) + inline void SetShapes(ScMyShapesContainer* pNewShapes) { pShapes = pNewShapes; } - inline void SetNoteShapes(ScMyNoteShapesContainer* pNewNoteShapes) + inline void SetNoteShapes(ScMyNoteShapesContainer* pNewNoteShapes) { pNoteShapes = pNewNoteShapes; } - inline void SetEmptyDatabaseRanges(ScMyEmptyDatabaseRangesContainer* pNewEmptyDatabaseRanges) + inline void SetEmptyDatabaseRanges(ScMyEmptyDatabaseRangesContainer* pNewEmptyDatabaseRanges) { pEmptyDatabaseRanges = pNewEmptyDatabaseRanges; } - inline void SetMergedRanges(ScMyMergedRangesContainer* pNewMergedRanges) + inline void SetMergedRanges(ScMyMergedRangesContainer* pNewMergedRanges) { pMergedRanges = pNewMergedRanges; } - inline void SetAreaLinks(ScMyAreaLinksContainer* pNewAreaLinks) + inline void SetAreaLinks(ScMyAreaLinksContainer* pNewAreaLinks) { pAreaLinks = pNewAreaLinks; } - inline void SetDetectiveObj(ScMyDetectiveObjContainer* pNewDetectiveObj) + inline void SetDetectiveObj(ScMyDetectiveObjContainer* pNewDetectiveObj) { pDetectiveObj = pNewDetectiveObj; } - inline void SetDetectiveOp(ScMyDetectiveOpContainer* pNewDetectiveOp) + inline void SetDetectiveOp(ScMyDetectiveOpContainer* pNewDetectiveOp) { pDetectiveOp = pNewDetectiveOp; } - void SetCurrentTable(const SCTAB nTable, + void SetCurrentTable(const SCTAB nTable, com::sun::star::uno::Reference<com::sun::star::sheet::XSpreadsheet>& rxTable); void SkipTable(SCTAB nSkip); - sal_Bool GetNext(ScMyCell& aCell, ScFormatRangeStyles* pCellStyles); + sal_Bool GetNext(ScMyCell& aCell, ScFormatRangeStyles* pCellStyles); }; #endif diff --git a/sc/source/filter/xml/XMLExportSharedData.cxx b/sc/source/filter/xml/XMLExportSharedData.cxx index a3e4d3ae80b5..c3de04075326 100644 --- a/sc/source/filter/xml/XMLExportSharedData.cxx +++ b/sc/source/filter/xml/XMLExportSharedData.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 diff --git a/sc/source/filter/xml/XMLExportSharedData.hxx b/sc/source/filter/xml/XMLExportSharedData.hxx index 7337cbbc27e7..48497b530979 100644 --- a/sc/source/filter/xml/XMLExportSharedData.hxx +++ b/sc/source/filter/xml/XMLExportSharedData.hxx @@ -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 @@ -54,14 +54,14 @@ class ScMyNoteShapesContainer; class ScMySharedData { - std::vector<sal_Int32> nLastColumns; - std::vector<sal_Int32> nLastRows; - ScMyTableShapes* pTableShapes; - ScMyDrawPages* pDrawPages; - ScMyShapesContainer* pShapesContainer; - ScMyDetectiveObjContainer* pDetectiveObjContainer; + std::vector<sal_Int32> nLastColumns; + std::vector<sal_Int32> nLastRows; + ScMyTableShapes* pTableShapes; + ScMyDrawPages* pDrawPages; + ScMyShapesContainer* pShapesContainer; + ScMyDetectiveObjContainer* pDetectiveObjContainer; ScMyNoteShapesContainer* pNoteShapes; - sal_Int32 nTableCount; + sal_Int32 nTableCount; public: ScMySharedData(const sal_Int32 nTableCount); ~ScMySharedData(); diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx b/sc/source/filter/xml/XMLStylesExportHelper.cxx index 79c0d24eb1f8..5e20443e65fc 100644 --- a/sc/source/filter/xml/XMLStylesExportHelper.cxx +++ b/sc/source/filter/xml/XMLStylesExportHelper.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 @@ -192,9 +192,9 @@ sal_Bool ScMyValidationsContainer::AddValidation(const uno::Any& aTempAny, rtl::OUString ScMyValidationsContainer::GetCondition(ScXMLExport& rExport, const ScMyValidation& aValidation) { - /* ATTENTION! Should the condition to not write sheet::ValidationType_ANY - * ever be changed, adapt the conditional call of - * MarkUsedExternalReferences() in + /* ATTENTION! Should the condition to not write sheet::ValidationType_ANY + * ever be changed, adapt the conditional call of + * MarkUsedExternalReferences() in * ScTableValidationObj::ScTableValidationObj() accordingly! */ rtl::OUString sCondition; if (aValidation.aValidationType != sheet::ValidationType_ANY) diff --git a/sc/source/filter/xml/XMLStylesExportHelper.hxx b/sc/source/filter/xml/XMLStylesExportHelper.hxx index 405dedf9f26b..a1070b2c1739 100644 --- a/sc/source/filter/xml/XMLStylesExportHelper.hxx +++ b/sc/source/filter/xml/XMLStylesExportHelper.hxx @@ -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 @@ -43,73 +43,73 @@ class ScXMLExport; struct ScMyValidation { - rtl::OUString sName; - rtl::OUString sErrorMessage; - rtl::OUString sErrorTitle; - rtl::OUString sImputMessage; - rtl::OUString sImputTitle; - rtl::OUString sFormula1; - rtl::OUString sFormula2; - com::sun::star::table::CellAddress aBaseCell; - com::sun::star::sheet::ValidationAlertStyle aAlertStyle; - com::sun::star::sheet::ValidationType aValidationType; - com::sun::star::sheet::ConditionOperator aOperator; + rtl::OUString sName; + rtl::OUString sErrorMessage; + rtl::OUString sErrorTitle; + rtl::OUString sImputMessage; + rtl::OUString sImputTitle; + rtl::OUString sFormula1; + rtl::OUString sFormula2; + com::sun::star::table::CellAddress aBaseCell; + com::sun::star::sheet::ValidationAlertStyle aAlertStyle; + com::sun::star::sheet::ValidationType aValidationType; + com::sun::star::sheet::ConditionOperator aOperator; sal_Int16 nShowList; - sal_Bool bShowErrorMessage; - sal_Bool bShowImputMessage; - sal_Bool bIgnoreBlanks; + sal_Bool bShowErrorMessage; + sal_Bool bShowImputMessage; + sal_Bool bIgnoreBlanks; ScMyValidation(); ~ScMyValidation(); - sal_Bool IsEqual(const ScMyValidation& aVal) const; + sal_Bool IsEqual(const ScMyValidation& aVal) const; }; -typedef std::vector<ScMyValidation> ScMyValidationVec; +typedef std::vector<ScMyValidation> ScMyValidationVec; class ScMyValidationsContainer { private: - ScMyValidationVec aValidationVec; - const rtl::OUString sEmptyString; - const rtl::OUString sERRALSTY; - const rtl::OUString sIGNOREBL; + ScMyValidationVec aValidationVec; + const rtl::OUString sEmptyString; + const rtl::OUString sERRALSTY; + const rtl::OUString sIGNOREBL; const rtl::OUString sSHOWLIST; - const rtl::OUString sTYPE; - const rtl::OUString sSHOWINP; - const rtl::OUString sSHOWERR; - const rtl::OUString sINPTITLE; - const rtl::OUString sINPMESS; - const rtl::OUString sERRTITLE; - const rtl::OUString sERRMESS; - const rtl::OUString sOnError; - const rtl::OUString sEventType; - const rtl::OUString sStarBasic; - const rtl::OUString sScript; - const rtl::OUString sLibrary; - const rtl::OUString sMacroName; + const rtl::OUString sTYPE; + const rtl::OUString sSHOWINP; + const rtl::OUString sSHOWERR; + const rtl::OUString sINPTITLE; + const rtl::OUString sINPMESS; + const rtl::OUString sERRTITLE; + const rtl::OUString sERRMESS; + const rtl::OUString sOnError; + const rtl::OUString sEventType; + const rtl::OUString sStarBasic; + const rtl::OUString sScript; + const rtl::OUString sLibrary; + const rtl::OUString sMacroName; public: ScMyValidationsContainer(); ~ScMyValidationsContainer(); - sal_Bool AddValidation(const com::sun::star::uno::Any& aAny, + sal_Bool AddValidation(const com::sun::star::uno::Any& aAny, sal_Int32& nValidationIndex); - rtl::OUString GetCondition(ScXMLExport& rExport, const ScMyValidation& aValidation); - rtl::OUString GetBaseCellAddress(ScDocument* pDoc, const com::sun::star::table::CellAddress& aCell); - void WriteMessage(ScXMLExport& rExport, + rtl::OUString GetCondition(ScXMLExport& rExport, const ScMyValidation& aValidation); + rtl::OUString GetBaseCellAddress(ScDocument* pDoc, const com::sun::star::table::CellAddress& aCell); + void WriteMessage(ScXMLExport& rExport, const rtl::OUString& sTitle, const rtl::OUString& sMessage, const sal_Bool bShowMessage, const sal_Bool bIsHelpMessage); - void WriteValidations(ScXMLExport& rExport); - const rtl::OUString& GetValidationName(const sal_Int32 nIndex); + void WriteValidations(ScXMLExport& rExport); + const rtl::OUString& GetValidationName(const sal_Int32 nIndex); }; //============================================================================== struct ScMyDefaultStyle { - sal_Int32 nIndex; - sal_Int32 nRepeat; - sal_Bool bIsAutoStyle; + sal_Int32 nIndex; + sal_Int32 nRepeat; + sal_Bool bIsAutoStyle; ScMyDefaultStyle() : nIndex(-1), nRepeat(1), bIsAutoStyle(sal_True) {} @@ -145,12 +145,12 @@ public: struct ScMyRowFormatRange { - sal_Int32 nStartColumn; - sal_Int32 nRepeatColumns; - sal_Int32 nRepeatRows; - sal_Int32 nIndex; - sal_Int32 nValidationIndex; - sal_Bool bIsAutoStyle; + sal_Int32 nStartColumn; + sal_Int32 nRepeatColumns; + sal_Int32 nRepeatRows; + sal_Int32 nIndex; + sal_Int32 nValidationIndex; + sal_Bool bIsAutoStyle; ScMyRowFormatRange(); sal_Bool operator<(const ScMyRowFormatRange& rRange) const; @@ -160,10 +160,10 @@ typedef std::list<ScMyRowFormatRange> ScMyRowFormatRangesList; class ScRowFormatRanges { - ScMyRowFormatRangesList aRowFormatRanges; - const ScMyDefaultStyleList* pRowDefaults; - const ScMyDefaultStyleList* pColDefaults; - sal_uInt32 nSize; + ScMyRowFormatRangesList aRowFormatRanges; + const ScMyDefaultStyleList* pRowDefaults; + const ScMyDefaultStyleList* pColDefaults; + sal_uInt32 nSize; void AddRange(const sal_Int32 nPrevStartCol, const sal_Int32 nRepeat, const sal_Int32 nPrevIndex, const sal_Bool bPrevAutoStyle, const ScMyRowFormatRange& rFormatRange); @@ -183,30 +183,30 @@ public: void Sort(); }; -typedef std::vector<rtl::OUString*> ScMyOUStringVec; +typedef std::vector<rtl::OUString*> ScMyOUStringVec; struct ScMyFormatRange { com::sun::star::table::CellRangeAddress aRangeAddress; - sal_Int32 nStyleNameIndex; - sal_Int32 nValidationIndex; - sal_Int32 nNumberFormat; - sal_Bool bIsAutoStyle; + sal_Int32 nStyleNameIndex; + sal_Int32 nValidationIndex; + sal_Int32 nNumberFormat; + sal_Bool bIsAutoStyle; ScMyFormatRange(); sal_Bool operator< (const ScMyFormatRange& rRange) const; }; -typedef std::list<ScMyFormatRange> ScMyFormatRangeAddresses; -typedef std::vector<ScMyFormatRangeAddresses*> ScMyFormatRangeListVec; +typedef std::list<ScMyFormatRange> ScMyFormatRangeAddresses; +typedef std::vector<ScMyFormatRangeAddresses*> ScMyFormatRangeListVec; class ScFormatRangeStyles { - ScMyFormatRangeListVec aTables; - ScMyOUStringVec aStyleNames; - ScMyOUStringVec aAutoStyleNames; - const ScMyDefaultStyleList* pRowDefaults; - const ScMyDefaultStyleList* pColDefaults; + ScMyFormatRangeListVec aTables; + ScMyOUStringVec aStyleNames; + ScMyOUStringVec aAutoStyleNames; + const ScMyDefaultStyleList* pRowDefaults; + const ScMyDefaultStyleList* pColDefaults; public: ScFormatRangeStyles(); @@ -233,7 +233,7 @@ public: class ScColumnRowStylesBase { - ScMyOUStringVec aStyleNames; + ScMyOUStringVec aStyleNames; public: ScColumnRowStylesBase(); @@ -248,19 +248,19 @@ public: struct ScColumnStyle { - sal_Int32 nIndex; - sal_Bool bIsVisible; + sal_Int32 nIndex; + sal_Bool bIsVisible; ScColumnStyle() : nIndex(-1), bIsVisible(sal_True) {} }; -typedef std::vector<ScColumnStyle> ScMyColumnStyleVec; -typedef std::vector<ScMyColumnStyleVec> ScMyColumnVectorVec; +typedef std::vector<ScColumnStyle> ScMyColumnStyleVec; +typedef std::vector<ScMyColumnStyleVec> ScMyColumnVectorVec; class ScColumnStyles : public ScColumnRowStylesBase { - ScMyColumnVectorVec aTables; + ScMyColumnVectorVec aTables; public: ScColumnStyles(); @@ -273,12 +273,12 @@ public: virtual rtl::OUString* GetStyleName(const sal_Int32 nTable, const sal_Int32 nField); }; -typedef std::vector<sal_Int32> ScMysalInt32Vec; -typedef std::vector<ScMysalInt32Vec> ScMyRowVectorVec; +typedef std::vector<sal_Int32> ScMysalInt32Vec; +typedef std::vector<ScMysalInt32Vec> ScMyRowVectorVec; class ScRowStyles : public ScColumnRowStylesBase { - ScMyRowVectorVec aTables; + ScMyRowVectorVec aTables; public: ScRowStyles(); diff --git a/sc/source/filter/xml/XMLStylesImportHelper.cxx b/sc/source/filter/xml/XMLStylesImportHelper.cxx index 3a4ea8384539..83f8632b377e 100644 --- a/sc/source/filter/xml/XMLStylesImportHelper.cxx +++ b/sc/source/filter/xml/XMLStylesImportHelper.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 diff --git a/sc/source/filter/xml/XMLStylesImportHelper.hxx b/sc/source/filter/xml/XMLStylesImportHelper.hxx index 2c39d4eacf12..526959ff9970 100644 --- a/sc/source/filter/xml/XMLStylesImportHelper.hxx +++ b/sc/source/filter/xml/XMLStylesImportHelper.hxx @@ -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 @@ -44,8 +44,8 @@ class ScXMLImport; struct ScMyStyleNumberFormat { - rtl::OUString sStyleName; - sal_Int32 nNumberFormat; + rtl::OUString sStyleName; + sal_Int32 nNumberFormat; ScMyStyleNumberFormat() : nNumberFormat(-1) {} ScMyStyleNumberFormat(const rtl::OUString& rStyleName) : @@ -62,11 +62,11 @@ struct LessStyleNumberFormat } }; -typedef std::set< ScMyStyleNumberFormat, LessStyleNumberFormat > ScMyStyleNumberFormatSet; +typedef std::set< ScMyStyleNumberFormat, LessStyleNumberFormat > ScMyStyleNumberFormatSet; class ScMyStyleNumberFormats { - ScMyStyleNumberFormatSet aSet; + ScMyStyleNumberFormatSet aSet; public: void AddStyleNumberFormat(const rtl::OUString& rStyleName, const sal_Int32 nNumberFormat); @@ -75,7 +75,7 @@ public: struct ScMyCurrencyStyle { - rtl::OUString sCurrency; + rtl::OUString sCurrency; ::boost::shared_ptr<ScSimpleRangeList> mpRanges; ScMyCurrencyStyle() : @@ -92,7 +92,7 @@ struct LessCurrencyStyle } }; -typedef std::set<ScMyCurrencyStyle, LessCurrencyStyle> ScMyCurrencyStylesSet; +typedef std::set<ScMyCurrencyStyle, LessCurrencyStyle> ScMyCurrencyStylesSet; class ScMyStyleRanges : public SvRefBase { @@ -103,7 +103,7 @@ class ScMyStyleRanges : public SvRefBase ::boost::shared_ptr<ScSimpleRangeList> mpPercentList; ::boost::shared_ptr<ScSimpleRangeList> mpLogicalList; ::boost::shared_ptr<ScSimpleRangeList> mpUndefinedList; - ScMyCurrencyStylesSet* pCurrencyList; + ScMyCurrencyStylesSet* pCurrencyList; void AddRange(const ScRange& rRange, ScRangeList* pList, const rtl::OUString* pStyleName, const sal_Int16 nType, @@ -137,8 +137,8 @@ SV_DECL_IMPL_REF( ScMyStyleRanges ); struct ScMyStyle { - rtl::OUString sStyleName; - ScMyStyleRangesRef xRanges; + rtl::OUString sStyleName; + ScMyStyleRangesRef xRanges; ScMyStyle() : xRanges(new ScMyStyleRanges()) {} ~ScMyStyle() {} @@ -152,24 +152,24 @@ struct LessStyle } }; -typedef std::set<ScMyStyle, LessStyle> ScMyStylesSet; +typedef std::set<ScMyStyle, LessStyle> ScMyStylesSet; typedef std::vector<ScMyStylesSet::iterator> ScMyStyles; class ScMyStylesImportHelper { - ScMyStylesSet aCellStyles; - ScMyStyles aColDefaultStyles; - ScMyStylesSet::iterator aRowDefaultStyle; - ScXMLImport& rImport; - rtl::OUString* pStyleName; - rtl::OUString* pPrevStyleName; - rtl::OUString* pCurrency; - rtl::OUString* pPrevCurrency; - ScRange aPrevRange; - sal_uInt32 nMaxRanges; - sal_Int16 nCellType; - sal_Int16 nPrevCellType; - sal_Bool bPrevRangeAdded; + ScMyStylesSet aCellStyles; + ScMyStyles aColDefaultStyles; + ScMyStylesSet::iterator aRowDefaultStyle; + ScXMLImport& rImport; + rtl::OUString* pStyleName; + rtl::OUString* pPrevStyleName; + rtl::OUString* pCurrency; + rtl::OUString* pPrevCurrency; + ScRange aPrevRange; + sal_uInt32 nMaxRanges; + sal_Int16 nCellType; + sal_Int16 nPrevCellType; + sal_Bool bPrevRangeAdded; void ResetAttributes(); ScMyStylesSet::iterator GetIterator(const rtl::OUString* pStyleName); diff --git a/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx b/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx index ec79d21aba40..80abe62b92cb 100644 --- a/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx +++ b/sc/source/filter/xml/XMLTableHeaderFooterContext.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 diff --git a/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx b/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx index eecedc746b3e..8d3b2169f233 100644 --- a/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx +++ b/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx @@ -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 @@ -49,19 +49,19 @@ class XMLTableHeaderFooterContext: public SvXMLImportContext ::com::sun::star::uno::Reference < ::com::sun::star::sheet::XHeaderFooterContent > xHeaderFooterContent; - const ::rtl::OUString sOn; - const ::rtl::OUString sShareContent; - const ::rtl::OUString sContent; - const ::rtl::OUString sContentLeft; - const ::rtl::OUString sEmpty; - rtl::OUString sCont; - - sal_Bool bDisplay; - sal_Bool bInsertContent; - sal_Bool bLeft; - sal_Bool bContainsLeft; - sal_Bool bContainsRight; - sal_Bool bContainsCenter; + const ::rtl::OUString sOn; + const ::rtl::OUString sShareContent; + const ::rtl::OUString sContent; + const ::rtl::OUString sContentLeft; + const ::rtl::OUString sEmpty; + rtl::OUString sCont; + + sal_Bool bDisplay; + sal_Bool bInsertContent; + sal_Bool bLeft; + sal_Bool bContainsLeft; + sal_Bool bContainsRight; + sal_Bool bContainsCenter; public: TYPEINFO(); diff --git a/sc/source/filter/xml/XMLTableMasterPageExport.cxx b/sc/source/filter/xml/XMLTableMasterPageExport.cxx index aeb0444ae2a5..7e555b5d39aa 100644 --- a/sc/source/filter/xml/XMLTableMasterPageExport.cxx +++ b/sc/source/filter/xml/XMLTableMasterPageExport.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 diff --git a/sc/source/filter/xml/XMLTableMasterPageExport.hxx b/sc/source/filter/xml/XMLTableMasterPageExport.hxx index 33327ee3b90d..f6d879743c79 100644 --- a/sc/source/filter/xml/XMLTableMasterPageExport.hxx +++ b/sc/source/filter/xml/XMLTableMasterPageExport.hxx @@ -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,6 +63,6 @@ public: }; -#endif // _XMLOFF_XMLTABLEMASTERPAGEEXPORT_HXX +#endif // _XMLOFF_XMLTABLEMASTERPAGEEXPORT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/xml/XMLTableShapeImportHelper.cxx b/sc/source/filter/xml/XMLTableShapeImportHelper.cxx index 9ddc5ede06a5..320681e8e132 100644 --- a/sc/source/filter/xml/XMLTableShapeImportHelper.cxx +++ b/sc/source/filter/xml/XMLTableShapeImportHelper.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 diff --git a/sc/source/filter/xml/XMLTableShapeImportHelper.hxx b/sc/source/filter/xml/XMLTableShapeImportHelper.hxx index fb40daa82756..6bb9b9253549 100644 --- a/sc/source/filter/xml/XMLTableShapeImportHelper.hxx +++ b/sc/source/filter/xml/XMLTableShapeImportHelper.hxx @@ -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 diff --git a/sc/source/filter/xml/XMLTableShapeResizer.cxx b/sc/source/filter/xml/XMLTableShapeResizer.cxx index 23e72c369267..696b102da1f5 100644 --- a/sc/source/filter/xml/XMLTableShapeResizer.cxx +++ b/sc/source/filter/xml/XMLTableShapeResizer.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 @@ -247,7 +247,7 @@ void ScMyShapeResizer::ResizeShapes() uno::Reference<beans::XPropertySet> xShapeProps (aItr->xShape, uno::UNO_QUERY); if(xShapeProps.is()) { - uno::Reference<drawing::XShape> xStartShape(xShapeProps->getPropertyValue( sStartShape ), uno::UNO_QUERY); + uno::Reference<drawing::XShape> xStartShape(xShapeProps->getPropertyValue( sStartShape ), uno::UNO_QUERY); uno::Reference<drawing::XShape> xEndShape(xShapeProps->getPropertyValue( sEndShape ), uno::UNO_QUERY); if (!xStartShape.is() && !xEndShape.is()) { @@ -378,8 +378,8 @@ void ScMyShapeResizer::ResizeShapes() aItr = aShapes.erase(aItr); } rImport.UnlockSolarMutex(); -// if (pCollection) -// pDoc->SetChartListenerCollection(pCollection); +// if (pCollection) +// pDoc->SetChartListenerCollection(pCollection); } } } diff --git a/sc/source/filter/xml/XMLTableShapeResizer.hxx b/sc/source/filter/xml/XMLTableShapeResizer.hxx index 6372f50be673..618b0a35c3fb 100644 --- a/sc/source/filter/xml/XMLTableShapeResizer.hxx +++ b/sc/source/filter/xml/XMLTableShapeResizer.hxx @@ -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 @@ -43,8 +43,8 @@ struct ScMyToResizeShape { com::sun::star::uno::Reference <com::sun::star::drawing::XShape> xShape; rtl::OUString* pRangeList; - com::sun::star::table::CellAddress aEndCell; - com::sun::star::table::CellAddress aStartCell; + com::sun::star::table::CellAddress aEndCell; + com::sun::star::table::CellAddress aStartCell; sal_Int32 nEndX; sal_Int32 nEndY; @@ -55,9 +55,9 @@ typedef std::list<ScMyToResizeShape> ScMyToResizeShapes; class ScMyShapeResizer { - ScXMLImport& rImport; - ScMyToResizeShapes aShapes; - ScChartListenerCollection* pCollection; + ScXMLImport& rImport; + ScMyToResizeShapes aShapes; + ScChartListenerCollection* pCollection; sal_Bool IsOLE(com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rShape) const; void CreateChartListener(ScDocument* pDoc, @@ -71,12 +71,12 @@ public: ScMyShapeResizer(ScXMLImport& rImport); ~ScMyShapeResizer(); - void AddShape(com::sun::star::uno::Reference <com::sun::star::drawing::XShape>& rShape, + void AddShape(com::sun::star::uno::Reference <com::sun::star::drawing::XShape>& rShape, rtl::OUString* pRangeList, com::sun::star::table::CellAddress& rStartAddress, com::sun::star::table::CellAddress& rEndAddress, sal_Int32 nEndX, sal_Int32 nEndY); - void ResizeShapes(); + void ResizeShapes(); }; #endif diff --git a/sc/source/filter/xml/XMLTableShapesContext.cxx b/sc/source/filter/xml/XMLTableShapesContext.cxx index 2421bb785870..dd26e2d1e01b 100644 --- a/sc/source/filter/xml/XMLTableShapesContext.cxx +++ b/sc/source/filter/xml/XMLTableShapesContext.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 diff --git a/sc/source/filter/xml/XMLTableShapesContext.hxx b/sc/source/filter/xml/XMLTableShapesContext.hxx index 168e7538ed0f..a8000a8f6efa 100644 --- a/sc/source/filter/xml/XMLTableShapesContext.hxx +++ b/sc/source/filter/xml/XMLTableShapesContext.hxx @@ -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 diff --git a/sc/source/filter/xml/XMLTableSourceContext.cxx b/sc/source/filter/xml/XMLTableSourceContext.cxx index 9cc6d9a7090a..090e5415c7f7 100644 --- a/sc/source/filter/xml/XMLTableSourceContext.cxx +++ b/sc/source/filter/xml/XMLTableSourceContext.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 diff --git a/sc/source/filter/xml/XMLTableSourceContext.hxx b/sc/source/filter/xml/XMLTableSourceContext.hxx index 00985a721bb1..f5fe4eb30dc2 100644 --- a/sc/source/filter/xml/XMLTableSourceContext.hxx +++ b/sc/source/filter/xml/XMLTableSourceContext.hxx @@ -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 @@ -36,12 +36,12 @@ class ScXMLImport; class ScXMLTableSourceContext : public SvXMLImportContext { - rtl::OUString sLink; - rtl::OUString sTableName; - rtl::OUString sFilterName; - rtl::OUString sFilterOptions; - sal_Int32 nRefresh; - com::sun::star::sheet::SheetLinkMode nMode; + rtl::OUString sLink; + rtl::OUString sTableName; + rtl::OUString sFilterName; + rtl::OUString sFilterOptions; + sal_Int32 nRefresh; + com::sun::star::sheet::SheetLinkMode nMode; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } diff --git a/sc/source/filter/xml/XMLTextPContext.cxx b/sc/source/filter/xml/XMLTextPContext.cxx index 724a87a65626..661296516ddd 100644 --- a/sc/source/filter/xml/XMLTextPContext.cxx +++ b/sc/source/filter/xml/XMLTextPContext.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 @@ -150,7 +150,7 @@ SvXMLImportContext *ScXMLTextPContext::CreateChildContext( USHORT nTempPrefix, sSetString = sSimpleContent; sal_Unicode cNonSpace(0); - + sal_Int32 nLength = sSetString.getLength(); if ( nLength > 0 ) { diff --git a/sc/source/filter/xml/XMLTextPContext.hxx b/sc/source/filter/xml/XMLTextPContext.hxx index e2f3e9446b2e..9b92599b4254 100644 --- a/sc/source/filter/xml/XMLTextPContext.hxx +++ b/sc/source/filter/xml/XMLTextPContext.hxx @@ -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 @@ -38,13 +38,13 @@ class ScXMLTableRowCellContext; class ScXMLTextPContext : public SvXMLImportContext { ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> xAttrList; - SvXMLImportContext* pTextPContext; - ScXMLTableRowCellContext* pCellContext; - rtl::OUString sLName; + SvXMLImportContext* pTextPContext; + ScXMLTableRowCellContext* pCellContext; + rtl::OUString sLName; rtl::OUString sSimpleContent; // copy of the first Character call's argument rtl::OUStringBuffer* pContentBuffer; // used if there's more than one string - USHORT nPrefix; - sal_Bool bIsOwn; + USHORT nPrefix; + sal_Bool bIsOwn; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.cxx b/sc/source/filter/xml/XMLTrackedChangesContext.cxx index 86a5f4a88a81..40ae2111630e 100644 --- a/sc/source/filter/xml/XMLTrackedChangesContext.cxx +++ b/sc/source/filter/xml/XMLTrackedChangesContext.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 @@ -54,12 +54,12 @@ using rtl::OUString; class ScXMLChangeInfoContext : public SvXMLImportContext { - ScMyActionInfo aInfo; + ScMyActionInfo aInfo; ::rtl::OUStringBuffer sAuthorBuffer; ::rtl::OUStringBuffer sDateTimeBuffer; ::rtl::OUStringBuffer sCommentBuffer; - ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; - sal_uInt32 nParagraphCount; + ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; + sal_uInt32 nParagraphCount; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -83,7 +83,7 @@ public: class ScXMLBigRangeContext : public SvXMLImportContext { - ScBigRange& rBigRange; + ScBigRange& rBigRange; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -107,22 +107,22 @@ public: class ScXMLCellContentDeletionContext : public SvXMLImportContext { - rtl::OUString sFormulaAddress; - rtl::OUString sFormula; + rtl::OUString sFormulaAddress; + rtl::OUString sFormula; rtl::OUString sFormulaNmsp; rtl::OUString sInputString; - ScBigRange aBigRange; - double fValue; - ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; - ScBaseCell* pCell; - sal_uInt32 nID; - sal_Int32 nMatrixCols; - sal_Int32 nMatrixRows; + ScBigRange aBigRange; + double fValue; + ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; + ScBaseCell* pCell; + sal_uInt32 nID; + sal_Int32 nMatrixCols; + sal_Int32 nMatrixRows; formula::FormulaGrammar::Grammar eGrammar; - sal_uInt16 nType; - sal_uInt8 nMatrixFlag; - sal_Bool bBigRange; - sal_Bool bContainsCell; + sal_uInt16 nType; + sal_uInt8 nMatrixFlag; + sal_Bool bBigRange; + sal_Bool bContainsCell; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -146,7 +146,7 @@ public: class ScXMLDependenceContext : public SvXMLImportContext { - ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; + ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -170,7 +170,7 @@ public: class ScXMLDependingsContext : public SvXMLImportContext { - ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; + ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -194,7 +194,7 @@ public: class ScXMLChangeDeletionContext : public SvXMLImportContext { - ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; + ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -218,7 +218,7 @@ public: class ScXMLDeletionsContext : public SvXMLImportContext { - ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; + ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -245,11 +245,11 @@ class ScXMLChangeCellContext; class ScXMLChangeTextPContext : public SvXMLImportContext { ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> xAttrList; - rtl::OUString sLName; - rtl::OUStringBuffer sText; - ScXMLChangeCellContext* pChangeCellContext; - SvXMLImportContext* pTextPContext; - USHORT nPrefix; + rtl::OUString sLName; + rtl::OUStringBuffer sText; + ScXMLChangeCellContext* pChangeCellContext; + SvXMLImportContext* pTextPContext; + USHORT nPrefix; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -278,19 +278,19 @@ public: class ScXMLChangeCellContext : public SvXMLImportContext { - rtl::OUString sText; + rtl::OUString sText; rtl::OUString& rInputString; - ScBaseCell*& rOldCell; - ScEditEngineTextObj* pEditTextObj; - double& rDateTimeValue; - double fValue; - sal_uInt16& rType; + ScBaseCell*& rOldCell; + ScEditEngineTextObj* pEditTextObj; + double& rDateTimeValue; + double fValue; + sal_uInt16& rType; // sal_Bool bIsMatrix; // sal_Bool bIsCoveredMatrix; - sal_Bool bEmpty; - sal_Bool bFirstParagraph; - sal_Bool bString; - sal_Bool bFormula; + sal_Bool bEmpty; + sal_Bool bFirstParagraph; + sal_Bool bString; + sal_Bool bFormula; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -322,19 +322,19 @@ public: class ScXMLPreviousContext : public SvXMLImportContext { - rtl::OUString sFormulaAddress; - rtl::OUString sFormula; + rtl::OUString sFormulaAddress; + rtl::OUString sFormula; rtl::OUString sFormulaNmsp; rtl::OUString sInputString; - double fValue; - ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; - ScBaseCell* pOldCell; - sal_uInt32 nID; - sal_Int32 nMatrixCols; - sal_Int32 nMatrixRows; + double fValue; + ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; + ScBaseCell* pOldCell; + sal_uInt32 nID; + sal_Int32 nMatrixCols; + sal_Int32 nMatrixRows; formula::FormulaGrammar::Grammar eGrammar; - sal_uInt16 nType; - sal_uInt8 nMatrixFlag; + sal_uInt16 nType; + sal_uInt8 nMatrixFlag; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -358,8 +358,8 @@ public: class ScXMLContentChangeContext : public SvXMLImportContext { - ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; - ScBigRange aBigRange; + ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; + ScBigRange aBigRange; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -382,7 +382,7 @@ public: class ScXMLInsertionContext : public SvXMLImportContext { - ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; + ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -405,7 +405,7 @@ public: class ScXMLInsertionCutOffContext : public SvXMLImportContext { - ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; + ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -428,7 +428,7 @@ public: class ScXMLMovementCutOffContext : public SvXMLImportContext { - ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; + ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -451,7 +451,7 @@ public: class ScXMLCutOffsContext : public SvXMLImportContext { - ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; + ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -474,7 +474,7 @@ public: class ScXMLDeletionContext : public SvXMLImportContext { - ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; + ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -497,9 +497,9 @@ public: class ScXMLMovementContext : public SvXMLImportContext { - ScBigRange aSourceRange; - ScBigRange aTargetRange; - ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; + ScBigRange aSourceRange; + ScBigRange aTargetRange; + ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -522,7 +522,7 @@ public: class ScXMLRejectionContext : public SvXMLImportContext { - ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; + ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.hxx b/sc/source/filter/xml/XMLTrackedChangesContext.hxx index 82753f25e5c0..14b418356545 100644 --- a/sc/source/filter/xml/XMLTrackedChangesContext.hxx +++ b/sc/source/filter/xml/XMLTrackedChangesContext.hxx @@ -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 @@ -40,7 +40,7 @@ class ScEditEngineTextObj; class ScXMLTrackedChangesContext : public SvXMLImportContext { - ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; + ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } diff --git a/sc/source/filter/xml/sheetdata.cxx b/sc/source/filter/xml/sheetdata.cxx index 9f35e99f5326..e81ddae8d00a 100644 --- a/sc/source/filter/xml/sheetdata.cxx +++ b/sc/source/filter/xml/sheetdata.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 diff --git a/sc/source/filter/xml/xmlannoi.cxx b/sc/source/filter/xml/xmlannoi.cxx index 6fcb70393eec..ca282395393e 100644 --- a/sc/source/filter/xml/xmlannoi.cxx +++ b/sc/source/filter/xml/xmlannoi.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 @@ -159,7 +159,7 @@ SvXMLImportContext *ScXMLAnnotationContext::CreateChildContext( USHORT nPrefix, pContext = new ScXMLContentContext(GetScImport(), nPrefix, rLName, xAttrList, maCreateDateStringBuffer); } -/* else if ((nPrefix == XML_NAMESPACE_TEXT) && IsXMLToken(rLName, XML_P) ) +/* else if ((nPrefix == XML_NAMESPACE_TEXT) && IsXMLToken(rLName, XML_P) ) { if (!bHasTextP) { diff --git a/sc/source/filter/xml/xmlannoi.hxx b/sc/source/filter/xml/xmlannoi.hxx index de0f61e9820e..97913a91b9fd 100644 --- a/sc/source/filter/xml/xmlannoi.hxx +++ b/sc/source/filter/xml/xmlannoi.hxx @@ -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 diff --git a/sc/source/filter/xml/xmlbodyi.cxx b/sc/source/filter/xml/xmlbodyi.cxx index 7f92f82aa1a6..d768ad47c276 100644 --- a/sc/source/filter/xml/xmlbodyi.cxx +++ b/sc/source/filter/xml/xmlbodyi.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 @@ -157,18 +157,18 @@ SvXMLImportContext *ScXMLBodyContext::CreateChildContext( USHORT nPrefix, // sal_Bool bHeading = sal_False; switch( rTokenMap.Get( nPrefix, rLocalName ) ) { -// case XML_TOK_TEXT_H: -// bHeading = TRUE; -// case XML_TOK_TEXT_P: -// pContext = new SwXMLParaContext( GetSwImport(),nPrefix, rLocalName, -// xAttrList, bHeading ); -// break; -// case XML_TOK_TEXT_ORDERED_LIST: -// bOrdered = TRUE; -// case XML_TOK_TEXT_UNORDERED_LIST: -// pContext = new SwXMLListBlockContext( GetSwImport(),nPrefix, rLocalName, -// xAttrList, bOrdered ); -// break; +// case XML_TOK_TEXT_H: +// bHeading = TRUE; +// case XML_TOK_TEXT_P: +// pContext = new SwXMLParaContext( GetSwImport(),nPrefix, rLocalName, +// xAttrList, bHeading ); +// break; +// case XML_TOK_TEXT_ORDERED_LIST: +// bOrdered = TRUE; +// case XML_TOK_TEXT_UNORDERED_LIST: +// pContext = new SwXMLListBlockContext( GetSwImport(),nPrefix, rLocalName, +// xAttrList, bOrdered ); +// break; case XML_TOK_BODY_TRACKED_CHANGES : { pChangeTrackingImportHelper = GetScImport().GetChangeTrackingImportHelper(); @@ -269,9 +269,9 @@ void ScXMLBodyContext::EndElement() pContext->EndElement(); } GetScImport().LockSolarMutex(); - ScMyImpDetectiveOpArray* pDetOpArray = GetScImport().GetDetectiveOpArray(); - ScDocument* pDoc = GetScImport().GetDocument(); - ScMyImpDetectiveOp aDetOp; + ScMyImpDetectiveOpArray* pDetOpArray = GetScImport().GetDetectiveOpArray(); + ScDocument* pDoc = GetScImport().GetDocument(); + ScMyImpDetectiveOp aDetOp; if (pDoc && GetScImport().GetModel().is()) { diff --git a/sc/source/filter/xml/xmlbodyi.hxx b/sc/source/filter/xml/xmlbodyi.hxx index 7e643221b934..f0060eb59cb5 100644 --- a/sc/source/filter/xml/xmlbodyi.hxx +++ b/sc/source/filter/xml/xmlbodyi.hxx @@ -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 @@ -39,13 +39,13 @@ class ScXMLChangeTrackingImportHelper; class ScXMLBodyContext : public SvXMLImportContext { - rtl::OUString sPassword; + rtl::OUString sPassword; ScPasswordHash meHash1; ScPasswordHash meHash2; - sal_Bool bProtected; + sal_Bool bProtected; sal_Bool bHadCalculationSettings; - ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; + ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx index cc3588a3c249..35f78f7a632b 100644 --- a/sc/source/filter/xml/xmlcelli.cxx +++ b/sc/source/filter/xml/xmlcelli.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 @@ #include <i18npool/lang.h> #include <comphelper/extract.hxx> -#define SC_CURRENCYSYMBOL "CurrencySymbol" +#define SC_CURRENCYSYMBOL "CurrencySymbol" using namespace com::sun::star; using namespace xmloff::token; @@ -712,7 +712,7 @@ void ScXMLTableRowCellContext::SetDetectiveObj( const table::CellAddress& rPosit if( CellExists(rPosition) && pDetectiveObjVec && pDetectiveObjVec->size() ) { LockSolarMutex(); - ScDetectiveFunc aDetFunc( rXMLImport.GetDocument(), rPosition.Sheet ); + ScDetectiveFunc aDetFunc( rXMLImport.GetDocument(), rPosition.Sheet ); uno::Reference<container::XIndexAccess> xShapesIndex (rXMLImport.GetTables().GetCurrentXShapes(), uno::UNO_QUERY); // make draw page ScMyImpDetectiveObjVec::iterator aItr(pDetectiveObjVec->begin()); ScMyImpDetectiveObjVec::iterator aEndItr(pDetectiveObjVec->end()); @@ -827,7 +827,7 @@ void ScXMLTableRowCellContext::EndElement() bIsEmpty = sal_True; } sal_Bool bWasEmpty = bIsEmpty; -// uno::Reference <table::XCell> xCell; +// uno::Reference <table::XCell> xCell; table::CellAddress aCurrentPos( aCellPos ); if ((pContentValidationName && pContentValidationName->getLength()) || mxAnnotationData.get() || pDetectiveObjVec || pCellRangeSource) @@ -858,7 +858,7 @@ void ScXMLTableRowCellContext::EndElement() // { // try // { - // xCell.set(xCellRange->getCellByPosition(aCurrentPos.Column, aCurrentPos.Row)); + // xCell.set(xCellRange->getCellByPosition(aCurrentPos.Column, aCurrentPos.Row)); // } // catch (lang::IndexOutOfBoundsException&) // { diff --git a/sc/source/filter/xml/xmlcelli.hxx b/sc/source/filter/xml/xmlcelli.hxx index 7bfe5c932796..6c6524174d5a 100644 --- a/sc/source/filter/xml/xmlcelli.hxx +++ b/sc/source/filter/xml/xmlcelli.hxx @@ -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 @@ -58,25 +58,25 @@ class ScXMLTableRowCellContext : public SvXMLImportContext ::boost::optional< FormulaWithNamespace > pOUFormula; rtl::OUString* pContentValidationName; ::std::auto_ptr< ScXMLAnnotationData > mxAnnotationData; - ScMyImpDetectiveObjVec* pDetectiveObjVec; - ScMyImpCellRangeSource* pCellRangeSource; - double fValue; - sal_Int32 nMergedRows, nMergedCols; - sal_Int32 nMatrixRows, nMatrixCols; - sal_Int32 nRepeatedRows; - sal_Int32 nCellsRepeated; + ScMyImpDetectiveObjVec* pDetectiveObjVec; + ScMyImpCellRangeSource* pCellRangeSource; + double fValue; + sal_Int32 nMergedRows, nMergedCols; + sal_Int32 nMatrixRows, nMatrixCols; + sal_Int32 nRepeatedRows; + sal_Int32 nCellsRepeated; ScXMLImport& rXMLImport; formula::FormulaGrammar::Grammar eGrammar; - sal_Int16 nCellType; - sal_Bool bIsMerged; - sal_Bool bIsMatrix; - sal_Bool bHasSubTable; - sal_Bool bIsCovered; - sal_Bool bIsEmpty; - sal_Bool bHasTextImport; - sal_Bool bIsFirstTextImport; - sal_Bool bSolarMutexLocked; - sal_Bool bFormulaTextResult; + sal_Int16 nCellType; + sal_Bool bIsMerged; + sal_Bool bIsMatrix; + sal_Bool bHasSubTable; + sal_Bool bIsCovered; + sal_Bool bIsEmpty; + sal_Bool bHasTextImport; + sal_Bool bIsFirstTextImport; + sal_Bool bSolarMutexLocked; + sal_Bool bFormulaTextResult; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } diff --git a/sc/source/filter/xml/xmlcoli.cxx b/sc/source/filter/xml/xmlcoli.cxx index 4b05c89dc4e2..93112790364b 100644 --- a/sc/source/filter/xml/xmlcoli.cxx +++ b/sc/source/filter/xml/xmlcoli.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 @@ -120,14 +120,14 @@ SvXMLImportContext *ScXMLTableColContext::CreateChildContext( USHORT nPrefix, switch( rTokenMap.Get( nPrefix, rLName ) ) { case XML_TOK_TABLE_ROW_CELL: -// if( IsInsertCellPossible() ) +// if( IsInsertCellPossible() ) pContext = new ScXMLTableRowCellContext( GetScImport(), nPrefix, rLName, xAttrList//, //this ); break; case XML_TOK_TABLE_ROW_COVERED_CELL: -// if( IsInsertCellPossible() ) +// if( IsInsertCellPossible() ) pContext = new ScXMLTableRowCellContext( GetScImport(), nPrefix, rLName, xAttrList//, //this diff --git a/sc/source/filter/xml/xmlcoli.hxx b/sc/source/filter/xml/xmlcoli.hxx index 295f1ba41278..f72712b9e33e 100644 --- a/sc/source/filter/xml/xmlcoli.hxx +++ b/sc/source/filter/xml/xmlcoli.hxx @@ -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 @@ -35,10 +35,10 @@ class ScXMLImport; class ScXMLTableColContext : public SvXMLImportContext { - sal_Int32 nColCount; - rtl::OUString sStyleName; - rtl::OUString sVisibility; - rtl::OUString sCellStyleName; + sal_Int32 nColCount; + rtl::OUString sStyleName; + rtl::OUString sVisibility; + rtl::OUString sCellStyleName; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -62,13 +62,13 @@ public: class ScXMLTableColsContext : public SvXMLImportContext { - sal_Int32 nHeaderStartCol; - sal_Int32 nHeaderEndCol; - sal_Int32 nGroupStartCol; - sal_Int32 nGroupEndCol; - sal_Bool bHeader; - sal_Bool bGroup; - sal_Bool bGroupDisplay; + sal_Int32 nHeaderStartCol; + sal_Int32 nHeaderEndCol; + sal_Int32 nGroupStartCol; + sal_Int32 nGroupEndCol; + sal_Bool bHeader; + sal_Bool bGroup; + sal_Bool bGroupDisplay; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } diff --git a/sc/source/filter/xml/xmlconti.cxx b/sc/source/filter/xml/xmlconti.cxx index dfb34beab24c..36a9cff9a977 100644 --- a/sc/source/filter/xml/xmlconti.cxx +++ b/sc/source/filter/xml/xmlconti.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 diff --git a/sc/source/filter/xml/xmlconti.hxx b/sc/source/filter/xml/xmlconti.hxx index ffde3d98e51a..47c2410f6380 100644 --- a/sc/source/filter/xml/xmlconti.hxx +++ b/sc/source/filter/xml/xmlconti.hxx @@ -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 diff --git a/sc/source/filter/xml/xmlcvali.cxx b/sc/source/filter/xml/xmlcvali.cxx index 40f1a00000a0..bf485eca555a 100644 --- a/sc/source/filter/xml/xmlcvali.cxx +++ b/sc/source/filter/xml/xmlcvali.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 @@ -67,7 +67,7 @@ class ScXMLContentValidationContext : public SvXMLImportContext sal_Bool bDisplayHelp; sal_Bool bDisplayError; - SvXMLImportContextRef xEventContext; + SvXMLImportContextRef xEventContext; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -100,10 +100,10 @@ public: class ScXMLHelpMessageContext : public SvXMLImportContext { - rtl::OUString sTitle; - rtl::OUStringBuffer sMessage; - sal_Int32 nParagraphCount; - sal_Bool bDisplay; + rtl::OUString sTitle; + rtl::OUStringBuffer sMessage; + sal_Int32 nParagraphCount; + sal_Bool bDisplay; ScXMLContentValidationContext* pValidationContext; @@ -130,11 +130,11 @@ public: class ScXMLErrorMessageContext : public SvXMLImportContext { - rtl::OUString sTitle; - rtl::OUStringBuffer sMessage; - rtl::OUString sMessageType; - sal_Int32 nParagraphCount; - sal_Bool bDisplay; + rtl::OUString sTitle; + rtl::OUStringBuffer sMessage; + rtl::OUString sMessageType; + sal_Int32 nParagraphCount; + sal_Bool bDisplay; ScXMLContentValidationContext* pValidationContext; @@ -161,10 +161,10 @@ public: class ScXMLErrorMacroContext : public SvXMLImportContext { - rtl::OUString sName; - sal_Bool bExecute; + rtl::OUString sName; + sal_Bool bExecute; - ScXMLContentValidationContext* pValidationContext; + ScXMLContentValidationContext* pValidationContext; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } diff --git a/sc/source/filter/xml/xmlcvali.hxx b/sc/source/filter/xml/xmlcvali.hxx index 2328a0ff7844..131b10e583bc 100644 --- a/sc/source/filter/xml/xmlcvali.hxx +++ b/sc/source/filter/xml/xmlcvali.hxx @@ -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 diff --git a/sc/source/filter/xml/xmldpimp.cxx b/sc/source/filter/xml/xmldpimp.cxx index 3f1af06fd309..d515637de971 100644 --- a/sc/source/filter/xml/xmldpimp.cxx +++ b/sc/source/filter/xml/xmldpimp.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 @@ -169,17 +169,17 @@ ScXMLDataPilotTableContext::ScXMLDataPilotTableContext( ScXMLImport& rImport, { sGrandTotal = sValue; if (IsXMLToken(sValue, XML_BOTH)) - { + { maRowGrandTotal.mbVisible = true; maColGrandTotal.mbVisible = true; } else if (IsXMLToken(sValue, XML_ROW)) - { + { maRowGrandTotal.mbVisible = true; maColGrandTotal.mbVisible = false; } else if (IsXMLToken(sValue, XML_COLUMN)) - { + { maRowGrandTotal.mbVisible = false; maColGrandTotal.mbVisible = true; } @@ -295,7 +295,7 @@ SvXMLImportContext *ScXMLDataPilotTableContext::CreateChildContext( USHORT nPref } void ScXMLDataPilotTableContext::SetButtons() -{ +{ ScDPOutputGeometry aGeometry(aTargetRangeAddress, bShowFilter, ScDPOutputGeometry::ODF); aGeometry.setColumnFieldCount(mnColFieldCount); aGeometry.setRowFieldCount(mnRowFieldCount); @@ -319,7 +319,7 @@ void ScXMLDataPilotTableContext::SetButtons() if (eType == ScDPOutputGeometry::Column || eType == ScDPOutputGeometry::Row) nMFlag |= SC_MF_BUTTON_POPUP; - // Use the cell's string value to see if this field contains a + // Use the cell's string value to see if this field contains a // hidden member. Isn't there a better way? GetString() is // quite expensive... String aCellStr; @@ -340,8 +340,8 @@ void ScXMLDataPilotTableContext::AddDimension(ScDPSaveDimension* pDim, bool bHas { if (pDPSave) { - // #91045# if a dimension with that name has already been inserted, - // mark the new one as duplicate + // #91045# if a dimension with that name has already been inserted, + // mark the new one as duplicate if ( !pDim->IsDataLayout() && pDPSave->GetExistingDimensionByName(pDim->GetName()) ) pDim->SetDupFlag( TRUE ); @@ -369,7 +369,7 @@ void ScXMLDataPilotTableContext::AddDimension(ScDPSaveDimension* pDim, bool bHas if (bHasHiddenMember) { - // the layout name takes priority over the original name, + // the layout name takes priority over the original name, // since this data is used against cell values. const OUString* pLayoutName = pDim->GetLayoutName(); if (pLayoutName) @@ -457,7 +457,7 @@ void ScXMLDataPilotTableContext::EndElement() pDPSave->SetRowGrand(maRowGrandTotal.mbVisible); pDPSave->SetColumnGrand(maColGrandTotal.mbVisible); if (maRowGrandTotal.maDisplayName.getLength()) - // TODO: Right now, we only support one grand total name for both + // TODO: Right now, we only support one grand total name for both // column and row totals. Take the value from the row total for // now. pDPSave->SetGrandTotalName(maRowGrandTotal.maDisplayName); @@ -801,7 +801,7 @@ ScXMLDataPilotGrandTotalContext::~ScXMLDataPilotGrandTotalContext() { } -SvXMLImportContext* ScXMLDataPilotGrandTotalContext::CreateChildContext( +SvXMLImportContext* ScXMLDataPilotGrandTotalContext::CreateChildContext( USHORT /*nPrefix*/, const ::rtl::OUString& /*rLocalName*/, const Reference<XAttributeList>& /*xAttrList*/ ) { return NULL; @@ -966,7 +966,7 @@ ScXMLDataPilotFieldContext::ScXMLDataPilotFieldContext( ScXMLImport& rImport, } } if (bHasName) - { + { pDim = new ScDPSaveDimension(String(sName), bDataLayout); if (aDisplayName.getLength()) pDim->SetLayoutName(aDisplayName); @@ -1042,7 +1042,7 @@ void ScXMLDataPilotFieldContext::EndElement() } pDataPilotTable->AddDimension(pDim, mbHasHiddenMember); if (bIsGroupField) - { + { ScDPNumGroupInfo aInfo; aInfo.Enable = sal_True; aInfo.DateValues = bDateValue; @@ -1756,7 +1756,7 @@ ScXMLDataPilotGroupContext::ScXMLDataPilotGroupContext( ScXMLImport& rImport, USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); rtl::OUString sValue = xAttrList->getValueByIndex( i ); - + if (nPrefix == XML_NAMESPACE_TABLE) { if (IsXMLToken(aLocalName, XML_NAME)) diff --git a/sc/source/filter/xml/xmldpimp.hxx b/sc/source/filter/xml/xmldpimp.hxx index 554853ff78ff..1e9ac075e70a 100644 --- a/sc/source/filter/xml/xmldpimp.hxx +++ b/sc/source/filter/xml/xmldpimp.hxx @@ -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 @@ -89,42 +89,42 @@ class ScXMLDataPilotTableContext : public SvXMLImportContext bool mbVisible; GrandTotalItem(); }; - ScDocument* pDoc; - ScDPObject* pDPObject; - ScDPSaveData* pDPSave; + ScDocument* pDoc; + ScDPObject* pDPObject; + ScDPSaveData* pDPSave; ScDPDimensionSaveData* pDPDimSaveData; GrandTotalItem maRowGrandTotal; GrandTotalItem maColGrandTotal; - rtl::OUString sDataPilotTableName; - rtl::OUString sApplicationData; - rtl::OUString sGrandTotal; - rtl::OUString sDatabaseName; - rtl::OUString sSourceObject; - rtl::OUString sServiceName; - rtl::OUString sServiceSourceName; - rtl::OUString sServiceSourceObject; - rtl::OUString sServiceUsername; - rtl::OUString sServicePassword; - rtl::OUString sButtons; - ScRange aSourceCellRangeAddress; - ScRange aTargetRangeAddress; - ScRange aFilterSourceRange; - ScAddress aFilterOutputPosition; - ScQueryParam aSourceQueryParam; - ScMySourceType nSourceType; + rtl::OUString sDataPilotTableName; + rtl::OUString sApplicationData; + rtl::OUString sGrandTotal; + rtl::OUString sDatabaseName; + rtl::OUString sSourceObject; + rtl::OUString sServiceName; + rtl::OUString sServiceSourceName; + rtl::OUString sServiceSourceObject; + rtl::OUString sServiceUsername; + rtl::OUString sServicePassword; + rtl::OUString sButtons; + ScRange aSourceCellRangeAddress; + ScRange aTargetRangeAddress; + ScRange aFilterSourceRange; + ScAddress aFilterOutputPosition; + ScQueryParam aSourceQueryParam; + ScMySourceType nSourceType; sal_uInt32 mnRowFieldCount; sal_uInt32 mnColFieldCount; sal_uInt32 mnPageFieldCount; sal_uInt32 mnDataFieldCount; - sal_Bool bIsNative; - sal_Bool bIgnoreEmptyRows; - sal_Bool bIdentifyCategories; - sal_Bool bUseRegularExpression; - sal_Bool bIsCaseSensitive; - sal_Bool bSkipDuplicates; - sal_Bool bFilterCopyOutputData; - sal_Bool bTargetRangeAddress; - sal_Bool bSourceCellRange; + sal_Bool bIsNative; + sal_Bool bIgnoreEmptyRows; + sal_Bool bIdentifyCategories; + sal_Bool bUseRegularExpression; + sal_Bool bIsCaseSensitive; + sal_Bool bSkipDuplicates; + sal_Bool bFilterCopyOutputData; + sal_Bool bTargetRangeAddress; + sal_Bool bSourceCellRange; sal_Bool bShowFilter; sal_Bool bDrillDown; sal_Bool bHeaderGridLayout; @@ -159,12 +159,12 @@ public: void SetServicePassword(const rtl::OUString& sValue) { sServicePassword = sValue; } void SetSourceCellRangeAddress(const ScRange& aValue) { aSourceCellRangeAddress = aValue; bSourceCellRange = sal_True; } void SetSourceQueryParam(const ScQueryParam& aValue) { aSourceQueryParam = aValue; } -// void SetFilterUseRegularExpressions(const sal_Bool bValue) { aSourceQueryParam.bRegExp = bValue; } +// void SetFilterUseRegularExpressions(const sal_Bool bValue) { aSourceQueryParam.bRegExp = bValue; } void SetFilterOutputPosition(const ScAddress& aValue) { aFilterOutputPosition = aValue; } void SetFilterCopyOutputData(const sal_Bool bValue) { bFilterCopyOutputData = bValue; } void SetFilterSourceRange(const ScRange& aValue) { aFilterSourceRange = aValue; } -// void SetFilterIsCaseSensitive(const sal_Bool bValue) { aSourceQueryParam.bCaseSens = bValue; } -// void SetFilterSkipDuplicates(const sal_Bool bValue) { aSourceQueryParam.bDuplicate = !bValue; } +// void SetFilterIsCaseSensitive(const sal_Bool bValue) { aSourceQueryParam.bCaseSens = bValue; } +// void SetFilterSkipDuplicates(const sal_Bool bValue) { aSourceQueryParam.bDuplicate = !bValue; } void AddDimension(ScDPSaveDimension* pDim, bool bHasHiddenMember); void AddGroupDim(const ScDPSaveNumGroupDimension& aNumGroupDim); void AddGroupDim(const ScDPSaveGroupDimension& aGroupDim); @@ -173,7 +173,7 @@ public: class ScXMLDPSourceSQLContext : public SvXMLImportContext { - ScXMLDataPilotTableContext* pDataPilotTable; + ScXMLDataPilotTableContext* pDataPilotTable; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -198,7 +198,7 @@ public: class ScXMLDPSourceTableContext : public SvXMLImportContext { - ScXMLDataPilotTableContext* pDataPilotTable; + ScXMLDataPilotTableContext* pDataPilotTable; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -223,7 +223,7 @@ public: class ScXMLDPSourceQueryContext : public SvXMLImportContext { - ScXMLDataPilotTableContext* pDataPilotTable; + ScXMLDataPilotTableContext* pDataPilotTable; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -248,7 +248,7 @@ public: class ScXMLSourceServiceContext : public SvXMLImportContext { - ScXMLDataPilotTableContext* pDataPilotTable; + ScXMLDataPilotTableContext* pDataPilotTable; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -281,11 +281,11 @@ class ScXMLDataPilotGrandTotalContext : public SvXMLImportContext ::rtl::OUString maDisplayName; Orientation meOrientation; bool mbVisible; - + public: - ScXMLDataPilotGrandTotalContext( + ScXMLDataPilotGrandTotalContext( ScXMLImport& rImport, USHORT nPrefix, const ::rtl::OUString& rLName, - const ::com::sun::star::uno::Reference< + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pTableContext ); @@ -301,7 +301,7 @@ public: class ScXMLSourceCellRangeContext : public SvXMLImportContext { - ScXMLDataPilotTableContext* pDataPilotTable; + ScXMLDataPilotTableContext* pDataPilotTable; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -332,8 +332,8 @@ struct ScXMLDataPilotGroup class ScXMLDataPilotFieldContext : public SvXMLImportContext { - ScXMLDataPilotTableContext* pDataPilotTable; - ScDPSaveDimension* pDim; + ScXMLDataPilotTableContext* pDataPilotTable; + ScDPSaveDimension* pDim; ::std::vector<ScXMLDataPilotGroup> aGroups; rtl::OUString sGroupSource; @@ -342,11 +342,11 @@ class ScXMLDataPilotFieldContext : public SvXMLImportContext double fStart; double fEnd; double fStep; - sal_Int32 nUsedHierarchy; + sal_Int32 nUsedHierarchy; sal_Int32 nGroupPart; - sal_Int16 nFunction; - sal_Int16 nOrientation; - sal_Bool bShowEmpty:1; + sal_Int16 nFunction; + sal_Int16 nOrientation; + sal_Bool bShowEmpty:1; sal_Bool bSelectedPage:1; sal_Bool bIsGroupField:1; sal_Bool bDateValue:1; @@ -382,7 +382,7 @@ public: void SetAutoShowInfo(const com::sun::star::sheet::DataPilotFieldAutoShowInfo& aInfo) { if (pDim) pDim->SetAutoShowInfo(&aInfo); } void SetSortInfo(const com::sun::star::sheet::DataPilotFieldSortInfo& aInfo) { if (pDim) pDim->SetSortInfo(&aInfo); } void SetLayoutInfo(const com::sun::star::sheet::DataPilotFieldLayoutInfo& aInfo) { if (pDim) pDim->SetLayoutInfo(&aInfo); } - void SetGrouping(const rtl::OUString& rGroupSource, const double& rStart, const double& rEnd, const double& rStep, + void SetGrouping(const rtl::OUString& rGroupSource, const double& rStart, const double& rEnd, const double& rStep, sal_Int32 nPart, sal_Bool bDate, sal_Bool bAutoSt, sal_Bool bAutoE) { bIsGroupField = sal_True; @@ -418,7 +418,7 @@ public: class ScXMLDataPilotLevelContext : public SvXMLImportContext { - ScXMLDataPilotFieldContext* pDataPilotField; + ScXMLDataPilotFieldContext* pDataPilotField; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -499,8 +499,8 @@ class ScXMLDataPilotSubTotalsContext : public SvXMLImportContext { ScXMLDataPilotFieldContext* pDataPilotField; - sal_Int16 nFunctionCount; - sal_uInt16* pFunctions; + sal_Int16 nFunctionCount; + sal_uInt16* pFunctions; ::rtl::OUString maDisplayName; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } @@ -530,7 +530,7 @@ public: class ScXMLDataPilotSubTotalContext : public SvXMLImportContext { - ScXMLDataPilotSubTotalsContext* pDataPilotSubTotals; + ScXMLDataPilotSubTotalsContext* pDataPilotSubTotals; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -580,12 +580,12 @@ public: class ScXMLDataPilotMemberContext : public SvXMLImportContext { - ScXMLDataPilotFieldContext* pDataPilotField; + ScXMLDataPilotFieldContext* pDataPilotField; rtl::OUString sName; rtl::OUString maDisplayName; - sal_Bool bDisplay; - sal_Bool bDisplayDetails; + sal_Bool bDisplay; + sal_Bool bDisplayDetails; sal_Bool bHasName; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } @@ -611,7 +611,7 @@ public: class ScXMLDataPilotGroupsContext : public SvXMLImportContext { - ScXMLDataPilotFieldContext* pDataPilotField; + ScXMLDataPilotFieldContext* pDataPilotField; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -636,7 +636,7 @@ public: class ScXMLDataPilotGroupContext : public SvXMLImportContext { - ScXMLDataPilotFieldContext* pDataPilotField; + ScXMLDataPilotFieldContext* pDataPilotField; rtl::OUString sName; ::std::vector<rtl::OUString> aMembers; @@ -666,7 +666,7 @@ public: class ScXMLDataPilotGroupMemberContext : public SvXMLImportContext { - ScXMLDataPilotGroupContext* pDataPilotGroup; + ScXMLDataPilotGroupContext* pDataPilotGroup; rtl::OUString sName; diff --git a/sc/source/filter/xml/xmldrani.cxx b/sc/source/filter/xml/xmldrani.cxx index 33c19be9a824..8f517cc57a5a 100644 --- a/sc/source/filter/xml/xmldrani.cxx +++ b/sc/source/filter/xml/xmldrani.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 @@ -62,9 +62,9 @@ #include <com/sun/star/uno/RuntimeException.hpp> #include <com/sun/star/xml/sax/XLocator.hpp> -#define SC_ENABLEUSERSORTLIST "EnableUserSortList" -#define SC_USERSORTLISTINDEX "UserSortListIndex" -#define SC_USERLIST "UserList" +#define SC_ENABLEUSERSORTLIST "EnableUserSortList" +#define SC_USERSORTLISTINDEX "UserSortListIndex" +#define SC_USERLIST "UserList" using namespace com::sun::star; using namespace xmloff::token; diff --git a/sc/source/filter/xml/xmldrani.hxx b/sc/source/filter/xml/xmldrani.hxx index 7d2d5b2292eb..182b3638edda 100644 --- a/sc/source/filter/xml/xmldrani.hxx +++ b/sc/source/filter/xml/xmldrani.hxx @@ -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 @@ -71,11 +71,11 @@ struct ScSubTotalRule class ScXMLDatabaseRangeContext : public SvXMLImportContext { - rtl::OUString sDatabaseRangeName; + rtl::OUString sDatabaseRangeName; rtl::OUString sConnectionRessource; - rtl::OUString sRangeAddress; - rtl::OUString sDatabaseName; - rtl::OUString sSourceObject; + rtl::OUString sRangeAddress; + rtl::OUString sDatabaseName; + rtl::OUString sSourceObject; com::sun::star::uno::Sequence <com::sun::star::beans::PropertyValue> aSortSequence; com::sun::star::uno::Sequence <com::sun::star::sheet::TableFilterField2> aFilterFields; std::vector < ScSubTotalRule > aSubTotalRules; @@ -83,29 +83,29 @@ class ScXMLDatabaseRangeContext : public SvXMLImportContext com::sun::star::table::CellRangeAddress aFilterConditionSourceRangeAddress; com::sun::star::sheet::DataImportMode nSourceType; com::sun::star::table::TableOrientation eOrientation; - sal_Int32 nRefresh; - sal_Int16 nSubTotalsUserListIndex; - sal_Int16 nSubTotalRuleGroupFieldNumber; - sal_Bool bContainsSort; - sal_Bool bContainsSubTotal; - sal_Bool bNative; - sal_Bool bIsSelection; - sal_Bool bKeepFormats; - sal_Bool bMoveCells; - sal_Bool bStripData; - sal_Bool bContainsHeader; - sal_Bool bAutoFilter; - sal_Bool bSubTotalsBindFormatsToContent; - sal_Bool bSubTotalsIsCaseSensitive; - sal_Bool bSubTotalsInsertPageBreaks; - sal_Bool bSubTotalsSortGroups; - sal_Bool bSubTotalsEnabledUserList; - sal_Bool bSubTotalsAscending; - sal_Bool bFilterCopyOutputData; - sal_Bool bFilterIsCaseSensitive; - sal_Bool bFilterSkipDuplicates; - sal_Bool bFilterUseRegularExpressions; - sal_Bool bFilterConditionSourceRange; + sal_Int32 nRefresh; + sal_Int16 nSubTotalsUserListIndex; + sal_Int16 nSubTotalRuleGroupFieldNumber; + sal_Bool bContainsSort; + sal_Bool bContainsSubTotal; + sal_Bool bNative; + sal_Bool bIsSelection; + sal_Bool bKeepFormats; + sal_Bool bMoveCells; + sal_Bool bStripData; + sal_Bool bContainsHeader; + sal_Bool bAutoFilter; + sal_Bool bSubTotalsBindFormatsToContent; + sal_Bool bSubTotalsIsCaseSensitive; + sal_Bool bSubTotalsInsertPageBreaks; + sal_Bool bSubTotalsSortGroups; + sal_Bool bSubTotalsEnabledUserList; + sal_Bool bSubTotalsAscending; + sal_Bool bFilterCopyOutputData; + sal_Bool bFilterIsCaseSensitive; + sal_Bool bFilterSkipDuplicates; + sal_Bool bFilterUseRegularExpressions; + sal_Bool bFilterConditionSourceRange; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 2f31b209d375..1430be85368d 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -145,21 +145,21 @@ #define SC_STANDARDFORMAT "StandardFormat" #define SC_LAYERID "LayerID" -#define SC_DEFAULT_TABLE_COUNT 3 -#define SC_VIEWCHANGES_COUNT 13 -#define SC_SHOW_CHANGES 0 -#define SC_SHOW_ACCEPTED_CHANGES 1 -#define SC_SHOW_REJECTED_CHANGES 2 -#define SC_SHOW_CHANGES_BY_DATETIME 3 -#define SC_SHOW_CHANGES_BY_DATETIME_MODE 4 -#define SC_SHOW_CHANGES_BY_DATETIME_FIRST_DATETIME 5 -#define SC_SHOW_CHANGES_BY_DATETIME_SECOND_DATETIME 6 -#define SC_SHOW_CHANGES_BY_AUTHOR 7 -#define SC_SHOW_CHANGES_BY_AUTHOR_NAME 8 -#define SC_SHOW_CHANGES_BY_COMMENT 9 -#define SC_SHOW_CHANGES_BY_COMMENT_TEXT 10 -#define SC_SHOW_CHANGES_BY_RANGES 11 -#define SC_SHOW_CHANGES_BY_RANGES_LIST 12 +#define SC_DEFAULT_TABLE_COUNT 3 +#define SC_VIEWCHANGES_COUNT 13 +#define SC_SHOW_CHANGES 0 +#define SC_SHOW_ACCEPTED_CHANGES 1 +#define SC_SHOW_REJECTED_CHANGES 2 +#define SC_SHOW_CHANGES_BY_DATETIME 3 +#define SC_SHOW_CHANGES_BY_DATETIME_MODE 4 +#define SC_SHOW_CHANGES_BY_DATETIME_FIRST_DATETIME 5 +#define SC_SHOW_CHANGES_BY_DATETIME_SECOND_DATETIME 6 +#define SC_SHOW_CHANGES_BY_AUTHOR 7 +#define SC_SHOW_CHANGES_BY_AUTHOR_NAME 8 +#define SC_SHOW_CHANGES_BY_COMMENT 9 +#define SC_SHOW_CHANGES_BY_COMMENT_TEXT 10 +#define SC_SHOW_CHANGES_BY_RANGES 11 +#define SC_SHOW_CHANGES_BY_RANGES_LIST 12 using namespace rtl; using namespace formula; @@ -458,7 +458,7 @@ sal_Int16 ScXMLExport::GetFieldUnit() ScXMLExport::ScXMLExport( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceFactory, const sal_uInt16 nExportFlag) -: SvXMLExport( xServiceFactory, SvXMLUnitConverter::GetMapUnit(GetFieldUnit()), XML_SPREADSHEET, nExportFlag ), +: SvXMLExport( xServiceFactory, SvXMLUnitConverter::GetMapUnit(GetFieldUnit()), XML_SPREADSHEET, nExportFlag ), pDoc(NULL), nSourceStreamPos(0), pNumberFormatAttributesExportHelper(NULL), @@ -847,7 +847,7 @@ void ScXMLExport::_ExportMeta() void ScXMLExport::_ExportFontDecls() { - GetFontAutoStylePool(); // make sure the pool is created + GetFontAutoStylePool(); // make sure the pool is created SvXMLExport::_ExportFontDecls(); } @@ -1948,7 +1948,7 @@ void ScXMLExport::_ExportStyles( sal_Bool bUsed ) if (pSharedData->HasShapes()) { GetShapeExport()->ExportGraphicDefaults(); -/* xInterface = xMultiServiceFactory->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.Defaults"))); +/* xInterface = xMultiServiceFactory->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.Defaults"))); uno::Reference <beans::XPropertySet> xDrawProperties(xInterface, uno::UNO_QUERY); if (xDrawProperties.is()) aStylesExp.exportDefaultStyle(xDrawProperties, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_SD_GRAPHICS_NAME)), GetShapeExport()->CreateShapePropMapper(*this));*/ @@ -2756,10 +2756,10 @@ void ScXMLExport::CollectInternalShape( uno::Reference< drawing::XShape > xShape // other objects from internal layer only (detective) else if( pObject->GetLayer() == SC_LAYER_INTERN ) { - ScDetectiveFunc aDetFunc( pDoc, static_cast<SCTAB>(nCurrentTable) ); - ScAddress aPosition; - ScRange aSourceRange; - sal_Bool bRedLine; + ScDetectiveFunc aDetFunc( pDoc, static_cast<SCTAB>(nCurrentTable) ); + ScAddress aPosition; + ScRange aSourceRange; + sal_Bool bRedLine; ScDetectiveObjType eObjType = aDetFunc.GetDetectiveObjectType( pObject, nCurrentTable, aPosition, aSourceRange, bRedLine ); pSharedData->GetDetectiveObjContainer()->AddObject( eObjType, static_cast<SCTAB>(nCurrentTable), aPosition, aSourceRange, bRedLine ); @@ -2841,7 +2841,7 @@ sal_Bool ScXMLExport::IsMatrix (const ScAddress& aCell, return sal_False; -/* uno::Reference <sheet::XArrayFormulaRange> xArrayFormulaRange (xCell, uno::UNO_QUERY); +/* uno::Reference <sheet::XArrayFormulaRange> xArrayFormulaRange (xCell, uno::UNO_QUERY); if (xArrayFormulaRange.is()) { rtl::OUString sArrayFormula(xArrayFormulaRange->getArrayFormula()); @@ -2886,17 +2886,17 @@ sal_Bool ScXMLExport::GetCellText (ScMyCell& rMyCell, const ScAddress& aPos) con return sal_True; else { -/* if (!rMyCell.bHasXText) +/* if (!rMyCell.bHasXText) { rMyCell.xText.set(xCurrentTableCellRange->getCellByPosition(rMyCell.aCellAddress.Column, rMyCell.aCellAddress.Row), uno::UNO_QUERY); rMyCell.bHasXText = sal_True; }*/ -// if (rMyCell.xText.is()) -// { +// if (rMyCell.xText.is()) +// { rMyCell.sStringValue = ScCellObj::GetOutputString_Impl(pDoc, aPos); rMyCell.bHasStringValue = sal_True; return sal_True; -// } +// } } } @@ -3058,7 +3058,7 @@ void ScXMLExport::WriteCell (ScMyCell& aCell) void ScXMLExport::ExportShape(const uno::Reference < drawing::XShape >& xShape, awt::Point* pPoint) { uno::Reference < beans::XPropertySet > xShapeProps ( xShape, uno::UNO_QUERY ); -//BM sal_Bool bMemChart(sal_False); // das muss man jetzt umbenennen :-) +//BM sal_Bool bMemChart(sal_False); // das muss man jetzt umbenennen :-) bool bIsChart( false ); rtl::OUString sPropCLSID (RTL_CONSTASCII_USTRINGPARAM("CLSID")); rtl::OUString sPropModel (RTL_CONSTASCII_USTRINGPARAM("Model")); @@ -3147,50 +3147,50 @@ void ScXMLExport::ExportShape(const uno::Reference < drawing::XShape >& xShape, } } -//BM rtl::OUString sOUName; -//BM xShapeProps->getPropertyValue(sPersistName) >>= sOUName; -//BM String sName(sOUName); -//BM if (!pChartListener) -//BM { -//BM String aEmptyString; -//BM ScRange aRange; -//BM pChartListener = new ScChartListener ( aEmptyString, GetDocument(), aRange ); -//BM } -//BM if(pChartListener) -//BM { -//BM USHORT nIndex(0); -//BM pChartListener->SetString( sName ); -//BM if ( GetDocument() && GetDocument()->GetChartListenerCollection()->Search( pChartListener, nIndex ) ) -//BM { -//BM const ScRangeListRef& rRangeListRef(((ScChartListener*) -//BM (GetDocument()->GetChartListenerCollection()-> -//BM At( nIndex )))->GetRangeList()); -//BM if (rRangeListRef.Is()) -//BM { -//BM bMemChart = sal_True; -//BM rtl::OUString sRanges; -//BM ScRangeStringConverter::GetStringFromRangeList(sRanges, rRangeListRef, GetDocument()); +//BM rtl::OUString sOUName; +//BM xShapeProps->getPropertyValue(sPersistName) >>= sOUName; +//BM String sName(sOUName); +//BM if (!pChartListener) +//BM { +//BM String aEmptyString; +//BM ScRange aRange; +//BM pChartListener = new ScChartListener ( aEmptyString, GetDocument(), aRange ); +//BM } +//BM if(pChartListener) +//BM { +//BM USHORT nIndex(0); +//BM pChartListener->SetString( sName ); +//BM if ( GetDocument() && GetDocument()->GetChartListenerCollection()->Search( pChartListener, nIndex ) ) +//BM { +//BM const ScRangeListRef& rRangeListRef(((ScChartListener*) +//BM (GetDocument()->GetChartListenerCollection()-> +//BM At( nIndex )))->GetRangeList()); +//BM if (rRangeListRef.Is()) +//BM { +//BM bMemChart = sal_True; +//BM rtl::OUString sRanges; +//BM ScRangeStringConverter::GetStringFromRangeList(sRanges, rRangeListRef, GetDocument()); //BM SvXMLAttributeList* pAttrList = NULL; -//BM if (sRanges.getLength()) +//BM if (sRanges.getLength()) //BM { //BM pAttrList = new SvXMLAttributeList(); //BM pAttrList->AddAttribute( //BM GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_DRAW, GetXMLToken(XML_NOTIFY_ON_UPDATE_OF_RANGES) ), sRanges ); //BM } -//BM GetShapeExport()->exportShape(xShape, SEF_EXPORT_NO_CHART_DATA | SEF_DEFAULT, pPoint, pAttrList); -//BM } -//BM } -//BM else -//BM { -//BM bMemChart = sal_True; +//BM GetShapeExport()->exportShape(xShape, SEF_EXPORT_NO_CHART_DATA | SEF_DEFAULT, pPoint, pAttrList); +//BM } +//BM } +//BM else +//BM { +//BM bMemChart = sal_True; //BM SvXMLAttributeList* pAttrList = new SvXMLAttributeList(); //BM pAttrList->AddAttribute( //BM GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_DRAW, GetXMLToken(XML_NOTIFY_ON_UPDATE_OF_RANGES) ), rtl::OUString() ); -//BM GetShapeExport()->exportShape(xShape, SEF_EXPORT_NO_CHART_DATA | SEF_DEFAULT, pPoint, pAttrList); -//BM } -//BM } +//BM GetShapeExport()->exportShape(xShape, SEF_EXPORT_NO_CHART_DATA | SEF_DEFAULT, pPoint, pAttrList); +//BM } +//BM } -/* SchMemChart* pMemChart = pDoc->FindChartData(sName); +/* SchMemChart* pMemChart = pDoc->FindChartData(sName); if (pMemChart && pMemChart->GetSeriesAddresses().getLength()) { bMemChart = sal_True; @@ -3394,7 +3394,7 @@ void ScXMLExport::WriteAnnotation(ScMyCell& rMyCell) { if( rMyCell.bHasAnnotation && rMyCell.xAnnotation.is()) { -/* rtl::OUString sAuthor(rMyCell.xAnnotation->getAuthor()); +/* rtl::OUString sAuthor(rMyCell.xAnnotation->getAuthor()); if (sAuthor.getLength()) { SvXMLElementExport aCreatorElem( *this, XML_NAMESPACE_DC, @@ -3794,9 +3794,9 @@ void ScXMLExport::WriteScenario() { if (pDoc && pDoc->IsScenario(static_cast<SCTAB>(nCurrentTable))) { - String sComment; - Color aColor; - sal_uInt16 nFlags; + String sComment; + Color aColor; + sal_uInt16 nFlags; pDoc->GetScenarioData(static_cast<SCTAB>(nCurrentTable), sComment, aColor, nFlags); if (!(nFlags & SC_SCENARIO_SHOWFRAME)) AddAttribute(XML_NAMESPACE_TABLE, XML_DISPLAY_BORDER, XML_FALSE); diff --git a/sc/source/filter/xml/xmlexprt.hxx b/sc/source/filter/xml/xmlexprt.hxx index 07b494dce2af..e89deb8e0d62 100644 --- a/sc/source/filter/xml/xmlexprt.hxx +++ b/sc/source/filter/xml/xmlexprt.hxx @@ -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 @@ -70,44 +70,44 @@ typedef std::vector< com::sun::star::uno::Reference < com::sun::star::drawing::X class ScXMLExport : public SvXMLExport { - ScDocument* pDoc; + ScDocument* pDoc; com::sun::star::uno::Reference <com::sun::star::sheet::XSpreadsheet> xCurrentTable; com::sun::star::uno::Reference <com::sun::star::table::XCellRange> xCurrentTableCellRange; com::sun::star::uno::Reference<com::sun::star::io::XInputStream> xSourceStream; sal_Int32 nSourceStreamPos; - UniReference < XMLPropertyHandlerFactory > xScPropHdlFactory; - UniReference < XMLPropertySetMapper > xCellStylesPropertySetMapper; - UniReference < XMLPropertySetMapper > xColumnStylesPropertySetMapper; - UniReference < XMLPropertySetMapper > xRowStylesPropertySetMapper; - UniReference < XMLPropertySetMapper > xTableStylesPropertySetMapper; - UniReference < SvXMLExportPropertyMapper > xCellStylesExportPropertySetMapper; - UniReference < SvXMLExportPropertyMapper > xColumnStylesExportPropertySetMapper; - UniReference < SvXMLExportPropertyMapper > xRowStylesExportPropertySetMapper; - UniReference < SvXMLExportPropertyMapper > xTableStylesExportPropertySetMapper; + UniReference < XMLPropertyHandlerFactory > xScPropHdlFactory; + UniReference < XMLPropertySetMapper > xCellStylesPropertySetMapper; + UniReference < XMLPropertySetMapper > xColumnStylesPropertySetMapper; + UniReference < XMLPropertySetMapper > xRowStylesPropertySetMapper; + UniReference < XMLPropertySetMapper > xTableStylesPropertySetMapper; + UniReference < SvXMLExportPropertyMapper > xCellStylesExportPropertySetMapper; + UniReference < SvXMLExportPropertyMapper > xColumnStylesExportPropertySetMapper; + UniReference < SvXMLExportPropertyMapper > xRowStylesExportPropertySetMapper; + UniReference < SvXMLExportPropertyMapper > xTableStylesExportPropertySetMapper; XMLNumberFormatAttributesExportHelper* pNumberFormatAttributesExportHelper; typedef ::std::hash_map<sal_Int32, sal_Int32> NumberFormatIndexMap; NumberFormatIndexMap aNumFmtIndexMap; - ScMySharedData* pSharedData; - ScColumnStyles* pColumnStyles; - ScRowStyles* pRowStyles; - ScFormatRangeStyles* pCellStyles; - ScRowFormatRanges* pRowFormatRanges; - std::vector<rtl::OUString> aTableStyles; - com::sun::star::table::CellRangeAddress aRowHeaderRange; - ScMyOpenCloseColumnRowGroup* pGroupColumns; - ScMyOpenCloseColumnRowGroup* pGroupRows; - ScMyDefaultStyles* pDefaults; - ScChartListener* pChartListener; + ScMySharedData* pSharedData; + ScColumnStyles* pColumnStyles; + ScRowStyles* pRowStyles; + ScFormatRangeStyles* pCellStyles; + ScRowFormatRanges* pRowFormatRanges; + std::vector<rtl::OUString> aTableStyles; + com::sun::star::table::CellRangeAddress aRowHeaderRange; + ScMyOpenCloseColumnRowGroup* pGroupColumns; + ScMyOpenCloseColumnRowGroup* pGroupRows; + ScMyDefaultStyles* pDefaults; + ScChartListener* pChartListener; const ScMyCell* pCurrentCell; - ScMyMergedRangesContainer* pMergedRangesContainer; - ScMyValidationsContainer* pValidationsContainer; - ScMyNotEmptyCellsIterator* pCellsItr; - ScChangeTrackingExportHelper* pChangeTrackingExportHelper; - const rtl::OUString sLayerID; - const rtl::OUString sCaptionShape; + ScMyMergedRangesContainer* pMergedRangesContainer; + ScMyValidationsContainer* pValidationsContainer; + ScMyNotEmptyCellsIterator* pCellsItr; + ScChangeTrackingExportHelper* pChangeTrackingExportHelper; + const rtl::OUString sLayerID; + const rtl::OUString sCaptionShape; rtl::OUString sExternalRefTabStyleName; rtl::OUString sAttrName; rtl::OUString sAttrStyleName; @@ -121,19 +121,19 @@ class ScXMLExport : public SvXMLExport rtl::OUString sElemRow; rtl::OUString sElemTab; rtl::OUString sElemP; - sal_Int32 nOpenRow; + sal_Int32 nOpenRow; sal_Int32 nProgressCount; - sal_uInt16 nCurrentTable; - sal_Bool bHasRowHeader; - sal_Bool bRowHeaderOpen; - sal_Bool mbShowProgress; + sal_uInt16 nCurrentTable; + sal_Bool bHasRowHeader; + sal_Bool bRowHeaderOpen; + sal_Bool mbShowProgress; sal_Int32 GetNumberFormatStyleIndex(sal_Int32 nNumFmt) const; - sal_Bool HasDrawPages(com::sun::star::uno::Reference <com::sun::star::sheet::XSpreadsheetDocument>& xDoc); - void CollectSharedData(sal_Int32& nTableCount, sal_Int32& nShapesCount, const sal_Int32 nCellCount); - void CollectShapesAutoStyles(const sal_Int32 nTableCount); - void WriteTablesView(const com::sun::star::uno::Any& aTableView); - void WriteView(const com::sun::star::uno::Any& aView); + sal_Bool HasDrawPages(com::sun::star::uno::Reference <com::sun::star::sheet::XSpreadsheetDocument>& xDoc); + void CollectSharedData(sal_Int32& nTableCount, sal_Int32& nShapesCount, const sal_Int32 nCellCount); + void CollectShapesAutoStyles(const sal_Int32 nTableCount); + void WriteTablesView(const com::sun::star::uno::Any& aTableView); + void WriteView(const com::sun::star::uno::Any& aView); virtual void _ExportFontDecls(); virtual void _ExportStyles( sal_Bool bUsed ); virtual void _ExportAutoStyles(); @@ -146,7 +146,7 @@ class ScXMLExport : public SvXMLExport com::sun::star::table::CellRangeAddress GetEndAddress(const com::sun::star::uno::Reference<com::sun::star::sheet::XSpreadsheet>& xTable, const sal_Int32 nTable); -// ScMyEmptyDatabaseRangesContainer GetEmptyDatabaseRanges(); +// ScMyEmptyDatabaseRangesContainer GetEmptyDatabaseRanges(); void GetAreaLinks( com::sun::star::uno::Reference< com::sun::star::sheet::XSpreadsheetDocument>& xSpreadDoc, ScMyAreaLinksContainer& rAreaLinks ); void GetDetectiveOpList( ScMyDetectiveOpContainer& rDetOp ); void WriteSingleColumn(const sal_Int32 nRepeatColumns, const sal_Int32 nStyleIndex, @@ -196,12 +196,12 @@ class ScXMLExport : public SvXMLExport void WriteCalculationSettings(const com::sun::star::uno::Reference <com::sun::star::sheet::XSpreadsheetDocument>& xSpreadDoc); void WriteTableSource(); - void WriteScenario(); // core implementation + void WriteScenario(); // core implementation void WriteTheLabelRanges(const com::sun::star::uno::Reference< com::sun::star::sheet::XSpreadsheetDocument >& xSpreadDoc); void WriteLabelRanges( const com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >& xRangesIAccess, sal_Bool bColumn ); void WriteNamedExpressions(const com::sun::star::uno::Reference <com::sun::star::sheet::XSpreadsheetDocument>& xSpreadDoc); void WriteExternalRefCaches(); - void WriteConsolidation(); // core implementation + void WriteConsolidation(); // core implementation void CollectUserDefinedNamespaces(const SfxItemPool* pPool, sal_uInt16 nAttrib); @@ -234,8 +234,8 @@ public: virtual ~ScXMLExport(); static sal_Int16 GetFieldUnit(); - inline ScDocument* GetDocument() { return pDoc; } - inline const ScDocument* GetDocument() const { return pDoc; } + inline ScDocument* GetDocument() { return pDoc; } + inline const ScDocument* GetDocument() const { return pDoc; } sal_Bool IsMatrix (const ScAddress& aCell, com::sun::star::table::CellRangeAddress& aCellAddress, sal_Bool& bIsFirst) const; diff --git a/sc/source/filter/xml/xmlexternaltabi.cxx b/sc/source/filter/xml/xmlexternaltabi.cxx index 73c00cdc136b..86c0b2ffc2a1 100644 --- a/sc/source/filter/xml/xmlexternaltabi.cxx +++ b/sc/source/filter/xml/xmlexternaltabi.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 @@ -98,12 +98,12 @@ SvXMLImportContext* ScXMLExternalRefTabSourceContext::CreateChildContext( return new SvXMLImportContext(GetImport(), nPrefix, rLocalName); } -/** - * Make sure the URL is a valid relative URL, mainly to avoid storing - * absolute URL as relative URL by accident. For now, we only check the first - * three characters which are assumed to be always '../', because the relative - * URL for an external document is always in reference to the content.xml - * fragment of the original document. +/** + * Make sure the URL is a valid relative URL, mainly to avoid storing + * absolute URL as relative URL by accident. For now, we only check the first + * three characters which are assumed to be always '../', because the relative + * URL for an external document is always in reference to the content.xml + * fragment of the original document. */ static bool lcl_isValidRelativeURL(const OUString& rUrl) { @@ -232,7 +232,7 @@ void ScXMLExternalRefRowContext::EndElement() for (sal_Int32 i = 1; i < mnRepeatRowCount; ++i) { - // Performance: duplicates of a non-existent row will still not exist. + // Performance: duplicates of a non-existent row will still not exist. // Don't find that out for every cell. // External references often are a sparse matrix. if (i == 1 && !pTab->hasRow( mrExternalRefInfo.mnRow)) diff --git a/sc/source/filter/xml/xmlexternaltabi.hxx b/sc/source/filter/xml/xmlexternaltabi.hxx index 065933ce8108..4b4cfcd00770 100644 --- a/sc/source/filter/xml/xmlexternaltabi.hxx +++ b/sc/source/filter/xml/xmlexternaltabi.hxx @@ -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 diff --git a/sc/source/filter/xml/xmlfilti.cxx b/sc/source/filter/xml/xmlfilti.cxx index f30c4a87c5e7..2d5aa545f248 100644 --- a/sc/source/filter/xml/xmlfilti.cxx +++ b/sc/source/filter/xml/xmlfilti.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 @@ -519,7 +519,7 @@ void ScXMLDPFilterContext::EndElement() aFilterFields.bRegExp = bUseRegularExpressions; aFilterFields.bCaseSens = bIsCaseSensitive; aFilterFields.bDuplicate = !bSkipDuplicates; -// pDataPilotTable->SetFilterUseRegularExpressions(bUseRegularExpressions); +// pDataPilotTable->SetFilterUseRegularExpressions(bUseRegularExpressions); if (bCopyOutputData) { pDataPilotTable->SetFilterOutputPosition(aOutputPosition); @@ -527,8 +527,8 @@ void ScXMLDPFilterContext::EndElement() } else pDataPilotTable->SetFilterCopyOutputData(sal_False); -// pDataPilotTable->SetFilterIsCaseSensitive(bIsCaseSensitive); -// pDataPilotTable->SetFilterSkipDuplicates(bSkipDuplicates); +// pDataPilotTable->SetFilterIsCaseSensitive(bIsCaseSensitive); +// pDataPilotTable->SetFilterSkipDuplicates(bSkipDuplicates); pDataPilotTable->SetSourceQueryParam(aFilterFields); if (bConditionSourceRange) pDataPilotTable->SetFilterSourceRange(aConditionSourceRangeAddress); diff --git a/sc/source/filter/xml/xmlfilti.hxx b/sc/source/filter/xml/xmlfilti.hxx index 7bd5c1f331d3..e8eb69976ba9 100644 --- a/sc/source/filter/xml/xmlfilti.hxx +++ b/sc/source/filter/xml/xmlfilti.hxx @@ -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 @@ -50,16 +50,16 @@ class ScXMLFilterContext : public SvXMLImportContext com::sun::star::uno::Sequence <com::sun::star::sheet::TableFilterField2> aFilterFields; com::sun::star::table::CellAddress aOutputPosition; com::sun::star::table::CellRangeAddress aConditionSourceRangeAddress; - sal_Int16 nUserListIndex; - sal_Bool bSkipDuplicates; - sal_Bool bCopyOutputData; - sal_Bool bUseRegularExpressions; - sal_Bool bIsCaseSensitive; - sal_Bool bEnabledUserList; - sal_Bool bConnectionOr; - sal_Bool bNextConnectionOr; - sal_Bool bConditionSourceRange; - Stack aConnectionOrStack; + sal_Int16 nUserListIndex; + sal_Bool bSkipDuplicates; + sal_Bool bCopyOutputData; + sal_Bool bUseRegularExpressions; + sal_Bool bIsCaseSensitive; + sal_Bool bEnabledUserList; + sal_Bool bConnectionOr; + sal_Bool bNextConnectionOr; + sal_Bool bConditionSourceRange; + Stack aConnectionOrStack; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -149,8 +149,8 @@ class ScXMLConditionContext : public SvXMLImportContext rtl::OUString sDataType; rtl::OUString sConditionValue; rtl::OUString sOperator; - sal_Int32 nField; - sal_Bool bIsCaseSensitive; + sal_Int32 nField; + sal_Bool bIsCaseSensitive; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -178,22 +178,22 @@ public: class ScXMLDPFilterContext : public SvXMLImportContext { - ScXMLDataPilotTableContext* pDataPilotTable; - - ScQueryParam aFilterFields; - ScAddress aOutputPosition; - ScRange aConditionSourceRangeAddress; - sal_uInt8 nFilterFieldCount; - sal_Int16 nUserListIndex; - sal_Bool bSkipDuplicates; - sal_Bool bCopyOutputData; - sal_Bool bUseRegularExpressions; - sal_Bool bIsCaseSensitive; - sal_Bool bEnabledUserList; - sal_Bool bConnectionOr; - sal_Bool bNextConnectionOr; - sal_Bool bConditionSourceRange; - Stack aConnectionOrStack; + ScXMLDataPilotTableContext* pDataPilotTable; + + ScQueryParam aFilterFields; + ScAddress aOutputPosition; + ScRange aConditionSourceRangeAddress; + sal_uInt8 nFilterFieldCount; + sal_Int16 nUserListIndex; + sal_Bool bSkipDuplicates; + sal_Bool bCopyOutputData; + sal_Bool bUseRegularExpressions; + sal_Bool bIsCaseSensitive; + sal_Bool bEnabledUserList; + sal_Bool bConnectionOr; + sal_Bool bNextConnectionOr; + sal_Bool bConditionSourceRange; + Stack aConnectionOrStack; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -282,8 +282,8 @@ class ScXMLDPConditionContext : public SvXMLImportContext rtl::OUString sDataType; rtl::OUString sConditionValue; rtl::OUString sOperator; - sal_Int32 nField; - sal_Bool bIsCaseSensitive; + sal_Int32 nField; + sal_Bool bIsCaseSensitive; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } diff --git a/sc/source/filter/xml/xmlfonte.cxx b/sc/source/filter/xml/xmlfonte.cxx index ec9715c7131a..001cdbd2a704 100644 --- a/sc/source/filter/xml/xmlfonte.cxx +++ b/sc/source/filter/xml/xmlfonte.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 diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index b14b71f72540..5600150d4d73 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.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 @@ -95,9 +95,9 @@ #include <com/sun/star/io/XSeekable.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#define SC_LOCALE "Locale" -#define SC_STANDARDFORMAT "StandardFormat" -#define SC_CURRENCYSYMBOL "CurrencySymbol" +#define SC_LOCALE "Locale" +#define SC_STANDARDFORMAT "StandardFormat" +#define SC_CURRENCYSYMBOL "CurrencySymbol" #define SC_NAMEDRANGES "NamedRanges" #define SC_REPEAT_COLUMN "repeat-column" #define SC_REPEAT_ROW "repeat-row" @@ -430,14 +430,14 @@ const SvXMLTokenMap& ScXMLImport::GetDocElemTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aDocTokenMap[] = { - { XML_NAMESPACE_OFFICE, XML_FONT_FACE_DECLS, XML_TOK_DOC_FONTDECLS }, - { XML_NAMESPACE_OFFICE, XML_STYLES, XML_TOK_DOC_STYLES }, - { XML_NAMESPACE_OFFICE, XML_AUTOMATIC_STYLES, XML_TOK_DOC_AUTOSTYLES }, - { XML_NAMESPACE_OFFICE, XML_MASTER_STYLES, XML_TOK_DOC_MASTERSTYLES }, - { XML_NAMESPACE_OFFICE, XML_META, XML_TOK_DOC_META }, - { XML_NAMESPACE_OFFICE, XML_SCRIPTS, XML_TOK_DOC_SCRIPTS }, - { XML_NAMESPACE_OFFICE, XML_BODY, XML_TOK_DOC_BODY }, - { XML_NAMESPACE_OFFICE, XML_SETTINGS, XML_TOK_DOC_SETTINGS }, + { XML_NAMESPACE_OFFICE, XML_FONT_FACE_DECLS, XML_TOK_DOC_FONTDECLS }, + { XML_NAMESPACE_OFFICE, XML_STYLES, XML_TOK_DOC_STYLES }, + { XML_NAMESPACE_OFFICE, XML_AUTOMATIC_STYLES, XML_TOK_DOC_AUTOSTYLES }, + { XML_NAMESPACE_OFFICE, XML_MASTER_STYLES, XML_TOK_DOC_MASTERSTYLES }, + { XML_NAMESPACE_OFFICE, XML_META, XML_TOK_DOC_META }, + { XML_NAMESPACE_OFFICE, XML_SCRIPTS, XML_TOK_DOC_SCRIPTS }, + { XML_NAMESPACE_OFFICE, XML_BODY, XML_TOK_DOC_BODY }, + { XML_NAMESPACE_OFFICE, XML_SETTINGS, XML_TOK_DOC_SETTINGS }, XML_TOKEN_MAP_END }; @@ -455,17 +455,17 @@ const SvXMLTokenMap& ScXMLImport::GetBodyElemTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aBodyTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_TRACKED_CHANGES, XML_TOK_BODY_TRACKED_CHANGES }, - { XML_NAMESPACE_TABLE, XML_CALCULATION_SETTINGS, XML_TOK_BODY_CALCULATION_SETTINGS }, - { XML_NAMESPACE_TABLE, XML_CONTENT_VALIDATIONS, XML_TOK_BODY_CONTENT_VALIDATIONS }, - { XML_NAMESPACE_TABLE, XML_LABEL_RANGES, XML_TOK_BODY_LABEL_RANGES }, - { XML_NAMESPACE_TABLE, XML_TABLE, XML_TOK_BODY_TABLE }, - { XML_NAMESPACE_TABLE, XML_NAMED_EXPRESSIONS, XML_TOK_BODY_NAMED_EXPRESSIONS }, - { XML_NAMESPACE_TABLE, XML_DATABASE_RANGES, XML_TOK_BODY_DATABASE_RANGES }, - { XML_NAMESPACE_TABLE, XML_DATABASE_RANGE, XML_TOK_BODY_DATABASE_RANGE }, - { XML_NAMESPACE_TABLE, XML_DATA_PILOT_TABLES, XML_TOK_BODY_DATA_PILOT_TABLES }, - { XML_NAMESPACE_TABLE, XML_CONSOLIDATION, XML_TOK_BODY_CONSOLIDATION }, - { XML_NAMESPACE_TABLE, XML_DDE_LINKS, XML_TOK_BODY_DDE_LINKS }, + { XML_NAMESPACE_TABLE, XML_TRACKED_CHANGES, XML_TOK_BODY_TRACKED_CHANGES }, + { XML_NAMESPACE_TABLE, XML_CALCULATION_SETTINGS, XML_TOK_BODY_CALCULATION_SETTINGS }, + { XML_NAMESPACE_TABLE, XML_CONTENT_VALIDATIONS, XML_TOK_BODY_CONTENT_VALIDATIONS }, + { XML_NAMESPACE_TABLE, XML_LABEL_RANGES, XML_TOK_BODY_LABEL_RANGES }, + { XML_NAMESPACE_TABLE, XML_TABLE, XML_TOK_BODY_TABLE }, + { XML_NAMESPACE_TABLE, XML_NAMED_EXPRESSIONS, XML_TOK_BODY_NAMED_EXPRESSIONS }, + { XML_NAMESPACE_TABLE, XML_DATABASE_RANGES, XML_TOK_BODY_DATABASE_RANGES }, + { XML_NAMESPACE_TABLE, XML_DATABASE_RANGE, XML_TOK_BODY_DATABASE_RANGE }, + { XML_NAMESPACE_TABLE, XML_DATA_PILOT_TABLES, XML_TOK_BODY_DATA_PILOT_TABLES }, + { XML_NAMESPACE_TABLE, XML_CONSOLIDATION, XML_TOK_BODY_CONSOLIDATION }, + { XML_NAMESPACE_TABLE, XML_DDE_LINKS, XML_TOK_BODY_DDE_LINKS }, XML_TOKEN_MAP_END }; @@ -481,7 +481,7 @@ const SvXMLTokenMap& ScXMLImport::GetContentValidationsElemTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aContentValidationsElemTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_CONTENT_VALIDATION, XML_TOK_CONTENT_VALIDATION }, + { XML_NAMESPACE_TABLE, XML_CONTENT_VALIDATION, XML_TOK_CONTENT_VALIDATION }, XML_TOKEN_MAP_END }; @@ -516,11 +516,11 @@ const SvXMLTokenMap& ScXMLImport::GetContentValidationAttrTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aContentValidationAttrTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_CONTENT_VALIDATION_NAME }, - { XML_NAMESPACE_TABLE, XML_CONDITION, XML_TOK_CONTENT_VALIDATION_CONDITION }, - { XML_NAMESPACE_TABLE, XML_BASE_CELL_ADDRESS, XML_TOK_CONTENT_VALIDATION_BASE_CELL_ADDRESS }, - { XML_NAMESPACE_TABLE, XML_ALLOW_EMPTY_CELL, XML_TOK_CONTENT_VALIDATION_ALLOW_EMPTY_CELL }, - { XML_NAMESPACE_TABLE, XML_DISPLAY_LIST, XML_TOK_CONTENT_VALIDATION_DISPLAY_LIST }, + { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_CONTENT_VALIDATION_NAME }, + { XML_NAMESPACE_TABLE, XML_CONDITION, XML_TOK_CONTENT_VALIDATION_CONDITION }, + { XML_NAMESPACE_TABLE, XML_BASE_CELL_ADDRESS, XML_TOK_CONTENT_VALIDATION_BASE_CELL_ADDRESS }, + { XML_NAMESPACE_TABLE, XML_ALLOW_EMPTY_CELL, XML_TOK_CONTENT_VALIDATION_ALLOW_EMPTY_CELL }, + { XML_NAMESPACE_TABLE, XML_DISPLAY_LIST, XML_TOK_CONTENT_VALIDATION_DISPLAY_LIST }, XML_TOKEN_MAP_END }; @@ -536,7 +536,7 @@ const SvXMLTokenMap& ScXMLImport::GetContentValidationMessageElemTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aContentValidationMessageElemTokenMap[] = { - { XML_NAMESPACE_TEXT, XML_P, XML_TOK_P }, + { XML_NAMESPACE_TEXT, XML_P, XML_TOK_P }, XML_TOKEN_MAP_END }; @@ -552,8 +552,8 @@ const SvXMLTokenMap& ScXMLImport::GetContentValidationHelpMessageAttrTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aContentValidationHelpMessageAttrTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_TITLE, XML_TOK_HELP_MESSAGE_ATTR_TITLE }, - { XML_NAMESPACE_TABLE, XML_DISPLAY, XML_TOK_HELP_MESSAGE_ATTR_DISPLAY }, + { XML_NAMESPACE_TABLE, XML_TITLE, XML_TOK_HELP_MESSAGE_ATTR_TITLE }, + { XML_NAMESPACE_TABLE, XML_DISPLAY, XML_TOK_HELP_MESSAGE_ATTR_DISPLAY }, XML_TOKEN_MAP_END }; @@ -569,9 +569,9 @@ const SvXMLTokenMap& ScXMLImport::GetContentValidationErrorMessageAttrTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aContentValidationErrorMessageAttrTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_TITLE, XML_TOK_ERROR_MESSAGE_ATTR_TITLE }, - { XML_NAMESPACE_TABLE, XML_DISPLAY, XML_TOK_ERROR_MESSAGE_ATTR_DISPLAY }, - { XML_NAMESPACE_TABLE, XML_MESSAGE_TYPE, XML_TOK_ERROR_MESSAGE_ATTR_MESSAGE_TYPE }, + { XML_NAMESPACE_TABLE, XML_TITLE, XML_TOK_ERROR_MESSAGE_ATTR_TITLE }, + { XML_NAMESPACE_TABLE, XML_DISPLAY, XML_TOK_ERROR_MESSAGE_ATTR_DISPLAY }, + { XML_NAMESPACE_TABLE, XML_MESSAGE_TYPE, XML_TOK_ERROR_MESSAGE_ATTR_MESSAGE_TYPE }, XML_TOKEN_MAP_END }; @@ -587,8 +587,8 @@ const SvXMLTokenMap& ScXMLImport::GetContentValidationErrorMacroAttrTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aContentValidationErrorMacroAttrTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_ERROR_MACRO_ATTR_NAME }, - { XML_NAMESPACE_TABLE, XML_EXECUTE, XML_TOK_ERROR_MACRO_ATTR_EXECUTE }, + { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_ERROR_MACRO_ATTR_NAME }, + { XML_NAMESPACE_TABLE, XML_EXECUTE, XML_TOK_ERROR_MACRO_ATTR_EXECUTE }, XML_TOKEN_MAP_END }; @@ -604,7 +604,7 @@ const SvXMLTokenMap& ScXMLImport::GetLabelRangesElemTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aLabelRangesElemTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_LABEL_RANGE, XML_TOK_LABEL_RANGE_ELEM }, + { XML_NAMESPACE_TABLE, XML_LABEL_RANGE, XML_TOK_LABEL_RANGE_ELEM }, XML_TOKEN_MAP_END }; @@ -620,9 +620,9 @@ const SvXMLTokenMap& ScXMLImport::GetLabelRangeAttrTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aLabelRangeAttrTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_LABEL_CELL_RANGE_ADDRESS, XML_TOK_LABEL_RANGE_ATTR_LABEL_RANGE }, - { XML_NAMESPACE_TABLE, XML_DATA_CELL_RANGE_ADDRESS, XML_TOK_LABEL_RANGE_ATTR_DATA_RANGE }, - { XML_NAMESPACE_TABLE, XML_ORIENTATION, XML_TOK_LABEL_RANGE_ATTR_ORIENTATION }, + { XML_NAMESPACE_TABLE, XML_LABEL_CELL_RANGE_ADDRESS, XML_TOK_LABEL_RANGE_ATTR_LABEL_RANGE }, + { XML_NAMESPACE_TABLE, XML_DATA_CELL_RANGE_ADDRESS, XML_TOK_LABEL_RANGE_ATTR_DATA_RANGE }, + { XML_NAMESPACE_TABLE, XML_ORIENTATION, XML_TOK_LABEL_RANGE_ATTR_ORIENTATION }, XML_TOKEN_MAP_END }; @@ -638,19 +638,19 @@ const SvXMLTokenMap& ScXMLImport::GetTableElemTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aTableTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_TABLE_COLUMN_GROUP, XML_TOK_TABLE_COL_GROUP }, - { XML_NAMESPACE_TABLE, XML_TABLE_HEADER_COLUMNS, XML_TOK_TABLE_HEADER_COLS }, - { XML_NAMESPACE_TABLE, XML_TABLE_COLUMNS, XML_TOK_TABLE_COLS }, - { XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, XML_TOK_TABLE_COL }, + { XML_NAMESPACE_TABLE, XML_TABLE_COLUMN_GROUP, XML_TOK_TABLE_COL_GROUP }, + { XML_NAMESPACE_TABLE, XML_TABLE_HEADER_COLUMNS, XML_TOK_TABLE_HEADER_COLS }, + { XML_NAMESPACE_TABLE, XML_TABLE_COLUMNS, XML_TOK_TABLE_COLS }, + { XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, XML_TOK_TABLE_COL }, { XML_NAMESPACE_TABLE, XML_TABLE_PROTECTION, XML_TOK_TABLE_PROTECTION }, - { XML_NAMESPACE_TABLE, XML_TABLE_ROW_GROUP, XML_TOK_TABLE_ROW_GROUP }, - { XML_NAMESPACE_TABLE, XML_TABLE_HEADER_ROWS, XML_TOK_TABLE_HEADER_ROWS }, - { XML_NAMESPACE_TABLE, XML_TABLE_ROWS, XML_TOK_TABLE_ROWS }, - { XML_NAMESPACE_TABLE, XML_TABLE_ROW, XML_TOK_TABLE_ROW }, - { XML_NAMESPACE_TABLE, XML_TABLE_SOURCE, XML_TOK_TABLE_SOURCE }, - { XML_NAMESPACE_TABLE, XML_SCENARIO, XML_TOK_TABLE_SCENARIO }, - { XML_NAMESPACE_TABLE, XML_SHAPES, XML_TOK_TABLE_SHAPES }, - { XML_NAMESPACE_OFFICE, XML_FORMS, XML_TOK_TABLE_FORMS }, + { XML_NAMESPACE_TABLE, XML_TABLE_ROW_GROUP, XML_TOK_TABLE_ROW_GROUP }, + { XML_NAMESPACE_TABLE, XML_TABLE_HEADER_ROWS, XML_TOK_TABLE_HEADER_ROWS }, + { XML_NAMESPACE_TABLE, XML_TABLE_ROWS, XML_TOK_TABLE_ROWS }, + { XML_NAMESPACE_TABLE, XML_TABLE_ROW, XML_TOK_TABLE_ROW }, + { XML_NAMESPACE_TABLE, XML_TABLE_SOURCE, XML_TOK_TABLE_SOURCE }, + { XML_NAMESPACE_TABLE, XML_SCENARIO, XML_TOK_TABLE_SCENARIO }, + { XML_NAMESPACE_TABLE, XML_SHAPES, XML_TOK_TABLE_SHAPES }, + { XML_NAMESPACE_OFFICE, XML_FORMS, XML_TOK_TABLE_FORMS }, { XML_NAMESPACE_OFFICE, XML_EVENT_LISTENERS, XML_TOK_TABLE_EVENT_LISTENERS }, { XML_NAMESPACE_OFFICE_EXT, XML_EVENT_LISTENERS, XML_TOK_TABLE_EVENT_LISTENERS_EXT }, XML_TOKEN_MAP_END @@ -684,10 +684,10 @@ const SvXMLTokenMap& ScXMLImport::GetTableRowsElemTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aTableRowsElemTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_TABLE_ROW_GROUP, XML_TOK_TABLE_ROWS_ROW_GROUP }, - { XML_NAMESPACE_TABLE, XML_TABLE_HEADER_ROWS, XML_TOK_TABLE_ROWS_HEADER_ROWS }, - { XML_NAMESPACE_TABLE, XML_TABLE_ROWS, XML_TOK_TABLE_ROWS_ROWS }, - { XML_NAMESPACE_TABLE, XML_TABLE_ROW, XML_TOK_TABLE_ROWS_ROW }, + { XML_NAMESPACE_TABLE, XML_TABLE_ROW_GROUP, XML_TOK_TABLE_ROWS_ROW_GROUP }, + { XML_NAMESPACE_TABLE, XML_TABLE_HEADER_ROWS, XML_TOK_TABLE_ROWS_HEADER_ROWS }, + { XML_NAMESPACE_TABLE, XML_TABLE_ROWS, XML_TOK_TABLE_ROWS_ROWS }, + { XML_NAMESPACE_TABLE, XML_TABLE_ROW, XML_TOK_TABLE_ROWS_ROW }, XML_TOKEN_MAP_END }; @@ -703,10 +703,10 @@ const SvXMLTokenMap& ScXMLImport::GetTableColsElemTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aTableColsElemTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_TABLE_COLUMN_GROUP, XML_TOK_TABLE_COLS_COL_GROUP }, - { XML_NAMESPACE_TABLE, XML_TABLE_HEADER_COLUMNS, XML_TOK_TABLE_COLS_HEADER_COLS }, - { XML_NAMESPACE_TABLE, XML_TABLE_COLUMNS, XML_TOK_TABLE_COLS_COLS }, - { XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, XML_TOK_TABLE_COLS_COL }, + { XML_NAMESPACE_TABLE, XML_TABLE_COLUMN_GROUP, XML_TOK_TABLE_COLS_COL_GROUP }, + { XML_NAMESPACE_TABLE, XML_TABLE_HEADER_COLUMNS, XML_TOK_TABLE_COLS_HEADER_COLS }, + { XML_NAMESPACE_TABLE, XML_TABLE_COLUMNS, XML_TOK_TABLE_COLS_COLS }, + { XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, XML_TOK_TABLE_COLS_COL }, XML_TOKEN_MAP_END }; @@ -745,14 +745,14 @@ const SvXMLTokenMap& ScXMLImport::GetTableScenarioAttrTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aTableScenarioAttrTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_DISPLAY_BORDER, XML_TOK_TABLE_SCENARIO_ATTR_DISPLAY_BORDER }, - { XML_NAMESPACE_TABLE, XML_BORDER_COLOR, XML_TOK_TABLE_SCENARIO_ATTR_BORDER_COLOR }, - { XML_NAMESPACE_TABLE, XML_COPY_BACK, XML_TOK_TABLE_SCENARIO_ATTR_COPY_BACK }, - { XML_NAMESPACE_TABLE, XML_COPY_STYLES, XML_TOK_TABLE_SCENARIO_ATTR_COPY_STYLES }, - { XML_NAMESPACE_TABLE, XML_COPY_FORMULAS, XML_TOK_TABLE_SCENARIO_ATTR_COPY_FORMULAS }, - { XML_NAMESPACE_TABLE, XML_IS_ACTIVE, XML_TOK_TABLE_SCENARIO_ATTR_IS_ACTIVE }, - { XML_NAMESPACE_TABLE, XML_SCENARIO_RANGES, XML_TOK_TABLE_SCENARIO_ATTR_SCENARIO_RANGES }, - { XML_NAMESPACE_TABLE, XML_COMMENT, XML_TOK_TABLE_SCENARIO_ATTR_COMMENT }, + { XML_NAMESPACE_TABLE, XML_DISPLAY_BORDER, XML_TOK_TABLE_SCENARIO_ATTR_DISPLAY_BORDER }, + { XML_NAMESPACE_TABLE, XML_BORDER_COLOR, XML_TOK_TABLE_SCENARIO_ATTR_BORDER_COLOR }, + { XML_NAMESPACE_TABLE, XML_COPY_BACK, XML_TOK_TABLE_SCENARIO_ATTR_COPY_BACK }, + { XML_NAMESPACE_TABLE, XML_COPY_STYLES, XML_TOK_TABLE_SCENARIO_ATTR_COPY_STYLES }, + { XML_NAMESPACE_TABLE, XML_COPY_FORMULAS, XML_TOK_TABLE_SCENARIO_ATTR_COPY_FORMULAS }, + { XML_NAMESPACE_TABLE, XML_IS_ACTIVE, XML_TOK_TABLE_SCENARIO_ATTR_IS_ACTIVE }, + { XML_NAMESPACE_TABLE, XML_SCENARIO_RANGES, XML_TOK_TABLE_SCENARIO_ATTR_SCENARIO_RANGES }, + { XML_NAMESPACE_TABLE, XML_COMMENT, XML_TOK_TABLE_SCENARIO_ATTR_COMMENT }, { XML_NAMESPACE_TABLE, XML_PROTECTED, XML_TOK_TABLE_SCENARIO_ATTR_PROTECTED }, XML_TOKEN_MAP_END }; @@ -769,9 +769,9 @@ const SvXMLTokenMap& ScXMLImport::GetTableColAttrTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aTableColAttrTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_STYLE_NAME, XML_TOK_TABLE_COL_ATTR_STYLE_NAME }, - { XML_NAMESPACE_TABLE, XML_NUMBER_COLUMNS_REPEATED, XML_TOK_TABLE_COL_ATTR_REPEATED }, - { XML_NAMESPACE_TABLE, XML_VISIBILITY, XML_TOK_TABLE_COL_ATTR_VISIBILITY }, + { XML_NAMESPACE_TABLE, XML_STYLE_NAME, XML_TOK_TABLE_COL_ATTR_STYLE_NAME }, + { XML_NAMESPACE_TABLE, XML_NUMBER_COLUMNS_REPEATED, XML_TOK_TABLE_COL_ATTR_REPEATED }, + { XML_NAMESPACE_TABLE, XML_VISIBILITY, XML_TOK_TABLE_COL_ATTR_VISIBILITY }, { XML_NAMESPACE_TABLE, XML_DEFAULT_CELL_STYLE_NAME, XML_TOK_TABLE_COL_ATTR_DEFAULT_CELL_STYLE_NAME }, XML_TOKEN_MAP_END }; @@ -788,8 +788,8 @@ const SvXMLTokenMap& ScXMLImport::GetTableRowElemTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aTableRowTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_TABLE_CELL, XML_TOK_TABLE_ROW_CELL }, - { XML_NAMESPACE_TABLE, XML_COVERED_TABLE_CELL, XML_TOK_TABLE_ROW_COVERED_CELL }, + { XML_NAMESPACE_TABLE, XML_TABLE_CELL, XML_TOK_TABLE_ROW_CELL }, + { XML_NAMESPACE_TABLE, XML_COVERED_TABLE_CELL, XML_TOK_TABLE_ROW_COVERED_CELL }, XML_TOKEN_MAP_END }; @@ -805,11 +805,11 @@ const SvXMLTokenMap& ScXMLImport::GetTableRowAttrTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aTableRowAttrTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_STYLE_NAME, XML_TOK_TABLE_ROW_ATTR_STYLE_NAME }, - { XML_NAMESPACE_TABLE, XML_VISIBILITY, XML_TOK_TABLE_ROW_ATTR_VISIBILITY }, - { XML_NAMESPACE_TABLE, XML_NUMBER_ROWS_REPEATED, XML_TOK_TABLE_ROW_ATTR_REPEATED }, - { XML_NAMESPACE_TABLE, XML_DEFAULT_CELL_STYLE_NAME, XML_TOK_TABLE_ROW_ATTR_DEFAULT_CELL_STYLE_NAME }, - // { XML_NAMESPACE_TABLE, XML_USE_OPTIMAL_HEIGHT, XML_TOK_TABLE_ROW_ATTR_USE_OPTIMAL_HEIGHT }, + { XML_NAMESPACE_TABLE, XML_STYLE_NAME, XML_TOK_TABLE_ROW_ATTR_STYLE_NAME }, + { XML_NAMESPACE_TABLE, XML_VISIBILITY, XML_TOK_TABLE_ROW_ATTR_VISIBILITY }, + { XML_NAMESPACE_TABLE, XML_NUMBER_ROWS_REPEATED, XML_TOK_TABLE_ROW_ATTR_REPEATED }, + { XML_NAMESPACE_TABLE, XML_DEFAULT_CELL_STYLE_NAME, XML_TOK_TABLE_ROW_ATTR_DEFAULT_CELL_STYLE_NAME }, + // { XML_NAMESPACE_TABLE, XML_USE_OPTIMAL_HEIGHT, XML_TOK_TABLE_ROW_ATTR_USE_OPTIMAL_HEIGHT }, XML_TOKEN_MAP_END }; @@ -825,11 +825,11 @@ const SvXMLTokenMap& ScXMLImport::GetTableRowCellElemTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aTableRowCellTokenMap[] = { - { XML_NAMESPACE_TEXT, XML_P, XML_TOK_TABLE_ROW_CELL_P }, - { XML_NAMESPACE_TABLE, XML_SUB_TABLE, XML_TOK_TABLE_ROW_CELL_TABLE }, - { XML_NAMESPACE_OFFICE, XML_ANNOTATION, XML_TOK_TABLE_ROW_CELL_ANNOTATION }, - { XML_NAMESPACE_TABLE, XML_DETECTIVE, XML_TOK_TABLE_ROW_CELL_DETECTIVE }, - { XML_NAMESPACE_TABLE, XML_CELL_RANGE_SOURCE, XML_TOK_TABLE_ROW_CELL_CELL_RANGE_SOURCE }, + { XML_NAMESPACE_TEXT, XML_P, XML_TOK_TABLE_ROW_CELL_P }, + { XML_NAMESPACE_TABLE, XML_SUB_TABLE, XML_TOK_TABLE_ROW_CELL_TABLE }, + { XML_NAMESPACE_OFFICE, XML_ANNOTATION, XML_TOK_TABLE_ROW_CELL_ANNOTATION }, + { XML_NAMESPACE_TABLE, XML_DETECTIVE, XML_TOK_TABLE_ROW_CELL_DETECTIVE }, + { XML_NAMESPACE_TABLE, XML_CELL_RANGE_SOURCE, XML_TOK_TABLE_ROW_CELL_CELL_RANGE_SOURCE }, XML_TOKEN_MAP_END }; @@ -845,10 +845,10 @@ const SvXMLTokenMap& ScXMLImport::GetTableAnnotationAttrTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aTableAnnotationAttrTokenMap[] = { - { XML_NAMESPACE_OFFICE, XML_AUTHOR, XML_TOK_TABLE_ANNOTATION_ATTR_AUTHOR }, - { XML_NAMESPACE_OFFICE, XML_CREATE_DATE, XML_TOK_TABLE_ANNOTATION_ATTR_CREATE_DATE }, - { XML_NAMESPACE_OFFICE, XML_CREATE_DATE_STRING, XML_TOK_TABLE_ANNOTATION_ATTR_CREATE_DATE_STRING }, - { XML_NAMESPACE_OFFICE, XML_DISPLAY, XML_TOK_TABLE_ANNOTATION_ATTR_DISPLAY }, + { XML_NAMESPACE_OFFICE, XML_AUTHOR, XML_TOK_TABLE_ANNOTATION_ATTR_AUTHOR }, + { XML_NAMESPACE_OFFICE, XML_CREATE_DATE, XML_TOK_TABLE_ANNOTATION_ATTR_CREATE_DATE }, + { XML_NAMESPACE_OFFICE, XML_CREATE_DATE_STRING, XML_TOK_TABLE_ANNOTATION_ATTR_CREATE_DATE_STRING }, + { XML_NAMESPACE_OFFICE, XML_DISPLAY, XML_TOK_TABLE_ANNOTATION_ATTR_DISPLAY }, { XML_NAMESPACE_SVG, XML_X, XML_TOK_TABLE_ANNOTATION_ATTR_X }, { XML_NAMESPACE_SVG, XML_Y, XML_TOK_TABLE_ANNOTATION_ATTR_Y }, XML_TOKEN_MAP_END @@ -866,8 +866,8 @@ const SvXMLTokenMap& ScXMLImport::GetDetectiveElemTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aDetectiveElemTokenMap[]= { - { XML_NAMESPACE_TABLE, XML_HIGHLIGHTED_RANGE, XML_TOK_DETECTIVE_ELEM_HIGHLIGHTED }, - { XML_NAMESPACE_TABLE, XML_OPERATION, XML_TOK_DETECTIVE_ELEM_OPERATION }, + { XML_NAMESPACE_TABLE, XML_HIGHLIGHTED_RANGE, XML_TOK_DETECTIVE_ELEM_HIGHLIGHTED }, + { XML_NAMESPACE_TABLE, XML_OPERATION, XML_TOK_DETECTIVE_ELEM_OPERATION }, XML_TOKEN_MAP_END }; @@ -883,10 +883,10 @@ const SvXMLTokenMap& ScXMLImport::GetDetectiveHighlightedAttrTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aDetectiveHighlightedAttrTokenMap[]= { - { XML_NAMESPACE_TABLE, XML_CELL_RANGE_ADDRESS, XML_TOK_DETECTIVE_HIGHLIGHTED_ATTR_CELL_RANGE }, - { XML_NAMESPACE_TABLE, XML_DIRECTION, XML_TOK_DETECTIVE_HIGHLIGHTED_ATTR_DIRECTION }, - { XML_NAMESPACE_TABLE, XML_CONTAINS_ERROR, XML_TOK_DETECTIVE_HIGHLIGHTED_ATTR_CONTAINS_ERROR }, - { XML_NAMESPACE_TABLE, XML_MARKED_INVALID, XML_TOK_DETECTIVE_HIGHLIGHTED_ATTR_MARKED_INVALID }, + { XML_NAMESPACE_TABLE, XML_CELL_RANGE_ADDRESS, XML_TOK_DETECTIVE_HIGHLIGHTED_ATTR_CELL_RANGE }, + { XML_NAMESPACE_TABLE, XML_DIRECTION, XML_TOK_DETECTIVE_HIGHLIGHTED_ATTR_DIRECTION }, + { XML_NAMESPACE_TABLE, XML_CONTAINS_ERROR, XML_TOK_DETECTIVE_HIGHLIGHTED_ATTR_CONTAINS_ERROR }, + { XML_NAMESPACE_TABLE, XML_MARKED_INVALID, XML_TOK_DETECTIVE_HIGHLIGHTED_ATTR_MARKED_INVALID }, XML_TOKEN_MAP_END }; @@ -902,8 +902,8 @@ const SvXMLTokenMap& ScXMLImport::GetDetectiveOperationAttrTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aDetectiveOperationAttrTokenMap[]= { - { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_DETECTIVE_OPERATION_ATTR_NAME }, - { XML_NAMESPACE_TABLE, XML_INDEX, XML_TOK_DETECTIVE_OPERATION_ATTR_INDEX }, + { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_DETECTIVE_OPERATION_ATTR_NAME }, + { XML_NAMESPACE_TABLE, XML_INDEX, XML_TOK_DETECTIVE_OPERATION_ATTR_INDEX }, XML_TOKEN_MAP_END }; @@ -919,13 +919,13 @@ const SvXMLTokenMap& ScXMLImport::GetTableCellRangeSourceAttrTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aTableCellRangeSourceAttrTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_NAME }, - { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_HREF }, - { XML_NAMESPACE_TABLE, XML_FILTER_NAME, XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_FILTER_NAME }, - { XML_NAMESPACE_TABLE, XML_FILTER_OPTIONS, XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_FILTER_OPTIONS }, - { XML_NAMESPACE_TABLE, XML_LAST_COLUMN_SPANNED, XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_LAST_COLUMN }, - { XML_NAMESPACE_TABLE, XML_LAST_ROW_SPANNED, XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_LAST_ROW }, - { XML_NAMESPACE_TABLE, XML_REFRESH_DELAY, XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_REFRESH_DELAY }, + { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_NAME }, + { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_HREF }, + { XML_NAMESPACE_TABLE, XML_FILTER_NAME, XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_FILTER_NAME }, + { XML_NAMESPACE_TABLE, XML_FILTER_OPTIONS, XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_FILTER_OPTIONS }, + { XML_NAMESPACE_TABLE, XML_LAST_COLUMN_SPANNED, XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_LAST_COLUMN }, + { XML_NAMESPACE_TABLE, XML_LAST_ROW_SPANNED, XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_LAST_ROW }, + { XML_NAMESPACE_TABLE, XML_REFRESH_DELAY, XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_REFRESH_DELAY }, XML_TOKEN_MAP_END }; @@ -941,8 +941,8 @@ const SvXMLTokenMap& ScXMLImport::GetNamedExpressionsElemTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aNamedExpressionsTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_NAMED_RANGE, XML_TOK_NAMED_EXPRESSIONS_NAMED_RANGE }, - { XML_NAMESPACE_TABLE, XML_NAMED_EXPRESSION, XML_TOK_NAMED_EXPRESSIONS_NAMED_EXPRESSION }, + { XML_NAMESPACE_TABLE, XML_NAMED_RANGE, XML_TOK_NAMED_EXPRESSIONS_NAMED_RANGE }, + { XML_NAMESPACE_TABLE, XML_NAMED_EXPRESSION, XML_TOK_NAMED_EXPRESSIONS_NAMED_EXPRESSION }, XML_TOKEN_MAP_END }; @@ -958,10 +958,10 @@ const SvXMLTokenMap& ScXMLImport::GetNamedRangeAttrTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aNamedRangeAttrTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_NAMED_RANGE_ATTR_NAME }, - { XML_NAMESPACE_TABLE, XML_CELL_RANGE_ADDRESS, XML_TOK_NAMED_RANGE_ATTR_CELL_RANGE_ADDRESS }, - { XML_NAMESPACE_TABLE, XML_BASE_CELL_ADDRESS, XML_TOK_NAMED_RANGE_ATTR_BASE_CELL_ADDRESS }, - { XML_NAMESPACE_TABLE, XML_RANGE_USABLE_AS, XML_TOK_NAMED_RANGE_ATTR_RANGE_USABLE_AS }, + { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_NAMED_RANGE_ATTR_NAME }, + { XML_NAMESPACE_TABLE, XML_CELL_RANGE_ADDRESS, XML_TOK_NAMED_RANGE_ATTR_CELL_RANGE_ADDRESS }, + { XML_NAMESPACE_TABLE, XML_BASE_CELL_ADDRESS, XML_TOK_NAMED_RANGE_ATTR_BASE_CELL_ADDRESS }, + { XML_NAMESPACE_TABLE, XML_RANGE_USABLE_AS, XML_TOK_NAMED_RANGE_ATTR_RANGE_USABLE_AS }, XML_TOKEN_MAP_END }; @@ -977,9 +977,9 @@ const SvXMLTokenMap& ScXMLImport::GetNamedExpressionAttrTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aNamedExpressionAttrTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_NAMED_EXPRESSION_ATTR_NAME }, - { XML_NAMESPACE_TABLE, XML_BASE_CELL_ADDRESS, XML_TOK_NAMED_EXPRESSION_ATTR_BASE_CELL_ADDRESS }, - { XML_NAMESPACE_TABLE, XML_EXPRESSION, XML_TOK_NAMED_EXPRESSION_ATTR_EXPRESSION }, + { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_NAMED_EXPRESSION_ATTR_NAME }, + { XML_NAMESPACE_TABLE, XML_BASE_CELL_ADDRESS, XML_TOK_NAMED_EXPRESSION_ATTR_BASE_CELL_ADDRESS }, + { XML_NAMESPACE_TABLE, XML_EXPRESSION, XML_TOK_NAMED_EXPRESSION_ATTR_EXPRESSION }, XML_TOKEN_MAP_END }; @@ -995,7 +995,7 @@ const SvXMLTokenMap& ScXMLImport::GetDatabaseRangesElemTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aDatabaseRangesTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_DATABASE_RANGE, XML_TOK_DATABASE_RANGE }, + { XML_NAMESPACE_TABLE, XML_DATABASE_RANGE, XML_TOK_DATABASE_RANGE }, XML_TOKEN_MAP_END }; @@ -1011,12 +1011,12 @@ const SvXMLTokenMap& ScXMLImport::GetDatabaseRangeElemTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aDatabaseRangeTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_SQL, XML_TOK_DATABASE_RANGE_SOURCE_SQL }, - { XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_TABLE, XML_TOK_DATABASE_RANGE_SOURCE_TABLE }, - { XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_QUERY, XML_TOK_DATABASE_RANGE_SOURCE_QUERY }, - { XML_NAMESPACE_TABLE, XML_FILTER, XML_TOK_FILTER }, - { XML_NAMESPACE_TABLE, XML_SORT, XML_TOK_SORT }, - { XML_NAMESPACE_TABLE, XML_SUBTOTAL_RULES, XML_TOK_DATABASE_RANGE_SUBTOTAL_RULES }, + { XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_SQL, XML_TOK_DATABASE_RANGE_SOURCE_SQL }, + { XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_TABLE, XML_TOK_DATABASE_RANGE_SOURCE_TABLE }, + { XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_QUERY, XML_TOK_DATABASE_RANGE_SOURCE_QUERY }, + { XML_NAMESPACE_TABLE, XML_FILTER, XML_TOK_FILTER }, + { XML_NAMESPACE_TABLE, XML_SORT, XML_TOK_SORT }, + { XML_NAMESPACE_TABLE, XML_SUBTOTAL_RULES, XML_TOK_DATABASE_RANGE_SUBTOTAL_RULES }, XML_TOKEN_MAP_END }; @@ -1032,16 +1032,16 @@ const SvXMLTokenMap& ScXMLImport::GetDatabaseRangeAttrTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aDatabaseRangeAttrTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_DATABASE_RANGE_ATTR_NAME }, - { XML_NAMESPACE_TABLE, XML_IS_SELECTION, XML_TOK_DATABASE_RANGE_ATTR_IS_SELECTION }, - { XML_NAMESPACE_TABLE, XML_ON_UPDATE_KEEP_STYLES, XML_TOK_DATABASE_RANGE_ATTR_ON_UPDATE_KEEP_STYLES }, - { XML_NAMESPACE_TABLE, XML_ON_UPDATE_KEEP_SIZE, XML_TOK_DATABASE_RANGE_ATTR_ON_UPDATE_KEEP_SIZE }, - { XML_NAMESPACE_TABLE, XML_HAS_PERSISTENT_DATA, XML_TOK_DATABASE_RANGE_ATTR_HAS_PERSISTENT_DATA }, - { XML_NAMESPACE_TABLE, XML_ORIENTATION, XML_TOK_DATABASE_RANGE_ATTR_ORIENTATION }, - { XML_NAMESPACE_TABLE, XML_CONTAINS_HEADER, XML_TOK_DATABASE_RANGE_ATTR_CONTAINS_HEADER }, - { XML_NAMESPACE_TABLE, XML_DISPLAY_FILTER_BUTTONS, XML_TOK_DATABASE_RANGE_ATTR_DISPLAY_FILTER_BUTTONS }, - { XML_NAMESPACE_TABLE, XML_TARGET_RANGE_ADDRESS, XML_TOK_DATABASE_RANGE_ATTR_TARGET_RANGE_ADDRESS }, - { XML_NAMESPACE_TABLE, XML_REFRESH_DELAY, XML_TOK_DATABASE_RANGE_ATTR_REFRESH_DELAY }, + { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_DATABASE_RANGE_ATTR_NAME }, + { XML_NAMESPACE_TABLE, XML_IS_SELECTION, XML_TOK_DATABASE_RANGE_ATTR_IS_SELECTION }, + { XML_NAMESPACE_TABLE, XML_ON_UPDATE_KEEP_STYLES, XML_TOK_DATABASE_RANGE_ATTR_ON_UPDATE_KEEP_STYLES }, + { XML_NAMESPACE_TABLE, XML_ON_UPDATE_KEEP_SIZE, XML_TOK_DATABASE_RANGE_ATTR_ON_UPDATE_KEEP_SIZE }, + { XML_NAMESPACE_TABLE, XML_HAS_PERSISTENT_DATA, XML_TOK_DATABASE_RANGE_ATTR_HAS_PERSISTENT_DATA }, + { XML_NAMESPACE_TABLE, XML_ORIENTATION, XML_TOK_DATABASE_RANGE_ATTR_ORIENTATION }, + { XML_NAMESPACE_TABLE, XML_CONTAINS_HEADER, XML_TOK_DATABASE_RANGE_ATTR_CONTAINS_HEADER }, + { XML_NAMESPACE_TABLE, XML_DISPLAY_FILTER_BUTTONS, XML_TOK_DATABASE_RANGE_ATTR_DISPLAY_FILTER_BUTTONS }, + { XML_NAMESPACE_TABLE, XML_TARGET_RANGE_ADDRESS, XML_TOK_DATABASE_RANGE_ATTR_TARGET_RANGE_ADDRESS }, + { XML_NAMESPACE_TABLE, XML_REFRESH_DELAY, XML_TOK_DATABASE_RANGE_ATTR_REFRESH_DELAY }, XML_TOKEN_MAP_END }; @@ -1057,11 +1057,11 @@ const SvXMLTokenMap& ScXMLImport::GetDatabaseRangeSourceSQLAttrTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aDatabaseRangeSourceSQLAttrTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_DATABASE_NAME, XML_TOK_SOURCE_SQL_ATTR_DATABASE_NAME }, + { XML_NAMESPACE_TABLE, XML_DATABASE_NAME, XML_TOK_SOURCE_SQL_ATTR_DATABASE_NAME }, { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_SOURCE_SQL_ATTR_HREF }, { XML_NAMESPACE_TABLE, XML_CONNECTION_RESOURCE, XML_TOK_SOURCE_SQL_ATTR_CONNECTION_RESSOURCE}, - { XML_NAMESPACE_TABLE, XML_SQL_STATEMENT, XML_TOK_SOURCE_SQL_ATTR_SQL_STATEMENT }, - { XML_NAMESPACE_TABLE, XML_PARSE_SQL_STATEMENT, XML_TOK_SOURCE_SQL_ATTR_PARSE_SQL_STATEMENT }, + { XML_NAMESPACE_TABLE, XML_SQL_STATEMENT, XML_TOK_SOURCE_SQL_ATTR_SQL_STATEMENT }, + { XML_NAMESPACE_TABLE, XML_PARSE_SQL_STATEMENT, XML_TOK_SOURCE_SQL_ATTR_PARSE_SQL_STATEMENT }, XML_TOKEN_MAP_END }; @@ -1077,10 +1077,10 @@ const SvXMLTokenMap& ScXMLImport::GetDatabaseRangeSourceTableAttrTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aDatabaseRangeSourceTableAttrTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_DATABASE_NAME, XML_TOK_SOURCE_TABLE_ATTR_DATABASE_NAME }, + { XML_NAMESPACE_TABLE, XML_DATABASE_NAME, XML_TOK_SOURCE_TABLE_ATTR_DATABASE_NAME }, { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_SOURCE_TABLE_ATTR_HREF }, { XML_NAMESPACE_TABLE, XML_CONNECTION_RESOURCE, XML_TOK_SOURCE_TABLE_ATTR_CONNECTION_RESSOURCE }, - { XML_NAMESPACE_TABLE, XML_TABLE_NAME, XML_TOK_SOURCE_TABLE_ATTR_TABLE_NAME }, + { XML_NAMESPACE_TABLE, XML_TABLE_NAME, XML_TOK_SOURCE_TABLE_ATTR_TABLE_NAME }, XML_TOKEN_MAP_END }; @@ -1096,10 +1096,10 @@ const SvXMLTokenMap& ScXMLImport::GetDatabaseRangeSourceQueryAttrTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aDatabaseRangeSourceQueryAttrTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_DATABASE_NAME, XML_TOK_SOURCE_QUERY_ATTR_DATABASE_NAME }, + { XML_NAMESPACE_TABLE, XML_DATABASE_NAME, XML_TOK_SOURCE_QUERY_ATTR_DATABASE_NAME }, { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_SOURCE_QUERY_ATTR_HREF }, { XML_NAMESPACE_TABLE, XML_CONNECTION_RESOURCE, XML_TOK_SOURCE_QUERY_ATTR_CONNECTION_RESSOURCE }, - { XML_NAMESPACE_TABLE, XML_QUERY_NAME, XML_TOK_SOURCE_QUERY_ATTR_QUERY_NAME }, + { XML_NAMESPACE_TABLE, XML_QUERY_NAME, XML_TOK_SOURCE_QUERY_ATTR_QUERY_NAME }, XML_TOKEN_MAP_END }; @@ -1115,9 +1115,9 @@ const SvXMLTokenMap& ScXMLImport::GetFilterElemTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aFilterTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_FILTER_AND, XML_TOK_FILTER_AND }, - { XML_NAMESPACE_TABLE, XML_FILTER_OR, XML_TOK_FILTER_OR }, - { XML_NAMESPACE_TABLE, XML_FILTER_CONDITION, XML_TOK_FILTER_CONDITION }, + { XML_NAMESPACE_TABLE, XML_FILTER_AND, XML_TOK_FILTER_AND }, + { XML_NAMESPACE_TABLE, XML_FILTER_OR, XML_TOK_FILTER_OR }, + { XML_NAMESPACE_TABLE, XML_FILTER_CONDITION, XML_TOK_FILTER_CONDITION }, XML_TOKEN_MAP_END }; @@ -1133,10 +1133,10 @@ const SvXMLTokenMap& ScXMLImport::GetFilterAttrTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aFilterAttrTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_TARGET_RANGE_ADDRESS, XML_TOK_FILTER_ATTR_TARGET_RANGE_ADDRESS }, - { XML_NAMESPACE_TABLE, XML_CONDITION_SOURCE_RANGE_ADDRESS, XML_TOK_FILTER_ATTR_CONDITION_SOURCE_RANGE_ADDRESS }, - { XML_NAMESPACE_TABLE, XML_CONDITION_SOURCE, XML_TOK_FILTER_ATTR_CONDITION_SOURCE }, - { XML_NAMESPACE_TABLE, XML_DISPLAY_DUPLICATES, XML_TOK_FILTER_ATTR_DISPLAY_DUPLICATES }, + { XML_NAMESPACE_TABLE, XML_TARGET_RANGE_ADDRESS, XML_TOK_FILTER_ATTR_TARGET_RANGE_ADDRESS }, + { XML_NAMESPACE_TABLE, XML_CONDITION_SOURCE_RANGE_ADDRESS, XML_TOK_FILTER_ATTR_CONDITION_SOURCE_RANGE_ADDRESS }, + { XML_NAMESPACE_TABLE, XML_CONDITION_SOURCE, XML_TOK_FILTER_ATTR_CONDITION_SOURCE }, + { XML_NAMESPACE_TABLE, XML_DISPLAY_DUPLICATES, XML_TOK_FILTER_ATTR_DISPLAY_DUPLICATES }, XML_TOKEN_MAP_END }; @@ -1152,11 +1152,11 @@ const SvXMLTokenMap& ScXMLImport::GetFilterConditionAttrTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aFilterConditionAttrTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_FIELD_NUMBER, XML_TOK_CONDITION_ATTR_FIELD_NUMBER }, - { XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE, XML_TOK_CONDITION_ATTR_CASE_SENSITIVE }, - { XML_NAMESPACE_TABLE, XML_DATA_TYPE, XML_TOK_CONDITION_ATTR_DATA_TYPE }, - { XML_NAMESPACE_TABLE, XML_VALUE, XML_TOK_CONDITION_ATTR_VALUE }, - { XML_NAMESPACE_TABLE, XML_OPERATOR, XML_TOK_CONDITION_ATTR_OPERATOR }, + { XML_NAMESPACE_TABLE, XML_FIELD_NUMBER, XML_TOK_CONDITION_ATTR_FIELD_NUMBER }, + { XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE, XML_TOK_CONDITION_ATTR_CASE_SENSITIVE }, + { XML_NAMESPACE_TABLE, XML_DATA_TYPE, XML_TOK_CONDITION_ATTR_DATA_TYPE }, + { XML_NAMESPACE_TABLE, XML_VALUE, XML_TOK_CONDITION_ATTR_VALUE }, + { XML_NAMESPACE_TABLE, XML_OPERATOR, XML_TOK_CONDITION_ATTR_OPERATOR }, XML_TOKEN_MAP_END }; @@ -1172,7 +1172,7 @@ const SvXMLTokenMap& ScXMLImport::GetSortElemTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aSortTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_SORT_BY, XML_TOK_SORT_SORT_BY }, + { XML_NAMESPACE_TABLE, XML_SORT_BY, XML_TOK_SORT_SORT_BY }, XML_TOKEN_MAP_END }; @@ -1188,12 +1188,12 @@ const SvXMLTokenMap& ScXMLImport::GetSortAttrTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aSortAttrTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_BIND_STYLES_TO_CONTENT, XML_TOK_SORT_ATTR_BIND_STYLES_TO_CONTENT }, - { XML_NAMESPACE_TABLE, XML_TARGET_RANGE_ADDRESS, XML_TOK_SORT_ATTR_TARGET_RANGE_ADDRESS }, - { XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE, XML_TOK_SORT_ATTR_CASE_SENSITIVE }, - { XML_NAMESPACE_TABLE, XML_LANGUAGE, XML_TOK_SORT_ATTR_LANGUAGE }, - { XML_NAMESPACE_TABLE, XML_COUNTRY, XML_TOK_SORT_ATTR_COUNTRY }, - { XML_NAMESPACE_TABLE, XML_ALGORITHM, XML_TOK_SORT_ATTR_ALGORITHM }, + { XML_NAMESPACE_TABLE, XML_BIND_STYLES_TO_CONTENT, XML_TOK_SORT_ATTR_BIND_STYLES_TO_CONTENT }, + { XML_NAMESPACE_TABLE, XML_TARGET_RANGE_ADDRESS, XML_TOK_SORT_ATTR_TARGET_RANGE_ADDRESS }, + { XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE, XML_TOK_SORT_ATTR_CASE_SENSITIVE }, + { XML_NAMESPACE_TABLE, XML_LANGUAGE, XML_TOK_SORT_ATTR_LANGUAGE }, + { XML_NAMESPACE_TABLE, XML_COUNTRY, XML_TOK_SORT_ATTR_COUNTRY }, + { XML_NAMESPACE_TABLE, XML_ALGORITHM, XML_TOK_SORT_ATTR_ALGORITHM }, XML_TOKEN_MAP_END }; @@ -1209,9 +1209,9 @@ const SvXMLTokenMap& ScXMLImport::GetSortSortByAttrTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aSortSortByAttrTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_FIELD_NUMBER, XML_TOK_SORT_BY_ATTR_FIELD_NUMBER }, - { XML_NAMESPACE_TABLE, XML_DATA_TYPE, XML_TOK_SORT_BY_ATTR_DATA_TYPE }, - { XML_NAMESPACE_TABLE, XML_ORDER, XML_TOK_SORT_BY_ATTR_ORDER }, + { XML_NAMESPACE_TABLE, XML_FIELD_NUMBER, XML_TOK_SORT_BY_ATTR_FIELD_NUMBER }, + { XML_NAMESPACE_TABLE, XML_DATA_TYPE, XML_TOK_SORT_BY_ATTR_DATA_TYPE }, + { XML_NAMESPACE_TABLE, XML_ORDER, XML_TOK_SORT_BY_ATTR_ORDER }, XML_TOKEN_MAP_END }; @@ -1227,8 +1227,8 @@ const SvXMLTokenMap& ScXMLImport::GetDatabaseRangeSubTotalRulesElemTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aDatabaseRangeSubTotalRulesTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_SORT_GROUPS, XML_TOK_SUBTOTAL_RULES_SORT_GROUPS }, - { XML_NAMESPACE_TABLE, XML_SUBTOTAL_RULE, XML_TOK_SUBTOTAL_RULES_SUBTOTAL_RULE }, + { XML_NAMESPACE_TABLE, XML_SORT_GROUPS, XML_TOK_SUBTOTAL_RULES_SORT_GROUPS }, + { XML_NAMESPACE_TABLE, XML_SUBTOTAL_RULE, XML_TOK_SUBTOTAL_RULES_SUBTOTAL_RULE }, XML_TOKEN_MAP_END }; @@ -1244,9 +1244,9 @@ const SvXMLTokenMap& ScXMLImport::GetDatabaseRangeSubTotalRulesAttrTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aDatabaseRangeSubTotalRulesAttrTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_BIND_STYLES_TO_CONTENT, XML_TOK_SUBTOTAL_RULES_ATTR_BIND_STYLES_TO_CONTENT }, - { XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE, XML_TOK_SUBTOTAL_RULES_ATTR_CASE_SENSITIVE }, - { XML_NAMESPACE_TABLE, XML_PAGE_BREAKS_ON_GROUP_CHANGE, XML_TOK_SUBTOTAL_RULES_ATTR_PAGE_BREAKS_ON_GROUP_CHANGE }, + { XML_NAMESPACE_TABLE, XML_BIND_STYLES_TO_CONTENT, XML_TOK_SUBTOTAL_RULES_ATTR_BIND_STYLES_TO_CONTENT }, + { XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE, XML_TOK_SUBTOTAL_RULES_ATTR_CASE_SENSITIVE }, + { XML_NAMESPACE_TABLE, XML_PAGE_BREAKS_ON_GROUP_CHANGE, XML_TOK_SUBTOTAL_RULES_ATTR_PAGE_BREAKS_ON_GROUP_CHANGE }, XML_TOKEN_MAP_END }; @@ -1262,8 +1262,8 @@ const SvXMLTokenMap& ScXMLImport::GetSubTotalRulesSortGroupsAttrTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aSubTotalRulesSortGroupsAttrTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_DATA_TYPE, XML_TOK_SORT_GROUPS_ATTR_DATA_TYPE }, - { XML_NAMESPACE_TABLE, XML_ORDER, XML_TOK_SORT_GROUPS_ATTR_ORDER }, + { XML_NAMESPACE_TABLE, XML_DATA_TYPE, XML_TOK_SORT_GROUPS_ATTR_DATA_TYPE }, + { XML_NAMESPACE_TABLE, XML_ORDER, XML_TOK_SORT_GROUPS_ATTR_ORDER }, XML_TOKEN_MAP_END }; @@ -1279,7 +1279,7 @@ const SvXMLTokenMap& ScXMLImport::GetSubTotalRulesSubTotalRuleElemTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aSubTotalRulesSubTotalRuleTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_SUBTOTAL_FIELD, XML_TOK_SUBTOTAL_RULE_SUBTOTAL_FIELD }, + { XML_NAMESPACE_TABLE, XML_SUBTOTAL_FIELD, XML_TOK_SUBTOTAL_RULE_SUBTOTAL_FIELD }, XML_TOKEN_MAP_END }; @@ -1295,7 +1295,7 @@ const SvXMLTokenMap& ScXMLImport::GetSubTotalRulesSubTotalRuleAttrTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aSubTotalRulesSubTotalRuleAttrTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_GROUP_BY_FIELD_NUMBER, XML_TOK_SUBTOTAL_RULE_ATTR_GROUP_BY_FIELD_NUMBER }, + { XML_NAMESPACE_TABLE, XML_GROUP_BY_FIELD_NUMBER, XML_TOK_SUBTOTAL_RULE_ATTR_GROUP_BY_FIELD_NUMBER }, XML_TOKEN_MAP_END }; @@ -1311,8 +1311,8 @@ const SvXMLTokenMap& ScXMLImport::GetSubTotalRuleSubTotalFieldAttrTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aSubTotalRuleSubTotalFieldAttrTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_FIELD_NUMBER, XML_TOK_SUBTOTAL_FIELD_ATTR_FIELD_NUMBER }, - { XML_NAMESPACE_TABLE, XML_FUNCTION, XML_TOK_SUBTOTAL_FIELD_ATTR_FUNCTION }, + { XML_NAMESPACE_TABLE, XML_FIELD_NUMBER, XML_TOK_SUBTOTAL_FIELD_ATTR_FIELD_NUMBER }, + { XML_NAMESPACE_TABLE, XML_FUNCTION, XML_TOK_SUBTOTAL_FIELD_ATTR_FUNCTION }, XML_TOKEN_MAP_END }; @@ -1328,7 +1328,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotTablesElemTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aDataPilotTablesElemTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_DATA_PILOT_TABLE, XML_TOK_DATA_PILOT_TABLE }, + { XML_NAMESPACE_TABLE, XML_DATA_PILOT_TABLE, XML_TOK_DATA_PILOT_TABLE }, XML_TOKEN_MAP_END }; @@ -1344,15 +1344,15 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotTableAttrTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aDataPilotTableAttrTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_DATA_PILOT_TABLE_ATTR_NAME }, - { XML_NAMESPACE_TABLE, XML_APPLICATION_DATA, XML_TOK_DATA_PILOT_TABLE_ATTR_APPLICATION_DATA }, - { XML_NAMESPACE_TABLE, XML_GRAND_TOTAL, XML_TOK_DATA_PILOT_TABLE_ATTR_GRAND_TOTAL }, - { XML_NAMESPACE_TABLE, XML_IGNORE_EMPTY_ROWS, XML_TOK_DATA_PILOT_TABLE_ATTR_IGNORE_EMPTY_ROWS }, - { XML_NAMESPACE_TABLE, XML_IDENTIFY_CATEGORIES, XML_TOK_DATA_PILOT_TABLE_ATTR_IDENTIFY_CATEGORIES }, - { XML_NAMESPACE_TABLE, XML_TARGET_RANGE_ADDRESS, XML_TOK_DATA_PILOT_TABLE_ATTR_TARGET_RANGE_ADDRESS }, - { XML_NAMESPACE_TABLE, XML_BUTTONS, XML_TOK_DATA_PILOT_TABLE_ATTR_BUTTONS }, - { XML_NAMESPACE_TABLE, XML_SHOW_FILTER_BUTTON, XML_TOK_DATA_PILOT_TABLE_ATTR_SHOW_FILTER_BUTTON }, - { XML_NAMESPACE_TABLE, XML_DRILL_DOWN_ON_DOUBLE_CLICK, XML_TOK_DATA_PILOT_TABLE_ATTR_DRILL_DOWN }, + { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_DATA_PILOT_TABLE_ATTR_NAME }, + { XML_NAMESPACE_TABLE, XML_APPLICATION_DATA, XML_TOK_DATA_PILOT_TABLE_ATTR_APPLICATION_DATA }, + { XML_NAMESPACE_TABLE, XML_GRAND_TOTAL, XML_TOK_DATA_PILOT_TABLE_ATTR_GRAND_TOTAL }, + { XML_NAMESPACE_TABLE, XML_IGNORE_EMPTY_ROWS, XML_TOK_DATA_PILOT_TABLE_ATTR_IGNORE_EMPTY_ROWS }, + { XML_NAMESPACE_TABLE, XML_IDENTIFY_CATEGORIES, XML_TOK_DATA_PILOT_TABLE_ATTR_IDENTIFY_CATEGORIES }, + { XML_NAMESPACE_TABLE, XML_TARGET_RANGE_ADDRESS, XML_TOK_DATA_PILOT_TABLE_ATTR_TARGET_RANGE_ADDRESS }, + { XML_NAMESPACE_TABLE, XML_BUTTONS, XML_TOK_DATA_PILOT_TABLE_ATTR_BUTTONS }, + { XML_NAMESPACE_TABLE, XML_SHOW_FILTER_BUTTON, XML_TOK_DATA_PILOT_TABLE_ATTR_SHOW_FILTER_BUTTON }, + { XML_NAMESPACE_TABLE, XML_DRILL_DOWN_ON_DOUBLE_CLICK, XML_TOK_DATA_PILOT_TABLE_ATTR_DRILL_DOWN }, { XML_NAMESPACE_TABLE, XML_HEADER_GRID_LAYOUT, XML_TOK_DATA_PILOT_TABLE_ATTR_HEADER_GRID_LAYOUT }, XML_TOKEN_MAP_END }; @@ -1369,13 +1369,13 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotTableElemTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aDataPilotTableElemTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_SQL, XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_SQL }, - { XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_TABLE, XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_TABLE }, + { XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_SQL, XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_SQL }, + { XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_TABLE, XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_TABLE }, { XML_NAMESPACE_TABLE, XML_DATA_PILOT_GRAND_TOTAL, XML_TOK_DATA_PILOT_TABLE_ELEM_GRAND_TOTAL }, - { XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_QUERY, XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_QUERY }, - { XML_NAMESPACE_TABLE, XML_SOURCE_SERVICE, XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_SERVICE }, - { XML_NAMESPACE_TABLE, XML_SOURCE_CELL_RANGE, XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_CELL_RANGE }, - { XML_NAMESPACE_TABLE, XML_DATA_PILOT_FIELD, XML_TOK_DATA_PILOT_TABLE_ELEM_DATA_PILOT_FIELD }, + { XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_QUERY, XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_QUERY }, + { XML_NAMESPACE_TABLE, XML_SOURCE_SERVICE, XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_SERVICE }, + { XML_NAMESPACE_TABLE, XML_SOURCE_CELL_RANGE, XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_CELL_RANGE }, + { XML_NAMESPACE_TABLE, XML_DATA_PILOT_FIELD, XML_TOK_DATA_PILOT_TABLE_ELEM_DATA_PILOT_FIELD }, XML_TOKEN_MAP_END }; @@ -1391,10 +1391,10 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotTableSourceServiceAttrTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aDataPilotTableSourceServiceAttrTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_SOURCE_SERVICE_ATTR_NAME }, - { XML_NAMESPACE_TABLE, XML_SOURCE_NAME, XML_TOK_SOURCE_SERVICE_ATTR_SOURCE_NAME }, - { XML_NAMESPACE_TABLE, XML_OBJECT_NAME, XML_TOK_SOURCE_SERVICE_ATTR_OBJECT_NAME }, - { XML_NAMESPACE_TABLE, XML_USER_NAME, XML_TOK_SOURCE_SERVICE_ATTR_USER_NAME }, + { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_SOURCE_SERVICE_ATTR_NAME }, + { XML_NAMESPACE_TABLE, XML_SOURCE_NAME, XML_TOK_SOURCE_SERVICE_ATTR_SOURCE_NAME }, + { XML_NAMESPACE_TABLE, XML_OBJECT_NAME, XML_TOK_SOURCE_SERVICE_ATTR_OBJECT_NAME }, + { XML_NAMESPACE_TABLE, XML_USER_NAME, XML_TOK_SOURCE_SERVICE_ATTR_USER_NAME }, { XML_NAMESPACE_TABLE, XML_PASSWORD, XML_TOK_SOURCE_SERVICE_ATTR_PASSWORD }, XML_TOKEN_MAP_END }; @@ -1430,7 +1430,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotTableSourceCellRangeAttrTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aDataPilotTableSourceCellRangeAttrTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_CELL_RANGE_ADDRESS, XML_TOK_SOURCE_CELL_RANGE_ATTR_CELL_RANGE_ADDRESS}, + { XML_NAMESPACE_TABLE, XML_CELL_RANGE_ADDRESS, XML_TOK_SOURCE_CELL_RANGE_ATTR_CELL_RANGE_ADDRESS}, XML_TOKEN_MAP_END }; @@ -1446,7 +1446,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotTableSourceCellRangeElemTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aDataPilotTableSourceCellRangeElemTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_FILTER, XML_TOK_SOURCE_CELL_RANGE_ELEM_FILTER}, + { XML_NAMESPACE_TABLE, XML_FILTER, XML_TOK_SOURCE_CELL_RANGE_ELEM_FILTER}, XML_TOKEN_MAP_END }; @@ -1485,7 +1485,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotFieldElemTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aDataPilotFieldElemTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_DATA_PILOT_LEVEL, XML_TOK_DATA_PILOT_FIELD_ELEM_DATA_PILOT_LEVEL }, + { XML_NAMESPACE_TABLE, XML_DATA_PILOT_LEVEL, XML_TOK_DATA_PILOT_FIELD_ELEM_DATA_PILOT_LEVEL }, { XML_NAMESPACE_TABLE, XML_DATA_PILOT_FIELD_REFERENCE, XML_TOK_DATA_PILOT_FIELD_ELEM_DATA_PILOT_REFERENCE }, { XML_NAMESPACE_TABLE, XML_DATA_PILOT_GROUPS, XML_TOK_DATA_PILOT_FIELD_ELEM_DATA_PILOT_GROUPS }, XML_TOKEN_MAP_END @@ -1503,7 +1503,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotLevelAttrTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aDataPilotLevelAttrTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_SHOW_EMPTY, XML_TOK_DATA_PILOT_LEVEL_ATTR_SHOW_EMPTY }, + { XML_NAMESPACE_TABLE, XML_SHOW_EMPTY, XML_TOK_DATA_PILOT_LEVEL_ATTR_SHOW_EMPTY }, XML_TOKEN_MAP_END }; @@ -1519,11 +1519,11 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotLevelElemTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aDataPilotLevelElemTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_DATA_PILOT_SUBTOTALS, XML_TOK_DATA_PILOT_LEVEL_ELEM_DATA_PILOT_SUBTOTALS }, - { XML_NAMESPACE_TABLE, XML_DATA_PILOT_MEMBERS, XML_TOK_DATA_PILOT_LEVEL_ELEM_DATA_PILOT_MEMBERS }, - { XML_NAMESPACE_TABLE, XML_DATA_PILOT_DISPLAY_INFO, XML_TOK_DATA_PILOT_FIELD_ELEM_DATA_PILOT_DISPLAY_INFO }, - { XML_NAMESPACE_TABLE, XML_DATA_PILOT_SORT_INFO, XML_TOK_DATA_PILOT_FIELD_ELEM_DATA_PILOT_SORT_INFO }, - { XML_NAMESPACE_TABLE, XML_DATA_PILOT_LAYOUT_INFO, XML_TOK_DATA_PILOT_FIELD_ELEM_DATA_PILOT_LAYOUT_INFO }, + { XML_NAMESPACE_TABLE, XML_DATA_PILOT_SUBTOTALS, XML_TOK_DATA_PILOT_LEVEL_ELEM_DATA_PILOT_SUBTOTALS }, + { XML_NAMESPACE_TABLE, XML_DATA_PILOT_MEMBERS, XML_TOK_DATA_PILOT_LEVEL_ELEM_DATA_PILOT_MEMBERS }, + { XML_NAMESPACE_TABLE, XML_DATA_PILOT_DISPLAY_INFO, XML_TOK_DATA_PILOT_FIELD_ELEM_DATA_PILOT_DISPLAY_INFO }, + { XML_NAMESPACE_TABLE, XML_DATA_PILOT_SORT_INFO, XML_TOK_DATA_PILOT_FIELD_ELEM_DATA_PILOT_SORT_INFO }, + { XML_NAMESPACE_TABLE, XML_DATA_PILOT_LAYOUT_INFO, XML_TOK_DATA_PILOT_FIELD_ELEM_DATA_PILOT_LAYOUT_INFO }, XML_TOKEN_MAP_END }; @@ -1539,7 +1539,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotSubTotalsElemTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aDataPilotSubTotalsElemTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_DATA_PILOT_SUBTOTAL, XML_TOK_DATA_PILOT_SUBTOTALS_ELEM_DATA_PILOT_SUBTOTAL }, + { XML_NAMESPACE_TABLE, XML_DATA_PILOT_SUBTOTAL, XML_TOK_DATA_PILOT_SUBTOTALS_ELEM_DATA_PILOT_SUBTOTAL }, XML_TOKEN_MAP_END }; @@ -1573,7 +1573,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotMembersElemTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aDataPilotMembersElemTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_DATA_PILOT_MEMBER, XML_TOK_DATA_PILOT_MEMBERS_ELEM_DATA_PILOT_MEMBER }, + { XML_NAMESPACE_TABLE, XML_DATA_PILOT_MEMBER, XML_TOK_DATA_PILOT_MEMBERS_ELEM_DATA_PILOT_MEMBER }, XML_TOKEN_MAP_END }; @@ -1609,11 +1609,11 @@ const SvXMLTokenMap& ScXMLImport::GetConsolidationAttrTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aConsolidationAttrTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_FUNCTION, XML_TOK_CONSOLIDATION_ATTR_FUNCTION }, - { XML_NAMESPACE_TABLE, XML_SOURCE_CELL_RANGE_ADDRESSES, XML_TOK_CONSOLIDATION_ATTR_SOURCE_RANGES }, - { XML_NAMESPACE_TABLE, XML_TARGET_CELL_ADDRESS, XML_TOK_CONSOLIDATION_ATTR_TARGET_ADDRESS }, - { XML_NAMESPACE_TABLE, XML_USE_LABEL, XML_TOK_CONSOLIDATION_ATTR_USE_LABEL }, - { XML_NAMESPACE_TABLE, XML_LINK_TO_SOURCE_DATA, XML_TOK_CONSOLIDATION_ATTR_LINK_TO_SOURCE }, + { XML_NAMESPACE_TABLE, XML_FUNCTION, XML_TOK_CONSOLIDATION_ATTR_FUNCTION }, + { XML_NAMESPACE_TABLE, XML_SOURCE_CELL_RANGE_ADDRESSES, XML_TOK_CONSOLIDATION_ATTR_SOURCE_RANGES }, + { XML_NAMESPACE_TABLE, XML_TARGET_CELL_ADDRESS, XML_TOK_CONSOLIDATION_ATTR_TARGET_ADDRESS }, + { XML_NAMESPACE_TABLE, XML_USE_LABEL, XML_TOK_CONSOLIDATION_ATTR_USE_LABEL }, + { XML_NAMESPACE_TABLE, XML_LINK_TO_SOURCE_DATA, XML_TOK_CONSOLIDATION_ATTR_LINK_TO_SOURCE }, XML_TOKEN_MAP_END }; @@ -1661,7 +1661,7 @@ SvXMLImportContext *ScXMLImport::CreateContext( USHORT nPrefix, ScXMLImport::ScXMLImport( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceFactory, const sal_uInt16 nImportFlag) -: SvXMLImport( xServiceFactory, nImportFlag ), +: SvXMLImport( xServiceFactory, nImportFlag ), pDoc( NULL ), pChangeTrackingImportHelper(NULL), pStylesImportHelper(NULL), @@ -1670,9 +1670,9 @@ ScXMLImport::ScXMLImport( sCellStyle(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_CELLSTYL)), sStandardFormat(RTL_CONSTASCII_USTRINGPARAM(SC_STANDARDFORMAT)), sType(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_TYPE)), -// pScAutoStylePool(new SvXMLAutoStylePoolP), -// pParaItemMapper( 0 ), -// pI18NMap( new SvI18NMap ), +// pScAutoStylePool(new SvXMLAutoStylePoolP), +// pParaItemMapper( 0 ), +// pI18NMap( new SvI18NMap ), pDocElemTokenMap( 0 ), pStylesElemTokenMap( 0 ), pStylesAttrTokenMap( 0 ), @@ -1797,7 +1797,7 @@ ScXMLImport::ScXMLImport( ScXMLImport::~ScXMLImport() throw() { - // delete pI18NMap; + // delete pI18NMap; delete pDocElemTokenMap; delete pStylesElemTokenMap; delete pStylesAttrTokenMap; @@ -1865,8 +1865,8 @@ ScXMLImport::~ScXMLImport() throw() delete pDataPilotMemberAttrTokenMap; delete pConsolidationAttrTokenMap; - // if (pScAutoStylePool) - // delete pScAutoStylePool; + // if (pScAutoStylePool) + // delete pScAutoStylePool; if (pChangeTrackingImportHelper) delete pChangeTrackingImportHelper; if (pNumberFormatAttributesExportHelper) @@ -2275,19 +2275,19 @@ void ScXMLImport::SetConfigurationSettings(const uno::Sequence<beans::PropertyVa uno::Type aType = aConfigProps[i].Value.getValueType(); uno::Reference<beans::XPropertySet> xImportInfo = getImportInfo(); - + if (xImportInfo.is() && - (aType.equals(getCppuType( + (aType.equals(getCppuType( (uno::Reference<container::XNameContainer> *)0 ) ) || - aType.equals(getCppuType( + aType.equals(getCppuType( (uno::Reference<container::XNameAccess> *)0 ) ) ) ) { - uno::Reference< beans::XPropertySetInfo > xPropertySetInfo = + uno::Reference< beans::XPropertySetInfo > xPropertySetInfo = xImportInfo->getPropertySetInfo(); - if (xPropertySetInfo.is() && + if (xPropertySetInfo.is() && xPropertySetInfo->hasPropertyByName(sSCName) ) { - xImportInfo->setPropertyValue(sSCName, + xImportInfo->setPropertyValue(sSCName, aConfigProps[i].Value ); } } diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx index 49e89406d8eb..9c4bf644da9a 100644 --- a/sc/source/filter/xml/xmlimprt.hxx +++ b/sc/source/filter/xml/xmlimprt.hxx @@ -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 @@ -248,7 +248,7 @@ enum ScXMLTableRowAttrTokens XML_TOK_TABLE_ROW_ATTR_VISIBILITY, XML_TOK_TABLE_ROW_ATTR_REPEATED, XML_TOK_TABLE_ROW_ATTR_DEFAULT_CELL_STYLE_NAME -// XML_TOK_TABLE_ROW_ATTR_USE_OPTIMAL_HEIGHT +// XML_TOK_TABLE_ROW_ATTR_USE_OPTIMAL_HEIGHT }; enum ScXMLTableRowCellTokens @@ -643,134 +643,134 @@ typedef std::list<const ScMyLabelRange*> ScMyLabelRanges; struct ScMyImportValidation { - rtl::OUString sName; - rtl::OUString sImputTitle; - rtl::OUString sImputMessage; - rtl::OUString sErrorTitle; - rtl::OUString sErrorMessage; - rtl::OUString sFormula1; - rtl::OUString sFormula2; + rtl::OUString sName; + rtl::OUString sImputTitle; + rtl::OUString sImputMessage; + rtl::OUString sErrorTitle; + rtl::OUString sErrorMessage; + rtl::OUString sFormula1; + rtl::OUString sFormula2; rtl::OUString sFormulaNmsp1; rtl::OUString sFormulaNmsp2; rtl::OUString sBaseCellAddress; // #b4974740# string is used directly - com::sun::star::sheet::ValidationAlertStyle aAlertStyle; - com::sun::star::sheet::ValidationType aValidationType; - com::sun::star::sheet::ConditionOperator aOperator; + com::sun::star::sheet::ValidationAlertStyle aAlertStyle; + com::sun::star::sheet::ValidationType aValidationType; + com::sun::star::sheet::ConditionOperator aOperator; formula::FormulaGrammar::Grammar eGrammar1; formula::FormulaGrammar::Grammar eGrammar2; sal_Int16 nShowList; - sal_Bool bShowErrorMessage; - sal_Bool bShowImputMessage; - sal_Bool bIgnoreBlanks; + sal_Bool bShowErrorMessage; + sal_Bool bShowImputMessage; + sal_Bool bIgnoreBlanks; }; -typedef std::vector<ScMyImportValidation> ScMyImportValidations; -typedef std::list<SvXMLImportContext*> ScMyViewContextList; +typedef std::vector<ScMyImportValidation> ScMyImportValidations; +typedef std::list<SvXMLImportContext*> ScMyViewContextList; class ScMyStylesImportHelper; class ScXMLImport: public SvXMLImport { - typedef ::std::hash_map< ::rtl::OUString, sal_Int16, ::rtl::OUStringHash > CellTypeMap; - CellTypeMap aCellTypeMap; - - ScDocument* pDoc; - ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; - ScMyViewContextList aViewContextList; - ScMyStylesImportHelper* pStylesImportHelper; - rtl::OUString sNumberFormat; - rtl::OUString sLocale; - rtl::OUString sCellStyle; - rtl::OUString sStandardFormat; - rtl::OUString sType; - -// SvXMLAutoStylePoolP *pScAutoStylePool; - UniReference < XMLPropertyHandlerFactory > xScPropHdlFactory; - UniReference < XMLPropertySetMapper > xCellStylesPropertySetMapper; - UniReference < XMLPropertySetMapper > xColumnStylesPropertySetMapper; - UniReference < XMLPropertySetMapper > xRowStylesPropertySetMapper; - UniReference < XMLPropertySetMapper > xTableStylesPropertySetMapper; -// SvXMLImportContextRef xStyles; -// SvXMLImportContextRef xAutoStyles; - -// SvXMLImportItemMapper *pParaItemMapper;// paragraph item import -// SvI18NMap *pI18NMap; // name mapping for I18N - SvXMLTokenMap *pDocElemTokenMap; - SvXMLTokenMap *pStylesElemTokenMap; - SvXMLTokenMap *pStylesAttrTokenMap; - SvXMLTokenMap *pStyleElemTokenMap; - SvXMLTokenMap *pBodyElemTokenMap; - SvXMLTokenMap *pContentValidationsElemTokenMap; - SvXMLTokenMap *pContentValidationElemTokenMap; - SvXMLTokenMap *pContentValidationAttrTokenMap; - SvXMLTokenMap *pContentValidationMessageElemTokenMap; - SvXMLTokenMap *pContentValidationHelpMessageAttrTokenMap; - SvXMLTokenMap *pContentValidationErrorMessageAttrTokenMap; - SvXMLTokenMap *pContentValidationErrorMacroAttrTokenMap; - SvXMLTokenMap *pLabelRangesElemTokenMap; - SvXMLTokenMap *pLabelRangeAttrTokenMap; - SvXMLTokenMap *pTableElemTokenMap; + typedef ::std::hash_map< ::rtl::OUString, sal_Int16, ::rtl::OUStringHash > CellTypeMap; + CellTypeMap aCellTypeMap; + + ScDocument* pDoc; + ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; + ScMyViewContextList aViewContextList; + ScMyStylesImportHelper* pStylesImportHelper; + rtl::OUString sNumberFormat; + rtl::OUString sLocale; + rtl::OUString sCellStyle; + rtl::OUString sStandardFormat; + rtl::OUString sType; + +// SvXMLAutoStylePoolP *pScAutoStylePool; + UniReference < XMLPropertyHandlerFactory > xScPropHdlFactory; + UniReference < XMLPropertySetMapper > xCellStylesPropertySetMapper; + UniReference < XMLPropertySetMapper > xColumnStylesPropertySetMapper; + UniReference < XMLPropertySetMapper > xRowStylesPropertySetMapper; + UniReference < XMLPropertySetMapper > xTableStylesPropertySetMapper; +// SvXMLImportContextRef xStyles; +// SvXMLImportContextRef xAutoStyles; + +// SvXMLImportItemMapper *pParaItemMapper;// paragraph item import +// SvI18NMap *pI18NMap; // name mapping for I18N + SvXMLTokenMap *pDocElemTokenMap; + SvXMLTokenMap *pStylesElemTokenMap; + SvXMLTokenMap *pStylesAttrTokenMap; + SvXMLTokenMap *pStyleElemTokenMap; + SvXMLTokenMap *pBodyElemTokenMap; + SvXMLTokenMap *pContentValidationsElemTokenMap; + SvXMLTokenMap *pContentValidationElemTokenMap; + SvXMLTokenMap *pContentValidationAttrTokenMap; + SvXMLTokenMap *pContentValidationMessageElemTokenMap; + SvXMLTokenMap *pContentValidationHelpMessageAttrTokenMap; + SvXMLTokenMap *pContentValidationErrorMessageAttrTokenMap; + SvXMLTokenMap *pContentValidationErrorMacroAttrTokenMap; + SvXMLTokenMap *pLabelRangesElemTokenMap; + SvXMLTokenMap *pLabelRangeAttrTokenMap; + SvXMLTokenMap *pTableElemTokenMap; SvXMLTokenMap *pTableProtectionElemTokenMap; - SvXMLTokenMap *pTableRowsElemTokenMap; - SvXMLTokenMap *pTableColsElemTokenMap; - SvXMLTokenMap *pTableScenarioAttrTokenMap; - SvXMLTokenMap *pTableAttrTokenMap; - SvXMLTokenMap *pTableColAttrTokenMap; - SvXMLTokenMap *pTableRowElemTokenMap; - SvXMLTokenMap *pTableRowAttrTokenMap; - SvXMLTokenMap *pTableRowCellElemTokenMap; - SvXMLTokenMap *pTableRowCellAttrTokenMap; - SvXMLTokenMap *pTableAnnotationAttrTokenMap; - SvXMLTokenMap *pDetectiveElemTokenMap; - SvXMLTokenMap *pDetectiveHighlightedAttrTokenMap; - SvXMLTokenMap *pDetectiveOperationAttrTokenMap; - SvXMLTokenMap *pTableCellRangeSourceAttrTokenMap; - SvXMLTokenMap *pNamedExpressionsElemTokenMap; - SvXMLTokenMap *pNamedRangeAttrTokenMap; - SvXMLTokenMap *pNamedExpressionAttrTokenMap; - SvXMLTokenMap *pDatabaseRangesElemTokenMap; - SvXMLTokenMap *pDatabaseRangeElemTokenMap; - SvXMLTokenMap *pDatabaseRangeAttrTokenMap; - SvXMLTokenMap *pDatabaseRangeSourceSQLAttrTokenMap; - SvXMLTokenMap *pDatabaseRangeSourceTableAttrTokenMap; - SvXMLTokenMap *pDatabaseRangeSourceQueryAttrTokenMap; - SvXMLTokenMap *pFilterElemTokenMap; - SvXMLTokenMap *pFilterAttrTokenMap; - SvXMLTokenMap *pFilterConditionAttrTokenMap; - SvXMLTokenMap *pSortElemTokenMap; - SvXMLTokenMap *pSortAttrTokenMap; - SvXMLTokenMap *pSortSortByAttrTokenMap; - SvXMLTokenMap *pDatabaseRangeSubTotalRulesElemTokenMap; - SvXMLTokenMap *pDatabaseRangeSubTotalRulesAttrTokenMap; - SvXMLTokenMap *pSubTotalRulesSortGroupsAttrTokenMap; - SvXMLTokenMap *pSubTotalRulesSubTotalRuleElemTokenMap; - SvXMLTokenMap *pSubTotalRulesSubTotalRuleAttrTokenMap; - SvXMLTokenMap *pSubTotalRuleSubTotalFieldAttrTokenMap; - SvXMLTokenMap *pDataPilotTablesElemTokenMap; - SvXMLTokenMap *pDataPilotTableAttrTokenMap; - SvXMLTokenMap *pDataPilotTableElemTokenMap; - SvXMLTokenMap *pDataPilotTableSourceServiceAttrTokenMap; + SvXMLTokenMap *pTableRowsElemTokenMap; + SvXMLTokenMap *pTableColsElemTokenMap; + SvXMLTokenMap *pTableScenarioAttrTokenMap; + SvXMLTokenMap *pTableAttrTokenMap; + SvXMLTokenMap *pTableColAttrTokenMap; + SvXMLTokenMap *pTableRowElemTokenMap; + SvXMLTokenMap *pTableRowAttrTokenMap; + SvXMLTokenMap *pTableRowCellElemTokenMap; + SvXMLTokenMap *pTableRowCellAttrTokenMap; + SvXMLTokenMap *pTableAnnotationAttrTokenMap; + SvXMLTokenMap *pDetectiveElemTokenMap; + SvXMLTokenMap *pDetectiveHighlightedAttrTokenMap; + SvXMLTokenMap *pDetectiveOperationAttrTokenMap; + SvXMLTokenMap *pTableCellRangeSourceAttrTokenMap; + SvXMLTokenMap *pNamedExpressionsElemTokenMap; + SvXMLTokenMap *pNamedRangeAttrTokenMap; + SvXMLTokenMap *pNamedExpressionAttrTokenMap; + SvXMLTokenMap *pDatabaseRangesElemTokenMap; + SvXMLTokenMap *pDatabaseRangeElemTokenMap; + SvXMLTokenMap *pDatabaseRangeAttrTokenMap; + SvXMLTokenMap *pDatabaseRangeSourceSQLAttrTokenMap; + SvXMLTokenMap *pDatabaseRangeSourceTableAttrTokenMap; + SvXMLTokenMap *pDatabaseRangeSourceQueryAttrTokenMap; + SvXMLTokenMap *pFilterElemTokenMap; + SvXMLTokenMap *pFilterAttrTokenMap; + SvXMLTokenMap *pFilterConditionAttrTokenMap; + SvXMLTokenMap *pSortElemTokenMap; + SvXMLTokenMap *pSortAttrTokenMap; + SvXMLTokenMap *pSortSortByAttrTokenMap; + SvXMLTokenMap *pDatabaseRangeSubTotalRulesElemTokenMap; + SvXMLTokenMap *pDatabaseRangeSubTotalRulesAttrTokenMap; + SvXMLTokenMap *pSubTotalRulesSortGroupsAttrTokenMap; + SvXMLTokenMap *pSubTotalRulesSubTotalRuleElemTokenMap; + SvXMLTokenMap *pSubTotalRulesSubTotalRuleAttrTokenMap; + SvXMLTokenMap *pSubTotalRuleSubTotalFieldAttrTokenMap; + SvXMLTokenMap *pDataPilotTablesElemTokenMap; + SvXMLTokenMap *pDataPilotTableAttrTokenMap; + SvXMLTokenMap *pDataPilotTableElemTokenMap; + SvXMLTokenMap *pDataPilotTableSourceServiceAttrTokenMap; SvXMLTokenMap *pDataPilotGrandTotalAttrTokenMap; - SvXMLTokenMap *pDataPilotTableSourceCellRangeElemTokenMap; - SvXMLTokenMap *pDataPilotTableSourceCellRangeAttrTokenMap; - SvXMLTokenMap *pDataPilotFieldAttrTokenMap; - SvXMLTokenMap *pDataPilotFieldElemTokenMap; - SvXMLTokenMap *pDataPilotLevelAttrTokenMap; - SvXMLTokenMap *pDataPilotLevelElemTokenMap; - SvXMLTokenMap *pDataPilotSubTotalsElemTokenMap; - SvXMLTokenMap *pDataPilotSubTotalAttrTokenMap; - SvXMLTokenMap *pDataPilotMembersElemTokenMap; - SvXMLTokenMap *pDataPilotMemberAttrTokenMap; - SvXMLTokenMap *pConsolidationAttrTokenMap; - - ScMyTables aTables; - - ScMyNamedExpressions* pMyNamedExpressions; + SvXMLTokenMap *pDataPilotTableSourceCellRangeElemTokenMap; + SvXMLTokenMap *pDataPilotTableSourceCellRangeAttrTokenMap; + SvXMLTokenMap *pDataPilotFieldAttrTokenMap; + SvXMLTokenMap *pDataPilotFieldElemTokenMap; + SvXMLTokenMap *pDataPilotLevelAttrTokenMap; + SvXMLTokenMap *pDataPilotLevelElemTokenMap; + SvXMLTokenMap *pDataPilotSubTotalsElemTokenMap; + SvXMLTokenMap *pDataPilotSubTotalAttrTokenMap; + SvXMLTokenMap *pDataPilotMembersElemTokenMap; + SvXMLTokenMap *pDataPilotMemberAttrTokenMap; + SvXMLTokenMap *pConsolidationAttrTokenMap; + + ScMyTables aTables; + + ScMyNamedExpressions* pMyNamedExpressions; ScMyLabelRanges* pMyLabelRanges; - ScMyImportValidations* pValidations; - ScMyImpDetectiveOpArray* pDetectiveOpArray; + ScMyImportValidations* pValidations; + ScMyImpDetectiveOpArray* pDetectiveOpArray; SolarMutexGuard* pSolarMutexGuard; - std::vector<rtl::OUString> aTableStyles; + std::vector<rtl::OUString> aTableStyles; XMLNumberFormatAttributesExportHelper* pNumberFormatAttributesExportHelper; ScMyStyleNumberFormats* pStyleNumberFormats; com::sun::star::uno::Reference <com::sun::star::util::XNumberFormats> xNumberFormats; @@ -778,16 +778,16 @@ class ScXMLImport: public SvXMLImport com::sun::star::uno::Reference <com::sun::star::sheet::XSheetCellRangeContainer> xSheetCellRanges; - rtl::OUString sEmpty; - rtl::OUString sPrevStyleName; - rtl::OUString sPrevCurrency; - sal_uInt32 nSolarMutexLocked; + rtl::OUString sEmpty; + rtl::OUString sPrevStyleName; + rtl::OUString sPrevCurrency; + sal_uInt32 nSolarMutexLocked; sal_Int32 nProgressCount; - sal_uInt16 nStyleFamilyMask;// Mask of styles to load - sal_Int16 nPrevCellType; - sal_Bool bLoadDoc; // Load doc or styles only - sal_Bool bRemoveLastChar; - sal_Bool bNullDateSetted; + sal_uInt16 nStyleFamilyMask;// Mask of styles to load + sal_Int16 nPrevCellType; + sal_Bool bLoadDoc; // Load doc or styles only + sal_Bool bRemoveLastChar; + sal_Bool bNullDateSetted; sal_Bool bSelfImportingXMLSet; sal_Bool bLatinDefaultStyle; // latin-only number format in default style? sal_Bool bFromWrapper; // called from ScDocShell / ScXMLImportWrapper? @@ -822,8 +822,8 @@ public: const ::rtl::OUString& rLocalName ); SvXMLImportContext *CreateStylesContext(const ::rtl::OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList, sal_Bool bAutoStyles ); -// SvXMLImportContext *CreateUseStylesContext(const ::rtl::OUString& rLocalName , -// const ::com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList); +// SvXMLImportContext *CreateUseStylesContext(const ::rtl::OUString& rLocalName , +// const ::com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList); SvXMLImportContext *CreateBodyContext( const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -831,8 +831,8 @@ public: virtual void SetStatistics( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue> & i_rStats); - inline ScDocument* GetDocument() { return pDoc; } - inline const ScDocument* GetDocument() const { return pDoc; } + inline ScDocument* GetDocument() { return pDoc; } + inline const ScDocument* GetDocument() const { return pDoc; } ScMyTables& GetTables() { return aTables; } @@ -843,21 +843,21 @@ public: sal_Int16 GetCellType(const ::rtl::OUString& rStrValue) const; -// SvI18NMap& GetI18NMap() { return *pI18NMap; } +// SvI18NMap& GetI18NMap() { return *pI18NMap; } -// inline const SvXMLImportItemMapper& GetParaItemMapper() const; -// SvXMLImportContext *CreateParaItemImportContext( USHORT nPrefix, -// const ::rtl::OUString& rLocalName, -// const ::com::sun::star::uno::Reference< -// ::com::sun::star::xml::sax::XAttributeList& xAttrList, -// SfxItemSet& rItemSet ); +// inline const SvXMLImportItemMapper& GetParaItemMapper() const; +// SvXMLImportContext *CreateParaItemImportContext( USHORT nPrefix, +// const ::rtl::OUString& rLocalName, +// const ::com::sun::star::uno::Reference< +// ::com::sun::star::xml::sax::XAttributeList& xAttrList, +// SfxItemSet& rItemSet ); UniReference < XMLPropertySetMapper > GetCellStylesPropertySetMapper() const { return xCellStylesPropertySetMapper; } UniReference < XMLPropertySetMapper > GetColumnStylesPropertySetMapper() const { return xColumnStylesPropertySetMapper; } UniReference < XMLPropertySetMapper > GetRowStylesPropertySetMapper() const { return xRowStylesPropertySetMapper; } UniReference < XMLPropertySetMapper > GetTableStylesPropertySetMapper() const { return xTableStylesPropertySetMapper; } -// SvXMLImportContextRef GetAutoStyles() const { return xAutoStyles; } -// SvXMLImportContextRef GetStyles() const { return xStyles; } +// SvXMLImportContextRef GetAutoStyles() const { return xAutoStyles; } +// SvXMLImportContextRef GetStyles() const { return xStyles; } const SvXMLTokenMap& GetDocElemTokenMap(); const SvXMLTokenMap& GetBodyElemTokenMap(); @@ -923,13 +923,13 @@ public: const SvXMLTokenMap& GetDataPilotMembersElemTokenMap(); const SvXMLTokenMap& GetDataPilotMemberAttrTokenMap(); const SvXMLTokenMap& GetConsolidationAttrTokenMap(); -// const SvXMLTokenMap& GetTextPElemTokenMap(); -// const SvXMLTokenMap& GetTextPAttrTokenMap(); -// const SvXMLTokenMap& GetStyleStylesElemTokenMap(); -// const SvXMLTokenMap& GetTextListBlockAttrTokenMap(); -// const SvXMLTokenMap& GetTextListBlockElemTokenMap(); +// const SvXMLTokenMap& GetTextPElemTokenMap(); +// const SvXMLTokenMap& GetTextPAttrTokenMap(); +// const SvXMLTokenMap& GetStyleStylesElemTokenMap(); +// const SvXMLTokenMap& GetTextListBlockAttrTokenMap(); +// const SvXMLTokenMap& GetTextListBlockElemTokenMap(); - void AddNamedExpression(const ScMyNamedExpression* pMyNamedExpression) { + void AddNamedExpression(const ScMyNamedExpression* pMyNamedExpression) { if (!pMyNamedExpressions) pMyNamedExpressions = new ScMyNamedExpressions(); pMyNamedExpressions->push_back(pMyNamedExpression); } @@ -947,7 +947,7 @@ public: pValidations->push_back(rValidation); } sal_Bool GetValidation(const rtl::OUString& sName, ScMyImportValidation& aValidation); - inline ScMyImpDetectiveOpArray* GetDetectiveOpArray() { + inline ScMyImpDetectiveOpArray* GetDetectiveOpArray() { if (!pDetectiveOpArray) pDetectiveOpArray = new ScMyImpDetectiveOpArray(); return pDetectiveOpArray; } @@ -1010,7 +1010,7 @@ public: void SetRangeOverflowType(sal_uInt32 nType); - sal_Int32 GetRangeType(const rtl::OUString sRangeType) const; + sal_Int32 GetRangeType(const rtl::OUString sRangeType) const; void SetNamedRanges(); void SetLabelRanges(); void AddDefaultNote( const com::sun::star::table::CellAddress& aCell ); diff --git a/sc/source/filter/xml/xmllabri.cxx b/sc/source/filter/xml/xmllabri.cxx index 777190445f6e..0c2e87e9dc46 100644 --- a/sc/source/filter/xml/xmllabri.cxx +++ b/sc/source/filter/xml/xmllabri.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,8 +63,8 @@ SvXMLImportContext* ScXMLLabelRangesContext::CreateChildContext( const OUString& rLName, const uno::Reference< xml::sax::XAttributeList >& xAttrList ) { - SvXMLImportContext* pContext(NULL); - const SvXMLTokenMap& rTokenMap(GetScImport().GetLabelRangesElemTokenMap()); + SvXMLImportContext* pContext(NULL); + const SvXMLTokenMap& rTokenMap(GetScImport().GetLabelRangesElemTokenMap()); switch( rTokenMap.Get( nPrefix, rLName ) ) { @@ -93,15 +93,15 @@ ScXMLLabelRangeContext::ScXMLLabelRangeContext( SvXMLImportContext( rImport, nPrfx, rLName ), bColumnOrientation( sal_False ) { - sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); - const SvXMLTokenMap& rAttrTokenMap(GetScImport().GetLabelRangeAttrTokenMap()); + sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); + const SvXMLTokenMap& rAttrTokenMap(GetScImport().GetLabelRangeAttrTokenMap()); for( sal_Int16 nIndex = 0; nIndex < nAttrCount; ++nIndex ) { - const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); - const rtl::OUString& sValue (xAttrList->getValueByIndex( nIndex )); - OUString aLocalName; - USHORT nPrefix (GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); + const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); + const rtl::OUString& sValue (xAttrList->getValueByIndex( nIndex )); + OUString aLocalName; + USHORT nPrefix (GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { diff --git a/sc/source/filter/xml/xmllabri.hxx b/sc/source/filter/xml/xmllabri.hxx index 2876da98b871..3da2d2c0721d 100644 --- a/sc/source/filter/xml/xmllabri.hxx +++ b/sc/source/filter/xml/xmllabri.hxx @@ -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 @@ -38,8 +38,8 @@ class ScXMLImport; class ScXMLLabelRangesContext : public SvXMLImportContext { private: - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } + ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLLabelRangesContext( @@ -48,14 +48,14 @@ public: const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); - virtual ~ScXMLLabelRangesContext(); + virtual ~ScXMLLabelRangesContext(); - virtual SvXMLImportContext* CreateChildContext( + virtual SvXMLImportContext* CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); - virtual void EndElement(); + virtual void EndElement(); }; @@ -64,12 +64,12 @@ public: class ScXMLLabelRangeContext : public SvXMLImportContext { private: - ::rtl::OUString sLabelRangeStr; - ::rtl::OUString sDataRangeStr; - sal_Bool bColumnOrientation; + ::rtl::OUString sLabelRangeStr; + ::rtl::OUString sDataRangeStr; + sal_Bool bColumnOrientation; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } + ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLLabelRangeContext( @@ -78,14 +78,14 @@ public: const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); - virtual ~ScXMLLabelRangeContext(); + virtual ~ScXMLLabelRangeContext(); - virtual SvXMLImportContext* CreateChildContext( + virtual SvXMLImportContext* CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); - virtual void EndElement(); + virtual void EndElement(); }; #endif diff --git a/sc/source/filter/xml/xmlnexpi.cxx b/sc/source/filter/xml/xmlnexpi.cxx index 4d81085bcdfd..4bd8139937ba 100644 --- a/sc/source/filter/xml/xmlnexpi.cxx +++ b/sc/source/filter/xml/xmlnexpi.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 @@ -56,7 +56,7 @@ ScXMLNamedExpressionsContext::ScXMLNamedExpressionsContext( ScXMLImport& rImport ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) : SvXMLImportContext( rImport, nPrfx, rLName ) { -/* sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; +/* sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; ++i ) { const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); @@ -175,7 +175,7 @@ SvXMLImportContext *ScXMLNamedRangeContext::CreateChildContext( USHORT nPrefix, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { -/* const SvXMLTokenMap& rTokenMap = GetScImport().GetTableElemTokenMap(); +/* const SvXMLTokenMap& rTokenMap = GetScImport().GetTableElemTokenMap(); switch( rTokenMap.Get( nPrefix, rLName ) ) { }*/ @@ -238,7 +238,7 @@ SvXMLImportContext *ScXMLNamedExpressionContext::CreateChildContext( USHORT nPre const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { -/* const SvXMLTokenMap& rTokenMap = GetScImport().GetTableElemTokenMap(); +/* const SvXMLTokenMap& rTokenMap = GetScImport().GetTableElemTokenMap(); switch( rTokenMap.Get( nPrefix, rLName ) ) { }*/ diff --git a/sc/source/filter/xml/xmlnexpi.hxx b/sc/source/filter/xml/xmlnexpi.hxx index 2e66030d44c5..2d6bc01a5fff 100644 --- a/sc/source/filter/xml/xmlnexpi.hxx +++ b/sc/source/filter/xml/xmlnexpi.hxx @@ -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 diff --git a/sc/source/filter/xml/xmlrowi.cxx b/sc/source/filter/xml/xmlrowi.cxx index 4d1b2042a607..91bf4dd19fd3 100644 --- a/sc/source/filter/xml/xmlrowi.cxx +++ b/sc/source/filter/xml/xmlrowi.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 @@ -133,7 +133,7 @@ SvXMLImportContext *ScXMLTableRowContext::CreateChildContext( USHORT nPrefix, switch( rTokenMap.Get( nPrefix, rLName ) ) { case XML_TOK_TABLE_ROW_CELL: -// if( IsInsertCellPossible() ) +// if( IsInsertCellPossible() ) { bHasCell = sal_True; pContext = new ScXMLTableRowCellContext( GetScImport(), nPrefix, @@ -143,7 +143,7 @@ SvXMLImportContext *ScXMLTableRowContext::CreateChildContext( USHORT nPrefix, } break; case XML_TOK_TABLE_ROW_COVERED_CELL: -// if( IsInsertCellPossible() ) +// if( IsInsertCellPossible() ) { bHasCell = sal_True; pContext = new ScXMLTableRowCellContext( GetScImport(), nPrefix, @@ -172,7 +172,6 @@ void ScXMLTableRowContext::EndElement() sal_Int32 nSheet = rXMLImport.GetTables().GetCurrentSheet(); sal_Int32 nCurrentRow(rXMLImport.GetTables().GetCurrentRow()); uno::Reference<sheet::XSpreadsheet> xSheet(rXMLImport.GetTables().GetCurrentXSheet()); - ScDocument* pDoc = rXMLImport.GetDocument(); if(xSheet.is()) { sal_Int32 nFirstRow(nCurrentRow - nRepeatedRows + 1); @@ -220,18 +219,10 @@ void ScXMLTableRowContext::EndElement() bVisible = sal_False; bFiltered = sal_True; } - - // #i116164# call SetRowHidden/SetRowFiltered directly, so the tree doesn't have to be rebuilt - // to compare with existing hidden flags. - if (!bVisible && pDoc) - pDoc->SetRowHidden((SCROW)nFirstRow, (SCROW)nCurrentRow, (SCTAB)nSheet, true); - if (bFiltered && pDoc) - pDoc->SetRowFiltered((SCROW)nFirstRow, (SCROW)nCurrentRow, (SCTAB)nSheet, true); - - //if (!bVisible) - // xRowProperties->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ISVISIBLE)), uno::makeAny(bVisible)); - //if (bFiltered) - // xRowProperties->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ISFILTERED)), uno::makeAny(bFiltered)); + if (!bVisible) + xRowProperties->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ISVISIBLE)), uno::makeAny(bVisible)); + if (bFiltered) + xRowProperties->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ISFILTERED)), uno::makeAny(bFiltered)); } } } diff --git a/sc/source/filter/xml/xmlrowi.hxx b/sc/source/filter/xml/xmlrowi.hxx index f72618d0e9ef..d02141b05f13 100644 --- a/sc/source/filter/xml/xmlrowi.hxx +++ b/sc/source/filter/xml/xmlrowi.hxx @@ -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 diff --git a/sc/source/filter/xml/xmlsceni.cxx b/sc/source/filter/xml/xmlsceni.cxx index 3235941af5b2..5e2d19b470d2 100644 --- a/sc/source/filter/xml/xmlsceni.cxx +++ b/sc/source/filter/xml/xmlsceni.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 @@ -147,7 +147,7 @@ SvXMLImportContext *ScXMLTableScenarioContext::CreateChildContext( void ScXMLTableScenarioContext::EndElement() { SCTAB nCurrTable( sal::static_int_cast<SCTAB>( GetScImport().GetTables().GetCurrentSheet() ) ); - ScDocument* pDoc(GetScImport().GetDocument()); + ScDocument* pDoc(GetScImport().GetDocument()); if (pDoc) { pDoc->SetScenario( nCurrTable, TRUE ); diff --git a/sc/source/filter/xml/xmlsceni.hxx b/sc/source/filter/xml/xmlsceni.hxx index bec95988d72d..84844a7e06d7 100644 --- a/sc/source/filter/xml/xmlsceni.hxx +++ b/sc/source/filter/xml/xmlsceni.hxx @@ -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 @@ -38,14 +38,14 @@ class ScXMLImport; class ScXMLTableScenarioContext : public SvXMLImportContext { private: - rtl::OUString sComment; - Color aBorderColor; - ScRangeList aScenarioRanges; - sal_Bool bDisplayBorder; - sal_Bool bCopyBack; - sal_Bool bCopyStyles; - sal_Bool bCopyFormulas; - sal_Bool bIsActive; + rtl::OUString sComment; + Color aBorderColor; + ScRangeList aScenarioRanges; + sal_Bool bDisplayBorder; + sal_Bool bCopyBack; + sal_Bool bCopyStyles; + sal_Bool bCopyFormulas; + sal_Bool bIsActive; sal_Bool bProtected; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } diff --git a/sc/source/filter/xml/xmlsorti.cxx b/sc/source/filter/xml/xmlsorti.cxx index bf1f0427854d..ceb4550852aa 100644 --- a/sc/source/filter/xml/xmlsorti.cxx +++ b/sc/source/filter/xml/xmlsorti.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 diff --git a/sc/source/filter/xml/xmlsorti.hxx b/sc/source/filter/xml/xmlsorti.hxx index 27ec77c89226..455e15fb0a6f 100644 --- a/sc/source/filter/xml/xmlsorti.hxx +++ b/sc/source/filter/xml/xmlsorti.hxx @@ -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 @@ -43,14 +43,14 @@ class ScXMLSortContext : public SvXMLImportContext com::sun::star::uno::Sequence <com::sun::star::util::SortField> aSortFields; com::sun::star::table::CellAddress aOutputPosition; - rtl::OUString sCountry; - rtl::OUString sLanguage; - rtl::OUString sAlgorithm; - sal_Int16 nUserListIndex; - sal_Bool bCopyOutputData; - sal_Bool bBindFormatsToContent; - sal_Bool bIsCaseSensitive; - sal_Bool bEnabledUserList; + rtl::OUString sCountry; + rtl::OUString sLanguage; + rtl::OUString sAlgorithm; + sal_Int16 nUserListIndex; + sal_Bool bCopyOutputData; + sal_Bool bBindFormatsToContent; + sal_Bool bIsCaseSensitive; + sal_Bool bEnabledUserList; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -79,9 +79,9 @@ class ScXMLSortByContext : public SvXMLImportContext { ScXMLSortContext* pSortContext; - rtl::OUString sFieldNumber; - rtl::OUString sDataType; - rtl::OUString sOrder; + rtl::OUString sFieldNumber; + rtl::OUString sDataType; + rtl::OUString sOrder; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } diff --git a/sc/source/filter/xml/xmlstyle.cxx b/sc/source/filter/xml/xmlstyle.cxx index f686ed36bf9b..25dcd6e1f30f 100644 --- a/sc/source/filter/xml/xmlstyle.cxx +++ b/sc/source/filter/xml/xmlstyle.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 @@ -71,7 +71,7 @@ using ::rtl::OUString; #define MAP(name,prefix,token,type,context) { name, sizeof(name)-1, prefix, token, type, context, SvtSaveOptions::ODFVER_010 } #define MAP_EXT(name,prefix,token,type,context) { name, sizeof(name)-1, prefix, token, type, context, SvtSaveOptions::ODFVER_LATEST } -#define MAP_END() { NULL, 0, 0, XML_TOKEN_INVALID, 0, 0, SvtSaveOptions::ODFVER_010 } +#define MAP_END() { NULL, 0, 0, XML_TOKEN_INVALID, 0, 0, SvtSaveOptions::ODFVER_010 } const XMLPropertyMapEntry aXMLScCellStylesProperties[] = { @@ -105,7 +105,7 @@ const XMLPropertyMapEntry aXMLScCellStylesProperties[] = MAP( "ParaBottomMargin", XML_NAMESPACE_FO, XML_PADDING, XML_TYPE_PROP_TABLE_CELL|XML_TYPE_MEASURE, CTF_SC_ALLPADDING ), MAP( "ParaBottomMargin", XML_NAMESPACE_FO, XML_PADDING_BOTTOM, XML_TYPE_PROP_TABLE_CELL|XML_TYPE_MEASURE, CTF_SC_BOTTOMPADDING ), MAP( "ParaIndent", XML_NAMESPACE_FO, XML_MARGIN_LEFT, XML_TYPE_PROP_PARAGRAPH|XML_TYPE_MEASURE16, 0 ), -// MAP( "ParaIsHyphenation", XML_NAMESPACE_FO, XML_HYPHENATE, XML_TYPE_PROP_TEXT|XML_TYPE_BOOL, 0 ), +// MAP( "ParaIsHyphenation", XML_NAMESPACE_FO, XML_HYPHENATE, XML_TYPE_PROP_TEXT|XML_TYPE_BOOL, 0 ), MAP( "ParaLeftMargin", XML_NAMESPACE_FO, XML_PADDING_LEFT, XML_TYPE_PROP_TABLE_CELL|XML_TYPE_MEASURE, CTF_SC_LEFTPADDING ), MAP( "ParaRightMargin", XML_NAMESPACE_FO, XML_PADDING_RIGHT, XML_TYPE_PROP_TABLE_CELL|XML_TYPE_MEASURE, CTF_SC_RIGHTPADDING ), MAP( "ParaTopMargin", XML_NAMESPACE_FO, XML_PADDING_TOP, XML_TYPE_PROP_TABLE_CELL|XML_TYPE_MEASURE, CTF_SC_TOPPADDING ), @@ -132,7 +132,7 @@ const XMLPropertyMapEntry aXMLScColumnStylesProperties[] = MAP( "IsManualPageBreak", XML_NAMESPACE_FO, XML_BREAK_BEFORE, XML_TYPE_PROP_TABLE_COLUMN|XML_SC_TYPE_BREAKBEFORE, 0), MAP( "IsVisible", XML_NAMESPACE_TABLE, XML_DISPLAY, XML_TYPE_PROP_TABLE_COLUMN|XML_SC_TYPE_EQUAL|MID_FLAG_SPECIAL_ITEM, CTF_SC_ISVISIBLE ), MAP( "Width", XML_NAMESPACE_STYLE, XML_COLUMN_WIDTH, XML_TYPE_PROP_TABLE_COLUMN|XML_TYPE_MEASURE, 0 ), -// MAP( "OptimalWidth", XML_NAMESPACE_STYLE, XML_USE_OPTIMAL_COLUMN_WIDTH, XML_TYPE_PROP_TABLE_COLUMN|XML_TYPE_BOOL, 0), +// MAP( "OptimalWidth", XML_NAMESPACE_STYLE, XML_USE_OPTIMAL_COLUMN_WIDTH, XML_TYPE_PROP_TABLE_COLUMN|XML_TYPE_BOOL, 0), MAP_END() }; @@ -252,31 +252,31 @@ void ScXMLCellExportPropertyMapper::ContextFilter( { switch( getPropertySetMapper()->GetEntryContextId( propertie->mnIndex ) ) { - case CTF_SC_ALLPADDING: pPadding = propertie; break; - case CTF_SC_BOTTOMPADDING: pPadding_Bottom = propertie; break; - case CTF_SC_LEFTPADDING: pPadding_Left = propertie; break; - case CTF_SC_RIGHTPADDING: pPadding_Right = propertie; break; - case CTF_SC_TOPPADDING: pPadding_Top = propertie; break; - case CTF_SC_ALLBORDER: pBorder = propertie; break; - case CTF_SC_LEFTBORDER: pBorder_Left = propertie; break; - case CTF_SC_RIGHTBORDER: pBorder_Right = propertie; break; - case CTF_SC_BOTTOMBORDER: pBorder_Bottom = propertie; break; - case CTF_SC_TOPBORDER: pBorder_Top = propertie; break; - case CTF_SC_ALLBORDERWIDTH: pAllBorderWidthState = propertie; break; - case CTF_SC_LEFTBORDERWIDTH: pLeftBorderWidthState = propertie; break; - case CTF_SC_RIGHTBORDERWIDTH: pRightBorderWidthState = propertie; break; - case CTF_SC_TOPBORDERWIDTH: pTopBorderWidthState = propertie; break; - case CTF_SC_BOTTOMBORDERWIDTH: pBottomBorderWidthState = propertie; break; - case CTF_ALLBORDER: pSWBorder = propertie; break; - case CTF_LEFTBORDER: pSWBorder_Left = propertie; break; - case CTF_RIGHTBORDER: pSWBorder_Right = propertie; break; - case CTF_BOTTOMBORDER: pSWBorder_Bottom = propertie; break; - case CTF_TOPBORDER: pSWBorder_Top = propertie; break; - case CTF_ALLBORDERWIDTH: pSWAllBorderWidthState = propertie; break; - case CTF_LEFTBORDERWIDTH: pSWLeftBorderWidthState = propertie; break; - case CTF_RIGHTBORDERWIDTH: pSWRightBorderWidthState = propertie; break; - case CTF_TOPBORDERWIDTH: pSWTopBorderWidthState = propertie; break; - case CTF_BOTTOMBORDERWIDTH: pSWBottomBorderWidthState = propertie; break; + case CTF_SC_ALLPADDING: pPadding = propertie; break; + case CTF_SC_BOTTOMPADDING: pPadding_Bottom = propertie; break; + case CTF_SC_LEFTPADDING: pPadding_Left = propertie; break; + case CTF_SC_RIGHTPADDING: pPadding_Right = propertie; break; + case CTF_SC_TOPPADDING: pPadding_Top = propertie; break; + case CTF_SC_ALLBORDER: pBorder = propertie; break; + case CTF_SC_LEFTBORDER: pBorder_Left = propertie; break; + case CTF_SC_RIGHTBORDER: pBorder_Right = propertie; break; + case CTF_SC_BOTTOMBORDER: pBorder_Bottom = propertie; break; + case CTF_SC_TOPBORDER: pBorder_Top = propertie; break; + case CTF_SC_ALLBORDERWIDTH: pAllBorderWidthState = propertie; break; + case CTF_SC_LEFTBORDERWIDTH: pLeftBorderWidthState = propertie; break; + case CTF_SC_RIGHTBORDERWIDTH: pRightBorderWidthState = propertie; break; + case CTF_SC_TOPBORDERWIDTH: pTopBorderWidthState = propertie; break; + case CTF_SC_BOTTOMBORDERWIDTH: pBottomBorderWidthState = propertie; break; + case CTF_ALLBORDER: pSWBorder = propertie; break; + case CTF_LEFTBORDER: pSWBorder_Left = propertie; break; + case CTF_RIGHTBORDER: pSWBorder_Right = propertie; break; + case CTF_BOTTOMBORDER: pSWBorder_Bottom = propertie; break; + case CTF_TOPBORDER: pSWBorder_Top = propertie; break; + case CTF_ALLBORDERWIDTH: pSWAllBorderWidthState = propertie; break; + case CTF_LEFTBORDERWIDTH: pSWLeftBorderWidthState = propertie; break; + case CTF_RIGHTBORDERWIDTH: pSWRightBorderWidthState = propertie; break; + case CTF_TOPBORDERWIDTH: pSWTopBorderWidthState = propertie; break; + case CTF_BOTTOMBORDERWIDTH: pSWBottomBorderWidthState = propertie; break; case CTF_SC_DIAGONALTLBR: pDiagonalTLBR = propertie; break; case CTF_SC_DIAGONALTLBRWIDTH: pDiagonalTLBRWidthState = propertie; break; case CTF_SC_DIAGONALBLTR: pDiagonalBLTR = propertie; break; @@ -546,7 +546,7 @@ void ScXMLRowExportPropertyMapper::ContextFilter( { //#108550#; don't filter the height, so other applications know the calculated height -/* XMLPropertyState* pHeight = NULL; +/* XMLPropertyState* pHeight = NULL; XMLPropertyState* pOptimalHeight = NULL; for( ::std::vector< XMLPropertyState >::iterator propertie = rProperties.begin(); @@ -555,8 +555,8 @@ void ScXMLRowExportPropertyMapper::ContextFilter( { switch( getPropertySetMapper()->GetEntryContextId( propertie->mnIndex ) ) { - case CTF_SC_ROWHEIGHT: pHeight = propertie; break; - case CTF_SC_ROWOPTIMALHEIGHT: pOptimalHeight = propertie; break; + case CTF_SC_ROWHEIGHT: pHeight = propertie; break; + case CTF_SC_ROWOPTIMALHEIGHT: pOptimalHeight = propertie; break; } } if ((pHeight && pOptimalHeight && ::cppu::any2bool( pOptimalHeight->maValue )) || diff --git a/sc/source/filter/xml/xmlstyle.hxx b/sc/source/filter/xml/xmlstyle.hxx index 07a4d307a2c3..aa7c9dc2e45c 100644 --- a/sc/source/filter/xml/xmlstyle.hxx +++ b/sc/source/filter/xml/xmlstyle.hxx @@ -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 @@ -46,9 +46,9 @@ extern const XMLPropertyMapEntry aXMLScTableStylesProperties[]; extern const XMLPropertyMapEntry aXMLScTableStylesImportProperties[]; //CellStyles -#define XML_SC_TYPE_CELLPROTECTION (XML_SC_TYPES_START + 1) -#define XML_SC_TYPE_PRINTCONTENT (XML_SC_TYPES_START + 2) -#define XML_SC_TYPE_HORIJUSTIFY (XML_SC_TYPES_START + 3) +#define XML_SC_TYPE_CELLPROTECTION (XML_SC_TYPES_START + 1) +#define XML_SC_TYPE_PRINTCONTENT (XML_SC_TYPES_START + 2) +#define XML_SC_TYPE_HORIJUSTIFY (XML_SC_TYPES_START + 3) #define XML_SC_TYPE_HORIJUSTIFY_METHOD (XML_SC_TYPES_START + 4) #define XML_SC_TYPE_HORIJUSTIFYSOURCE (XML_SC_TYPES_START + 5) #define XML_SC_TYPE_HORIJUSTIFYREPEAT (XML_SC_TYPES_START + 6) @@ -65,46 +65,46 @@ extern const XMLPropertyMapEntry aXMLScTableStylesImportProperties[]; #define XML_SC_TYPE_EQUAL (XML_SC_TYPES_START + 17) #define XML_SC_TYPE_VERTICAL (XML_SC_TYPES_START + 18) -#define CTF_SC_HORIJUSTIFY (XML_SC_CTF_START + 1) -#define CTF_SC_HORIJUSTIFY_SOURCE (XML_SC_CTF_START + 2) -#define CTF_SC_ALLPADDING (XML_SC_CTF_START + 3) -#define CTF_SC_BOTTOMPADDING (XML_SC_CTF_START + 4) -#define CTF_SC_LEFTPADDING (XML_SC_CTF_START + 5) -#define CTF_SC_RIGHTPADDING (XML_SC_CTF_START + 6) -#define CTF_SC_TOPPADDING (XML_SC_CTF_START + 7) -#define CTF_SC_ALLBORDER (XML_SC_CTF_START + 8) -#define CTF_SC_LEFTBORDER (XML_SC_CTF_START + 9) -#define CTF_SC_RIGHTBORDER (XML_SC_CTF_START + 10) -#define CTF_SC_TOPBORDER (XML_SC_CTF_START + 11) -#define CTF_SC_BOTTOMBORDER (XML_SC_CTF_START + 12) -#define CTF_SC_ALLBORDERWIDTH (XML_SC_CTF_START + 13) -#define CTF_SC_LEFTBORDERWIDTH (XML_SC_CTF_START + 14) -#define CTF_SC_RIGHTBORDERWIDTH (XML_SC_CTF_START + 15) -#define CTF_SC_TOPBORDERWIDTH (XML_SC_CTF_START + 16) -#define CTF_SC_BOTTOMBORDERWIDTH (XML_SC_CTF_START + 17) -#define CTF_SC_NUMBERFORMAT (XML_SC_CTF_START + 18) -#define CTF_SC_MAP (XML_SC_CTF_START + 19) -#define CTF_SC_PARAINDENT (XML_SC_CTF_START + 20) -#define CTF_SC_OLDTEXTBACKGROUND (XML_SC_CTF_START + 21) -#define CTF_SC_IMPORT_MAP (XML_SC_CTF_START + 22) -#define CTF_SC_CELLSTYLE (XML_SC_CTF_START + 23) -#define CTF_SC_VALIDATION (XML_SC_CTF_START + 24) -#define CTF_SC_DIAGONALTLBR (XML_SC_CTF_START + 25) -#define CTF_SC_DIAGONALTLBRWIDTH (XML_SC_CTF_START + 26) -#define CTF_SC_DIAGONALBLTR (XML_SC_CTF_START + 27) -#define CTF_SC_DIAGONALBLTRWIDTH (XML_SC_CTF_START + 28) +#define CTF_SC_HORIJUSTIFY (XML_SC_CTF_START + 1) +#define CTF_SC_HORIJUSTIFY_SOURCE (XML_SC_CTF_START + 2) +#define CTF_SC_ALLPADDING (XML_SC_CTF_START + 3) +#define CTF_SC_BOTTOMPADDING (XML_SC_CTF_START + 4) +#define CTF_SC_LEFTPADDING (XML_SC_CTF_START + 5) +#define CTF_SC_RIGHTPADDING (XML_SC_CTF_START + 6) +#define CTF_SC_TOPPADDING (XML_SC_CTF_START + 7) +#define CTF_SC_ALLBORDER (XML_SC_CTF_START + 8) +#define CTF_SC_LEFTBORDER (XML_SC_CTF_START + 9) +#define CTF_SC_RIGHTBORDER (XML_SC_CTF_START + 10) +#define CTF_SC_TOPBORDER (XML_SC_CTF_START + 11) +#define CTF_SC_BOTTOMBORDER (XML_SC_CTF_START + 12) +#define CTF_SC_ALLBORDERWIDTH (XML_SC_CTF_START + 13) +#define CTF_SC_LEFTBORDERWIDTH (XML_SC_CTF_START + 14) +#define CTF_SC_RIGHTBORDERWIDTH (XML_SC_CTF_START + 15) +#define CTF_SC_TOPBORDERWIDTH (XML_SC_CTF_START + 16) +#define CTF_SC_BOTTOMBORDERWIDTH (XML_SC_CTF_START + 17) +#define CTF_SC_NUMBERFORMAT (XML_SC_CTF_START + 18) +#define CTF_SC_MAP (XML_SC_CTF_START + 19) +#define CTF_SC_PARAINDENT (XML_SC_CTF_START + 20) +#define CTF_SC_OLDTEXTBACKGROUND (XML_SC_CTF_START + 21) +#define CTF_SC_IMPORT_MAP (XML_SC_CTF_START + 22) +#define CTF_SC_CELLSTYLE (XML_SC_CTF_START + 23) +#define CTF_SC_VALIDATION (XML_SC_CTF_START + 24) +#define CTF_SC_DIAGONALTLBR (XML_SC_CTF_START + 25) +#define CTF_SC_DIAGONALTLBRWIDTH (XML_SC_CTF_START + 26) +#define CTF_SC_DIAGONALBLTR (XML_SC_CTF_START + 27) +#define CTF_SC_DIAGONALBLTRWIDTH (XML_SC_CTF_START + 28) #define CTF_SC_DIAGONALTLBRWIDTHS (XML_SC_CTF_START + 29) #define CTF_SC_DIAGONALBLTRWIDTHS (XML_SC_CTF_START + 30) -#define CTF_SC_ROWHEIGHT (XML_SC_CTF_START + 50) -#define CTF_SC_ROWOPTIMALHEIGHT (XML_SC_CTF_START + 51) -#define CTF_SC_ROWBREAKBEFORE (XML_SC_CTF_START + 52) -#define CTF_SC_ISVISIBLE (XML_SC_CTF_START + 53) +#define CTF_SC_ROWHEIGHT (XML_SC_CTF_START + 50) +#define CTF_SC_ROWOPTIMALHEIGHT (XML_SC_CTF_START + 51) +#define CTF_SC_ROWBREAKBEFORE (XML_SC_CTF_START + 52) +#define CTF_SC_ISVISIBLE (XML_SC_CTF_START + 53) -#define CTF_SC_MASTERPAGENAME (XML_SC_CTF_START + 53) +#define CTF_SC_MASTERPAGENAME (XML_SC_CTF_START + 53) //ColumnStyles -#define XML_SC_TYPE_BREAKBEFORE (XML_SC_TYPES_START + 50) +#define XML_SC_TYPE_BREAKBEFORE (XML_SC_TYPES_START + 50) class ScXMLExport; class ScXMLImport; diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx index ffecefb2d653..4e1bd93b462e 100644 --- a/sc/source/filter/xml/xmlstyli.cxx +++ b/sc/source/filter/xml/xmlstyli.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 @@ -250,9 +250,9 @@ void ScXMLRowImportPropertyMapper::finished(::std::vector< XMLPropertyState >& r sal_Int16 nContextID = getPropertySetMapper()->GetEntryContextId(property->mnIndex); switch (nContextID) { - case CTF_SC_ROWHEIGHT : pHeight = property; break; - case CTF_SC_ROWOPTIMALHEIGHT : pOptimalHeight = property; break; - case CTF_SC_ROWBREAKBEFORE : pPageBreak = property; break; + case CTF_SC_ROWHEIGHT : pHeight = property; break; + case CTF_SC_ROWOPTIMALHEIGHT : pOptimalHeight = property; break; + case CTF_SC_ROWBREAKBEFORE : pPageBreak = property; break; } } } @@ -302,7 +302,7 @@ public: }; ScXMLMapContext::ScXMLMapContext(SvXMLImport& rImport, sal_uInt16 nPrfx, - const OUString& rLName, const uno::Reference< xml::sax::XAttributeList > & xAttrList ) + const OUString& rLName, const uno::Reference< xml::sax::XAttributeList > & xAttrList ) : SvXMLImportContext( rImport, nPrfx, rLName ) { sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); diff --git a/sc/source/filter/xml/xmlstyli.hxx b/sc/source/filter/xml/xmlstyli.hxx index f483e7734f25..7ab9bd66b827 100644 --- a/sc/source/filter/xml/xmlstyli.hxx +++ b/sc/source/filter/xml/xmlstyli.hxx @@ -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 @@ -56,7 +56,7 @@ public: virtual ~ScXMLCellImportPropertyMapper(); /** this method is called for every item that has the MID_FLAG_SPECIAL_ITEM_IMPORT flag set */ -/* virtual sal_Bool handleSpecialItem( +/* virtual sal_Bool handleSpecialItem( XMLPropertyState& rProperty, ::std::vector< XMLPropertyState >& rProperties, const ::rtl::OUString& rValue, @@ -64,7 +64,7 @@ public: const SvXMLNamespaceMap& rNamespaceMap ) const;*/ /** this method is called for every item that has the MID_FLAG_NO_ITEM_IMPORT flag set */ -/* virtual sal_Bool handleNoItem( +/* virtual sal_Bool handleNoItem( sal_Int32 nIndex, ::std::vector< XMLPropertyState >& rProperties, const ::rtl::OUString& rValue, @@ -95,16 +95,16 @@ struct ScXMLMapContent; class XMLTableStyleContext : public XMLPropStyleContext { - ::rtl::OUString sDataStyleName; - rtl::OUString sPageStyle; - const rtl::OUString sNumberFormat; - SvXMLStylesContext* pStyles; - std::vector<ScXMLMapContent> aMaps; - com::sun::star::uno::Any aConditionalFormat; - sal_Int32 nNumberFormat; + ::rtl::OUString sDataStyleName; + rtl::OUString sPageStyle; + const rtl::OUString sNumberFormat; + SvXMLStylesContext* pStyles; + std::vector<ScXMLMapContent> aMaps; + com::sun::star::uno::Any aConditionalFormat; + sal_Int32 nNumberFormat; sal_Int32 nLastSheet; - sal_Bool bConditionalFormatCreated; - sal_Bool bParentSet; + sal_Bool bConditionalFormatCreated; + sal_Bool bParentSet; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -210,7 +210,7 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); -// virtual SvXMLImportPropertyMapper *GetImpPropMapper(); +// virtual SvXMLImportPropertyMapper *GetImpPropMapper(); public: @@ -221,7 +221,7 @@ public: virtual ~XMLTableStylesContext(); // Create child element. -/* virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, +/* virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList );*/ @@ -272,9 +272,9 @@ namespace com { namespace sun { namespace star { class ScMasterPageContext : public XMLTextMasterPageContext { com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> xPropSet; - const rtl::OUString sEmpty; - sal_Bool bContainsRightHeader; - sal_Bool bContainsRightFooter; + const rtl::OUString sEmpty; + sal_Bool bContainsRightHeader; + sal_Bool bContainsRightFooter; void ClearContent(const rtl::OUString& rContent); public: diff --git a/sc/source/filter/xml/xmlsubti.cxx b/sc/source/filter/xml/xmlsubti.cxx index d3e949acabd0..ebd7b4308391 100644 --- a/sc/source/filter/xml/xmlsubti.cxx +++ b/sc/source/filter/xml/xmlsubti.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,7 +69,7 @@ using ::std::auto_ptr; using namespace com::sun::star; ScMyTableData::ScMyTableData(sal_Int32 nSheet, sal_Int32 nCol, sal_Int32 nRow) - : nColsPerCol(nDefaultColCount, 1), + : nColsPerCol(nDefaultColCount, 1), nRealCols(nDefaultColCount + 1, 0), nRowsPerRow(nDefaultRowCount, 1), nRealRows(nDefaultRowCount + 1, 0), @@ -465,7 +465,7 @@ void ScMyTables::InsertColumn() //insert Cell sheet::CellInsertMode aCellInsertMode(sheet::CellInsertMode_RIGHT); - uno::Reference <sheet::XCellRangeMovement> xCellRangeMovement (xCurrentSheet, uno::UNO_QUERY); + uno::Reference <sheet::XCellRangeMovement> xCellRangeMovement (xCurrentSheet, uno::UNO_QUERY); xCellRangeMovement->insertCells(aTempCellAddress, aCellInsertMode); //merge @@ -493,7 +493,7 @@ void ScMyTables::NewColumn(sal_Bool bIsCovered) { sal_Int32 FirstColsSpanned(nSpannedCols / nColCount); sal_Int32 LastColSpanned(FirstColsSpanned - + (nSpannedCols % nColCount)); + + (nSpannedCols % nColCount)); for (sal_Int32 i = 0; i < nColCount - 1; ++i) { aTableVec[nTableCount - 1]->SetColsPerCol(i, FirstColsSpanned); @@ -537,7 +537,7 @@ void ScMyTables::AddColumn(sal_Bool bIsCovered) else { NewColumn(bIsCovered); - // if (!bIsCovered) + // if (!bIsCovered) aTableVec[nTableCount - 1]->SetRealCols(aTableVec[nTableCount - 1]->GetColumn() + 1, aTableVec[nTableCount - 1]->GetRealCols(aTableVec[nTableCount - 1]->GetColumn()) + aTableVec[nTableCount - 1]->GetColsPerCol(aTableVec[nTableCount - 1]->GetColumn())); @@ -690,7 +690,7 @@ void ScMyTables::DeleteTable() rImport.GetDocument()->RenameTab( static_cast<SCTAB>(nCurrentSheet), sCurrentSheetName, sal_False, sal_True); -/* rtl::OUString sErrorMessage(RTL_CONSTASCII_USTRINGPARAM("Could not create a table with the name ")); +/* rtl::OUString sErrorMessage(RTL_CONSTASCII_USTRINGPARAM("Could not create a table with the name ")); sErrorMessage += sCurrentSheetName; sErrorMessage += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(". The new name is ")); sErrorMessage += sCurrentName; diff --git a/sc/source/filter/xml/xmlsubti.hxx b/sc/source/filter/xml/xmlsubti.hxx index 6268a874d357..580a53bd542a 100644 --- a/sc/source/filter/xml/xmlsubti.hxx +++ b/sc/source/filter/xml/xmlsubti.hxx @@ -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 @@ -55,40 +55,40 @@ const ScMysalIntVec::size_type nDefaultTabCount = 10; class ScMyTableData { private: - com::sun::star::table::CellAddress aTableCellPos; - ScMysalIntVec nColsPerCol; - ScMysalIntVec nRealCols; - ScMysalIntVec nRowsPerRow; - ScMysalIntVec nRealRows; - sal_Int32 nSpannedCols; - sal_Int32 nColCount; - sal_Int32 nSubTableSpanned; - ScMysalIntList nChangedCols; + com::sun::star::table::CellAddress aTableCellPos; + ScMysalIntVec nColsPerCol; + ScMysalIntVec nRealCols; + ScMysalIntVec nRowsPerRow; + ScMysalIntVec nRealRows; + sal_Int32 nSpannedCols; + sal_Int32 nColCount; + sal_Int32 nSubTableSpanned; + ScMysalIntList nChangedCols; public: ScMyTableData(sal_Int32 nSheet = -1, sal_Int32 nCol = -1, sal_Int32 nRow = -1); ~ScMyTableData(); - com::sun::star::table::CellAddress GetCellPos() const { return aTableCellPos; } - sal_Int32 GetRow() const { return aTableCellPos.Row; } - sal_Int32 GetColumn() const { return aTableCellPos.Column; } - void AddRow(); - void AddColumn(); - void SetFirstColumn() { aTableCellPos.Column = -1; } + com::sun::star::table::CellAddress GetCellPos() const { return aTableCellPos; } + sal_Int32 GetRow() const { return aTableCellPos.Row; } + sal_Int32 GetColumn() const { return aTableCellPos.Column; } + void AddRow(); + void AddColumn(); + void SetFirstColumn() { aTableCellPos.Column = -1; } sal_Int32 GetColsPerCol(const sal_Int32 nIndex) const { return nColsPerCol[nIndex]; } - void SetColsPerCol(const sal_Int32 nIndex, sal_Int32 nValue = 1) { nColsPerCol[nIndex] = nValue; } - sal_Int32 GetRealCols(const sal_Int32 nIndex, const sal_Bool bIsNormal = sal_True) const; - void SetRealCols(const sal_Int32 nIndex, const sal_Int32 nValue) { nRealCols[nIndex] = nValue; } - sal_Int32 GetRowsPerRow(const sal_Int32 nIndex) const { return nRowsPerRow[nIndex]; } - void SetRowsPerRow(const sal_Int32 nIndex, const sal_Int32 nValue = 1) { nRowsPerRow[nIndex] = nValue; } - sal_Int32 GetRealRows(const sal_Int32 nIndex) const { return nIndex < 0 ? 0 : nRealRows[nIndex]; } - void SetRealRows(const sal_Int32 nIndex, const sal_Int32 nValue) { nRealRows[nIndex] = nValue; } - sal_Int32 GetSpannedCols() const { return nSpannedCols; } - void SetSpannedCols(const sal_Int32 nTempSpannedCols) { nSpannedCols = nTempSpannedCols; } - sal_Int32 GetColCount() const { return nColCount; } - void SetColCount(const sal_Int32 nTempColCount) { nColCount = nTempColCount; } - sal_Int32 GetSubTableSpanned() const { return nSubTableSpanned; } - void SetSubTableSpanned(const sal_Int32 nValue) { nSubTableSpanned = nValue; } - sal_Int32 GetChangedCols(const sal_Int32 nFromIndex, const sal_Int32 nToIndex) const; - void SetChangedCols(const sal_Int32 nValue); + void SetColsPerCol(const sal_Int32 nIndex, sal_Int32 nValue = 1) { nColsPerCol[nIndex] = nValue; } + sal_Int32 GetRealCols(const sal_Int32 nIndex, const sal_Bool bIsNormal = sal_True) const; + void SetRealCols(const sal_Int32 nIndex, const sal_Int32 nValue) { nRealCols[nIndex] = nValue; } + sal_Int32 GetRowsPerRow(const sal_Int32 nIndex) const { return nRowsPerRow[nIndex]; } + void SetRowsPerRow(const sal_Int32 nIndex, const sal_Int32 nValue = 1) { nRowsPerRow[nIndex] = nValue; } + sal_Int32 GetRealRows(const sal_Int32 nIndex) const { return nIndex < 0 ? 0 : nRealRows[nIndex]; } + void SetRealRows(const sal_Int32 nIndex, const sal_Int32 nValue) { nRealRows[nIndex] = nValue; } + sal_Int32 GetSpannedCols() const { return nSpannedCols; } + void SetSpannedCols(const sal_Int32 nTempSpannedCols) { nSpannedCols = nTempSpannedCols; } + sal_Int32 GetColCount() const { return nColCount; } + void SetColCount(const sal_Int32 nTempColCount) { nColCount = nTempColCount; } + sal_Int32 GetSubTableSpanned() const { return nSubTableSpanned; } + void SetSubTableSpanned(const sal_Int32 nValue) { nSubTableSpanned = nValue; } + sal_Int32 GetChangedCols(const sal_Int32 nFromIndex, const sal_Int32 nToIndex) const; + void SetChangedCols(const sal_Int32 nValue); }; //******************************************************************************************************************************* @@ -125,7 +125,7 @@ class ScMyTables private: typedef std::list<ScMatrixRange> ScMyMatrixRangeList; - ScXMLImport& rImport; + ScXMLImport& rImport; ScMyShapeResizer aResizeShapes; @@ -133,57 +133,57 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > xCurrentCellRange; ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > xDrawPage; ::com::sun::star::uno::Reference < ::com::sun::star::drawing::XShapes > xShapes; - rtl::OUString sCurrentSheetName; - std::vector<ScMyTableData*> aTableVec; + rtl::OUString sCurrentSheetName; + std::vector<ScMyTableData*> aTableVec; ScXMLTabProtectionData maProtectionData; ScMyMatrixRangeList aMatrixRangeList; - com::sun::star::table::CellAddress aRealCellPos; - sal_Int32 nCurrentColStylePos; - sal_Int16 nCurrentDrawPage; - sal_Int16 nCurrentXShapes; - sal_Int32 nTableCount; - sal_Int32 nCurrentSheet; - - sal_Bool IsMerged (const com::sun::star::uno::Reference <com::sun::star::table::XCellRange>& xCellRange, + com::sun::star::table::CellAddress aRealCellPos; + sal_Int32 nCurrentColStylePos; + sal_Int16 nCurrentDrawPage; + sal_Int16 nCurrentXShapes; + sal_Int32 nTableCount; + sal_Int32 nCurrentSheet; + + sal_Bool IsMerged (const com::sun::star::uno::Reference <com::sun::star::table::XCellRange>& xCellRange, const sal_Int32 nCol, const sal_Int32 nRow, com::sun::star::table::CellRangeAddress& aCellAddress) const; - void UnMerge(); - void DoMerge(sal_Int32 nCount = -1); - void InsertRow(); - void NewRow(); - void InsertColumn(); - void NewColumn(sal_Bool bIsCovered); + void UnMerge(); + void DoMerge(sal_Int32 nCount = -1); + void InsertRow(); + void NewRow(); + void InsertColumn(); + void NewColumn(sal_Bool bIsCovered); public: ScMyTables(ScXMLImport& rImport); ~ScMyTables(); - void NewSheet(const rtl::OUString& sTableName, const rtl::OUString& sStyleName, + void NewSheet(const rtl::OUString& sTableName, const rtl::OUString& sStyleName, const ScXMLTabProtectionData& rProtectData); - void AddRow(); - void SetRowStyle(const rtl::OUString& rCellStyleName); - void AddColumn(sal_Bool bIsCovered); - void NewTable(sal_Int32 nTempSpannedCols); - void UpdateRowHeights(); - void ResizeShapes() { aResizeShapes.ResizeShapes(); } - void DeleteTable(); - com::sun::star::table::CellAddress GetRealCellPos(); - void AddColCount(sal_Int32 nTempColCount); - void AddColStyle(const sal_Int32 nRepeat, const rtl::OUString& rCellStyleName); + void AddRow(); + void SetRowStyle(const rtl::OUString& rCellStyleName); + void AddColumn(sal_Bool bIsCovered); + void NewTable(sal_Int32 nTempSpannedCols); + void UpdateRowHeights(); + void ResizeShapes() { aResizeShapes.ResizeShapes(); } + void DeleteTable(); + com::sun::star::table::CellAddress GetRealCellPos(); + void AddColCount(sal_Int32 nTempColCount); + void AddColStyle(const sal_Int32 nRepeat, const rtl::OUString& rCellStyleName); ScXMLTabProtectionData& GetCurrentProtectionData() { return maProtectionData; } - rtl::OUString GetCurrentSheetName() const { return sCurrentSheetName; } - sal_Int32 GetCurrentSheet() const { return nCurrentSheet; } - sal_Int32 GetCurrentColumn() const { return aTableVec[nTableCount - 1]->GetColCount(); } - sal_Int32 GetCurrentRow() const { return aTableVec[nTableCount - 1]->GetRow(); } + rtl::OUString GetCurrentSheetName() const { return sCurrentSheetName; } + sal_Int32 GetCurrentSheet() const { return nCurrentSheet; } + sal_Int32 GetCurrentColumn() const { return aTableVec[nTableCount - 1]->GetColCount(); } + sal_Int32 GetCurrentRow() const { return aTableVec[nTableCount - 1]->GetRow(); } ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheet > - GetCurrentXSheet() { return xCurrentSheet; } + GetCurrentXSheet() { return xCurrentSheet; } ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > - GetCurrentXCellRange() { return xCurrentCellRange; } + GetCurrentXCellRange() { return xCurrentCellRange; } ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > GetCurrentXDrawPage(); ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > GetCurrentXShapes(); - sal_Bool HasDrawPage(); - sal_Bool HasXShapes(); - void AddShape(com::sun::star::uno::Reference <com::sun::star::drawing::XShape>& rShape, + sal_Bool HasDrawPage(); + sal_Bool HasXShapes(); + void AddShape(com::sun::star::uno::Reference <com::sun::star::drawing::XShape>& rShape, rtl::OUString* pRangeList, com::sun::star::table::CellAddress& rStartAddress, com::sun::star::table::CellAddress& rEndAddress, diff --git a/sc/source/filter/xml/xmltabi.cxx b/sc/source/filter/xml/xmltabi.cxx index 01e613b1ea74..f229beafa769 100644 --- a/sc/source/filter/xml/xmltabi.cxx +++ b/sc/source/filter/xml/xmltabi.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 @@ -68,17 +68,17 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::xml::sax::XAttributeList; using ::rtl::OUString; -/** - * Determine whether this table is an external reference cache from its +/** + * Determine whether this table is an external reference cache from its * name. There is currently no way of determining whether a table is a - * regular table or an external reference cache other than examining the - * name itself. We should probably introduce a new boolean value for - * table:table element and use it instead of doing this, to make it more - * reliable and future-proof. - * - * @param rName + * regular table or an external reference cache other than examining the + * name itself. We should probably introduce a new boolean value for + * table:table element and use it instead of doing this, to make it more + * reliable and future-proof. * - * @return + * @param rName + * + * @return */ static bool lcl_isExternalRefCache(const rtl::OUString& rName, rtl::OUString& rUrl, rtl::OUString& rExtTabName) { @@ -250,7 +250,7 @@ SvXMLImportContext *ScXMLTableContext::CreateChildContext( USHORT nPrefix, sal_uInt16 nToken = rTokenMap.Get(nPrefix, rLName); if (pExternalRefInfo.get()) { - // We only care about the table-row and table-source elements for + // We only care about the table-row and table-source elements for // external cache data. switch (nToken) { diff --git a/sc/source/filter/xml/xmltabi.hxx b/sc/source/filter/xml/xmltabi.hxx index db60f90c0c33..3cdd0b9883c4 100644 --- a/sc/source/filter/xml/xmltabi.hxx +++ b/sc/source/filter/xml/xmltabi.hxx @@ -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 @@ -48,10 +48,10 @@ struct ScXMLExternalTabData class ScXMLTableContext : public SvXMLImportContext { - rtl::OUString sPrintRanges; + rtl::OUString sPrintRanges; ::std::auto_ptr<ScXMLExternalTabData> pExternalRefInfo; sal_Int32 nStartOffset; - sal_Bool bStartFormPage; + sal_Bool bStartFormPage; sal_Bool bPrintEntireSheet; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx index e61cdb4927ef..de75372d9740 100644 --- a/sc/source/filter/xml/xmlwrap.cxx +++ b/sc/source/filter/xml/xmlwrap.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 @@ -128,8 +128,8 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::Reference<lang::XMultiSe // Get data source ... -// uno::Reference< uno::XInterface > xPipe; -// uno::Reference< io::XActiveDataSource > xSource; +// uno::Reference< uno::XInterface > xPipe; +// uno::Reference< io::XActiveDataSource > xSource; sal_Bool bEncrypted = sal_False; rtl::OUString sStream(sDocName); @@ -168,7 +168,7 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::Reference<lang::XMultiSe } } // #99667#; no longer necessary -/* else if ( pMedium ) +/* else if ( pMedium ) { // if there is a medium and if this medium has a load environment, // we get an active data source from the medium. @@ -225,7 +225,7 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::Reference<lang::XMultiSe xParser->setDocumentHandler( xDocHandler ); // parse -/* if( xSource.is() ) +/* if( xSource.is() ) { uno::Reference<io::XActiveDataControl> xSourceControl( xSource, uno::UNO_QUERY ); if( xSourceControl.is() ) @@ -507,8 +507,8 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError) sal_uInt32 nSettingsRetval(0); if (!bStylesOnly) { - // Settings must be loaded first because of the printer setting, - // which is needed in the page styles (paper tray). + // Settings must be loaded first because of the printer setting, + // which is needed in the page styles (paper tray). uno::Sequence<uno::Any> aSettingsArgs(1); uno::Any* pSettingsArgs = aSettingsArgs.getArray(); @@ -678,7 +678,7 @@ sal_Bool ScXMLImportWrapper::ExportToComponent(uno::Reference<lang::XMultiServic xOut = xStream->getOutputStream(); } // #99667#; no longer necessary -/* else if ( pMedium ) +/* else if ( pMedium ) { xOut = pMedium->GetDataSink(); }*/ @@ -818,7 +818,7 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly) if ( pObjSh && xStorage.is() ) { - pObjSh->UpdateDocInfoForSave(); // update information + pObjSh->UpdateDocInfoForSave(); // update information uno::Reference<frame::XModel> xModel(pObjSh->GetModel()); uno::Reference<task::XStatusIndicator> xStatusIndicator(GetStatusIndicator()); |