[Libreoffice-commits] .: 2 commits - solenv/gbuild writerfilter/source

[Lubos Lunak]

 solenv/gbuild/platform/WNT_INTEL_MSC.mk |    2 +-
 solenv/gbuild/platform/com_GCC_class.mk |    2 +-
 solenv/gbuild/platform/solaris.mk       |    2 +-
 writerfilter/source/ooxml/model.xml     |   15 +++++++++++++++
 4 files changed, 18 insertions(+), 3 deletions(-)

New commits:
commit d5fe99eae04e0a706f072e1da5943c04f52dcd40
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Fri Dec 16 18:52:53 2011 +0100

    at least process sub-elements of w:customXml (fdo#35983)

diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
index 12d29a5..39ecf66 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -22700,6 +22700,21 @@
       <attribute name="uri" tokenid="ooxml:CT_CustomXmlRun_uri"/>
       <attribute name="element" tokenid="ooxml:CT_CustomXmlRun_element"/>
     </resource>
+    <resource name="CT_CustomXmlBlock" resource="Properties" tag="content">
+      <element name="customXmlPr" tokenid="ooxml:CT_CustomXmlBlock_customXmlPr"/>
+      <attribute name="uri" tokenid="ooxml:CT_CustomXmlBlock_uri"/>
+      <attribute name="element" tokenid="ooxml:CT_CustomXmlBlock_element"/>
+    </resource>
+    <resource name="CT_CustomXmlCell" resource="Properties" tag="content">
+      <element name="customXmlPr" tokenid="ooxml:CT_CustomXmlCell_customXmlPr"/>
+      <attribute name="uri" tokenid="ooxml:CT_CustomXmlCell_uri"/>
+      <attribute name="element" tokenid="ooxml:CT_CustomXmlCell_element"/>
+    </resource>
+    <resource name="CT_CustomXmlRow" resource="Properties" tag="content">
+      <element name="customXmlPr" tokenid="ooxml:CT_CustomXmlRow_customXmlPr"/>
+      <attribute name="uri" tokenid="ooxml:CT_CustomXmlRow_uri"/>
+      <attribute name="element" tokenid="ooxml:CT_CustomXmlRow_element"/>
+    </resource>
     <resource name="CT_SmartTagRun" resource="Properties" tag="content">
       <element name="smartTagPr" tokenid="ooxml:CT_SmartTagRun_smartTagPr"/>
       <attribute name="uri" tokenid="ooxml:CT_SmartTagRun_uri"/>
commit b55dbc1e19163ba477b32b6234f29018f0d0af02
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Wed Dec 14 16:41:01 2011 +0100

    make gbuild output [Build CXX] filename also with the .cxx extension

diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 45c9609..ddf9aea 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -299,7 +299,7 @@ endef
 # CxxObject class
 
 define gb_CxxObject__command
-$(call gb_Output_announce,$(2),$(true),CXX,3)
+$(call gb_Output_announce,$(2).cxx,$(true),CXX,3)
 $(call gb_Helper_abbreviate_dirs_native,\
 	mkdir -p $(dir $(1)) $(dir $(4)) && \
 	$(gb_CXX) \
diff --git a/solenv/gbuild/platform/com_GCC_class.mk b/solenv/gbuild/platform/com_GCC_class.mk
index 61afbc1..5bf7740 100644
--- a/solenv/gbuild/platform/com_GCC_class.mk
+++ b/solenv/gbuild/platform/com_GCC_class.mk
@@ -44,7 +44,7 @@ endef
 
 # $(call gb_CxxObject__command,object,relative-source,source,dep-file)
 define gb_CxxObject__command
-$(call gb_Output_announce,$(2),$(true),CXX,3)
+$(call gb_Output_announce,$(2).cxx,$(true),CXX,3)
 $(call gb_Helper_abbreviate_dirs,\
 	mkdir -p $(dir $(1)) $(dir $(4)) && \
 	$(gb_CXX) \
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index f23571d..a3d055b 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -179,7 +179,7 @@ endef
 # CxxObject class
 
 define gb_CxxObject__command
-$(call gb_Output_announce,$(2),$(true),CXX,3)
+$(call gb_Output_announce,$(2).cxx,$(true),CXX,3)
 $(call gb_Helper_abbreviate_dirs,\
 	mkdir -p $(dir $(1)) $(dir $(4)) && \
 	$(gb_CXX) \