[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - 12 commits - configure.ac extras/source framework/uiconfig svx/source sw/qa sw/source vcl/qa vcl/source vcl/unx

Caolán McNamara (via logerrit) Mon, 02 May 2022 01:29:32 -0700

 configure.ac                                                                   
  |   28 
 extras/source/templates/draw/bpmn/content.xml                                  
  |   92 
 extras/source/templates/draw/bpmn/meta.xml                                     
  |   12 
 extras/source/templates/draw/bpmn/styles.xml                                   
  |   36 
 
extras/source/templates/offimisc/Businesscard-with-logo/Thumbnails/thumbnail.png
 |binary
 extras/source/templates/offimisc/Businesscard-with-logo/content.xml            
  | 1920 ----------
 extras/source/templates/offimisc/Businesscard-with-logo/meta.xml               
  |    5 
 extras/source/templates/offimisc/Businesscard-with-logo/settings.xml           
  |  124 
 extras/source/templates/offimisc/Businesscard-with-logo/styles.xml             
  |   86 
 framework/uiconfig/startmodule/menubar/menubar.xml                             
  |    1 
 svx/source/xml/xmlxtimp.cxx                                                    
  |    2 
 sw/qa/extras/layout/data/forcepoint93-1.rtf                                    
  |binary
 sw/qa/extras/layout/data/forcepoint93-2.rtf                                    
  |binary
 sw/qa/extras/layout/layout.cxx                                                 
  |    7 
 sw/qa/uitest/writer_tests/trackedChanges.py                                    
  |   30 
 sw/source/core/inc/frame.hxx                                                   
  |   11 
 sw/source/core/layout/objectformattertxtfrm.cxx                                
  |    2 
 sw/source/core/layout/wsfrm.cxx                                                
  |    2 
 sw/source/uibase/misc/redlndlg.cxx                                             
  |   27 
 vcl/qa/cppunit/mnemonic.cxx                                                    
  |    2 
 vcl/source/app/IconThemeInfo.cxx                                               
  |   20 
 vcl/source/filter/itiff/itiff.cxx                                              
  |   34 
 vcl/source/window/brdwin.cxx                                                   
  |   12 
 vcl/source/window/mnemonic.cxx                                                 
  |    2 
 vcl/unx/gtk3/gtkframe.cxx                                                      
  |   43 
 25 files changed, 337 insertions(+), 2161 deletions(-)


New commits:
commit 28df187c10dc65b7879c6415749f9e786cf9ffbc
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Apr 26 14:37:10 2022 +0100
Commit:     Andras Timar <andras.ti...@collabora.com>
CommitDate: Mon May 2 10:28:52 2022 +0200

    tdf#140272 gtk3: fix crash with dnd using touch
    
    gdk_wayland_drag_context_manage_dnd needs
    gdk_device_window_at_position(device, ...)
    to succeed
    
    similar to the problem of https://gitlab.gnome.org/GNOME/gtk/-/issues/1080
    
    Change-Id: I2e1956b40a622b1d74d3aef3b5fac654fc1256eb
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133409
    Tested-by: Jenkins
    Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>

diff --git a/vcl/unx/gtk3/gtkframe.cxx b/vcl/unx/gtk3/gtkframe.cxx
index 8864a60cc50d..c6fb8ac14ac1 100644
--- a/vcl/unx/gtk3/gtkframe.cxx
+++ b/vcl/unx/gtk3/gtkframe.cxx
@@ -5815,16 +5815,39 @@ void GtkSalFrame::startDrag(const 
css::datatransfer::dnd::DragGestureEvent& rEve
     aFakeEvent.type = GDK_BUTTON_PRESS;
     aFakeEvent.button.window = widget_get_surface(getMouseEventWidget());
     aFakeEvent.button.time = GDK_CURRENT_TIME;
-    GdkDeviceManager* pDeviceManager = 
gdk_display_get_device_manager(getGdkDisplay());
-    aFakeEvent.button.device = 
gdk_device_manager_get_client_pointer(pDeviceManager);
-
-    GdkDragContext *pDrag = 
gtk_drag_begin_with_coordinates(getMouseEventWidget(),
-                                                            pTargetList,
-                                                            sourceActions,
-                                                            nDragButton,
-                                                            &aFakeEvent,
-                                                            rEvent.DragOriginX,
-                                                            
rEvent.DragOriginY);
+
+    aFakeEvent.button.device = gtk_get_current_event_device();
+    // if no current event to determine device, or (tdf#140272) the device 
will be unsuitable then find an
+    // appropiate device to use.
+    if (!aFakeEvent.button.device || 
!gdk_device_get_window_at_position(aFakeEvent.button.device, nullptr, nullptr))
+    {
+        GdkDeviceManager* pDeviceManager = 
gdk_display_get_device_manager(getGdkDisplay());
+        GList* pDevices = gdk_device_manager_list_devices(pDeviceManager, 
GDK_DEVICE_TYPE_MASTER);
+        for (GList* pEntry = pDevices; pEntry; pEntry = pEntry->next)
+        {
+            GdkDevice* pDevice = static_cast<GdkDevice*>(pEntry->data);
+            if (gdk_device_get_source(pDevice) == GDK_SOURCE_KEYBOARD)
+                continue;
+            if (gdk_device_get_window_at_position(pDevice, nullptr, nullptr))
+            {
+                aFakeEvent.button.device = pDevice;
+                break;
+            }
+        }
+        g_list_free(pDevices);
+    }
+
+    GdkDragContext *pDrag;
+    if (!aFakeEvent.button.device || 
!gdk_device_get_window_at_position(aFakeEvent.button.device, nullptr, nullptr))
+        pDrag = nullptr;
+    else
+        pDrag = gtk_drag_begin_with_coordinates(getMouseEventWidget(),
+                                                pTargetList,
+                                                sourceActions,
+                                                nDragButton,
+                                                &aFakeEvent,
+                                                rEvent.DragOriginX,
+                                                rEvent.DragOriginY);
 
     gtk_target_list_unref(pTargetList);
 
commit e665027b9cd92f7d0ec676717c0b45dca81a8b8d
Author:     Laurent BP <laurent.balland-poir...@laposte.net>
AuthorDate: Mon Aug 30 10:24:27 2021 +0200
Commit:     Andras Timar <andras.ti...@collabora.com>
CommitDate: Mon May 2 10:28:52 2022 +0200

    tdf#143956 Remove page size of Writer templates 3
    
    This patch concerns "offmisc" templates:
    - Businesscard-with-logo:
      - use predefined style names to have them automatically translated
      - use automatic date format according to locale settings
      - update preview
      - remove useless duplicate code and unused styles
      - contributor's name to top to fit in A4 and Letter formats
      - remove 1 empty line in table to fit in Letter format also
      - remove useless stuff in settings.xml file. Keep these fields,
    because if certain settings are MISSING, xmlimp will consider the file
    in old format (thanks to Justin Luth)
      - reindent xml files
    
    Change-Id: Ie1b35fe420dbb445cb5070b8a3726c40184973ca
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121267
    Tested-by: Jenkins
    Reviewed-by: Laurent Balland-Poirier <laurent.balland-poir...@laposte.net>
    (cherry picked from commit fd9d71d7706adcbe1191b09c8ba252d2b4dfb50e)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133607
    Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>

diff --git 
a/extras/source/templates/offimisc/Businesscard-with-logo/Thumbnails/thumbnail.png
 
b/extras/source/templates/offimisc/Businesscard-with-logo/Thumbnails/thumbnail.png
index 16b482abaf16..f901880f6769 100644
Binary files 
a/extras/source/templates/offimisc/Businesscard-with-logo/Thumbnails/thumbnail.png
 and 
b/extras/source/templates/offimisc/Businesscard-with-logo/Thumbnails/thumbnail.png
 differ
diff --git 
a/extras/source/templates/offimisc/Businesscard-with-logo/content.xml 
b/extras/source/templates/offimisc/Businesscard-with-logo/content.xml
index 13f9b3469066..da1483bfd2f5 100644
--- a/extras/source/templates/offimisc/Businesscard-with-logo/content.xml
+++ b/extras/source/templates/offimisc/Businesscard-with-logo/content.xml
@@ -5,50 +5,8 @@
     <style:font-face style:name="Liberation Serif" 
svg:font-family="'Liberation Serif'"/>
   </office:font-face-decls>
   <office:automatic-styles>
-    <style:style style:name="Table19" style:family="table">
-      <style:table-properties style:width="9cm" fo:margin-left="0cm" 
fo:margin-right="-0.004cm" fo:break-before="page" table:align="margins"/>
-    </style:style>
-    <style:style style:name="Table19.A" style:family="table-column">
-      <style:table-column-properties style:column-width="0.355cm" 
style:rel-column-width="2580*"/>
-    </style:style>
-    <style:style style:name="Table19.B" style:family="table-column">
-      <style:table-column-properties style:column-width="1.882cm" 
style:rel-column-width="13700*"/>
-    </style:style>
-    <style:style style:name="Table19.C" style:family="table-column">
-      <style:table-column-properties style:column-width="1.311cm" 
style:rel-column-width="9540*"/>
-    </style:style>
-    <style:style style:name="Table19.D" style:family="table-column">
-      <style:table-column-properties style:column-width="4.957cm" 
style:rel-column-width="36093*"/>
-    </style:style>
-    <style:style style:name="Table19.E" style:family="table-column">
-      <style:table-column-properties style:column-width="0.497cm" 
style:rel-column-width="3622*"/>
-    </style:style>
-    <style:style style:name="Table19.A1" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" 
fo:border-right="0.05pt solid #000000" fo:border-top="0.05pt solid #000000" 
fo:border-bottom="none"/>
-    </style:style>
-    <style:style style:name="Table19.A2" style:family="table-cell">
-      <style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.05pt 
solid #000000" fo:border-right="none" fo:border-top="none" 
fo:border-bottom="none"/>
-    </style:style>
-    <style:style style:name="Table19.C2" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border-left="none" fo:border-right="0.05pt solid 
#000000" fo:border-top="none" fo:border-bottom="none"/>
-    </style:style>
-    <style:style style:name="Table19.A3" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" 
fo:border-right="none" fo:border-top="none" fo:border-bottom="none"/>
-    </style:style>
-    <style:style style:name="Table19.B3" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border="none"/>
-    </style:style>
-    <style:style style:name="Table19.A8" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" 
fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid 
#000000"/>
-    </style:style>
-    <style:style style:name="Table19.B8" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border-left="none" fo:border-right="none" 
fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-    </style:style>
-    <style:style style:name="Table19.E8" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border-left="none" fo:border-right="0.05pt solid 
#000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-    </style:style>
     <style:style style:name="Table1" style:family="table">
-      <style:table-properties style:width="9cm" fo:margin-left="0cm" 
fo:margin-right="-0.004cm" fo:break-before="page" table:align="margins"/>
+      <style:table-properties style:width="9cm" fo:margin-left="0cm" 
fo:margin-right="0cm" fo:break-before="page" table:align="margins"/>
     </style:style>
     <style:style style:name="Table1.A" style:family="table-column">
       <style:table-column-properties style:column-width="0.355cm" 
style:rel-column-width="2580*"/>
@@ -66,463 +24,59 @@
       <style:table-column-properties style:column-width="0.497cm" 
style:rel-column-width="3622*"/>
     </style:style>
     <style:style style:name="Table1.A1" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" 
fo:border-right="0.05pt solid #000000" fo:border-top="0.05pt solid #000000" 
fo:border-bottom="none"/>
+      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.1cm" fo:border-left="0.05pt solid #000000" 
fo:border-right="0.05pt solid #000000" fo:border-top="0.05pt solid #000000" 
fo:border-bottom="none"/>
     </style:style>
     <style:style style:name="Table1.A2" style:family="table-cell">
-      <style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.05pt 
solid #000000" fo:border-right="none" fo:border-top="none" 
fo:border-bottom="none"/>
+      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.1cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" 
fo:border-top="none" fo:border-bottom="none"/>
     </style:style>
     <style:style style:name="Table1.C2" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border-left="none" fo:border-right="0.05pt solid 
#000000" fo:border-top="none" fo:border-bottom="none"/>
+      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.1cm" fo:border-left="none" fo:border-right="0.05pt solid #000000" 
fo:border-top="none" fo:border-bottom="none"/>
     </style:style>
     <style:style style:name="Table1.A3" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" 
fo:border-right="none" fo:border-top="none" fo:border-bottom="none"/>
+      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.1cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" 
fo:border-top="none" fo:border-bottom="none"/>
     </style:style>
     <style:style style:name="Table1.B3" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border="none"/>
+      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.1cm" fo:border="none"/>
     </style:style>
     <style:style style:name="Table1.A8" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" 
fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid 
#000000"/>
+      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.1cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" 
fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
     </style:style>
     <style:style style:name="Table1.B8" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border-left="none" fo:border-right="none" 
fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.1cm" fo:border-left="none" fo:border-right="none" 
fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
     </style:style>
     <style:style style:name="Table1.E8" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border-left="none" fo:border-right="0.05pt solid 
#000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-    </style:style>
-    <style:style style:name="Table2" style:family="table">
-      <style:table-properties style:width="9.001cm" fo:margin-left="0cm" 
fo:margin-right="-0.004cm" fo:break-before="page" table:align="margins"/>
-    </style:style>
-    <style:style style:name="Table2.A" style:family="table-column">
-      <style:table-column-properties style:column-width="0.355cm" 
style:rel-column-width="2580*"/>
-    </style:style>
-    <style:style style:name="Table2.B" style:family="table-column">
-      <style:table-column-properties style:column-width="1.882cm" 
style:rel-column-width="13700*"/>
-    </style:style>
-    <style:style style:name="Table2.C" style:family="table-column">
-      <style:table-column-properties style:column-width="1.311cm" 
style:rel-column-width="9540*"/>
-    </style:style>
-    <style:style style:name="Table2.D" style:family="table-column">
-      <style:table-column-properties style:column-width="4.957cm" 
style:rel-column-width="36093*"/>
-    </style:style>
-    <style:style style:name="Table2.E" style:family="table-column">
-      <style:table-column-properties style:column-width="0.497cm" 
style:rel-column-width="3622*"/>
-    </style:style>
-    <style:style style:name="Table2.A1" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" 
fo:border-right="0.05pt solid #000000" fo:border-top="0.05pt solid #000000" 
fo:border-bottom="none"/>
-    </style:style>
-    <style:style style:name="Table2.A2" style:family="table-cell">
-      <style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.05pt 
solid #000000" fo:border-right="none" fo:border-top="none" 
fo:border-bottom="none"/>
-    </style:style>
-    <style:style style:name="Table2.C2" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border-left="none" fo:border-right="0.05pt solid 
#000000" fo:border-top="none" fo:border-bottom="none"/>
-    </style:style>
-    <style:style style:name="Table2.A3" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" 
fo:border-right="none" fo:border-top="none" fo:border-bottom="none"/>
-    </style:style>
-    <style:style style:name="Table2.B3" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border="none"/>
-    </style:style>
-    <style:style style:name="Table2.A8" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" 
fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid 
#000000"/>
-    </style:style>
-    <style:style style:name="Table2.B8" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border-left="none" fo:border-right="none" 
fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-    </style:style>
-    <style:style style:name="Table2.E8" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border-left="none" fo:border-right="0.05pt solid 
#000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-    </style:style>
-    <style:style style:name="Table3" style:family="table">
-      <style:table-properties style:width="9.001cm" fo:margin-left="0cm" 
fo:margin-right="-0.004cm" fo:break-before="page" table:align="margins"/>
-    </style:style>
-    <style:style style:name="Table3.A" style:family="table-column">
-      <style:table-column-properties style:column-width="0.355cm" 
style:rel-column-width="2580*"/>
-    </style:style>
-    <style:style style:name="Table3.B" style:family="table-column">
-      <style:table-column-properties style:column-width="1.882cm" 
style:rel-column-width="13700*"/>
-    </style:style>
-    <style:style style:name="Table3.C" style:family="table-column">
-      <style:table-column-properties style:column-width="1.311cm" 
style:rel-column-width="9540*"/>
-    </style:style>
-    <style:style style:name="Table3.D" style:family="table-column">
-      <style:table-column-properties style:column-width="4.957cm" 
style:rel-column-width="36093*"/>
-    </style:style>
-    <style:style style:name="Table3.E" style:family="table-column">
-      <style:table-column-properties style:column-width="0.497cm" 
style:rel-column-width="3622*"/>
-    </style:style>
-    <style:style style:name="Table3.A1" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" 
fo:border-right="0.05pt solid #000000" fo:border-top="0.05pt solid #000000" 
fo:border-bottom="none"/>
-    </style:style>
-    <style:style style:name="Table3.A2" style:family="table-cell">
-      <style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.05pt 
solid #000000" fo:border-right="none" fo:border-top="none" 
fo:border-bottom="none"/>
-    </style:style>
-    <style:style style:name="Table3.C2" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border-left="none" fo:border-right="0.05pt solid 
#000000" fo:border-top="none" fo:border-bottom="none"/>
-    </style:style>
-    <style:style style:name="Table3.A3" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" 
fo:border-right="none" fo:border-top="none" fo:border-bottom="none"/>
-    </style:style>
-    <style:style style:name="Table3.B3" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border="none"/>
-    </style:style>
-    <style:style style:name="Table3.A8" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" 
fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid 
#000000"/>
-    </style:style>
-    <style:style style:name="Table3.B8" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border-left="none" fo:border-right="none" 
fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-    </style:style>
-    <style:style style:name="Table3.E8" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border-left="none" fo:border-right="0.05pt solid 
#000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-    </style:style>
-    <style:style style:name="Table4" style:family="table">
-      <style:table-properties style:width="9.001cm" fo:margin-left="0cm" 
fo:margin-right="-0.004cm" fo:break-before="page" table:align="margins"/>
-    </style:style>
-    <style:style style:name="Table4.A" style:family="table-column">
-      <style:table-column-properties style:column-width="0.355cm" 
style:rel-column-width="2580*"/>
-    </style:style>
-    <style:style style:name="Table4.B" style:family="table-column">
-      <style:table-column-properties style:column-width="1.882cm" 
style:rel-column-width="13700*"/>
-    </style:style>
-    <style:style style:name="Table4.C" style:family="table-column">
-      <style:table-column-properties style:column-width="1.311cm" 
style:rel-column-width="9540*"/>
-    </style:style>
-    <style:style style:name="Table4.D" style:family="table-column">
-      <style:table-column-properties style:column-width="4.957cm" 
style:rel-column-width="36093*"/>
-    </style:style>
-    <style:style style:name="Table4.E" style:family="table-column">
-      <style:table-column-properties style:column-width="0.497cm" 
style:rel-column-width="3622*"/>
-    </style:style>
-    <style:style style:name="Table4.A1" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" 
fo:border-right="0.05pt solid #000000" fo:border-top="0.05pt solid #000000" 
fo:border-bottom="none"/>
-    </style:style>
-    <style:style style:name="Table4.A2" style:family="table-cell">
-      <style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.05pt 
solid #000000" fo:border-right="none" fo:border-top="none" 
fo:border-bottom="none"/>
-    </style:style>
-    <style:style style:name="Table4.C2" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border-left="none" fo:border-right="0.05pt solid 
#000000" fo:border-top="none" fo:border-bottom="none"/>
-    </style:style>
-    <style:style style:name="Table4.A3" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" 
fo:border-right="none" fo:border-top="none" fo:border-bottom="none"/>
-    </style:style>
-    <style:style style:name="Table4.B3" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border="none"/>
-    </style:style>
-    <style:style style:name="Table4.A8" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" 
fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid 
#000000"/>
-    </style:style>
-    <style:style style:name="Table4.B8" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border-left="none" fo:border-right="none" 
fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-    </style:style>
-    <style:style style:name="Table4.E8" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border-left="none" fo:border-right="0.05pt solid 
#000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-    </style:style>
-    <style:style style:name="Table5" style:family="table">
-      <style:table-properties style:width="9.001cm" fo:margin-left="0cm" 
fo:margin-right="-0.004cm" fo:break-before="page" table:align="margins"/>
-    </style:style>
-    <style:style style:name="Table5.A" style:family="table-column">
-      <style:table-column-properties style:column-width="0.355cm" 
style:rel-column-width="2580*"/>
-    </style:style>
-    <style:style style:name="Table5.B" style:family="table-column">
-      <style:table-column-properties style:column-width="1.882cm" 
style:rel-column-width="13700*"/>
-    </style:style>
-    <style:style style:name="Table5.C" style:family="table-column">
-      <style:table-column-properties style:column-width="1.311cm" 
style:rel-column-width="9540*"/>
-    </style:style>
-    <style:style style:name="Table5.D" style:family="table-column">
-      <style:table-column-properties style:column-width="4.957cm" 
style:rel-column-width="36093*"/>
-    </style:style>
-    <style:style style:name="Table5.E" style:family="table-column">
-      <style:table-column-properties style:column-width="0.497cm" 
style:rel-column-width="3622*"/>
-    </style:style>
-    <style:style style:name="Table5.A1" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" 
fo:border-right="0.05pt solid #000000" fo:border-top="0.05pt solid #000000" 
fo:border-bottom="none"/>
-    </style:style>
-    <style:style style:name="Table5.A2" style:family="table-cell">
-      <style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.05pt 
solid #000000" fo:border-right="none" fo:border-top="none" 
fo:border-bottom="none"/>
-    </style:style>
-    <style:style style:name="Table5.C2" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border-left="none" fo:border-right="0.05pt solid 
#000000" fo:border-top="none" fo:border-bottom="none"/>
-    </style:style>
-    <style:style style:name="Table5.A3" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" 
fo:border-right="none" fo:border-top="none" fo:border-bottom="none"/>
-    </style:style>
-    <style:style style:name="Table5.B3" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border="none"/>
-    </style:style>
-    <style:style style:name="Table5.A8" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" 
fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid 
#000000"/>
-    </style:style>
-    <style:style style:name="Table5.B8" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border-left="none" fo:border-right="none" 
fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-    </style:style>
-    <style:style style:name="Table5.E8" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border-left="none" fo:border-right="0.05pt solid 
#000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-    </style:style>
-    <style:style style:name="Table6" style:family="table">
-      <style:table-properties style:width="9.001cm" fo:margin-left="0cm" 
fo:margin-right="-0.004cm" fo:break-before="page" table:align="margins"/>
-    </style:style>
-    <style:style style:name="Table6.A" style:family="table-column">
-      <style:table-column-properties style:column-width="0.355cm" 
style:rel-column-width="2580*"/>
-    </style:style>
-    <style:style style:name="Table6.B" style:family="table-column">
-      <style:table-column-properties style:column-width="1.882cm" 
style:rel-column-width="13700*"/>
-    </style:style>
-    <style:style style:name="Table6.C" style:family="table-column">
-      <style:table-column-properties style:column-width="1.311cm" 
style:rel-column-width="9540*"/>
-    </style:style>
-    <style:style style:name="Table6.D" style:family="table-column">
-      <style:table-column-properties style:column-width="4.957cm" 
style:rel-column-width="36093*"/>
-    </style:style>
-    <style:style style:name="Table6.E" style:family="table-column">
-      <style:table-column-properties style:column-width="0.497cm" 
style:rel-column-width="3622*"/>
-    </style:style>
-    <style:style style:name="Table6.A1" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" 
fo:border-right="0.05pt solid #000000" fo:border-top="0.05pt solid #000000" 
fo:border-bottom="none"/>
-    </style:style>
-    <style:style style:name="Table6.A2" style:family="table-cell">
-      <style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.05pt 
solid #000000" fo:border-right="none" fo:border-top="none" 
fo:border-bottom="none"/>
-    </style:style>
-    <style:style style:name="Table6.C2" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border-left="none" fo:border-right="0.05pt solid 
#000000" fo:border-top="none" fo:border-bottom="none"/>
-    </style:style>
-    <style:style style:name="Table6.A3" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" 
fo:border-right="none" fo:border-top="none" fo:border-bottom="none"/>
-    </style:style>
-    <style:style style:name="Table6.B3" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border="none"/>
-    </style:style>
-    <style:style style:name="Table6.A8" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" 
fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid 
#000000"/>
-    </style:style>
-    <style:style style:name="Table6.B8" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border-left="none" fo:border-right="none" 
fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-    </style:style>
-    <style:style style:name="Table6.E8" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border-left="none" fo:border-right="0.05pt solid 
#000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-    </style:style>
-    <style:style style:name="Table7" style:family="table">
-      <style:table-properties style:width="9.001cm" fo:margin-left="0cm" 
fo:margin-right="-0.004cm" fo:break-before="page" table:align="margins"/>
-    </style:style>
-    <style:style style:name="Table7.A" style:family="table-column">
-      <style:table-column-properties style:column-width="0.355cm" 
style:rel-column-width="2580*"/>
-    </style:style>
-    <style:style style:name="Table7.B" style:family="table-column">
-      <style:table-column-properties style:column-width="1.882cm" 
style:rel-column-width="13700*"/>
-    </style:style>
-    <style:style style:name="Table7.C" style:family="table-column">
-      <style:table-column-properties style:column-width="1.311cm" 
style:rel-column-width="9540*"/>
-    </style:style>
-    <style:style style:name="Table7.D" style:family="table-column">
-      <style:table-column-properties style:column-width="4.957cm" 
style:rel-column-width="36093*"/>
-    </style:style>
-    <style:style style:name="Table7.E" style:family="table-column">
-      <style:table-column-properties style:column-width="0.497cm" 
style:rel-column-width="3622*"/>
-    </style:style>
-    <style:style style:name="Table7.A1" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" 
fo:border-right="0.05pt solid #000000" fo:border-top="0.05pt solid #000000" 
fo:border-bottom="none"/>
-    </style:style>
-    <style:style style:name="Table7.A2" style:family="table-cell">
-      <style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.05pt 
solid #000000" fo:border-right="none" fo:border-top="none" 
fo:border-bottom="none"/>
-    </style:style>
-    <style:style style:name="Table7.C2" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border-left="none" fo:border-right="0.05pt solid 
#000000" fo:border-top="none" fo:border-bottom="none"/>
-    </style:style>
-    <style:style style:name="Table7.A3" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" 
fo:border-right="none" fo:border-top="none" fo:border-bottom="none"/>
-    </style:style>
-    <style:style style:name="Table7.B3" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border="none"/>
-    </style:style>
-    <style:style style:name="Table7.A8" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" 
fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid 
#000000"/>
-    </style:style>
-    <style:style style:name="Table7.B8" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border-left="none" fo:border-right="none" 
fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-    </style:style>
-    <style:style style:name="Table7.E8" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border-left="none" fo:border-right="0.05pt solid 
#000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-    </style:style>
-    <style:style style:name="Table8" style:family="table">
-      <style:table-properties style:width="9.001cm" fo:margin-left="0cm" 
fo:margin-right="-0.004cm" fo:break-before="page" table:align="margins"/>
-    </style:style>
-    <style:style style:name="Table8.A" style:family="table-column">
-      <style:table-column-properties style:column-width="0.355cm" 
style:rel-column-width="2580*"/>
-    </style:style>
-    <style:style style:name="Table8.B" style:family="table-column">
-      <style:table-column-properties style:column-width="1.882cm" 
style:rel-column-width="13700*"/>
-    </style:style>
-    <style:style style:name="Table8.C" style:family="table-column">
-      <style:table-column-properties style:column-width="1.311cm" 
style:rel-column-width="9540*"/>
-    </style:style>
-    <style:style style:name="Table8.D" style:family="table-column">
-      <style:table-column-properties style:column-width="4.957cm" 
style:rel-column-width="36093*"/>
-    </style:style>
-    <style:style style:name="Table8.E" style:family="table-column">
-      <style:table-column-properties style:column-width="0.497cm" 
style:rel-column-width="3622*"/>
-    </style:style>
-    <style:style style:name="Table8.A1" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" 
fo:border-right="0.05pt solid #000000" fo:border-top="0.05pt solid #000000" 
fo:border-bottom="none"/>
-    </style:style>
-    <style:style style:name="Table8.A2" style:family="table-cell">
-      <style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.05pt 
solid #000000" fo:border-right="none" fo:border-top="none" 
fo:border-bottom="none"/>
-    </style:style>
-    <style:style style:name="Table8.C2" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border-left="none" fo:border-right="0.05pt solid 
#000000" fo:border-top="none" fo:border-bottom="none"/>
-    </style:style>
-    <style:style style:name="Table8.A3" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" 
fo:border-right="none" fo:border-top="none" fo:border-bottom="none"/>
-    </style:style>
-    <style:style style:name="Table8.B3" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border="none"/>
-    </style:style>
-    <style:style style:name="Table8.A8" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" 
fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid 
#000000"/>
-    </style:style>
-    <style:style style:name="Table8.B8" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border-left="none" fo:border-right="none" 
fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-    </style:style>
-    <style:style style:name="Table8.E8" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border-left="none" fo:border-right="0.05pt solid 
#000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-    </style:style>
-    <style:style style:name="Table9" style:family="table">
-      <style:table-properties style:width="9.001cm" fo:margin-left="0cm" 
fo:margin-right="-0.004cm" fo:break-before="page" table:align="margins"/>
-    </style:style>
-    <style:style style:name="Table9.A" style:family="table-column">
-      <style:table-column-properties style:column-width="0.355cm" 
style:rel-column-width="2580*"/>
-    </style:style>
-    <style:style style:name="Table9.B" style:family="table-column">
-      <style:table-column-properties style:column-width="1.882cm" 
style:rel-column-width="13700*"/>
-    </style:style>
-    <style:style style:name="Table9.C" style:family="table-column">
-      <style:table-column-properties style:column-width="1.311cm" 
style:rel-column-width="9540*"/>
-    </style:style>
-    <style:style style:name="Table9.D" style:family="table-column">
-      <style:table-column-properties style:column-width="4.957cm" 
style:rel-column-width="36093*"/>
-    </style:style>
-    <style:style style:name="Table9.E" style:family="table-column">
-      <style:table-column-properties style:column-width="0.497cm" 
style:rel-column-width="3622*"/>
-    </style:style>
-    <style:style style:name="Table9.A1" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" 
fo:border-right="0.05pt solid #000000" fo:border-top="0.05pt solid #000000" 
fo:border-bottom="none"/>
-    </style:style>
-    <style:style style:name="Table9.A2" style:family="table-cell">
-      <style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.05pt 
solid #000000" fo:border-right="none" fo:border-top="none" 
fo:border-bottom="none"/>
-    </style:style>
-    <style:style style:name="Table9.C2" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border-left="none" fo:border-right="0.05pt solid 
#000000" fo:border-top="none" fo:border-bottom="none"/>
-    </style:style>
-    <style:style style:name="Table9.A3" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" 
fo:border-right="none" fo:border-top="none" fo:border-bottom="none"/>
-    </style:style>
-    <style:style style:name="Table9.B3" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border="none"/>
-    </style:style>
-    <style:style style:name="Table9.A8" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" 
fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid 
#000000"/>
-    </style:style>
-    <style:style style:name="Table9.B8" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border-left="none" fo:border-right="none" 
fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
-    </style:style>
-    <style:style style:name="Table9.E8" style:family="table-cell">
-      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.097cm" fo:border-left="none" fo:border-right="0.05pt solid 
#000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
+      <style:table-cell-properties style:vertical-align="middle" 
fo:padding="0.1cm" fo:border-left="none" fo:border-right="0.05pt solid #000000" 
fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
     </style:style>
     <style:style style:name="P1" style:family="paragraph" 
style:parent-style-name="Table_20_Contents">
       <style:paragraph-properties fo:text-align="center" 
style:justify-single-word="false"/>
-      <style:text-properties fo:font-size="8pt"/>
     </style:style>
     <style:style style:name="P2" style:family="paragraph" 
style:parent-style-name="Table_20_Contents">
       <style:paragraph-properties fo:text-align="end" 
style:justify-single-word="false"/>
-      <style:text-properties fo:font-size="8pt"/>
     </style:style>
     <style:style style:name="P3" style:family="paragraph" 
style:parent-style-name="Table_20_Contents">
       <style:paragraph-properties fo:text-align="start" 
style:justify-single-word="false"/>
-      <style:text-properties fo:font-size="8pt"/>
     </style:style>
     <style:style style:name="P4" style:family="paragraph" 
style:parent-style-name="Table_20_Contents">
-      <style:paragraph-properties fo:text-align="start" 
style:justify-single-word="false">
+      <style:paragraph-properties fo:margin-bottom="0.5cm" 
style:contextual-spacing="false" fo:text-align="start" 
style:justify-single-word="false">
         <style:tab-stops>
           <style:tab-stop style:position="5.6cm" style:type="center"/>
         </style:tab-stops>
       </style:paragraph-properties>
-      <style:text-properties fo:font-size="8pt" officeooo:rsid="000c3eb2" 
officeooo:paragraph-rsid="000c3eb2"/>
-    </style:style>
-    <style:style style:name="P5" style:family="paragraph" 
style:parent-style-name="Table_20_Contents">
-      <style:paragraph-properties fo:text-align="start" 
style:justify-single-word="false">
-        <style:tab-stops>
-          <style:tab-stop style:position="0.076cm"/>
-        </style:tab-stops>
-      </style:paragraph-properties>
-      <style:text-properties fo:font-size="8pt" fo:font-weight="bold"/>
     </style:style>
     <style:style style:name="P6" style:family="paragraph" 
style:parent-style-name="Table_20_Contents">
       <style:paragraph-properties fo:text-align="end" 
style:justify-single-word="false"/>
-      <style:text-properties fo:font-size="8pt" fo:font-weight="bold"/>
-    </style:style>
-    <style:style style:name="P7" style:family="paragraph" 
style:parent-style-name="Table_20_Contents">
-      <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" 
fo:text-align="end" style:justify-single-word="false" fo:text-indent="0cm" 
style:auto-text-indent="false"/>
-      <style:text-properties fo:font-size="8pt"/>
+      <style:text-properties fo:font-weight="bold"/>
     </style:style>
     <style:style style:name="P8" style:family="paragraph" 
style:parent-style-name="Table_20_Contents">
-      <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" 
fo:margin-top="0cm" fo:margin-bottom="0.109cm" loext:contextual-spacing="false" 
fo:text-align="start" style:justify-single-word="false" fo:text-indent="0cm" 
style:auto-text-indent="false">
-        <style:tab-stops>
-          <style:tab-stop style:position="5.6cm" style:type="center"/>
-        </style:tab-stops>
-      </style:paragraph-properties>
-      <style:text-properties fo:font-size="22pt" officeooo:rsid="000c3eb2"/>
-    </style:style>
-    <style:style style:name="P9" style:family="paragraph" 
style:parent-style-name="Table_20_Contents">
-      <style:paragraph-properties fo:text-align="start" 
style:justify-single-word="false">
-        <style:tab-stops>
-          <style:tab-stop style:position="5.6cm" style:type="center"/>
-        </style:tab-stops>
-      </style:paragraph-properties>
-      <style:text-properties fo:font-size="8pt" officeooo:rsid="000c3eb2" 
officeooo:paragraph-rsid="000c3eb2"/>
-    </style:style>
-    <style:style style:name="P10" style:family="paragraph" 
style:parent-style-name="Table_20_Contents">
-      <style:paragraph-properties fo:text-align="center" 
style:justify-single-word="false"/>
-      <style:text-properties fo:font-size="8pt"/>
-    </style:style>
-    <style:style style:name="P11" style:family="paragraph" 
style:parent-style-name="Table_20_Contents">
-      <style:paragraph-properties fo:text-align="end" 
style:justify-single-word="false"/>
-      <style:text-properties fo:font-size="8pt"/>
-    </style:style>
-    <style:style style:name="P12" style:family="paragraph" 
style:parent-style-name="Table_20_Contents">
-      <style:paragraph-properties fo:text-align="start" 
style:justify-single-word="false"/>
-      <style:text-properties fo:font-size="8pt"/>
-    </style:style>
-    <style:style style:name="P13" style:family="paragraph" 
style:parent-style-name="Table_20_Contents">
-      <style:paragraph-properties fo:text-align="start" 
style:justify-single-word="false">
-        <style:tab-stops>
-          <style:tab-stop style:position="0.076cm"/>
-        </style:tab-stops>
-      </style:paragraph-properties>
-      <style:text-properties fo:font-size="8pt" fo:font-weight="bold"/>
-    </style:style>
-    <style:style style:name="P14" style:family="paragraph" 
style:parent-style-name="Table_20_Contents">
-      <style:paragraph-properties fo:text-align="end" 
style:justify-single-word="false"/>
-      <style:text-properties fo:font-size="8pt" fo:font-weight="bold"/>
-    </style:style>
-    <style:style style:name="P15" style:family="paragraph" 
style:parent-style-name="Table_20_Contents">
-      <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" 
fo:margin-top="0cm" fo:margin-bottom="0.109cm" loext:contextual-spacing="false" 
fo:text-align="start" style:justify-single-word="false" fo:text-indent="0cm" 
style:auto-text-indent="false">
+      <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" 
fo:margin-top="0cm" fo:margin-bottom="0.1cm" loext:contextual-spacing="false" 
fo:text-align="start" style:justify-single-word="false" fo:text-indent="0cm" 
style:auto-text-indent="false">
         <style:tab-stops>
           <style:tab-stop style:position="5.6cm" style:type="center"/>
         </style:tab-stops>
       </style:paragraph-properties>
-      <style:text-properties fo:font-size="22pt" officeooo:rsid="000c3eb2"/>
-    </style:style>
-    <style:style style:name="P16" style:family="paragraph" 
style:parent-style-name="Table_20_Contents">
-      <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" 
fo:text-align="end" style:justify-single-word="false" fo:text-indent="0cm" 
style:auto-text-indent="false"/>
-      <style:text-properties fo:font-size="8pt"/>
-    </style:style>
-    <style:style style:name="P17" style:family="paragraph"/>
-    <style:style style:name="T1" style:family="text">
-      <style:text-properties officeooo:rsid="000a46db"/>
+      <style:text-properties fo:font-size="22pt"/>
     </style:style>
-    <style:style style:name="T2" style:family="text">
-      <style:text-properties officeooo:rsid="00100185"/>
-    </style:style>
-    <style:style style:name="T3" style:family="text"/>
-    <style:style style:name="fr1" style:family="graphic" 
style:parent-style-name="Labels">
-      <style:graphic-properties style:vertical-pos="top" 
style:vertical-rel="baseline" style:horizontal-pos="center" 
style:horizontal-rel="paragraph-content"/>
+    <style:style style:name="P17" style:family="paragraph">
+      <style:text-properties fo:font-size="8pt" fo:font-style="italic" 
fo:text-align="center"/>
     </style:style>
     <style:style style:name="fr2" style:family="graphic" 
style:parent-style-name="Graphics">
       <style:graphic-properties style:run-through="foreground" 
style:wrap="run-through" style:number-wrapped-paragraphs="no-limit" 
style:horizontal-pos="left" style:horizontal-rel="paragraph" 
style:mirror="none" fo:clip="rect(0cm, 0cm, 0cm, 0cm)" draw:luminance="0%" 
draw:contrast="0%" draw:red="0%" draw:green="0%" draw:blue="0%" 
draw:gamma="100%" draw:color-inversion="false" draw:image-opacity="100%" 
draw:color-mode="standard"/>
@@ -532,50 +86,8 @@
         <style:columns fo:column-count="1" fo:column-gap="0cm"/>
       </style:section-properties>
     </style:style>
-    <text:list-style style:name="L1">
-      <text:list-level-style-number text:level="1" style:num-format="A">
-        <style:list-level-properties/>
-        <style:text-properties fo:color="#000000" fo:font-size="100%"/>
-      </text:list-level-style-number>
-      <text:list-level-style-number text:level="2" style:num-format="A">
-        <style:list-level-properties text:space-before="0.8cm"/>
-        <style:text-properties fo:color="#000000" fo:font-size="100%"/>
-      </text:list-level-style-number>
-      <text:list-level-style-number text:level="3" style:num-format="A">
-        <style:list-level-properties text:space-before="1.6cm"/>
-        <style:text-properties fo:color="#000000" fo:font-size="100%"/>
-      </text:list-level-style-number>
-      <text:list-level-style-number text:level="4" style:num-format="A">
-        <style:list-level-properties text:space-before="2.4cm"/>
-        <style:text-properties fo:color="#000000" fo:font-size="100%"/>
-      </text:list-level-style-number>
-      <text:list-level-style-number text:level="5" style:num-format="A">
-        <style:list-level-properties text:space-before="3.2cm"/>
-        <style:text-properties fo:color="#000000" fo:font-size="100%"/>
-      </text:list-level-style-number>
-      <text:list-level-style-number text:level="6" style:num-format="A">
-        <style:list-level-properties text:space-before="4cm"/>
-        <style:text-properties fo:color="#000000" fo:font-size="100%"/>
-      </text:list-level-style-number>
-      <text:list-level-style-number text:level="7" style:num-format="A">
-        <style:list-level-properties text:space-before="4.8cm"/>
-        <style:text-properties fo:color="#000000" fo:font-size="100%"/>
-      </text:list-level-style-number>
-      <text:list-level-style-number text:level="8" style:num-format="A">
-        <style:list-level-properties text:space-before="5.6cm"/>
-        <style:text-properties fo:color="#000000" fo:font-size="100%"/>
-      </text:list-level-style-number>
-      <text:list-level-style-number text:level="9" style:num-format="A">
-        <style:list-level-properties text:space-before="6.4cm"/>
-        <style:text-properties fo:color="#000000" fo:font-size="100%"/>
-      </text:list-level-style-number>
-      <text:list-level-style-number text:level="10" style:num-format="A">
-        <style:list-level-properties text:space-before="7.2cm"/>
-        <style:text-properties fo:color="#000000" fo:font-size="100%"/>
-      </text:list-level-style-number>
-    </text:list-style>
-    <style:style style:name="gr1" style:family="graphic">
-      <style:graphic-properties draw:stroke="none" svg:stroke-color="#000000" 
draw:fill="none" draw:fill-color="#ffffff" fo:min-height="0.504cm" 
style:run-through="foreground" style:wrap="run-through" 
style:number-wrapped-paragraphs="no-limit" style:vertical-pos="from-top" 
style:vertical-rel="page" style:horizontal-pos="from-left" 
style:horizontal-rel="paragraph" 
draw:wrap-influence-on-position="once-concurrent" style:flow-with-text="false"/>
+    <style:style style:name="gr1" style:family="graphic" 
style:parent-style-name="Graphics">
+      <style:graphic-properties draw:stroke="none" svg:stroke-color="#000000" 
draw:fill="none" draw:fill-color="#ffffff" fo:min-height="0.25cm" 
style:run-through="foreground" style:wrap="run-through" 
style:number-wrapped-paragraphs="no-limit" 
draw:wrap-influence-on-position="once-concurrent" style:flow-with-text="false"/>
     </style:style>
   </office:automatic-styles>
   <office:body>
@@ -587,35 +99,31 @@
         <text:sequence-decl text:display-outline-level="0" text:name="Text"/>
         <text:sequence-decl text:display-outline-level="0" 
text:name="Drawing"/>
       </text:sequence-decls>
-      <draw:frame text:anchor-type="page" text:anchor-page-number="1" 
draw:z-index="10" draw:style-name="gr1" draw:text-style-name="P17" 
svg:width="5.905cm" svg:height="0.505cm" svg:x="7.782cm" svg:y="29.162cm">
+      <draw:frame draw:name="TemplateDesigner" text:anchor-page-number="1" 
draw:style-name="gr1" svg:width="3.8cm" svg:height="0.5cm">
         <draw:text-box>
-          <text:p>
-            <text:span text:style-name="T3">Designed by Edmund 
Laugasson</text:span>
-          </text:p>
+          <text:p text:style-name="P17">Designed by Edmund Laugasson</text:p>
         </draw:text-box>
       </draw:frame>
       <text:p text:style-name="Standard">
-        <draw:frame draw:style-name="fr1" draw:name="Frame1" 
text:anchor-type="as-char" svg:width="8.998cm" svg:height="5.198cm" 
draw:z-index="0">
+        <draw:frame draw:style-name="Labels" svg:width="9cm" 
svg:height="5.2cm" draw:z-index="0">
           <draw:text-box>
             <text:section text:style-name="Sect1" text:name="MasterLabel">
-              <table:table table:name="Table19" table:style-name="Table19">
-                <table:table-column table:style-name="Table19.A"/>
-                <table:table-column table:style-name="Table19.B"/>
-                <table:table-column table:style-name="Table19.C"/>
-                <table:table-column table:style-name="Table19.D"/>
-                <table:table-column table:style-name="Table19.E"/>
+              <table:table table:style-name="Table1">
+                <table:table-column table:style-name="Table1.A"/>
+                <table:table-column table:style-name="Table1.B"/>
+                <table:table-column table:style-name="Table1.C"/>
+                <table:table-column table:style-name="Table1.D"/>
+                <table:table-column table:style-name="Table1.E"/>
                 <table:table-row>
-                  <table:table-cell table:style-name="Table19.A1" 
table:number-columns-spanned="5" office:value-type="string">
+                  <table:table-cell table:style-name="Table1.A1" 
table:number-columns-spanned="5" office:value-type="string">
                     <text:p text:style-name="P8">
-                      <draw:frame draw:style-name="fr2" draw:name="Image1" 
text:anchor-type="paragraph" svg:width="2.604cm" svg:height="0.834cm" 
draw:z-index="11">
+                      <draw:frame draw:style-name="fr2" draw:name="Image1" 
text:anchor-type="paragraph" svg:width="2.604cm" svg:height="0.834cm" 
draw:z-index="1">
                         <draw:image 
xlink:href="Pictures/10000201000001F4000000A0108F3F06.png" xlink:type="simple" 
xlink:show="embed" xlink:actuate="onLoad"/>
                       </draw:frame>
-                      <text:span text:style-name="T2">
-                        <text:tab/>
-                      </text:span>
+                      <text:tab/>
                       <text:author-name text:fixed="false"/>
                     </text:p>
-                    <text:p text:style-name="P4"><text:span 
text:style-name="T2"><text:tab/></text:span>profession</text:p>
+                    <text:p text:style-name="P4"><text:tab/>profession</text:p>
                   </table:table-cell>
                   <table:covered-table-cell/>
                   <table:covered-table-cell/>
@@ -623,115 +131,104 @@
                   <table:covered-table-cell/>
                 </table:table-row>
                 <table:table-row>
-                  <table:table-cell table:style-name="Table19.A2" 
table:number-columns-spanned="2" office:value-type="string">
-                    <text:p text:style-name="P1"/>
-                  </table:table-cell>
-                  <table:covered-table-cell/>
-                  <table:table-cell table:style-name="Table19.C2" 
table:number-columns-spanned="3" office:value-type="string">
-                    <text:p text:style-name="P5"/>
-                  </table:table-cell>
-                  <table:covered-table-cell/>
-                  <table:covered-table-cell/>
-                </table:table-row>
-                <table:table-row>
-                  <table:table-cell table:style-name="Table19.A3" 
office:value-type="string">
-                    <text:p text:style-name="P2"/>
+                  <table:table-cell table:style-name="Table1.A3" 
office:value-type="string">
+                    <text:p text:style-name="P3"/>
                   </table:table-cell>
-                  <table:table-cell table:style-name="Table19.B3" 
office:value-type="string">
-                    <text:p text:style-name="P6"><text:span 
text:style-name="T1">Work</text:span>:</text:p>
+                  <table:table-cell table:style-name="Table1.B3" 
office:value-type="string">
+                    <text:p text:style-name="P6">Work:</text:p>
                   </table:table-cell>
-                  <table:table-cell table:style-name="Table19.B3" 
office:value-type="string">
-                    <text:p text:style-name="P7">GSM:</text:p>
+                  <table:table-cell table:style-name="Table1.B3" 
office:value-type="string">
+                    <text:p text:style-name="P2">GSM:</text:p>
                   </table:table-cell>
-                  <table:table-cell table:style-name="Table19.B3" 
office:value-type="string">
+                  <table:table-cell table:style-name="Table1.B3" 
office:value-type="string">
                     <text:p text:style-name="P3"/>
                   </table:table-cell>
-                  <table:table-cell table:style-name="Table19.C2" 
office:value-type="string">
+                  <table:table-cell table:style-name="Table1.C2" 
office:value-type="string">
                     <text:p text:style-name="P3"/>
                   </table:table-cell>
                 </table:table-row>
                 <table:table-row>
-                  <table:table-cell table:style-name="Table19.A3" 
office:value-type="string">
+                  <table:table-cell table:style-name="Table1.A3" 
office:value-type="string">
                     <text:p text:style-name="P3"/>
                   </table:table-cell>
-                  <table:table-cell table:style-name="Table19.B3" 
office:value-type="string">
+                  <table:table-cell table:style-name="Table1.B3" 
office:value-type="string">
                     <text:p text:style-name="P2"/>
                   </table:table-cell>
-                  <table:table-cell table:style-name="Table19.B3" 
office:value-type="string">
-                    <text:p text:style-name="P2"><text:span 
text:style-name="T1">phone</text:span>:</text:p>
+                  <table:table-cell table:style-name="Table1.B3" 
office:value-type="string">
+                    <text:p text:style-name="P2">phone:</text:p>
                   </table:table-cell>
-                  <table:table-cell table:style-name="Table19.B3" 
office:value-type="string">
+                  <table:table-cell table:style-name="Table1.B3" 
office:value-type="string">
                     <text:p text:style-name="P3"/>
                   </table:table-cell>
-                  <table:table-cell table:style-name="Table19.C2" 
office:value-type="string">
+                  <table:table-cell table:style-name="Table1.C2" 
office:value-type="string">
                     <text:p text:style-name="P3"/>
                   </table:table-cell>
                 </table:table-row>
                 <table:table-row>
-                  <table:table-cell table:style-name="Table19.A3" 
office:value-type="string">
+                  <table:table-cell table:style-name="Table1.A3" 
office:value-type="string">
                     <text:p text:style-name="P3"/>
                   </table:table-cell>
-                  <table:table-cell table:style-name="Table19.B3" 
office:value-type="string">
+                  <table:table-cell table:style-name="Table1.B3" 
office:value-type="string">
                     <text:p text:style-name="P2"/>
                   </table:table-cell>
-                  <table:table-cell table:style-name="Table19.B3" 
office:value-type="string">
-                    <text:p text:style-name="P2">e-<text:span 
text:style-name="T1">mail</text:span>:</text:p>
+                  <table:table-cell table:style-name="Table1.B3" 
office:value-type="string">
+                    <text:p text:style-name="P2">e-mail:</text:p>
                   </table:table-cell>
-                  <table:table-cell table:style-name="Table19.B3" 
office:value-type="string">
+                  <table:table-cell table:style-name="Table1.B3" 
office:value-type="string">
                     <text:p text:style-name="P3"/>
                   </table:table-cell>
-                  <table:table-cell table:style-name="Table19.C2" 
office:value-type="string">
+                  <table:table-cell table:style-name="Table1.C2" 
office:value-type="string">
                     <text:p text:style-name="P3"/>
                   </table:table-cell>
                 </table:table-row>
                 <table:table-row>
-                  <table:table-cell table:style-name="Table19.A3" 
office:value-type="string">
+                  <table:table-cell table:style-name="Table1.A3" 
office:value-type="string">
                     <text:p text:style-name="P3"/>
                   </table:table-cell>
-                  <table:table-cell table:style-name="Table19.B3" 
office:value-type="string">
-                    <text:p text:style-name="P6"/>
+                  <table:table-cell table:style-name="Table1.B3" 
office:value-type="string">
+                    <text:p text:style-name="P2"/>
                   </table:table-cell>
-                  <table:table-cell table:style-name="Table19.B3" 
office:value-type="string">
-                    <text:p text:style-name="P2">fa<text:span 
text:style-name="T1">x</text:span>:</text:p>
+                  <table:table-cell table:style-name="Table1.B3" 
office:value-type="string">
+                    <text:p text:style-name="P2">fax:</text:p>
                   </table:table-cell>
-                  <table:table-cell table:style-name="Table19.B3" 
office:value-type="string">
+                  <table:table-cell table:style-name="Table1.B3" 
office:value-type="string">
                     <text:p text:style-name="P3"/>
                   </table:table-cell>
-                  <table:table-cell table:style-name="Table19.C2" 
office:value-type="string">
+                  <table:table-cell table:style-name="Table1.C2" 
office:value-type="string">
                     <text:p text:style-name="P3"/>
                   </table:table-cell>
                 </table:table-row>
                 <table:table-row>
-                  <table:table-cell table:style-name="Table19.A3" 
office:value-type="string">
+                  <table:table-cell table:style-name="Table1.A3" 
office:value-type="string">
                     <text:p text:style-name="P3"/>
                   </table:table-cell>
-                  <table:table-cell table:style-name="Table19.B3" 
office:value-type="string">
-                    <text:p text:style-name="P6"><text:span 
text:style-name="T1">Home</text:span>:</text:p>
+                  <table:table-cell table:style-name="Table1.B3" 
office:value-type="string">
+                    <text:p text:style-name="P6">Home:</text:p>
                   </table:table-cell>
-                  <table:table-cell table:style-name="Table19.B3" 
office:value-type="string">
-                    <text:p text:style-name="P2"><text:span 
text:style-name="T1">phone</text:span>:</text:p>
+                  <table:table-cell table:style-name="Table1.B3" 
office:value-type="string">
+                    <text:p text:style-name="P2">phone:</text:p>
                   </table:table-cell>
-                  <table:table-cell table:style-name="Table19.B3" 
office:value-type="string">
+                  <table:table-cell table:style-name="Table1.B3" 
office:value-type="string">
                     <text:p text:style-name="P3"/>
                   </table:table-cell>
-                  <table:table-cell table:style-name="Table19.C2" 
office:value-type="string">
+                  <table:table-cell table:style-name="Table1.C2" 
office:value-type="string">
                     <text:p text:style-name="P3"/>
                   </table:table-cell>
                 </table:table-row>
                 <table:table-row>
-                  <table:table-cell table:style-name="Table19.A8" 
office:value-type="string">
+                  <table:table-cell table:style-name="Table1.A8" 
office:value-type="string">
                     <text:p text:style-name="P3"/>
                   </table:table-cell>
-                  <table:table-cell table:style-name="Table19.B8" 
office:value-type="string">
+                  <table:table-cell table:style-name="Table1.B8" 
office:value-type="string">
                     <text:p text:style-name="P2"/>
                   </table:table-cell>
-                  <table:table-cell table:style-name="Table19.B8" 
office:value-type="string">
-                    <text:p text:style-name="P2">e-<text:span 
text:style-name="T1">mail</text:span>:</text:p>
+                  <table:table-cell table:style-name="Table1.B8" 
office:value-type="string">
+                    <text:p text:style-name="P2">e-mail:</text:p>
                   </table:table-cell>
-                  <table:table-cell table:style-name="Table19.B8" 
office:value-type="string">
+                  <table:table-cell table:style-name="Table1.B8" 
office:value-type="string">
                     <text:p text:style-name="P3"/>
                   </table:table-cell>
-                  <table:table-cell table:style-name="Table19.E8" 
office:value-type="string">
+                  <table:table-cell table:style-name="Table1.E8" 
office:value-type="string">
                     <text:p text:style-name="P3"/>
                   </table:table-cell>
                 </table:table-row>
@@ -740,1325 +237,74 @@
             </text:section>
           </draw:text-box>
         </draw:frame>
-        <draw:frame draw:style-name="fr1" draw:name="Frame2" 
text:anchor-type="as-char" svg:width="8.998cm" svg:height="5.198cm" 
draw:z-index="1">
+        <draw:frame draw:style-name="Labels" draw:name="Frame1" 
svg:width="9cm" svg:height="5.2cm">
           <draw:text-box>
             <text:section text:style-name="Sect1" text:name="Section1" 
text:protected="true">
               <text:section-source text:section-name="MasterLabel"/>
-              <table:table table:name="Table1" table:style-name="Table1">
-                <table:table-column table:style-name="Table1.A"/>
-                <table:table-column table:style-name="Table1.B"/>
-                <table:table-column table:style-name="Table1.C"/>
-                <table:table-column table:style-name="Table1.D"/>
-                <table:table-column table:style-name="Table1.E"/>
-                <table:table-row>
-                  <table:table-cell table:style-name="Table1.A1" 
table:number-columns-spanned="5" office:value-type="string">
-                    <text:p text:style-name="P8">
-                      <draw:frame draw:style-name="fr2" draw:name="Image2" 
text:anchor-type="paragraph" svg:width="2.604cm" svg:height="0.834cm" 
draw:z-index="12">
-                        <draw:image 
xlink:href="Pictures/10000201000001F4000000A0108F3F06.png" xlink:type="simple" 
xlink:show="embed" xlink:actuate="onLoad"/>
-                      </draw:frame>
-                      <text:span text:style-name="T2">
-                        <text:tab/>
-                      </text:span>
-                      <text:author-name text:fixed="false"/>
-                    </text:p>
-                    <text:p text:style-name="P4"><text:span 
text:style-name="T2"><text:tab/></text:span>profession</text:p>
-                  </table:table-cell>
-                  <table:covered-table-cell/>
-                  <table:covered-table-cell/>
-                  <table:covered-table-cell/>
-                  <table:covered-table-cell/>
-                </table:table-row>
-                <table:table-row>
-                  <table:table-cell table:style-name="Table1.A2" 
table:number-columns-spanned="2" office:value-type="string">
-                    <text:p text:style-name="P1"/>
-                  </table:table-cell>
-                  <table:covered-table-cell/>
-                  <table:table-cell table:style-name="Table1.C2" 
table:number-columns-spanned="3" office:value-type="string">
-                    <text:p text:style-name="P5"/>
-                  </table:table-cell>
-                  <table:covered-table-cell/>
-                  <table:covered-table-cell/>
-                </table:table-row>
-                <table:table-row>
-                  <table:table-cell table:style-name="Table1.A3" 
office:value-type="string">
-                    <text:p text:style-name="P2"/>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table1.B3" 
office:value-type="string">
-                    <text:p text:style-name="P6"><text:span 
text:style-name="T1">Work</text:span>:</text:p>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table1.B3" 
office:value-type="string">
-                    <text:p text:style-name="P7">GSM:</text:p>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table1.B3" 
office:value-type="string">
-                    <text:p text:style-name="P3"/>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table1.C2" 
office:value-type="string">
-                    <text:p text:style-name="P3"/>
-                  </table:table-cell>
-                </table:table-row>
-                <table:table-row>
-                  <table:table-cell table:style-name="Table1.A3" 
office:value-type="string">
-                    <text:p text:style-name="P3"/>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table1.B3" 
office:value-type="string">
-                    <text:p text:style-name="P2"/>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table1.B3" 
office:value-type="string">
-                    <text:p text:style-name="P2"><text:span 
text:style-name="T1">phone</text:span>:</text:p>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table1.B3" 
office:value-type="string">
-                    <text:p text:style-name="P3"/>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table1.C2" 
office:value-type="string">
-                    <text:p text:style-name="P3"/>
-                  </table:table-cell>
-                </table:table-row>
-                <table:table-row>
-                  <table:table-cell table:style-name="Table1.A3" 
office:value-type="string">
-                    <text:p text:style-name="P3"/>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table1.B3" 
office:value-type="string">
-                    <text:p text:style-name="P2"/>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table1.B3" 
office:value-type="string">
-                    <text:p text:style-name="P2">e-<text:span 
text:style-name="T1">mail</text:span>:</text:p>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table1.B3" 
office:value-type="string">
-                    <text:p text:style-name="P3"/>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table1.C2" 
office:value-type="string">
-                    <text:p text:style-name="P3"/>
-                  </table:table-cell>
-                </table:table-row>
-                <table:table-row>
-                  <table:table-cell table:style-name="Table1.A3" 
office:value-type="string">
-                    <text:p text:style-name="P3"/>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table1.B3" 
office:value-type="string">
-                    <text:p text:style-name="P6"/>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table1.B3" 
office:value-type="string">
-                    <text:p text:style-name="P2">fa<text:span 
text:style-name="T1">x</text:span>:</text:p>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table1.B3" 
office:value-type="string">
-                    <text:p text:style-name="P3"/>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table1.C2" 
office:value-type="string">
-                    <text:p text:style-name="P3"/>
-                  </table:table-cell>
-                </table:table-row>
-                <table:table-row>
-                  <table:table-cell table:style-name="Table1.A3" 
office:value-type="string">
-                    <text:p text:style-name="P3"/>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table1.B3" 
office:value-type="string">
-                    <text:p text:style-name="P6"><text:span 
text:style-name="T1">Home</text:span>:</text:p>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table1.B3" 
office:value-type="string">
-                    <text:p text:style-name="P2"><text:span 
text:style-name="T1">phone</text:span>:</text:p>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table1.B3" 
office:value-type="string">
-                    <text:p text:style-name="P3"/>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table1.C2" 
office:value-type="string">
-                    <text:p text:style-name="P3"/>
-                  </table:table-cell>
-                </table:table-row>
-                <table:table-row>
-                  <table:table-cell table:style-name="Table1.A8" 
office:value-type="string">
-                    <text:p text:style-name="P3"/>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table1.B8" 
office:value-type="string">
-                    <text:p text:style-name="P2"/>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table1.B8" 
office:value-type="string">
-                    <text:p text:style-name="P2">e-<text:span 
text:style-name="T1">mail</text:span>:</text:p>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table1.B8" 
office:value-type="string">
-                    <text:p text:style-name="P3"/>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table1.E8" 
office:value-type="string">
-                    <text:p text:style-name="P3"/>
-                  </table:table-cell>
-                </table:table-row>
-              </table:table>
-              <text:p text:style-name="Standard"/>
             </text:section>
           </draw:text-box>
         </draw:frame>
       </text:p>
       <text:p text:style-name="Standard">
-        <draw:frame draw:style-name="fr1" draw:name="Frame3" 
text:anchor-type="as-char" svg:width="8.998cm" svg:height="5.198cm" 
draw:z-index="2">
+        <draw:frame draw:style-name="Labels" draw:name="Frame2" 
svg:width="9cm" svg:height="5.2cm" draw:z-index="2">
           <draw:text-box>
             <text:section text:style-name="Sect1" text:name="Section2" 
text:protected="true">
               <text:section-source text:section-name="MasterLabel"/>
-              <table:table table:name="Table2" table:style-name="Table2">
-                <table:table-column table:style-name="Table2.A"/>
-                <table:table-column table:style-name="Table2.B"/>
-                <table:table-column table:style-name="Table2.C"/>
-                <table:table-column table:style-name="Table2.D"/>
-                <table:table-column table:style-name="Table2.E"/>
-                <table:table-row>
-                  <table:table-cell table:style-name="Table2.A1" 
table:number-columns-spanned="5" office:value-type="string">
-                    <text:p text:style-name="P8">
-                      <draw:frame draw:style-name="fr2" draw:name="Image3" 
text:anchor-type="paragraph" svg:width="2.604cm" svg:height="0.834cm" 
draw:z-index="13">
-                        <draw:image 
xlink:href="Pictures/10000201000001F4000000A0108F3F06.png" xlink:type="simple" 
xlink:show="embed" xlink:actuate="onLoad"/>
-                      </draw:frame>
-                      <text:span text:style-name="T2">
-                        <text:tab/>
-                      </text:span>
-                      <text:author-name text:fixed="false"/>
-                    </text:p>
-                    <text:p text:style-name="P4"><text:span 
text:style-name="T2"><text:tab/></text:span>profession</text:p>
-                  </table:table-cell>
-                  <table:covered-table-cell/>
-                  <table:covered-table-cell/>
-                  <table:covered-table-cell/>
-                  <table:covered-table-cell/>
-                </table:table-row>
-                <table:table-row>
-                  <table:table-cell table:style-name="Table2.A2" 
table:number-columns-spanned="2" office:value-type="string">
-                    <text:p text:style-name="P1"/>
-                  </table:table-cell>
-                  <table:covered-table-cell/>
-                  <table:table-cell table:style-name="Table2.C2" 
table:number-columns-spanned="3" office:value-type="string">
-                    <text:p text:style-name="P5"/>
-                  </table:table-cell>
-                  <table:covered-table-cell/>
-                  <table:covered-table-cell/>
-                </table:table-row>
-                <table:table-row>
-                  <table:table-cell table:style-name="Table2.A3" 
office:value-type="string">
-                    <text:p text:style-name="P2"/>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table2.B3" 
office:value-type="string">
-                    <text:p text:style-name="P6"><text:span 
text:style-name="T1">Work</text:span>:</text:p>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table2.B3" 
office:value-type="string">
-                    <text:p text:style-name="P7">GSM:</text:p>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table2.B3" 
office:value-type="string">
-                    <text:p text:style-name="P3"/>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table2.C2" 
office:value-type="string">
-                    <text:p text:style-name="P3"/>
-                  </table:table-cell>
-                </table:table-row>
-                <table:table-row>
-                  <table:table-cell table:style-name="Table2.A3" 
office:value-type="string">
-                    <text:p text:style-name="P3"/>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table2.B3" 
office:value-type="string">
-                    <text:p text:style-name="P2"/>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table2.B3" 
office:value-type="string">
-                    <text:p text:style-name="P2"><text:span 
text:style-name="T1">phone</text:span>:</text:p>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table2.B3" 
office:value-type="string">
-                    <text:p text:style-name="P3"/>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table2.C2" 
office:value-type="string">
-                    <text:p text:style-name="P3"/>
-                  </table:table-cell>
-                </table:table-row>
-                <table:table-row>
-                  <table:table-cell table:style-name="Table2.A3" 
office:value-type="string">
-                    <text:p text:style-name="P3"/>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table2.B3" 
office:value-type="string">
-                    <text:p text:style-name="P2"/>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table2.B3" 
office:value-type="string">
-                    <text:p text:style-name="P2">e-<text:span 
text:style-name="T1">mail</text:span>:</text:p>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table2.B3" 
office:value-type="string">
-                    <text:p text:style-name="P3"/>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table2.C2" 
office:value-type="string">
-                    <text:p text:style-name="P3"/>
-                  </table:table-cell>
-                </table:table-row>
-                <table:table-row>
-                  <table:table-cell table:style-name="Table2.A3" 
office:value-type="string">
-                    <text:p text:style-name="P3"/>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table2.B3" 
office:value-type="string">
-                    <text:p text:style-name="P6"/>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table2.B3" 
office:value-type="string">
-                    <text:p text:style-name="P2">fa<text:span 
text:style-name="T1">x</text:span>:</text:p>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table2.B3" 
office:value-type="string">
-                    <text:p text:style-name="P3"/>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table2.C2" 
office:value-type="string">
-                    <text:p text:style-name="P3"/>
-                  </table:table-cell>
-                </table:table-row>
-                <table:table-row>
-                  <table:table-cell table:style-name="Table2.A3" 
office:value-type="string">
-                    <text:p text:style-name="P3"/>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table2.B3" 
office:value-type="string">
-                    <text:p text:style-name="P6"><text:span 
text:style-name="T1">Home</text:span>:</text:p>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table2.B3" 
office:value-type="string">
-                    <text:p text:style-name="P2"><text:span 
text:style-name="T1">phone</text:span>:</text:p>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table2.B3" 
office:value-type="string">
-                    <text:p text:style-name="P3"/>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table2.C2" 
office:value-type="string">
-                    <text:p text:style-name="P3"/>
-                  </table:table-cell>
-                </table:table-row>
-                <table:table-row>
-                  <table:table-cell table:style-name="Table2.A8" 
office:value-type="string">
-                    <text:p text:style-name="P3"/>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table2.B8" 
office:value-type="string">
-                    <text:p text:style-name="P2"/>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table2.B8" 
office:value-type="string">
-                    <text:p text:style-name="P2">e-<text:span 
text:style-name="T1">mail</text:span>:</text:p>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table2.B8" 
office:value-type="string">
-                    <text:p text:style-name="P3"/>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table2.E8" 
office:value-type="string">
-                    <text:p text:style-name="P3"/>
-                  </table:table-cell>
-                </table:table-row>
-              </table:table>
-              <text:p text:style-name="Standard"/>
             </text:section>
           </draw:text-box>
         </draw:frame>
-        <draw:frame draw:style-name="fr1" draw:name="Frame4" 
text:anchor-type="as-char" svg:width="8.998cm" svg:height="5.198cm" 
draw:z-index="3">
+        <draw:frame draw:style-name="Labels" draw:name="Frame3" 
svg:width="9cm" svg:height="5.2cm" draw:z-index="3">
           <draw:text-box>
             <text:section text:style-name="Sect1" text:name="Section3" 
text:protected="true">
               <text:section-source text:section-name="MasterLabel"/>
-              <table:table table:name="Table3" table:style-name="Table3">
-                <table:table-column table:style-name="Table3.A"/>
-                <table:table-column table:style-name="Table3.B"/>
-                <table:table-column table:style-name="Table3.C"/>
-                <table:table-column table:style-name="Table3.D"/>
-                <table:table-column table:style-name="Table3.E"/>
-                <table:table-row>
-                  <table:table-cell table:style-name="Table3.A1" 
table:number-columns-spanned="5" office:value-type="string">
-                    <text:p text:style-name="P8">
-                      <draw:frame draw:style-name="fr2" draw:name="Image4" 
text:anchor-type="paragraph" svg:width="2.604cm" svg:height="0.834cm" 
draw:z-index="14">
-                        <draw:image 
xlink:href="Pictures/10000201000001F4000000A0108F3F06.png" xlink:type="simple" 
xlink:show="embed" xlink:actuate="onLoad"/>
-                      </draw:frame>
-                      <text:span text:style-name="T2">
-                        <text:tab/>
-                      </text:span>
-                      <text:author-name text:fixed="false"/>
-                    </text:p>
-                    <text:p text:style-name="P4"><text:span 
text:style-name="T2"><text:tab/></text:span>profession</text:p>
-                  </table:table-cell>
-                  <table:covered-table-cell/>
-                  <table:covered-table-cell/>
-                  <table:covered-table-cell/>
-                  <table:covered-table-cell/>
-                </table:table-row>
-                <table:table-row>
-                  <table:table-cell table:style-name="Table3.A2" 
table:number-columns-spanned="2" office:value-type="string">
-                    <text:p text:style-name="P1"/>
-                  </table:table-cell>
-                  <table:covered-table-cell/>
-                  <table:table-cell table:style-name="Table3.C2" 
table:number-columns-spanned="3" office:value-type="string">
-                    <text:p text:style-name="P5"/>
-                  </table:table-cell>
-                  <table:covered-table-cell/>
-                  <table:covered-table-cell/>
-                </table:table-row>
-                <table:table-row>
-                  <table:table-cell table:style-name="Table3.A3" 
office:value-type="string">
-                    <text:p text:style-name="P2"/>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table3.B3" 
office:value-type="string">
-                    <text:p text:style-name="P6"><text:span 
text:style-name="T1">Work</text:span>:</text:p>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table3.B3" 
office:value-type="string">
-                    <text:p text:style-name="P7">GSM:</text:p>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table3.B3" 
office:value-type="string">
-                    <text:p text:style-name="P3"/>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table3.C2" 
office:value-type="string">
-                    <text:p text:style-name="P3"/>
-                  </table:table-cell>
-                </table:table-row>
-                <table:table-row>
-                  <table:table-cell table:style-name="Table3.A3" 
office:value-type="string">
-                    <text:p text:style-name="P3"/>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table3.B3" 
office:value-type="string">
-                    <text:p text:style-name="P2"/>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table3.B3" 
office:value-type="string">
-                    <text:p text:style-name="P2"><text:span 
text:style-name="T1">phone</text:span>:</text:p>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table3.B3" 
office:value-type="string">
-                    <text:p text:style-name="P3"/>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table3.C2" 
office:value-type="string">
-                    <text:p text:style-name="P3"/>
-                  </table:table-cell>
-                </table:table-row>
-                <table:table-row>
-                  <table:table-cell table:style-name="Table3.A3" 
office:value-type="string">
-                    <text:p text:style-name="P3"/>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table3.B3" 
office:value-type="string">
-                    <text:p text:style-name="P2"/>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table3.B3" 
office:value-type="string">
-                    <text:p text:style-name="P2">e-<text:span 
text:style-name="T1">mail</text:span>:</text:p>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table3.B3" 
office:value-type="string">
-                    <text:p text:style-name="P3"/>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table3.C2" 
office:value-type="string">
-                    <text:p text:style-name="P3"/>
-                  </table:table-cell>
-                </table:table-row>
-                <table:table-row>
-                  <table:table-cell table:style-name="Table3.A3" 
office:value-type="string">
-                    <text:p text:style-name="P3"/>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table3.B3" 
office:value-type="string">
-                    <text:p text:style-name="P6"/>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table3.B3" 
office:value-type="string">
-                    <text:p text:style-name="P2">fa<text:span 
text:style-name="T1">x</text:span>:</text:p>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table3.B3" 
office:value-type="string">
-                    <text:p text:style-name="P3"/>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table3.C2" 
office:value-type="string">
-                    <text:p text:style-name="P3"/>
-                  </table:table-cell>
-                </table:table-row>
-                <table:table-row>
-                  <table:table-cell table:style-name="Table3.A3" 
office:value-type="string">
-                    <text:p text:style-name="P3"/>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table3.B3" 
office:value-type="string">
-                    <text:p text:style-name="P6"><text:span 
text:style-name="T1">Home</text:span>:</text:p>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table3.B3" 
office:value-type="string">
-                    <text:p text:style-name="P2"><text:span 
text:style-name="T1">phone</text:span>:</text:p>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table3.B3" 
office:value-type="string">
-                    <text:p text:style-name="P3"/>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table3.C2" 
office:value-type="string">
-                    <text:p text:style-name="P3"/>
-                  </table:table-cell>
-                </table:table-row>
-                <table:table-row>
-                  <table:table-cell table:style-name="Table3.A8" 
office:value-type="string">
-                    <text:p text:style-name="P3"/>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table3.B8" 
office:value-type="string">
-                    <text:p text:style-name="P2"/>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table3.B8" 
office:value-type="string">
-                    <text:p text:style-name="P2">e-<text:span 
text:style-name="T1">mail</text:span>:</text:p>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table3.B8" 
office:value-type="string">
-                    <text:p text:style-name="P3"/>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table3.E8" 
office:value-type="string">
-                    <text:p text:style-name="P3"/>
-                  </table:table-cell>
-                </table:table-row>
-              </table:table>
-              <text:p text:style-name="Standard"/>
             </text:section>
           </draw:text-box>
         </draw:frame>
       </text:p>
       <text:p text:style-name="Standard">
-        <draw:frame draw:style-name="fr1" draw:name="Frame5" 
text:anchor-type="as-char" svg:width="8.998cm" svg:height="5.198cm" 
draw:z-index="4">
+        <draw:frame draw:style-name="Labels" draw:name="Frame4" 
svg:width="9cm" svg:height="5.2cm" draw:z-index="4">
           <draw:text-box>
             <text:section text:style-name="Sect1" text:name="Section4" 
text:protected="true">
               <text:section-source text:section-name="MasterLabel"/>
-              <table:table table:name="Table4" table:style-name="Table4">
-                <table:table-column table:style-name="Table4.A"/>
-                <table:table-column table:style-name="Table4.B"/>
-                <table:table-column table:style-name="Table4.C"/>
-                <table:table-column table:style-name="Table4.D"/>
-                <table:table-column table:style-name="Table4.E"/>
-                <table:table-row>
-                  <table:table-cell table:style-name="Table4.A1" 
table:number-columns-spanned="5" office:value-type="string">
-                    <text:p text:style-name="P8">
-                      <draw:frame draw:style-name="fr2" draw:name="Image5" 
text:anchor-type="paragraph" svg:width="2.604cm" svg:height="0.834cm" 
draw:z-index="15">
-                        <draw:image 
xlink:href="Pictures/10000201000001F4000000A0108F3F06.png" xlink:type="simple" 
xlink:show="embed" xlink:actuate="onLoad"/>
-                      </draw:frame>
-                      <text:span text:style-name="T2">
-                        <text:tab/>
-                      </text:span>
-                      <text:author-name text:fixed="false"/>
-                    </text:p>
-                    <text:p text:style-name="P4"><text:span 
text:style-name="T2"><text:tab/></text:span>profession</text:p>
-                  </table:table-cell>
-                  <table:covered-table-cell/>
-                  <table:covered-table-cell/>
-                  <table:covered-table-cell/>
-                  <table:covered-table-cell/>
-                </table:table-row>
-                <table:table-row>
-                  <table:table-cell table:style-name="Table4.A2" 
table:number-columns-spanned="2" office:value-type="string">
-                    <text:p text:style-name="P1"/>
-                  </table:table-cell>
-                  <table:covered-table-cell/>
-                  <table:table-cell table:style-name="Table4.C2" 
table:number-columns-spanned="3" office:value-type="string">
-                    <text:p text:style-name="P5"/>
-                  </table:table-cell>
-                  <table:covered-table-cell/>
-                  <table:covered-table-cell/>
-                </table:table-row>
-                <table:table-row>
-                  <table:table-cell table:style-name="Table4.A3" 
office:value-type="string">
-                    <text:p text:style-name="P2"/>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table4.B3" 
office:value-type="string">
-                    <text:p text:style-name="P6"><text:span 
text:style-name="T1">Work</text:span>:</text:p>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table4.B3" 
office:value-type="string">
-                    <text:p text:style-name="P7">GSM:</text:p>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table4.B3" 
office:value-type="string">
-                    <text:p text:style-name="P3"/>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table4.C2" 
office:value-type="string">
-                    <text:p text:style-name="P3"/>
-                  </table:table-cell>
-                </table:table-row>
-                <table:table-row>
-                  <table:table-cell table:style-name="Table4.A3" 
office:value-type="string">
-                    <text:p text:style-name="P3"/>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table4.B3" 
office:value-type="string">
-                    <text:p text:style-name="P2"/>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table4.B3" 
office:value-type="string">
-                    <text:p text:style-name="P2"><text:span 
text:style-name="T1">phone</text:span>:</text:p>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table4.B3" 
office:value-type="string">
-                    <text:p text:style-name="P3"/>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table4.C2" 
office:value-type="string">
-                    <text:p text:style-name="P3"/>
-                  </table:table-cell>
-                </table:table-row>
-                <table:table-row>
-                  <table:table-cell table:style-name="Table4.A3" 
office:value-type="string">
-                    <text:p text:style-name="P3"/>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table4.B3" 
office:value-type="string">
-                    <text:p text:style-name="P2"/>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table4.B3" 
office:value-type="string">
-                    <text:p text:style-name="P2">e-<text:span 
text:style-name="T1">mail</text:span>:</text:p>
-                  </table:table-cell>
-                  <table:table-cell table:style-name="Table4.B3" 
office:value-type="string">

... etc. - the rest is truncated

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - 12 commits - configure.ac extras/source framework/uiconfig svx/source sw/qa sw/source vcl/qa vcl/source vcl/unx

Reply via email to