sw/source/core/layout/tabfrm.cxx | 5 ---
writerfilter/documentation/ooxml/model.xml | 41 +++++++++++++++++++++++++++++
writerfilter/source/ooxml/model.xml | 2 -
3 files changed, 42 insertions(+), 6 deletions(-)
New commits:
commit 9f03ad248e2e0151facadee0738a7fa6158743f9
Author: LuboÅ¡ LuÅák <l.lu...@suse.cz>
Date: Thu Jan 19 14:22:27 2012 +0100
a feeble attempt at at least some docs for writerfilter
diff --git a/writerfilter/documentation/ooxml/model.xml
b/writerfilter/documentation/ooxml/model.xml
new file mode 100644
index 0000000..c50f23d
--- /dev/null
+++ b/writerfilter/documentation/ooxml/model.xml
@@ -0,0 +1,41 @@
+These are various notes about ooxml/model.xml and related stuff. They have been
+mostly found out by trial and error, because existing documentation is poor
+or nonexistent, so I don't actually understand writerfilter that much (and
+think nothing nice about it) and don't think it (both writerfilter and my
+understanding/liking of it) could be noticeably improved. In an ideal world
+it should be nuked from orbit and started again from scratch with a saner
design.
+
+-
+CT_xxx (Complex Type) - it seems to be used for XML elements
+ST_xxx (Simple Type) - it seems to be used for XML attributes
+
+- SPRM - no idea what that actually means, but in the context of OOXML it seems
+ to pretty much mean "XML element"
+
+-
+
+Format of the <resource> tag (shortened CT_Font example):
+
+ <resource name="CT_Font" resource="Properties" tag="font">
+ <element name="charset" tokenid="ooxml:CT_Font_charset"/>
+ <attribute name="name" tokenid="ooxml:CT_Font_name"/>
+ </resource>
+
+CT_Font is the type that is defined how it will be handled.
+resource="XXX" means it will be handled by OOXMLFastContextHandlerXXX class
+no idea what tag="font" means or if it matters
+<element> defines the <w:charset> subelement will be handled in sprm() function
+ as NS_ooxml::LN_CT_Font_charset case
+<attribute> defines the <w:name> attribute of the element will be handled
+ in attribute() function as NS_ooxml::LN_CT_Font_name case
+in both cases sprm()/attribute() may mean actually any of the various strange
+ naming ideas like lcl_sprm()
+
+-
+If an element (and its subelements) are not processed but the element itself
+does not require any special handling, make sure something like the below is
present.
+Otherwise null context will be created and the element and all its subelements
+will be ignored.
+
+<resource name="CT_OMathPara" resource="Stream" tag="math"/>
+
commit 58de34f6330e7093238bae2a14982e598867b336
Author: LuboÅ¡ LuÅák <l.lu...@suse.cz>
Date: Wed Jan 18 18:08:26 2012 +0100
fix reading w:charset, you misdesigned writerfilter monster (fdo#34814)
diff --git a/writerfilter/source/ooxml/model.xml
b/writerfilter/source/ooxml/model.xml
index 39ecf66..4dc8c49 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -20473,7 +20473,7 @@
<define name="CT_Charset">
<optional>
<attribute name="val">
- <ref name="CT_UcharHexNumber"/>
+ <ref name="ST_UcharHexNumber"/>
</attribute>
</optional>
<optional>
commit 38fea73760e675dc04e0c20f3e01e50aa8b03767
Author: LuboÅ¡ LuÅák <l.lu...@suse.cz>
Date: Tue Jan 17 14:28:38 2012 +0100
remove executable bit on source files
diff --git a/sw/source/core/inc/viewimp.hxx b/sw/source/core/inc/viewimp.hxx
old mode 100755
new mode 100644
diff --git a/sw/source/ui/config/optdlg.src b/sw/source/ui/config/optdlg.src
old mode 100755
new mode 100644
diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx
old mode 100755
new mode 100644
diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml
b/sw/uiconfig/sglobal/menubar/menubar.xml
old mode 100755
new mode 100644
diff --git a/sw/uiconfig/sweb/menubar/menubar.xml
b/sw/uiconfig/sweb/menubar/menubar.xml
old mode 100755
new mode 100644
diff --git a/sw/uiconfig/swform/menubar/menubar.xml
b/sw/uiconfig/swform/menubar/menubar.xml
old mode 100755
new mode 100644
diff --git a/sw/uiconfig/swreport/menubar/menubar.xml
b/sw/uiconfig/swreport/menubar/menubar.xml
old mode 100755
new mode 100644
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml
b/sw/uiconfig/swriter/menubar/menubar.xml
old mode 100755
new mode 100644
diff --git a/sw/uiconfig/swxform/menubar/menubar.xml
b/sw/uiconfig/swxform/menubar/menubar.xml
old mode 100755
new mode 100644
commit 254ba40392b17c2cb2fa1ef35a835d19a5f4a5e1
Author: LuboÅ¡ LuÅák <l.lu...@suse.cz>
Date: Mon Jan 16 17:42:39 2012 +0100
remove pointless forward moving of a table (bnc#706138)
This appears to be broken. Why should a table where all rows want to be kept
together be moved one page forward just because there is something
before it on the page where it is? It either fits its curent page, in which
case it's wrong, or it does not fit, in which case it may not fit the
following
page either and something else needs to take care of it anyway.
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 1571b71..ec32c68 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -2404,11 +2404,6 @@ void SwTabFrm::MakeAll()
++nMinNumOfLines;
pTmpRow = static_cast<const
SwRowFrm*>(pTmpRow->GetNext());
}
- // Check if all lines want to keep together and we
- // have a pIndPrev. In this case we set nDeadLine
- // to 0, forcing the table to move forward.
- if ( !pTmpRow && pIndPrev )
- nDeadLine = 0;
}
if ( !bTryToSplit )
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
