offapi/com/sun/star/i18n/ParseResult.idl | 10 oox/source/ppt/pptshape.cxx | 392 +++++++++++++++---------------- oox/source/token/namespaces-strict.txt | 2 solenv/gbuild/CustomTarget.mk | 11 svx/source/unodraw/unoshap4.cxx | 6 writerfilter/source/ooxml/model.xml | 2 6 files changed, 211 insertions(+), 212 deletions(-)
New commits: commit 6c81b5fc685b487f4c777cca2bae77d21cf4fac2 Author: Michael Stahl <[email protected]> Date: Thu Jan 21 10:41:22 2016 +0100 offapi: ParseResult documentation makes no sense fix confusion between characters, code points and code units Change-Id: I315735e103799ff2fb53e99442d500b998f50304 diff --git a/offapi/com/sun/star/i18n/ParseResult.idl b/offapi/com/sun/star/i18n/ParseResult.idl index 4c6910f..22b2ccb 100644 --- a/offapi/com/sun/star/i18n/ParseResult.idl +++ b/offapi/com/sun/star/i18n/ParseResult.idl @@ -31,15 +31,15 @@ module com { module sun { module star { module i18n { published struct ParseResult { - /** Count of ignored leading whitespace, in code points, not - characters. */ + /** Count of ignored leading whitespace, in UTF-16 code units, not + Unicode code points. */ long LeadingWhiteSpace; - /** Code point index of first unprocessed character. */ + /** UTF-16 code unit index of first unprocessed character. */ long EndPos; - /** Number of characters (not code points) of the parsed token, not - including leading whitespace. */ + /** Number of code points (not UTF-16 code units) of the parsed token, + not including leading whitespace. */ long CharLen; /** Value of token in case of numeric. */ commit e7279e5bab5aece2f759c134e29fa1760bed157e Author: Michael Stahl <[email protected]> Date: Wed Jan 20 11:57:48 2016 +0100 svx: use SAL_WARN_IF Change-Id: Ic638636aef8c42635cd166ab779564434d5daecf diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx index d4afc83..093d164 100644 --- a/svx/source/unodraw/unoshap4.cxx +++ b/svx/source/unodraw/unoshap4.cxx @@ -303,12 +303,8 @@ bool SvxOle2Shape::getPropertyValueImpl( const OUString& rName, const SfxItemPro // usage. Removed it, former fallback is used now if ( pProperty->nWID == OWN_ATTR_OLEMODEL || pProperty->nWID == OWN_ATTR_OLE_EMBEDDED_OBJECT ) { -#if OSL_DEBUG_LEVEL > 0 const bool bSuccess(pObj->AddOwnLightClient()); - OSL_ENSURE( bSuccess, "An object without client is provided!" ); -#else - pObj->AddOwnLightClient(); -#endif + SAL_WARN_IF(!bSuccess, "svx.svdraw", "An object without client is provided!"); } if ( pProperty->nWID == OWN_ATTR_OLEMODEL ) commit 1bceacf3ade2417e4a038964b3369b18f2729c94 Author: Michael Stahl <[email protected]> Date: Tue Jan 19 16:08:18 2016 +0100 oox: fix indentation of PPTShape::addShape() Change-Id: Ic878535d3bc2d57dc24cc1821d8ce8403482b253 diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx index ce9b835..4ba58af 100644 --- a/oox/source/ppt/pptshape.cxx +++ b/oox/source/ppt/pptshape.cxx @@ -118,201 +118,204 @@ void PPTShape::addShape( // only placeholder from layout are being inserted if ( mnSubType && ( meShapeLocation == Master ) ) return; + + OUString sServiceName( msServiceName ); + if (sServiceName.isEmpty()) + return; try { - OUString sServiceName( msServiceName ); - if( !sServiceName.isEmpty() ) - { - oox::drawingml::TextListStylePtr aMasterTextListStyle; - Reference< lang::XMultiServiceFactory > xServiceFact( rFilterBase.getModel(), UNO_QUERY_THROW ); - bool bClearText = false; + oox::drawingml::TextListStylePtr aMasterTextListStyle; + Reference<lang::XMultiServiceFactory> xServiceFact(rFilterBase.getModel(), UNO_QUERY_THROW); + bool bClearText = false; - if ( sServiceName != "com.sun.star.drawing.GraphicObjectShape" && - sServiceName != "com.sun.star.drawing.OLE2Shape" ) + if (sServiceName != "com.sun.star.drawing.GraphicObjectShape" && + sServiceName != "com.sun.star.drawing.OLE2Shape") + { + const OUString sOutlinerShapeService("com.sun.star.presentation.OutlinerShape"); + SAL_INFO("oox.ppt","has master: " << std::hex << rSlidePersist.getMasterPersist().get()); + switch (mnSubType) { - const OUString sOutlinerShapeService( "com.sun.star.presentation.OutlinerShape" ); - SAL_INFO("oox.ppt","has master: " << std::hex << rSlidePersist.getMasterPersist().get()); - switch( mnSubType ) + case XML_ctrTitle : + case XML_title : { - case XML_ctrTitle : - case XML_title : - { - sServiceName = "com.sun.star.presentation.TitleTextShape"; - aMasterTextListStyle = rSlidePersist.getMasterPersist().get() ? rSlidePersist.getMasterPersist()->getTitleTextStyle() : rSlidePersist.getTitleTextStyle(); - bClearText = true; + sServiceName = "com.sun.star.presentation.TitleTextShape"; + aMasterTextListStyle = rSlidePersist.getMasterPersist().get() ? rSlidePersist.getMasterPersist()->getTitleTextStyle() : rSlidePersist.getTitleTextStyle(); + bClearText = true; + } + break; + case XML_subTitle : + { + if ((meShapeLocation == Master) || (meShapeLocation == Layout)) + sServiceName = OUString(); + else { + sServiceName = "com.sun.star.presentation.SubtitleShape"; + aMasterTextListStyle = rSlidePersist.getMasterPersist().get() ? rSlidePersist.getMasterPersist()->getBodyTextStyle() : rSlidePersist.getBodyTextStyle(); } - break; - case XML_subTitle : + } + break; + case XML_obj : + { + sServiceName = sOutlinerShapeService; + aMasterTextListStyle = rSlidePersist.getMasterPersist().get() ? rSlidePersist.getMasterPersist()->getBodyTextStyle() : rSlidePersist.getBodyTextStyle(); + } + break; + case XML_body : + { + if (rSlidePersist.isNotesPage()) { - if ( ( meShapeLocation == Master ) || ( meShapeLocation == Layout ) ) - sServiceName = OUString(); - else { - sServiceName = "com.sun.star.presentation.SubtitleShape"; - aMasterTextListStyle = rSlidePersist.getMasterPersist().get() ? rSlidePersist.getMasterPersist()->getBodyTextStyle() : rSlidePersist.getBodyTextStyle(); - } + sServiceName = "com.sun.star.presentation.NotesShape"; + aMasterTextListStyle = rSlidePersist.getMasterPersist().get() ? rSlidePersist.getMasterPersist()->getNotesTextStyle() : rSlidePersist.getNotesTextStyle(); } - break; - case XML_obj : + else { sServiceName = sOutlinerShapeService; aMasterTextListStyle = rSlidePersist.getMasterPersist().get() ? rSlidePersist.getMasterPersist()->getBodyTextStyle() : rSlidePersist.getBodyTextStyle(); } - break; - case XML_body : - { - if ( rSlidePersist.isNotesPage() ) - { - sServiceName = "com.sun.star.presentation.NotesShape"; - aMasterTextListStyle = rSlidePersist.getMasterPersist().get() ? rSlidePersist.getMasterPersist()->getNotesTextStyle() : rSlidePersist.getNotesTextStyle(); - } - else - { - sServiceName = sOutlinerShapeService; - aMasterTextListStyle = rSlidePersist.getMasterPersist().get() ? rSlidePersist.getMasterPersist()->getBodyTextStyle() : rSlidePersist.getBodyTextStyle(); - } - } - break; - case XML_dt : - sServiceName = "com.sun.star.presentation.DateTimeShape"; - bClearText = true; - break; - case XML_hdr : - sServiceName = "com.sun.star.presentation.HeaderShape"; - bClearText = true; - break; - case XML_ftr : - sServiceName = "com.sun.star.presentation.FooterShape"; - bClearText = true; - break; - case XML_sldNum : - sServiceName = "com.sun.star.presentation.SlideNumberShape"; - bClearText = true; - break; - case XML_sldImg : - sServiceName = "com.sun.star.presentation.PageShape"; - break; - case XML_chart : - if ( meShapeLocation == Layout ) - sServiceName = sOutlinerShapeService; - else - sServiceName = "com.sun.star.presentation.ChartShape"; - break; - case XML_tbl : - if ( meShapeLocation == Layout ) - sServiceName = sOutlinerShapeService; - else - sServiceName = "com.sun.star.presentation.TableShape"; - break; - case XML_pic : - if ( meShapeLocation == Layout ) - sServiceName = sOutlinerShapeService; - else - sServiceName = "com.sun.star.presentation.GraphicObjectShape"; - break; - case XML_media : - if ( meShapeLocation == Layout ) - sServiceName = sOutlinerShapeService; - else - sServiceName = "com.sun.star.presentation.MediaShape"; - break; - default: - if ( mnSubType && meShapeLocation == Layout ) - sServiceName = sOutlinerShapeService; - break; } + break; + case XML_dt : + sServiceName = "com.sun.star.presentation.DateTimeShape"; + bClearText = true; + break; + case XML_hdr : + sServiceName = "com.sun.star.presentation.HeaderShape"; + bClearText = true; + break; + case XML_ftr : + sServiceName = "com.sun.star.presentation.FooterShape"; + bClearText = true; + break; + case XML_sldNum : + sServiceName = "com.sun.star.presentation.SlideNumberShape"; + bClearText = true; + break; + case XML_sldImg : + sServiceName = "com.sun.star.presentation.PageShape"; + break; + case XML_chart : + if (meShapeLocation == Layout) + sServiceName = sOutlinerShapeService; + else + sServiceName = "com.sun.star.presentation.ChartShape"; + break; + case XML_tbl : + if (meShapeLocation == Layout) + sServiceName = sOutlinerShapeService; + else + sServiceName = "com.sun.star.presentation.TableShape"; + break; + case XML_pic : + if (meShapeLocation == Layout) + sServiceName = sOutlinerShapeService; + else + sServiceName = "com.sun.star.presentation.GraphicObjectShape"; + break; + case XML_media : + if (meShapeLocation == Layout) + sServiceName = sOutlinerShapeService; + else + sServiceName = "com.sun.star.presentation.MediaShape"; + break; + default: + if (mnSubType && meShapeLocation == Layout) + sServiceName = sOutlinerShapeService; + break; } + } + + SAL_INFO("oox.ppt","shape service: " << sServiceName); - SAL_INFO("oox.ppt","shape service: " << sServiceName); - - if( mnSubType && getSubTypeIndex().has() && meShapeLocation == Layout ) { - oox::drawingml::ShapePtr pPlaceholder = PPTShape::findPlaceholderByIndex( getSubTypeIndex().get(), rSlidePersist.getShapes()->getChildren(), true ); - if (!pPlaceholder.get()) - pPlaceholder = PPTShape::findPlaceholder( mnSubType, 0, getSubTypeIndex(), rSlidePersist.getShapes()->getChildren(), true ); - - if (pPlaceholder.get()) { - if( maSize.Width == 0 || maSize.Height == 0 ) { - awt::Size aSize = maSize; - if( maSize.Width == 0 ) - aSize.Width = pPlaceholder->getSize().Width; - if( maSize.Height == 0 ) - aSize.Height = pPlaceholder->getSize().Height; - setSize( aSize ); - if ( maPosition.X == 0 || maPosition.Y == 0 ) { - awt::Point aPosition = maPosition; - if( maPosition.X == 0 ) - aPosition.X = pPlaceholder->getPosition().X; - if( maPosition.Y == 0 ) - aPosition.Y = pPlaceholder->getPosition().Y; - setPosition( aPosition ); - } + if (mnSubType && getSubTypeIndex().has() && meShapeLocation == Layout) + { + oox::drawingml::ShapePtr pPlaceholder = PPTShape::findPlaceholderByIndex( getSubTypeIndex().get(), rSlidePersist.getShapes()->getChildren(), true ); + if (!pPlaceholder.get()) + pPlaceholder = PPTShape::findPlaceholder( mnSubType, 0, getSubTypeIndex(), rSlidePersist.getShapes()->getChildren(), true ); + + if (pPlaceholder.get()) { + if (maSize.Width == 0 || maSize.Height == 0) { + awt::Size aSize = maSize; + if (maSize.Width == 0) + aSize.Width = pPlaceholder->getSize().Width; + if (maSize.Height == 0) + aSize.Height = pPlaceholder->getSize().Height; + setSize( aSize ); + if (maPosition.X == 0 || maPosition.Y == 0) { + awt::Point aPosition = maPosition; + if (maPosition.X == 0) + aPosition.X = pPlaceholder->getPosition().X; + if (maPosition.Y == 0) + aPosition.Y = pPlaceholder->getPosition().Y; + setPosition( aPosition ); } } } + } - // use placeholder index if possible - if( mnSubType && getSubTypeIndex().has() && rSlidePersist.getMasterPersist().get() ) { - oox::drawingml::ShapePtr pPlaceholder = PPTShape::findPlaceholderByIndex( getSubTypeIndex().get(), rSlidePersist.getMasterPersist()->getShapes()->getChildren() ); - // TODO: Check if this is required for non-notes slides as well... - if( rSlidePersist.isNotesPage() && pPlaceholder.get() && pPlaceholder->getSubType() != getSubType() ) - pPlaceholder.reset(); + // use placeholder index if possible + if (mnSubType && getSubTypeIndex().has() && rSlidePersist.getMasterPersist().get()) + { + oox::drawingml::ShapePtr pPlaceholder = PPTShape::findPlaceholderByIndex(getSubTypeIndex().get(), rSlidePersist.getMasterPersist()->getShapes()->getChildren()); + // TODO: Check if this is required for non-notes slides as well... + if (rSlidePersist.isNotesPage() && pPlaceholder.get() && pPlaceholder->getSubType() != getSubType()) + pPlaceholder.reset(); - if( pPlaceholder.get()) { - SAL_INFO("oox.ppt","found placeholder with index: " << getSubTypeIndex().get() << " and type: " << lclDebugSubType( mnSubType )); - } - if( pPlaceholder.get() ) { - PPTShape* pPPTPlaceholder = dynamic_cast< PPTShape* >( pPlaceholder.get() ); - TextListStylePtr pNewTextListStyle ( new TextListStyle() ); + if (pPlaceholder.get()) { + SAL_INFO("oox.ppt","found placeholder with index: " << getSubTypeIndex().get() << " and type: " << lclDebugSubType( mnSubType )); + } + if (pPlaceholder.get()) { + PPTShape* pPPTPlaceholder = dynamic_cast< PPTShape* >( pPlaceholder.get() ); + TextListStylePtr pNewTextListStyle ( new TextListStyle() ); - if( pPlaceholder->getTextBody() ) { + if (pPlaceholder->getTextBody()) { - pNewTextListStyle->apply( pPlaceholder->getTextBody()->getTextListStyle() ); - if( pPlaceholder->getMasterTextListStyle().get() ) - pNewTextListStyle->apply( *pPlaceholder->getMasterTextListStyle() ); + pNewTextListStyle->apply( pPlaceholder->getTextBody()->getTextListStyle() ); + if (pPlaceholder->getMasterTextListStyle().get()) + pNewTextListStyle->apply( *pPlaceholder->getMasterTextListStyle() ); - // SAL_INFO("oox.ppt","placeholder body style"); - // pPlaceholder->getTextBody()->getTextListStyle().dump(); - // SAL_INFO("oox.ppt","master text list style"); - // pPlaceholder->getMasterTextListStyle()->dump(); + // SAL_INFO("oox.ppt","placeholder body style"); + // pPlaceholder->getTextBody()->getTextListStyle().dump(); + // SAL_INFO("oox.ppt","master text list style"); + // pPlaceholder->getMasterTextListStyle()->dump(); - aMasterTextListStyle = pNewTextListStyle; - // SAL_INFO("oox.ppt","combined master text list style"); - // aMasterTextListStyle->dump(); - } - if( pPPTPlaceholder && pPPTPlaceholder->mpPlaceholder.get() ) { - SAL_INFO("oox.ppt","placeholder has parent placeholder: " << pPPTPlaceholder->mpPlaceholder->getId() << " type: " << lclDebugSubType( pPPTPlaceholder->mpPlaceholder->getSubType() ) << " index: " << pPPTPlaceholder->mpPlaceholder->getSubTypeIndex().get() ); - SAL_INFO("oox.ppt","has textbody " << (pPPTPlaceholder->mpPlaceholder->getTextBody() != nullptr) ); - TextListStylePtr pPlaceholderStyle = getSubTypeTextListStyle( rSlidePersist, pPPTPlaceholder->mpPlaceholder->getSubType() ); - if( pPPTPlaceholder->mpPlaceholder->getTextBody() ) - pNewTextListStyle->apply( pPPTPlaceholder->mpPlaceholder->getTextBody()->getTextListStyle() ); - if( pPlaceholderStyle.get() ) { - pNewTextListStyle->apply( *pPlaceholderStyle ); - //pPlaceholderStyle->dump(); - } + aMasterTextListStyle = pNewTextListStyle; + // SAL_INFO("oox.ppt","combined master text list style"); + // aMasterTextListStyle->dump(); + } + if (pPPTPlaceholder && pPPTPlaceholder->mpPlaceholder.get()) { + SAL_INFO("oox.ppt","placeholder has parent placeholder: " << pPPTPlaceholder->mpPlaceholder->getId() << " type: " << lclDebugSubType( pPPTPlaceholder->mpPlaceholder->getSubType() ) << " index: " << pPPTPlaceholder->mpPlaceholder->getSubTypeIndex().get() ); + SAL_INFO("oox.ppt","has textbody " << (pPPTPlaceholder->mpPlaceholder->getTextBody() != nullptr) ); + TextListStylePtr pPlaceholderStyle = getSubTypeTextListStyle( rSlidePersist, pPPTPlaceholder->mpPlaceholder->getSubType() ); + if (pPPTPlaceholder->mpPlaceholder->getTextBody()) + pNewTextListStyle->apply( pPPTPlaceholder->mpPlaceholder->getTextBody()->getTextListStyle() ); + if (pPlaceholderStyle.get()) { + pNewTextListStyle->apply( *pPlaceholderStyle ); + //pPlaceholderStyle->dump(); } - } else if( !mpPlaceholder.get() ) { - aMasterTextListStyle.reset(); } - SAL_INFO("oox.ppt","placeholder id: " << (pPlaceholder.get() ? pPlaceholder->getId() : "not found")); + } else if (!mpPlaceholder.get()) { + aMasterTextListStyle.reset(); } + SAL_INFO("oox.ppt","placeholder id: " << (pPlaceholder.get() ? pPlaceholder->getId() : "not found")); + } - if ( !sServiceName.isEmpty() ) + if (!sServiceName.isEmpty()) + { + if (!aMasterTextListStyle.get()) { - if ( !aMasterTextListStyle.get() ) + bool isOther = !getTextBody().get() && sServiceName != "com.sun.star.drawing.GroupShape"; + TextListStylePtr aSlideStyle = isOther ? rSlidePersist.getOtherTextStyle() : rSlidePersist.getDefaultTextStyle(); + // Combine from MasterSlide details as well. + if (rSlidePersist.getMasterPersist().get()) { - bool isOther = !getTextBody().get() && sServiceName != "com.sun.star.drawing.GroupShape"; - TextListStylePtr aSlideStyle = isOther ? rSlidePersist.getOtherTextStyle() : rSlidePersist.getDefaultTextStyle(); - // Combine from MasterSlide details as well. - if( rSlidePersist.getMasterPersist().get() ) - { - aMasterTextListStyle = isOther ? rSlidePersist.getMasterPersist()->getOtherTextStyle() : rSlidePersist.getMasterPersist()->getDefaultTextStyle(); - if( aSlideStyle.get() ) - aMasterTextListStyle->apply( *aSlideStyle.get() ); - } - else - { - aMasterTextListStyle = aSlideStyle; - } + aMasterTextListStyle = isOther ? rSlidePersist.getMasterPersist()->getOtherTextStyle() : rSlidePersist.getMasterPersist()->getDefaultTextStyle(); + if (aSlideStyle.get()) + aMasterTextListStyle->apply( *aSlideStyle.get() ); + } + else + { + aMasterTextListStyle = aSlideStyle; } + } if( aMasterTextListStyle.get() && getTextBody().get() ) { TextListStylePtr aCombinedTextListStyle (new TextListStyle()); @@ -328,46 +331,45 @@ void PPTShape::addShape( setMasterTextListStyle( aMasterTextListStyle ); Reference< XShape > xShape( createAndInsert( rFilterBase, sServiceName, pTheme, rxShapes, pShapeRect, bClearText, mpPlaceholder.get() != nullptr, aTransformation, getFillProperties() ) ); - if ( !rSlidePersist.isMasterPage() && rSlidePersist.getPage().is() && ( (sal_Int32)mnSubType == XML_title ) ) - { - try + if (!rSlidePersist.isMasterPage() && rSlidePersist.getPage().is() && ((sal_Int32)mnSubType == XML_title)) + { + try + { + OUString aTitleText; + Reference<XTextRange> xText(xShape, UNO_QUERY_THROW); + aTitleText = xText->getString(); + if (!aTitleText.isEmpty() && (aTitleText.getLength() < 64)) // just a magic value, but we don't want to set slide names which are too long { - OUString aTitleText; - Reference< XTextRange > xText( xShape, UNO_QUERY_THROW ); - aTitleText = xText->getString(); - if ( !aTitleText.isEmpty() && ( aTitleText.getLength() < 64 ) ) // just a magic value, but we don't want to set slide names which are too long - { - Reference< container::XNamed > xName( rSlidePersist.getPage(), UNO_QUERY_THROW ); - xName->setName( aTitleText ); - } + Reference<container::XNamed> xName(rSlidePersist.getPage(), UNO_QUERY_THROW); + xName->setName(aTitleText); } - catch( uno::Exception& ) - { + } + catch (uno::Exception&) + { - } } - if( pShapeMap ) + } + if (pShapeMap) + { + // bnc#705982 - if optional model id reference is + // there, use that to obtain target shape + if (!msModelId.isEmpty()) + { + (*pShapeMap)[ msModelId ] = shared_from_this(); + } + else if (!msId.isEmpty()) { - // bnc#705982 - if optional model id reference is - // there, use that to obtain target shape - if( !msModelId.isEmpty() ) - { - (*pShapeMap)[ msModelId ] = shared_from_this(); - } - else if( !msId.isEmpty() ) - { - (*pShapeMap)[ msId ] = shared_from_this(); - } + (*pShapeMap)[ msId ] = shared_from_this(); } - - // if this is a group shape, we have to add also each child shape - Reference< XShapes > xShapes( xShape, UNO_QUERY ); - if ( xShapes.is() ) - addChildren( rFilterBase, *this, pTheme, xShapes, pShapeRect ? *pShapeRect : awt::Rectangle( maPosition.X, maPosition.Y, maSize.Width, maSize.Height ), pShapeMap, aTransformation ); } + + // if this is a group shape, we have to add also each child shape + Reference<XShapes> xShapes(xShape, UNO_QUERY); + if (xShapes.is()) + addChildren( rFilterBase, *this, pTheme, xShapes, pShapeRect ? *pShapeRect : awt::Rectangle( maPosition.X, maPosition.Y, maSize.Width, maSize.Height ), pShapeMap, aTransformation ); } } - catch( const Exception& ) + catch (const Exception&) { } } commit 4eee0f8d1180300bd56942ad23321f8f3f1b6177 Author: Michael Stahl <[email protected]> Date: Fri Jan 15 21:45:01 2016 +0100 oox, writerfilter: incorrect a14 namespace Change-Id: I813ca0510b6cfc26c307c510f3511c01c0f65c85 diff --git a/oox/source/token/namespaces-strict.txt b/oox/source/token/namespaces-strict.txt index 69eb335..f9a4633 100644 --- a/oox/source/token/namespaces-strict.txt +++ b/oox/source/token/namespaces-strict.txt @@ -77,7 +77,7 @@ wps http://schemas.microsoft.com/office/word/2010/wordproces wpg http://schemas.microsoft.com/office/word/2010/wordprocessingGroup wp14 http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing w14 http://schemas.microsoft.com/office/word/2010/wordml -a14 http://schemas.microsoft.com/office/drawingml/2010/main +a14 http://schemas.microsoft.com/office/drawing/2010/main p14 http://schemas.microsoft.com/office/powerpoint/2010/main # MSO 2012/2013 extensions --------------------------------------------------------- diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml index 050a236..32935c9 100644 --- a/writerfilter/source/ooxml/model.xml +++ b/writerfilter/source/ooxml/model.xml @@ -5342,7 +5342,7 @@ </resource> </namespace> <namespace name="a14"> - <grammar xmlns="http://relaxng.org/ns/structure/1.0"; ns="http://schemas.microsoft.com/office/drawingml/2010/main";> + <grammar xmlns="http://relaxng.org/ns/structure/1.0"; ns="http://schemas.microsoft.com/office/drawing/2010/main";> <!-- Simple types --> <define name="ST_ArtisticEffectParam10"> <data type="integer"/> commit 25aea9b1ec325d060f0d29cddfc3762ca175e511 Author: Michael Stahl <[email protected]> Date: Fri Jan 15 21:52:01 2016 +0100 gbuild: missing dependency in CustomTarget Change-Id: I560384d91fa5c6ba42123330369628419fe1bc1c diff --git a/solenv/gbuild/CustomTarget.mk b/solenv/gbuild/CustomTarget.mk index 8f5ef05..28ffc16 100644 --- a/solenv/gbuild/CustomTarget.mk +++ b/solenv/gbuild/CustomTarget.mk @@ -93,14 +93,15 @@ $(call gb_CustomTarget_get_workdir,$(1))/misc/$(5)ids.inc \ $(call gb_CustomTarget_get_workdir,$(1))/$(5)names.inc \ $(if $(6),$(call gb_CustomTarget_get_workdir,$(1))/misc/$(6)) \ $(if $(7),$(call gb_CustomTarget_get_workdir,$(1))/$(7)names.inc) : \ - $(call gb_CustomTarget_get_workdir,$(1))/$(2)/token/$(4).hxx + $(call gb_CustomTarget_get_workdir,$(1))/$(2)/token/$(4).hxx touch $$@ $(call gb_CustomTarget_get_workdir,$(1))/$(2)/token/$(4).hxx : \ - $(if $(8),$(SRCDIR)/$(3)/$(8),$(SRCDIR)/solenv/bin/generate-tokens.pl) \ - $(SRCDIR)/$(3)/$(4).txt \ - $(SRCDIR)/$(3)/$(4).hxx.head \ - $(SRCDIR)/$(3)/$(4).hxx.tail + $(if $(7),$(SRCDIR)/$(3)/$(7).txt) \ + $(if $(8),$(SRCDIR)/$(3)/$(8),$(SRCDIR)/solenv/bin/generate-tokens.pl) \ + $(SRCDIR)/$(3)/$(4).txt \ + $(SRCDIR)/$(3)/$(4).hxx.head \ + $(SRCDIR)/$(3)/$(4).hxx.tail $$(call gb_Output_announce,$$(subst $(WORKDIR)/,,$$@),build,PRL,1) mkdir -p $(call gb_CustomTarget_get_workdir,$(1))/misc \ $(call gb_CustomTarget_get_workdir,$(1)) \ _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
