include/oox/drawingml/ThemeOverrideFragmentHandler.hxx | 40 -- include/oox/drawingml/clrschemecontext.hxx | 62 --- include/oox/drawingml/colorchoicecontext.hxx | 77 --- include/oox/drawingml/customshapegeometry.hxx | 71 --- include/oox/drawingml/customshapeproperties.hxx | 169 -------- include/oox/drawingml/drawingmltypes.hxx | 3 include/oox/drawingml/embeddedwavaudiofile.hxx | 51 -- include/oox/drawingml/fillproperties.hxx | 18 include/oox/drawingml/fillpropertiesgroupcontext.hxx | 253 ------------- include/oox/drawingml/guidcontext.hxx | 41 -- include/oox/drawingml/linepropertiescontext.hxx | 51 -- include/oox/drawingml/objectdefaultcontext.hxx | 43 -- include/oox/drawingml/scene3dcontext.hxx | 67 --- include/oox/drawingml/shape.hxx | 5 include/oox/drawingml/shape3dproperties.hxx | 98 ----- include/oox/drawingml/shapecontext.hxx | 1 include/oox/drawingml/shapepropertiescontext.hxx | 43 -- include/oox/drawingml/shapestylecontext.hxx | 44 -- include/oox/drawingml/spdefcontext.hxx | 42 -- include/oox/drawingml/textbody.hxx | 73 --- include/oox/drawingml/textbodycontext.hxx | 62 --- include/oox/drawingml/textbodyproperties.hxx | 59 --- include/oox/drawingml/textbodypropertiescontext.hxx | 46 -- include/oox/drawingml/textcharacterproperties.hxx | 92 ---- include/oox/drawingml/textcharacterpropertiescontext.hxx | 47 -- include/oox/drawingml/texteffectscontext.hxx | 50 -- include/oox/drawingml/textfield.hxx | 63 --- include/oox/drawingml/textfieldcontext.hxx | 50 -- include/oox/drawingml/textfont.hxx | 76 --- include/oox/drawingml/textliststyle.hxx | 64 --- include/oox/drawingml/textliststylecontext.hxx | 44 -- include/oox/drawingml/textparagraph.hxx | 72 --- include/oox/drawingml/textparagraphproperties.hxx | 132 ------ include/oox/drawingml/textparagraphpropertiescontext.hxx | 55 -- include/oox/drawingml/textrun.hxx | 63 --- include/oox/drawingml/textspacing.hxx | 70 --- include/oox/drawingml/theme.hxx | 4 include/oox/drawingml/themeelementscontext.hxx | 46 -- include/oox/drawingml/transform2dcontext.hxx | 48 -- include/oox/ppt/pptshapepropertiescontext.hxx | 2 include/oox/ppt/presentationfragmenthandler.hxx | 1 include/oox/ppt/slidepersist.hxx | 2 oox/inc/drawingml/ThemeOverrideFragmentHandler.hxx | 40 ++ oox/inc/drawingml/chart/axismodel.hxx | 1 oox/inc/drawingml/clrschemecontext.hxx | 62 +++ oox/inc/drawingml/colorchoicecontext.hxx | 77 +++ oox/inc/drawingml/customshapegeometry.hxx | 71 +++ oox/inc/drawingml/customshapeproperties.hxx | 169 ++++++++ oox/inc/drawingml/embeddedwavaudiofile.hxx | 39 ++ oox/inc/drawingml/fillpropertiesgroupcontext.hxx | 253 +++++++++++++ oox/inc/drawingml/graphicproperties.hxx | 56 ++ oox/inc/drawingml/guidcontext.hxx | 41 ++ oox/inc/drawingml/linepropertiescontext.hxx | 50 ++ oox/inc/drawingml/objectdefaultcontext.hxx | 43 ++ oox/inc/drawingml/scene3dcontext.hxx | 67 +++ oox/inc/drawingml/shape3dproperties.hxx | 98 +++++ oox/inc/drawingml/shapepropertiescontext.hxx | 43 ++ oox/inc/drawingml/shapestylecontext.hxx | 44 ++ oox/inc/drawingml/spdefcontext.hxx | 42 ++ oox/inc/drawingml/table/tablecell.hxx | 2 oox/inc/drawingml/table/tablestylepart.hxx | 2 oox/inc/drawingml/table/tablestyletextstylecontext.hxx | 2 oox/inc/drawingml/textbody.hxx | 73 +++ oox/inc/drawingml/textbodycontext.hxx | 62 +++ oox/inc/drawingml/textbodyproperties.hxx | 59 +++ oox/inc/drawingml/textbodypropertiescontext.hxx | 46 ++ oox/inc/drawingml/textcharacterproperties.hxx | 92 ++++ oox/inc/drawingml/textcharacterpropertiescontext.hxx | 47 ++ oox/inc/drawingml/texteffectscontext.hxx | 50 ++ oox/inc/drawingml/textfield.hxx | 63 +++ oox/inc/drawingml/textfieldcontext.hxx | 50 ++ oox/inc/drawingml/textfont.hxx | 76 +++ oox/inc/drawingml/textliststyle.hxx | 62 +++ oox/inc/drawingml/textliststylecontext.hxx | 44 ++ oox/inc/drawingml/textparagraph.hxx | 72 +++ oox/inc/drawingml/textparagraphproperties.hxx | 132 ++++++ oox/inc/drawingml/textparagraphpropertiescontext.hxx | 55 ++ oox/inc/drawingml/textrun.hxx | 63 +++ oox/inc/drawingml/textspacing.hxx | 70 +++ oox/inc/drawingml/themeelementscontext.hxx | 46 ++ oox/inc/drawingml/transform2dcontext.hxx | 48 ++ oox/source/drawingml/ThemeOverrideFragmentHandler.cxx | 4 oox/source/drawingml/chart/axiscontext.cxx | 4 oox/source/drawingml/chart/chartcontextbase.cxx | 2 oox/source/drawingml/chart/chartspacefragment.cxx | 4 oox/source/drawingml/chart/chartspacemodel.cxx | 1 oox/source/drawingml/chart/objectformatter.cxx | 4 oox/source/drawingml/chart/plotareacontext.cxx | 2 oox/source/drawingml/chart/seriescontext.cxx | 4 oox/source/drawingml/chart/seriesmodel.cxx | 1 oox/source/drawingml/chart/titlecontext.cxx | 4 oox/source/drawingml/chart/titleconverter.cxx | 4 oox/source/drawingml/chart/titlemodel.cxx | 1 oox/source/drawingml/chart/typegroupmodel.cxx | 1 oox/source/drawingml/clrschemecontext.cxx | 2 oox/source/drawingml/colorchoicecontext.cxx | 2 oox/source/drawingml/connectorshapecontext.cxx | 4 oox/source/drawingml/customshapegeometry.cxx | 3 oox/source/drawingml/customshapepresetdata.cxx | 2 oox/source/drawingml/customshapeproperties.cxx | 2 oox/source/drawingml/diagram/datamodelcontext.cxx | 6 oox/source/drawingml/diagram/diagram.cxx | 6 oox/source/drawingml/diagram/diagram.hxx | 1 oox/source/drawingml/diagram/diagramfragmenthandler.cxx | 2 oox/source/drawingml/diagram/diagramlayoutatoms.cxx | 8 oox/source/drawingml/diagram/layoutnodecontext.cxx | 2 oox/source/drawingml/effectpropertiescontext.cxx | 2 oox/source/drawingml/embeddedwavaudiofile.cxx | 23 - oox/source/drawingml/fillproperties.cxx | 8 oox/source/drawingml/fillpropertiesgroupcontext.cxx | 2 oox/source/drawingml/graphicshapecontext.cxx | 51 +- oox/source/drawingml/guidcontext.cxx | 2 oox/source/drawingml/hyperlinkcontext.cxx | 7 oox/source/drawingml/linepropertiescontext.cxx | 4 oox/source/drawingml/objectdefaultcontext.cxx | 4 oox/source/drawingml/scene3dcontext.cxx | 4 oox/source/drawingml/shape.cxx | 10 oox/source/drawingml/shape3dproperties.cxx | 2 oox/source/drawingml/shapecontext.cxx | 11 oox/source/drawingml/shapegroupcontext.cxx | 5 oox/source/drawingml/shapepropertiescontext.cxx | 12 oox/source/drawingml/shapestylecontext.cxx | 4 oox/source/drawingml/spdefcontext.cxx | 10 oox/source/drawingml/table/tablebackgroundstylecontext.cxx | 2 oox/source/drawingml/table/tablecell.cxx | 2 oox/source/drawingml/table/tablecellcontext.cxx | 6 oox/source/drawingml/table/tablecontext.cxx | 2 oox/source/drawingml/table/tablestylecellstylecontext.cxx | 4 oox/source/drawingml/table/tablestyletextstylecontext.cxx | 2 oox/source/drawingml/textbody.cxx | 4 oox/source/drawingml/textbodycontext.cxx | 16 oox/source/drawingml/textbodyproperties.cxx | 2 oox/source/drawingml/textbodypropertiescontext.cxx | 4 oox/source/drawingml/textcharacterproperties.cxx | 2 oox/source/drawingml/textcharacterpropertiescontext.cxx | 8 oox/source/drawingml/texteffectscontext.cxx | 2 oox/source/drawingml/textfield.cxx | 6 oox/source/drawingml/textfieldcontext.cxx | 8 oox/source/drawingml/textfont.cxx | 2 oox/source/drawingml/textliststyle.cxx | 2 oox/source/drawingml/textliststylecontext.cxx | 4 oox/source/drawingml/textparagraph.cxx | 4 oox/source/drawingml/textparagraphproperties.cxx | 2 oox/source/drawingml/textparagraphpropertiescontext.cxx | 6 oox/source/drawingml/textrun.cxx | 2 oox/source/drawingml/textspacingcontext.cxx | 2 oox/source/drawingml/theme.cxx | 2 oox/source/drawingml/themeelementscontext.cxx | 9 oox/source/drawingml/themefragmenthandler.cxx | 4 oox/source/drawingml/transform2dcontext.cxx | 5 oox/source/ppt/animvariantcontext.cxx | 2 oox/source/ppt/backgroundproperties.cxx | 2 oox/source/ppt/dgmlayout.cxx | 1 oox/source/ppt/pptgraphicshapecontext.cxx | 8 oox/source/ppt/pptshape.cxx | 2 oox/source/ppt/pptshapecontext.cxx | 10 oox/source/ppt/pptshapegroupcontext.cxx | 5 oox/source/ppt/pptshapepropertiescontext.cxx | 8 oox/source/ppt/presentationfragmenthandler.cxx | 2 oox/source/ppt/slidefragmenthandler.cxx | 3 oox/source/ppt/slidemastertextstylescontext.cxx | 4 oox/source/ppt/slidepersist.cxx | 3 oox/source/ppt/soundactioncontext.cxx | 7 oox/source/ppt/timenodelistcontext.cxx | 2 oox/source/ppt/timetargetelementcontext.cxx | 8 oox/source/shape/WpgContext.cxx | 2 oox/source/shape/WpsContext.cxx | 8 167 files changed, 2644 insertions(+), 2596 deletions(-)
New commits: commit 24dbe577e539798203d777802cc7027b2edd58c4 Author: Matúš Kukan <[email protected]> Date: Fri Sep 12 16:57:53 2014 +0200 Replace struct EmbeddedWAVAudioFile with simple string. Change-Id: I6659b6e1be865546f380a28e4803fbe593de0803 diff --git a/oox/inc/drawingml/embeddedwavaudiofile.hxx b/oox/inc/drawingml/embeddedwavaudiofile.hxx index c1b1992..d467654 100644 --- a/oox/inc/drawingml/embeddedwavaudiofile.hxx +++ b/oox/inc/drawingml/embeddedwavaudiofile.hxx @@ -21,27 +21,15 @@ #define INCLUDED_OOX_DRAWINGML_EMBEDDEDWAVAUDIOFILE_HXX #include <rtl/ustring.hxx> -#include <com/sun/star/xml/sax/XFastAttributeList.hpp> #include <oox/core/fragmenthandler.hxx> +#include <oox/helper/attributelist.hxx> namespace oox { namespace drawingml { - struct EmbeddedWAVAudioFile - { - EmbeddedWAVAudioFile() - : mbBuiltIn(false) - { - } - bool mbBuiltIn; - OUString msName; - OUString msEmbed; - }; - - void getEmbeddedWAVAudioFile( + OUString getEmbeddedWAVAudioFile( const ::oox::core::Relations& rRelations, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttribs, - EmbeddedWAVAudioFile & aAudio ); + const AttributeList& rAttribs ); } } diff --git a/oox/inc/drawingml/graphicproperties.hxx b/oox/inc/drawingml/graphicproperties.hxx index 626fe5f..27644cd 100644 --- a/oox/inc/drawingml/graphicproperties.hxx +++ b/oox/inc/drawingml/graphicproperties.hxx @@ -24,7 +24,6 @@ #include <oox/drawingml/fillproperties.hxx> #include <oox/helper/helper.hxx> -#include <drawingml/embeddedwavaudiofile.hxx> namespace oox { class GraphicHelper; @@ -36,8 +35,8 @@ namespace drawingml { struct GraphicProperties { - BlipFillProperties maBlipProps; /// Properties for the graphic. - EmbeddedWAVAudioFile maAudio; /// Audio file details + BlipFillProperties maBlipProps; ///< Properties for the graphic. + OUString msMediaTempFile; ///< Audio/Video temporary file. /** Overwrites all members that are explicitly set in rSourceProps. */ void assignUsed( const GraphicProperties& rSourceProps ); diff --git a/oox/source/drawingml/embeddedwavaudiofile.cxx b/oox/source/drawingml/embeddedwavaudiofile.cxx index c15bc7c..7ed371e 100644 --- a/oox/source/drawingml/embeddedwavaudiofile.cxx +++ b/oox/source/drawingml/embeddedwavaudiofile.cxx @@ -20,23 +20,16 @@ #include "drawingml/embeddedwavaudiofile.hxx" #include "oox/helper/attributelist.hxx" -using namespace ::oox::core; -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::xml::sax; - namespace oox { namespace drawingml { // CT_EmbeddedWAVAudioFile - void getEmbeddedWAVAudioFile( const Relations& rRelations, - const Reference< XFastAttributeList >& xAttribs, EmbeddedWAVAudioFile & aAudio ) - { - AttributeList attribs(xAttribs); - - OUString sId = xAttribs->getOptionalValue( R_TOKEN( embed ) ); - aAudio.msEmbed = rRelations.getFragmentPathFromRelId( sId ); - aAudio.mbBuiltIn = attribs.getBool( XML_builtIn, false ); - aAudio.msName = xAttribs->getOptionalValue( XML_name ); - } +OUString getEmbeddedWAVAudioFile( const core::Relations& rRelations, const AttributeList& rAttribs ) +{ + if (rAttribs.getBool( XML_builtIn, false )) + return rAttribs.getString( XML_name ).get(); + else + return rRelations.getFragmentPathFromRelId( rAttribs.getString( R_TOKEN(embed) ).get() ); +} } } diff --git a/oox/source/drawingml/fillproperties.cxx b/oox/source/drawingml/fillproperties.cxx index 109fc23..80e2c25 100644 --- a/oox/source/drawingml/fillproperties.cxx +++ b/oox/source/drawingml/fillproperties.cxx @@ -34,6 +34,7 @@ #include <com/sun/star/drawing/Hatch.hpp> #include <com/sun/star/drawing/RectanglePoint.hpp> #include <com/sun/star/graphic/XGraphicTransformer.hpp> +#include <oox/core/fragmenthandler.hxx> #include "oox/helper/graphichelper.hxx" #include "oox/drawingml/drawingmltypes.hxx" #include "oox/drawingml/shapepropertymap.hxx" @@ -752,8 +753,8 @@ void GraphicProperties::pushToPropMap( PropertyMap& rPropMap, const GraphicHelpe rPropMap.setProperty(PROP_AdjustContrast, nContrast); // Media content - if( !maAudio.msEmbed.isEmpty() ) - rPropMap.setProperty(PROP_MediaURL, maAudio.msEmbed); + if( !msMediaTempFile.isEmpty() ) + rPropMap.setProperty(PROP_MediaURL, msMediaTempFile); } bool ArtisticEffectProperties::isEmpty() const diff --git a/oox/source/drawingml/graphicshapecontext.cxx b/oox/source/drawingml/graphicshapecontext.cxx index f23ee1f..a2eac16 100644 --- a/oox/source/drawingml/graphicshapecontext.cxx +++ b/oox/source/drawingml/graphicshapecontext.cxx @@ -19,8 +19,10 @@ #include <com/sun/star/io/TempFile.hpp> #include "oox/drawingml/graphicshapecontext.hxx" + #include <osl/diagnose.h> +#include <drawingml/embeddedwavaudiofile.hxx> #include "drawingml/fillpropertiesgroupcontext.hxx" #include "drawingml/graphicproperties.hxx" #include "drawingml/customshapeproperties.hxx" @@ -38,7 +40,6 @@ #include "oox/helper/binaryinputstream.hxx" #include "oox/helper/binaryoutputstream.hxx" #include "oox/ppt/pptshapegroupcontext.hxx" -#include <comphelper/processfactory.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::io; @@ -85,9 +86,8 @@ ContextHandlerRef GraphicShapeContext::onCreateContext( sal_Int32 aElementToken, return new BlipFillContext( *this, rAttribs, mpShapePtr->getGraphicProperties().maBlipProps ); case XML_wavAudioFile: { - getEmbeddedWAVAudioFile( getRelations(), rAttribs.getFastAttributeList(), mpShapePtr->getGraphicProperties().maAudio ); - mpShapePtr->getGraphicProperties().maAudio.msEmbed = - lcl_CopyToTempFile( mpShapePtr->getGraphicProperties().maAudio.msEmbed, getFilter() ); + mpShapePtr->getGraphicProperties().msMediaTempFile = + lcl_CopyToTempFile( getEmbeddedWAVAudioFile(getRelations(), rAttribs), getFilter() ); } break; case XML_audioFile: @@ -95,7 +95,7 @@ ContextHandlerRef GraphicShapeContext::onCreateContext( sal_Int32 aElementToken, { OUString rPath = getRelations().getFragmentPathFromRelId( rAttribs.getString(R_TOKEN(link)).get() ); - mpShapePtr->getGraphicProperties().maAudio.msEmbed = + mpShapePtr->getGraphicProperties().msMediaTempFile = lcl_CopyToTempFile( rPath, getFilter() ); } break; diff --git a/oox/source/drawingml/hyperlinkcontext.cxx b/oox/source/drawingml/hyperlinkcontext.cxx index b2774d1..a3e7254 100644 --- a/oox/source/drawingml/hyperlinkcontext.cxx +++ b/oox/source/drawingml/hyperlinkcontext.cxx @@ -150,15 +150,14 @@ HyperLinkContext::~HyperLinkContext() } ContextHandlerRef HyperLinkContext::onCreateContext( - ::sal_Int32 aElement, const AttributeList& rAttribs ) + ::sal_Int32 aElement, const AttributeList& ) { switch( aElement ) { case A_TOKEN( extLst ): return 0; case A_TOKEN( snd ): - EmbeddedWAVAudioFile aAudio; - getEmbeddedWAVAudioFile( getRelations(), rAttribs.getFastAttributeList(), aAudio ); + // TODO use getEmbeddedWAVAudioFile() here break; } diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index 099feb0..dbd2aa7 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -405,7 +405,7 @@ Reference< XShape > Shape::createAndInsert( OUString aServiceName; if( rServiceName == "com.sun.star.drawing.GraphicObjectShape" && - mpGraphicPropertiesPtr && !mpGraphicPropertiesPtr->maAudio.msEmbed.isEmpty() ) + mpGraphicPropertiesPtr && !mpGraphicPropertiesPtr->msMediaTempFile.isEmpty() ) { aServiceName = finalizeServiceName( rFilterBase, "com.sun.star.presentation.MediaShape", aShapeRectHmm ); bIsEmbMedia = true; diff --git a/oox/source/ppt/soundactioncontext.cxx b/oox/source/ppt/soundactioncontext.cxx index 0996fdb..9f1a4c0 100644 --- a/oox/source/ppt/soundactioncontext.cxx +++ b/oox/source/ppt/soundactioncontext.cxx @@ -74,10 +74,7 @@ namespace oox { namespace ppt { case PPT_TOKEN( snd ): if( mbHasStartSound ) { - drawingml::EmbeddedWAVAudioFile aAudio; - drawingml::getEmbeddedWAVAudioFile( getRelations(), rAttribs.getFastAttributeList(), aAudio); - - msSndName = ( aAudio.mbBuiltIn ? aAudio.msName : aAudio.msEmbed ); + msSndName = drawingml::getEmbeddedWAVAudioFile( getRelations(), rAttribs ); } return this; case PPT_TOKEN( endSnd ): diff --git a/oox/source/ppt/timetargetelementcontext.cxx b/oox/source/ppt/timetargetelementcontext.cxx index 230dd89..225ca38 100644 --- a/oox/source/ppt/timetargetelementcontext.cxx +++ b/oox/source/ppt/timetargetelementcontext.cxx @@ -123,11 +123,7 @@ namespace oox { namespace ppt { case PPT_TOKEN( sndTgt ): { mpTarget->mnType = XML_sndTgt; - drawingml::EmbeddedWAVAudioFile aAudio; - drawingml::getEmbeddedWAVAudioFile( getRelations(), rAttribs.getFastAttributeList(), aAudio); - - OUString sSndName = ( aAudio.mbBuiltIn ? aAudio.msName : aAudio.msEmbed ); - mpTarget->msValue = sSndName; + mpTarget->msValue = drawingml::getEmbeddedWAVAudioFile( getRelations(), rAttribs ); break; } case PPT_TOKEN( spTgt ): commit b7006f3c2f8f71f4d4721c6e5cdc122628c756f0 Author: Matúš Kukan <[email protected]> Date: Fri Sep 12 16:08:34 2014 +0200 bnc#591147: OOXML import: Import video file too. Change-Id: Ie9b6c5ff866269e5d7a26d025cb1c0d884ff1134 diff --git a/oox/source/drawingml/graphicshapecontext.cxx b/oox/source/drawingml/graphicshapecontext.cxx index e78a3e2..f23ee1f 100644 --- a/oox/source/drawingml/graphicshapecontext.cxx +++ b/oox/source/drawingml/graphicshapecontext.cxx @@ -48,6 +48,22 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::xml::sax; using namespace ::oox::core; +static OUString lcl_CopyToTempFile(const OUString& rStream, const oox::core::XmlFilterBase& rFilter) +{ + if (rStream.isEmpty()) + return OUString(); + + Reference< XInputStream > xInStrm( rFilter.openInputStream(rStream), UNO_SET_THROW ); + Reference< XTempFile > xTempFile( TempFile::create(rFilter.getComponentContext()) ); + Reference< XOutputStream > xOutStrm( xTempFile->getOutputStream(), UNO_SET_THROW ); + oox::BinaryXOutputStream aOutStrm( xOutStrm, false ); + oox::BinaryXInputStream aInStrm( xInStrm, false ); + aInStrm.copyToStream( aOutStrm ); + + xTempFile->setRemoveFile( false ); + return xTempFile->getUri(); +} + namespace oox { namespace drawingml { @@ -70,19 +86,17 @@ ContextHandlerRef GraphicShapeContext::onCreateContext( sal_Int32 aElementToken, case XML_wavAudioFile: { getEmbeddedWAVAudioFile( getRelations(), rAttribs.getFastAttributeList(), mpShapePtr->getGraphicProperties().maAudio ); - if( !mpShapePtr->getGraphicProperties().maAudio.msEmbed.isEmpty() ) - { - Reference< XComponentContext > xContext = comphelper::getProcessComponentContext(); - Reference< XInputStream > xInStrm( getFilter().openInputStream( mpShapePtr->getGraphicProperties().maAudio.msEmbed ), UNO_SET_THROW ); - Reference< XTempFile > xTempFile( TempFile::create(xContext) ); - Reference< XOutputStream > xOutStrm( xTempFile->getOutputStream(), UNO_SET_THROW ); - BinaryXOutputStream aOutStrm( xOutStrm, false ); - BinaryXInputStream aInStrm( xInStrm, false ); - aInStrm.copyToStream( aOutStrm ); - - xTempFile->setRemoveFile( false ); - mpShapePtr->getGraphicProperties().maAudio.msEmbed = xTempFile->getUri(); - } + mpShapePtr->getGraphicProperties().maAudio.msEmbed = + lcl_CopyToTempFile( mpShapePtr->getGraphicProperties().maAudio.msEmbed, getFilter() ); + } + break; + case XML_audioFile: + case XML_videoFile: + { + OUString rPath = getRelations().getFragmentPathFromRelId( + rAttribs.getString(R_TOKEN(link)).get() ); + mpShapePtr->getGraphicProperties().maAudio.msEmbed = + lcl_CopyToTempFile( rPath, getFilter() ); } break; } commit fce166376335b97bf26bcd895ae785070f393878 Author: Matúš Kukan <[email protected]> Date: Fri Sep 12 11:11:30 2014 +0200 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 diff --git a/include/oox/drawingml/drawingmltypes.hxx b/include/oox/drawingml/drawingmltypes.hxx index 18c9768..433e2b9 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/fillproperties.hxx b/include/oox/drawingml/fillproperties.hxx index 550fd82..815881a 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/shape.hxx b/include/oox/drawingml/shape.hxx index a3bd884..0814299 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/shapecontext.hxx b/include/oox/drawingml/shapecontext.hxx index 7b81f03..b7c17a7 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/theme.hxx b/include/oox/drawingml/theme.hxx index d0c1810..965124c 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/ppt/pptshapepropertiescontext.hxx b/include/oox/ppt/pptshapepropertiescontext.hxx index d309443..4184357 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 653249e..998d0c0 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 7eb4706..1a3f473 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> diff --git a/include/oox/drawingml/ThemeOverrideFragmentHandler.hxx b/oox/inc/drawingml/ThemeOverrideFragmentHandler.hxx similarity index 100% rename from include/oox/drawingml/ThemeOverrideFragmentHandler.hxx rename to oox/inc/drawingml/ThemeOverrideFragmentHandler.hxx diff --git a/oox/inc/drawingml/chart/axismodel.hxx b/oox/inc/drawingml/chart/axismodel.hxx index c4ba8d4..57ecbf4 100644 --- a/oox/inc/drawingml/chart/axismodel.hxx +++ b/oox/inc/drawingml/chart/axismodel.hxx @@ -21,6 +21,7 @@ #define INCLUDED_OOX_DRAWINGML_CHART_AXISMODEL_HXX #include <oox/drawingml/shape.hxx> +#include <oox/token/tokens.hxx> #include <drawingml/chart/titlemodel.hxx> namespace oox { diff --git a/include/oox/drawingml/clrschemecontext.hxx b/oox/inc/drawingml/clrschemecontext.hxx similarity index 97% rename from include/oox/drawingml/clrschemecontext.hxx rename to oox/inc/drawingml/clrschemecontext.hxx index 85ce9ad..38efe30 100644 --- a/include/oox/drawingml/clrschemecontext.hxx +++ b/oox/inc/drawingml/clrschemecontext.hxx @@ -23,7 +23,7 @@ #include <oox/core/contexthandler2.hxx> #include <oox/drawingml/clrscheme.hxx> #include <oox/drawingml/color.hxx> -#include <oox/drawingml/colorchoicecontext.hxx> +#include <drawingml/colorchoicecontext.hxx> namespace oox { namespace drawingml { diff --git a/include/oox/drawingml/colorchoicecontext.hxx b/oox/inc/drawingml/colorchoicecontext.hxx similarity index 100% rename from include/oox/drawingml/colorchoicecontext.hxx rename to oox/inc/drawingml/colorchoicecontext.hxx diff --git a/include/oox/drawingml/customshapegeometry.hxx b/oox/inc/drawingml/customshapegeometry.hxx similarity index 100% rename from include/oox/drawingml/customshapegeometry.hxx rename to oox/inc/drawingml/customshapegeometry.hxx diff --git a/include/oox/drawingml/customshapeproperties.hxx b/oox/inc/drawingml/customshapeproperties.hxx similarity index 100% rename from include/oox/drawingml/customshapeproperties.hxx rename to oox/inc/drawingml/customshapeproperties.hxx diff --git a/include/oox/drawingml/embeddedwavaudiofile.hxx b/oox/inc/drawingml/embeddedwavaudiofile.hxx similarity index 100% rename from include/oox/drawingml/embeddedwavaudiofile.hxx rename to oox/inc/drawingml/embeddedwavaudiofile.hxx diff --git a/include/oox/drawingml/fillpropertiesgroupcontext.hxx b/oox/inc/drawingml/fillpropertiesgroupcontext.hxx similarity index 99% rename from include/oox/drawingml/fillpropertiesgroupcontext.hxx rename to oox/inc/drawingml/fillpropertiesgroupcontext.hxx index aae88df..5387b34 100644 --- a/include/oox/drawingml/fillpropertiesgroupcontext.hxx +++ b/oox/inc/drawingml/fillpropertiesgroupcontext.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_OOX_DRAWINGML_FILLPROPERTIESGROUPCONTEXT_HXX #define INCLUDED_OOX_DRAWINGML_FILLPROPERTIESGROUPCONTEXT_HXX -#include <oox/drawingml/colorchoicecontext.hxx> +#include <drawingml/colorchoicecontext.hxx> #include <oox/drawingml/fillproperties.hxx> namespace oox { diff --git a/oox/inc/drawingml/graphicproperties.hxx b/oox/inc/drawingml/graphicproperties.hxx new file mode 100644 index 0000000..626fe5f --- /dev/null +++ b/oox/inc/drawingml/graphicproperties.hxx @@ -0,0 +1,57 @@ +/* -*- 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_GRAPHICPROPERTIES_HXX +#define INCLUDED_OOX_DRAWINGML_GRAPHICPROPERTIES_HXX + +#include <sal/config.h> + +#include <oox/drawingml/fillproperties.hxx> +#include <oox/helper/helper.hxx> +#include <drawingml/embeddedwavaudiofile.hxx> + +namespace oox { + class GraphicHelper; + class PropertyMap; +} + +namespace oox { +namespace drawingml { + +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 + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/oox/drawingml/guidcontext.hxx b/oox/inc/drawingml/guidcontext.hxx similarity index 100% rename from include/oox/drawingml/guidcontext.hxx rename to oox/inc/drawingml/guidcontext.hxx diff --git a/include/oox/drawingml/linepropertiescontext.hxx b/oox/inc/drawingml/linepropertiescontext.hxx similarity index 94% rename from include/oox/drawingml/linepropertiescontext.hxx rename to oox/inc/drawingml/linepropertiescontext.hxx index efd85ca..21e7810 100644 --- a/include/oox/drawingml/linepropertiescontext.hxx +++ b/oox/inc/drawingml/linepropertiescontext.hxx @@ -21,7 +21,6 @@ #define INCLUDED_OOX_DRAWINGML_LINEPROPERTIESCONTEXT_HXX #include <oox/core/contexthandler2.hxx> -#include <oox/dllapi.h> namespace oox { namespace drawingml { @@ -29,7 +28,7 @@ namespace oox { namespace drawingml { struct LineProperties; -class OOX_DLLPUBLIC LinePropertiesContext : public ::oox::core::ContextHandler2 +class LinePropertiesContext : public ::oox::core::ContextHandler2 { public: LinePropertiesContext( ::oox::core::ContextHandler2Helper& rParent, diff --git a/include/oox/drawingml/objectdefaultcontext.hxx b/oox/inc/drawingml/objectdefaultcontext.hxx similarity index 100% rename from include/oox/drawingml/objectdefaultcontext.hxx rename to oox/inc/drawingml/objectdefaultcontext.hxx diff --git a/include/oox/drawingml/scene3dcontext.hxx b/oox/inc/drawingml/scene3dcontext.hxx similarity index 98% rename from include/oox/drawingml/scene3dcontext.hxx rename to oox/inc/drawingml/scene3dcontext.hxx index d016445..edd92e8 100644 --- a/include/oox/drawingml/scene3dcontext.hxx +++ b/oox/inc/drawingml/scene3dcontext.hxx @@ -21,7 +21,7 @@ #define INCLUDED_OOX_DRAWINGML_SCENE3DCONTEXT_HXX #include <oox/core/contexthandler2.hxx> -#include "oox/drawingml/shape3dproperties.hxx" +#include "drawingml/shape3dproperties.hxx" namespace oox { namespace drawingml { diff --git a/include/oox/drawingml/shape3dproperties.hxx b/oox/inc/drawingml/shape3dproperties.hxx similarity index 100% rename from include/oox/drawingml/shape3dproperties.hxx rename to oox/inc/drawingml/shape3dproperties.hxx diff --git a/include/oox/drawingml/shapepropertiescontext.hxx b/oox/inc/drawingml/shapepropertiescontext.hxx similarity index 100% rename from include/oox/drawingml/shapepropertiescontext.hxx rename to oox/inc/drawingml/shapepropertiescontext.hxx diff --git a/include/oox/drawingml/shapestylecontext.hxx b/oox/inc/drawingml/shapestylecontext.hxx similarity index 100% rename from include/oox/drawingml/shapestylecontext.hxx rename to oox/inc/drawingml/shapestylecontext.hxx diff --git a/include/oox/drawingml/spdefcontext.hxx b/oox/inc/drawingml/spdefcontext.hxx similarity index 100% rename from include/oox/drawingml/spdefcontext.hxx rename to oox/inc/drawingml/spdefcontext.hxx diff --git a/oox/inc/drawingml/table/tablecell.hxx b/oox/inc/drawingml/table/tablecell.hxx index c484ed2..e650210 100644 --- a/oox/inc/drawingml/table/tablecell.hxx +++ b/oox/inc/drawingml/table/tablecell.hxx @@ -25,7 +25,7 @@ #include <oox/drawingml/drawingmltypes.hxx> #include <oox/drawingml/lineproperties.hxx> #include <oox/drawingml/fillproperties.hxx> -#include <oox/drawingml/textliststyle.hxx> +#include <drawingml/textliststyle.hxx> #include <com/sun/star/table/XCell.hpp> #include <boost/shared_ptr.hpp> diff --git a/oox/inc/drawingml/table/tablestylepart.hxx b/oox/inc/drawingml/table/tablestylepart.hxx index 7177deb..8c29518 100644 --- a/oox/inc/drawingml/table/tablestylepart.hxx +++ b/oox/inc/drawingml/table/tablestylepart.hxx @@ -23,7 +23,7 @@ #include <rtl/ustring.hxx> #include <boost/optional.hpp> #include <oox/drawingml/color.hxx> -#include <oox/drawingml/textfont.hxx> +#include <drawingml/textfont.hxx> #include <oox/drawingml/fillproperties.hxx> #include <oox/drawingml/lineproperties.hxx> #include <oox/drawingml/shape.hxx> diff --git a/oox/inc/drawingml/table/tablestyletextstylecontext.hxx b/oox/inc/drawingml/table/tablestyletextstylecontext.hxx index 56f190c..0768bc0 100644 --- a/oox/inc/drawingml/table/tablestyletextstylecontext.hxx +++ b/oox/inc/drawingml/table/tablestyletextstylecontext.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_OOX_DRAWINGML_TABLE_TABLESTYLETEXTSTYLECONTEXT_HXX #define INCLUDED_OOX_DRAWINGML_TABLE_TABLESTYLETEXTSTYLECONTEXT_HXX -#include <oox/core/contexthandler.hxx> +#include <oox/core/contexthandler2.hxx> #include <drawingml/table/tablestylepart.hxx> namespace oox { namespace drawingml { namespace table { diff --git a/include/oox/drawingml/textbody.hxx b/oox/inc/drawingml/textbody.hxx similarity index 96% rename from include/oox/drawingml/textbody.hxx rename to oox/inc/drawingml/textbody.hxx index 8475031..ea9bca7 100644 --- a/include/oox/drawingml/textbody.hxx +++ b/oox/inc/drawingml/textbody.hxx @@ -21,8 +21,8 @@ #define INCLUDED_OOX_DRAWINGML_TEXTBODY_HXX #include <oox/drawingml/drawingmltypes.hxx> -#include <oox/drawingml/textbodyproperties.hxx> -#include <oox/drawingml/textliststyle.hxx> +#include <drawingml/textbodyproperties.hxx> +#include <drawingml/textliststyle.hxx> namespace com { namespace sun { namespace star { namespace text { class XText; } diff --git a/include/oox/drawingml/textbodycontext.hxx b/oox/inc/drawingml/textbodycontext.hxx similarity index 96% rename from include/oox/drawingml/textbodycontext.hxx rename to oox/inc/drawingml/textbodycontext.hxx index 74c5cdd..43e80af 100644 --- a/include/oox/drawingml/textbodycontext.hxx +++ b/oox/inc/drawingml/textbodycontext.hxx @@ -22,8 +22,8 @@ #include <com/sun/star/text/XText.hpp> -#include <oox/drawingml/textbody.hxx> -#include <oox/drawingml/textrun.hxx> +#include <drawingml/textbody.hxx> +#include <drawingml/textrun.hxx> #include <oox/core/contexthandler2.hxx> namespace oox { namespace drawingml { diff --git a/include/oox/drawingml/textbodyproperties.hxx b/oox/inc/drawingml/textbodyproperties.hxx similarity index 100% rename from include/oox/drawingml/textbodyproperties.hxx rename to oox/inc/drawingml/textbodyproperties.hxx diff --git a/include/oox/drawingml/textbodypropertiescontext.hxx b/oox/inc/drawingml/textbodypropertiescontext.hxx similarity index 100% rename from include/oox/drawingml/textbodypropertiescontext.hxx rename to oox/inc/drawingml/textbodypropertiescontext.hxx diff --git a/include/oox/drawingml/textcharacterproperties.hxx b/oox/inc/drawingml/textcharacterproperties.hxx similarity index 98% rename from include/oox/drawingml/textcharacterproperties.hxx rename to oox/inc/drawingml/textcharacterproperties.hxx index 4162c23..b873c88 100644 --- a/include/oox/drawingml/textcharacterproperties.hxx +++ b/oox/inc/drawingml/textcharacterproperties.hxx @@ -23,7 +23,7 @@ #include <oox/helper/helper.hxx> #include <oox/helper/propertymap.hxx> #include <oox/drawingml/color.hxx> -#include <oox/drawingml/textfont.hxx> +#include <drawingml/textfont.hxx> #include <oox/drawingml/fillproperties.hxx> namespace oox { class PropertySet; } diff --git a/include/oox/drawingml/textcharacterpropertiescontext.hxx b/oox/inc/drawingml/textcharacterpropertiescontext.hxx similarity index 100% rename from include/oox/drawingml/textcharacterpropertiescontext.hxx rename to oox/inc/drawingml/textcharacterpropertiescontext.hxx diff --git a/include/oox/drawingml/texteffectscontext.hxx b/oox/inc/drawingml/texteffectscontext.hxx similarity index 100% rename from include/oox/drawingml/texteffectscontext.hxx rename to oox/inc/drawingml/texteffectscontext.hxx diff --git a/include/oox/drawingml/textfield.hxx b/oox/inc/drawingml/textfield.hxx similarity index 96% rename from include/oox/drawingml/textfield.hxx rename to oox/inc/drawingml/textfield.hxx index f1444e6..80ac53f 100644 --- a/include/oox/drawingml/textfield.hxx +++ b/oox/inc/drawingml/textfield.hxx @@ -22,8 +22,8 @@ #include <boost/shared_ptr.hpp> -#include <oox/drawingml/textrun.hxx> -#include <oox/drawingml/textparagraphproperties.hxx> +#include <drawingml/textrun.hxx> +#include <drawingml/textparagraphproperties.hxx> namespace oox { namespace drawingml { diff --git a/include/oox/drawingml/textfieldcontext.hxx b/oox/inc/drawingml/textfieldcontext.hxx similarity index 100% rename from include/oox/drawingml/textfieldcontext.hxx rename to oox/inc/drawingml/textfieldcontext.hxx diff --git a/include/oox/drawingml/textfont.hxx b/oox/inc/drawingml/textfont.hxx similarity index 100% rename from include/oox/drawingml/textfont.hxx rename to oox/inc/drawingml/textfont.hxx diff --git a/include/oox/drawingml/textliststyle.hxx b/oox/inc/drawingml/textliststyle.hxx similarity index 94% rename from include/oox/drawingml/textliststyle.hxx rename to oox/inc/drawingml/textliststyle.hxx index d73734f..1f3c6a0 100644 --- a/include/oox/drawingml/textliststyle.hxx +++ b/oox/inc/drawingml/textliststyle.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_OOX_DRAWINGML_TEXTLISTSTYLE_HXX #define INCLUDED_OOX_DRAWINGML_TEXTLISTSTYLE_HXX -#include <oox/drawingml/textparagraphproperties.hxx> +#include <drawingml/textparagraphproperties.hxx> #include <oox/helper/refvector.hxx> namespace oox { namespace drawingml { @@ -55,8 +55,6 @@ protected: TextParagraphPropertiesVector maAggregationListStyle; }; -typedef boost::shared_ptr< TextListStyle > TextListStylePtr; - } } #endif // INCLUDED_OOX_DRAWINGML_TEXTLISTSTYLE_HXX diff --git a/include/oox/drawingml/textliststylecontext.hxx b/oox/inc/drawingml/textliststylecontext.hxx similarity index 97% rename from include/oox/drawingml/textliststylecontext.hxx rename to oox/inc/drawingml/textliststylecontext.hxx index 2e99008..f71fc89 100644 --- a/include/oox/drawingml/textliststylecontext.hxx +++ b/oox/inc/drawingml/textliststylecontext.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_OOX_DRAWINGML_TEXTLISTSTYLECONTEXT_HXX #define INCLUDED_OOX_DRAWINGML_TEXTLISTSTYLECONTEXT_HXX -#include <oox/drawingml/textliststyle.hxx> +#include <drawingml/textliststyle.hxx> #include <oox/core/contexthandler2.hxx> namespace oox { namespace drawingml { diff --git a/include/oox/drawingml/textparagraph.hxx b/oox/inc/drawingml/textparagraph.hxx similarity index 95% rename from include/oox/drawingml/textparagraph.hxx rename to oox/inc/drawingml/textparagraph.hxx index f100458..c419a65 100644 --- a/include/oox/drawingml/textparagraph.hxx +++ b/oox/inc/drawingml/textparagraph.hxx @@ -24,9 +24,9 @@ #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> +#include <drawingml/textrun.hxx> +#include <drawingml/textliststyle.hxx> +#include <drawingml/textparagraphproperties.hxx> namespace oox { namespace drawingml { diff --git a/include/oox/drawingml/textparagraphproperties.hxx b/oox/inc/drawingml/textparagraphproperties.hxx similarity index 96% rename from include/oox/drawingml/textparagraphproperties.hxx rename to oox/inc/drawingml/textparagraphproperties.hxx index 14f56268..e6ba589 100644 --- a/include/oox/drawingml/textparagraphproperties.hxx +++ b/oox/inc/drawingml/textparagraphproperties.hxx @@ -21,11 +21,11 @@ #define INCLUDED_OOX_DRAWINGML_TEXTPARAGRAPHPROPERTIES_HXX #include <com/sun/star/beans/XPropertySet.hpp> -#include <oox/drawingml/fillpropertiesgroupcontext.hxx> -#include <oox/drawingml/textcharacterproperties.hxx> +#include <drawingml/fillpropertiesgroupcontext.hxx> +#include <drawingml/textcharacterproperties.hxx> #include <com/sun/star/style/NumberingType.hpp> -#include <oox/drawingml/textfont.hxx> -#include <oox/drawingml/textspacing.hxx> +#include <drawingml/textfont.hxx> +#include <drawingml/textspacing.hxx> #include <boost/optional.hpp> namespace com { namespace sun { namespace star { diff --git a/include/oox/drawingml/textparagraphpropertiescontext.hxx b/oox/inc/drawingml/textparagraphpropertiescontext.hxx similarity index 95% rename from include/oox/drawingml/textparagraphpropertiescontext.hxx rename to oox/inc/drawingml/textparagraphpropertiescontext.hxx index b2b124d..6f5fbc5 100644 --- a/include/oox/drawingml/textparagraphpropertiescontext.hxx +++ b/oox/inc/drawingml/textparagraphpropertiescontext.hxx @@ -24,8 +24,8 @@ #include <com/sun/star/style/TabStop.hpp> #include <oox/drawingml/drawingmltypes.hxx> -#include <oox/drawingml/textparagraphproperties.hxx> -#include <oox/drawingml/textspacing.hxx> +#include <drawingml/textparagraphproperties.hxx> +#include <drawingml/textspacing.hxx> #include <oox/core/contexthandler2.hxx> namespace oox { namespace drawingml { diff --git a/include/oox/drawingml/textrun.hxx b/oox/inc/drawingml/textrun.hxx similarity index 97% rename from include/oox/drawingml/textrun.hxx rename to oox/inc/drawingml/textrun.hxx index 5fec1a3..1b77465 100644 --- a/include/oox/drawingml/textrun.hxx +++ b/oox/inc/drawingml/textrun.hxx @@ -23,7 +23,7 @@ #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> +#include <drawingml/textcharacterproperties.hxx> namespace oox { namespace drawingml { diff --git a/include/oox/drawingml/textspacing.hxx b/oox/inc/drawingml/textspacing.hxx similarity index 100% rename from include/oox/drawingml/textspacing.hxx rename to oox/inc/drawingml/textspacing.hxx diff --git a/include/oox/drawingml/themeelementscontext.hxx b/oox/inc/drawingml/themeelementscontext.hxx similarity index 100% rename from include/oox/drawingml/themeelementscontext.hxx rename to oox/inc/drawingml/themeelementscontext.hxx diff --git a/include/oox/drawingml/transform2dcontext.hxx b/oox/inc/drawingml/transform2dcontext.hxx similarity index 100% rename from include/oox/drawingml/transform2dcontext.hxx rename to oox/inc/drawingml/transform2dcontext.hxx diff --git a/oox/source/drawingml/ThemeOverrideFragmentHandler.cxx b/oox/source/drawingml/ThemeOverrideFragmentHandler.cxx index 5f3e7fc..8d71095 100644 --- a/oox/source/drawingml/ThemeOverrideFragmentHandler.cxx +++ b/oox/source/drawingml/ThemeOverrideFragmentHandler.cxx @@ -7,9 +7,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "oox/drawingml/ThemeOverrideFragmentHandler.hxx" +#include <drawingml/ThemeOverrideFragmentHandler.hxx> #include "oox/drawingml/theme.hxx" -#include "oox/drawingml/themeelementscontext.hxx" +#include "drawingml/themeelementscontext.hxx" using namespace ::oox::core; diff --git a/oox/source/drawingml/chart/axiscontext.cxx b/oox/source/drawingml/chart/axiscontext.cxx index c414504..295b25f 100644 --- a/oox/source/drawingml/chart/axiscontext.cxx +++ b/oox/source/drawingml/chart/axiscontext.cxx @@ -19,8 +19,8 @@ #include "drawingml/chart/axiscontext.hxx" -#include "oox/drawingml/shapepropertiescontext.hxx" -#include "oox/drawingml/textbodycontext.hxx" +#include "drawingml/shapepropertiescontext.hxx" +#include "drawingml/textbodycontext.hxx" #include "drawingml/chart/axismodel.hxx" #include "drawingml/chart/titlecontext.hxx" diff --git a/oox/source/drawingml/chart/chartcontextbase.cxx b/oox/source/drawingml/chart/chartcontextbase.cxx index f489c2f..74bc6c1 100644 --- a/oox/source/drawingml/chart/chartcontextbase.cxx +++ b/oox/source/drawingml/chart/chartcontextbase.cxx @@ -20,7 +20,7 @@ #include "drawingml/chart/chartcontextbase.hxx" #include "oox/drawingml/chart/modelbase.hxx" -#include "oox/drawingml/shapepropertiescontext.hxx" +#include "drawingml/shapepropertiescontext.hxx" namespace oox { namespace drawingml { diff --git a/oox/source/drawingml/chart/chartspacefragment.cxx b/oox/source/drawingml/chart/chartspacefragment.cxx index 40ea77a..7117877 100644 --- a/oox/source/drawingml/chart/chartspacefragment.cxx +++ b/oox/source/drawingml/chart/chartspacefragment.cxx @@ -19,8 +19,8 @@ #include "drawingml/chart/chartspacefragment.hxx" -#include "oox/drawingml/shapepropertiescontext.hxx" -#include "oox/drawingml/textbodycontext.hxx" +#include "drawingml/shapepropertiescontext.hxx" +#include "drawingml/textbodycontext.hxx" #include "drawingml/chart/chartspacemodel.hxx" #include "drawingml/chart/plotareacontext.hxx" #include "drawingml/chart/titlecontext.hxx" diff --git a/oox/source/drawingml/chart/chartspacemodel.cxx b/oox/source/drawingml/chart/chartspacemodel.cxx index c1a9c6c..a1c107e 100644 --- a/oox/source/drawingml/chart/chartspacemodel.cxx +++ b/oox/source/drawingml/chart/chartspacemodel.cxx @@ -18,6 +18,7 @@ */ #include "drawingml/chart/chartspacemodel.hxx" +#include <oox/token/tokens.hxx> namespace oox { namespace drawingml { diff --git a/oox/source/drawingml/chart/objectformatter.cxx b/oox/source/drawingml/chart/objectformatter.cxx index abf5bcb..d0ab4c0 100644 --- a/oox/source/drawingml/chart/objectformatter.cxx +++ b/oox/source/drawingml/chart/objectformatter.cxx @@ -27,8 +27,8 @@ #include "oox/drawingml/fillproperties.hxx" #include "oox/drawingml/lineproperties.hxx" #include "oox/drawingml/shapepropertymap.hxx" -#include "oox/drawingml/textbody.hxx" -#include "oox/drawingml/textparagraph.hxx" +#include "drawingml/textbody.hxx" +#include "drawingml/textparagraph.hxx" #include "oox/drawingml/theme.hxx" #include "drawingml/chart/chartspacemodel.hxx" #include "oox/helper/modelobjecthelper.hxx" diff --git a/oox/source/drawingml/chart/plotareacontext.cxx b/oox/source/drawingml/chart/plotareacontext.cxx index 738fa92..53cb1ae 100644 --- a/oox/source/drawingml/chart/plotareacontext.cxx +++ b/oox/source/drawingml/chart/plotareacontext.cxx @@ -19,7 +19,7 @@ #include "drawingml/chart/plotareacontext.hxx" -#include "oox/drawingml/shapepropertiescontext.hxx" +#include "drawingml/shapepropertiescontext.hxx" #include "drawingml/chart/axiscontext.hxx" #include "drawingml/chart/plotareamodel.hxx" #include "drawingml/chart/seriescontext.hxx" diff --git a/oox/source/drawingml/chart/seriescontext.cxx b/oox/source/drawingml/chart/seriescontext.cxx index 9646851..e9002f4 100644 --- a/oox/source/drawingml/chart/seriescontext.cxx +++ b/oox/source/drawingml/chart/seriescontext.cxx @@ -19,8 +19,8 @@ #include "drawingml/chart/seriescontext.hxx" -#include "oox/drawingml/shapepropertiescontext.hxx" -#include "oox/drawingml/textbodycontext.hxx" +#include "drawingml/shapepropertiescontext.hxx" +#include "drawingml/textbodycontext.hxx" #include "drawingml/chart/datasourcecontext.hxx" #include "drawingml/chart/seriesmodel.hxx" #include "drawingml/chart/titlecontext.hxx" diff --git a/oox/source/drawingml/chart/seriesmodel.cxx b/oox/source/drawingml/chart/seriesmodel.cxx index 8daa50a..5507384 100644 --- a/oox/source/drawingml/chart/seriesmodel.cxx +++ b/oox/source/drawingml/chart/seriesmodel.cxx @@ -18,6 +18,7 @@ */ #include "drawingml/chart/seriesmodel.hxx" +#include <oox/token/tokens.hxx> namespace oox { namespace drawingml { diff --git a/oox/source/drawingml/chart/titlecontext.cxx b/oox/source/drawingml/chart/titlecontext.cxx index 0a627ee..e589335 100644 --- a/oox/source/drawingml/chart/titlecontext.cxx +++ b/oox/source/drawingml/chart/titlecontext.cxx @@ -19,8 +19,8 @@ #include "drawingml/chart/titlecontext.hxx" -#include "oox/drawingml/shapepropertiescontext.hxx" -#include "oox/drawingml/textbodycontext.hxx" +#include "drawingml/shapepropertiescontext.hxx" +#include "drawingml/textbodycontext.hxx" #include "drawingml/chart/datasourcecontext.hxx" #include "drawingml/chart/titlemodel.hxx" diff --git a/oox/source/drawingml/chart/titleconverter.cxx b/oox/source/drawingml/chart/titleconverter.cxx index 29dc019..844aa0a 100644 --- a/oox/source/drawingml/chart/titleconverter.cxx +++ b/oox/source/drawingml/chart/titleconverter.cxx @@ -26,8 +26,8 @@ #include <com/sun/star/chart2/XLegend.hpp> #include <com/sun/star/chart2/XTitle.hpp> #include <com/sun/star/chart2/XTitled.hpp> -#include "oox/drawingml/textbody.hxx" -#include "oox/drawingml/textparagraph.hxx" +#include "drawingml/textbody.hxx" +#include "drawingml/textparagraph.hxx" #include "drawingml/chart/datasourceconverter.hxx" #include "drawingml/chart/titlemodel.hxx" #include "oox/helper/containerhelper.hxx" diff --git a/oox/source/drawingml/chart/titlemodel.cxx b/oox/source/drawingml/chart/titlemodel.cxx index 614f212..3ca7f5d 100644 --- a/oox/source/drawingml/chart/titlemodel.cxx +++ b/oox/source/drawingml/chart/titlemodel.cxx @@ -18,6 +18,7 @@ */ #include "drawingml/chart/titlemodel.hxx" +#include <oox/token/tokens.hxx> namespace oox { namespace drawingml { diff --git a/oox/source/drawingml/chart/typegroupmodel.cxx b/oox/source/drawingml/chart/typegroupmodel.cxx index 30f1ccc..f27f6da 100644 --- a/oox/source/drawingml/chart/typegroupmodel.cxx +++ b/oox/source/drawingml/chart/typegroupmodel.cxx @@ -18,6 +18,7 @@ */ #include "drawingml/chart/typegroupmodel.hxx" +#include <oox/token/tokens.hxx> namespace oox { namespace drawingml { diff --git a/oox/source/drawingml/clrschemecontext.cxx b/oox/source/drawingml/clrschemecontext.cxx index 83244be..d16a14f 100644 --- a/oox/source/drawingml/clrschemecontext.cxx +++ b/oox/source/drawingml/clrschemecontext.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "oox/drawingml/clrschemecontext.hxx" +#include "drawingml/clrschemecontext.hxx" #include "oox/core/xmlfilterbase.hxx" using namespace ::oox::core; diff --git a/oox/source/drawingml/colorchoicecontext.cxx b/oox/source/drawingml/colorchoicecontext.cxx index e255fcb..3236c5a 100644 --- a/oox/source/drawingml/colorchoicecontext.cxx +++ b/oox/source/drawingml/colorchoicecontext.cxx @@ -18,7 +18,7 @@ */ #include "oox/drawingml/drawingmltypes.hxx" -#include "oox/drawingml/colorchoicecontext.hxx" +#include "drawingml/colorchoicecontext.hxx" #include "oox/helper/attributelist.hxx" #include "oox/drawingml/color.hxx" diff --git a/oox/source/drawingml/connectorshapecontext.cxx b/oox/source/drawingml/connectorshapecontext.cxx index 4fa115a..03f346c 100644 --- a/oox/source/drawingml/connectorshapecontext.cxx +++ b/oox/source/drawingml/connectorshapecontext.cxx @@ -25,8 +25,8 @@ #include "oox/drawingml/graphicshapecontext.hxx" #include "oox/drawingml/lineproperties.hxx" #include "oox/drawingml/drawingmltypes.hxx" -#include "oox/drawingml/customshapegeometry.hxx" -#include "oox/drawingml/textbodycontext.hxx" +#include "drawingml/customshapegeometry.hxx" +#include "drawingml/textbodycontext.hxx" using namespace oox::core; using namespace ::com::sun::star; diff --git a/oox/source/drawingml/customshapegeometry.cxx b/oox/source/drawingml/customshapegeometry.cxx index 87d3304..6868e2c 100644 --- a/oox/source/drawingml/customshapegeometry.cxx +++ b/oox/source/drawingml/customshapegeometry.cxx @@ -17,7 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "oox/drawingml/customshapegeometry.hxx" +#include "drawingml/customshapegeometry.hxx" +#include <drawingml/customshapeproperties.hxx> #include <com/sun/star/xml/sax/FastToken.hpp> #include <boost/unordered_map.hpp> diff --git a/oox/source/drawingml/customshapepresetdata.cxx b/oox/source/drawingml/customshapepresetdata.cxx index 85d87cb..78d0af1 100644 --- a/oox/source/drawingml/customshapepresetdata.cxx +++ b/oox/source/drawingml/customshapepresetdata.cxx @@ -12,7 +12,7 @@ #include <tools/stream.hxx> #include <comphelper/sequenceasvector.hxx> -#include "oox/drawingml/customshapeproperties.hxx" +#include "drawingml/customshapeproperties.hxx" #include "oox/helper/helper.hxx" #include "oox/helper/propertymap.hxx" #include "oox/helper/propertyset.hxx" diff --git a/oox/source/drawingml/customshapeproperties.cxx b/oox/source/drawingml/customshapeproperties.cxx index efaddba..5758d79 100644 --- a/oox/source/drawingml/customshapeproperties.cxx +++ b/oox/source/drawingml/customshapeproperties.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "oox/drawingml/customshapeproperties.hxx" +#include "drawingml/customshapeproperties.hxx" #include "oox/helper/helper.hxx" #include "oox/helper/propertymap.hxx" #include "oox/helper/propertyset.hxx" diff --git a/oox/source/drawingml/diagram/datamodelcontext.cxx b/oox/source/drawingml/diagram/datamodelcontext.cxx index ef8f9e4..b5b6dff 100644 --- a/oox/source/drawingml/diagram/datamodelcontext.cxx +++ b/oox/source/drawingml/diagram/datamodelcontext.cxx @@ -19,9 +19,9 @@ #include "datamodelcontext.hxx" #include "oox/helper/attributelist.hxx" -#include "oox/drawingml/fillpropertiesgroupcontext.hxx" -#include "oox/drawingml/shapepropertiescontext.hxx" -#include "oox/drawingml/textbodycontext.hxx" +#include "drawingml/fillpropertiesgroupcontext.hxx" +#include "drawingml/shapepropertiescontext.hxx" +#include "drawingml/textbodycontext.hxx" using namespace ::oox::core; using namespace ::com::sun::star::xml::sax; diff --git a/oox/source/drawingml/diagram/diagram.cxx b/oox/source/drawingml/diagram/diagram.cxx index 4d6a421..1c53d74 100644 --- a/oox/source/drawingml/diagram/diagram.cxx +++ b/oox/source/drawingml/diagram/diagram.cxx @@ -26,9 +26,9 @@ #include <com/sun/star/xml/sax/XFastSAXSerializable.hpp> #include <rtl/ustrbuf.hxx> #include <editeng/unoprnms.hxx> -#include "oox/drawingml/textbody.hxx" -#include "oox/drawingml/textparagraph.hxx" -#include "oox/drawingml/textrun.hxx" +#include "drawingml/textbody.hxx" +#include "drawingml/textparagraph.hxx" +#include "drawingml/textrun.hxx" #include "drawingml/diagram/diagram.hxx" #include "oox/drawingml/fillproperties.hxx" #include "oox/ppt/pptshapegroupcontext.hxx" diff --git a/oox/source/drawingml/diagram/diagram.hxx b/oox/source/drawingml/diagram/diagram.hxx index 2b811f9..9ef9215 100644 --- a/oox/source/drawingml/diagram/diagram.hxx +++ b/oox/source/drawingml/diagram/diagram.hxx @@ -30,6 +30,7 @@ #include "oox/drawingml/shape.hxx" #include "oox/drawingml/fillproperties.hxx" +#include <oox/token/tokens.hxx> namespace com { namespace sun { namespace star { namespace xml { namespace dom { class XDocument; } } diff --git a/oox/source/drawingml/diagram/diagramfragmenthandler.cxx b/oox/source/drawingml/diagram/diagramfragmenthandler.cxx index 59b1836..f1c3cb7 100644 --- a/oox/source/drawingml/diagram/diagramfragmenthandler.cxx +++ b/oox/source/drawingml/diagram/diagramfragmenthandler.cxx @@ -22,7 +22,7 @@ #include "diagramdefinitioncontext.hxx" #include "diagramfragmenthandler.hxx" #include "datamodelcontext.hxx" -#include "oox/drawingml/colorchoicecontext.hxx" +#include "drawingml/colorchoicecontext.hxx" using namespace ::oox::core; using namespace ::com::sun::star::xml::sax; diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx index f1692ec..049f409 100644 --- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx +++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx @@ -27,10 +27,10 @@ #include "oox/helper/attributelist.hxx" #include "oox/drawingml/fillproperties.hxx" #include "oox/drawingml/lineproperties.hxx" -#include "oox/drawingml/textbody.hxx" -#include "oox/drawingml/textparagraph.hxx" -#include "oox/drawingml/textrun.hxx" -#include "oox/drawingml/customshapeproperties.hxx" +#include "drawingml/textbody.hxx" +#include "drawingml/textparagraph.hxx" +#include "drawingml/textrun.hxx" +#include "drawingml/customshapeproperties.hxx" #include "layoutnodecontext.hxx" using namespace ::com::sun::star; diff --git a/oox/source/drawingml/diagram/layoutnodecontext.cxx b/oox/source/drawingml/diagram/layoutnodecontext.cxx index 4612fcb..facfda4 100644 --- a/oox/source/drawingml/diagram/layoutnodecontext.cxx +++ b/oox/source/drawingml/diagram/layoutnodecontext.cxx @@ -22,7 +22,7 @@ #include "oox/helper/attributelist.hxx" #include "drawingml/diagram/diagram.hxx" #include "oox/drawingml/shapecontext.hxx" -#include "oox/drawingml/customshapeproperties.hxx" +#include "drawingml/customshapeproperties.hxx" #include "diagramdefinitioncontext.hxx" #include "constraintlistcontext.hxx" diff --git a/oox/source/drawingml/effectpropertiescontext.cxx b/oox/source/drawingml/effectpropertiescontext.cxx index 7d6549c..d1d0cd9 100644 --- a/oox/source/drawingml/effectpropertiescontext.cxx +++ b/oox/source/drawingml/effectpropertiescontext.cxx @@ -10,7 +10,7 @@ #include "effectpropertiescontext.hxx" #include "effectproperties.hxx" #include "oox/drawingml/drawingmltypes.hxx" -#include "oox/drawingml/fillpropertiesgroupcontext.hxx" +#include "drawingml/fillpropertiesgroupcontext.hxx" #include "oox/helper/attributelist.hxx" using namespace ::oox::core; diff --git a/oox/source/drawingml/embeddedwavaudiofile.cxx b/oox/source/drawingml/embeddedwavaudiofile.cxx index 6b2f29e..c15bc7c 100644 --- a/oox/source/drawingml/embeddedwavaudiofile.cxx +++ b/oox/source/drawingml/embeddedwavaudiofile.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "oox/drawingml/embeddedwavaudiofile.hxx" +#include "drawingml/embeddedwavaudiofile.hxx" #include "oox/helper/attributelist.hxx" using namespace ::oox::core; diff --git a/oox/source/drawingml/fillproperties.cxx b/oox/source/drawingml/fillproperties.cxx index 8401d7a..109fc23 100644 --- a/oox/source/drawingml/fillproperties.cxx +++ b/oox/source/drawingml/fillproperties.cxx @@ -20,7 +20,8 @@ #include <iterator> #include <boost/utility.hpp> -#include "oox/drawingml/fillproperties.hxx" +#include <oox/drawingml/fillproperties.hxx> +#include <drawingml/graphicproperties.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/oox/source/drawingml/fillpropertiesgroupcontext.cxx b/oox/source/drawingml/fillpropertiesgroupcontext.cxx index e60f689..a45dd78 100644 --- a/oox/source/drawingml/fillpropertiesgroupcontext.cxx +++ b/oox/source/drawingml/fillpropertiesgroupcontext.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "oox/drawingml/fillpropertiesgroupcontext.hxx" +#include "drawingml/fillpropertiesgroupcontext.hxx" #include "oox/helper/attributelist.hxx" #include "oox/helper/graphichelper.hxx" #include "oox/core/xmlfilterbase.hxx" diff --git a/oox/source/drawingml/graphicshapecontext.cxx b/oox/source/drawingml/graphicshapecontext.cxx index f753783..e78a3e2 100644 --- a/oox/source/drawingml/graphicshapecontext.cxx +++ b/oox/source/drawingml/graphicshapecontext.cxx @@ -21,8 +21,9 @@ #include "oox/drawingml/graphicshapecontext.hxx" #include <osl/diagnose.h> -#include "oox/drawingml/fillpropertiesgroupcontext.hxx" -#include "oox/drawingml/customshapeproperties.hxx" +#include "drawingml/fillpropertiesgroupcontext.hxx" +#include "drawingml/graphicproperties.hxx" +#include "drawingml/customshapeproperties.hxx" #include "drawingml/diagram/diagram.hxx" #include "drawingml/table/tablecontext.hxx" #include "oox/core/xmlfilterbase.hxx" @@ -33,7 +34,7 @@ #include "oox/vml/vmlshape.hxx" #include "oox/vml/vmlshapecontainer.hxx" #include "oox/drawingml/fillproperties.hxx" -#include "oox/drawingml/transform2dcontext.hxx" +#include "drawingml/transform2dcontext.hxx" #include "oox/helper/binaryinputstream.hxx" #include "oox/helper/binaryoutputstream.hxx" #include "oox/ppt/pptshapegroupcontext.hxx" diff --git a/oox/source/drawingml/guidcontext.cxx b/oox/source/drawingml/guidcontext.cxx index 0e000d7..89eff05 100644 --- a/oox/source/drawingml/guidcontext.cxx +++ b/oox/source/drawingml/guidcontext.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "oox/drawingml/guidcontext.hxx" +#include "drawingml/guidcontext.hxx" using namespace ::oox::core; using namespace ::com::sun::star::uno; diff --git a/oox/source/drawingml/hyperlinkcontext.cxx b/oox/source/drawingml/hyperlinkcontext.cxx index 6e648dc..b2774d1 100644 --- a/oox/source/drawingml/hyperlinkcontext.cxx +++ b/oox/source/drawingml/hyperlinkcontext.cxx @@ -24,7 +24,7 @@ #include "oox/helper/propertymap.hxx" #include "oox/core/relations.hxx" #include "oox/core/xmlfilterbase.hxx" -#include "oox/drawingml/embeddedwavaudiofile.hxx" +#include "drawingml/embeddedwavaudiofile.hxx" using namespace ::oox::core; using namespace ::com::sun::star::uno; diff --git a/oox/source/drawingml/linepropertiescontext.cxx b/oox/source/drawingml/linepropertiescontext.cxx index 45a4a0e..bc5395d 100644 --- a/oox/source/drawingml/linepropertiescontext.cxx +++ b/oox/source/drawingml/linepropertiescontext.cxx @@ -17,9 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "oox/drawingml/linepropertiescontext.hxx" +#include "drawingml/linepropertiescontext.hxx" #include "oox/drawingml/drawingmltypes.hxx" -#include "oox/drawingml/fillpropertiesgroupcontext.hxx" +#include "drawingml/fillpropertiesgroupcontext.hxx" #include "oox/drawingml/lineproperties.hxx" #include "oox/helper/attributelist.hxx" diff --git a/oox/source/drawingml/objectdefaultcontext.cxx b/oox/source/drawingml/objectdefaultcontext.cxx index 7b1e40c..0b10241 100644 --- a/oox/source/drawingml/objectdefaultcontext.cxx +++ b/oox/source/drawingml/objectdefaultcontext.cxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "oox/drawingml/objectdefaultcontext.hxx" -#include "oox/drawingml/spdefcontext.hxx" +#include "drawingml/objectdefaultcontext.hxx" +#include "drawingml/spdefcontext.hxx" #include "oox/drawingml/theme.hxx" using namespace ::oox::core; diff --git a/oox/source/drawingml/scene3dcontext.cxx b/oox/source/drawingml/scene3dcontext.cxx index c8d9dd5..2514d8f 100644 --- a/oox/source/drawingml/scene3dcontext.cxx +++ b/oox/source/drawingml/scene3dcontext.cxx @@ -17,12 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "oox/drawingml/scene3dcontext.hxx" +#include "drawingml/scene3dcontext.hxx" #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/graphic/XGraphicProvider.hpp> #include <cppuhelper/exc_hlp.hxx> #include <comphelper/anytostring.hxx> -#include "oox/drawingml/colorchoicecontext.hxx" +#include "drawingml/colorchoicecontext.hxx" #include "oox/drawingml/drawingmltypes.hxx" #include "oox/drawingml/fillproperties.hxx" #include "oox/core/xmlfilterbase.hxx" diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index 8545307..099feb0 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -18,14 +18,16 @@ */ #include "oox/drawingml/shape.hxx" -#include "oox/drawingml/customshapeproperties.hxx" +#include "drawingml/customshapeproperties.hxx" #include "oox/drawingml/theme.hxx" #include "oox/drawingml/fillproperties.hxx" +#include "drawingml/graphicproperties.hxx" +#include <drawingml/scene3dcontext.hxx> #include "oox/drawingml/lineproperties.hxx" #include "effectproperties.hxx" #include "oox/drawingml/shapepropertymap.hxx" -#include "oox/drawingml/textbody.hxx" -#include "oox/drawingml/ThemeOverrideFragmentHandler.hxx" +#include "drawingml/textbody.hxx" +#include <drawingml/ThemeOverrideFragmentHandler.hxx> #include "drawingml/table/tableproperties.hxx" #include "oox/drawingml/chart/chartconverter.hxx" #include "drawingml/chart/chartspacefragment.hxx" diff --git a/oox/source/drawingml/shape3dproperties.cxx b/oox/source/drawingml/shape3dproperties.cxx index 2060f18..38b26c7 100644 --- a/oox/source/drawingml/shape3dproperties.cxx +++ b/oox/source/drawingml/shape3dproperties.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "oox/drawingml/shape3dproperties.hxx" +#include "drawingml/shape3dproperties.hxx" #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/XFramesSupplier.hpp> #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/oox/source/drawingml/shapecontext.cxx b/oox/source/drawingml/shapecontext.cxx index 536bbc7..5bb38a4 100644 --- a/oox/source/drawingml/shapecontext.cxx +++ b/oox/source/drawingml/shapecontext.cxx @@ -25,13 +25,14 @@ #include "oox/helper/attributelist.hxx" #include "oox/drawingml/shapecontext.hxx" -#include "oox/drawingml/shapestylecontext.hxx" -#include "oox/drawingml/fillpropertiesgroupcontext.hxx" +#include <drawingml/shapepropertiescontext.hxx> +#include "drawingml/shapestylecontext.hxx" +#include "drawingml/fillpropertiesgroupcontext.hxx" #include "oox/drawingml/lineproperties.hxx" #include "oox/drawingml/drawingmltypes.hxx" -#include "oox/drawingml/customshapegeometry.hxx" -#include "oox/drawingml/textbodycontext.hxx" -#include "oox/drawingml/textbodypropertiescontext.hxx" +#include "drawingml/customshapegeometry.hxx" +#include "drawingml/textbodycontext.hxx" +#include "drawingml/textbodypropertiescontext.hxx" #include "hyperlinkcontext.hxx" using namespace oox::core; diff --git a/oox/source/drawingml/shapegroupcontext.cxx b/oox/source/drawingml/shapegroupcontext.cxx index f4e0454..a1ae52d3 100644 --- a/oox/source/drawingml/shapegroupcontext.cxx +++ b/oox/source/drawingml/shapegroupcontext.cxx @@ -27,8 +27,9 @@ #include "oox/drawingml/graphicshapecontext.hxx" #include "oox/drawingml/lineproperties.hxx" #include "oox/drawingml/drawingmltypes.hxx" -#include "oox/drawingml/customshapegeometry.hxx" -#include "oox/drawingml/textbodycontext.hxx" +#include "drawingml/customshapegeometry.hxx" +#include <drawingml/shapepropertiescontext.hxx> +#include "drawingml/textbodycontext.hxx" using namespace oox::core; using namespace ::com::sun::star; diff --git a/oox/source/drawingml/shapepropertiescontext.cxx b/oox/source/drawingml/shapepropertiescontext.cxx index 9eb71b2..e0ac8b0 100644 --- a/oox/source/drawingml/shapepropertiescontext.cxx +++ b/oox/source/drawingml/shapepropertiescontext.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "oox/drawingml/shapepropertiescontext.hxx" +#include "drawingml/shapepropertiescontext.hxx" #include <com/sun/star/xml/sax/FastToken.hpp> #include <com/sun/star/drawing/LineStyle.hpp> @@ -25,11 +25,11 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/container/XNamed.hpp> -#include "oox/drawingml/scene3dcontext.hxx" -#include "oox/drawingml/linepropertiescontext.hxx" -#include "oox/drawingml/fillpropertiesgroupcontext.hxx" -#include "oox/drawingml/transform2dcontext.hxx" -#include "oox/drawingml/customshapegeometry.hxx" +#include "drawingml/scene3dcontext.hxx" +#include "drawingml/linepropertiescontext.hxx" +#include "drawingml/fillpropertiesgroupcontext.hxx" +#include "drawingml/transform2dcontext.hxx" +#include "drawingml/customshapegeometry.hxx" #include "effectpropertiescontext.hxx" using namespace oox::core; diff --git a/oox/source/drawingml/shapestylecontext.cxx b/oox/source/drawingml/shapestylecontext.cxx index aeb6278..1f805f8 100644 --- a/oox/source/drawingml/shapestylecontext.cxx +++ b/oox/source/drawingml/shapestylecontext.cxx @@ -17,10 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "oox/drawingml/shapestylecontext.hxx" +#include "drawingml/shapestylecontext.hxx" #include "oox/helper/attributelist.hxx" -#include "oox/drawingml/colorchoicecontext.hxx" +#include "drawingml/colorchoicecontext.hxx" using namespace ::oox::core; using namespace ::com::sun::star::uno; diff --git a/oox/source/drawingml/spdefcontext.cxx b/oox/source/drawingml/spdefcontext.cxx index 2b71833..3f84106 100644 --- a/oox/source/drawingml/spdefcontext.cxx +++ b/oox/source/drawingml/spdefcontext.cxx @@ -17,11 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "oox/drawingml/spdefcontext.hxx" -#include "oox/drawingml/shapepropertiescontext.hxx" -#include "oox/drawingml/textbody.hxx" -#include "oox/drawingml/textbodypropertiescontext.hxx" -#include "oox/drawingml/textliststylecontext.hxx" +#include "drawingml/spdefcontext.hxx" +#include "drawingml/shapepropertiescontext.hxx" +#include "drawingml/textbody.hxx" +#include "drawingml/textbodypropertiescontext.hxx" +#include "drawingml/textliststylecontext.hxx" using namespace ::oox::core; using namespace ::com::sun::star::uno; diff --git a/oox/source/drawingml/table/tablebackgroundstylecontext.cxx b/oox/source/drawingml/table/tablebackgroundstylecontext.cxx index a91da19..2281d04 100644 --- a/oox/source/drawingml/table/tablebackgroundstylecontext.cxx +++ b/oox/source/drawingml/table/tablebackgroundstylecontext.cxx @@ -20,7 +20,7 @@ #include <osl/diagnose.h> #include "drawingml/table/tablebackgroundstylecontext.hxx" -#include "oox/drawingml/fillpropertiesgroupcontext.hxx" +#include "drawingml/fillpropertiesgroupcontext.hxx" #include "oox/helper/attributelist.hxx" using namespace ::oox::core; diff --git a/oox/source/drawingml/table/tablecell.cxx b/oox/source/drawingml/table/tablecell.cxx index 817caba..96cb28c 100644 --- a/oox/source/drawingml/table/tablecell.cxx +++ b/oox/source/drawingml/table/tablecell.cxx @@ -21,7 +21,7 @@ #include "drawingml/table/tableproperties.hxx" #include <basegfx/color/bcolor.hxx> #include "oox/drawingml/shapepropertymap.hxx" -#include "oox/drawingml/textbody.hxx" +#include "drawingml/textbody.hxx" #include "oox/drawingml/theme.hxx" #include "oox/core/xmlfilterbase.hxx" #include "oox/helper/propertyset.hxx" diff --git a/oox/source/drawingml/table/tablecellcontext.cxx b/oox/source/drawingml/table/tablecellcontext.cxx index c0de51f..b0df166 100644 --- a/oox/source/drawingml/table/tablecellcontext.cxx +++ b/oox/source/drawingml/table/tablecellcontext.cxx @@ -20,9 +20,9 @@ #include <osl/diagnose.h> #include "drawingml/table/tablecellcontext.hxx" -#include "oox/drawingml/textbodycontext.hxx" -#include "oox/drawingml/linepropertiescontext.hxx" -#include "oox/drawingml/fillpropertiesgroupcontext.hxx" +#include "drawingml/textbodycontext.hxx" +#include "drawingml/linepropertiescontext.hxx" +#include "drawingml/fillpropertiesgroupcontext.hxx" #include "oox/helper/attributelist.hxx" using namespace ::oox::core; diff --git a/oox/source/drawingml/table/tablecontext.cxx b/oox/source/drawingml/table/tablecontext.cxx index 52edb76..ac6a862 100644 --- a/oox/source/drawingml/table/tablecontext.cxx +++ b/oox/source/drawingml/table/tablecontext.cxx @@ -19,7 +19,7 @@ #include <osl/diagnose.h> #include "oox/helper/attributelist.hxx" -#include "oox/drawingml/guidcontext.hxx" +#include "drawingml/guidcontext.hxx" #include "drawingml/table/tablecontext.hxx" #include "drawingml/table/tableproperties.hxx" #include "drawingml/table/tablestylecontext.hxx" diff --git a/oox/source/drawingml/table/tablestylecellstylecontext.cxx b/oox/source/drawingml/table/tablestylecellstylecontext.cxx index a318a0a..ef9be24 100644 --- a/oox/source/drawingml/table/tablestylecellstylecontext.cxx +++ b/oox/source/drawingml/table/tablestylecellstylecontext.cxx @@ -20,8 +20,8 @@ #include <osl/diagnose.h> #include "drawingml/table/tablestylecellstylecontext.hxx" -#include "oox/drawingml/fillpropertiesgroupcontext.hxx" -#include "oox/drawingml/linepropertiescontext.hxx" +#include "drawingml/fillpropertiesgroupcontext.hxx" +#include "drawingml/linepropertiescontext.hxx" #include "oox/helper/attributelist.hxx" using namespace ::oox::core; diff --git a/oox/source/drawingml/table/tablestyletextstylecontext.cxx b/oox/source/drawingml/table/tablestyletextstylecontext.cxx index 93277fc..f1e64ff 100644 --- a/oox/source/drawingml/table/tablestyletextstylecontext.cxx +++ b/oox/source/drawingml/table/tablestyletextstylecontext.cxx @@ -20,7 +20,7 @@ #include <osl/diagnose.h> #include "drawingml/table/tablestyletextstylecontext.hxx" -#include "oox/drawingml/colorchoicecontext.hxx" +#include "drawingml/colorchoicecontext.hxx" #include "oox/helper/attributelist.hxx" using namespace ::oox::core; diff --git a/oox/source/drawingml/textbody.cxx b/oox/source/drawingml/textbody.cxx index 9e9d0dd..165b9db 100644 --- a/oox/source/drawingml/textbody.cxx +++ b/oox/source/drawingml/textbody.cxx @@ -17,11 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "oox/drawingml/textbody.hxx" +#include "drawingml/textbody.hxx" #include <com/sun/star/text/XText.hpp> #include <com/sun/star/text/XTextCursor.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include "oox/drawingml/textparagraph.hxx" +#include "drawingml/textparagraph.hxx" using namespace ::com::sun::star::uno; using namespace ::com::sun::star::text; diff --git a/oox/source/drawingml/textbodycontext.cxx b/oox/source/drawingml/textbodycontext.cxx index 9cfffdc..4154e1b 100644 --- a/oox/source/drawingml/textbodycontext.cxx +++ b/oox/source/drawingml/textbodycontext.cxx @@ -17,14 +17,14 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "oox/drawingml/textbodycontext.hxx" -#include "oox/drawingml/textbodypropertiescontext.hxx" -#include "oox/drawingml/textparagraph.hxx" -#include "oox/drawingml/textparagraphpropertiescontext.hxx" -#include "oox/drawingml/textcharacterpropertiescontext.hxx" -#include "oox/drawingml/textliststylecontext.hxx" -#include "oox/drawingml/textfield.hxx" -#include "oox/drawingml/textfieldcontext.hxx" +#include "drawingml/textbodycontext.hxx" +#include "drawingml/textbodypropertiescontext.hxx" +#include "drawingml/textparagraph.hxx" +#include "drawingml/textparagraphpropertiescontext.hxx" +#include "drawingml/textcharacterpropertiescontext.hxx" +#include "drawingml/textliststylecontext.hxx" +#include "drawingml/textfield.hxx" +#include "drawingml/textfieldcontext.hxx" using namespace ::oox::core; using namespace ::com::sun::star::uno; diff --git a/oox/source/drawingml/textbodyproperties.cxx b/oox/source/drawingml/textbodyproperties.cxx index 1c1b4f2..9f146c6 100644 --- a/oox/source/drawingml/textbodyproperties.cxx +++ b/oox/source/drawingml/textbodyproperties.cxx @@ -20,7 +20,7 @@ #include <com/sun/star/text/WritingMode.hpp> #include <com/sun/star/drawing/TextHorizontalAdjust.hpp> #include "oox/drawingml/drawingmltypes.hxx" -#include "oox/drawingml/textbodyproperties.hxx" +#include "drawingml/textbodyproperties.hxx" #include "oox/token/tokens.hxx" using namespace ::com::sun::star::drawing; diff --git a/oox/source/drawingml/textbodypropertiescontext.cxx b/oox/source/drawingml/textbodypropertiescontext.cxx index 80d82a0..89167b6 100644 --- a/oox/source/drawingml/textbodypropertiescontext.cxx +++ b/oox/source/drawingml/textbodypropertiescontext.cxx @@ -17,12 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "oox/drawingml/textbodypropertiescontext.hxx" +#include "drawingml/textbodypropertiescontext.hxx" #include <com/sun/star/text/WritingMode.hpp> #include <com/sun/star/drawing/TextFitToSizeType.hpp> #include <com/sun/star/drawing/TextHorizontalAdjust.hpp> -#include "oox/drawingml/textbodyproperties.hxx" +#include "drawingml/textbodyproperties.hxx" #include "oox/drawingml/drawingmltypes.hxx" #include "oox/helper/attributelist.hxx" #include "oox/helper/propertymap.hxx" diff --git a/oox/source/drawingml/textcharacterproperties.cxx b/oox/source/drawingml/textcharacterproperties.cxx index d919882..d7a848d 100644 --- a/oox/source/drawingml/textcharacterproperties.cxx +++ b/oox/source/drawingml/textcharacterproperties.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "oox/drawingml/textcharacterproperties.hxx" +#include "drawingml/textcharacterproperties.hxx" #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/awt/FontSlant.hpp> #include <com/sun/star/awt/FontWeight.hpp> diff --git a/oox/source/drawingml/textcharacterpropertiescontext.cxx b/oox/source/drawingml/textcharacterpropertiescontext.cxx index 600f472..87d884e 100644 --- a/oox/source/drawingml/textcharacterpropertiescontext.cxx +++ b/oox/source/drawingml/textcharacterpropertiescontext.cxx @@ -17,14 +17,14 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "oox/drawingml/textcharacterpropertiescontext.hxx" +#include "drawingml/textcharacterpropertiescontext.hxx" #include "oox/helper/attributelist.hxx" #include "oox/drawingml/drawingmltypes.hxx" -#include "oox/drawingml/colorchoicecontext.hxx" -#include "oox/drawingml/texteffectscontext.hxx" +#include "drawingml/colorchoicecontext.hxx" +#include "drawingml/texteffectscontext.hxx" #include "oox/drawingml/lineproperties.hxx" -#include "oox/drawingml/textparagraphproperties.hxx" +#include "drawingml/textparagraphproperties.hxx" #include "oox/core/relations.hxx" #include "hyperlinkcontext.hxx" diff --git a/oox/source/drawingml/texteffectscontext.cxx b/oox/source/drawingml/texteffectscontext.cxx index a4cfd7a..e996e1a 100644 --- a/oox/source/drawingml/texteffectscontext.cxx +++ b/oox/source/drawingml/texteffectscontext.cxx @@ -8,7 +8,7 @@ * */ -#include "oox/drawingml/texteffectscontext.hxx" +#include "drawingml/texteffectscontext.hxx" #include <map> diff --git a/oox/source/drawingml/textfield.cxx b/oox/source/drawingml/textfield.cxx index 55b538b0..2523156 100644 --- a/oox/source/drawingml/textfield.cxx +++ b/oox/source/drawingml/textfield.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "oox/drawingml/textfield.hxx" +#include "drawingml/textfield.hxx" #include <list> @@ -30,8 +30,8 @@ #include "oox/helper/helper.hxx" #include "oox/helper/propertyset.hxx" #include "oox/core/xmlfilterbase.hxx" -#include "oox/drawingml/textparagraphproperties.hxx" -#include "oox/drawingml/textcharacterproperties.hxx" +#include "drawingml/textparagraphproperties.hxx" +#include "drawingml/textcharacterproperties.hxx" using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/oox/source/drawingml/textfieldcontext.cxx b/oox/source/drawingml/textfieldcontext.cxx index 8dcb14d..d0ea8aa 100644 --- a/oox/source/drawingml/textfieldcontext.cxx +++ b/oox/source/drawingml/textfieldcontext.cxx @@ -17,10 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "oox/drawingml/textfieldcontext.hxx" -#include "oox/drawingml/textparagraphpropertiescontext.hxx" -#include "oox/drawingml/textcharacterpropertiescontext.hxx" -#include "oox/drawingml/textfield.hxx" +#include "drawingml/textfieldcontext.hxx" +#include "drawingml/textparagraphpropertiescontext.hxx" +#include "drawingml/textcharacterpropertiescontext.hxx" +#include "drawingml/textfield.hxx" using namespace ::oox::core; using namespace ::com::sun::star::uno; diff --git a/oox/source/drawingml/textfont.cxx b/oox/source/drawingml/textfont.cxx index 2bda567..742f020 100644 --- a/oox/source/drawingml/textfont.cxx +++ b/oox/source/drawingml/textfont.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "oox/drawingml/textfont.hxx" +#include "drawingml/textfont.hxx" #include <com/sun/star/awt/FontFamily.hpp> #include <com/sun/star/awt/FontPitch.hpp> #include "oox/drawingml/theme.hxx" diff --git a/oox/source/drawingml/textliststyle.cxx b/oox/source/drawingml/textliststyle.cxx index 3a92b12..29b359f 100644 --- a/oox/source/drawingml/textliststyle.cxx +++ b/oox/source/drawingml/textliststyle.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "oox/drawingml/textliststyle.hxx" +#include "drawingml/textliststyle.hxx" namespace oox { namespace drawingml { diff --git a/oox/source/drawingml/textliststylecontext.cxx b/oox/source/drawingml/textliststylecontext.cxx index 117351b..b8ada9e 100644 --- a/oox/source/drawingml/textliststylecontext.cxx +++ b/oox/source/drawingml/textliststylecontext.cxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "oox/drawingml/textliststylecontext.hxx" -#include "oox/drawingml/textparagraphpropertiescontext.hxx" +#include "drawingml/textliststylecontext.hxx" +#include "drawingml/textparagraphpropertiescontext.hxx" #include "oox/helper/attributelist.hxx" using namespace ::oox::core; diff --git a/oox/source/drawingml/textparagraph.cxx b/oox/source/drawingml/textparagraph.cxx index 098a941..ce61099 100644 --- a/oox/source/drawingml/textparagraph.cxx +++ b/oox/source/drawingml/textparagraph.cxx @@ -17,9 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "oox/drawingml/textparagraph.hxx" +#include "drawingml/textparagraph.hxx" #include "oox/drawingml/drawingmltypes.hxx" -#include "oox/drawingml/textcharacterproperties.hxx" +#include "drawingml/textcharacterproperties.hxx" #include <rtl/ustring.hxx> #include "oox/helper/propertyset.hxx" diff --git a/oox/source/drawingml/textparagraphproperties.cxx b/oox/source/drawingml/textparagraphproperties.cxx index 924a5e4..a7b5f6b 100644 --- a/oox/source/drawingml/textparagraphproperties.cxx +++ b/oox/source/drawingml/textparagraphproperties.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "oox/drawingml/textparagraphproperties.hxx" +#include "drawingml/textparagraphproperties.hxx" #include <com/sun/star/text/XNumberingRulesSupplier.hpp> #include <com/sun/star/container/XIndexReplace.hpp> diff --git a/oox/source/drawingml/textparagraphpropertiescontext.cxx b/oox/source/drawingml/textparagraphpropertiescontext.cxx index 035f99a..6c01a0a 100644 --- a/oox/source/drawingml/textparagraphpropertiescontext.cxx +++ b/oox/source/drawingml/textparagraphpropertiescontext.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "oox/drawingml/textparagraphpropertiescontext.hxx" +#include "drawingml/textparagraphpropertiescontext.hxx" #include <com/sun/star/text/WritingMode2.hpp> #include <com/sun/star/awt/FontDescriptor.hpp> @@ -25,8 +25,8 @@ #include <svx/unopage.hxx> -#include "oox/drawingml/colorchoicecontext.hxx" -#include "oox/drawingml/textcharacterpropertiescontext.hxx" +#include "drawingml/colorchoicecontext.hxx" +#include "drawingml/textcharacterpropertiescontext.hxx" #include "oox/drawingml/fillproperties.hxx" #include "oox/helper/attributelist.hxx" #include "textspacingcontext.hxx" diff --git a/oox/source/drawingml/textrun.cxx b/oox/source/drawingml/textrun.cxx index 99e40fc..b988522 100644 --- a/oox/source/drawingml/textrun.cxx +++ b/oox/source/drawingml/textrun.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "oox/drawingml/textrun.hxx" +#include "drawingml/textrun.hxx" #include <com/sun/star/text/ControlCharacter.hpp> #include <com/sun/star/beans/XMultiPropertySet.hpp> diff --git a/oox/source/drawingml/textspacingcontext.cxx b/oox/source/drawingml/textspacingcontext.cxx index 8ef0cae..ef0556d 100644 --- a/oox/source/drawingml/textspacingcontext.cxx +++ b/oox/source/drawingml/textspacingcontext.cxx @@ -18,7 +18,7 @@ */ #include "oox/drawingml/drawingmltypes.hxx" -#include "oox/drawingml/textspacing.hxx" +#include "drawingml/textspacing.hxx" #include "textspacingcontext.hxx" using namespace ::oox::core; diff --git a/oox/source/drawingml/theme.cxx b/oox/source/drawingml/theme.cxx index 31c3c1b..8f4b7bc 100644 --- a/oox/source/drawingml/theme.cxx +++ b/oox/source/drawingml/theme.cxx @@ -18,6 +18,8 @@ */ #include "oox/drawingml/theme.hxx" +#include <oox/token/tokens.hxx> +#include <drawingml/textcharacterproperties.hxx> namespace oox { namespace drawingml { diff --git a/oox/source/drawingml/themeelementscontext.cxx b/oox/source/drawingml/themeelementscontext.cxx index 0b6ab7a..d28150b 100644 --- a/oox/source/drawingml/themeelementscontext.cxx +++ b/oox/source/drawingml/themeelementscontext.cxx @@ -17,12 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "oox/drawingml/themeelementscontext.hxx" -#include "oox/drawingml/clrschemecontext.hxx" +#include "drawingml/themeelementscontext.hxx" +#include "drawingml/clrschemecontext.hxx" #include "oox/drawingml/lineproperties.hxx" -#include "oox/drawingml/linepropertiescontext.hxx" +#include "drawingml/linepropertiescontext.hxx" #include "oox/drawingml/fillproperties.hxx" -#include "oox/drawingml/fillpropertiesgroupcontext.hxx" +#include "drawingml/fillpropertiesgroupcontext.hxx" +#include "drawingml/textcharacterproperties.hxx" #include "oox/drawingml/theme.hxx" #include "oox/helper/attributelist.hxx" #include "effectproperties.hxx" diff --git a/oox/source/drawingml/themefragmenthandler.cxx b/oox/source/drawingml/themefragmenthandler.cxx index b0f4f85..edb044b 100644 --- a/oox/source/drawingml/themefragmenthandler.cxx +++ b/oox/source/drawingml/themefragmenthandler.cxx @@ -18,9 +18,9 @@ */ #include "oox/drawingml/themefragmenthandler.hxx" -#include "oox/drawingml/objectdefaultcontext.hxx" +#include "drawingml/objectdefaultcontext.hxx" #include "oox/drawingml/theme.hxx" -#include "oox/drawingml/themeelementscontext.hxx" +#include "drawingml/themeelementscontext.hxx" using namespace ::oox::core; diff --git a/oox/source/drawingml/transform2dcontext.cxx b/oox/source/drawingml/transform2dcontext.cxx index d3f7f5e..a6a39eb 100644 --- a/oox/source/drawingml/transform2dcontext.cxx +++ b/oox/source/drawingml/transform2dcontext.cxx @@ -17,10 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "oox/drawingml/transform2dcontext.hxx" +#include "drawingml/transform2dcontext.hxx" #include "oox/helper/attributelist.hxx" #include "oox/drawingml/shape.hxx" -#include "oox/drawingml/textbody.hxx" +#include "drawingml/customshapeproperties.hxx" +#include "drawingml/textbody.hxx" using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; diff --git a/oox/source/ppt/animvariantcontext.cxx b/oox/source/ppt/animvariantcontext.cxx index bc5aca0..92cb578 100644 --- a/oox/source/ppt/animvariantcontext.cxx +++ b/oox/source/ppt/animvariantcontext.cxx @@ -29,7 +29,7 @@ #include "oox/helper/attributelist.hxx" #include "oox/core/fragmenthandler.hxx" #include "oox/core/xmlfilterbase.hxx" -#include "oox/drawingml/colorchoicecontext.hxx" +#include "drawingml/colorchoicecontext.hxx" #include "pptfilterhelpers.hxx" using namespace ::oox::core; diff --git a/oox/source/ppt/backgroundproperties.cxx b/oox/source/ppt/backgroundproperties.cxx index e081a75..c2c8ef2 100644 --- a/oox/source/ppt/backgroundproperties.cxx +++ b/oox/source/ppt/backgroundproperties.cxx @@ -18,7 +18,7 @@ */ #include "oox/ppt/backgroundproperties.hxx" -#include "oox/drawingml/fillpropertiesgroupcontext.hxx" +#include "drawingml/fillpropertiesgroupcontext.hxx" #include "oox/drawingml/drawingmltypes.hxx" #include "oox/core/contexthandler2.hxx" diff --git a/oox/source/ppt/dgmlayout.cxx b/oox/source/ppt/dgmlayout.cxx index 9af11a2..678fb71 100644 --- a/oox/source/ppt/dgmlayout.cxx +++ b/oox/source/ppt/dgmlayout.cxx @@ -23,6 +23,7 @@ #include "drawingml/diagram/diagram.hxx" #include "oox/dump/pptxdumper.hxx" +#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/drawing/XShape.hpp> #include <com/sun/star/drawing/XMasterPageTarget.hpp> #include <com/sun/star/uno/XComponentContext.hpp> diff --git a/oox/source/ppt/pptgraphicshapecontext.cxx b/oox/source/ppt/pptgraphicshapecontext.cxx index 229867d..c31cc55 100644 --- a/oox/source/ppt/pptgraphicshapecontext.cxx +++ b/oox/source/ppt/pptgraphicshapecontext.cxx @@ -27,13 +27,13 @@ #include "oox/ppt/pptgraphicshapecontext.hxx" #include "oox/ppt/pptshapepropertiescontext.hxx" #include "oox/ppt/slidepersist.hxx" -#include "oox/drawingml/shapestylecontext.hxx" +#include "drawingml/shapestylecontext.hxx" #include "oox/token/namespaces.hxx" -#include "oox/drawingml/fillpropertiesgroupcontext.hxx" +#include "drawingml/fillpropertiesgroupcontext.hxx" #include "oox/drawingml/lineproperties.hxx" #include "oox/drawingml/drawingmltypes.hxx" -#include "oox/drawingml/customshapegeometry.hxx" -#include "oox/drawingml/textbodycontext.hxx" +#include "drawingml/customshapegeometry.hxx" +#include "drawingml/textbodycontext.hxx" #include <oox/token/tokens.hxx> using namespace oox::core; diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx index d026128..f454f44 100644 --- a/oox/source/ppt/pptshape.cxx +++ b/oox/source/ppt/pptshape.cxx @@ -19,7 +19,7 @@ #include "oox/ppt/pptshape.hxx" #include "oox/core/xmlfilterbase.hxx" -#include "oox/drawingml/textbody.hxx" +#include "drawingml/textbody.hxx" #include <com/sun/star/container/XNamed.hpp> #include <com/sun/star/beans/XMultiPropertySet.hpp> diff --git a/oox/source/ppt/pptshapecontext.cxx b/oox/source/ppt/pptshapecontext.cxx index c0117aa..e5e0fce 100644 --- a/oox/source/ppt/pptshapecontext.cxx +++ b/oox/source/ppt/pptshapecontext.cxx @@ -28,13 +28,13 @@ #include "oox/ppt/pptshapecontext.hxx" #include "oox/ppt/pptshapepropertiescontext.hxx" #include "oox/ppt/slidepersist.hxx" -#include "oox/drawingml/shapestylecontext.hxx" -#include "oox/drawingml/fillpropertiesgroupcontext.hxx" +#include "drawingml/shapestylecontext.hxx" +#include "drawingml/fillpropertiesgroupcontext.hxx" #include "oox/drawingml/lineproperties.hxx" #include "oox/drawingml/drawingmltypes.hxx" -#include "oox/drawingml/customshapegeometry.hxx" -#include "oox/drawingml/textbodycontext.hxx" -#include "oox/drawingml/transform2dcontext.hxx" +#include "drawingml/customshapegeometry.hxx" +#include "drawingml/textbodycontext.hxx" +#include "drawingml/transform2dcontext.hxx" using namespace oox::core; using namespace ::com::sun::star; diff --git a/oox/source/ppt/pptshapegroupcontext.cxx b/oox/source/ppt/pptshapegroupcontext.cxx index 9bf3d2b..fb6f780 100644 --- a/oox/source/ppt/pptshapegroupcontext.cxx +++ b/oox/source/ppt/pptshapegroupcontext.cxx @@ -29,8 +29,9 @@ #include "oox/drawingml/graphicshapecontext.hxx" #include "oox/drawingml/lineproperties.hxx" #include "oox/drawingml/drawingmltypes.hxx" -#include "oox/drawingml/customshapegeometry.hxx" -#include "oox/drawingml/textbodycontext.hxx" +#include "drawingml/customshapegeometry.hxx" +#include "drawingml/shapepropertiescontext.hxx" +#include "drawingml/textbodycontext.hxx" #include "oox/drawingml/connectorshapecontext.hxx" #include "oox/drawingml/fillproperties.hxx" #include "extdrawingfragmenthandler.hxx" diff --git a/oox/source/ppt/pptshapepropertiescontext.cxx b/oox/source/ppt/pptshapepropertiescontext.cxx index 77ba83c..cf12783 100644 --- a/oox/source/ppt/pptshapepropertiescontext.cxx +++ b/oox/source/ppt/pptshapepropertiescontext.cxx @@ -26,12 +26,12 @@ #include "oox/ppt/pptshape.hxx" #include "oox/ppt/pptshapepropertiescontext.hxx" #include "oox/ppt/slidepersist.hxx" -#include "oox/drawingml/shapestylecontext.hxx" -#include "oox/drawingml/fillpropertiesgroupcontext.hxx" +#include "drawingml/shapestylecontext.hxx" +#include "drawingml/fillpropertiesgroupcontext.hxx" #include "oox/drawingml/lineproperties.hxx" #include "oox/drawingml/drawingmltypes.hxx" -#include "oox/drawingml/customshapegeometry.hxx" -#include "oox/drawingml/textbodycontext.hxx" +#include "drawingml/customshapegeometry.hxx" +#include "drawingml/textbodycontext.hxx" using namespace oox::core; using namespace ::com::sun::star; diff --git a/oox/source/ppt/presentationfragmenthandler.cxx b/oox/source/ppt/presentationfragmenthandler.cxx index a0eb001..bef84de 100644 --- a/oox/source/ppt/presentationfragmenthandler.cxx +++ b/oox/source/ppt/presentationfragmenthandler.cxx @@ -35,7 +35,7 @@ #include "oox/drawingml/theme.hxx" #include "oox/drawingml/drawingmltypes.hxx" #include "oox/drawingml/themefragmenthandler.hxx" -#include "oox/drawingml/textliststylecontext.hxx" +#include "drawingml/textliststylecontext.hxx" #include "oox/ppt/pptshape.hxx" #include "oox/ppt/presentationfragmenthandler.hxx" #include "oox/ppt/slidefragmenthandler.hxx" diff --git a/oox/source/ppt/slidefragmenthandler.cxx b/oox/source/ppt/slidefragmenthandler.cxx index 70c9472..0edece0 100644 --- a/oox/source/ppt/slidefragmenthandler.cxx +++ b/oox/source/ppt/slidefragmenthandler.cxx @@ -35,7 +35,8 @@ #include "oox/ppt/pptshape.hxx" #include "oox/vml/vmldrawing.hxx" #include "oox/vml/vmldrawingfragment.hxx" -#include "oox/drawingml/clrschemecontext.hxx" +#include "drawingml/clrschemecontext.hxx" +#include "drawingml/textliststyle.hxx" #include "oox/ppt/pptimport.hxx" using namespace ::com::sun::star; diff --git a/oox/source/ppt/slidemastertextstylescontext.cxx b/oox/source/ppt/slidemastertextstylescontext.cxx index 71f6767..876f495 100644 --- a/oox/source/ppt/slidemastertextstylescontext.cxx +++ b/oox/source/ppt/slidemastertextstylescontext.cxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "oox/drawingml/textliststyle.hxx" -#include "oox/drawingml/textliststylecontext.hxx" +#include "drawingml/textliststyle.hxx" +#include "drawingml/textliststylecontext.hxx" #include "oox/ppt/slidemastertextstylescontext.hxx" using namespace ::oox::core; diff --git a/oox/source/ppt/slidepersist.cxx b/oox/source/ppt/slidepersist.cxx index b13c5f7..54b28e6 100644 --- a/oox/source/ppt/slidepersist.cxx +++ b/oox/source/ppt/slidepersist.cxx @@ -22,9 +22,12 @@ #include "oox/ppt/slidepersist.hxx" #include "oox/drawingml/fillproperties.hxx" #include "oox/drawingml/shapepropertymap.hxx" +#include "oox/helper/propertymap.hxx" #include "oox/helper/propertyset.hxx" #include "oox/vml/vmldrawing.hxx" #include "oox/core/xmlfilterbase.hxx" +#include "drawingml/textliststyle.hxx" +#include "drawingml/textparagraphproperties.hxx" #include <com/sun/star/style/XStyle.hpp> #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> diff --git a/oox/source/ppt/soundactioncontext.cxx b/oox/source/ppt/soundactioncontext.cxx index 9d72e3e..0996fdb 100644 --- a/oox/source/ppt/soundactioncontext.cxx +++ b/oox/source/ppt/soundactioncontext.cxx @@ -24,7 +24,7 @@ #include "oox/helper/attributelist.hxx" #include "oox/helper/propertymap.hxx" -#include "oox/drawingml/embeddedwavaudiofile.hxx" +#include "drawingml/embeddedwavaudiofile.hxx" using namespace ::oox::core; using namespace ::com::sun::star::xml::sax; diff --git a/oox/source/ppt/timenodelistcontext.cxx b/oox/source/ppt/timenodelistcontext.cxx index a2ab7dc..5f3db9a 100644 --- a/oox/source/ppt/timenodelistcontext.cxx +++ b/oox/source/ppt/timenodelistcontext.cxx @@ -41,7 +41,7 @@ #include "oox/helper/attributelist.hxx" #include "oox/core/xmlfilterbase.hxx" #include "oox/drawingml/drawingmltypes.hxx" -#include "oox/drawingml/colorchoicecontext.hxx" +#include "drawingml/colorchoicecontext.hxx" #include "oox/ppt/slidetransition.hxx" #include "animvariantcontext.hxx" diff --git a/oox/source/ppt/timetargetelementcontext.cxx b/oox/source/ppt/timetargetelementcontext.cxx index 93e3dd0..230dd89 100644 --- a/oox/source/ppt/timetargetelementcontext.cxx +++ b/oox/source/ppt/timetargetelementcontext.cxx @@ -26,7 +26,7 @@ #include <com/sun/star/uno/Any.hxx> #include "oox/helper/attributelist.hxx" -#include "oox/drawingml/embeddedwavaudiofile.hxx" +#include "drawingml/embeddedwavaudiofile.hxx" using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; diff --git a/oox/source/shape/WpgContext.cxx b/oox/source/shape/WpgContext.cxx index 9b62fef..4cbf200 100644 --- a/oox/source/shape/WpgContext.cxx +++ b/oox/source/shape/WpgContext.cxx @@ -8,7 +8,7 @@ */ #include "WpgContext.hxx" -#include <oox/drawingml/shapepropertiescontext.hxx> +#include <drawingml/shapepropertiescontext.hxx> #include <oox/drawingml/shapegroupcontext.hxx> #include <oox/drawingml/graphicshapecontext.hxx> diff --git a/oox/source/shape/WpsContext.cxx b/oox/source/shape/WpsContext.cxx index fb42e62..4d58638 100644 --- a/oox/source/shape/WpsContext.cxx +++ b/oox/source/shape/WpsContext.cxx @@ -8,11 +8,15 @@ */ #include "WpsContext.hxx" -#include <oox/drawingml/shapepropertiescontext.hxx> -#include <oox/drawingml/shapestylecontext.hxx> +#include <drawingml/customshapeproperties.hxx> +#include <drawingml/shapepropertiescontext.hxx> +#include <drawingml/shapestylecontext.hxx> +#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertyState.hpp> #include <oox/drawingml/drawingmltypes.hxx> +#include <boost/optional.hpp> + using namespace com::sun::star; namespace oox
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
