diff options
31 files changed, 236 insertions, 227 deletions
diff --git a/sc/source/filter/xml/XMLCalculationSettingsContext.hxx b/sc/source/filter/xml/XMLCalculationSettingsContext.hxx index 8ffdc9a81bcd..fb712ed73f82 100644 --- a/sc/source/filter/xml/XMLCalculationSettingsContext.hxx +++ b/sc/source/filter/xml/XMLCalculationSettingsContext.hxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLCalculationSettingsContext.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: sab $ $Date: 2000-11-23 14:58:05 $ + * last change: $Author: sab $ $Date: 2001-02-28 08:19:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -77,11 +77,11 @@ class ScXMLCalculationSettingsContext : public SvXMLImportContext com::sun::star::util::Date aNullDate; double fIterationEpsilon; sal_Int32 nIterationCount; - sal_Bool bIsIterationEnabled; - sal_Bool bCalcAsShown; - sal_Bool bIgnoreCase; - sal_Bool bLookUpLabels; - sal_Bool bMatchWholeCell; + sal_Bool bIsIterationEnabled : 1; + sal_Bool bCalcAsShown : 1; + sal_Bool bIgnoreCase : 1; + sal_Bool bLookUpLabels : 1; + sal_Bool bMatchWholeCell : 1; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } diff --git a/sc/source/filter/xml/XMLCellRangeSourceContext.hxx b/sc/source/filter/xml/XMLCellRangeSourceContext.hxx index dd5dac18a340..15124318d1eb 100644 --- a/sc/source/filter/xml/XMLCellRangeSourceContext.hxx +++ b/sc/source/filter/xml/XMLCellRangeSourceContext.hxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLCellRangeSourceContext.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: dr $ $Date: 2000-11-10 16:56:12 $ + * last change: $Author: sab $ $Date: 2001-02-28 08:19:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -79,7 +79,7 @@ struct ScMyImpCellRangeSource ::rtl::OUString sURL; sal_Int32 nColumns; sal_Int32 nRows; - sal_Bool bHas; + sal_Bool bHas : 1; ScMyImpCellRangeSource(); }; diff --git a/sc/source/filter/xml/XMLColumnRowGroupExport.hxx b/sc/source/filter/xml/XMLColumnRowGroupExport.hxx index ead1b75d8394..e6f3f6c7f4ff 100644 --- a/sc/source/filter/xml/XMLColumnRowGroupExport.hxx +++ b/sc/source/filter/xml/XMLColumnRowGroupExport.hxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLColumnRowGroupExport.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: sab $ $Date: 2001-02-05 13:43:01 $ + * last change: $Author: sab $ $Date: 2001-02-28 08:19:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -77,7 +77,7 @@ struct ScMyColumnRowGroup { sal_Int32 nField; sal_Int16 nLevel; - sal_Bool bDisplay; + sal_Bool bDisplay : 1; ScMyColumnRowGroup(); sal_Bool operator< (const ScMyColumnRowGroup& rGroup); @@ -93,7 +93,7 @@ class ScMyOpenCloseColumnRowGroup rtl::OUString sName; ScMyColumnRowGroupVec aTableStart; ScMyFieldGroupVec aTableEnd; - sal_Bool bNamespaced; + sal_Bool bNamespaced : 1; void OpenGroup(const ScMyColumnRowGroup& rGroup); void CloseGroup(); diff --git a/sc/source/filter/xml/XMLConsolidationContext.hxx b/sc/source/filter/xml/XMLConsolidationContext.hxx index bef2f205d8bd..c9df259a220c 100644 --- a/sc/source/filter/xml/XMLConsolidationContext.hxx +++ b/sc/source/filter/xml/XMLConsolidationContext.hxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLConsolidationContext.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: sab $ $Date: 2000-12-19 18:32:39 $ + * last change: $Author: sab $ $Date: 2001-02-28 08:19:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -82,8 +82,8 @@ private: ::rtl::OUString sUseLabel; ScAddress aTargetAddr; ScSubTotalFunc eFunction; - sal_Bool bLinkToSource; - sal_Bool bTargetAddr; + sal_Bool bLinkToSource : 1; + sal_Bool bTargetAddr : 1; protected: const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } diff --git a/sc/source/filter/xml/XMLDDELinksContext.hxx b/sc/source/filter/xml/XMLDDELinksContext.hxx index 7d744d40653f..6c399b15fca8 100644 --- a/sc/source/filter/xml/XMLDDELinksContext.hxx +++ b/sc/source/filter/xml/XMLDDELinksContext.hxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLDDELinksContext.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: sab $ $Date: 2001-02-05 13:43:01 $ + * last change: $Author: sab $ $Date: 2001-02-28 08:19:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -96,8 +96,8 @@ struct ScDDELinkCell { rtl::OUString sValue; double fValue; - sal_Bool bString; - sal_Bool bEmpty; + sal_Bool bString : 1; + sal_Bool bEmpty : 1; }; typedef std::list<ScDDELinkCell> ScDDELinkCells; @@ -109,10 +109,10 @@ class ScXMLDDELinkContext : public SvXMLImportContext rtl::OUString sApplication; rtl::OUString sTopic; rtl::OUString sItem; - sal_uInt8 nMode; 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(); } @@ -240,9 +240,9 @@ class ScXMLDDECellContext : public SvXMLImportContext rtl::OUString sValue; double fValue; sal_Int32 nCells; - sal_Bool bString; - sal_Bool bString2; - sal_Bool bEmpty; + sal_Bool bString : 1; + sal_Bool bString2 : 1; + sal_Bool bEmpty : 1; ScXMLDDELinkContext* pDDELink; diff --git a/sc/source/filter/xml/XMLDetectiveContext.hxx b/sc/source/filter/xml/XMLDetectiveContext.hxx index 287c5ce7f83f..7baa873cc784 100644 --- a/sc/source/filter/xml/XMLDetectiveContext.hxx +++ b/sc/source/filter/xml/XMLDetectiveContext.hxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLDetectiveContext.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: sab $ $Date: 2001-02-05 13:44:07 $ + * last change: $Author: sab $ $Date: 2001-02-28 08:19:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -90,7 +90,7 @@ struct ScMyImpDetectiveObj { ScRange aSourceRange; ScDetectiveObjType eObjType; - sal_Bool bHasError; + sal_Bool bHasError : 1; ScMyImpDetectiveObj(); }; @@ -164,7 +164,7 @@ class ScXMLDetectiveHighlightedContext : public SvXMLImportContext private: ScMyImpDetectiveObjVec& rDetectiveObjVec; ScMyImpDetectiveObj aDetectiveObj; - sal_Bool bValid; + sal_Bool bValid : 1; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -194,7 +194,7 @@ class ScXMLDetectiveOperationContext : public SvXMLImportContext { private: ScMyImpDetectiveOp aDetectiveOp; - sal_Bool bHasType; + sal_Bool bHasType : 1; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } diff --git a/sc/source/filter/xml/XMLExportIterator.cxx b/sc/source/filter/xml/XMLExportIterator.cxx index 450269075896..c30166e1e62a 100644 --- a/sc/source/filter/xml/XMLExportIterator.cxx +++ b/sc/source/filter/xml/XMLExportIterator.cxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLExportIterator.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: sab $ $Date: 2001-01-05 10:30:19 $ + * last change: $Author: sab $ $Date: 2001-02-28 08:19:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -617,9 +617,13 @@ void ScMyNotEmptyCellsIterator::SetMatrixCellData( ScMyCell& rMyCell ) uno::Reference< table::XCellRange > xCellRange( xTable, uno::UNO_QUERY ); if( xCellRange.is() ) { + sal_Bool bIsMatrixBase(sal_False); if( rExport.IsMatrix( xCellRange, xTable, rMyCell.aCellAddress.Column, rMyCell.aCellAddress.Row, - rMyCell.aMatrixRange, rMyCell.bIsMatrixBase ) ) - rMyCell.bIsMatrixCovered = !rMyCell.bIsMatrixBase; + rMyCell.aMatrixRange, bIsMatrixBase ) ) + { + rMyCell.bIsMatrixBase = bIsMatrixBase; + rMyCell.bIsMatrixCovered = !bIsMatrixBase; + } } } diff --git a/sc/source/filter/xml/XMLExportIterator.hxx b/sc/source/filter/xml/XMLExportIterator.hxx index 6218d90f3e86..482348f84f78 100644 --- a/sc/source/filter/xml/XMLExportIterator.hxx +++ b/sc/source/filter/xml/XMLExportIterator.hxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLExportIterator.hxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: sab $ $Date: 2001-02-05 13:43:01 $ + * last change: $Author: sab $ $Date: 2001-02-28 08:19:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -150,7 +150,7 @@ struct ScMyMergedRange { com::sun::star::table::CellRangeAddress aCellRange; sal_Int32 nRows; - sal_Bool bIsFirst; + sal_Bool bIsFirst : 1; sal_Bool operator<(const ScMyMergedRange& aRange); }; @@ -242,7 +242,7 @@ struct ScMyDetectiveObj ::com::sun::star::table::CellAddress aPosition; ::com::sun::star::table::CellRangeAddress aSourceRange; ScDetectiveObjType eObjType; - sal_Bool bHasError; + sal_Bool bHasError : 1; sal_Bool operator<(const ScMyDetectiveObj& rDetObj); }; @@ -315,17 +315,17 @@ struct ScMyCell ScMyDetectiveObjVec aDetectiveObjVec; ScMyDetectiveOpVec aDetectiveOpVec; - sal_Bool bHasShape; - sal_Bool bIsMergedBase; - sal_Bool bIsCovered; - sal_Bool bHasAreaLink; - sal_Bool bHasEmptyDatabase; - sal_Bool bHasDetectiveObj; - sal_Bool bHasDetectiveOp; - - sal_Bool bIsMatrixBase; - sal_Bool bIsMatrixCovered; - sal_Bool bHasAnnotation; + sal_Bool bHasShape : 1; + sal_Bool bIsMergedBase : 1; + sal_Bool bIsCovered : 1; + sal_Bool bHasAreaLink : 1; + sal_Bool bHasEmptyDatabase : 1; + sal_Bool bHasDetectiveObj : 1; + sal_Bool bHasDetectiveOp : 1; + + sal_Bool bIsMatrixBase : 1; + sal_Bool bIsMatrixCovered : 1; + sal_Bool bHasAnnotation : 1; ScMyCell(); ~ScMyCell(); diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx b/sc/source/filter/xml/XMLStylesExportHelper.cxx index 3ed41a1c4cb9..56603411e27e 100644 --- a/sc/source/filter/xml/XMLStylesExportHelper.cxx +++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLStylesExportHelper.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: sab $ $Date: 2001-01-15 14:52:44 $ + * last change: $Author: sab $ $Date: 2001-02-28 08:19:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -198,7 +198,9 @@ sal_Bool ScMyValidationsContainer::AddValidation(const uno::Any& aTempAny, aValidation.bShowImputMessage = bShowImputMessage; aValidation.aValidationType = aValidationType; aAny = xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_IGNOREBL))); - aAny >>= aValidation.bIgnoreBlanks; + sal_Bool bIgnoreBlanks(sal_False); + aAny >>= bIgnoreBlanks; + aValidation.bIgnoreBlanks = bIgnoreBlanks; aAny = xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_ERRALSTY))); aAny >>= aValidation.aAlertStyle; uno::Reference<sheet::XSheetCondition> xCondition(xPropertySet, uno::UNO_QUERY); diff --git a/sc/source/filter/xml/XMLStylesExportHelper.hxx b/sc/source/filter/xml/XMLStylesExportHelper.hxx index f3ce2e33d7de..8e09575b80a2 100644 --- a/sc/source/filter/xml/XMLStylesExportHelper.hxx +++ b/sc/source/filter/xml/XMLStylesExportHelper.hxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLStylesExportHelper.hxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: sab $ $Date: 2001-02-05 13:43:01 $ + * last change: $Author: sab $ $Date: 2001-02-28 08:19:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -104,9 +104,9 @@ struct ScMyValidation com::sun::star::sheet::ValidationAlertStyle aAlertStyle; com::sun::star::sheet::ValidationType aValidationType; com::sun::star::sheet::ConditionOperator aOperator; - sal_Bool bShowErrorMessage; - sal_Bool bShowImputMessage; - sal_Bool bIgnoreBlanks; + sal_Bool bShowErrorMessage : 1; + sal_Bool bShowImputMessage : 1; + sal_Bool bIgnoreBlanks : 1; ScMyValidation(); ~ScMyValidation(); @@ -146,7 +146,7 @@ struct ScMyRowFormatRange sal_Int32 nRepeatRows; sal_Int32 nIndex; sal_Int32 nValidationIndex; - sal_Bool bIsAutoStyle; + sal_Bool bIsAutoStyle : 1; ScMyRowFormatRange(); sal_Bool operator<(const ScMyRowFormatRange& rRange); @@ -178,7 +178,7 @@ struct ScMyFormatRange com::sun::star::table::CellRangeAddress aRangeAddress; sal_Int32 nStyleNameIndex; sal_Int32 nValidationIndex; - sal_Bool bIsAutoStyle; + sal_Bool bIsAutoStyle : 1; ScMyFormatRange(); sal_Bool operator< (const ScMyFormatRange& rRange); diff --git a/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx b/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx index 62e87cd3460e..aaa209b8a568 100644 --- a/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx +++ b/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLTableHeaderFooterContext.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: sab $ $Date: 2000-11-16 13:09:22 $ + * last change: $Author: sab $ $Date: 2001-02-28 08:19:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -165,7 +165,9 @@ XMLTableHeaderFooterContext::XMLTableHeaderFooterContext( SvXMLImport& rImport, sal_Bool bOn = *(sal_Bool *)aAny.getValue(); if ( bOn != bDisplay ) { - aAny.setValue( &bDisplay, ::getBooleanCppuType() ); + sal_Bool bTempDisplay(bDisplay); + aAny.setValue( &bTempDisplay, ::getBooleanCppuType() ); + bDisplay = bTempDisplay; xPropSet->setPropertyValue( sOn, aAny ); } } diff --git a/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx b/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx index fc93faa4c705..809100d5bc99 100644 --- a/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx +++ b/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLTableHeaderFooterContext.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: sab $ $Date: 2000-11-16 13:09:22 $ + * last change: $Author: sab $ $Date: 2001-02-28 08:19:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -95,7 +95,7 @@ class XMLTableHeaderFooterContext: public SvXMLImportContext const ::rtl::OUString sContentLeft; rtl::OUString sCont; - sal_Bool bDisplay; + sal_Bool bDisplay : 1; sal_Bool bInsertContent : 1; sal_Bool bLeft : 1; diff --git a/sc/source/filter/xml/XMLTableShapeImportHelper.hxx b/sc/source/filter/xml/XMLTableShapeImportHelper.hxx index 052e02435318..9eacedbff4e8 100644 --- a/sc/source/filter/xml/XMLTableShapeImportHelper.hxx +++ b/sc/source/filter/xml/XMLTableShapeImportHelper.hxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLTableShapeImportHelper.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: sab $ $Date: 2001-02-09 18:25:14 $ + * last change: $Author: sab $ $Date: 2001-02-28 08:19:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -74,7 +74,7 @@ class ScXMLImport; class XMLTableShapeImportHelper : public XMLShapeImportHelper { ::com::sun::star::table::CellAddress aStartCell; - sal_Bool bOnTable; + sal_Bool bOnTable : 1; public: XMLTableShapeImportHelper( ScXMLImport& rImp, SvXMLImportPropertyMapper *pImpMapper=0 ); diff --git a/sc/source/filter/xml/XMLTextPContext.hxx b/sc/source/filter/xml/XMLTextPContext.hxx index 24201dfbcf0f..6363abb40e47 100644 --- a/sc/source/filter/xml/XMLTextPContext.hxx +++ b/sc/source/filter/xml/XMLTextPContext.hxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLTextPContext.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: sab $ $Date: 2001-01-15 14:54:06 $ + * last change: $Author: sab $ $Date: 2001-02-28 08:19:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -78,7 +78,7 @@ class ScXMLTextPContext : public SvXMLImportContext rtl::OUString sLName; rtl::OUStringBuffer sOUText; USHORT nPrefix; - sal_Bool bIsOwn; + sal_Bool bIsOwn : 1; 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 0295406478aa..6eee42077436 100644 --- a/sc/source/filter/xml/XMLTrackedChangesContext.hxx +++ b/sc/source/filter/xml/XMLTrackedChangesContext.hxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLTrackedChangesContext.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: sab $ $Date: 2001-02-09 18:28:24 $ + * last change: $Author: sab $ $Date: 2001-02-28 08:19:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -162,8 +162,8 @@ class ScXMLCellContentDeletionContext : public SvXMLImportContext sal_Int32 nMatrixRows; sal_uInt16 nType; sal_uInt8 nMatrixFlag; - sal_Bool bBigRange; - sal_Bool bContainsCell; + sal_Bool bBigRange : 1; + sal_Bool bContainsCell : 1; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -313,12 +313,12 @@ class ScXMLChangeCellContext : public SvXMLImportContext 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 bIsMatrix : 1; + sal_Bool bIsCoveredMatrix : 1; + sal_Bool bEmpty : 1; + sal_Bool bFirstParagraph : 1; + sal_Bool bString : 1; + sal_Bool bFormula : 1; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } diff --git a/sc/source/filter/xml/xmlannoi.hxx b/sc/source/filter/xml/xmlannoi.hxx index b1586a4a6d59..81b2bbf75391 100644 --- a/sc/source/filter/xml/xmlannoi.hxx +++ b/sc/source/filter/xml/xmlannoi.hxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlannoi.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: sab $ $Date: 2001-01-15 14:43:50 $ + * last change: $Author: sab $ $Date: 2001-02-28 08:19:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -80,8 +80,8 @@ class ScXMLAnnotationContext : public SvXMLImportContext rtl::OUString sAuthor; rtl::OUString sCreateDate; sal_Int32 nParagraphCount; - sal_Bool bDisplay; - sal_Bool bHasTextP; + sal_Bool bDisplay : 1; + sal_Bool bHasTextP : 1; ScXMLTableRowCellContext* pCellContext; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } diff --git a/sc/source/filter/xml/xmlbodyi.hxx b/sc/source/filter/xml/xmlbodyi.hxx index ee0fd228ed72..24850db87856 100644 --- a/sc/source/filter/xml/xmlbodyi.hxx +++ b/sc/source/filter/xml/xmlbodyi.hxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlbodyi.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: sab $ $Date: 2001-02-23 15:46:38 $ + * last change: $Author: sab $ $Date: 2001-02-28 08:19:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -76,7 +76,7 @@ class ScXMLChangeTrackingImportHelper; class ScXMLBodyContext : public SvXMLImportContext { rtl::OUString sPassword; - sal_Bool bProtected; + sal_Bool bProtected : 1; ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } diff --git a/sc/source/filter/xml/xmlcelli.hxx b/sc/source/filter/xml/xmlcelli.hxx index e65f981fb2df..691f865a8bb3 100644 --- a/sc/source/filter/xml/xmlcelli.hxx +++ b/sc/source/filter/xml/xmlcelli.hxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlcelli.hxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: sab $ $Date: 2000-11-10 17:52:59 $ + * last change: $Author: sab $ $Date: 2001-02-28 08:19:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -103,7 +103,7 @@ struct ScMyAnnotation rtl::OUString sAuthor; rtl::OUString sCreateDate; rtl::OUString sText; - sal_Bool bDisplay; + sal_Bool bDisplay : 1; }; class ScXMLTableRowCellContext : public SvXMLImportContext @@ -117,21 +117,21 @@ class ScXMLTableRowCellContext : public SvXMLImportContext rtl::OUString sCurrencySymbol; rtl::OUString sStyleName; rtl::OUString sContentValidationName; + double fValue; sal_Int32 nMergedRows, nMergedCols; sal_Int32 nMatrixRows, nMatrixCols; - sal_Bool bIsMerged; - sal_Bool bIsMatrix; - sal_Bool bIsFormula; - sal_Bool bHasSubTable; - sal_Bool bIsCovered; - sal_Bool bHasAnnotation; - sal_Bool bIsEmpty; - sal_Bool bHasTextImport; - sal_Bool bIsFirstTextImport; + sal_Int32 nRepeatedRows; sal_Int32 nCellsRepeated; sal_Int16 nCellType; - sal_Int32 nRepeatedRows; - double fValue; + sal_Bool bIsMerged : 1; + sal_Bool bIsMatrix : 1; + sal_Bool bIsFormula : 1; + sal_Bool bHasSubTable : 1; + sal_Bool bIsCovered : 1; + sal_Bool bHasAnnotation : 1; + sal_Bool bIsEmpty : 1; + sal_Bool bHasTextImport : 1; + sal_Bool bIsFirstTextImport : 1; ScMyAnnotation aMyAnnotation; ScMyImpDetectiveObjVec aDetectiveObjVec; ScMyImpCellRangeSource aCellRangeSource; diff --git a/sc/source/filter/xml/xmlcoli.hxx b/sc/source/filter/xml/xmlcoli.hxx index 03a962f8a82b..e49aa294b98c 100644 --- a/sc/source/filter/xml/xmlcoli.hxx +++ b/sc/source/filter/xml/xmlcoli.hxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlcoli.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: sab $ $Date: 2000-11-01 13:19:03 $ + * last change: $Author: sab $ $Date: 2001-02-28 08:19:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -103,9 +103,9 @@ class ScXMLTableColsContext : public SvXMLImportContext sal_Int32 nHeaderEndCol; sal_Int32 nGroupStartCol; sal_Int32 nGroupEndCol; - sal_Bool bHeader; - sal_Bool bGroup; - sal_Bool bGroupDisplay; + sal_Bool bHeader : 1; + sal_Bool bGroup : 1; + sal_Bool bGroupDisplay : 1; 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 58212507f529..1d570646e8ae 100644 --- a/sc/source/filter/xml/xmlcvali.hxx +++ b/sc/source/filter/xml/xmlcvali.hxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlcvali.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: sab $ $Date: 2001-01-15 15:04:03 $ + * last change: $Author: sab $ $Date: 2001-02-28 08:19:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -115,9 +115,9 @@ class ScXMLContentValidationContext : public SvXMLImportContext rtl::OUString sErrorMessageType; rtl::OUString sBaseCellAddress; rtl::OUString sCondition; - sal_Bool bAllowEmptyCell; - sal_Bool bDisplayHelp; - sal_Bool bDisplayError; + sal_Bool bAllowEmptyCell : 1; + sal_Bool bDisplayHelp : 1; + sal_Bool bDisplayError : 1; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -154,7 +154,7 @@ class ScXMLHelpMessageContext : public SvXMLImportContext rtl::OUString sTitle; rtl::OUStringBuffer sMessage; sal_Int32 nParagraphCount; - sal_Bool bDisplay; + sal_Bool bDisplay : 1; ScXMLContentValidationContext* pValidationContext; @@ -185,7 +185,7 @@ class ScXMLErrorMessageContext : public SvXMLImportContext rtl::OUStringBuffer sMessage; rtl::OUString sMessageType; sal_Int32 nParagraphCount; - sal_Bool bDisplay; + sal_Bool bDisplay : 1; ScXMLContentValidationContext* pValidationContext; @@ -213,7 +213,7 @@ public: class ScXMLErrorMacroContext : public SvXMLImportContext { rtl::OUString sName; - sal_Bool bExecute; + sal_Bool bExecute : 1; ScXMLContentValidationContext* pValidationContext; diff --git a/sc/source/filter/xml/xmldpimp.hxx b/sc/source/filter/xml/xmldpimp.hxx index b9357f8bb809..ca23eabc3ea1 100644 --- a/sc/source/filter/xml/xmldpimp.hxx +++ b/sc/source/filter/xml/xmldpimp.hxx @@ -2,9 +2,9 @@ * * $RCSfile: xmldpimp.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: sab $ $Date: 2000-12-19 18:32:39 $ + * last change: $Author: sab $ $Date: 2001-02-28 08:19:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -128,15 +128,15 @@ class ScXMLDataPilotTableContext : public SvXMLImportContext ScAddress aFilterOutputPosition; ScQueryParam aSourceQueryParam; ScMySourceType nSourceType; - 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 : 1; + sal_Bool bIgnoreEmptyRows : 1; + sal_Bool bIdentifyCategories : 1; + sal_Bool bUseRegularExpression : 1; + sal_Bool bIsCaseSensitive : 1; + sal_Bool bSkipDuplicates : 1; + sal_Bool bFilterCopyOutputData : 1; + sal_Bool bTargetRangeAddress : 1; + sal_Bool bSourceCellRange : 1; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } @@ -308,10 +308,10 @@ class ScXMLDataPilotFieldContext : public SvXMLImportContext ScXMLDataPilotTableContext* pDataPilotTable; ScDPSaveDimension* pDim; - sal_Int16 nOrientation; sal_Int32 nUsedHierarchy; sal_Int16 nFunction; - sal_Bool bShowEmpty; + sal_Int16 nOrientation; + sal_Bool bShowEmpty : 1; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -449,8 +449,8 @@ class ScXMLDataPilotMemberContext : public SvXMLImportContext ScXMLDataPilotFieldContext* pDataPilotField; rtl::OUString sName; - sal_Bool bDisplay; - sal_Bool bDisplayDetails; + sal_Bool bDisplay : 1; + sal_Bool bDisplayDetails : 1; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } diff --git a/sc/source/filter/xml/xmldrani.hxx b/sc/source/filter/xml/xmldrani.hxx index e31dbf47cd43..233ff69cd629 100644 --- a/sc/source/filter/xml/xmldrani.hxx +++ b/sc/source/filter/xml/xmldrani.hxx @@ -2,9 +2,9 @@ * * $RCSfile: xmldrani.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:45:15 $ + * last change: $Author: sab $ $Date: 2001-02-28 08:19:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -125,27 +125,27 @@ class ScXMLDatabaseRangeContext : public SvXMLImportContext com::sun::star::table::CellAddress aFilterOutputPosition; com::sun::star::table::CellRangeAddress aFilterConditionSourceRangeAddress; com::sun::star::sheet::DataImportMode nSourceType; - sal_Bool bNative; - sal_Bool bIsSelection; - sal_Bool bKeepFormats; - sal_Bool bMoveCells; - sal_Bool bStripData; - sal_Bool bOrientation; - 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_Int16 nSubTotalsUserListIndex; - sal_Int16 nSubTotalRuleGroupFieldNumber; - sal_Bool bFilterCopyOutputData; - sal_Bool bFilterIsCaseSensitive; - sal_Bool bFilterSkipDuplicates; - sal_Bool bFilterUseRegularExpressions; - sal_Bool bFilterConditionSourceRange; + sal_Bool bNative : 1; + sal_Bool bIsSelection : 1; + sal_Bool bKeepFormats : 1; + sal_Bool bMoveCells : 1; + sal_Bool bStripData : 1; + sal_Bool bOrientation : 1; + sal_Bool bContainsHeader : 1; + sal_Bool bAutoFilter : 1; + sal_Bool bSubTotalsBindFormatsToContent : 1; + sal_Bool bSubTotalsIsCaseSensitive : 1; + sal_Bool bSubTotalsInsertPageBreaks : 1; + sal_Bool bSubTotalsSortGroups : 1; + sal_Bool bSubTotalsEnabledUserList : 1; + sal_Bool bSubTotalsAscending : 1; + sal_Int16 nSubTotalsUserListIndex : 1; + sal_Int16 nSubTotalRuleGroupFieldNumber : 1; + sal_Bool bFilterCopyOutputData : 1; + sal_Bool bFilterIsCaseSensitive : 1; + sal_Bool bFilterSkipDuplicates : 1; + sal_Bool bFilterUseRegularExpressions : 1; + sal_Bool bFilterConditionSourceRange : 1; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } diff --git a/sc/source/filter/xml/xmlexprt.hxx b/sc/source/filter/xml/xmlexprt.hxx index b02265bca3f1..6f49fab617cd 100644 --- a/sc/source/filter/xml/xmlexprt.hxx +++ b/sc/source/filter/xml/xmlexprt.hxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlexprt.hxx,v $ * - * $Revision: 1.44 $ + * $Revision: 1.45 $ * - * last change: $Author: sab $ $Date: 2001-02-23 15:46:38 $ + * last change: $Author: sab $ $Date: 2001-02-28 08:19:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -96,7 +96,7 @@ class ScDocument; struct ScMyDrawPage { com::sun::star::uno::Reference<com::sun::star::drawing::XDrawPage> xDrawPage; - sal_Bool bHasForms; + sal_Bool bHasForms : 1; }; typedef std::vector<sal_Int32> ScMyTableShapeIndexes; @@ -131,25 +131,25 @@ class ScXMLExport : public SvXMLExport ScMyTableShapes aTableShapes; ScMyDrawPages aDrawPages; - sal_Bool bHasRowHeader; - sal_Bool bRowHeaderOpen; - sal_Bool mbShowProgress : 1; - sal_Bool bShapeStyles; - sal_Int32 nOpenRow; - sal_Int32 nProgressReference; - sal_Int32 nProgressValue; - sal_Int32 nProgressObjects; - sal_Int32 nOldProgressValue; - sal_Int16 nCurrentTable; std::vector<sal_Int32> nLastColumns; std::vector<sal_Int32> nLastRows; - ScMyShapesContainer* pShapesContainer; ScMyMergedRangesContainer* pMergedRangesContainer; ScMyValidationsContainer* pValidationsContainer; ScMyDetectiveObjContainer* pDetectiveObjContainer; ScMyNotEmptyCellsIterator* pCellsItr; ScChangeTrackingExportHelper* pChangeTrackingExportHelper; + sal_Int32 nOpenRow; + sal_Int32 nProgressReference; + sal_Int32 nProgressValue; + sal_Int32 nProgressObjects; + sal_Int32 nOldProgressValue; + sal_Int16 nCurrentTable; + sal_Bool bHasRowHeader : 1; + sal_Bool bRowHeaderOpen : 1; + sal_Bool mbShowProgress : 1; + sal_Bool bShapeStyles : 1; + void WriteTablesView(const com::sun::star::uno::Any& aTableView); void WriteView(const com::sun::star::uno::Any& aView); diff --git a/sc/source/filter/xml/xmlfilti.hxx b/sc/source/filter/xml/xmlfilti.hxx index ec5f93655ca6..018b9d18b3a6 100644 --- a/sc/source/filter/xml/xmlfilti.hxx +++ b/sc/source/filter/xml/xmlfilti.hxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlfilti.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:45:15 $ + * last change: $Author: sab $ $Date: 2001-02-28 08:19:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -96,14 +96,14 @@ class ScXMLFilterContext : public SvXMLImportContext 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; + sal_Bool bSkipDuplicates : 1; + sal_Bool bCopyOutputData : 1; + sal_Bool bUseRegularExpressions : 1; + sal_Bool bIsCaseSensitive : 1; + sal_Bool bEnabledUserList : 1; + sal_Bool bConnectionOr : 1; + sal_Bool bNextConnectionOr : 1; + sal_Bool bConditionSourceRange : 1; Stack aConnectionOrStack; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } @@ -195,7 +195,7 @@ class ScXMLConditionContext : public SvXMLImportContext rtl::OUString sConditionValue; rtl::OUString sOperator; sal_Int32 nField; - sal_Bool bIsCaseSensitive; + sal_Bool bIsCaseSensitive : 1; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -229,14 +229,14 @@ class ScXMLDPFilterContext : public SvXMLImportContext ScAddress aOutputPosition; ScRange 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; + sal_Bool bSkipDuplicates : 1; + sal_Bool bCopyOutputData : 1; + sal_Bool bUseRegularExpressions : 1; + sal_Bool bIsCaseSensitive : 1; + sal_Bool bEnabledUserList : 1; + sal_Bool bConnectionOr : 1; + sal_Bool bNextConnectionOr : 1; + sal_Bool bConditionSourceRange : 1; Stack aConnectionOrStack; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } @@ -329,7 +329,7 @@ class ScXMLDPConditionContext : public SvXMLImportContext rtl::OUString sConditionValue; rtl::OUString sOperator; sal_Int32 nField; - sal_Bool bIsCaseSensitive; + sal_Bool bIsCaseSensitive : 1; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx index f20c63072d1a..3288d4a0ed7b 100644 --- a/sc/source/filter/xml/xmlimprt.hxx +++ b/sc/source/filter/xml/xmlimprt.hxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlimprt.hxx,v $ * - * $Revision: 1.39 $ + * $Revision: 1.40 $ * - * last change: $Author: sab $ $Date: 2001-02-23 15:46:38 $ + * last change: $Author: sab $ $Date: 2001-02-28 08:19:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -620,11 +620,11 @@ struct tScMyCellRange struct ScMyNamedExpression { - sal_Bool bIsExpression; rtl::OUString sName; rtl::OUString sContent; rtl::OUString sBaseCellAddress; rtl::OUString sRangeType; + sal_Bool bIsExpression : 1; }; typedef std::list<const ScMyNamedExpression*> ScMyNamedExpressions; @@ -642,9 +642,9 @@ struct ScMyImportValidation com::sun::star::sheet::ValidationAlertStyle aAlertStyle; com::sun::star::sheet::ValidationType aValidationType; com::sun::star::sheet::ConditionOperator aOperator; - sal_Bool bShowErrorMessage; - sal_Bool bShowImputMessage; - sal_Bool bIgnoreBlanks; + sal_Bool bShowErrorMessage : 1; + sal_Bool bShowImputMessage : 1; + sal_Bool bIgnoreBlanks : 1; }; typedef std::vector<ScMyImportValidation> ScMyImportValidations; @@ -733,16 +733,17 @@ class ScXMLImport: public SvXMLImport SvXMLTokenMap *pDataPilotMemberAttrTokenMap; SvXMLTokenMap *pConsolidationAttrTokenMap; - sal_uInt16 nStyleFamilyMask;// Mask of styles to load - sal_Bool bLoadDoc : 1; // Load doc or styles only - sal_Bool bRemoveLastChar; - ScMyTables aTables; ScMyNamedExpressions aMyNamedExpressions; ScMyImportValidations aValidations; ScMyImpDetectiveOpArray aDetectiveOpArray; + sal_uInt16 nStyleFamilyMask;// Mask of styles to load + sal_Bool bLoadDoc : 1; // Load doc or styles only + sal_Bool bRemoveLastChar : 1; + + protected: // This method is called after the namespace map has been updated, but diff --git a/sc/source/filter/xml/xmllabri.hxx b/sc/source/filter/xml/xmllabri.hxx index 6352629f463f..c56d8672f9df 100644 --- a/sc/source/filter/xml/xmllabri.hxx +++ b/sc/source/filter/xml/xmllabri.hxx @@ -2,9 +2,9 @@ * * $RCSfile: xmllabri.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: dr $ $Date: 2000-10-26 13:23:21 $ + * last change: $Author: sab $ $Date: 2001-02-28 08:19:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -101,7 +101,7 @@ class ScXMLLabelRangeContext : public SvXMLImportContext private: ::rtl::OUString sLabelRangeStr; ::rtl::OUString sDataRangeStr; - sal_Bool bColumnOrientation; + sal_Bool bColumnOrientation : 1; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } diff --git a/sc/source/filter/xml/xmlrowi.hxx b/sc/source/filter/xml/xmlrowi.hxx index e7e2e5c61cc0..3dda66e536ce 100644 --- a/sc/source/filter/xml/xmlrowi.hxx +++ b/sc/source/filter/xml/xmlrowi.hxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlrowi.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: sab $ $Date: 2000-11-01 13:19:03 $ + * last change: $Author: sab $ $Date: 2001-02-28 08:19:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -103,9 +103,9 @@ class ScXMLTableRowsContext : public SvXMLImportContext sal_Int32 nHeaderEndRow; sal_Int32 nGroupStartRow; sal_Int32 nGroupEndRow; - sal_Bool bHeader; - sal_Bool bGroup; - sal_Bool bGroupDisplay; + sal_Bool bHeader : 1; + sal_Bool bGroup : 1; + sal_Bool bGroupDisplay : 1; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } diff --git a/sc/source/filter/xml/xmlsceni.hxx b/sc/source/filter/xml/xmlsceni.hxx index d0d12008a97e..833f98667cc1 100644 --- a/sc/source/filter/xml/xmlsceni.hxx +++ b/sc/source/filter/xml/xmlsceni.hxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlsceni.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: dr $ $Date: 2000-10-10 09:42:33 $ + * last change: $Author: sab $ $Date: 2001-02-28 08:19:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -85,11 +85,11 @@ private: rtl::OUString sComment; Color aBorderColor; ScRangeList aScenarioRanges; - sal_Bool bDisplayBorder; - sal_Bool bCopyBack; - sal_Bool bCopyStyles; - sal_Bool bCopyFormulas; - sal_Bool bIsActive; + sal_Bool bDisplayBorder : 1; + sal_Bool bCopyBack : 1; + sal_Bool bCopyStyles : 1; + sal_Bool bCopyFormulas : 1; + sal_Bool bIsActive : 1; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } diff --git a/sc/source/filter/xml/xmlsorti.hxx b/sc/source/filter/xml/xmlsorti.hxx index d1d91a75197d..2ff45488403e 100644 --- a/sc/source/filter/xml/xmlsorti.hxx +++ b/sc/source/filter/xml/xmlsorti.hxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlsorti.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:45:16 $ + * last change: $Author: sab $ $Date: 2001-02-28 08:19:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -84,11 +84,11 @@ class ScXMLSortContext : public SvXMLImportContext com::sun::star::uno::Sequence <com::sun::star::util::SortField> aSortFields; com::sun::star::table::CellAddress aOutputPosition; - sal_Bool bCopyOutputData; - sal_Bool bBindFormatsToContent; - sal_Bool bIsCaseSensitive; - sal_Bool bEnabledUserList; sal_Int16 nUserListIndex; + sal_Bool bCopyOutputData : 1; + sal_Bool bBindFormatsToContent : 1; + sal_Bool bIsCaseSensitive : 1; + sal_Bool bEnabledUserList : 1; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } diff --git a/sc/source/filter/xml/xmlsubti.hxx b/sc/source/filter/xml/xmlsubti.hxx index 9d02eddd55c3..46b95e82739a 100644 --- a/sc/source/filter/xml/xmlsubti.hxx +++ b/sc/source/filter/xml/xmlsubti.hxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlsubti.hxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: sab $ $Date: 2001-02-22 18:10:43 $ + * last change: $Author: sab $ $Date: 2001-02-28 08:19:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -158,13 +158,13 @@ private: ::com::sun::star::uno::Reference < ::com::sun::star::drawing::XShapes > xShapes; rtl::OUString sCurrentSheetName; rtl::OUString sPassword; + std::vector<ScMyTableData*> aTableVec; + com::sun::star::table::CellAddress aRealCellPos; sal_Int16 nCurrentDrawPage; sal_Int16 nCurrentXShapes; - std::vector<ScMyTableData*> aTableVec; sal_Int16 nTableCount; sal_Int16 nCurrentSheet; - com::sun::star::table::CellAddress aRealCellPos; - sal_Bool bProtection; + sal_Bool bProtection : 1; sal_Bool IsMerged (const com::sun::star::uno::Reference <com::sun::star::table::XCellRange>& xCellRange, const sal_Int32 nCol, const sal_Int32 nRow, diff --git a/sc/source/filter/xml/xmltabi.hxx b/sc/source/filter/xml/xmltabi.hxx index d14ceb84f985..bd6b59fb5bc7 100644 --- a/sc/source/filter/xml/xmltabi.hxx +++ b/sc/source/filter/xml/xmltabi.hxx @@ -2,9 +2,9 @@ * * $RCSfile: xmltabi.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: sab $ $Date: 2001-02-01 17:39:59 $ + * last change: $Author: sab $ $Date: 2001-02-28 08:19:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -70,7 +70,7 @@ class ScXMLImport; class ScXMLTableContext : public SvXMLImportContext { rtl::OUString sPrintRanges; - sal_Bool bStartFormPage; + sal_Bool bStartFormPage : 1; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } |