diff options
Diffstat (limited to 'oox')
88 files changed, 324 insertions, 324 deletions
diff --git a/oox/inc/drawingml/ThemeOverrideFragmentHandler.hxx b/oox/inc/drawingml/ThemeOverrideFragmentHandler.hxx index 827cf5a52f55..5d1fdc9581a8 100644 --- a/oox/inc/drawingml/ThemeOverrideFragmentHandler.hxx +++ b/oox/inc/drawingml/ThemeOverrideFragmentHandler.hxx @@ -26,7 +26,7 @@ public: Theme& rTheme ); virtual ~ThemeOverrideFragmentHandler(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; private: Theme& mrTheme; diff --git a/oox/inc/drawingml/chart/axiscontext.hxx b/oox/inc/drawingml/chart/axiscontext.hxx index 6275fcdd3a71..d551b805bfb2 100644 --- a/oox/inc/drawingml/chart/axiscontext.hxx +++ b/oox/inc/drawingml/chart/axiscontext.hxx @@ -38,7 +38,7 @@ public: explicit AxisDispUnitsContext( ::oox::core::ContextHandler2Helper& rParent, AxisDispUnitsModel& rModel ); virtual ~AxisDispUnitsContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; }; @@ -54,7 +54,7 @@ public: explicit AxisContextBase( ::oox::core::ContextHandler2Helper& rParent, AxisModel& rModel ); virtual ~AxisContextBase(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; }; @@ -67,7 +67,7 @@ public: explicit CatAxisContext( ::oox::core::ContextHandler2Helper& rParent, AxisModel& rModel ); virtual ~CatAxisContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; }; @@ -80,7 +80,7 @@ public: explicit DateAxisContext( ::oox::core::ContextHandler2Helper& rParent, AxisModel& rModel ); virtual ~DateAxisContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; }; @@ -93,7 +93,7 @@ public: explicit SerAxisContext( ::oox::core::ContextHandler2Helper& rParent, AxisModel& rModel ); virtual ~SerAxisContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; }; @@ -106,7 +106,7 @@ public: explicit ValAxisContext( ::oox::core::ContextHandler2Helper& rParent, AxisModel& rModel ); virtual ~ValAxisContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; }; diff --git a/oox/inc/drawingml/chart/chartcontextbase.hxx b/oox/inc/drawingml/chart/chartcontextbase.hxx index c160fb907f35..9156b8106e45 100644 --- a/oox/inc/drawingml/chart/chartcontextbase.hxx +++ b/oox/inc/drawingml/chart/chartcontextbase.hxx @@ -60,7 +60,7 @@ public: explicit ShapePrWrapperContext( ::oox::core::ContextHandler2Helper& rParent, Shape& rModel ); virtual ~ShapePrWrapperContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; }; struct LayoutModel; @@ -73,7 +73,7 @@ public: explicit LayoutContext( ::oox::core::ContextHandler2Helper& rParent, LayoutModel& rModel ); virtual ~LayoutContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; }; } // namespace chart diff --git a/oox/inc/drawingml/chart/chartdrawingfragment.hxx b/oox/inc/drawingml/chart/chartdrawingfragment.hxx index 654bc9a7a73f..c8043bf1dc99 100644 --- a/oox/inc/drawingml/chart/chartdrawingfragment.hxx +++ b/oox/inc/drawingml/chart/chartdrawingfragment.hxx @@ -91,9 +91,9 @@ public: bool bOleSupport ); virtual ~ChartDrawingFragment(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual void onCharacters( const OUString& rChars ) SAL_OVERRIDE; - virtual void onEndElement() SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onCharacters( const OUString& rChars ) override; + virtual void onEndElement() override; private: ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > diff --git a/oox/inc/drawingml/chart/chartspacefragment.hxx b/oox/inc/drawingml/chart/chartspacefragment.hxx index 60170cc00d8a..929f4d077cdf 100644 --- a/oox/inc/drawingml/chart/chartspacefragment.hxx +++ b/oox/inc/drawingml/chart/chartspacefragment.hxx @@ -41,7 +41,7 @@ public: ChartSpaceModel& rModel ); virtual ~ChartSpaceFragment(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; ::oox::core::XmlFilterBase& mpFilterBase; }; diff --git a/oox/inc/drawingml/chart/datasourcecontext.hxx b/oox/inc/drawingml/chart/datasourcecontext.hxx index ef3298c89fde..15778a12fce6 100644 --- a/oox/inc/drawingml/chart/datasourcecontext.hxx +++ b/oox/inc/drawingml/chart/datasourcecontext.hxx @@ -43,8 +43,8 @@ public: explicit DoubleSequenceContext( ::oox::core::ContextHandler2Helper& rParent, DataSequenceModel& rModel ); virtual ~DoubleSequenceContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual void onCharacters( const OUString& rChars ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onCharacters( const OUString& rChars ) override; private: SvNumberFormatter* getNumberFormatter(); @@ -65,8 +65,8 @@ public: explicit StringSequenceContext( ::oox::core::ContextHandler2Helper& rParent, DataSequenceModel& rModel ); virtual ~StringSequenceContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual void onCharacters( const OUString& rChars ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onCharacters( const OUString& rChars ) override; private: sal_Int32 mnPtIndex; /// Current data point index. @@ -85,7 +85,7 @@ public: explicit DataSourceContext( ::oox::core::ContextHandler2Helper& rParent, DataSourceModel& rModel ); virtual ~DataSourceContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; }; diff --git a/oox/inc/drawingml/chart/plotareacontext.hxx b/oox/inc/drawingml/chart/plotareacontext.hxx index 2320288708ac..8a22dbedf28f 100644 --- a/oox/inc/drawingml/chart/plotareacontext.hxx +++ b/oox/inc/drawingml/chart/plotareacontext.hxx @@ -38,7 +38,7 @@ public: explicit View3DContext( ::oox::core::ContextHandler2Helper& rParent, View3DModel& rModel ); virtual ~View3DContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; }; @@ -54,7 +54,7 @@ public: explicit WallFloorContext( ::oox::core::ContextHandler2Helper& rParent, WallFloorModel& rModel ); virtual ~WallFloorContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; }; @@ -69,7 +69,7 @@ public: explicit DataTableContext( ::oox::core::ContextHandler2Helper& rParent, DataTableModel& rModel ); virtual ~DataTableContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; }; @@ -84,7 +84,7 @@ public: explicit PlotAreaContext( ::oox::core::ContextHandler2Helper& rParent, PlotAreaModel& rModel ); virtual ~PlotAreaContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; }; diff --git a/oox/inc/drawingml/chart/seriescontext.hxx b/oox/inc/drawingml/chart/seriescontext.hxx index 98583ae90118..c366d526a5e6 100644 --- a/oox/inc/drawingml/chart/seriescontext.hxx +++ b/oox/inc/drawingml/chart/seriescontext.hxx @@ -38,8 +38,8 @@ public: explicit DataLabelContext( ::oox::core::ContextHandler2Helper& rParent, DataLabelModel& rModel ); virtual ~DataLabelContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual void onCharacters( const OUString& rChars ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onCharacters( const OUString& rChars ) override; }; @@ -54,8 +54,8 @@ public: explicit DataLabelsContext( ::oox::core::ContextHandler2Helper& rParent, DataLabelsModel& rModel ); virtual ~DataLabelsContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual void onCharacters( const OUString& rChars ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onCharacters( const OUString& rChars ) override; }; @@ -70,7 +70,7 @@ public: explicit PictureOptionsContext( ::oox::core::ContextHandler2Helper& rParent, PictureOptionsModel& rModel ); virtual ~PictureOptionsContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; }; @@ -85,7 +85,7 @@ public: explicit ErrorBarContext( ::oox::core::ContextHandler2Helper& rParent, ErrorBarModel& rModel ); virtual ~ErrorBarContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; }; @@ -100,7 +100,7 @@ public: explicit TrendlineLabelContext( ::oox::core::ContextHandler2Helper& rParent, TrendlineLabelModel& rModel ); virtual ~TrendlineLabelContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; }; @@ -115,8 +115,8 @@ public: explicit TrendlineContext( ::oox::core::ContextHandler2Helper& rParent, TrendlineModel& rModel ); virtual ~TrendlineContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual void onCharacters( const OUString& rChars ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onCharacters( const OUString& rChars ) override; }; @@ -131,7 +131,7 @@ public: explicit DataPointContext( ::oox::core::ContextHandler2Helper& rParent, DataPointModel& rModel ); virtual ~DataPointContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; }; @@ -146,7 +146,7 @@ public: explicit SeriesContextBase( ::oox::core::ContextHandler2Helper& rParent, SeriesModel& rModel ); virtual ~SeriesContextBase(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; }; @@ -159,7 +159,7 @@ public: explicit AreaSeriesContext( ::oox::core::ContextHandler2Helper& rParent, SeriesModel& rModel ); virtual ~AreaSeriesContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; }; @@ -172,7 +172,7 @@ public: explicit BarSeriesContext( ::oox::core::ContextHandler2Helper& rParent, SeriesModel& rModel ); virtual ~BarSeriesContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; }; @@ -185,7 +185,7 @@ public: explicit BubbleSeriesContext( ::oox::core::ContextHandler2Helper& rParent, SeriesModel& rModel ); virtual ~BubbleSeriesContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; }; @@ -199,7 +199,7 @@ public: explicit LineSeriesContext( ::oox::core::ContextHandler2Helper& rParent, SeriesModel& rModel ); virtual ~LineSeriesContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; }; @@ -213,7 +213,7 @@ public: explicit PieSeriesContext( ::oox::core::ContextHandler2Helper& rParent, SeriesModel& rModel ); virtual ~PieSeriesContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; }; @@ -226,7 +226,7 @@ public: explicit RadarSeriesContext( ::oox::core::ContextHandler2Helper& rParent, SeriesModel& rModel ); virtual ~RadarSeriesContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; }; @@ -239,7 +239,7 @@ public: explicit ScatterSeriesContext( ::oox::core::ContextHandler2Helper& rParent, SeriesModel& rModel ); virtual ~ScatterSeriesContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; }; @@ -252,7 +252,7 @@ public: explicit SurfaceSeriesContext( ::oox::core::ContextHandler2Helper& rParent, SeriesModel& rModel ); virtual ~SurfaceSeriesContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; }; diff --git a/oox/inc/drawingml/chart/titlecontext.hxx b/oox/inc/drawingml/chart/titlecontext.hxx index 882f14d0e169..128d43274e64 100644 --- a/oox/inc/drawingml/chart/titlecontext.hxx +++ b/oox/inc/drawingml/chart/titlecontext.hxx @@ -38,8 +38,8 @@ public: explicit TextContext( ::oox::core::ContextHandler2Helper& rParent, TextModel& rModel ); virtual ~TextContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual void onCharacters( const OUString& rChars ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onCharacters( const OUString& rChars ) override; }; @@ -54,7 +54,7 @@ public: explicit TitleContext( ::oox::core::ContextHandler2Helper& rParent, TitleModel& rModel ); virtual ~TitleContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; }; @@ -69,7 +69,7 @@ public: explicit LegendContext( ::oox::core::ContextHandler2Helper& rParent, LegendModel& rModel ); virtual ~LegendContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; }; diff --git a/oox/inc/drawingml/chart/typegroupcontext.hxx b/oox/inc/drawingml/chart/typegroupcontext.hxx index b4999fd34d13..a4af55cda6a6 100644 --- a/oox/inc/drawingml/chart/typegroupcontext.hxx +++ b/oox/inc/drawingml/chart/typegroupcontext.hxx @@ -38,7 +38,7 @@ public: explicit UpDownBarsContext( ::oox::core::ContextHandler2Helper& rParent, UpDownBarsModel& rModel ); virtual ~UpDownBarsContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; }; @@ -56,7 +56,7 @@ public: explicit AreaTypeGroupContext( ::oox::core::ContextHandler2Helper& rParent, TypeGroupModel& rModel ); virtual ~AreaTypeGroupContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; }; @@ -69,7 +69,7 @@ public: explicit BarTypeGroupContext( ::oox::core::ContextHandler2Helper& rParent, TypeGroupModel& rModel ); virtual ~BarTypeGroupContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; }; @@ -82,7 +82,7 @@ public: explicit BubbleTypeGroupContext( ::oox::core::ContextHandler2Helper& rParent, TypeGroupModel& rModel ); virtual ~BubbleTypeGroupContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; }; @@ -96,7 +96,7 @@ public: explicit LineTypeGroupContext( ::oox::core::ContextHandler2Helper& rParent, TypeGroupModel& rModel ); virtual ~LineTypeGroupContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; }; @@ -110,7 +110,7 @@ public: explicit PieTypeGroupContext( ::oox::core::ContextHandler2Helper& rParent, TypeGroupModel& rModel ); virtual ~PieTypeGroupContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; }; @@ -123,7 +123,7 @@ public: explicit RadarTypeGroupContext( ::oox::core::ContextHandler2Helper& rParent, TypeGroupModel& rModel ); virtual ~RadarTypeGroupContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; }; @@ -136,7 +136,7 @@ public: explicit ScatterTypeGroupContext( ::oox::core::ContextHandler2Helper& rParent, TypeGroupModel& rModel ); virtual ~ScatterTypeGroupContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; }; @@ -150,7 +150,7 @@ public: explicit SurfaceTypeGroupContext( ::oox::core::ContextHandler2Helper& rParent, TypeGroupModel& rModel ); virtual ~SurfaceTypeGroupContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; }; diff --git a/oox/inc/drawingml/clrschemecontext.hxx b/oox/inc/drawingml/clrschemecontext.hxx index 38efe30d22fb..ad9173d16b90 100644 --- a/oox/inc/drawingml/clrschemecontext.hxx +++ b/oox/inc/drawingml/clrschemecontext.hxx @@ -49,7 +49,7 @@ class clrSchemeContext : public oox::core::ContextHandler2 { public: clrSchemeContext( ::oox::core::ContextHandler2Helper& rParent, ClrScheme& rClrScheme ); - virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; private: ClrScheme& mrClrScheme; diff --git a/oox/inc/drawingml/colorchoicecontext.hxx b/oox/inc/drawingml/colorchoicecontext.hxx index 8f283dd85285..62c8b44880bc 100644 --- a/oox/inc/drawingml/colorchoicecontext.hxx +++ b/oox/inc/drawingml/colorchoicecontext.hxx @@ -38,12 +38,12 @@ public: virtual void onStartElement( - const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; + const ::oox::AttributeList& rAttribs ) override; virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, - const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; + const ::oox::AttributeList& rAttribs ) override; private: Color& mrColor; @@ -61,7 +61,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, - const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; + const ::oox::AttributeList& rAttribs ) override; private: Color& mrColor; diff --git a/oox/inc/drawingml/customshapegeometry.hxx b/oox/inc/drawingml/customshapegeometry.hxx index 15fc22a440d5..7e3dcec8edf0 100644 --- a/oox/inc/drawingml/customshapegeometry.hxx +++ b/oox/inc/drawingml/customshapegeometry.hxx @@ -34,7 +34,7 @@ class CustomShapeGeometryContext : public ::oox::core::ContextHandler2 { public: CustomShapeGeometryContext( ::oox::core::ContextHandler2Helper& rParent, const ::oox::AttributeList& rAttributes, CustomShapeProperties& rCustomShapeProperties ); - virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 aElementToken, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 aElementToken, const ::oox::AttributeList& rAttribs ) override; private: CustomShapeProperties& mrCustomShapeProperties; @@ -46,7 +46,7 @@ class PresetShapeGeometryContext : public ::oox::core::ContextHandler2 { public: PresetShapeGeometryContext( ::oox::core::ContextHandler2Helper& rParent, const ::oox::AttributeList& rAttributes, CustomShapeProperties& rCustomShapeProperties ); - virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 aElementToken, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 aElementToken, const ::oox::AttributeList& rAttribs ) override; private: CustomShapeProperties& mrCustomShapeProperties; @@ -58,7 +58,7 @@ class PresetTextShapeContext : public ::oox::core::ContextHandler2 { public: PresetTextShapeContext( ::oox::core::ContextHandler2Helper& rParent, const ::oox::AttributeList& rAttributes, CustomShapeProperties& rCustomShapeProperties ); - virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 aElementToken, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 aElementToken, const ::oox::AttributeList& rAttribs ) override; private: CustomShapeProperties& mrCustomShapeProperties; diff --git a/oox/inc/drawingml/fillpropertiesgroupcontext.hxx b/oox/inc/drawingml/fillpropertiesgroupcontext.hxx index 5387b340dcc3..f5210c7ed1ea 100644 --- a/oox/inc/drawingml/fillpropertiesgroupcontext.hxx +++ b/oox/inc/drawingml/fillpropertiesgroupcontext.hxx @@ -52,7 +52,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, - const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; + const ::oox::AttributeList& rAttribs ) override; private: GradientFillProperties& mrGradientProps; @@ -70,7 +70,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, - const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; + const ::oox::AttributeList& rAttribs ) override; private: PatternFillProperties& mrPatternProps; @@ -91,7 +91,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, - const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; + const ::oox::AttributeList& rAttribs ) override; private: ArtisticEffectProperties& maEffect; @@ -112,7 +112,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, - const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; + const ::oox::AttributeList& rAttribs ) override; private: BlipFillProperties& mrBlipProps; @@ -134,7 +134,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, - const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; + const ::oox::AttributeList& rAttribs ) override; private: BlipFillProperties& mrBlipProps; @@ -157,7 +157,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, - const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; + const ::oox::AttributeList& rAttribs ) override; private: BlipFillProperties& mrBlipProps; @@ -177,7 +177,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, - const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; + const ::oox::AttributeList& rAttribs ) override; private: BlipFillProperties& mrBlipProps; @@ -195,7 +195,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, - const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; + const ::oox::AttributeList& rAttribs ) override; private: BlipFillProperties& mrBlipProps; @@ -213,7 +213,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, - const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; + const ::oox::AttributeList& rAttribs ) override; static ::oox::core::ContextHandlerRef createFillContext( diff --git a/oox/inc/drawingml/guidcontext.hxx b/oox/inc/drawingml/guidcontext.hxx index 285a5677ef4d..f43b0906af7d 100644 --- a/oox/inc/drawingml/guidcontext.hxx +++ b/oox/inc/drawingml/guidcontext.hxx @@ -29,7 +29,7 @@ namespace oox { namespace drawingml { public: GuidContext( ::oox::core::ContextHandler2Helper& rParent, OUString& rGuidId ); - virtual void onCharacters( const OUString& aChars ) SAL_OVERRIDE; + virtual void onCharacters( const OUString& aChars ) override; private: OUString& mrGuidId; diff --git a/oox/inc/drawingml/linepropertiescontext.hxx b/oox/inc/drawingml/linepropertiescontext.hxx index 21e7810505d4..a176ae612dfb 100644 --- a/oox/inc/drawingml/linepropertiescontext.hxx +++ b/oox/inc/drawingml/linepropertiescontext.hxx @@ -37,7 +37,7 @@ public: virtual ~LinePropertiesContext(); virtual ::oox::core::ContextHandlerRef - onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; + onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; protected: LineProperties& mrLineProperties; diff --git a/oox/inc/drawingml/objectdefaultcontext.hxx b/oox/inc/drawingml/objectdefaultcontext.hxx index f92e245d154c..f08092b4e6c2 100644 --- a/oox/inc/drawingml/objectdefaultcontext.hxx +++ b/oox/inc/drawingml/objectdefaultcontext.hxx @@ -30,7 +30,7 @@ class objectDefaultContext : public oox::core::ContextHandler2 { public: objectDefaultContext( ::oox::core::ContextHandler2Helper& rParent, Theme& rTheme ); - virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; protected: Theme& mrTheme; diff --git a/oox/inc/drawingml/scene3dcontext.hxx b/oox/inc/drawingml/scene3dcontext.hxx index edd92e8df1d0..cfcb042bd262 100644 --- a/oox/inc/drawingml/scene3dcontext.hxx +++ b/oox/inc/drawingml/scene3dcontext.hxx @@ -32,7 +32,7 @@ class Scene3DRotationPropertiesContext : public ::oox::core::ContextHandler2 public: Scene3DRotationPropertiesContext( ::oox::core::ContextHandler2Helper& rParent, RotationProperties& rRotationProperties ) throw(); - ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; + ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; private: RotationProperties& mrRotationProperties; @@ -43,7 +43,7 @@ class Scene3DPropertiesContext : public ::oox::core::ContextHandler2 public: Scene3DPropertiesContext( ::oox::core::ContextHandler2Helper& rParent, Shape3DProperties& r3DProperties ) throw(); - ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; + ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; private: Shape3DProperties& mr3DProperties; @@ -54,7 +54,7 @@ class Shape3DPropertiesContext : public ::oox::core::ContextHandler2 public: Shape3DPropertiesContext( ::oox::core::ContextHandler2Helper& rParent, const ::oox::AttributeList& rAttribs, Shape3DProperties& r3DProperties ) throw(); - ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; + ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; private: Shape3DProperties& mr3DProperties; diff --git a/oox/inc/drawingml/shapepropertiescontext.hxx b/oox/inc/drawingml/shapepropertiescontext.hxx index 4718e3b9a05d..d401aa7aca08 100644 --- a/oox/inc/drawingml/shapepropertiescontext.hxx +++ b/oox/inc/drawingml/shapepropertiescontext.hxx @@ -30,7 +30,7 @@ class ShapePropertiesContext : public ::oox::core::ContextHandler2 public: ShapePropertiesContext( ::oox::core::ContextHandler2Helper& rParent, Shape& rShape ); - virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; protected: Shape& mrShape; diff --git a/oox/inc/drawingml/shapestylecontext.hxx b/oox/inc/drawingml/shapestylecontext.hxx index b7a479124560..74788abe40eb 100644 --- a/oox/inc/drawingml/shapestylecontext.hxx +++ b/oox/inc/drawingml/shapestylecontext.hxx @@ -31,7 +31,7 @@ public: ShapeStyleContext( ::oox::core::ContextHandler2Helper& rParent, Shape& rShape ); virtual ~ShapeStyleContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; protected: Shape& mrShape; diff --git a/oox/inc/drawingml/spdefcontext.hxx b/oox/inc/drawingml/spdefcontext.hxx index 2488197cac51..18785b9820b0 100644 --- a/oox/inc/drawingml/spdefcontext.hxx +++ b/oox/inc/drawingml/spdefcontext.hxx @@ -29,7 +29,7 @@ class spDefContext : public oox::core::ContextHandler2 { public: spDefContext( ::oox::core::ContextHandler2Helper& rParent, Shape& rDefaultObject ); - virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; protected: Shape& mrDefaultObject; diff --git a/oox/inc/drawingml/table/tablebackgroundstylecontext.hxx b/oox/inc/drawingml/table/tablebackgroundstylecontext.hxx index 9330fdba9378..2e4e7abaca4f 100644 --- a/oox/inc/drawingml/table/tablebackgroundstylecontext.hxx +++ b/oox/inc/drawingml/table/tablebackgroundstylecontext.hxx @@ -31,7 +31,7 @@ public: TableBackgroundStyleContext( ::oox::core::ContextHandler2Helper& rParent, TableStyle& rTableStyle ); virtual ~TableBackgroundStyleContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; private: diff --git a/oox/inc/drawingml/table/tablecellcontext.hxx b/oox/inc/drawingml/table/tablecellcontext.hxx index 502e20727c22..d1c341b4ea29 100644 --- a/oox/inc/drawingml/table/tablecellcontext.hxx +++ b/oox/inc/drawingml/table/tablecellcontext.hxx @@ -32,7 +32,7 @@ public: const ::oox::AttributeList& rAttribs, TableCell& rTableCell ); virtual ~TableCellContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; private: diff --git a/oox/inc/drawingml/table/tablecontext.hxx b/oox/inc/drawingml/table/tablecontext.hxx index be315c10fcff..ba3c07ca319b 100644 --- a/oox/inc/drawingml/table/tablecontext.hxx +++ b/oox/inc/drawingml/table/tablecontext.hxx @@ -32,7 +32,7 @@ public: TableContext( ::oox::core::ContextHandler2Helper& rParent, ShapePtr pShapePtr ); virtual ~TableContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; private: diff --git a/oox/inc/drawingml/table/tablepartstylecontext.hxx b/oox/inc/drawingml/table/tablepartstylecontext.hxx index 0b9f33043544..fde8231880d4 100644 --- a/oox/inc/drawingml/table/tablepartstylecontext.hxx +++ b/oox/inc/drawingml/table/tablepartstylecontext.hxx @@ -31,7 +31,7 @@ public: TablePartStyleContext( ::oox::core::ContextHandler2Helper& rParent, TableStylePart& rTableStylePart ); virtual ~TablePartStyleContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; private: diff --git a/oox/inc/drawingml/table/tablerowcontext.hxx b/oox/inc/drawingml/table/tablerowcontext.hxx index 736023703e3f..8ee5b35d63a3 100644 --- a/oox/inc/drawingml/table/tablerowcontext.hxx +++ b/oox/inc/drawingml/table/tablerowcontext.hxx @@ -33,7 +33,7 @@ public: const ::oox::AttributeList& rAttribs, TableRow& rTableRow ); virtual ~TableRowContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; private: diff --git a/oox/inc/drawingml/table/tablestylecellstylecontext.hxx b/oox/inc/drawingml/table/tablestylecellstylecontext.hxx index 54c92ca88a66..772e3bef2c7c 100644 --- a/oox/inc/drawingml/table/tablestylecellstylecontext.hxx +++ b/oox/inc/drawingml/table/tablestylecellstylecontext.hxx @@ -31,7 +31,7 @@ public: TableStyleCellStyleContext( ::oox::core::ContextHandler2Helper& rParent, TableStylePart& rTableStylePart ); virtual ~TableStyleCellStyleContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; private: TableStylePart& mrTableStylePart; diff --git a/oox/inc/drawingml/table/tablestylecontext.hxx b/oox/inc/drawingml/table/tablestylecontext.hxx index 87a8e434d5d9..d983d5587687 100644 --- a/oox/inc/drawingml/table/tablestylecontext.hxx +++ b/oox/inc/drawingml/table/tablestylecontext.hxx @@ -33,7 +33,7 @@ public: TableStyle& rTableStyle ); virtual ~TableStyleContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; private: TableStyle& mrTableStyle; diff --git a/oox/inc/drawingml/table/tablestylelistfragmenthandler.hxx b/oox/inc/drawingml/table/tablestylelistfragmenthandler.hxx index 4b3312c88f45..65d0a90d8747 100644 --- a/oox/inc/drawingml/table/tablestylelistfragmenthandler.hxx +++ b/oox/inc/drawingml/table/tablestylelistfragmenthandler.hxx @@ -36,7 +36,7 @@ public: TableStyleList& rTableStyleList ); virtual ~TableStyleListFragmentHandler(); - virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const AttributeList& rAttribs ) override; private: diff --git a/oox/inc/drawingml/table/tablestyletextstylecontext.hxx b/oox/inc/drawingml/table/tablestyletextstylecontext.hxx index 0768bc0b4924..7db5f3a45d2c 100644 --- a/oox/inc/drawingml/table/tablestyletextstylecontext.hxx +++ b/oox/inc/drawingml/table/tablestyletextstylecontext.hxx @@ -33,7 +33,7 @@ public: TableStylePart& rTableStylePart ); virtual ~TableStyleTextStyleContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; private: TableStylePart& mrTableStylePart; diff --git a/oox/inc/drawingml/textbodycontext.hxx b/oox/inc/drawingml/textbodycontext.hxx index 43e80af578c9..253d8f0ab658 100644 --- a/oox/inc/drawingml/textbodycontext.hxx +++ b/oox/inc/drawingml/textbodycontext.hxx @@ -33,7 +33,7 @@ class TextBodyContext : public ::oox::core::ContextHandler2 public: TextBodyContext( ::oox::core::ContextHandler2Helper& rParent, TextBody& rTextBody ); - virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; protected: TextBody& mrTextBody; @@ -46,9 +46,9 @@ class RegularTextRunContext : public ::oox::core::ContextHandler2 public: RegularTextRunContext( ::oox::core::ContextHandler2Helper& rParent, TextRunPtr pRunPtr ); - virtual void onEndElement() SAL_OVERRIDE; - virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; - virtual void onCharacters( const OUString& aChars ) SAL_OVERRIDE; + virtual void onEndElement() override; + virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; + virtual void onCharacters( const OUString& aChars ) override; protected: TextRunPtr mpRunPtr; diff --git a/oox/inc/drawingml/textbodypropertiescontext.hxx b/oox/inc/drawingml/textbodypropertiescontext.hxx index b3ec0326d0b4..069edd2be2f9 100644 --- a/oox/inc/drawingml/textbodypropertiescontext.hxx +++ b/oox/inc/drawingml/textbodypropertiescontext.hxx @@ -33,7 +33,7 @@ public: const ::oox::AttributeList& rAttributes, TextBodyProperties& rTextBodyProp ); - virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; protected: TextBodyProperties& mrTextBodyProp; diff --git a/oox/inc/drawingml/textcharacterpropertiescontext.hxx b/oox/inc/drawingml/textcharacterpropertiescontext.hxx index d44227c96320..d223afd3b5e1 100644 --- a/oox/inc/drawingml/textcharacterpropertiescontext.hxx +++ b/oox/inc/drawingml/textcharacterpropertiescontext.hxx @@ -34,7 +34,7 @@ public: TextCharacterProperties& rTextCharacterProperties ); virtual ~TextCharacterPropertiesContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; protected: TextCharacterProperties& mrTextCharacterProperties; diff --git a/oox/inc/drawingml/texteffectscontext.hxx b/oox/inc/drawingml/texteffectscontext.hxx index 825192616e0f..1acb0091976d 100644 --- a/oox/inc/drawingml/texteffectscontext.hxx +++ b/oox/inc/drawingml/texteffectscontext.hxx @@ -28,10 +28,10 @@ public: std::vector<css::beans::PropertyValue>& rTextEffectsProperties); virtual ~TextEffectsContext(); - virtual void onStartElement(const oox::AttributeList& rAttribs) SAL_OVERRIDE; - virtual void onEndElement() SAL_OVERRIDE; + virtual void onStartElement(const oox::AttributeList& rAttribs) override; + virtual void onEndElement() override; - virtual oox::core::ContextHandlerRef onCreateContext(sal_Int32 Element, const oox::AttributeList& rAttribs) SAL_OVERRIDE; + virtual oox::core::ContextHandlerRef onCreateContext(sal_Int32 Element, const oox::AttributeList& rAttribs) override; protected: std::vector<css::beans::PropertyValue>& mrTextEffectsProperties; diff --git a/oox/inc/drawingml/textfield.hxx b/oox/inc/drawingml/textfield.hxx index b6a779055f5a..c378e95f3b16 100644 --- a/oox/inc/drawingml/textfield.hxx +++ b/oox/inc/drawingml/textfield.hxx @@ -45,7 +45,7 @@ public: const ::com::sun::star::uno::Reference < ::com::sun::star::text::XText > & xText, const ::com::sun::star::uno::Reference < ::com::sun::star::text::XTextCursor > &xAt, const TextCharacterProperties& rTextCharacterStyle, - float nDefaultCharHeight) const SAL_OVERRIDE; + float nDefaultCharHeight) const override; private: TextParagraphProperties maTextParagraphProperties; diff --git a/oox/inc/drawingml/textfieldcontext.hxx b/oox/inc/drawingml/textfieldcontext.hxx index 425122497c57..7f1efefd65d1 100644 --- a/oox/inc/drawingml/textfieldcontext.hxx +++ b/oox/inc/drawingml/textfieldcontext.hxx @@ -33,10 +33,10 @@ public: TextFieldContext( ::oox::core::ContextHandler2Helper& rParent, const ::oox::AttributeList& rAttributes, TextField& rTextField); - virtual void onEndElement( ) SAL_OVERRIDE; - virtual void onCharacters( const OUString& aChars ) SAL_OVERRIDE; + virtual void onEndElement( ) override; + virtual void onCharacters( const OUString& aChars ) override; virtual ::oox::core::ContextHandlerRef onCreateContext( - sal_Int32 aElementToken, const ::oox::AttributeList& rAttributes ) SAL_OVERRIDE; + sal_Int32 aElementToken, const ::oox::AttributeList& rAttributes ) override; private: TextField& mrTextField; diff --git a/oox/inc/drawingml/textliststylecontext.hxx b/oox/inc/drawingml/textliststylecontext.hxx index f71fc899cb0f..ced68dfb100b 100644 --- a/oox/inc/drawingml/textliststylecontext.hxx +++ b/oox/inc/drawingml/textliststylecontext.hxx @@ -31,7 +31,7 @@ public: TextListStyleContext( ::oox::core::ContextHandler2Helper& rParent, TextListStyle& rTextListStyle ); virtual ~TextListStyleContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; protected: TextListStyle& mrTextListStyle; diff --git a/oox/inc/drawingml/textparagraphpropertiescontext.hxx b/oox/inc/drawingml/textparagraphpropertiescontext.hxx index cf666a4d260c..899626c30fae 100644 --- a/oox/inc/drawingml/textparagraphpropertiescontext.hxx +++ b/oox/inc/drawingml/textparagraphpropertiescontext.hxx @@ -38,7 +38,7 @@ public: TextParagraphProperties& rTextParagraphProperties ); virtual ~TextParagraphPropertiesContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; protected: TextParagraphProperties& mrTextParagraphProperties; diff --git a/oox/inc/drawingml/themeelementscontext.hxx b/oox/inc/drawingml/themeelementscontext.hxx index 47acdc9a6290..b806862efd60 100644 --- a/oox/inc/drawingml/themeelementscontext.hxx +++ b/oox/inc/drawingml/themeelementscontext.hxx @@ -32,7 +32,7 @@ class ThemeElementsContext : public oox::core::ContextHandler2 public: ThemeElementsContext( ::oox::core::ContextHandler2Helper& rParent, Theme& rTheme ); virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, - const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; + const ::oox::AttributeList& rAttribs ) override; private: Theme& mrTheme; diff --git a/oox/inc/drawingml/transform2dcontext.hxx b/oox/inc/drawingml/transform2dcontext.hxx index dfe49cb0fc08..faba2789db99 100644 --- a/oox/inc/drawingml/transform2dcontext.hxx +++ b/oox/inc/drawingml/transform2dcontext.hxx @@ -33,7 +33,7 @@ class Transform2DContext : public ::oox::core::ContextHandler2 public: Transform2DContext( ::oox::core::ContextHandler2Helper& rParent, const ::oox::AttributeList& rAttributes, Shape& rShape, bool btxXfrm = false ) throw(); - virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; protected: Shape& mrShape; diff --git a/oox/qa/unit/vba_compression.cxx b/oox/qa/unit/vba_compression.cxx index 3e36bd5e171e..f31dc3b7730e 100644 --- a/oox/qa/unit/vba_compression.cxx +++ b/oox/qa/unit/vba_compression.cxx @@ -42,8 +42,8 @@ public: void testSpec323(); // avoid the BootstrapFixtureBase::setUp and tearDown - virtual void setUp() SAL_OVERRIDE; - virtual void tearDown() SAL_OVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; CPPUNIT_TEST_SUITE(TestVbaCompression); CPPUNIT_TEST(testSimple1); diff --git a/oox/qa/unit/vba_encryption.cxx b/oox/qa/unit/vba_encryption.cxx index 08e1994f6a3b..93525a2566e3 100644 --- a/oox/qa/unit/vba_encryption.cxx +++ b/oox/qa/unit/vba_encryption.cxx @@ -30,8 +30,8 @@ public: void testProjKey1(); // avoid the BootstrapFixtureBase::setUp and tearDown - virtual void setUp() SAL_OVERRIDE; - virtual void tearDown() SAL_OVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; CPPUNIT_TEST_SUITE(TestVbaEncryption); // CPPUNIT_TEST(testSimple1); diff --git a/oox/source/core/filterdetect.cxx b/oox/source/core/filterdetect.cxx index 1742c919c1fc..9c22264a4404 100644 --- a/oox/source/core/filterdetect.cxx +++ b/oox/source/core/filterdetect.cxx @@ -268,9 +268,9 @@ class PasswordVerifier : public IDocPasswordVerifier public: explicit PasswordVerifier( DocumentDecryption& aDecryptor ); - virtual DocPasswordVerifierResult verifyPassword( const OUString& rPassword, Sequence<NamedValue>& rEncryptionData ) SAL_OVERRIDE; + virtual DocPasswordVerifierResult verifyPassword( const OUString& rPassword, Sequence<NamedValue>& rEncryptionData ) override; - virtual DocPasswordVerifierResult verifyEncryptionData( const Sequence<NamedValue>& rEncryptionData ) SAL_OVERRIDE; + virtual DocPasswordVerifierResult verifyEncryptionData( const Sequence<NamedValue>& rEncryptionData ) override; private: DocumentDecryption& mDecryptor; }; diff --git a/oox/source/core/recordparser.cxx b/oox/source/core/recordparser.cxx index 4fe4b04a18e4..534f01255846 100644 --- a/oox/source/core/recordparser.cxx +++ b/oox/source/core/recordparser.cxx @@ -46,10 +46,10 @@ public: // com.sun.star.sax.XLocator interface - virtual sal_Int32 SAL_CALL getColumnNumber() throw( RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getLineNumber() throw( RuntimeException, std::exception ) SAL_OVERRIDE; - virtual OUString SAL_CALL getPublicId() throw( RuntimeException, std::exception ) SAL_OVERRIDE; - virtual OUString SAL_CALL getSystemId() throw( RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getColumnNumber() throw( RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getLineNumber() throw( RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getPublicId() throw( RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getSystemId() throw( RuntimeException, std::exception ) override; private: RecordParser* mpParser; diff --git a/oox/source/crypto/DocumentDecryption.cxx b/oox/source/crypto/DocumentDecryption.cxx index 1d68344ff66a..3d8d8c27bf5f 100644 --- a/oox/source/crypto/DocumentDecryption.cxx +++ b/oox/source/crypto/DocumentDecryption.cxx @@ -47,12 +47,12 @@ vector<sal_uInt8> convertToVector(Sequence<sal_Int8>& input) class AgileTokenHandler : public cppu::WeakImplHelper< XFastTokenHandler > { public: - virtual sal_Int32 SAL_CALL getTokenFromUTF8( const Sequence< sal_Int8 >& /*nIdentifier*/ ) throw (RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Int32 SAL_CALL getTokenFromUTF8( const Sequence< sal_Int8 >& /*nIdentifier*/ ) throw (RuntimeException, std::exception) override { return FastToken::DONTKNOW; } - virtual Sequence<sal_Int8> SAL_CALL getUTF8Identifier(sal_Int32 /*nToken*/) throw (RuntimeException, std::exception) SAL_OVERRIDE + virtual Sequence<sal_Int8> SAL_CALL getUTF8Identifier(sal_Int32 /*nToken*/) throw (RuntimeException, std::exception) override { return Sequence<sal_Int8>(); } @@ -68,20 +68,20 @@ public: {} void SAL_CALL startDocument() - throw (RuntimeException, SAXException, std::exception) SAL_OVERRIDE + throw (RuntimeException, SAXException, std::exception) override {} void SAL_CALL endDocument() - throw (RuntimeException, SAXException, std::exception) SAL_OVERRIDE + throw (RuntimeException, SAXException, std::exception) override {} void SAL_CALL setDocumentLocator( const Reference< XLocator >& /*xLocator*/ ) - throw (RuntimeException, SAXException, std::exception) SAL_OVERRIDE + throw (RuntimeException, SAXException, std::exception) override {} void SAL_CALL startFastElement( sal_Int32 /*Element*/, const Reference< XFastAttributeList >& /*Attribs*/ ) - throw (RuntimeException, SAXException, std::exception) SAL_OVERRIDE + throw (RuntimeException, SAXException, std::exception) override {} void SAL_CALL startUnknownElement( const OUString& /*aNamespace*/, const OUString& aName, const Reference< XFastAttributeList >& aAttributeList ) - throw (RuntimeException, SAXException, std::exception) SAL_OVERRIDE + throw (RuntimeException, SAXException, std::exception) override { if(aName == "keyData") { @@ -163,26 +163,26 @@ public: } void SAL_CALL endFastElement( sal_Int32 /*aElement*/ ) - throw (RuntimeException, SAXException, std::exception) SAL_OVERRIDE + throw (RuntimeException, SAXException, std::exception) override {} void SAL_CALL endUnknownElement( const OUString& /*aNamespace*/, const OUString& /*aName*/ ) - throw (RuntimeException, SAXException, std::exception) SAL_OVERRIDE + throw (RuntimeException, SAXException, std::exception) override {} Reference< XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 /*aElement*/, const Reference< XFastAttributeList >& /*aAttribs*/ ) - throw (RuntimeException, SAXException, std::exception) SAL_OVERRIDE + throw (RuntimeException, SAXException, std::exception) override { return NULL; } Reference< XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& /*aNamespace*/, const OUString& /*aName*/, const Reference< XFastAttributeList >& /*aAttribs*/ ) - throw (RuntimeException, SAXException, std::exception) SAL_OVERRIDE + throw (RuntimeException, SAXException, std::exception) override { return this; } void SAL_CALL characters( const OUString& /*aChars*/ ) - throw (RuntimeException, SAXException, std::exception) SAL_OVERRIDE + throw (RuntimeException, SAXException, std::exception) override {} }; diff --git a/oox/source/docprop/docprophandler.hxx b/oox/source/docprop/docprophandler.hxx index 26d3593b00e9..35c0378583be 100644 --- a/oox/source/docprop/docprophandler.hxx +++ b/oox/source/docprop/docprophandler.hxx @@ -67,19 +67,19 @@ public: // com.sun.star.xml.sax.XFastDocumentHandler - virtual void SAL_CALL startDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL endDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >& rxLocator ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL startDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL endDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >& rxLocator ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; // com.sun.star.xml.sax.XFastContextHandler - virtual void SAL_CALL startFastElement( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL startUnknownElement( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL endFastElement( ::sal_Int32 Element ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL endUnknownElement( const OUString& Namespace, const OUString& Name ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL characters( const OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL startFastElement( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL startUnknownElement( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL endFastElement( ::sal_Int32 Element ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL endUnknownElement( const OUString& Namespace, const OUString& Name ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL characters( const OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; }; diff --git a/oox/source/docprop/ooxmldocpropimport.hxx b/oox/source/docprop/ooxmldocpropimport.hxx index c186eb0083b5..dd83b43f73e4 100644 --- a/oox/source/docprop/ooxmldocpropimport.hxx +++ b/oox/source/docprop/ooxmldocpropimport.hxx @@ -39,15 +39,15 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XOOXMLDocumentPropertiesImporter virtual void SAL_CALL importProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& rxSource, const ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentProperties >& rxDocumentProperties ) - throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::Exception, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::Exception, std::exception) override; private: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxContext; diff --git a/oox/source/drawingml/customshapegeometry.cxx b/oox/source/drawingml/customshapegeometry.cxx index 256fcec3973e..0ee26fef1b56 100644 --- a/oox/source/drawingml/customshapegeometry.cxx +++ b/oox/source/drawingml/customshapegeometry.cxx @@ -440,7 +440,7 @@ class GeomGuideListContext : public ContextHandler2 { public: GeomGuideListContext( ContextHandler2Helper& rParent, CustomShapeProperties& rCustomShapeProperties, std::vector< CustomShapeGuide >& rGuideList ); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const ::oox::AttributeList& rAttribs ) override; protected: std::vector< CustomShapeGuide >& mrGuideList; @@ -656,7 +656,7 @@ class XYAdjustHandleContext : public ContextHandler2 { public: XYAdjustHandleContext( ContextHandler2Helper& rParent, const AttributeList& rAttribs, CustomShapeProperties& rCustomShapeProperties, AdjustHandle& rAdjustHandle ); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const ::oox::AttributeList& rAttribs ) override; protected: AdjustHandle& mrAdjustHandle; @@ -707,7 +707,7 @@ class PolarAdjustHandleContext : public ContextHandler2 { public: PolarAdjustHandleContext( ContextHandler2Helper& rParent, const AttributeList& rAttribs, CustomShapeProperties& rCustomShapeProperties, AdjustHandle& rAdjustHandle ); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const ::oox::AttributeList& rAttribs ) override; protected: AdjustHandle& mrAdjustHandle; @@ -758,7 +758,7 @@ class AdjustHandleListContext : public ContextHandler2 { public: AdjustHandleListContext( ContextHandler2Helper& rParent, CustomShapeProperties& rCustomShapeProperties, std::vector< AdjustHandle >& rAdjustHandleList ); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const ::oox::AttributeList& rAttribs ) override; protected: std::vector< AdjustHandle >& mrAdjustHandleList; @@ -794,7 +794,7 @@ class ConnectionSiteContext : public ContextHandler2 { public: ConnectionSiteContext( ContextHandler2Helper& rParent, const AttributeList& rAttribs, CustomShapeProperties& rCustomShapeProperties, ConnectionSite& rConnectionSite ); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const ::oox::AttributeList& rAttribs ) override; protected: ConnectionSite& mrConnectionSite; @@ -821,7 +821,7 @@ class Path2DMoveToContext : public ContextHandler2 { public: Path2DMoveToContext( ContextHandler2Helper& rParent, CustomShapeProperties& rCustomShapeProperties, EnhancedCustomShapeParameterPair& rAdjPoint2D ); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const ::oox::AttributeList& rAttribs ) override; protected: EnhancedCustomShapeParameterPair& mrAdjPoint2D; @@ -847,7 +847,7 @@ class Path2DLineToContext : public ContextHandler2 { public: Path2DLineToContext( ContextHandler2Helper& rParent, CustomShapeProperties& rCustomShapeProperties, EnhancedCustomShapeParameterPair& rAdjPoint2D ); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const ::oox::AttributeList& rAttribs ) override; protected: EnhancedCustomShapeParameterPair& mrAdjPoint2D; @@ -873,7 +873,7 @@ class Path2DQuadBezierToContext : public ContextHandler2 { public: Path2DQuadBezierToContext( ContextHandler2Helper& rParent, CustomShapeProperties& rCustomShapeProperties, EnhancedCustomShapeParameterPair& rPt1, EnhancedCustomShapeParameterPair& rPt2 ); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const ::oox::AttributeList& rAttribs ) override; protected: EnhancedCustomShapeParameterPair& mrPt1; @@ -907,7 +907,7 @@ class Path2DCubicBezierToContext : public ContextHandler2 public: Path2DCubicBezierToContext( ContextHandler2Helper& rParent, CustomShapeProperties& rCustomShapeProperties, EnhancedCustomShapeParameterPair&, EnhancedCustomShapeParameterPair&, EnhancedCustomShapeParameterPair& ); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const ::oox::AttributeList& rAttribs ) override; protected: CustomShapeProperties& mrCustomShapeProperties; @@ -945,7 +945,7 @@ public: Path2DContext( ContextHandler2Helper& rParent, const AttributeList& rAttribs, CustomShapeProperties& rCustomShapeProperties, std::vector< com::sun::star::drawing::EnhancedCustomShapeSegment >& rSegments, Path2D& rPath2D ); virtual ~Path2DContext(); virtual ::oox::core::ContextHandlerRef - onCreateContext( sal_Int32 aElementToken, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; + onCreateContext( sal_Int32 aElementToken, const ::oox::AttributeList& rAttribs ) override; protected: Path2D& mrPath2D; @@ -1143,7 +1143,7 @@ public: Path2DListContext( ContextHandler2Helper& rParent, CustomShapeProperties& rCustomShapeProperties, std::vector< EnhancedCustomShapeSegment >& rSegments, std::vector< Path2D >& rPath2DList ); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const ::oox::AttributeList& rAttribs ) override; protected: diff --git a/oox/source/drawingml/diagram/constraintlistcontext.hxx b/oox/source/drawingml/diagram/constraintlistcontext.hxx index ba1bc2c0e4ee..93ceeaf08eaa 100644 --- a/oox/source/drawingml/diagram/constraintlistcontext.hxx +++ b/oox/source/drawingml/diagram/constraintlistcontext.hxx @@ -32,7 +32,7 @@ public: ConstraintListContext( ContextHandler2Helper& rParent, const AttributeList& rAttributes, const LayoutAtomPtr &pNode ); virtual ~ConstraintListContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const AttributeList& rAttribs ) override; private: LayoutAtomPtr mpNode; }; diff --git a/oox/source/drawingml/diagram/datamodelcontext.cxx b/oox/source/drawingml/diagram/datamodelcontext.cxx index 6337ce8102e6..9006c1265f42 100644 --- a/oox/source/drawingml/diagram/datamodelcontext.cxx +++ b/oox/source/drawingml/diagram/datamodelcontext.cxx @@ -44,7 +44,7 @@ public: virtual ContextHandlerRef onCreateContext( sal_Int32 aElementToken, - const AttributeList& rAttribs ) SAL_OVERRIDE + const AttributeList& rAttribs ) override { switch( aElementToken ) { @@ -90,7 +90,7 @@ public: } virtual ContextHandlerRef onCreateContext( sal_Int32 aElementToken, - const AttributeList& rAttribs ) SAL_OVERRIDE + const AttributeList& rAttribs ) override { switch( aElementToken ) { @@ -175,7 +175,7 @@ public: virtual ContextHandlerRef onCreateContext( sal_Int32 aElementToken, - const AttributeList& ) SAL_OVERRIDE + const AttributeList& ) override { switch( aElementToken ) { @@ -218,7 +218,7 @@ public: virtual ContextHandlerRef onCreateContext( sal_Int32 aElementToken, - const AttributeList& rAttribs ) SAL_OVERRIDE + const AttributeList& rAttribs ) override { switch( aElementToken ) { @@ -262,7 +262,7 @@ public: {} virtual ContextHandlerRef onCreateContext( sal_Int32 aElementToken, - const AttributeList& rAttribs ) SAL_OVERRIDE + const AttributeList& rAttribs ) override { switch( aElementToken ) { @@ -296,7 +296,7 @@ public: virtual ContextHandlerRef onCreateContext( sal_Int32 aElementToken, - const AttributeList& rAttribs ) SAL_OVERRIDE + const AttributeList& rAttribs ) override { switch( aElementToken ) { diff --git a/oox/source/drawingml/diagram/datamodelcontext.hxx b/oox/source/drawingml/diagram/datamodelcontext.hxx index 3f85def3c841..c2fa95026a7d 100644 --- a/oox/source/drawingml/diagram/datamodelcontext.hxx +++ b/oox/source/drawingml/diagram/datamodelcontext.hxx @@ -34,7 +34,7 @@ public: DataModelContext( ::oox::core::ContextHandler2Helper& rParent, const DiagramDataPtr & pDataModelPtr ); virtual ~DataModelContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; protected: DiagramDataPtr mpDataModel; diff --git a/oox/source/drawingml/diagram/diagramdefinitioncontext.hxx b/oox/source/drawingml/diagram/diagramdefinitioncontext.hxx index afd1c35b3029..af2a0d98aa60 100644 --- a/oox/source/drawingml/diagram/diagramdefinitioncontext.hxx +++ b/oox/source/drawingml/diagram/diagramdefinitioncontext.hxx @@ -31,7 +31,7 @@ public: DiagramDefinitionContext( ::oox::core::ContextHandler2Helper& rParent, const ::oox::AttributeList& rAttributes, const DiagramLayoutPtr &pLayout ); virtual ~DiagramDefinitionContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; private: DiagramLayoutPtr mpLayout; diff --git a/oox/source/drawingml/diagram/diagramfragmenthandler.hxx b/oox/source/drawingml/diagram/diagramfragmenthandler.hxx index d8822403d634..fa1bf9d799ad 100644 --- a/oox/source/drawingml/diagram/diagramfragmenthandler.hxx +++ b/oox/source/drawingml/diagram/diagramfragmenthandler.hxx @@ -31,8 +31,8 @@ public: DiagramDataFragmentHandler( oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath, const DiagramDataPtr& rDataPtr ) throw(); virtual ~DiagramDataFragmentHandler() throw(); - virtual void SAL_CALL endDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void SAL_CALL endDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; private: @@ -45,8 +45,8 @@ public: DiagramLayoutFragmentHandler( oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath, const DiagramLayoutPtr& rDataPtr ) throw(); virtual ~DiagramLayoutFragmentHandler() throw(); - virtual void SAL_CALL endDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void SAL_CALL endDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; private: @@ -61,10 +61,10 @@ public: const OUString& rFragmentPath, DiagramQStyleMap& rStylesMap ); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; - virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual void onEndElement() SAL_OVERRIDE; + virtual void onStartElement( const AttributeList& rAttribs ) override; + virtual void onEndElement() override; private: ::oox::core::ContextHandlerRef createStyleMatrixContext(sal_Int32 nElement, @@ -84,10 +84,10 @@ public: const OUString& rFragmentPath, DiagramColorMap& rColorMap ); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; - virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual void onEndElement() SAL_OVERRIDE; + virtual void onStartElement( const AttributeList& rAttribs ) override; + virtual void onEndElement() override; private: OUString maColorName; diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx index 034a76a1e896..1d0b78e82aeb 100644 --- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx +++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx @@ -538,12 +538,12 @@ class ShapeLayoutingVisitor : public LayoutAtomVisitor const Diagram& mrDgm; OUString maName; - virtual void visit(ConstraintAtom& rAtom) SAL_OVERRIDE; - virtual void visit(AlgAtom& rAtom) SAL_OVERRIDE; - virtual void visit(ForEachAtom& rAtom) SAL_OVERRIDE; - virtual void visit(ConditionAtom& rAtom) SAL_OVERRIDE; - virtual void visit(ChooseAtom& rAtom) SAL_OVERRIDE; - virtual void visit(LayoutNode& rAtom) SAL_OVERRIDE; + virtual void visit(ConstraintAtom& rAtom) override; + virtual void visit(AlgAtom& rAtom) override; + virtual void visit(ForEachAtom& rAtom) override; + virtual void visit(ConditionAtom& rAtom) override; + virtual void visit(ChooseAtom& rAtom) override; + virtual void visit(LayoutNode& rAtom) override; public: ShapeLayoutingVisitor(const ShapePtr& rParentShape, @@ -563,12 +563,12 @@ class ShallowPresNameVisitor : public LayoutAtomVisitor size_t mnCnt; void defaultVisit(LayoutAtom& rAtom); - virtual void visit(ConstraintAtom& rAtom) SAL_OVERRIDE; - virtual void visit(AlgAtom& rAtom) SAL_OVERRIDE; - virtual void visit(ForEachAtom& rAtom) SAL_OVERRIDE; - virtual void visit(ConditionAtom& rAtom) SAL_OVERRIDE; - virtual void visit(ChooseAtom& rAtom) SAL_OVERRIDE; - virtual void visit(LayoutNode& rAtom) SAL_OVERRIDE; + virtual void visit(ConstraintAtom& rAtom) override; + virtual void visit(AlgAtom& rAtom) override; + virtual void visit(ForEachAtom& rAtom) override; + virtual void visit(ConditionAtom& rAtom) override; + virtual void visit(ChooseAtom& rAtom) override; + virtual void visit(LayoutNode& rAtom) override; public: explicit ShallowPresNameVisitor(const Diagram& rDgm) : diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx index b27216a697c1..7e511cc8597e 100644 --- a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx +++ b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx @@ -109,7 +109,7 @@ public: virtual ~ConstraintAtom() { } - virtual void accept( LayoutAtomVisitor& ) SAL_OVERRIDE; + virtual void accept( LayoutAtomVisitor& ) override; void setFor( sal_Int32 nToken ) { mnFor = nToken; } @@ -157,7 +157,7 @@ public: typedef std::map<sal_Int32,sal_Int32> ParamMap; - virtual void accept( LayoutAtomVisitor& ) SAL_OVERRIDE; + virtual void accept( LayoutAtomVisitor& ) override; void setType( sal_Int32 nToken ) { mnType = nToken; } @@ -183,7 +183,7 @@ public: IteratorAttr & iterator() { return maIter; } - virtual void accept( LayoutAtomVisitor& ) SAL_OVERRIDE; + virtual void accept( LayoutAtomVisitor& ) override; private: IteratorAttr maIter; @@ -198,11 +198,11 @@ public: explicit ConditionAtom(const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttributes); virtual ~ConditionAtom() { } - virtual void accept( LayoutAtomVisitor& ) SAL_OVERRIDE; + virtual void accept( LayoutAtomVisitor& ) override; void readElseBranch() { mbElse=true; } - virtual void addChild( const LayoutAtomPtr & pNode ) SAL_OVERRIDE; - virtual const std::vector<LayoutAtomPtr>& getChildren() const SAL_OVERRIDE; + virtual void addChild( const LayoutAtomPtr & pNode ) override; + virtual const std::vector<LayoutAtomPtr>& getChildren() const override; private: bool mbElse; IteratorAttr maIter; @@ -219,7 +219,7 @@ class ChooseAtom public: virtual ~ChooseAtom() { } - virtual void accept( LayoutAtomVisitor& ) SAL_OVERRIDE; + virtual void accept( LayoutAtomVisitor& ) override; }; class LayoutNode @@ -243,7 +243,7 @@ public: LayoutNode() : mnChildOrder(0) {} virtual ~LayoutNode() { } - virtual void accept( LayoutAtomVisitor& ) SAL_OVERRIDE; + virtual void accept( LayoutAtomVisitor& ) override; VarMap & variables() { return mVariables; } void setMoveWith( const OUString & sName ) @@ -289,12 +289,12 @@ class ShapeCreationVisitor : public LayoutAtomVisitor sal_Int32 mnCurrIdx; void defaultVisit(LayoutAtom& rAtom); - virtual void visit(ConstraintAtom& rAtom) SAL_OVERRIDE; - virtual void visit(AlgAtom& rAtom) SAL_OVERRIDE; - virtual void visit(ForEachAtom& rAtom) SAL_OVERRIDE; - virtual void visit(ConditionAtom& rAtom) SAL_OVERRIDE; - virtual void visit(ChooseAtom& rAtom) SAL_OVERRIDE; - virtual void visit(LayoutNode& rAtom) SAL_OVERRIDE; + virtual void visit(ConstraintAtom& rAtom) override; + virtual void visit(AlgAtom& rAtom) override; + virtual void visit(ForEachAtom& rAtom) override; + virtual void visit(ConditionAtom& rAtom) override; + virtual void visit(ChooseAtom& rAtom) override; + virtual void visit(LayoutNode& rAtom) override; public: ShapeCreationVisitor(const ShapePtr& rParentShape, diff --git a/oox/source/drawingml/diagram/layoutnodecontext.cxx b/oox/source/drawingml/diagram/layoutnodecontext.cxx index cc3bb6ae87df..93080691f310 100644 --- a/oox/source/drawingml/diagram/layoutnodecontext.cxx +++ b/oox/source/drawingml/diagram/layoutnodecontext.cxx @@ -59,7 +59,7 @@ public: virtual ContextHandlerRef onCreateContext( ::sal_Int32 aElement, - const AttributeList& rAttribs ) SAL_OVERRIDE + const AttributeList& rAttribs ) override { switch( aElement ) { @@ -96,7 +96,7 @@ public: virtual ContextHandlerRef onCreateContext( ::sal_Int32 aElement, - const AttributeList& rAttribs ) SAL_OVERRIDE + const AttributeList& rAttribs ) override { switch( aElement ) { @@ -161,7 +161,7 @@ public: } virtual ContextHandlerRef onCreateContext( ::sal_Int32 aElement, const AttributeList& rAttribs ) - throw (SAXException, RuntimeException) SAL_OVERRIDE + throw (SAXException, RuntimeException) override { sal_Int32 nIdx = LayoutNodeContext::tagToVarIdx( getBaseToken( aElement ) ); if( nIdx != -1 ) diff --git a/oox/source/drawingml/diagram/layoutnodecontext.hxx b/oox/source/drawingml/diagram/layoutnodecontext.hxx index e7b297fa7992..7559af0abbbb 100644 --- a/oox/source/drawingml/diagram/layoutnodecontext.hxx +++ b/oox/source/drawingml/diagram/layoutnodecontext.hxx @@ -32,7 +32,7 @@ public: LayoutNodeContext( ::oox::core::ContextHandler2Helper& rParent, const ::oox::AttributeList& rAttributes, const LayoutAtomPtr &pNode ); virtual ~LayoutNodeContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; static ::sal_Int32 tagToVarIdx( ::sal_Int32 aTag ); private: diff --git a/oox/source/drawingml/effectpropertiescontext.hxx b/oox/source/drawingml/effectpropertiescontext.hxx index 7f608b3caa83..9e0ec3fa4582 100644 --- a/oox/source/drawingml/effectpropertiescontext.hxx +++ b/oox/source/drawingml/effectpropertiescontext.hxx @@ -25,7 +25,7 @@ public: virtual ~EffectPropertiesContext(); virtual ::oox::core::ContextHandlerRef - onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; + onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; protected: EffectProperties& mrEffectProperties; diff --git a/oox/source/drawingml/hyperlinkcontext.hxx b/oox/source/drawingml/hyperlinkcontext.hxx index 8bdf9cd1b3a0..f886a7cca959 100644 --- a/oox/source/drawingml/hyperlinkcontext.hxx +++ b/oox/source/drawingml/hyperlinkcontext.hxx @@ -37,7 +37,7 @@ public: PropertyMap& aProperties ); virtual ~HyperLinkContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; protected: PropertyMap& maProperties; diff --git a/oox/source/drawingml/textbodycontext.cxx b/oox/source/drawingml/textbodycontext.cxx index 2fca12d07445..c0a198ea435a 100644 --- a/oox/source/drawingml/textbodycontext.cxx +++ b/oox/source/drawingml/textbodycontext.cxx @@ -39,7 +39,7 @@ class TextParagraphContext : public ContextHandler2 public: TextParagraphContext( ContextHandler2Helper& rParent, TextParagraph& rPara ); - virtual ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override; protected: TextParagraph& mrParagraph; diff --git a/oox/source/drawingml/textspacingcontext.hxx b/oox/source/drawingml/textspacingcontext.hxx index 366884d1a200..b11db5e1ad35 100644 --- a/oox/source/drawingml/textspacingcontext.hxx +++ b/oox/source/drawingml/textspacingcontext.hxx @@ -31,7 +31,7 @@ class TextSpacingContext : public ::oox::core::ContextHandler2 public: TextSpacingContext( ::oox::core::ContextHandler2Helper& rParent, TextSpacing & aSpacing ); - virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; private: TextSpacing& maSpacing; diff --git a/oox/source/drawingml/texttabstoplistcontext.hxx b/oox/source/drawingml/texttabstoplistcontext.hxx index 20b07fb00e13..1acb0e506475 100644 --- a/oox/source/drawingml/texttabstoplistcontext.hxx +++ b/oox/source/drawingml/texttabstoplistcontext.hxx @@ -35,7 +35,7 @@ namespace oox { namespace drawingml { ::std::list< ::com::sun::star::style::TabStop > & aTabList ); virtual ~TextTabStopListContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; protected: ::std::list< ::com::sun::star::style::TabStop > & maTabList; diff --git a/oox/source/drawingml/themeelementscontext.cxx b/oox/source/drawingml/themeelementscontext.cxx index d28150b22362..a65ce7c1419d 100644 --- a/oox/source/drawingml/themeelementscontext.cxx +++ b/oox/source/drawingml/themeelementscontext.cxx @@ -40,7 +40,7 @@ class FillStyleListContext : public ContextHandler2 { public: FillStyleListContext( ContextHandler2Helper& rParent, FillStyleList& rFillStyleList ); - virtual ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; private: FillStyleList& mrFillStyleList; @@ -72,7 +72,7 @@ class LineStyleListContext : public ContextHandler2 { public: LineStyleListContext( ContextHandler2Helper& rParent, LineStyleList& rLineStyleList ); - virtual ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; private: LineStyleList& mrLineStyleList; @@ -99,7 +99,7 @@ class EffectStyleListContext : public ContextHandler2 { public: EffectStyleListContext( ContextHandler2Helper& rParent, EffectStyleList& rEffectStyleList ); - virtual ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; private: EffectStyleList& mrEffectStyleList; @@ -131,8 +131,8 @@ class FontSchemeContext : public ContextHandler2 { public: FontSchemeContext( ContextHandler2Helper& rParent, FontScheme& rFontScheme ); - virtual ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual void onEndElement() SAL_OVERRIDE; + virtual ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onEndElement() override; private: FontScheme& mrFontScheme; diff --git a/oox/source/export/ColorPropertySet.cxx b/oox/source/export/ColorPropertySet.cxx index ebdfb1cbad93..0a8ebb293d93 100644 --- a/oox/source/export/ColorPropertySet.cxx +++ b/oox/source/export/ColorPropertySet.cxx @@ -42,9 +42,9 @@ public: protected: // ____ XPropertySetInfo ____ - virtual Sequence< Property > SAL_CALL getProperties() throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual Property SAL_CALL getPropertyByName( const OUString& aName ) throw (UnknownPropertyException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual Sequence< Property > SAL_CALL getProperties() throw (RuntimeException, std::exception) override; + virtual Property SAL_CALL getPropertyByName( const OUString& aName ) throw (UnknownPropertyException, RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) throw (RuntimeException, std::exception) override; private: OUString m_aColorPropName; diff --git a/oox/source/export/ColorPropertySet.hxx b/oox/source/export/ColorPropertySet.hxx index 522a0e045511..580976049c72 100644 --- a/oox/source/export/ColorPropertySet.hxx +++ b/oox/source/export/ColorPropertySet.hxx @@ -44,7 +44,7 @@ public: protected: // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) @@ -52,55 +52,55 @@ protected: ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // ____ XPropertyState ____ virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; private: ::com::sun::star::uno::Reference< diff --git a/oox/source/helper/progressbar.cxx b/oox/source/helper/progressbar.cxx index 36820d785a29..e62debdab2e0 100644 --- a/oox/source/helper/progressbar.cxx +++ b/oox/source/helper/progressbar.cxx @@ -76,11 +76,11 @@ class SubSegment : public ISegmentProgressBar public: explicit SubSegment( IProgressBar& rParentProgress, double fStartPos, double fLength ); - virtual double getPosition() const SAL_OVERRIDE; - virtual void setPosition( double fPosition ) SAL_OVERRIDE; + virtual double getPosition() const override; + virtual void setPosition( double fPosition ) override; - virtual double getFreeLength() const SAL_OVERRIDE; - virtual ISegmentProgressBarRef createSegment( double fLength ) SAL_OVERRIDE; + virtual double getFreeLength() const override; + virtual ISegmentProgressBarRef createSegment( double fLength ) override; private: IProgressBar& mrParentProgress; diff --git a/oox/source/helper/propertymap.cxx b/oox/source/helper/propertymap.cxx index 8fc744fef916..1e9cf8e01b18 100644 --- a/oox/source/helper/propertymap.cxx +++ b/oox/source/helper/propertymap.cxx @@ -103,18 +103,18 @@ public: explicit GenericPropertySet( const PropertyMap& rPropMap ); // XPropertySet - virtual Reference< XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const Any& aValue ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& aListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const Reference< XVetoableChangeListener >& aListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const Reference< XVetoableChangeListener >& aListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual Reference< XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const Any& aValue ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) override; + virtual Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& aListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const Reference< XVetoableChangeListener >& aListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const Reference< XVetoableChangeListener >& aListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) override; // XPropertySetInfo - virtual Sequence< Property > SAL_CALL getProperties() throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual Property SAL_CALL getPropertyByName( const OUString& aName ) throw (UnknownPropertyException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual Sequence< Property > SAL_CALL getProperties() throw (RuntimeException, std::exception) override; + virtual Property SAL_CALL getPropertyByName( const OUString& aName ) throw (UnknownPropertyException, RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) throw (RuntimeException, std::exception) override; private: osl::Mutex mMutex; diff --git a/oox/source/helper/textinputstream.cxx b/oox/source/helper/textinputstream.cxx index 10bda133c0d9..0a969f100418 100644 --- a/oox/source/helper/textinputstream.cxx +++ b/oox/source/helper/textinputstream.cxx @@ -44,15 +44,15 @@ public: explicit UnoBinaryInputStream( BinaryInputStream& rInStrm ); virtual sal_Int32 SAL_CALL readBytes( Sequence< sal_Int8 >& rData, sal_Int32 nBytesToRead ) - throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) SAL_OVERRIDE; + throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL readSomeBytes( Sequence< sal_Int8 >& rData, sal_Int32 nMaxBytesToRead ) - throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) SAL_OVERRIDE; + throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) override; virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) - throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) SAL_OVERRIDE; + throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL available() - throw (NotConnectedException, IOException, RuntimeException, std::exception) SAL_OVERRIDE; + throw (NotConnectedException, IOException, RuntimeException, std::exception) override; virtual void SAL_CALL closeInput() - throw (NotConnectedException, IOException, RuntimeException, std::exception) SAL_OVERRIDE; + throw (NotConnectedException, IOException, RuntimeException, std::exception) override; private: void ensureConnected() const throw (NotConnectedException); diff --git a/oox/source/ole/olestorage.cxx b/oox/source/ole/olestorage.cxx index 7e254a3b2d32..9bba20551b7e 100644 --- a/oox/source/ole/olestorage.cxx +++ b/oox/source/ole/olestorage.cxx @@ -60,13 +60,13 @@ public: const OUString& rElementName ); virtual ~OleOutputStream(); - virtual void SAL_CALL seek( sal_Int64 nPos ) throw( IllegalArgumentException, IOException, RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Int64 SAL_CALL getPosition() throw( IOException, RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Int64 SAL_CALL getLength() throw( IOException, RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL seek( sal_Int64 nPos ) throw( IllegalArgumentException, IOException, RuntimeException, std::exception ) override; + virtual sal_Int64 SAL_CALL getPosition() throw( IOException, RuntimeException, std::exception ) override; + virtual sal_Int64 SAL_CALL getLength() throw( IOException, RuntimeException, std::exception ) override; - virtual void SAL_CALL writeBytes( const Sequence< sal_Int8 >& rData ) throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL flush() throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL closeOutput() throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL writeBytes( const Sequence< sal_Int8 >& rData ) throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception ) override; + virtual void SAL_CALL flush() throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception ) override; + virtual void SAL_CALL closeOutput() throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception ) override; private: void ensureSeekable() const throw( IOException ); diff --git a/oox/source/ppt/animvariantcontext.hxx b/oox/source/ppt/animvariantcontext.hxx index f05d6e743597..70bcc0ff08b8 100644 --- a/oox/source/ppt/animvariantcontext.hxx +++ b/oox/source/ppt/animvariantcontext.hxx @@ -34,8 +34,8 @@ namespace oox { namespace ppt { public: AnimVariantContext( ::oox::core::FragmentHandler2& rParent, ::sal_Int32 aElement, ::com::sun::star::uno::Any & aValue ); virtual ~AnimVariantContext( ) throw( ); - virtual void onEndElement() SAL_OVERRIDE; - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onEndElement() override; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override; private: ::sal_Int32 mnElement; diff --git a/oox/source/ppt/buildlistcontext.hxx b/oox/source/ppt/buildlistcontext.hxx index a5a46bbd78a4..84ec8e97c879 100644 --- a/oox/source/ppt/buildlistcontext.hxx +++ b/oox/source/ppt/buildlistcontext.hxx @@ -33,9 +33,9 @@ namespace oox { namespace ppt { virtual ~BuildListContext( ); - virtual void onEndElement() SAL_OVERRIDE; + virtual void onEndElement() override; - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override; private: bool mbInBldGraphic; bool mbBuildAsOne; diff --git a/oox/source/ppt/commonbehaviorcontext.hxx b/oox/source/ppt/commonbehaviorcontext.hxx index 5625f34e9cf1..a54c9cadb9a2 100644 --- a/oox/source/ppt/commonbehaviorcontext.hxx +++ b/oox/source/ppt/commonbehaviorcontext.hxx @@ -45,11 +45,11 @@ namespace oox { namespace ppt { virtual ~CommonBehaviorContext( ) throw( ); - virtual void onEndElement() SAL_OVERRIDE; + virtual void onEndElement() override; - virtual void onCharacters( const OUString& aChars ) SAL_OVERRIDE; + virtual void onCharacters( const OUString& aChars ) override; - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override; private: bool mbInAttrList; diff --git a/oox/source/ppt/commontimenodecontext.hxx b/oox/source/ppt/commontimenodecontext.hxx index 6790135fc9e1..aadaee7e723a 100644 --- a/oox/source/ppt/commontimenodecontext.hxx +++ b/oox/source/ppt/commontimenodecontext.hxx @@ -35,9 +35,9 @@ namespace oox { namespace ppt { CommonTimeNodeContext( ::oox::core::FragmentHandler2& rParent, sal_Int32 aElement, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttribs, const TimeNodePtr & pNode); virtual ~CommonTimeNodeContext( ) throw( ); - virtual void onEndElement() SAL_OVERRIDE; + virtual void onEndElement() override; - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override; private: bool mbIterate; diff --git a/oox/source/ppt/conditioncontext.hxx b/oox/source/ppt/conditioncontext.hxx index 612797a57a0a..a57dd1af6dc3 100644 --- a/oox/source/ppt/conditioncontext.hxx +++ b/oox/source/ppt/conditioncontext.hxx @@ -39,7 +39,7 @@ namespace oox { namespace ppt { const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttribs, const TimeNodePtr & pNode, AnimationCondition & aCond ); virtual ~CondContext( ) throw( ); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override; private: ::com::sun::star::animations::Event maEvent; @@ -57,7 +57,7 @@ namespace oox { namespace ppt { const TimeNodePtr & pNode, AnimationConditionList & aCondList ); virtual ~CondListContext( ) throw( ); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override; private: AnimationConditionList & maConditions; diff --git a/oox/source/ppt/customshowlistcontext.cxx b/oox/source/ppt/customshowlistcontext.cxx index a23447740e0b..a388241a8f9a 100644 --- a/oox/source/ppt/customshowlistcontext.cxx +++ b/oox/source/ppt/customshowlistcontext.cxx @@ -34,7 +34,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttribs, CustomShow& rCustomShow ); virtual ~CustomShowContext( ); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override; }; CustomShowContext::CustomShowContext( FragmentHandler2& rParent, diff --git a/oox/source/ppt/extdrawingfragmenthandler.hxx b/oox/source/ppt/extdrawingfragmenthandler.hxx index fdfdc0cedc03..17c84a76a50e 100644 --- a/oox/source/ppt/extdrawingfragmenthandler.hxx +++ b/oox/source/ppt/extdrawingfragmenthandler.hxx @@ -29,7 +29,7 @@ public: oox::drawingml::ShapePtr pShapePtr ) throw(); virtual ~ExtDrawingFragmentHandler() throw(); - virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const AttributeList& rAttribs ) override; private: const oox::ppt::SlidePersistPtr mpSlidePersistPtr; diff --git a/oox/source/ppt/pptimport.cxx b/oox/source/ppt/pptimport.cxx index e755f6849c1b..46ddb48987ee 100644 --- a/oox/source/ppt/pptimport.cxx +++ b/oox/source/ppt/pptimport.cxx @@ -192,8 +192,8 @@ class PptGraphicHelper : public GraphicHelper { public: explicit PptGraphicHelper( const PowerPointImport& rFilter ); - virtual sal_Int32 getSchemeColor( sal_Int32 nToken ) const SAL_OVERRIDE; - virtual sal_Int32 getDefaultChartAreaFillStyle() const SAL_OVERRIDE; + virtual sal_Int32 getSchemeColor( sal_Int32 nToken ) const override; + virtual sal_Int32 getDefaultChartAreaFillStyle() const override; private: const PowerPointImport& mrFilter; }; diff --git a/oox/source/ppt/timeanimvaluecontext.hxx b/oox/source/ppt/timeanimvaluecontext.hxx index 0121403491e5..21d60c0e3dd9 100644 --- a/oox/source/ppt/timeanimvaluecontext.hxx +++ b/oox/source/ppt/timeanimvaluecontext.hxx @@ -36,9 +36,9 @@ namespace oox { namespace ppt { virtual ~TimeAnimValueListContext( ); - virtual void onEndElement() SAL_OVERRIDE; + virtual void onEndElement() override; - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override; private: TimeAnimationValueList & maTavList; diff --git a/oox/source/ppt/timenodelistcontext.cxx b/oox/source/ppt/timenodelistcontext.cxx index e094d90a57d7..4efd9fedc7ee 100644 --- a/oox/source/ppt/timenodelistcontext.cxx +++ b/oox/source/ppt/timenodelistcontext.cxx @@ -132,7 +132,7 @@ namespace oox { namespace ppt { } } - virtual void onEndElement() SAL_OVERRIDE + virtual void onEndElement() override { sal_Int32 aElement = getCurrentElement(); if( aElement == PPT_TOKEN( audio ) ) @@ -145,7 +145,7 @@ namespace oox { namespace ppt { } } - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override { switch ( aElementToken ) { @@ -196,7 +196,7 @@ namespace oox { namespace ppt { } - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override { switch ( aElementToken ) { @@ -242,7 +242,7 @@ namespace oox { namespace ppt { { } - virtual void onEndElement() SAL_OVERRIDE + virtual void onEndElement() override { if( isCurrentElement( PPT_TOKEN( cmd ) ) ) { @@ -314,7 +314,7 @@ namespace oox { namespace ppt { } } - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override { switch ( aElementToken ) { @@ -355,7 +355,7 @@ namespace oox { namespace ppt { { } - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override { switch ( aElementToken ) { @@ -392,7 +392,7 @@ namespace oox { namespace ppt { { } - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override { switch ( aElementToken ) { @@ -428,7 +428,7 @@ namespace oox { namespace ppt { { } - virtual void onEndElement() SAL_OVERRIDE + virtual void onEndElement() override { //xParentNode if( isCurrentElement( mnElement ) ) @@ -446,7 +446,7 @@ namespace oox { namespace ppt { } } - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override { switch ( aElementToken ) { @@ -588,7 +588,7 @@ namespace oox { namespace ppt { } } - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override { switch ( aElementToken ) { @@ -629,7 +629,7 @@ namespace oox { namespace ppt { { } - virtual void onEndElement() SAL_OVERRIDE + virtual void onEndElement() override { if( isCurrentElement( mnElement ) ) { @@ -648,7 +648,7 @@ namespace oox { namespace ppt { } } - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override { switch ( aElementToken ) { @@ -728,7 +728,7 @@ namespace oox { namespace ppt { { } - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override { switch ( aElementToken ) { @@ -785,7 +785,7 @@ namespace oox { namespace ppt { { } - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override { switch ( aElementToken ) { @@ -868,7 +868,7 @@ namespace oox { namespace ppt { { } - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override { switch ( aElementToken ) { diff --git a/oox/source/ppt/timetargetelementcontext.cxx b/oox/source/ppt/timetargetelementcontext.cxx index b565a1b5e917..258ba12ef68e 100644 --- a/oox/source/ppt/timetargetelementcontext.cxx +++ b/oox/source/ppt/timetargetelementcontext.cxx @@ -45,7 +45,7 @@ namespace oox { namespace ppt { , maShapeTarget(aValue) { } - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override { switch( aElementToken ) { diff --git a/oox/source/ppt/timetargetelementcontext.hxx b/oox/source/ppt/timetargetelementcontext.hxx index 5e4b8079f5bb..f5e4a65e5517 100644 --- a/oox/source/ppt/timetargetelementcontext.hxx +++ b/oox/source/ppt/timetargetelementcontext.hxx @@ -32,7 +32,7 @@ namespace oox { namespace ppt { public: TimeTargetElementContext( ::oox::core::FragmentHandler2& rParent, const AnimTargetElementPtr & aValue ); virtual ~TimeTargetElementContext( ) throw( ); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override; private: AnimTargetElementPtr mpTarget; diff --git a/oox/source/shape/LockedCanvasContext.hxx b/oox/source/shape/LockedCanvasContext.hxx index ca1599d0078b..a2e430c67938 100644 --- a/oox/source/shape/LockedCanvasContext.hxx +++ b/oox/source/shape/LockedCanvasContext.hxx @@ -25,7 +25,7 @@ public: explicit LockedCanvasContext(oox::core::ContextHandler2Helper& rParent); virtual ~LockedCanvasContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext(sal_Int32 Element, const ::oox::AttributeList& rAttribs) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext(sal_Int32 Element, const ::oox::AttributeList& rAttribs) override; oox::drawingml::ShapePtr getShape() { diff --git a/oox/source/shape/ShapeContextHandler.hxx b/oox/source/shape/ShapeContextHandler.hxx index 8aba74a45967..87910910025e 100644 --- a/oox/source/shape/ShapeContextHandler.hxx +++ b/oox/source/shape/ShapeContextHandler.hxx @@ -58,91 +58,91 @@ public: // ::com::sun::star::lang::XServiceInfo: virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService - (const OUString & ServiceName) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + (const OUString & ServiceName) throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; // ::com::sun::star::xml::sax::XFastContextHandler: virtual void SAL_CALL startFastElement (::sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; virtual void SAL_CALL startUnknownElement (const OUString & Namespace, const OUString & Name, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; virtual void SAL_CALL endFastElement(::sal_Int32 Element) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; virtual void SAL_CALL endUnknownElement (const OUString & Namespace, const OUString & Name) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext (::sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext (const OUString & Namespace, const OUString & Name, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; virtual void SAL_CALL characters(const OUString & aChars) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; // ::com::sun::star::xml::sax::XFastShapeContextHandler: virtual css::uno::Reference< css::drawing::XShape > SAL_CALL getShape() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getDrawPage() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setDrawPage (const css::uno::Reference< css::drawing::XDrawPage > & the_value) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< css::frame::XModel > SAL_CALL getModel() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setModel (const css::uno::Reference< css::frame::XModel > & the_value) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< css::io::XInputStream > SAL_CALL - getInputStream() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getInputStream() throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setInputStream (const css::uno::Reference< css::io::XInputStream > & the_value) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getRelationFragmentPath() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setRelationFragmentPath (const OUString & the_value) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getStartToken() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setStartToken( ::sal_Int32 _starttoken ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getStartToken() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setStartToken( ::sal_Int32 _starttoken ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual css::awt::Point SAL_CALL getPosition() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setPosition(const css::awt::Point& rPosition) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::awt::Point SAL_CALL getPosition() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPosition(const css::awt::Point& rPosition) throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setDocumentProperties(const css::uno::Reference<css::document::XDocumentProperties>& xDocProps) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference<css::document::XDocumentProperties> SAL_CALL getDocumentProperties() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; private: ShapeContextHandler(ShapeContextHandler &) = delete; diff --git a/oox/source/shape/ShapeDrawingFragmentHandler.hxx b/oox/source/shape/ShapeDrawingFragmentHandler.hxx index 367f29a35fe7..82360a2620b8 100644 --- a/oox/source/shape/ShapeDrawingFragmentHandler.hxx +++ b/oox/source/shape/ShapeDrawingFragmentHandler.hxx @@ -21,8 +21,8 @@ class ShapeDrawingFragmentHandler : public oox::core::FragmentHandler2 public: ShapeDrawingFragmentHandler( oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath, oox::drawingml::ShapePtr pGroupShapePtr ) throw(); virtual ~ShapeDrawingFragmentHandler() throw(); - virtual void SAL_CALL endDocument() throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::oox::core::ContextHandlerRef onCreateContext(sal_Int32 Element, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void SAL_CALL endDocument() throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::oox::core::ContextHandlerRef onCreateContext(sal_Int32 Element, const AttributeList& rAttribs ) override; private: oox::drawingml::ShapePtr mpGroupShapePtr; diff --git a/oox/source/shape/ShapeFilterBase.cxx b/oox/source/shape/ShapeFilterBase.cxx index 2d886749528e..3a69807ef08d 100644 --- a/oox/source/shape/ShapeFilterBase.cxx +++ b/oox/source/shape/ShapeFilterBase.cxx @@ -77,7 +77,7 @@ class ShapeGraphicHelper : public GraphicHelper { public: explicit ShapeGraphicHelper( const ShapeFilterBase& rFilter ); - virtual sal_Int32 getSchemeColor( sal_Int32 nToken ) const SAL_OVERRIDE; + virtual sal_Int32 getSchemeColor( sal_Int32 nToken ) const override; private: const ShapeFilterBase& mrFilter; }; diff --git a/oox/source/shape/ShapeFilterBase.hxx b/oox/source/shape/ShapeFilterBase.hxx index 171e27419a07..70160b62d7ec 100644 --- a/oox/source/shape/ShapeFilterBase.hxx +++ b/oox/source/shape/ShapeFilterBase.hxx @@ -42,27 +42,27 @@ public: virtual ~ShapeFilterBase(); /** Has to be implemented by each filter, returns the current theme. */ - virtual const ::oox::drawingml::Theme* getCurrentTheme() const SAL_OVERRIDE; + virtual const ::oox::drawingml::Theme* getCurrentTheme() const override; void setCurrentTheme(::oox::drawingml::ThemePtr pTheme); /** Has to be implemented by each filter to return the collection of VML shapes. */ - virtual ::oox::vml::Drawing* getVmlDrawing() SAL_OVERRIDE; + virtual ::oox::vml::Drawing* getVmlDrawing() override; /** Has to be implemented by each filter to return TableStyles. */ - virtual const ::oox::drawingml::table::TableStyleListPtr getTableStyles() SAL_OVERRIDE; + virtual const ::oox::drawingml::table::TableStyleListPtr getTableStyles() override; - virtual ::oox::drawingml::chart::ChartConverter* getChartConverter() SAL_OVERRIDE; + virtual ::oox::drawingml::chart::ChartConverter* getChartConverter() override; - virtual bool importDocument() SAL_OVERRIDE { return true; } - virtual bool exportDocument() SAL_OVERRIDE { return true; } + virtual bool importDocument() override { return true; } + virtual bool exportDocument() override { return true; } sal_Int32 getSchemeColor( sal_Int32 nToken ) const; private: - virtual ::oox::ole::VbaProject* implCreateVbaProject() const SAL_OVERRIDE; - virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual GraphicHelper* implCreateGraphicHelper() const SAL_OVERRIDE; + virtual ::oox::ole::VbaProject* implCreateVbaProject() const override; + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; + virtual GraphicHelper* implCreateGraphicHelper() const override; std::shared_ptr< ::oox::drawingml::chart::ChartConverter > mxChartConv; ::oox::drawingml::ThemePtr mpTheme; diff --git a/oox/source/shape/WpgContext.hxx b/oox/source/shape/WpgContext.hxx index f57eff1415ee..ed0cebf1e245 100644 --- a/oox/source/shape/WpgContext.hxx +++ b/oox/source/shape/WpgContext.hxx @@ -25,7 +25,7 @@ public: explicit WpgContext(oox::core::ContextHandler2Helper& rParent); virtual ~WpgContext(); - virtual oox::core::ContextHandlerRef onCreateContext(sal_Int32 nElementToken, const oox::AttributeList& rAttribs) SAL_OVERRIDE; + virtual oox::core::ContextHandlerRef onCreateContext(sal_Int32 nElementToken, const oox::AttributeList& rAttribs) override; oox::drawingml::ShapePtr getShape() { diff --git a/oox/source/shape/WpsContext.hxx b/oox/source/shape/WpsContext.hxx index df83f888ecb3..90fd3fb9aa21 100644 --- a/oox/source/shape/WpsContext.hxx +++ b/oox/source/shape/WpsContext.hxx @@ -25,7 +25,7 @@ public: WpsContext(oox::core::ContextHandler2Helper& rParent, css::uno::Reference<css::drawing::XShape> xShape); virtual ~WpsContext(); - virtual oox::core::ContextHandlerRef onCreateContext(sal_Int32 nElementToken, const oox::AttributeList& rAttribs) SAL_OVERRIDE; + virtual oox::core::ContextHandlerRef onCreateContext(sal_Int32 nElementToken, const oox::AttributeList& rAttribs) override; oox::drawingml::ShapePtr getShape() { |