diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-09-12 11:11:30 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-09-14 11:29:22 +0200 |
| commit | fce166376335b97bf26bcd895ae785070f393878 (patch) | |
| tree | a41102d59ab12c8cbc2c91690aee129bd32163bd /include | |
| parent | df344855e1c90e6be333afc143044bb04114c683 (diff) | |
Move oox/drawingml/*hxx internal headers to oox/inc.
Do not export LinePropertiesContext class as visible.
And move GraphicProperties to its own header.
Change-Id: I047c181e9f2adc7e59885f59663ea56c7eb898ed
Diffstat (limited to 'include')
42 files changed, 8 insertions, 2392 deletions
diff --git a/include/oox/drawingml/ThemeOverrideFragmentHandler.hxx b/include/oox/drawingml/ThemeOverrideFragmentHandler.hxx deleted file mode 100644 index 827cf5a52f55..000000000000 --- a/include/oox/drawingml/ThemeOverrideFragmentHandler.hxx +++ /dev/null @@ -1,40 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#ifndef INCLUDED_OOX_DRAWINGML_THEMEOVERRICEFRAGMENTHANDLER_HXX -#define INCLUDED_OOX_DRAWINGML_THEMEOVERRICEFRAGMENTHANDLER_HXX - -#include <oox/core/fragmenthandler2.hxx> - -namespace oox { -namespace drawingml { - -class Theme; - -class ThemeOverrideFragmentHandler : public ::oox::core::FragmentHandler2 -{ -public: - explicit ThemeOverrideFragmentHandler( - ::oox::core::XmlFilterBase& rFilter, - const OUString& rFragmentPath, - Theme& rTheme ); - virtual ~ThemeOverrideFragmentHandler(); - - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; - -private: - Theme& mrTheme; -}; - -} // namespace drawingml -} // namespace oox - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/oox/drawingml/clrschemecontext.hxx b/include/oox/drawingml/clrschemecontext.hxx deleted file mode 100644 index 85ce9ada5f80..000000000000 --- a/include/oox/drawingml/clrschemecontext.hxx +++ /dev/null @@ -1,62 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_OOX_DRAWINGML_CLRSCHEMECONTEXT_HXX -#define INCLUDED_OOX_DRAWINGML_CLRSCHEMECONTEXT_HXX - -#include <oox/core/contexthandler2.hxx> -#include <oox/drawingml/clrscheme.hxx> -#include <oox/drawingml/color.hxx> -#include <oox/drawingml/colorchoicecontext.hxx> - -namespace oox { namespace drawingml { - -class clrMapContext : public oox::core::ContextHandler2 -{ -public: - clrMapContext( ::oox::core::ContextHandler2Helper& rParent, - const ::oox::AttributeList& rAttributes, ClrMap& rClrMap ); -}; - -class clrSchemeColorContext : private Color, public ColorContext -{ -public: - clrSchemeColorContext( ::oox::core::ContextHandler2Helper& rParent, ClrScheme& rClrScheme, sal_Int32 nColorToken ); - virtual ~clrSchemeColorContext(); - -private: - ClrScheme& mrClrScheme; - sal_Int32 mnColorToken; -}; - -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; - -private: - ClrScheme& mrClrScheme; -}; - -} } - -#endif // INCLUDED_OOX_DRAWINGML_CLRSCHEMECONTEXT_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/oox/drawingml/colorchoicecontext.hxx b/include/oox/drawingml/colorchoicecontext.hxx deleted file mode 100644 index 8f283dd85285..000000000000 --- a/include/oox/drawingml/colorchoicecontext.hxx +++ /dev/null @@ -1,77 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_OOX_DRAWINGML_COLORCHOICECONTEXT_HXX -#define INCLUDED_OOX_DRAWINGML_COLORCHOICECONTEXT_HXX - -#include <oox/core/contexthandler2.hxx> - -namespace oox { -namespace drawingml { - -class Color; - - - -/** Context handler for the different color value elements (a:scrgbClr, - a:srgbClr, a:hslClr, a:sysClr, a:schemeClr, a:prstClr). */ -class ColorValueContext : public ::oox::core::ContextHandler2 -{ -public: - explicit ColorValueContext( ::oox::core::ContextHandler2Helper& rParent, Color& rColor ); - - - virtual void onStartElement( - const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; - - virtual ::oox::core::ContextHandlerRef - onCreateContext( - sal_Int32 nElement, - const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; - -private: - Color& mrColor; -}; - - - -/** Context handler for elements that *contain* a color value element - (a:scrgbClr, a:srgbClr, a:hslClr, a:sysClr, a:schemeClr, a:prstClr). */ -class ColorContext : public ::oox::core::ContextHandler2 -{ -public: - explicit ColorContext( ::oox::core::ContextHandler2Helper& rParent, Color& rColor ); - - virtual ::oox::core::ContextHandlerRef - onCreateContext( - sal_Int32 nElement, - const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; - -private: - Color& mrColor; -}; - - - -} // namespace drawingml -} // namespace oox - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/oox/drawingml/customshapegeometry.hxx b/include/oox/drawingml/customshapegeometry.hxx deleted file mode 100644 index 15fc22a440d5..000000000000 --- a/include/oox/drawingml/customshapegeometry.hxx +++ /dev/null @@ -1,71 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_OOX_DRAWINGML_CUSTOMSHAPEGEOMETRY_HXX -#define INCLUDED_OOX_DRAWINGML_CUSTOMSHAPEGEOMETRY_HXX - -#include <com/sun/star/beans/XPropertySet.hpp> -#include <oox/helper/propertymap.hxx> -#include <oox/core/contexthandler2.hxx> -#include <oox/drawingml/shape.hxx> - -namespace oox { namespace drawingml { - - - -// CT_CustomGeometry2D -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; - -private: - CustomShapeProperties& mrCustomShapeProperties; -}; - - -// CT_PresetGeometry2D -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; - -private: - CustomShapeProperties& mrCustomShapeProperties; -}; - - -// CT_PresetTextShape -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; - -private: - CustomShapeProperties& mrCustomShapeProperties; -}; - -} } - -#endif // INCLUDED_OOX_DRAWINGML_CUSTOMSHAPEGEOMETRY_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/oox/drawingml/customshapeproperties.hxx b/include/oox/drawingml/customshapeproperties.hxx deleted file mode 100644 index d27fc661c0a2..000000000000 --- a/include/oox/drawingml/customshapeproperties.hxx +++ /dev/null @@ -1,169 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_OOX_DRAWINGML_CUSTOMSHAPEPROPERTIES_HXX -#define INCLUDED_OOX_DRAWINGML_CUSTOMSHAPEPROPERTIES_HXX - -#include <boost/shared_ptr.hpp> -#include <boost/unordered_map.hpp> -#include <vector> -#include <map> -#include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp> -#include <com/sun/star/drawing/EnhancedCustomShapeParameterType.hpp> -#include <com/sun/star/drawing/EnhancedCustomShapeSegment.hpp> -#include <com/sun/star/drawing/EnhancedCustomShapeGluePointType.hpp> -#include <com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.hpp> -#include <com/sun/star/drawing/EnhancedCustomShapeTextFrame.hpp> -#include <com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.hpp> -#include <com/sun/star/drawing/EnhancedCustomShapeTextPathMode.hpp> -#include <com/sun/star/beans/PropertyValues.hpp> -#include <com/sun/star/drawing/ProjectionMode.hpp> -#include <com/sun/star/drawing/XShape.hpp> -#include <com/sun/star/graphic/XGraphic.hpp> -#include <oox/core/xmlfilterbase.hxx> -#include <oox/drawingml/color.hxx> -#include <oox/helper/helper.hxx> -#include <oox/helper/propertymap.hxx> -#include <oox/token/tokens.hxx> - -namespace oox { namespace drawingml { - -class CustomShapeProperties; - -typedef boost::shared_ptr< CustomShapeProperties > CustomShapePropertiesPtr; - -struct CustomShapeGuide -{ - OUString maName; - OUString maFormula; -}; - -struct AdjustHandle -{ - bool polar; - com::sun::star::drawing::EnhancedCustomShapeParameterPair - pos; - - // depending to the type (polar or not): - OptValue< OUString > gdRef1; // gdRefX or gdRefR - OptValue< com::sun::star::drawing::EnhancedCustomShapeParameter > - min1; // minX or minR - OptValue< com::sun::star::drawing::EnhancedCustomShapeParameter > - max1; // maxX or maxR - OptValue< OUString > gdRef2; // gdRefY or gdRefAng - OptValue< com::sun::star::drawing::EnhancedCustomShapeParameter > - min2; // minX or minAng - OptValue< com::sun::star::drawing::EnhancedCustomShapeParameter > - max2; // maxY or maxAng - - AdjustHandle( bool bPolar ) : polar( bPolar ) {}; -}; - -struct ConnectionSite -{ - com::sun::star::drawing::EnhancedCustomShapeParameterPair - pos; - com::sun::star::drawing::EnhancedCustomShapeParameter - ang; -}; - -struct GeomRect -{ - com::sun::star::drawing::EnhancedCustomShapeParameter l; - com::sun::star::drawing::EnhancedCustomShapeParameter t; - com::sun::star::drawing::EnhancedCustomShapeParameter r; - com::sun::star::drawing::EnhancedCustomShapeParameter b; -}; - -struct Path2D -{ - sal_Int64 w; - sal_Int64 h; - sal_Int32 fill; - bool stroke; - bool extrusionOk; - std::vector< com::sun::star::drawing::EnhancedCustomShapeParameterPair > parameter; - - Path2D() : w( 0 ), h( 0 ), fill( XML_norm ), stroke( true ), extrusionOk( true ) {}; -}; - - -class CustomShapeProperties -{ -public: - - CustomShapeProperties(); - virtual ~CustomShapeProperties(); - - void pushToPropSet( const ::oox::core::FilterBase& rFilterBase, - const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > & xPropSet, - const ::com::sun::star::uno::Reference < ::com::sun::star::drawing::XShape > & xShape, const ::com::sun::star::awt::Size &aSize ); - - sal_Int32 getShapePresetType() const { return mnShapePresetType; } - OUString getShapePresetTypeName() const; - void setShapePresetType( sal_Int32 nShapePresetType ){ mnShapePresetType = nShapePresetType; }; - bool getShapeTypeOverride(){ return mbShapeTypeOverride; }; - void setShapeTypeOverride( bool bShapeTypeOverride ) { mbShapeTypeOverride = bShapeTypeOverride; }; - - std::vector< CustomShapeGuide >& getAdjustmentGuideList(){ return maAdjustmentGuideList; }; - std::vector< CustomShapeGuide >& getGuideList(){ return maGuideList; }; - std::vector< AdjustHandle >& getAdjustHandleList(){ return maAdjustHandleList; }; - std::vector< ConnectionSite >& getConnectionSiteList(){ return maConnectionSiteList; }; - OptValue< GeomRect >& getTextRect(){ return maTextRect; }; - std::vector< Path2D >& getPath2DList(){ return maPath2DList; }; - std::vector< com::sun::star::drawing::EnhancedCustomShapeSegment >& getSegments(){ return maSegments; }; - void setMirroredX( bool bMirroredX ) { mbMirroredX = bMirroredX; }; - void setMirroredY( bool bMirroredY ) { mbMirroredY = bMirroredY; }; - void setTextRotateAngle( sal_Int32 nAngle ) { mnTextRotateAngle = nAngle; }; - - static sal_Int32 SetCustomShapeGuideValue( std::vector< CustomShapeGuide >& rGuideList, const CustomShapeGuide& rGuide ); - static sal_Int32 GetCustomShapeGuideValue( const std::vector< CustomShapeGuide >& rGuideList, const OUString& rFormulaName ); - - sal_Int32 getArcNum() { return mnArcNum++; } - -private: - - sal_Int32 mnShapePresetType; - bool mbShapeTypeOverride; - std::vector< CustomShapeGuide > maAdjustmentGuideList; - std::vector< CustomShapeGuide > maGuideList; - std::vector< AdjustHandle > maAdjustHandleList; - std::vector< ConnectionSite > maConnectionSiteList; - OptValue< GeomRect > maTextRect; - std::vector< Path2D > maPath2DList; - - std::vector< com::sun::star::drawing::EnhancedCustomShapeSegment > - maSegments; - bool mbMirroredX; - bool mbMirroredY; - sal_Int32 mnTextRotateAngle; - - typedef boost::unordered_map< sal_Int32, PropertyMap > PresetDataMap; - - static PresetDataMap maPresetDataMap; - static void initializePresetDataMap(); - - sal_Int32 mnArcNum; -}; - -} } - -#endif // INCLUDED_OOX_DRAWINGML_CUSTOMSHAPEPROPERTIES_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/oox/drawingml/drawingmltypes.hxx b/include/oox/drawingml/drawingmltypes.hxx index 18c976883f1a..433e2b906044 100644 --- a/include/oox/drawingml/drawingmltypes.hxx +++ b/include/oox/drawingml/drawingmltypes.hxx @@ -69,6 +69,9 @@ typedef ::boost::shared_ptr< EffectProperties > EffectPropertiesPtr; class TextBody; typedef ::boost::shared_ptr< TextBody > TextBodyPtr; +class TextListStyle; +typedef boost::shared_ptr< TextListStyle > TextListStylePtr; + class Shape; typedef ::boost::shared_ptr< Shape > ShapePtr; diff --git a/include/oox/drawingml/embeddedwavaudiofile.hxx b/include/oox/drawingml/embeddedwavaudiofile.hxx deleted file mode 100644 index c1b199243f87..000000000000 --- a/include/oox/drawingml/embeddedwavaudiofile.hxx +++ /dev/null @@ -1,51 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_OOX_DRAWINGML_EMBEDDEDWAVAUDIOFILE_HXX -#define INCLUDED_OOX_DRAWINGML_EMBEDDEDWAVAUDIOFILE_HXX - -#include <rtl/ustring.hxx> -#include <com/sun/star/xml/sax/XFastAttributeList.hpp> - -#include <oox/core/fragmenthandler.hxx> - -namespace oox { namespace drawingml { - - struct EmbeddedWAVAudioFile - { - EmbeddedWAVAudioFile() - : mbBuiltIn(false) - { - } - bool mbBuiltIn; - OUString msName; - OUString msEmbed; - }; - - void getEmbeddedWAVAudioFile( - const ::oox::core::Relations& rRelations, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttribs, - EmbeddedWAVAudioFile & aAudio ); - -} } - - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/oox/drawingml/fillproperties.hxx b/include/oox/drawingml/fillproperties.hxx index 550fd825176b..815881a52c28 100644 --- a/include/oox/drawingml/fillproperties.hxx +++ b/include/oox/drawingml/fillproperties.hxx @@ -25,13 +25,10 @@ #include <com/sun/star/geometry/IntegerRectangle2D.hpp> #include <oox/drawingml/color.hxx> #include <oox/helper/helper.hxx> -#include <oox/drawingml/embeddedwavaudiofile.hxx> #include <oox/ole/oleobjecthelper.hxx> namespace oox { class GraphicHelper; - class PropertyMap; - class PropertySet; } namespace oox { @@ -144,21 +141,6 @@ struct OOX_DLLPUBLIC FillProperties bool bFlipV = false ) const; }; -struct GraphicProperties -{ - BlipFillProperties maBlipProps; /// Properties for the graphic. - EmbeddedWAVAudioFile maAudio; /// Audio file details - - /** Overwrites all members that are explicitly set in rSourceProps. */ - void assignUsed( const GraphicProperties& rSourceProps ); - - /** Writes the properties to the passed property map. */ - void pushToPropMap( - PropertyMap& rPropMap, - const GraphicHelper& rGraphicHelper, - sal_Int32 nPhClr = API_RGB_TRANSPARENT ) const; -}; - } // namespace drawingml } // namespace oox diff --git a/include/oox/drawingml/fillpropertiesgroupcontext.hxx b/include/oox/drawingml/fillpropertiesgroupcontext.hxx deleted file mode 100644 index aae88df408be..000000000000 --- a/include/oox/drawingml/fillpropertiesgroupcontext.hxx +++ /dev/null @@ -1,253 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_OOX_DRAWINGML_FILLPROPERTIESGROUPCONTEXT_HXX -#define INCLUDED_OOX_DRAWINGML_FILLPROPERTIESGROUPCONTEXT_HXX - -#include <oox/drawingml/colorchoicecontext.hxx> -#include <oox/drawingml/fillproperties.hxx> - -namespace oox { -namespace drawingml { - - - -/** Context handler that imports the a:solidFill element. */ -class SolidFillContext : public ColorContext -{ -public: - explicit SolidFillContext( - ::oox::core::ContextHandler2Helper& rParent, - const ::oox::AttributeList& rAttribs, - FillProperties& rFillProps ); -}; - - - -/** Context handler that imports the a:gradFill element. */ -class GradientFillContext : public ::oox::core::ContextHandler2 -{ -public: - explicit GradientFillContext( - ::oox::core::ContextHandler2Helper& rParent, - const ::oox::AttributeList& rAttribs, - GradientFillProperties& rGradientProps ); - - virtual ::oox::core::ContextHandlerRef - onCreateContext( - sal_Int32 nElement, - const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; - -private: - GradientFillProperties& mrGradientProps; -}; - -/** Context handler that imports the a:pattFill element. */ -class PatternFillContext : public ::oox::core::ContextHandler2 -{ -public: - explicit PatternFillContext( - ::oox::core::ContextHandler2Helper& rParent, - const ::oox::AttributeList& rAttribs, - PatternFillProperties& rPatternProps ); - - virtual ::oox::core::ContextHandlerRef - onCreateContext( - sal_Int32 nElement, - const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; - -private: - PatternFillProperties& mrPatternProps; -}; - - - -/** Context handler that imports a14:imgProps, a14:imgLayer, a14:imgEffect containers - and the a14:artistic* effect tags defined in the MS-ODRAWXML extension. */ -class ArtisticEffectContext : public ::oox::core::ContextHandler2 -{ -public: - explicit ArtisticEffectContext( - ::oox::core::ContextHandler2Helper& rParent, - ArtisticEffectProperties& rEffect ); - virtual ~ArtisticEffectContext(); - - virtual ::oox::core::ContextHandlerRef - onCreateContext( - sal_Int32 nElement, - const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; - -private: - ArtisticEffectProperties& maEffect; -}; - - - -/** Context handler that imports the a:extLst element inside a:blip and its - children a:ext, which can contain transformations to the bitmap. */ -class BlipExtensionContext : public ::oox::core::ContextHandler2 -{ -public: - explicit BlipExtensionContext( - ::oox::core::ContextHandler2Helper& rParent, - BlipFillProperties& rBlipProps ); - virtual ~BlipExtensionContext(); - - virtual ::oox::core::ContextHandlerRef - onCreateContext( - sal_Int32 nElement, - const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; - -private: - BlipFillProperties& mrBlipProps; -}; - - - -/** Context handler that imports the a:duotone element containing the colors - of a bitmap duotone transformation. */ -class DuotoneContext : public ::oox::core::ContextHandler2 -{ -public: - explicit DuotoneContext( - ::oox::core::ContextHandler2Helper& rParent, - const ::oox::AttributeList& rAttribs, - BlipFillProperties& rBlipProps ); - virtual ~DuotoneContext(); - - virtual ::oox::core::ContextHandlerRef - onCreateContext( - sal_Int32 nElement, - const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; - -private: - BlipFillProperties& mrBlipProps; - int mnColorIndex; -}; - - - -/** Context handler that imports the a:clrChange element containing the colors - of a bitmap color change transformation. */ -class ColorChangeContext : public ::oox::core::ContextHandler2 -{ -public: - explicit ColorChangeContext( - ::oox::core::ContextHandler2Helper& rParent, - const ::oox::AttributeList& rAttribs, - BlipFillProperties& rBlipProps ); - virtual ~ColorChangeContext(); - - virtual ::oox::core::ContextHandlerRef - onCreateContext( - sal_Int32 nElement, - const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; - -private: - BlipFillProperties& mrBlipProps; - bool mbUseAlpha; -}; - -/** Context handler that imports the a:blip element containing the fill bitmap - and bitmap color transformation settings. */ -class BlipContext : public ::oox::core::ContextHandler2 -{ -public: - explicit BlipContext( - ::oox::core::ContextHandler2Helper& rParent, - const ::oox::AttributeList& rAttribs, - BlipFillProperties& rBlipProps ); - - virtual ::oox::core::ContextHandlerRef - onCreateContext( - sal_Int32 nElement, - const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; - -private: - BlipFillProperties& mrBlipProps; -}; - -/** Context handler that imports the a:blipFill element. */ -class BlipFillContext : public ::oox::core::ContextHandler2 -{ -public: - explicit BlipFillContext( - ::oox::core::ContextHandler2Helper& rParent, - const ::oox::AttributeList& rAttribs, - BlipFillProperties& rBlipProps ); - - virtual ::oox::core::ContextHandlerRef - onCreateContext( - sal_Int32 nElement, - const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; - -private: - BlipFillProperties& mrBlipProps; -}; - -/** Context handler for elements that contain a fill property element - (a:noFill, a:solidFill, a:gradFill, a:pattFill, a:blipFill, a:grpFill). */ -class FillPropertiesContext : public ::oox::core::ContextHandler2 -{ -public: - explicit FillPropertiesContext( - ::oox::core::ContextHandler2Helper& rParent, - FillProperties& rFillProps ); - - virtual ::oox::core::ContextHandlerRef - onCreateContext( - sal_Int32 nElement, - const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; - - static ::oox::core::ContextHandlerRef - createFillContext( - ::oox::core::ContextHandler2Helper& rParent, - sal_Int32 nElement, - const ::oox::AttributeList& rAttribs, - FillProperties& rFillProps ); - -protected: - FillProperties& mrFillProps; -}; - -/** Context handler for elements that contain a fill property element - (a:noFill, a:solidFill, a:gradFill, a:pattFill, a:blipFill, a:grpFill). - - This context handler takes a simple color instead of a fill properties - struct. The imported fill properties are converted automatically to the - best fitting solid color. - */ -class SimpleFillPropertiesContext : private FillProperties, public FillPropertiesContext -{ -public: - explicit SimpleFillPropertiesContext( - ::oox::core::ContextHandler2Helper& rParent, - Color& rColor ); - virtual ~SimpleFillPropertiesContext(); - -protected: - Color& mrColor; -}; - -} // namespace drawingml -} // namespace oox - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/oox/drawingml/guidcontext.hxx b/include/oox/drawingml/guidcontext.hxx deleted file mode 100644 index 285a5677ef4d..000000000000 --- a/include/oox/drawingml/guidcontext.hxx +++ /dev/null @@ -1,41 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_OOX_DRAWINGML_GUIDCONTEXT_HXX -#define INCLUDED_OOX_DRAWINGML_GUIDCONTEXT_HXX - -#include <oox/core/contexthandler2.hxx> - -namespace oox { namespace drawingml { - - class GuidContext : public ::oox::core::ContextHandler2 - { - - public: - GuidContext( ::oox::core::ContextHandler2Helper& rParent, OUString& rGuidId ); - virtual void onCharacters( const OUString& aChars ) SAL_OVERRIDE; - - private: - OUString& mrGuidId; - }; -} } - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/oox/drawingml/linepropertiescontext.hxx b/include/oox/drawingml/linepropertiescontext.hxx deleted file mode 100644 index efd85ca4e247..000000000000 --- a/include/oox/drawingml/linepropertiescontext.hxx +++ /dev/null @@ -1,51 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_OOX_DRAWINGML_LINEPROPERTIESCONTEXT_HXX -#define INCLUDED_OOX_DRAWINGML_LINEPROPERTIESCONTEXT_HXX - -#include <oox/core/contexthandler2.hxx> -#include <oox/dllapi.h> - -namespace oox { namespace drawingml { - - - -struct LineProperties; - -class OOX_DLLPUBLIC LinePropertiesContext : public ::oox::core::ContextHandler2 -{ -public: - LinePropertiesContext( ::oox::core::ContextHandler2Helper& rParent, - const ::oox::AttributeList& rAttributes, - LineProperties& rLineProperties ) throw(); - virtual ~LinePropertiesContext(); - - virtual ::oox::core::ContextHandlerRef - onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; - -protected: - LineProperties& mrLineProperties; -}; - -} } - -#endif // INCLUDED_OOX_DRAWINGML_LINEPROPERTIESCONTEXT_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/oox/drawingml/objectdefaultcontext.hxx b/include/oox/drawingml/objectdefaultcontext.hxx deleted file mode 100644 index f92e245d154c..000000000000 --- a/include/oox/drawingml/objectdefaultcontext.hxx +++ /dev/null @@ -1,43 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_OOX_DRAWINGML_OBJECTDEFAULTCONTEXT_HXX -#define INCLUDED_OOX_DRAWINGML_OBJECTDEFAULTCONTEXT_HXX - -#include <oox/core/contexthandler2.hxx> - -namespace oox { namespace drawingml { - -class Theme; - -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; - -protected: - Theme& mrTheme; -}; - -} } - -#endif // INCLUDED_OOX_DRAWINGML_OBJECTDEFAULTCONTEXT_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/oox/drawingml/scene3dcontext.hxx b/include/oox/drawingml/scene3dcontext.hxx deleted file mode 100644 index d016445528b6..000000000000 --- a/include/oox/drawingml/scene3dcontext.hxx +++ /dev/null @@ -1,67 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_OOX_DRAWINGML_SCENE3DCONTEXT_HXX -#define INCLUDED_OOX_DRAWINGML_SCENE3DCONTEXT_HXX - -#include <oox/core/contexthandler2.hxx> -#include "oox/drawingml/shape3dproperties.hxx" - -namespace oox { namespace drawingml { - -struct Shape3DProperties; - -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; - -private: - RotationProperties& mrRotationProperties; -}; - -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; - -private: - Shape3DProperties& mr3DProperties; -}; - -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; - -private: - Shape3DProperties& mr3DProperties; -}; - -} } - -#endif // INCLUDED_OOX_DRAWINGML_SCENE3DCONTEXT_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx index a3bd8849fa89..081429922189 100644 --- a/include/oox/drawingml/shape.hxx +++ b/include/oox/drawingml/shape.hxx @@ -21,10 +21,9 @@ #define INCLUDED_OOX_DRAWINGML_SHAPE_HXX #include <oox/helper/propertymap.hxx> +#include <oox/core/xmlfilterbase.hxx> +#include <oox/drawingml/color.hxx> #include <oox/drawingml/drawingmltypes.hxx> -#include <oox/drawingml/customshapeproperties.hxx> -#include <oox/drawingml/textliststyle.hxx> -#include <oox/drawingml/shape3dproperties.hxx> #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/drawing/XDrawPage.hpp> diff --git a/include/oox/drawingml/shape3dproperties.hxx b/include/oox/drawingml/shape3dproperties.hxx deleted file mode 100644 index 5c3eaa00ead2..000000000000 --- a/include/oox/drawingml/shape3dproperties.hxx +++ /dev/null @@ -1,98 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_OOX_DRAWINGML_SHAPE3DPROPERTIES_HXX -#define INCLUDED_OOX_DRAWINGML_SHAPE3DPROPERTIES_HXX - -#include <map> -#include <com/sun/star/graphic/XGraphic.hpp> -#include <com/sun/star/geometry/IntegerRectangle2D.hpp> -#include <oox/core/xmlfilterbase.hxx> -#include <oox/drawingml/color.hxx> -#include <oox/helper/helper.hxx> - -namespace oox { class PropertyMap; } -namespace oox { class PropertySet; } -namespace oox { namespace core { class ModelObjectContainer; } } - -namespace oox { -namespace drawingml { - - - -struct RotationProperties -{ - OptValue< sal_Int32 > mnLatitude; - OptValue< sal_Int32 > mnLongitude; - OptValue< sal_Int32 > mnRevolution; -}; - -struct BevelProperties -{ - OptValue< sal_Int32 > mnPreset; - OptValue< sal_Int32 > mnWidth; - OptValue< sal_Int32 > mnHeight; -}; - -struct Shape3DProperties -{ - OptValue< sal_Int32 > mnPreset; - OptValue< float > mfFieldOfVision; - OptValue< float > mfZoom; - OptValue< sal_Int32 > mnLightRigDirection; - OptValue< sal_Int32 > mnLightRigType; - RotationProperties maCameraRotation; - RotationProperties maLightRigRotation; - - OptValue< sal_Int32 > mnExtrusionH; - OptValue< sal_Int32 > mnContourW; - OptValue< sal_Int32 > mnShapeZ; - OptValue< sal_Int32 > mnMaterial; - Color maExtrusionColor; - Color maContourColor; - - OptValue< BevelProperties > maTopBevelProperties; - OptValue< BevelProperties > maBottomBevelProperties; - - /** Overwrites all members that are explicitly set in rSourceProps. */ - void assignUsed( const Shape3DProperties& rSourceProps ); - - OUString getCameraPrstName( sal_Int32 nElement ); - OUString getLightRigName( sal_Int32 nElement ); - OUString getLightRigDirName( sal_Int32 nElement ); - OUString getBevelPresetTypeString( sal_Int32 nType ); - OUString getPresetMaterialTypeString( sal_Int32 nType ); - - css::uno::Sequence< css::beans::PropertyValue > getCameraAttributes(); - css::uno::Sequence< css::beans::PropertyValue > getLightRigAttributes(); - css::uno::Sequence< css::beans::PropertyValue > getShape3DAttributes( - const GraphicHelper& rGraphicHelper, sal_Int32 rPhClr = API_RGB_TRANSPARENT ); - css::uno::Sequence< css::beans::PropertyValue > getBevelAttributes( BevelProperties rProps ); - css::uno::Sequence< css::beans::PropertyValue > getColorAttributes( - const Color& rColor, const GraphicHelper& rGraphicHelper, sal_Int32 rPhClr ); -}; - - - -} // namespace drawingml -} // namespace oox - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/oox/drawingml/shapecontext.hxx b/include/oox/drawingml/shapecontext.hxx index 7b81f030e8a0..b7c17a7a4ac7 100644 --- a/include/oox/drawingml/shapecontext.hxx +++ b/include/oox/drawingml/shapecontext.hxx @@ -24,7 +24,6 @@ #include <oox/core/contexthandler2.hxx> #include <oox/drawingml/shape.hxx> -#include <oox/drawingml/shapepropertiescontext.hxx> #include <oox/dllapi.h> namespace oox { namespace drawingml { diff --git a/include/oox/drawingml/shapepropertiescontext.hxx b/include/oox/drawingml/shapepropertiescontext.hxx deleted file mode 100644 index 4718e3b9a05d..000000000000 --- a/include/oox/drawingml/shapepropertiescontext.hxx +++ /dev/null @@ -1,43 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_OOX_DRAWINGML_SHAPEPROPERTIESCONTEXT_HXX -#define INCLUDED_OOX_DRAWINGML_SHAPEPROPERTIESCONTEXT_HXX - -#include <oox/core/contexthandler2.hxx> -#include <oox/drawingml/shape.hxx> - -namespace oox { namespace drawingml { - -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; - -protected: - Shape& mrShape; -}; - -} } - -#endif // INCLUDED_OOX_DRAWINGML_SHAPEPROPERTIESCONTEXT_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/oox/drawingml/shapestylecontext.hxx b/include/oox/drawingml/shapestylecontext.hxx deleted file mode 100644 index b7a479124560..000000000000 --- a/include/oox/drawingml/shapestylecontext.hxx +++ /dev/null @@ -1,44 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_OOX_DRAWINGML_SHAPESTYLECONTEXT_HXX -#define INCLUDED_OOX_DRAWINGML_SHAPESTYLECONTEXT_HXX - -#include <oox/drawingml/shape.hxx> -#include <oox/core/contexthandler2.hxx> - -namespace oox { namespace drawingml { - -class ShapeStyleContext : public ::oox::core::ContextHandler2 -{ -public: - ShapeStyleContext( ::oox::core::ContextHandler2Helper& rParent, Shape& rShape ); - virtual ~ShapeStyleContext(); - - virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; - -protected: - Shape& mrShape; -}; - -} } - -#endif // INCLUDED_OOX_DRAWINGML_SHAPESTYLECONTEXT_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/oox/drawingml/spdefcontext.hxx b/include/oox/drawingml/spdefcontext.hxx deleted file mode 100644 index 2488197cac51..000000000000 --- a/include/oox/drawingml/spdefcontext.hxx +++ /dev/null @@ -1,42 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_OOX_DRAWINGML_SPDEFCONTEXT_HXX -#define INCLUDED_OOX_DRAWINGML_SPDEFCONTEXT_HXX - -#include <oox/drawingml/shape.hxx> -#include <oox/core/contexthandler2.hxx> - -namespace oox { namespace drawingml { - -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; - -protected: - Shape& mrDefaultObject; -}; - -} } - -#endif // INCLUDED_OOX_DRAWINGML_SPDEFCONTEXT_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/oox/drawingml/textbody.hxx b/include/oox/drawingml/textbody.hxx deleted file mode 100644 index 8475031e15be..000000000000 --- a/include/oox/drawingml/textbody.hxx +++ /dev/null @@ -1,73 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_OOX_DRAWINGML_TEXTBODY_HXX -#define INCLUDED_OOX_DRAWINGML_TEXTBODY_HXX - -#include <oox/drawingml/drawingmltypes.hxx> -#include <oox/drawingml/textbodyproperties.hxx> -#include <oox/drawingml/textliststyle.hxx> - -namespace com { namespace sun { namespace star { - namespace text { class XText; } - namespace text { class XTextCursor; } -} } } - -namespace oox { namespace core { class XmlFilterBase; } } - -namespace oox { namespace drawingml { - -class TextParagraph; -typedef RefVector< TextParagraph > TextParagraphVector; - -class TextBody -{ -public: - TextBody(); - TextBody( TextBodyPtr pBody ); - ~TextBody(); - - const TextParagraphVector& getParagraphs() const { return maParagraphs; } - TextParagraph& addParagraph(); - - const TextListStyle& getTextListStyle() const { return maTextListStyle; } - TextListStyle& getTextListStyle() { return maTextListStyle; } - - const TextBodyProperties& getTextProperties() const { return maTextProperties; } - TextBodyProperties& getTextProperties() { return maTextProperties; } - - /** insert the text body at the text cursor */ - void insertAt( - const ::oox::core::XmlFilterBase& rFilterBase, - 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& rTextStyleProperties, - const TextListStylePtr& pMasterTextListStyle ) const; - bool isEmpty(); -protected: - TextParagraphVector maParagraphs; - TextBodyProperties maTextProperties; - TextListStyle maTextListStyle; -}; - -} } - -#endif // INCLUDED_OOX_DRAWINGML_TEXTBODY_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/oox/drawingml/textbodycontext.hxx b/include/oox/drawingml/textbodycontext.hxx deleted file mode 100644 index 74c5cdd780ee..000000000000 --- a/include/oox/drawingml/textbodycontext.hxx +++ /dev/null @@ -1,62 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_OOX_DRAWINGML_TEXTBODYCONTEXT_HXX -#define INCLUDED_OOX_DRAWINGML_TEXTBODYCONTEXT_HXX - -#include <com/sun/star/text/XText.hpp> - -#include <oox/drawingml/textbody.hxx> -#include <oox/drawingml/textrun.hxx> -#include <oox/core/contexthandler2.hxx> - -namespace oox { namespace drawingml { - -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; - -protected: - TextBody& mrTextBody; - ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > mxText; -}; - -// CT_RegularTextRun -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; - -protected: - TextRunPtr mpRunPtr; - bool mbIsInText; -}; - -} } - -#endif // INCLUDED_OOX_DRAWINGML_TEXTBODYCONTEXT_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/oox/drawingml/textbodyproperties.hxx b/include/oox/drawingml/textbodyproperties.hxx deleted file mode 100644 index e6ed0fc19011..000000000000 --- a/include/oox/drawingml/textbodyproperties.hxx +++ /dev/null @@ -1,59 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_OOX_DRAWINGML_TEXTBODYPROPERTIES_HXX -#define INCLUDED_OOX_DRAWINGML_TEXTBODYPROPERTIES_HXX - -#include <com/sun/star/drawing/TextVerticalAdjust.hpp> -#include <oox/helper/helper.hxx> -#include <oox/helper/propertymap.hxx> -#include <boost/optional.hpp> - -namespace oox { -namespace drawingml { - - - -struct TextBodyProperties -{ - PropertyMap maPropertyMap; - OptValue< sal_Int32 > moRotation; - bool mbAnchorCtr; - OptValue< sal_Int32 > moVert; - boost::optional< sal_Int32 > moInsets[4]; - boost::optional< sal_Int32 > moTextOffUpper; - boost::optional< sal_Int32 > moTextOffLeft; - boost::optional< sal_Int32 > moTextOffLower; - boost::optional< sal_Int32 > moTextOffRight; - ::com::sun::star::drawing::TextVerticalAdjust meVA; - - explicit TextBodyProperties(); - - void pushRotationAdjustments( sal_Int32 nRotation ); - void pushVertSimulation(); -}; - - - -} // namespace drawingml -} // namespace oox - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/oox/drawingml/textbodypropertiescontext.hxx b/include/oox/drawingml/textbodypropertiescontext.hxx deleted file mode 100644 index b3ec0326d0b4..000000000000 --- a/include/oox/drawingml/textbodypropertiescontext.hxx +++ /dev/null @@ -1,46 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_OOX_DRAWINGML_TEXTBODYPROPERTIESCONTEXT_HXX -#define INCLUDED_OOX_DRAWINGML_TEXTBODYPROPERTIESCONTEXT_HXX - -#include <oox/core/contexthandler2.hxx> - -namespace oox { namespace drawingml { - -struct TextBodyProperties; - -class TextBodyPropertiesContext : public ::oox::core::ContextHandler2 -{ -public: - TextBodyPropertiesContext( ::oox::core::ContextHandler2Helper& rParent, - const ::oox::AttributeList& rAttributes, - TextBodyProperties& rTextBodyProp ); - - virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; - -protected: - TextBodyProperties& mrTextBodyProp; -}; - -} } - -#endif // INCLUDED_OOX_DRAWINGML_TEXTBODYPROPERTIESCONTEXT_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/oox/drawingml/textcharacterproperties.hxx b/include/oox/drawingml/textcharacterproperties.hxx deleted file mode 100644 index 4162c235953b..000000000000 --- a/include/oox/drawingml/textcharacterproperties.hxx +++ /dev/null @@ -1,92 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_OOX_DRAWINGML_TEXTCHARACTERPROPERTIES_HXX -#define INCLUDED_OOX_DRAWINGML_TEXTCHARACTERPROPERTIES_HXX - -#include <oox/helper/helper.hxx> -#include <oox/helper/propertymap.hxx> -#include <oox/drawingml/color.hxx> -#include <oox/drawingml/textfont.hxx> -#include <oox/drawingml/fillproperties.hxx> - -namespace oox { class PropertySet; } - -namespace oox { -namespace drawingml { - - - -struct TextCharacterProperties -{ - PropertyMap maHyperlinkPropertyMap; - TextFont maLatinFont; - TextFont maLatinThemeFont; - TextFont maAsianFont; - TextFont maAsianThemeFont; - TextFont maComplexFont; - TextFont maComplexThemeFont; - TextFont maSymbolFont; - Color maCharColor; - Color maUnderlineColor; - Color maHighlightColor; - OptValue< OUString > moLang; - OptValue< sal_Int32 > moHeight; - OptValue< sal_Int32 > moSpacing; - OptValue< sal_Int32 > moUnderline; - OptValue< sal_Int32 > moBaseline; - OptValue< sal_Int32 > moStrikeout; - OptValue< sal_Int32 > moCaseMap; - OptValue< bool > moBold; - OptValue< bool > moItalic; - OptValue< bool > moUnderlineLineFollowText; - OptValue< bool > moUnderlineFillFollowText; - GradientFillProperties maGradientProps; /// Properties for gradient text colors - - std::vector<css::beans::PropertyValue> maTextEffectsProperties; - - /** Overwrites all members that are explicitly set in rSourceProps. */ - void assignUsed( const TextCharacterProperties& rSourceProps ); - - /** Returns the current character size. If possible the masterstyle should - have been applied before, otherwise the character size can be zero and - the default value is returned. */ - float getCharHeightPoints( float fDefault ) const; - - /** Writes the properties to the passed property map. */ - void pushToPropMap( - PropertyMap& rPropMap, - const ::oox::core::XmlFilterBase& rFilter, - bool bUseOptional = false ) const; - - /** Writes the properties to the passed property set. */ - void pushToPropSet( - PropertySet& rPropSet, - const ::oox::core::XmlFilterBase& rFilter, - bool bUseOptional = false ) const; -}; - - - -} // namespace drawingml -} // namespace oox - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/oox/drawingml/textcharacterpropertiescontext.hxx b/include/oox/drawingml/textcharacterpropertiescontext.hxx deleted file mode 100644 index d44227c96320..000000000000 --- a/include/oox/drawingml/textcharacterpropertiescontext.hxx +++ /dev/null @@ -1,47 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_OOX_DRAWINGML_TEXTCHARACTERPROPERTIESCONTEXT_HXX -#define INCLUDED_OOX_DRAWINGML_TEXTCHARACTERPROPERTIESCONTEXT_HXX - -#include <oox/core/contexthandler2.hxx> - -namespace oox { namespace drawingml { - -struct TextCharacterProperties; - -class TextCharacterPropertiesContext : public ::oox::core::ContextHandler2 -{ -public: - TextCharacterPropertiesContext( ::oox::core::ContextHandler2Helper& rParent, - const ::oox::AttributeList& rAttribs, - TextCharacterProperties& rTextCharacterProperties ); - virtual ~TextCharacterPropertiesContext(); - - virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; - -protected: - TextCharacterProperties& mrTextCharacterProperties; -}; - -} } - -#endif // INCLUDED_OOX_DRAWINGML_TEXTCHARACTERPROPERTIESCONTEXT_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/oox/drawingml/texteffectscontext.hxx b/include/oox/drawingml/texteffectscontext.hxx deleted file mode 100644 index b8e3aeb4a4a0..000000000000 --- a/include/oox/drawingml/texteffectscontext.hxx +++ /dev/null @@ -1,50 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - */ - -#ifndef INCLUDED_OOX_DRAWINGML_TEXTEFFECTSCONTEXT_HXX -#define INCLUDED_OOX_DRAWINGML_TEXTEFFECTSCONTEXT_HXX - -#include <com/sun/star/beans/PropertyValue.hpp> - -#include <oox/helper/grabbagstack.hxx> -#include <oox/core/contexthandler2.hxx> -#include <boost/scoped_ptr.hpp> -#include <vector> - -namespace oox { namespace drawingml { - -class TextEffectsContext : public oox::core::ContextHandler2 -{ -public: - TextEffectsContext(oox::core::ContextHandler2Helper& rParent, - sal_Int32 aElementToken, - std::vector<css::beans::PropertyValue>& rTextEffectsProperties); - virtual ~TextEffectsContext(); - - virtual void onStartElement(const oox::AttributeList& rAttribs) SAL_OVERRIDE; - virtual void onEndElement() SAL_OVERRIDE; - - virtual oox::core::ContextHandlerRef onCreateContext(sal_Int32 Element, const oox::AttributeList& rAttribs) SAL_OVERRIDE; - -protected: - std::vector<css::beans::PropertyValue>& mrTextEffectsProperties; - boost::scoped_ptr<oox::GrabBagStack> mpGrabBagStack; - sal_Int32 mnCurrentElement; - -private: - void processAttributes(const AttributeList& rAttribs); - void pushAttributeToGrabBag (const sal_Int32& aAttributeId, const OUString& rElementName, const AttributeList& rAttribs); -}; - -} } - -#endif // INCLUDED_OOX_DRAWINGML_TEXTEFFECTSCONTEXT_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/oox/drawingml/textfield.hxx b/include/oox/drawingml/textfield.hxx deleted file mode 100644 index f1444e6e8c88..000000000000 --- a/include/oox/drawingml/textfield.hxx +++ /dev/null @@ -1,63 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_OOX_DRAWINGML_TEXTFIELD_HXX -#define INCLUDED_OOX_DRAWINGML_TEXTFIELD_HXX - -#include <boost/shared_ptr.hpp> - -#include <oox/drawingml/textrun.hxx> -#include <oox/drawingml/textparagraphproperties.hxx> - -namespace oox { namespace drawingml { - -struct TextCharacterProperties; - -class TextField - : public TextRun -{ -public: - TextField(); - - TextParagraphProperties& getTextParagraphProperties() { return maTextParagraphProperties; } - const TextParagraphProperties& getTextParagraphProperties() const { return maTextParagraphProperties; } - - void setType( const OUString& sType ) { msType = sType; } - void setUuid( const OUString & sUuid ) { msUuid = sUuid; } - - virtual sal_Int32 insertAt( - const ::oox::core::XmlFilterBase& rFilterBase, - 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; - -private: - TextParagraphProperties maTextParagraphProperties; - OUString msType; - OUString msUuid; -}; - -typedef boost::shared_ptr< TextField > TextFieldPtr; - -} } - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/oox/drawingml/textfieldcontext.hxx b/include/oox/drawingml/textfieldcontext.hxx deleted file mode 100644 index 425122497c57..000000000000 --- a/include/oox/drawingml/textfieldcontext.hxx +++ /dev/null @@ -1,50 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_OOX_DRAWINGML_TEXTFIELDCONTEXT_HXX -#define INCLUDED_OOX_DRAWINGML_TEXTFIELDCONTEXT_HXX - -#include <oox/core/contexthandler2.hxx> - -namespace oox { namespace drawingml { - -class TextField; - -class TextFieldContext - : public ::oox::core::ContextHandler2 -{ -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 ::oox::core::ContextHandlerRef onCreateContext( - sal_Int32 aElementToken, const ::oox::AttributeList& rAttributes ) SAL_OVERRIDE; - -private: - TextField& mrTextField; - bool mbIsInText; -}; - -} } - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/oox/drawingml/textfont.hxx b/include/oox/drawingml/textfont.hxx deleted file mode 100644 index bb6ae6d2af82..000000000000 --- a/include/oox/drawingml/textfont.hxx +++ /dev/null @@ -1,76 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_OOX_DRAWINGML_TEXTFONT_HXX -#define INCLUDED_OOX_DRAWINGML_TEXTFONT_HXX - -#include <rtl/ustring.hxx> - -namespace oox { class AttributeList; } -namespace oox { namespace core { class XmlFilterBase; } } - -namespace oox { -namespace drawingml { - - - -/** carries a CT_TextFont*/ -class TextFont -{ -public: - explicit TextFont(); - - /** Sets attributes from the passed attribute list. */ - void setAttributes( const AttributeList& rAttribs ); - - /** Sets font name and init other attributes. */ - void setAttributes( const OUString& rFontName ); - - /** Overwrites this text font with the passed text font, if it is used. */ - void assignIfUsed( const TextFont& rTextFont ); - - /** Returns the font name, pitch, and family; tries to resolve theme - placeholder names, e.g. '+mj-lt' for the major latin theme font. */ - bool getFontData( - OUString& rFontName, - sal_Int16& rnFontPitch, - sal_Int16& rnFontFamily, - const ::oox::core::XmlFilterBase& rFilter ) const; - -private: - bool implGetFontData( - OUString& rFontName, - sal_Int16& rnFontPitch, - sal_Int16& rnFontFamily ) const; - -private: - OUString maTypeface; - OUString maPanose; - sal_Int32 mnPitch; - sal_Int32 mnCharset; -}; - - - -} // namespace drawingml -} // namespace oox - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/oox/drawingml/textliststyle.hxx b/include/oox/drawingml/textliststyle.hxx deleted file mode 100644 index d73734fde27c..000000000000 --- a/include/oox/drawingml/textliststyle.hxx +++ /dev/null @@ -1,64 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_OOX_DRAWINGML_TEXTLISTSTYLE_HXX -#define INCLUDED_OOX_DRAWINGML_TEXTLISTSTYLE_HXX - -#include <oox/drawingml/textparagraphproperties.hxx> -#include <oox/helper/refvector.hxx> - -namespace oox { namespace drawingml { - -typedef RefVector< TextParagraphProperties > TextParagraphPropertiesVector; - -class TextListStyle -{ -public: - - TextListStyle(); - ~TextListStyle(); - - TextListStyle(const TextListStyle& rStyle); - TextListStyle& operator=(const TextListStyle& rStyle); - - void apply( const TextListStyle& rTextListStyle ); - - const TextParagraphPropertiesVector& getListStyle() const { return maListStyle; }; - TextParagraphPropertiesVector& getListStyle() { return maListStyle; }; - - const TextParagraphPropertiesVector& getAggregationListStyle() const { return maAggregationListStyle; }; - TextParagraphPropertiesVector& getAggregationListStyle() { return maAggregationListStyle; }; - -#if defined(DBG_UTIL) && OSL_DEBUG_LEVEL > 1 - void dump() const; -#endif - -protected: - - TextParagraphPropertiesVector maListStyle; - TextParagraphPropertiesVector maAggregationListStyle; -}; - -typedef boost::shared_ptr< TextListStyle > TextListStylePtr; - -} } - -#endif // INCLUDED_OOX_DRAWINGML_TEXTLISTSTYLE_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/oox/drawingml/textliststylecontext.hxx b/include/oox/drawingml/textliststylecontext.hxx deleted file mode 100644 index 2e9900830500..000000000000 --- a/include/oox/drawingml/textliststylecontext.hxx +++ /dev/null @@ -1,44 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_OOX_DRAWINGML_TEXTLISTSTYLECONTEXT_HXX -#define INCLUDED_OOX_DRAWINGML_TEXTLISTSTYLECONTEXT_HXX - -#include <oox/drawingml/textliststyle.hxx> -#include <oox/core/contexthandler2.hxx> - -namespace oox { namespace drawingml { - -class TextListStyleContext : public ::oox::core::ContextHandler2 -{ -public: - TextListStyleContext( ::oox::core::ContextHandler2Helper& rParent, TextListStyle& rTextListStyle ); - virtual ~TextListStyleContext(); - - virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; - -protected: - TextListStyle& mrTextListStyle; -}; - -} } - -#endif // INCLUDED_OOX_DRAWINGML_TEXTLISTSTYLECONTEXT_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/oox/drawingml/textparagraph.hxx b/include/oox/drawingml/textparagraph.hxx deleted file mode 100644 index f100458ab07c..000000000000 --- a/include/oox/drawingml/textparagraph.hxx +++ /dev/null @@ -1,72 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_OOX_DRAWINGML_TEXTPARAGRAPH_HXX -#define INCLUDED_OOX_DRAWINGML_TEXTPARAGRAPH_HXX - -#include <com/sun/star/text/XTextCursor.hpp> -#include <com/sun/star/text/XText.hpp> - -#include <oox/core/xmlfilterbase.hxx> -#include <oox/drawingml/textrun.hxx> -#include <oox/drawingml/textliststyle.hxx> -#include <oox/drawingml/textparagraphproperties.hxx> - -namespace oox { namespace drawingml { - -typedef RefVector< TextRun > TextRunVector; - -class TextParagraph -{ -public: - TextParagraph(); - ~TextParagraph(); - - TextRunVector& getRuns() { return maRuns; } - const TextRunVector& getRuns() const { return maRuns; } - void addRun( const TextRunPtr & pRun ) { maRuns.push_back( pRun ); } - - TextParagraphProperties& getProperties() { return maProperties; } - const TextParagraphProperties& getProperties() const { return maProperties; } - - TextCharacterProperties& getEndProperties() { return maEndProperties; } - const TextCharacterProperties& getEndProperties() const { return maEndProperties; } - - void insertAt( - const ::oox::core::XmlFilterBase& rFilterBase, - 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& rTextStyleProperties, - const TextListStyle& rTextListStyle, - bool bFirst = false, - float nDefaultCharHeight = 0) const; - -private: - TextParagraphProperties maProperties; - TextCharacterProperties maEndProperties; - TextRunVector maRuns; -}; - -typedef boost::shared_ptr< TextParagraph > TextParagraphPtr; - -} } - -#endif // INCLUDED_OOX_DRAWINGML_TEXTPARAGRAPH_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/oox/drawingml/textparagraphproperties.hxx b/include/oox/drawingml/textparagraphproperties.hxx deleted file mode 100644 index 14f56268a0d5..000000000000 --- a/include/oox/drawingml/textparagraphproperties.hxx +++ /dev/null @@ -1,132 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_OOX_DRAWINGML_TEXTPARAGRAPHPROPERTIES_HXX -#define INCLUDED_OOX_DRAWINGML_TEXTPARAGRAPHPROPERTIES_HXX - -#include <com/sun/star/beans/XPropertySet.hpp> -#include <oox/drawingml/fillpropertiesgroupcontext.hxx> -#include <oox/drawingml/textcharacterproperties.hxx> -#include <com/sun/star/style/NumberingType.hpp> -#include <oox/drawingml/textfont.hxx> -#include <oox/drawingml/textspacing.hxx> -#include <boost/optional.hpp> - -namespace com { namespace sun { namespace star { - namespace graphic { class XGraphic; } -} } } - -namespace oox { namespace drawingml { - -class TextParagraphProperties; - -typedef boost::shared_ptr< TextParagraphProperties > TextParagraphPropertiesPtr; - -class BulletList -{ -public: - BulletList( ); - bool is() const; - void apply( const BulletList& ); - void pushToPropMap( const ::oox::core::XmlFilterBase* pFilterBase, PropertyMap& xPropMap ) const; - void setBulletChar( const OUString & sChar ); - void setStartAt( sal_Int32 nStartAt ){ mnStartAt <<= static_cast< sal_Int16 >( nStartAt ); } - void setType( sal_Int32 nType ); - void setNone( ); - void setSuffixParenBoth(); - void setSuffixParenRight(); - void setSuffixPeriod(); - void setSuffixNone(); - void setSuffixMinusRight(); - void setBulletSize(sal_Int16 nSize); - void setFontSize(sal_Int16 nSize); - void setStyleName( const OUString& rStyleName ) { maStyleName <<= rStyleName; } - void setGraphic( ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& rXGraphic ); - - ::oox::drawingml::ColorPtr maBulletColorPtr; - ::com::sun::star::uno::Any mbBulletColorFollowText; - ::com::sun::star::uno::Any mbBulletFontFollowText; - ::oox::drawingml::TextFont maBulletFont; - ::com::sun::star::uno::Any msBulletChar; - ::com::sun::star::uno::Any mnStartAt; - ::com::sun::star::uno::Any mnNumberingType; - ::com::sun::star::uno::Any msNumberingPrefix; - ::com::sun::star::uno::Any msNumberingSuffix; - ::com::sun::star::uno::Any mnSize; - ::com::sun::star::uno::Any mnFontSize; - ::com::sun::star::uno::Any maStyleName; - ::com::sun::star::uno::Any maGraphic; - boost::optional< float > maFollowFontSize; -}; - -class TextParagraphProperties -{ -public: - - TextParagraphProperties(); - ~TextParagraphProperties(); - - void setLevel( sal_Int16 nLevel ) { mnLevel = nLevel; } - sal_Int16 getLevel( ) const { return mnLevel; } - PropertyMap& getTextParagraphPropertyMap() { return maTextParagraphPropertyMap; } - BulletList& getBulletList() { return maBulletList; } - TextCharacterProperties& getTextCharacterProperties() { return maTextCharacterProperties; } - const TextCharacterProperties& getTextCharacterProperties() const { return maTextCharacterProperties; } - - TextSpacing& getParaTopMargin() { return maParaTopMargin; } - TextSpacing& getParaBottomMargin() { return maParaBottomMargin; } - boost::optional< sal_Int32 >& getParaLeftMargin(){ return moParaLeftMargin; } - boost::optional< sal_Int32 >& getFirstLineIndentation(){ return moFirstLineIndentation; } - - boost::optional< sal_Int16 >& getParaAdjust() { return moParaAdjust; } - void setParaAdjust( sal_Int16 nParaAdjust ) { moParaAdjust = nParaAdjust; } - - void apply( const TextParagraphProperties& rSourceProps ); - void pushToPropSet( const ::oox::core::XmlFilterBase* pFilterBase, - const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > & xPropSet, - PropertyMap& rioBulletList, const BulletList* pMasterBuList, bool bApplyBulletList, float fFontSize, bool bPushDefaultValues = false ) const; - void pushToPropSet( const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > & xPropSet) const; - - /** Returns the largest character size of this paragraph. If possible the - masterstyle should have been applied before, otherwise the character - size can be zero and the default value is returned. */ - float getCharHeightPoints( float fDefault ) const; - -#ifdef DBG_UTIL - void dump() const; -#endif - -protected: - - TextCharacterProperties maTextCharacterProperties; - PropertyMap maTextParagraphPropertyMap; - BulletList maBulletList; - TextSpacing maParaTopMargin; - TextSpacing maParaBottomMargin; - boost::optional< sal_Int32 > moParaLeftMargin; - boost::optional< sal_Int32 > moFirstLineIndentation; - boost::optional< sal_Int16 > moParaAdjust; - sal_Int16 mnLevel; -}; - -} } - -#endif // INCLUDED_OOX_DRAWINGML_TEXTPARAGRAPHPROPERTIES_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/oox/drawingml/textparagraphpropertiescontext.hxx b/include/oox/drawingml/textparagraphpropertiescontext.hxx deleted file mode 100644 index b2b124daf7a3..000000000000 --- a/include/oox/drawingml/textparagraphpropertiescontext.hxx +++ /dev/null @@ -1,55 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_OOX_DRAWINGML_TEXTPARAGRAPHPROPERTIESCONTEXT_HXX -#define INCLUDED_OOX_DRAWINGML_TEXTPARAGRAPHPROPERTIESCONTEXT_HXX - -#include <list> - -#include <com/sun/star/style/TabStop.hpp> -#include <oox/drawingml/drawingmltypes.hxx> -#include <oox/drawingml/textparagraphproperties.hxx> -#include <oox/drawingml/textspacing.hxx> -#include <oox/core/contexthandler2.hxx> - -namespace oox { namespace drawingml { - -class TextParagraphPropertiesContext : public ::oox::core::ContextHandler2 -{ -public: - TextParagraphPropertiesContext( ::oox::core::ContextHandler2Helper& rParent, - const ::oox::AttributeList& rAttributes, - TextParagraphProperties& rTextParagraphProperties ); - virtual ~TextParagraphPropertiesContext(); - - virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; - -protected: - TextParagraphProperties& mrTextParagraphProperties; - TextSpacing maLineSpacing; - BulletList& mrBulletList; - ::std::list< ::com::sun::star::style::TabStop > maTabList; - ::boost::shared_ptr< BlipFillProperties > mxBlipProps; -}; - -} } - -#endif // INCLUDED_OOX_DRAWINGML_TEXTPARAGRAPHPROPERTIESCONTEXT_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/oox/drawingml/textrun.hxx b/include/oox/drawingml/textrun.hxx deleted file mode 100644 index 5fec1a316db5..000000000000 --- a/include/oox/drawingml/textrun.hxx +++ /dev/null @@ -1,63 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_OOX_DRAWINGML_TEXTRUN_HXX -#define INCLUDED_OOX_DRAWINGML_TEXTRUN_HXX - -#include <com/sun/star/text/XTextCursor.hpp> -#include <com/sun/star/text/XText.hpp> -#include <com/sun/star/frame/XModel.hpp> -#include <oox/drawingml/textcharacterproperties.hxx> - -namespace oox { namespace drawingml { - -class TextRun -{ -public: - TextRun(); - virtual ~TextRun(); - - OUString& getText() { return msText; } - const OUString& getText() const { return msText; } - - TextCharacterProperties& getTextCharacterProperties() { return maTextCharacterProperties; } - const TextCharacterProperties& getTextCharacterProperties() const { return maTextCharacterProperties; } - - void setLineBreak() { mbIsLineBreak = true; } - - virtual sal_Int32 insertAt( - const ::oox::core::XmlFilterBase& rFilterBase, - 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; - -private: - OUString msText; - TextCharacterProperties maTextCharacterProperties; - bool mbIsLineBreak; -}; - -typedef boost::shared_ptr< TextRun > TextRunPtr; - -} } - -#endif // INCLUDED_OOX_DRAWINGML_TEXTRUN_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/oox/drawingml/textspacing.hxx b/include/oox/drawingml/textspacing.hxx deleted file mode 100644 index 4c859d706057..000000000000 --- a/include/oox/drawingml/textspacing.hxx +++ /dev/null @@ -1,70 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_OOX_DRAWINGML_TEXTSPACING_HXX -#define INCLUDED_OOX_DRAWINGML_TEXTSPACING_HXX - -#include <rtl/ustring.hxx> - -#include <com/sun/star/style/LineSpacing.hpp> -#include <com/sun/star/style/LineSpacingMode.hpp> -#include <oox/drawingml/drawingmltypes.hxx> - -namespace oox { namespace drawingml { - - - /** carries a CT_TextSpacing */ - class TextSpacing - { - public: - enum { - POINTS = 0, - PERCENT - }; - TextSpacing() - : nUnit( POINTS ), nValue( 0 ), bHasValue( false ) - { - } - TextSpacing( sal_Int32 nPoints ) : nUnit( POINTS ), nValue( nPoints ), bHasValue( true ){}; - ::com::sun::star::style::LineSpacing toLineSpacing() const - { - ::com::sun::star::style::LineSpacing aSpacing; - aSpacing.Mode = ( nUnit == PERCENT - ? ::com::sun::star::style::LineSpacingMode::PROP - : ::com::sun::star::style::LineSpacingMode::MINIMUM ); - aSpacing.Height = static_cast< sal_Int16 >( nUnit == PERCENT ? nValue / 1000 : nValue ); - return aSpacing; - } - sal_Int32 toMargin( float fFontSize ) const - { - if ( nUnit == PERCENT ) - return GetTextSpacingPoint(static_cast<sal_Int32>((fFontSize*nValue)/1000)); - else - return nValue; - } - sal_Int32 nUnit; - sal_Int32 nValue; - bool bHasValue; - }; - -} } - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/oox/drawingml/theme.hxx b/include/oox/drawingml/theme.hxx index d0c18100d734..965124cbcd78 100644 --- a/include/oox/drawingml/theme.hxx +++ b/include/oox/drawingml/theme.hxx @@ -22,7 +22,7 @@ #include <oox/drawingml/clrscheme.hxx> #include <oox/drawingml/shape.hxx> -#include <oox/drawingml/textfont.hxx> +#include <oox/helper/refvector.hxx> #include <com/sun/star/xml/dom/XDocument.hpp> #include <oox/dllapi.h> @@ -40,7 +40,7 @@ typedef RefVector< LineProperties > LineStyleList; typedef RefVector< EffectProperties > EffectStyleList; typedef RefMap< sal_Int32, TextCharacterProperties > FontScheme; - +class TextFont; class OOX_DLLPUBLIC Theme { diff --git a/include/oox/drawingml/themeelementscontext.hxx b/include/oox/drawingml/themeelementscontext.hxx deleted file mode 100644 index 47acdc9a6290..000000000000 --- a/include/oox/drawingml/themeelementscontext.hxx +++ /dev/null @@ -1,46 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_OOX_DRAWINGML_THEMEELEMENTSCONTEXT_HXX -#define INCLUDED_OOX_DRAWINGML_THEMEELEMENTSCONTEXT_HXX - -#include <oox/core/contexthandler2.hxx> - -namespace oox { -namespace drawingml { - -class Theme; - -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; - -private: - Theme& mrTheme; -}; - -} // namespace drawingml -} // namespace oox - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/oox/drawingml/transform2dcontext.hxx b/include/oox/drawingml/transform2dcontext.hxx deleted file mode 100644 index dfe49cb0fc08..000000000000 --- a/include/oox/drawingml/transform2dcontext.hxx +++ /dev/null @@ -1,48 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_OOX_DRAWINGML_TRANSFORM2DCONTEXT_HXX -#define INCLUDED_OOX_DRAWINGML_TRANSFORM2DCONTEXT_HXX - -#include <oox/core/contexthandler2.hxx> - -namespace oox { -namespace drawingml { - -class Shape; - -/** context to import a CT_Transform2D */ -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; - -protected: - Shape& mrShape; - bool mbtxXfrm; -}; - -} // namespace drawingml -} // namespace oox - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/oox/ppt/pptshapepropertiescontext.hxx b/include/oox/ppt/pptshapepropertiescontext.hxx index d3094432ef52..4184357299cc 100644 --- a/include/oox/ppt/pptshapepropertiescontext.hxx +++ b/include/oox/ppt/pptshapepropertiescontext.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_OOX_PPT_PPTSHAPEPROPERTIESCONTEXT_HXX #define INCLUDED_OOX_PPT_PPTSHAPEPROPERTIESCONTEXT_HXX -#include <oox/drawingml/shapepropertiescontext.hxx> +#include <drawingml/shapepropertiescontext.hxx> namespace oox { namespace ppt { diff --git a/include/oox/ppt/presentationfragmenthandler.hxx b/include/oox/ppt/presentationfragmenthandler.hxx index 653249e6f783..998d0c0d8f4a 100644 --- a/include/oox/ppt/presentationfragmenthandler.hxx +++ b/include/oox/ppt/presentationfragmenthandler.hxx @@ -22,7 +22,6 @@ #include <com/sun/star/drawing/XDrawPage.hpp> #include <com/sun/star/awt/Size.hpp> -#include <oox/drawingml/textliststyle.hxx> #include <oox/ppt/slidepersist.hxx> #include <oox/core/contexthandler.hxx> #include <oox/core/fragmenthandler.hxx> diff --git a/include/oox/ppt/slidepersist.hxx b/include/oox/ppt/slidepersist.hxx index 7eb4706e4684..1a3f473b619b 100644 --- a/include/oox/ppt/slidepersist.hxx +++ b/include/oox/ppt/slidepersist.hxx @@ -24,8 +24,6 @@ #include <oox/drawingml/shape.hxx> #include <oox/drawingml/theme.hxx> #include <oox/drawingml/clrscheme.hxx> -#include <oox/drawingml/textliststyle.hxx> -#include <oox/drawingml/textparagraphproperties.hxx> #include <oox/ppt/headerfooter.hxx> #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/drawing/XDrawPage.hpp> |