diff options
Diffstat (limited to 'sc/source/filter')
40 files changed, 256 insertions, 256 deletions
diff --git a/sc/source/filter/xml/XMLCalculationSettingsContext.hxx b/sc/source/filter/xml/XMLCalculationSettingsContext.hxx index 33af4c0ff92a..3788c3cac8d9 100644 --- a/sc/source/filter/xml/XMLCalculationSettingsContext.hxx +++ b/sc/source/filter/xml/XMLCalculationSettingsContext.hxx @@ -22,8 +22,8 @@ #include <xmloff/xmlictxt.hxx> #include <com/sun/star/util/Date.hpp> +#include "xmlimprt.hxx" -class ScXMLImport; class ScXMLCalculationSettingsContext : public SvXMLImportContext { @@ -38,8 +38,8 @@ class ScXMLCalculationSettingsContext : public SvXMLImportContext bool bMatchWholeCell; bool bUseRegularExpressions; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLCalculationSettingsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -62,8 +62,8 @@ public: class ScXMLNullDateContext : public SvXMLImportContext { - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLNullDateContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -82,8 +82,8 @@ public: class ScXMLIterationContext : public SvXMLImportContext { - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLIterationContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/sc/source/filter/xml/XMLCellRangeSourceContext.hxx b/sc/source/filter/xml/XMLCellRangeSourceContext.hxx index 95a93c17cf5c..1801db63e891 100644 --- a/sc/source/filter/xml/XMLCellRangeSourceContext.hxx +++ b/sc/source/filter/xml/XMLCellRangeSourceContext.hxx @@ -21,8 +21,8 @@ #define INCLUDED_SC_SOURCE_FILTER_XML_XMLCELLRANGESOURCECONTEXT_HXX #include <xmloff/xmlimp.hxx> +#include "xmlimprt.hxx" -class ScXMLImport; struct ScMyImpCellRangeSource { @@ -40,8 +40,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 static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLCellRangeSourceContext( diff --git a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx index 76cfdc1cc195..d75c08112950 100644 --- a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx +++ b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx @@ -555,7 +555,7 @@ void ScChangeTrackingExportHelper::AddDeletionAttributes(const ScChangeActionDel bAll = true; else { - const ScChangeActionDel* pDel = (const ScChangeActionDel*) p; + const ScChangeActionDel* pDel = static_cast<const ScChangeActionDel*>(p); if ( (pDel->GetDx() > pDelAction->GetDx() || pDel->GetDy() > pDelAction->GetDy()) && pDel->GetBigRange() == pDelAction->GetBigRange() ) { diff --git a/sc/source/filter/xml/XMLConsolidationContext.hxx b/sc/source/filter/xml/XMLConsolidationContext.hxx index ba53c2f4af38..1c9bfd8d2844 100644 --- a/sc/source/filter/xml/XMLConsolidationContext.hxx +++ b/sc/source/filter/xml/XMLConsolidationContext.hxx @@ -23,8 +23,8 @@ #include "global.hxx" #include "address.hxx" #include <xmloff/xmlimp.hxx> +#include "xmlimprt.hxx" -class ScXMLImport; class ScXMLConsolidationContext : public SvXMLImportContext { @@ -37,8 +37,8 @@ private: bool bTargetAddr; protected: - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLConsolidationContext( diff --git a/sc/source/filter/xml/XMLDDELinksContext.hxx b/sc/source/filter/xml/XMLDDELinksContext.hxx index ce7b102e840f..184a4ced4ad9 100644 --- a/sc/source/filter/xml/XMLDDELinksContext.hxx +++ b/sc/source/filter/xml/XMLDDELinksContext.hxx @@ -21,15 +21,13 @@ #define INCLUDED_SC_SOURCE_FILTER_XML_XMLDDELINKSCONTEXT_HXX #include <xmloff/xmlictxt.hxx> - +#include "xmlimprt.hxx" #include <list> -class ScXMLImport; - class ScXMLDDELinksContext : public SvXMLImportContext { - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLDDELinksContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -68,8 +66,8 @@ class ScXMLDDELinkContext : public SvXMLImportContext sal_Int32 nRows; sal_uInt8 nMode; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLDDELinkContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -100,8 +98,8 @@ class ScXMLDDESourceContext : public SvXMLImportContext { ScXMLDDELinkContext* pDDELink; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLDDESourceContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -123,8 +121,8 @@ class ScXMLDDETableContext : public SvXMLImportContext { ScXMLDDELinkContext* pDDELink; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLDDETableContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -146,8 +144,8 @@ class ScXMLDDEColumnContext : public SvXMLImportContext { ScXMLDDELinkContext* pDDELink; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLDDEColumnContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -170,8 +168,8 @@ class ScXMLDDERowContext : public SvXMLImportContext ScXMLDDELinkContext* pDDELink; sal_Int32 nRows; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLDDERowContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -200,8 +198,8 @@ class ScXMLDDECellContext : public SvXMLImportContext ScXMLDDELinkContext* pDDELink; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLDDECellContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/sc/source/filter/xml/XMLDetectiveContext.hxx b/sc/source/filter/xml/XMLDetectiveContext.hxx index 12b0265abc10..38f22eaab528 100644 --- a/sc/source/filter/xml/XMLDetectiveContext.hxx +++ b/sc/source/filter/xml/XMLDetectiveContext.hxx @@ -24,11 +24,10 @@ #include <com/sun/star/table/CellRangeAddress.hpp> #include "detfunc.hxx" #include "detdata.hxx" +#include "xmlimprt.hxx" #include <list> -class ScXMLImport; - struct ScMyImpDetectiveObj { ScRange aSourceRange; @@ -78,8 +77,8 @@ class ScXMLDetectiveContext : public SvXMLImportContext private: ScMyImpDetectiveObjVec* pDetectiveObjVec; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLDetectiveContext( @@ -105,8 +104,8 @@ private: ScMyImpDetectiveObj aDetectiveObj; bool bValid; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLDetectiveHighlightedContext( @@ -132,8 +131,8 @@ private: ScMyImpDetectiveOp aDetectiveOp; bool bHasType; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLDetectiveOperationContext( diff --git a/sc/source/filter/xml/XMLEmptyContext.hxx b/sc/source/filter/xml/XMLEmptyContext.hxx index be0c9e9587d9..20d6bd0ced77 100644 --- a/sc/source/filter/xml/XMLEmptyContext.hxx +++ b/sc/source/filter/xml/XMLEmptyContext.hxx @@ -20,13 +20,13 @@ #define INCLUDED_SC_SOURCE_FILTER_XML_XMLEMPTYCONTEXT_HXX #include <xmloff/xmlictxt.hxx> +#include "xmlimprt.hxx" -class ScXMLImport; class ScXMLEmptyContext : public SvXMLImportContext { - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: diff --git a/sc/source/filter/xml/XMLExportDataPilot.cxx b/sc/source/filter/xml/XMLExportDataPilot.cxx index cd711d4b0edb..99b086777910 100644 --- a/sc/source/filter/xml/XMLExportDataPilot.cxx +++ b/sc/source/filter/xml/XMLExportDataPilot.cxx @@ -759,7 +759,7 @@ void ScXMLExportDataPilot::WriteDataPilots(const uno::Reference <sheet::XSpreads const ScPatternAttr* pAttr = aAttrItr.GetNext(nCol, nRow1, nRow2); while (pAttr) { - ScMergeFlagAttr& rItem = (ScMergeFlagAttr&)pAttr->GetItem(ATTR_MERGE_FLAG); + const ScMergeFlagAttr& rItem = static_cast<const ScMergeFlagAttr&>(pAttr->GetItem(ATTR_MERGE_FLAG)); if (rItem.HasPivotButton()) { for (SCROW nButtonRow = nRow1; nButtonRow <= nRow2; ++nButtonRow) diff --git a/sc/source/filter/xml/XMLTableShapesContext.cxx b/sc/source/filter/xml/XMLTableShapesContext.cxx index f1eb4a860b24..7062aa4c74b8 100644 --- a/sc/source/filter/xml/XMLTableShapesContext.cxx +++ b/sc/source/filter/xml/XMLTableShapesContext.cxx @@ -52,7 +52,7 @@ SvXMLImportContext *ScXMLTableShapesContext::CreateChildContext( sal_uInt16 nPre uno::Reference<drawing::XShapes> xShapes (rXMLImport.GetTables().GetCurrentXShapes()); if (xShapes.is()) { - XMLTableShapeImportHelper* pTableShapeImport((XMLTableShapeImportHelper*)rXMLImport.GetShapeImport().get()); + XMLTableShapeImportHelper* pTableShapeImport(static_cast<XMLTableShapeImportHelper*>(rXMLImport.GetShapeImport().get())); pTableShapeImport->SetOnTable(true); pContext = rXMLImport.GetShapeImport()->CreateGroupChildContext( rXMLImport, nPrefix, rLName, xAttrList, xShapes); diff --git a/sc/source/filter/xml/XMLTableShapesContext.hxx b/sc/source/filter/xml/XMLTableShapesContext.hxx index aa6ad501c4bd..857ebc8683d3 100644 --- a/sc/source/filter/xml/XMLTableShapesContext.hxx +++ b/sc/source/filter/xml/XMLTableShapesContext.hxx @@ -21,13 +21,12 @@ #define INCLUDED_SC_SOURCE_FILTER_XML_XMLTABLESHAPESCONTEXT_HXX #include <xmloff/xmlictxt.hxx> - -class ScXMLImport; +#include "xmlimprt.hxx" class ScXMLTableShapesContext : public SvXMLImportContext { - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLTableShapesContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/sc/source/filter/xml/XMLTableSourceContext.hxx b/sc/source/filter/xml/XMLTableSourceContext.hxx index 31415e9630c6..1c97efa3a138 100644 --- a/sc/source/filter/xml/XMLTableSourceContext.hxx +++ b/sc/source/filter/xml/XMLTableSourceContext.hxx @@ -22,8 +22,7 @@ #include <xmloff/xmlictxt.hxx> #include <com/sun/star/sheet/SheetLinkMode.hpp> - -class ScXMLImport; +#include "xmlimprt.hxx" class ScXMLTableSourceContext : public SvXMLImportContext { @@ -34,8 +33,8 @@ class ScXMLTableSourceContext : public SvXMLImportContext sal_Int32 nRefresh; com::sun::star::sheet::SheetLinkMode nMode; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLTableSourceContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.cxx b/sc/source/filter/xml/XMLTrackedChangesContext.cxx index 90e3b9cc9c98..dfa5a69310bd 100644 --- a/sc/source/filter/xml/XMLTrackedChangesContext.cxx +++ b/sc/source/filter/xml/XMLTrackedChangesContext.cxx @@ -47,7 +47,7 @@ class ScXMLChangeInfoContext : public SvXMLImportContext ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; sal_uInt32 nParagraphCount; - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLChangeInfoContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -68,7 +68,7 @@ class ScXMLBigRangeContext : public SvXMLImportContext { ScBigRange& rBigRange; - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLBigRangeContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -104,7 +104,7 @@ class ScXMLCellContentDeletionContext : public SvXMLImportContext bool bBigRange; bool bContainsCell; - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLCellContentDeletionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -125,7 +125,7 @@ class ScXMLDependenceContext : public SvXMLImportContext { ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLDependenceContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -146,7 +146,7 @@ class ScXMLDependingsContext : public SvXMLImportContext { ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLDependingsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -167,7 +167,7 @@ class ScXMLChangeDeletionContext : public SvXMLImportContext { ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLChangeDeletionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -188,7 +188,7 @@ class ScXMLDeletionsContext : public SvXMLImportContext { ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLDeletionsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -216,7 +216,7 @@ class ScXMLChangeTextPContext : public SvXMLImportContext SvXMLImportContext* pTextPContext; sal_uInt16 nPrefix; - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -253,7 +253,7 @@ class ScXMLChangeCellContext : public SvXMLImportContext bool bString; bool bFormula; - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLChangeCellContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -294,7 +294,7 @@ class ScXMLPreviousContext : public SvXMLImportContext sal_uInt16 nType; sal_uInt8 nMatrixFlag; - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLPreviousContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -316,7 +316,7 @@ class ScXMLContentChangeContext : public SvXMLImportContext ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; ScBigRange aBigRange; - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLContentChangeContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -336,7 +336,7 @@ class ScXMLInsertionContext : public SvXMLImportContext { ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLInsertionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -356,7 +356,7 @@ class ScXMLInsertionCutOffContext : public SvXMLImportContext { ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLInsertionCutOffContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -376,7 +376,7 @@ class ScXMLMovementCutOffContext : public SvXMLImportContext { ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLMovementCutOffContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -396,7 +396,7 @@ class ScXMLCutOffsContext : public SvXMLImportContext { ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLCutOffsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -416,7 +416,7 @@ class ScXMLDeletionContext : public SvXMLImportContext { ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLDeletionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -438,7 +438,7 @@ class ScXMLMovementContext : public SvXMLImportContext ScBigRange aTargetRange; ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLMovementContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -458,7 +458,7 @@ class ScXMLRejectionContext : public SvXMLImportContext { ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLRejectionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.hxx b/sc/source/filter/xml/XMLTrackedChangesContext.hxx index 5bc218e0a635..da8e03a81b6b 100644 --- a/sc/source/filter/xml/XMLTrackedChangesContext.hxx +++ b/sc/source/filter/xml/XMLTrackedChangesContext.hxx @@ -22,18 +22,18 @@ #include "XMLChangeTrackingImportHelper.hxx" #include "chgtrack.hxx" +#include "xmlimprt.hxx" #include <xmloff/xmlictxt.hxx> #include <rtl/ustrbuf.hxx> -class ScXMLImport; class ScXMLChangeTrackingImportHelper; class ScXMLTrackedChangesContext : public SvXMLImportContext { ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLTrackedChangesContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/sc/source/filter/xml/xmlannoi.cxx b/sc/source/filter/xml/xmlannoi.cxx index 963cd15b9790..10d161fa3e85 100644 --- a/sc/source/filter/xml/xmlannoi.cxx +++ b/sc/source/filter/xml/xmlannoi.cxx @@ -54,7 +54,7 @@ ScXMLAnnotationContext::ScXMLAnnotationContext( ScXMLImport& rImport, uno::Reference<drawing::XShapes> xLocalShapes (GetScImport().GetTables().GetCurrentXShapes()); if (xLocalShapes.is()) { - XMLTableShapeImportHelper* pTableShapeImport = (XMLTableShapeImportHelper*)GetScImport().GetShapeImport().get(); + XMLTableShapeImportHelper* pTableShapeImport = static_cast<XMLTableShapeImportHelper*>(GetScImport().GetShapeImport().get()); pTableShapeImport->SetAnnotation(this); pShapeContext = GetScImport().GetShapeImport()->CreateGroupChildContext( GetScImport(), nPrfx, rLName, xAttrList, xLocalShapes, true); @@ -169,7 +169,7 @@ void ScXMLAnnotationContext::EndElement() mrAnnotationData.maCreateDate = maCreateDateStringBuffer.makeStringAndClear(); mrAnnotationData.maSimpleText = maTextBuffer.makeStringAndClear(); - XMLTableShapeImportHelper* pTableShapeImport = (XMLTableShapeImportHelper*)GetScImport().GetShapeImport().get(); + XMLTableShapeImportHelper* pTableShapeImport = static_cast<XMLTableShapeImportHelper*>(GetScImport().GetShapeImport().get()); pTableShapeImport->SetAnnotation(NULL); } diff --git a/sc/source/filter/xml/xmlannoi.hxx b/sc/source/filter/xml/xmlannoi.hxx index d107b132d1e4..837f855d9f89 100644 --- a/sc/source/filter/xml/xmlannoi.hxx +++ b/sc/source/filter/xml/xmlannoi.hxx @@ -25,8 +25,8 @@ #include <editeng/editdata.hxx> #include <com/sun/star/drawing/XShape.hpp> #include <com/sun/star/drawing/XShapes.hpp> +#include "xmlimprt.hxx" -class ScXMLImport; class ScXMLTableRowCellContext; struct ScXMLAnnotationStyleEntry @@ -102,8 +102,8 @@ private: ScXMLTableRowCellContext* pCellContext; SvXMLImportContext* pShapeContext; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } }; #endif diff --git a/sc/source/filter/xml/xmlbodyi.cxx b/sc/source/filter/xml/xmlbodyi.cxx index 1b074b99123a..efb655fb7c5e 100644 --- a/sc/source/filter/xml/xmlbodyi.cxx +++ b/sc/source/filter/xml/xmlbodyi.cxx @@ -37,6 +37,7 @@ #include "XMLCalculationSettingsContext.hxx" #include "XMLTrackedChangesContext.hxx" #include "XMLEmptyContext.hxx" +#include "XMLDetectiveContext.hxx" #include "scerrors.hxx" #include "tabprotection.hxx" #include "datastreamimport.hxx" diff --git a/sc/source/filter/xml/xmlbodyi.hxx b/sc/source/filter/xml/xmlbodyi.hxx index 7aa2221c1426..09bcd460f179 100644 --- a/sc/source/filter/xml/xmlbodyi.hxx +++ b/sc/source/filter/xml/xmlbodyi.hxx @@ -22,10 +22,10 @@ #include <xmloff/xmlictxt.hxx> #include <xmloff/xmlimp.hxx> +#include "xmlimprt.hxx" #include "tabprotection.hxx" -class ScXMLImport; class ScXMLChangeTrackingImportHelper; class ScXMLBodyContext : public SvXMLImportContext @@ -37,8 +37,8 @@ class ScXMLBodyContext : public SvXMLImportContext bool bHadCalculationSettings; ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLBodyContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/sc/source/filter/xml/xmlcoli.cxx b/sc/source/filter/xml/xmlcoli.cxx index d5e80a7f5f26..86227a593df7 100644 --- a/sc/source/filter/xml/xmlcoli.cxx +++ b/sc/source/filter/xml/xmlcoli.cxx @@ -125,11 +125,11 @@ void ScXMLTableColContext::EndElement() { if (!sStyleName.isEmpty()) { - XMLTableStylesContext *pStyles = (XMLTableStylesContext *)rXMLImport.GetAutoStyles(); + XMLTableStylesContext *pStyles = static_cast<XMLTableStylesContext *>(rXMLImport.GetAutoStyles()); if ( pStyles ) { - XMLTableStyleContext* pStyle = (XMLTableStyleContext *)pStyles->FindStyleChildContext( - XML_STYLE_FAMILY_TABLE_COLUMN, sStyleName, true); + XMLTableStyleContext* pStyle = const_cast<XMLTableStyleContext*>(static_cast<const XMLTableStyleContext *>(pStyles->FindStyleChildContext( + XML_STYLE_FAMILY_TABLE_COLUMN, sStyleName, true))); if (pStyle) { pStyle->FillPropertySet(xColumnProperties); diff --git a/sc/source/filter/xml/xmlcoli.hxx b/sc/source/filter/xml/xmlcoli.hxx index 866ab957aa43..9c99afab9f99 100644 --- a/sc/source/filter/xml/xmlcoli.hxx +++ b/sc/source/filter/xml/xmlcoli.hxx @@ -21,8 +21,8 @@ #include <xmloff/xmlictxt.hxx> #include <xmloff/xmlimp.hxx> +#include "xmlimprt.hxx" -class ScXMLImport; class ScXMLTableColContext : public SvXMLImportContext { @@ -31,8 +31,8 @@ class ScXMLTableColContext : public SvXMLImportContext OUString sVisibility; OUString sCellStyleName; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -61,8 +61,8 @@ class ScXMLTableColsContext : public SvXMLImportContext bool bGroup; bool bGroupDisplay; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: diff --git a/sc/source/filter/xml/xmlcondformat.hxx b/sc/source/filter/xml/xmlcondformat.hxx index 26d83fab318d..9e2e810ee52f 100644 --- a/sc/source/filter/xml/xmlcondformat.hxx +++ b/sc/source/filter/xml/xmlcondformat.hxx @@ -23,8 +23,8 @@ struct ScIconSetFormatData; class ScXMLConditionalFormatsContext : public SvXMLImportContext { - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLConditionalFormatsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName ); @@ -41,8 +41,8 @@ public: class ScXMLConditionalFormatContext : public SvXMLImportContext { - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLConditionalFormatContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -66,8 +66,8 @@ private: class ScXMLColorScaleFormatContext : public SvXMLImportContext { private: - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLColorScaleFormatContext( ScXMLImport& rImport, sal_uInt16 nPrfx, @@ -86,8 +86,8 @@ private: class ScXMLDataBarFormatContext : public SvXMLImportContext { - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLDataBarFormatContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -110,8 +110,8 @@ private: class ScXMLIconSetFormatContext : public SvXMLImportContext { - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } ScIconSetFormatData* mpFormatData; public: @@ -132,8 +132,8 @@ public: class ScXMLColorScaleFormatEntryContext : public SvXMLImportContext { - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLColorScaleFormatEntryContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -149,8 +149,8 @@ private: class ScXMLFormattingEntryContext : public SvXMLImportContext { - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLFormattingEntryContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -163,8 +163,8 @@ public: class ScXMLCondContext : public SvXMLImportContext { - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLCondContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -177,8 +177,8 @@ public: class ScXMLDateContext : public SvXMLImportContext { - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLDateContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/sc/source/filter/xml/xmlconti.hxx b/sc/source/filter/xml/xmlconti.hxx index 2751007f17ba..bedbc7da46b3 100644 --- a/sc/source/filter/xml/xmlconti.hxx +++ b/sc/source/filter/xml/xmlconti.hxx @@ -21,16 +21,15 @@ #include <xmloff/xmlimp.hxx> #include <rtl/ustrbuf.hxx> - -class ScXMLImport; +#include "xmlimprt.hxx" class ScXMLContentContext : public SvXMLImportContext { OUStringBuffer sOUText; OUStringBuffer& sValue; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: diff --git a/sc/source/filter/xml/xmlcvali.cxx b/sc/source/filter/xml/xmlcvali.cxx index 1bd823c108a9..0c616f1b5cc8 100644 --- a/sc/source/filter/xml/xmlcvali.cxx +++ b/sc/source/filter/xml/xmlcvali.cxx @@ -51,8 +51,8 @@ class ScXMLContentValidationContext : public SvXMLImportContext SvXMLImportContextRef xEventContext; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } com::sun::star::sheet::ValidationAlertStyle GetAlertStyle() const; void SetFormula( OUString& rFormula, OUString& rFormulaNmsp, FormulaGrammar::Grammar& reGrammar, @@ -89,7 +89,7 @@ class ScXMLHelpMessageContext : public SvXMLImportContext ScXMLContentValidationContext* pValidationContext; - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -119,7 +119,7 @@ class ScXMLErrorMessageContext : public SvXMLImportContext ScXMLContentValidationContext* pValidationContext; - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -146,7 +146,7 @@ class ScXMLErrorMacroContext : public SvXMLImportContext ScXMLContentValidationContext* pValidationContext; - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -419,7 +419,7 @@ void ScXMLContentValidationContext::EndElement() { OUString sOnError("OnError"); XMLEventsImportContext* pEvents = - (XMLEventsImportContext*)&xEventContext; + static_cast<XMLEventsImportContext*>(&xEventContext); uno::Sequence<beans::PropertyValue> aValues; pEvents->GetEventSequence( sOnError, aValues ); diff --git a/sc/source/filter/xml/xmlcvali.hxx b/sc/source/filter/xml/xmlcvali.hxx index 2913d9e289b1..c97f174e97a8 100644 --- a/sc/source/filter/xml/xmlcvali.hxx +++ b/sc/source/filter/xml/xmlcvali.hxx @@ -25,13 +25,12 @@ #include <com/sun/star/sheet/ValidationType.hpp> #include <com/sun/star/sheet/ConditionOperator.hpp> #include <rtl/ustrbuf.hxx> - -class ScXMLImport; +#include "xmlimprt.hxx" class ScXMLContentValidationsContext : public SvXMLImportContext { - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: diff --git a/sc/source/filter/xml/xmldpimp.hxx b/sc/source/filter/xml/xmldpimp.hxx index 3470e6c8158b..9a0f1d3533d0 100644 --- a/sc/source/filter/xml/xmldpimp.hxx +++ b/sc/source/filter/xml/xmldpimp.hxx @@ -30,10 +30,10 @@ #include "dpobject.hxx" #include "dpsave.hxx" #include "queryparam.hxx" +#include "xmlimprt.hxx" #include <boost/unordered_set.hpp> -class ScXMLImport; class ScDPSaveNumGroupDimension; class ScDPSaveGroupDimension; @@ -49,8 +49,8 @@ enum ScMySourceType class ScXMLDataPilotTablesContext : public SvXMLImportContext { - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -118,8 +118,8 @@ class ScXMLDataPilotTableContext : public SvXMLImportContext SelectedPagesType maSelectedPages; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -162,8 +162,8 @@ class ScXMLDPSourceSQLContext : public SvXMLImportContext { ScXMLDataPilotTableContext* pDataPilotTable; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -187,8 +187,8 @@ class ScXMLDPSourceTableContext : public SvXMLImportContext { ScXMLDataPilotTableContext* pDataPilotTable; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -212,8 +212,8 @@ class ScXMLDPSourceQueryContext : public SvXMLImportContext { ScXMLDataPilotTableContext* pDataPilotTable; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -237,8 +237,8 @@ class ScXMLSourceServiceContext : public SvXMLImportContext { ScXMLDataPilotTableContext* pDataPilotTable; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -290,8 +290,8 @@ class ScXMLSourceCellRangeContext : public SvXMLImportContext { ScXMLDataPilotTableContext* pDataPilotTable; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -340,8 +340,8 @@ class ScXMLDataPilotFieldContext : public SvXMLImportContext bool bAutoEnd:1; bool mbHasHiddenMember:1; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -388,8 +388,8 @@ class ScXMLDataPilotFieldReferenceContext : public SvXMLImportContext { // com::sun::star::sheet::DataPilotFieldReference aReference; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -406,8 +406,8 @@ class ScXMLDataPilotLevelContext : public SvXMLImportContext { ScXMLDataPilotFieldContext* pDataPilotField; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -431,8 +431,8 @@ class ScXMLDataPilotDisplayInfoContext : public SvXMLImportContext { // com::sun::star::sheet::DataPilotFieldAutoShowInfo aInfo; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -449,8 +449,8 @@ class ScXMLDataPilotSortInfoContext : public SvXMLImportContext { // com::sun::star::sheet::DataPilotFieldSortInfo aInfo; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -467,8 +467,8 @@ class ScXMLDataPilotLayoutInfoContext : public SvXMLImportContext { // com::sun::star::sheet::DataPilotFieldLayoutInfo aInfo; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -489,8 +489,8 @@ class ScXMLDataPilotSubTotalsContext : public SvXMLImportContext sal_uInt16* pFunctions; OUString maDisplayName; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -518,8 +518,8 @@ class ScXMLDataPilotSubTotalContext : public SvXMLImportContext { ScXMLDataPilotSubTotalsContext* pDataPilotSubTotals; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -543,8 +543,8 @@ class ScXMLDataPilotMembersContext : public SvXMLImportContext { ScXMLDataPilotFieldContext* pDataPilotField; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -574,8 +574,8 @@ class ScXMLDataPilotMemberContext : public SvXMLImportContext bool bDisplayDetails; bool bHasName; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -599,8 +599,8 @@ class ScXMLDataPilotGroupsContext : public SvXMLImportContext { ScXMLDataPilotFieldContext* pDataPilotField; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -627,8 +627,8 @@ class ScXMLDataPilotGroupContext : public SvXMLImportContext OUString sName; ::std::vector<OUString> aMembers; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -656,8 +656,8 @@ class ScXMLDataPilotGroupMemberContext : public SvXMLImportContext OUString sName; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: diff --git a/sc/source/filter/xml/xmldrani.hxx b/sc/source/filter/xml/xmldrani.hxx index dbdc502a1dec..5555dfdd3d2e 100644 --- a/sc/source/filter/xml/xmldrani.hxx +++ b/sc/source/filter/xml/xmldrani.hxx @@ -31,17 +31,17 @@ #include <com/sun/star/table/TableOrientation.hpp> #include "dbdata.hxx" +#include "xmlimprt.hxx" #include <boost/scoped_ptr.hpp> class ScDBData; struct ScQueryParam; -class ScXMLImport; class ScXMLDatabaseRangesContext : public SvXMLImportContext { - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -100,8 +100,8 @@ class ScXMLDatabaseRangeContext : public SvXMLImportContext bool bByRow; ScDBCollection::RangeType meRangeType; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } ScDBData* ConvertToDBData(const OUString& rName); @@ -144,8 +144,8 @@ class ScXMLSourceSQLContext : public SvXMLImportContext ScXMLDatabaseRangeContext* pDatabaseRangeContext; OUString sDBName; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -170,8 +170,8 @@ class ScXMLSourceTableContext : public SvXMLImportContext ScXMLDatabaseRangeContext* pDatabaseRangeContext; OUString sDBName; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -196,8 +196,8 @@ class ScXMLSourceQueryContext : public SvXMLImportContext ScXMLDatabaseRangeContext* pDatabaseRangeContext; OUString sDBName; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -221,8 +221,8 @@ class ScXMLConResContext : public SvXMLImportContext { ScXMLDatabaseRangeContext* pDatabaseRangeContext; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -246,8 +246,8 @@ class ScXMLSubTotalRulesContext : public SvXMLImportContext { ScXMLDatabaseRangeContext* pDatabaseRangeContext; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -271,8 +271,8 @@ class ScXMLSortGroupsContext : public SvXMLImportContext { ScXMLDatabaseRangeContext* pDatabaseRangeContext; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -297,8 +297,8 @@ class ScXMLSubTotalRuleContext : public SvXMLImportContext ScXMLDatabaseRangeContext* pDatabaseRangeContext; ScSubTotalRule aSubTotalRule; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -328,8 +328,8 @@ class ScXMLSubTotalFieldContext : public SvXMLImportContext OUString sFieldNumber; OUString sFunction; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 6e7b52de2596..8b382c919f9e 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -4980,7 +4980,7 @@ void ScXMLExport::CollectUserDefinedNamespaces(const SfxItemPool* pPool, sal_uIn { if( 0 != (pItem = pPool->GetItem2( nAttrib, i ) ) ) { - const SvXMLAttrContainerItem *pUnknown((const SvXMLAttrContainerItem *)pItem); + const SvXMLAttrContainerItem *pUnknown(static_cast<const SvXMLAttrContainerItem *>(pItem)); if( (pUnknown->GetAttrCount() > 0) ) { sal_uInt16 nIdx(pUnknown->GetFirstNamespaceIndex()); diff --git a/sc/source/filter/xml/xmlfilti.hxx b/sc/source/filter/xml/xmlfilti.hxx index eaa0dd01a96e..e22fe1e6d81b 100644 --- a/sc/source/filter/xml/xmlfilti.hxx +++ b/sc/source/filter/xml/xmlfilti.hxx @@ -56,8 +56,8 @@ class ScXMLFilterContext : public SvXMLImportContext bool bConditionSourceRange; std::vector<ConnStackItem> maConnStack; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -87,8 +87,8 @@ class ScXMLAndContext : public SvXMLImportContext ScQueryParam& mrQueryParam; ScXMLFilterContext* pFilterContext; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -114,8 +114,8 @@ class ScXMLOrContext : public SvXMLImportContext ScQueryParam& mrQueryParam; ScXMLFilterContext* pFilterContext; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -148,8 +148,8 @@ class ScXMLConditionContext : public SvXMLImportContext sal_Int32 nField; bool bIsCaseSensitive; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -214,8 +214,8 @@ class ScXMLDPFilterContext : public SvXMLImportContext bool bConditionSourceRange:1; ::std::stack<bool> aConnectionOrStack; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -267,8 +267,8 @@ class ScXMLDPAndContext : public SvXMLImportContext { ScXMLDPFilterContext* pFilterContext; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -292,8 +292,8 @@ class ScXMLDPOrContext : public SvXMLImportContext { ScXMLDPFilterContext* pFilterContext; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -323,8 +323,8 @@ class ScXMLDPConditionContext : public SvXMLImportContext sal_Int32 nField; bool bIsCaseSensitive; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: diff --git a/sc/source/filter/xml/xmlfonte.cxx b/sc/source/filter/xml/xmlfonte.cxx index 82f1ca409751..8e514e6ca8ec 100644 --- a/sc/source/filter/xml/xmlfonte.cxx +++ b/sc/source/filter/xml/xmlfonte.cxx @@ -51,7 +51,7 @@ void ScXMLFontAutoStylePool_Impl::AddFontItems(sal_uInt16* pWhichIds, sal_uInt8 sal_uInt16 nWhichId(pWhichIds[i]); if (bExportDefaults && (0 != (pItem = &pItemPool->GetDefaultItem(nWhichId)))) { - const SvxFontItem *pFont((const SvxFontItem *)pItem); + const SvxFontItem *pFont(static_cast<const SvxFontItem *>(pItem)); Add( pFont->GetFamilyName(), pFont->GetStyleName(), pFont->GetFamily(), pFont->GetPitch(), pFont->GetCharSet() ); @@ -61,7 +61,7 @@ void ScXMLFontAutoStylePool_Impl::AddFontItems(sal_uInt16* pWhichIds, sal_uInt8 { if( 0 != (pItem = pItemPool->GetItem2( nWhichId, j ) ) ) { - const SvxFontItem *pFont((const SvxFontItem *)pItem); + const SvxFontItem *pFont(static_cast<const SvxFontItem *>(pItem)); Add( pFont->GetFamilyName(), pFont->GetStyleName(), pFont->GetFamily(), pFont->GetPitch(), pFont->GetCharSet() ); diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index aefb1a92f764..721a46b07854 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -58,6 +58,7 @@ #include "patattr.hxx" #include "XMLConverter.hxx" +#include "XMLDetectiveContext.hxx" #include "XMLTableShapeImportHelper.hxx" #include "XMLChangeTrackingImportHelper.hxx" #include "chgviset.hxx" @@ -240,7 +241,7 @@ const SvXMLTokenMap& ScXMLImport::GetTableRowCellAttrTokenMap() class ScXMLDocContext_Impl : public virtual SvXMLImportContext { protected: - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -314,7 +315,7 @@ SvXMLImportContext *ScXMLFlatDocContext_Impl::CreateChildContext( class ScXMLBodyContext_Impl : public SvXMLImportContext { - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -2270,9 +2271,9 @@ SvXMLImportContext *ScXMLImport::CreateStylesContext(const OUString& rLocalName, *this, XML_NAMESPACE_OFFICE, rLocalName, xAttrList, bIsAutoStyle); if (bIsAutoStyle) - SetAutoStyles((SvXMLStylesContext*)pContext); + SetAutoStyles(static_cast<SvXMLStylesContext*>(pContext)); else - SetStyles((SvXMLStylesContext*)pContext); + SetStyles(static_cast<SvXMLStylesContext*>(pContext)); return pContext; } @@ -2830,9 +2831,11 @@ void ScXMLImport::SetStyleToRanges() uno::Reference <beans::XPropertySet> xProperties (xSheetCellRanges, uno::UNO_QUERY); if (xProperties.is()) { - XMLTableStylesContext *pStyles((XMLTableStylesContext *)GetAutoStyles()); - XMLTableStyleContext* pStyle( pStyles ? (XMLTableStyleContext *)pStyles->FindStyleChildContext( - XML_STYLE_FAMILY_TABLE_CELL, sPrevStyleName, true) : NULL ); + XMLTableStylesContext *pStyles(static_cast<XMLTableStylesContext *>(GetAutoStyles())); + XMLTableStyleContext* pStyle = NULL; + if ( pStyles ) + pStyle = const_cast<XMLTableStyleContext*>(static_cast<const XMLTableStyleContext *>(pStyles->FindStyleChildContext( + XML_STYLE_FAMILY_TABLE_CELL, sPrevStyleName, true))); if (pStyle) { pStyle->FillPropertySet(xProperties); @@ -3435,4 +3438,11 @@ void ScXMLImport::NotifyEmbeddedFontRead() pDoc->SetIsUsingEmbededFonts( true ); } +ScMyImpDetectiveOpArray* ScXMLImport::GetDetectiveOpArray() +{ + if (!pDetectiveOpArray) + pDetectiveOpArray = new ScMyImpDetectiveOpArray(); + return pDetectiveOpArray; +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx index 0d953431b1a4..7f428e30f545 100644 --- a/sc/source/filter/xml/xmlimprt.hxx +++ b/sc/source/filter/xml/xmlimprt.hxx @@ -34,7 +34,6 @@ #include "compiler.hxx" #include "xmlstyle.hxx" -#include "XMLDetectiveContext.hxx" #include <com/sun/star/sheet/ValidationAlertStyle.hpp> #include <com/sun/star/sheet/ValidationType.hpp> #include <com/sun/star/sheet/ConditionOperator.hpp> @@ -54,6 +53,7 @@ class ScMyStyleNumberFormats; class XMLNumberFormatAttributesExportHelper; class ScEditEngineDefaulter; class ScDocumentImport; +class ScMyImpDetectiveOpArray; namespace sc { @@ -1137,10 +1137,7 @@ public: pValidations->push_back(rValidation); } bool GetValidation(const OUString& sName, ScMyImportValidation& aValidation); - inline ScMyImpDetectiveOpArray* GetDetectiveOpArray() { - if (!pDetectiveOpArray) - pDetectiveOpArray = new ScMyImpDetectiveOpArray(); - return pDetectiveOpArray; } + ScMyImpDetectiveOpArray* GetDetectiveOpArray(); void SetRemoveLastChar(bool bValue) { bRemoveLastChar = bValue; } bool GetRemoveLastChar() { return bRemoveLastChar; } diff --git a/sc/source/filter/xml/xmllabri.hxx b/sc/source/filter/xml/xmllabri.hxx index c384e9960538..590fc037aa78 100644 --- a/sc/source/filter/xml/xmllabri.hxx +++ b/sc/source/filter/xml/xmllabri.hxx @@ -20,14 +20,13 @@ #define INCLUDED_SC_SOURCE_FILTER_XML_XMLLABRI_HXX #include <xmloff/xmlictxt.hxx> - -class ScXMLImport; +#include "xmlimprt.hxx" class ScXMLLabelRangesContext : public SvXMLImportContext { private: - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLLabelRangesContext( @@ -53,8 +52,8 @@ private: OUString sDataRangeStr; bool bColumnOrientation; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLLabelRangeContext( diff --git a/sc/source/filter/xml/xmlnexpi.hxx b/sc/source/filter/xml/xmlnexpi.hxx index df17e0b01955..cce47678b4dc 100644 --- a/sc/source/filter/xml/xmlnexpi.hxx +++ b/sc/source/filter/xml/xmlnexpi.hxx @@ -22,17 +22,17 @@ #include <xmloff/xmlictxt.hxx> #include <xmloff/xmlimp.hxx> #include "address.hxx" +#include "xmlimprt.hxx" #include <boost/shared_ptr.hpp> -class ScXMLImport; struct ScMyNamedExpression; class ScRangeName; class ScXMLNamedExpressionsContext : public SvXMLImportContext { - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -92,8 +92,8 @@ private: class ScXMLNamedRangeContext : public SvXMLImportContext { - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -118,8 +118,8 @@ private: class ScXMLNamedExpressionContext : public SvXMLImportContext { - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: diff --git a/sc/source/filter/xml/xmlrowi.cxx b/sc/source/filter/xml/xmlrowi.cxx index 65af6b0905c0..7af34aa1dd16 100644 --- a/sc/source/filter/xml/xmlrowi.cxx +++ b/sc/source/filter/xml/xmlrowi.cxx @@ -172,11 +172,11 @@ void ScXMLTableRowContext::EndElement() { if (!sStyleName.isEmpty()) { - XMLTableStylesContext *pStyles((XMLTableStylesContext *)rXMLImport.GetAutoStyles()); + XMLTableStylesContext *pStyles(static_cast<XMLTableStylesContext *>(rXMLImport.GetAutoStyles())); if ( pStyles ) { - XMLTableStyleContext* pStyle((XMLTableStyleContext *)pStyles->FindStyleChildContext( - XML_STYLE_FAMILY_TABLE_ROW, sStyleName, true)); + XMLTableStyleContext* pStyle(const_cast<XMLTableStyleContext*>(static_cast<const XMLTableStyleContext *>(pStyles->FindStyleChildContext( + XML_STYLE_FAMILY_TABLE_ROW, sStyleName, true)))); if (pStyle) { pStyle->FillPropertySet(xRowProperties); diff --git a/sc/source/filter/xml/xmlrowi.hxx b/sc/source/filter/xml/xmlrowi.hxx index 24d08f59d0f7..c770218de1a7 100644 --- a/sc/source/filter/xml/xmlrowi.hxx +++ b/sc/source/filter/xml/xmlrowi.hxx @@ -22,8 +22,8 @@ #include <xmloff/xmlictxt.hxx> #include <xmloff/xmlimp.hxx> #include "address.hxx" +#include "xmlimprt.hxx" -class ScXMLImport; class ScXMLTableRowContext : public SvXMLImportContext { @@ -32,8 +32,8 @@ class ScXMLTableRowContext : public SvXMLImportContext sal_Int32 nRepeatedRows; bool bHasCell; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -60,8 +60,8 @@ class ScXMLTableRowsContext : public SvXMLImportContext bool bGroup; bool bGroupDisplay; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: diff --git a/sc/source/filter/xml/xmlsceni.hxx b/sc/source/filter/xml/xmlsceni.hxx index 4251c641330f..dd3b7b9548f0 100644 --- a/sc/source/filter/xml/xmlsceni.hxx +++ b/sc/source/filter/xml/xmlsceni.hxx @@ -39,8 +39,8 @@ private: bool bIsActive; bool bProtected; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: diff --git a/sc/source/filter/xml/xmlsorti.hxx b/sc/source/filter/xml/xmlsorti.hxx index 893a43e6c04e..97ff19ebea71 100644 --- a/sc/source/filter/xml/xmlsorti.hxx +++ b/sc/source/filter/xml/xmlsorti.hxx @@ -43,8 +43,8 @@ class ScXMLSortContext : public SvXMLImportContext bool bIsCaseSensitive; bool bEnabledUserList; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -74,8 +74,8 @@ class ScXMLSortByContext : public SvXMLImportContext OUString sDataType; OUString sOrder; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx index d27af06b4c74..7fb37216b5fa 100644 --- a/sc/source/filter/xml/xmlstyli.cxx +++ b/sc/source/filter/xml/xmlstyli.cxx @@ -351,7 +351,7 @@ class ScXMLMapContext : public SvXMLImportContext OUString msCondition; OUString msBaseCell; - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLMapContext( @@ -727,7 +727,7 @@ void XMLTableStylesContext::EndElement() if (bAutoStyles) GetImport().GetTextImport()->SetAutoStyles( this ); else - ((ScXMLImport&)GetImport()).InsertStyles(); + GetScImport().InsertStyles(); } rtl::Reference < SvXMLImportPropertyMapper > @@ -1089,7 +1089,7 @@ void ScCellTextStyleContext::FillPropertySet( const uno::Reference<beans::XPrope ScDrawTextCursor* pDrawImp = ScDrawTextCursor::getImplementation( xPropSet ); if (pDrawImp) { - XMLTableShapeImportHelper* pTableShapeImport = (XMLTableShapeImportHelper*)GetScImport().GetShapeImport().get(); + XMLTableShapeImportHelper* pTableShapeImport = static_cast<XMLTableShapeImportHelper*>(GetScImport().GetShapeImport().get()); ScXMLAnnotationContext* pAnnotationContext = pTableShapeImport->GetAnnotationContext(); if (pAnnotationContext) { diff --git a/sc/source/filter/xml/xmlstyli.hxx b/sc/source/filter/xml/xmlstyli.hxx index 9e68eda6dfba..6c1d483681ad 100644 --- a/sc/source/filter/xml/xmlstyli.hxx +++ b/sc/source/filter/xml/xmlstyli.hxx @@ -78,8 +78,8 @@ class XMLTableStyleContext : public XMLPropStyleContext ScConditionalFormat* mpCondFormat; bool mbDeleteCondFormat; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } protected: @@ -146,8 +146,8 @@ class XMLTableStylesContext : public SvXMLStylesContext rtl::Reference < SvXMLImportPropertyMapper > xRowImpPropMapper; rtl::Reference < SvXMLImportPropertyMapper > xTableImpPropMapper; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } protected: @@ -254,8 +254,8 @@ class ScCellTextStyleContext : public XMLTextStyleContext { sal_Int32 nLastSheet; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScCellTextStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/sc/source/filter/xml/xmlsubti.cxx b/sc/source/filter/xml/xmlsubti.cxx index e3f159b08f7e..f8da27fb556c 100644 --- a/sc/source/filter/xml/xmlsubti.cxx +++ b/sc/source/filter/xml/xmlsubti.cxx @@ -153,11 +153,11 @@ void ScMyTables::SetTableStyle(const OUString& sStyleName) uno::Reference <beans::XPropertySet> xProperties(xCurrentSheet, uno::UNO_QUERY); if ( xProperties.is() ) { - XMLTableStylesContext *pStyles = (XMLTableStylesContext *)rImport.GetAutoStyles(); + XMLTableStylesContext *pStyles = static_cast<XMLTableStylesContext *>(rImport.GetAutoStyles()); if ( pStyles ) { - XMLTableStyleContext* pStyle = (XMLTableStyleContext *)pStyles->FindStyleChildContext( - XML_STYLE_FAMILY_TABLE_TABLE, sStyleName, true); + XMLTableStyleContext* pStyle = const_cast<XMLTableStyleContext*>(static_cast<const XMLTableStyleContext *>(pStyles->FindStyleChildContext( + XML_STYLE_FAMILY_TABLE_TABLE, sStyleName, true))); if ( pStyle ) { pStyle->FillPropertySet(xProperties); diff --git a/sc/source/filter/xml/xmltabi.hxx b/sc/source/filter/xml/xmltabi.hxx index 62bd8c034c64..eec6553d4e0b 100644 --- a/sc/source/filter/xml/xmltabi.hxx +++ b/sc/source/filter/xml/xmltabi.hxx @@ -20,11 +20,11 @@ #define INCLUDED_SC_SOURCE_FILTER_XML_XMLTABI_HXX #include "externalrefmgr.hxx" +#include "xmlimprt.hxx" #include <xmloff/xmlictxt.hxx> #include <memory> -class ScXMLImport; struct ScXMLExternalTabData { @@ -45,8 +45,8 @@ class ScXMLTableContext : public SvXMLImportContext bool bStartFormPage; bool bPrintEntireSheet; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: |