Merge remote branch 'extensions/master'MELD_LIBREOFFICE_REPOS

* extensions/master: (978 commits)
  get this building for me
  Version 3.4.2.3, tag libreoffice-3.4.2.3 (3.4.2-rc3)
  enable l10n of presenter screen
  oops Bjoern's .gitattributes link got commited by mistake
  enable l10n of presenter screen
  Version 3.4.2.2, tag libreoffice-3.4.2.2 (3.4.2-rc2)
  poppler 0.17.0 changed its api for no some reason or other
  Branch libreoffice-3-4-2
  Version 3.4.2.1, tag libreoffice-3.4.2.1 (3.4.2-rc1)
  Remove component_getImplementationEnvironment
  hotfix to include localizations of Presenter screen extension
  hotfix to include localizations of Presenter screen extension
  Goodbye to CWS_WORK_STAMP
  use OString::equalsL
  fixing rebase errors
  ause130: #i117218# change .idl handling to gnu make
  CWS gnumake4: reimplement basegfx_s hack for new build system [hg:c943ed591aff]
  Use DESKTOP and NATIVE where appropriate
  Version 3.4.1.1, tag libreoffice-3.4.1.1 (3.4.1-rc1)
  createFromAscii -> RTL_CONSTASCII_USTRINGPARAM
  ...

1 files changed, 37 insertions, 0 deletions

diff --git a/reportbuilder/java/com/sun/star/report/pentaho/oasis-table.css b/reportbuilder/java/com/sun/star/report/pentaho/oasis-table.css
new file mode 100644
index 000000000000..91bedcd97573
--- /dev/null
+++ b/reportbuilder/java/com/sun/star/report/pentaho/oasis-table.css
@@ -0,0 +1,37 @@
+@namespace url("urn:oasis:names:tc:opendocument:xmlns:table:1.0");
+
+table {
+    display: table;
+}
+
+table-columns {
+    display: table-column-group;
+}
+
+table-column {
+    display: table-column;
+}
+
+table-row {
+    display: table-row;
+}
+
+table-cell {
+    display: table-cell;
+}
+
+table-cell[number-cols-spanned],
+table-cell[number-cols-spanned],
+table-columns[number-cols-spanned],
+table-column[number-cols-spanned] {
+    -x-liblayout-colspan: attr(number-cols-spanned);
+}
+
+table-cell[number-rows-spanned],
+table-cell[number-rows-spanned] {
+    -x-liblayout-rowspan: attr(number-rows-spanned);
+}
+
+
+
+