Merge branch 'actualizacion-master-2024-07-01' into 'master'

Merge TDF upstream a office-gob master

See merge request strepsirrhini/office-gobmx!27

android/source/src/main/play/listings/en-US/graphics/icon.png

@@ -1 +0,0 @@
-../../../../../../ic_launcher-web.png

android/source/src/main/play/listings/en-US/graphics/icon/icon.png

@@ -0,0 +1 @@
+../../../../../../../ic_launcher-web.png

avmedia/source/gtk/gtkplayer.cxx

@@ -343,11 +343,7 @@ uno::Reference<::media::XPlayerWindow>
         return nullptr;
 
     m_pVideo = gtk_picture_new_for_paintable(GDK_PAINTABLE(m_pStream));
-#if GTK_CHECK_VERSION(4, 7, 2)
     gtk_picture_set_content_fit(GTK_PICTURE(m_pVideo), GTK_CONTENT_FIT_FILL);
-#else
-    gtk_picture_set_keep_aspect_ratio(GTK_PICTURE(m_pVideo), false);
-#endif
     gtk_widget_set_can_target(m_pVideo, false);
     gtk_widget_set_vexpand(m_pVideo, true);
     gtk_widget_set_hexpand(m_pVideo, true);

basctl/uiconfig/basicide/ui/deletelangdialog.ui

@@ -32,4 +32,4 @@
       </object>
     </child>
   </object>
-</interface>
+</interface>

basctl/uiconfig/basicide/ui/dialogpage.ui

@@ -271,4 +271,4 @@
       <widget name="export"/>
     </widgets>
   </object>
-</interface>
+</interface>

basctl/uiconfig/basicide/ui/sortmenu.ui

@@ -39,4 +39,4 @@
       </object>
     </child>
   </object>
-</interface>
+</interface>

basic/source/classes/sbunoobj.cxx

@@ -1697,8 +1697,9 @@ bool checkUnoObjectType(SbUnoObject& rUnoObj, const OUString& rClass)
             OUString aInterfaceName = xClass->getName();
             if ( aInterfaceName == "com.sun.star.bridge.oleautomation.XAutomationObject" )
             {
-                // there is a hack in the extensions/source/ole/oleobj.cxx  to return the typename of the automation object, lets check if it
-                // matches
+                // there is a hack in the extensions/source/ole/oleobj.cxx
+                // to return the typename of the automation object, let's
+                // check if it matches
                 Reference< XInvocation > xInv( aToInspectObj, UNO_QUERY );
                 if ( xInv.is() )
                 {

basic/source/classes/sbxmod.cxx

@@ -1744,7 +1744,7 @@ bool SbModule::HasExeCode()
 {
     // And empty Image always has the Global Chain set up
     static const unsigned char pEmptyImage[] = { 0x45, 0x0 , 0x0, 0x0, 0x0 };
-    // lets be stricter for the moment than VBA
+    // let's be stricter for the moment than VBA
 
     if (!IsCompiled())
     {

basic/source/runtime/runtime.cxx

@@ -1641,7 +1641,7 @@ static bool checkUnoStructCopy( bool bVBA, SbxVariableRef const & refVal, SbxVar
     // There are some circumstances when calling GetObject
     // will trigger an error, we need to squash those here.
     // Alternatively it is possible that the same scenario
-    // could overwrite and existing error. Lets prevent that
+    // could overwrite and existing error. Let's prevent that
     SbxObjectRef xVarObj = static_cast<SbxObject*>(refVar->GetObject());
     if ( eOldErr != ERRCODE_NONE )
         SbxBase::SetError( eOldErr );
@@ -3698,7 +3698,7 @@ SbxVariable* SbiRuntime::FindElement( SbxObject* pObj, sal_uInt32 nOp1, sal_uInt
         }
         // consider index-access for UnoObjects
         // definitely we want this for VBA where properties are often
-        // collections ( which need index access ), but lets only do
+        // collections ( which need index access ), but let's only do
         // this if we actually have params following
         else if( bVBAEnabled && dynamic_cast<const SbUnoProperty*>( pElem) != nullptr && pElem->GetParameters() )
         {

bin/convwatch.py

@@ -355,7 +355,7 @@ def runLoadPrintFileTests(opts, dirs, suffix, reference):
 def mkImages(file, resolution):
     argv = [ "gs", "-r" + resolution, "-sOutputFile=" + file + ".%04d.jpeg",
              "-dNOPROMPT", "-dNOPAUSE", "-dBATCH", "-sDEVICE=jpeg", file ]
-    ret = subprocess.check_call(argv)
+    subprocess.check_call(argv)
 
 def mkAllImages(dirs, suffix, resolution, reference, failed):
     if reference:

bin/find-german-comments

@@ -61,7 +61,6 @@ class Parser:
         """
         Extracts the source code comments.
         """
-        linenum = 0
         if self.args.verbose:
             print("processing file '%s'...\n" % filename)
         sock = open(filename)
@@ -95,7 +94,6 @@ class Parser:
             elif "/*" in i and "*/" not in i and not in_comment:
                 # start of a real multiline comment
                 in_comment = True
-                linenum = count
                 s = re.sub(r".*/\*+", "", i.strip(self.strip))
                 if len(s):
                     buf.append(s.strip(self.strip))
@@ -156,7 +154,7 @@ class Parser:
             if len(path) >= START:
                 return 1
             diff = START - len(path)
-            if diff % 4 is not 0:
+            if (diff % 4) != 0:
                 padding = 1
             else:
                 padding = 0
@@ -216,7 +214,7 @@ class Parser:
         done = False
         while not done:
             nextElem = os.path.split(lastElem)[0]
-            if nextElem is not '':
+            if nextElem != '':
                 lastElem = nextElem
             else:
                 done = True
@@ -378,10 +376,10 @@ class Parser:
                 if not baseDir in directory_allowlist:
                     sys.stderr.write("\n - Error: Missing path %s -\n\n" % baseDir)
                     sys.exit(1)
-                elif directory_allowlist[baseDir] is 0:
+                elif directory_allowlist[baseDir] == 0:
                     self.check_file(path.strip())
                     num_checked = num_checked + 1
-                elif directory_allowlist[baseDir] is 1:
+                elif directory_allowlist[baseDir] == 1:
                     sys.stderr.write("Skipping excluded directory %s\n" % baseDir)
                     directory_allowlist[baseDir] = 2
             elif not globalscan:

bin/gbuild-to-ide

@@ -866,6 +866,12 @@ class VisualStudioIntegrationGenerator(IdeIntegrationGenerator):
     def __init__(self, gbuildparser, ide):
         IdeIntegrationGenerator.__init__(self, gbuildparser, ide)
         self.toolset = os.environ['VCTOOLSET']
+        if os.environ['CPUNAME'] == 'X86_64':
+            self.platform = 'x64'
+        elif os.environ['CPUNAME'] == 'AARCH64':
+            self.platform = 'ARM'
+        else: # 'INTEL'
+            self.platform = 'Win32'
         self.solution_directory = self.gbuildparser.builddir
         self.configurations = {
             'Build': {
@@ -995,7 +1001,7 @@ class VisualStudioIntegrationGenerator(IdeIntegrationGenerator):
             f.write('EndProject\n')
             # end Folders to group tests/libraries/executables
             f.write('Global\n')
-            platform = 'Win32'
+            platform = self.platform
             f.write('\tGlobalSection(SolutionConfigurationPlatforms) = preSolution\n')
             for cfg in self.configurations:
                 f.write('\t\t%(cfg)s|%(platform)s = %(cfg)s|%(platform)s\n' % {'cfg': cfg, 'platform': platform})
@@ -1071,7 +1077,7 @@ class VisualStudioIntegrationGenerator(IdeIntegrationGenerator):
         ET.register_namespace('', self.ns)
         proj_node = ET.Element('{%s}Project' % self.ns, DefaultTargets='Build', ToolsVersion='4.0')
         proj_confs_node = ET.SubElement(proj_node, '{%s}ItemGroup' % self.ns, Label='ProjectConfigurations')
-        platform = 'Win32'
+        platform = self.platform
         for configuration in self.configurations:
             proj_conf_node = ET.SubElement(proj_confs_node,
                                            '{%s}ProjectConfiguration' % self.ns,

bin/refcount_leak.py

@@ -95,7 +95,7 @@ def getFunction(frame):
     start = frame.index(" in ") + len(" in ")
     try:
         end = frame.index(" at ", start)
-    except ValueError as e:
+    except ValueError:
         # argh... stack frames may be split across multiple lines if
         # a parameter has a fancy pretty printer
         return frame[start:]

bin/update_pch_bisect

@@ -54,8 +54,7 @@ def run(command):
 
 def update_pch(filename, lines, marks):
     with open(filename, 'w') as f:
-        for i in xrange(len(marks)):
-            mark = marks[i]
+        for i, mark in enumerate(marks):
             if mark <= TEST_ON:
                 f.write(lines[i])
             else:
@@ -132,8 +131,7 @@ def get_marks(lines):
     marks = []
     min = -1
     max = -1
-    for i in xrange(len(lines)):
-        line = lines[i]
+    for i, line in enumerate(lines):
         if line.startswith('#include'):
             marks.append(TEST_ON)
             min = i if min < 0 else min
@@ -205,8 +203,8 @@ def main():
         # Simplify further, as sometimes we can have
         # false positives due to the benign nature
         # of includes that are not absolutely required.
-        for i in xrange(len(marks)):
-            if marks[i] == GOOD:
+        for i, mark in enumerate(marks):
+            if mark == GOOD:
                 marks[i] = TEST_OFF
                 update_pch(filename, lines, marks)
                 if not run(command):
@@ -214,14 +212,14 @@ def main():
                     marks[i] = GOOD
                 else:
                     marks[i] = BAD
-            elif marks[i] == TEST_OFF:
+            elif mark == TEST_OFF:
                 marks[i] = TEST_ON
 
     update_pch(filename, lines, marks)
 
     log('')
-    for i in xrange(len(marks)):
-        if marks[i] == (BAD if FIND_CONFLICTS else GOOD):
+    for i, mark in enumerate(marks):
+        if mark == (BAD if FIND_CONFLICTS else GOOD):
             print("'{}',".format(get_filename(lines[i].strip('\n'))))
 
     return 0
@@ -258,8 +256,7 @@ class TestBisectConflict(unittest.TestCase):
 
     def _update_func(self, lines, marks):
         self.lines = []
-        for i in xrange(len(marks)):
-            mark = marks[i]
+        for i, mark in enumerate(marks):
             if mark <= TEST_ON:
                 self.lines.append(lines[i])
             else:
@@ -282,7 +279,7 @@ class TestBisectConflict(unittest.TestCase):
 
     def test_conflict(self):
         lines = self.TEST.split('\n')
-        for pos in xrange(len(lines) + 1):
+        for pos in range(len(lines) + 1):
             lines = self.TEST.split('\n')
             lines.insert(pos, self.BAD_LINE)
             (marks, min, max) = get_marks(lines)
@@ -290,11 +287,11 @@ class TestBisectConflict(unittest.TestCase):
             marks = bisect(lines, marks, min, max,
                            lambda l, m: self._update_func(l, m),
                            lambda: self._test_func())
-            for i in xrange(len(marks)):
+            for i, mark in enumerate(marks):
                 if i == pos:
-                    self.assertEqual(BAD, marks[i])
+                    self.assertEqual(BAD, mark)
                 else:
-                    self.assertNotEqual(BAD, marks[i])
+                    self.assertNotEqual(BAD, mark)
 
 class TestBisectRequired(unittest.TestCase):
     TEST = """#include <algorithm>
@@ -310,8 +307,7 @@ class TestBisectRequired(unittest.TestCase):
 
     def _update_func(self, lines, marks):
         self.lines = []
-        for i in xrange(len(marks)):
-            mark = marks[i]
+        for i, mark in enumerate(marks):
             if mark <= TEST_ON:
                 self.lines.append(lines[i])
             else:
@@ -335,7 +331,7 @@ class TestBisectRequired(unittest.TestCase):
 
     def test_required(self):
         lines = self.TEST.split('\n')
-        for pos in xrange(len(lines) + 1):
+        for pos in range(len(lines) + 1):
             lines = self.TEST.split('\n')
             lines.insert(pos, self.REQ_LINE)
             (marks, min, max) = get_marks(lines)
@@ -343,11 +339,11 @@ class TestBisectRequired(unittest.TestCase):
             marks = bisect(lines, marks, min, max,
                            lambda l, m: self._update_func(l, m),
                            lambda: self._test_func())
-            for i in xrange(len(marks)):
+            for i, mark in enumerate(marks):
                 if i == pos:
-                    self.assertEqual(GOOD, marks[i])
+                    self.assertEqual(GOOD, mark)
                 else:
-                    self.assertNotEqual(GOOD, marks[i])
+                    self.assertNotEqual(GOOD, mark)
 
 unittest.main()
 

chart2/uiconfig/ui/3dviewdialog.ui

@@ -95,4 +95,4 @@
       <action-widget response="-11">help</action-widget>
     </action-widgets>
   </object>
-</interface>
+</interface>

chart2/uiconfig/ui/chardialog.ui

@@ -175,4 +175,4 @@
       <action-widget response="-11">help</action-widget>
     </action-widgets>
   </object>
-</interface>
+</interface>

cli_ure/source/uno_bridge/cli_proxy.cxx

@@ -711,7 +711,7 @@ void CliProxy::makeMethodInfos()
         {
             sr::InterfaceMapping mapInherited = objType->GetInterfaceMap(
                 arInheritedIfaces[nArLength - 1]);
-            int numMethods = mapInherited.TargetMethods->Length;
+            numMethods = mapInherited.TargetMethods->Length;
             m_arInterfaceMethodCount[nArLength - 1] = numMethods;
             for (int i = 0; i < numMethods; i++, index++)
             {
@@ -1029,11 +1029,11 @@ void SAL_CALL cli_proxy_dispatch(
                         OSL_ENSURE(usOid.equals( proxy->m_usOid ),
                                     "### different oids!");
 #endif
-                        uno_Interface* pUnoI = bridge->map_cli2uno(
+                        uno_Interface* pUnoI2 = bridge->map_cli2uno(
                             proxy->m_cliI, demanded_td.get() );
                         uno_any_construct(
-                            (uno_Any *)uno_ret, &pUnoI, demanded_td.get(), 0 );
-                        (*pUnoI->release)( pUnoI );
+                            (uno_Any *)uno_ret, &pUnoI2, demanded_td.get(), 0 );
+                        (*pUnoI2->release)( pUnoI2 );
                     }
                     else // object does not support demanded interface
                     {

cli_ure/source/uno_bridge/cli_uno.cxx

@@ -106,10 +106,10 @@ System::Object^ Bridge::call_uno(uno_Interface * pUnoI,
                 // cleanup uno in args
                 for (sal_Int32 n = 0; n < nPos; ++n)
                 {
-                    typelib_MethodParameter const & param = pParams[n];
-                    if (param.bIn)
+                    typelib_MethodParameter const & param2 = pParams[n];
+                    if (param2.bIn)
                     {
-                        uno_type_destructData(uno_args[n], param.pTypeRef, 0);
+                        uno_type_destructData(uno_args[n], param2.pTypeRef, 0);
                     }
                 }
                 throw;
@@ -253,9 +253,9 @@ void Bridge::call_cli(
                 // cleanup uno pure out
                 for ( sal_Int32 n = 0; n < nPos; ++n )
                 {
-                    typelib_MethodParameter const & param = params[ n ];
-                    if (! param.bIn)
-                        uno_type_destructData( uno_args[ n ], param.pTypeRef, 0 );
+                    typelib_MethodParameter const & param2 = params[ n ];
+                    if (! param2.bIn)
+                        uno_type_destructData( uno_args[ n ], param2.pTypeRef, 0 );
                 }
                 throw;
             }

codemaker/source/netmaker/netproduce.hxx

@@ -23,6 +23,8 @@ class NetProducer
 public:
     NetProducer()
         : m_manager(new TypeManager())
+        , m_verbose(false)
+        , m_dryRun(false)
     {
     }
 

compilerplugins/clang/cstylecast.cxx

@@ -139,7 +139,7 @@ bool isLiteralLike(Expr const * expr) {
 }
 
 bool canBeUsedForFunctionalCast(TypeSourceInfo const * info) {
-    // Must be <simple-type-specifier> or <typename-specifier>, lets approximate that here:
+    // Must be <simple-type-specifier> or <typename-specifier>, let's approximate that here:
     assert(info != nullptr);
     auto const type = info->getType();
     if (type.hasLocalQualifiers()) {

compilerplugins/clang/dbgunhandledexception.cxx

@@ -16,6 +16,7 @@
 #include <clang/Lex/Lexer.h>
 #include <fstream>
 #include <set>
+#include <stack>
 
 namespace loplugin
 {

compilerplugins/clang/elidestringvar.cxx

@@ -12,6 +12,7 @@
 #include <algorithm>
 #include <cassert>
 #include <map>
+#include <stack>
 
 #include "check.hxx"
 #include "compat.hxx"

compilerplugins/clang/refcounting.cxx

@@ -336,6 +336,8 @@ bool containsSalhelperReferenceObjectSubclass(const clang::Type* pType0) {
             auto const dc = loplugin::DeclCheck(pTemplate);
             if (dc.Class("Reference").Namespace("rtl").GlobalNamespace()
                 || (dc.Class("OStoreHandle").AnonymousNamespace().Namespace("store")
+                    .GlobalNamespace())
+                || (dc.Class("DeleteRtlReferenceOnDeinit").Namespace("vcl")
                     .GlobalNamespace()))
             {
                 return false;

compilerplugins/clang/store/checkunusedparams.cxx

@@ -147,7 +147,7 @@ void CheckUnusedParams::checkForFunctionDecl(Expr const * expr, bool bCheckOnly)
 
 static int noFieldsInRecord(RecordType const * recordType) {
     auto recordDecl = recordType->getDecl();
-    // if it's complicated, lets just assume it has fields
+    // if it's complicated, let's just assume it has fields
     if (isa<ClassTemplateSpecializationDecl>(recordDecl))
         return 1;
     return std::distance(recordDecl->field_begin(), recordDecl->field_end());

compilerplugins/clang/unsignedcompare.cxx

@@ -122,7 +122,7 @@ public:
         // actually meant to e.g. clamp from a large signed type to a small unsigned type.  The
         // assumption is that this will only be likely the case for BO_EQ (==) and BO_NE (!=)
         // comparisons, so filter these out here (not sure what case BO_Cmp (<=>) will turn out to
-        // be, so lets keep it here at least for now):
+        // be, so let's keep it here at least for now):
         switch (expr->getOpcode())
         {
             case BO_Cmp:

configure.ac

@@ -12125,7 +12125,7 @@ if test "$test_gtk4" = yes -a "x$enable_gtk4" = "xyes"; then
         add_warning 'Non-system cairo combined with gtk4 is assumed to cause trouble; proceed at your own risk.'
     fi
     : ${with_system_cairo:=yes}
-    PKG_CHECK_MODULES(GTK4, gtk4 gmodule-no-export-2.0 glib-2.0 >= 2.38 cairo atk)
+    PKG_CHECK_MODULES(GTK4, gtk4 >= 4.10 gmodule-no-export-2.0 glib-2.0 >= 2.38 cairo atk)
     GTK4_CFLAGS=$(printf '%s' "$GTK4_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
     GTK4_CFLAGS="$GTK4_CFLAGS -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
     FilterLibs "${GTK4_LIBS}"
@@ -13312,7 +13312,7 @@ AC_SUBST(SYSTEM_RHINO)
 AC_SUBST(RHINO_JAR)
 
 # This is only used in Qt5/Qt6/KF5/KF6 checks to determine if /usr/lib64
-# paths should be added to library search path. So lets put all 64-bit
+# paths should be added to library search path. So let's put all 64-bit
 # platforms there.
 supports_multilib=
 case "$host_cpu" in

connectivity/source/parse/sqlnode.cxx

@@ -387,7 +387,7 @@ void OSQLParseNode::impl_parseNodeToString_throw(OUStringBuffer& rString, const
         return;
     }
 
-    // Lets see how many nodes this subtree has
+    // Let's see how many nodes this subtree has
     sal_uInt32 nCount = count();
 
     bool bHandled = false;

cppu/source/threadpool/threadpool.cxx

@@ -106,7 +106,7 @@ namespace cppu_threadpool
     }
 
     /******************
-     * This methods lets the thread wait a certain amount of time. If within this timespan
+     * This method lets the thread wait a certain amount of time. If within this timespan
      * a new request comes in, this thread is reused. This is done only to improve performance,
      * it is not required for threadpool functionality.
      ******************/

cui/source/dialogs/AdditionsDialog.cxx

@@ -71,11 +71,12 @@ using namespace ::com::sun::star::beans;
 namespace
 {
 // Gets the content of the given URL and returns as a standard string
-std::string ucbGet(const OUString& rURL)
+std::string ucbGet(const OUString& rURL, const css::uno::Reference<css::awt::XWindow>& xParentWin)
 {
     try
     {
-        auto const s = utl::UcbStreamHelper::CreateStream(rURL, StreamMode::STD_READ);
+        auto const s
+            = utl::UcbStreamHelper::CreateStream(rURL, StreamMode::STD_READ, xParentWin, false);
         if (!s)
         {
             SAL_WARN("cui.dialogs", "CreateStream <" << rURL << "> failed");
@@ -404,7 +405,10 @@ void SearchAndParseThread::execute()
 
     if (m_bIsFirstLoading)
     {
-        std::string sResponse = !m_bUITest ? ucbGet(m_pAdditionsDialog->m_sURL) : "";
+        const auto pDialog = m_pAdditionsDialog->getDialog();
+        std::string sResponse = !m_bUITest ? ucbGet(m_pAdditionsDialog->m_sURL,
+                                                    pDialog ? pDialog->GetXWindow() : nullptr)
+                                           : "";
         parseResponse(sResponse, m_pAdditionsDialog->m_aAllExtensionsVector);
         std::sort(m_pAdditionsDialog->m_aAllExtensionsVector.begin(),
                   m_pAdditionsDialog->m_aAllExtensionsVector.end(),

cui/source/tabpages/autocdlg.cxx

@@ -1145,7 +1145,9 @@ IMPL_LINK(OfaAutocorrReplacePage, ModifyHdl, weld::Entry&, rEdt, void)
                 else
                 {
                     aTestStr = pCharClass->lowercase( aTestStr );
-                    if( aTestStr.startsWith(aWordStr) && !bTmpSelEntry )
+                    if( !bTmpSelEntry && ( aTestStr.startsWith(aWordStr)
+                        // find also with ".*" and between :colons:
+                        || aTestStr.replaceAll(".*","").replaceAll(":", "").startsWith(aWordStr) ) )
                     {
                         m_xReplaceTLB->scroll_to_row(rIter);
                         bTmpSelEntry = true;

cui/uiconfig/ui/asiantypography.ui

@@ -77,4 +77,4 @@
       </object>
     </child>
   </object>
-</interface>
+</interface>

cui/uiconfig/ui/borderareatransparencydialog.ui

@@ -177,4 +177,4 @@
       <action-widget response="101">reset</action-widget>
     </action-widgets>
   </object>
-</interface>
+</interface>

cui/uiconfig/ui/borderbackgrounddialog.ui

@@ -1,34 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
+<!-- Generated with glade 3.40.0 -->
 <interface domain="cui">
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkDialog" id="BorderBackgroundDialog">
-    <property name="can_focus">False</property>
-    <property name="border_width">6</property>
+    <property name="can-focus">False</property>
+    <property name="border-width">6</property>
     <property name="title" translatable="yes" context="borderbackgrounddialog|BorderBackgroundDialog">Border / Background</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
-    <property name="type_hint">dialog</property>
-    <child>
-      <placeholder/>
-    </child>
+    <property name="type-hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">12</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="dialog-action_area1">
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
+            <property name="can-focus">False</property>
+            <property name="layout-style">end</property>
             <child>
               <object class="GtkButton" id="ok">
                 <property name="label" translatable="yes" context="stock">_OK</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="has_default">True</property>
-                <property name="receives_default">True</property>
+                <property name="can-focus">True</property>
+                <property name="can-default">True</property>
+                <property name="has-default">True</property>
+                <property name="receives-default">True</property>
                 <property name="use-underline">True</property>
               </object>
               <packing>
@@ -41,8 +38,8 @@
               <object class="GtkButton" id="cancel">
                 <property name="label" translatable="yes" context="stock">_Cancel</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">True</property>
                 <property name="use-underline">True</property>
               </object>
               <packing>
@@ -55,8 +52,8 @@
               <object class="GtkButton" id="help">
                 <property name="label" translatable="yes" context="stock">_Help</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">True</property>
                 <property name="use-underline">True</property>
               </object>
               <packing>
@@ -70,8 +67,8 @@
               <object class="GtkButton" id="reset">
                 <property name="label" translatable="yes" context="stock">_Reset</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">True</property>
                 <property name="use-underline">True</property>
               </object>
               <packing>
@@ -84,23 +81,23 @@
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="pack_type">end</property>
+            <property name="pack-type">end</property>
             <property name="position">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkNotebook" id="tabcontrol">
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
+            <property name="can-focus">True</property>
             <property name="hexpand">True</property>
             <property name="vexpand">True</property>
             <property name="scrollable">True</property>
-            <property name="enable_popup">True</property>
+            <property name="enable-popup">True</property>
             <child>
               <!-- n-columns=1 n-rows=1 -->
               <object class="GtkGrid">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <child>
                   <placeholder/>
                 </child>
@@ -109,18 +106,18 @@
             <child type="tab">
               <object class="GtkLabel" id="borders">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="label" translatable="yes" context="borderbackgrounddialog|borders">Borders</property>
               </object>
               <packing>
-                <property name="tab_fill">False</property>
+                <property name="tab-fill">False</property>
               </packing>
             </child>
             <child>
               <!-- n-columns=1 n-rows=1 -->
               <object class="GtkGrid">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <child>
                   <placeholder/>
                 </child>
@@ -132,12 +129,12 @@
             <child type="tab">
               <object class="GtkLabel" id="background">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="label" translatable="yes" context="borderbackgrounddialog|background">Background</property>
               </object>
               <packing>
                 <property name="position">1</property>
-                <property name="tab_fill">False</property>
+                <property name="tab-fill">False</property>
               </packing>
             </child>
           </object>

cui/uiconfig/ui/eventassigndialog.ui

@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.40.0 -->
 <interface domain="cui">
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkDialog" id="EventAssignDialog">
-    <property name="can_focus">False</property>
-    <property name="border_width">6</property>
+    <property name="can-focus">False</property>
+    <property name="border-width">6</property>
     <property name="title" translatable="yes" context="eventassigndialog|EventAssignDialog">Assign Macro</property>
     <property name="resizable">False</property>
-    <property name="type_hint">normal</property>
+    <property name="type-hint">normal</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">12</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="dialog-action_area1">
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
+            <property name="can-focus">False</property>
+            <property name="layout-style">end</property>
             <child>
               <object class="GtkButton" id="ok">
                 <property name="label" translatable="yes" context="stock">_OK</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="has_default">True</property>
-                <property name="receives_default">True</property>
+                <property name="can-focus">True</property>
+                <property name="can-default">True</property>
+                <property name="has-default">True</property>
+                <property name="receives-default">True</property>
                 <property name="use-underline">True</property>
               </object>
               <packing>
@@ -37,8 +37,8 @@
               <object class="GtkButton" id="cancel">
                 <property name="label" translatable="yes" context="stock">_Cancel</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">True</property>
                 <property name="use-underline">True</property>
               </object>
               <packing>
@@ -51,8 +51,8 @@
               <object class="GtkButton" id="help">
                 <property name="label" translatable="yes" context="stock">_Help</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">True</property>
                 <property name="use-underline">True</property>
               </object>
               <packing>
@@ -66,7 +66,7 @@
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="pack_type">end</property>
+            <property name="pack-type">end</property>
             <property name="position">0</property>
           </packing>
         </child>

cui/uiconfig/ui/querydeletedictionarydialog.ui

@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.40.0 -->
 <interface domain="cui">
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkMessageDialog" id="QueryDeleteDictionaryDialog">
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <property name="title" translatable="yes" context="querydeletedictionarydialog|QueryDeleteDictionaryDialog">Delete Dictionary?</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
-    <property name="type_hint">dialog</property>
-    <property name="skip_taskbar_hint">True</property>
-    <property name="message_type">warning</property>
+    <property name="type-hint">dialog</property>
+    <property name="skip-taskbar-hint">True</property>
+    <property name="message-type">warning</property>
     <property name="buttons">yes-no</property>
     <property name="text" translatable="yes" context="querydeletedictionarydialog|QueryDeleteDictionaryDialog">Do you really want to delete the dictionary?</property>
-    <property name="secondary_text" translatable="yes" context="querydeletedictionarydialog|QueryDeleteDictionaryDialog">This action cannot be undone.</property>
+    <property name="secondary-text" translatable="yes" context="querydeletedictionarydialog|QueryDeleteDictionaryDialog">This action cannot be undone.</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox">
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">12</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="messagedialog-action_area">
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
           </object>
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="pack_type">end</property>
+            <property name="pack-type">end</property>
             <property name="position">0</property>
           </packing>
         </child>

cui/uiconfig/ui/querydeletelineenddialog.ui

@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.40.0 -->
 <interface domain="cui">
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkMessageDialog" id="AskDelLineEndDialog">
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <property name="title" translatable="yes" context="querydeletelineenddialog|AskDelLineEndDialog">Delete Arrow Style?</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
-    <property name="type_hint">dialog</property>
-    <property name="skip_taskbar_hint">True</property>
-    <property name="message_type">question</property>
+    <property name="type-hint">dialog</property>
+    <property name="skip-taskbar-hint">True</property>
+    <property name="message-type">question</property>
     <property name="buttons">yes-no</property>
     <property name="text" translatable="yes" context="querydeletelineenddialog|AskDelLineEndDialog">Do you really want to delete the arrow style?</property>
-    <property name="secondary_text" translatable="yes" context="querydeletelineenddialog|AskDelLineEndDialog">This action cannot be undone.</property>
+    <property name="secondary-text" translatable="yes" context="querydeletelineenddialog|AskDelLineEndDialog">This action cannot be undone.</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox">
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">12</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="messagedialog-action_area">
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
           </object>
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="pack_type">end</property>
+            <property name="pack-type">end</property>
             <property name="position">0</property>
           </packing>
         </child>

dbaccess/source/core/inc/ModelImpl.hxx

@@ -431,7 +431,7 @@ public:
     css::uno::Reference< css::script::XStorageBasedLibraryContainer >
             getLibraryContainer( bool _bScript );
 
-    /** lets our library containers store themself into the given root storage
+    /** lets our library containers store themselves into the given root storage
     */
     void    storeLibraryContainersTo( const css::uno::Reference< css::embed::XStorage >& _rxToRootStorage );
 

dbaccess/uiconfig/ui/admindialog.ui

@@ -132,4 +132,4 @@
       <action-widget response="-11">help</action-widget>
     </action-widgets>
   </object>
-</interface>
+</interface>

dbaccess/uiconfig/ui/autocharsetpage.ui

@@ -1,37 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.40.0 -->
 <interface domain="dba">
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkBox" id="AutoCharset">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <property name="hexpand">True</property>
     <property name="vexpand">True</property>
-    <property name="border_width">6</property>
+    <property name="border-width">6</property>
     <property name="orientation">vertical</property>
     <property name="spacing">12</property>
     <child>
       <object class="GtkFrame" id="frame1">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="hexpand">True</property>
-        <property name="label_xalign">0</property>
-        <property name="shadow_type">none</property>
+        <property name="label-xalign">0</property>
+        <property name="shadow-type">none</property>
         <child>
           <object class="GtkBox" id="box1">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="hexpand">True</property>
-            <property name="spacing">12</property>
+            <property name="can-focus">False</property>
             <property name="margin-start">12</property>
             <property name="margin-top">6</property>
+            <property name="hexpand">True</property>
+            <property name="spacing">12</property>
             <child>
               <object class="GtkLabel" id="charsetlabel">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="label" translatable="yes" context="autocharsetpage|charsetlabel">_Character set:</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">charset</property>
+                <property name="use-underline">True</property>
+                <property name="mnemonic-widget">charset</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -42,7 +42,7 @@
             <child>
               <object class="GtkComboBoxText" id="charset">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="can-focus">True</property>
                 <property name="hexpand">True</property>
               </object>
               <packing>
@@ -56,7 +56,7 @@
         <child type="label">
           <object class="GtkLabel" id="charsetheader">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <property name="label" translatable="yes" context="autocharsetpage|charsetheader">Data Conversion</property>
             <attributes>
               <attribute name="weight" value="bold"/>

dbaccess/uiconfig/ui/deleteallrowsdialog.ui

@@ -78,4 +78,4 @@
       <action-widget response="-6">cancel</action-widget>
     </action-widgets>
   </object>
-</interface>
+</interface>

dbaccess/uiconfig/ui/designsavemodifieddialog.ui

@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.40.0 -->
 <interface domain="dba">
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkMessageDialog" id="DesignSaveModifiedDialog">
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
-    <property name="type_hint">dialog</property>
-    <property name="skip_taskbar_hint">True</property>
-    <property name="message_type">question</property>
+    <property name="type-hint">dialog</property>
+    <property name="skip-taskbar-hint">True</property>
+    <property name="message-type">question</property>
     <property name="text" translatable="yes" context="designsavemodifieddialog|DesignSaveModifiedDialog">Do you want to save the changes?</property>
-    <property name="secondary_text" translatable="yes" context="designsavemodifieddialog|DesignSaveModifiedDialog">The relation design has been changed.</property>
+    <property name="secondary-text" translatable="yes" context="designsavemodifieddialog|DesignSaveModifiedDialog">The relation design has been changed.</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox">
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">12</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="messagedialog-action_area">
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <child>
               <object class="GtkButton" id="no">
                 <property name="label" translatable="yes" context="stock">_No</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">True</property>
                 <property name="use-underline">True</property>
               </object>
               <packing>
@@ -37,10 +37,10 @@
               <object class="GtkButton" id="yes">
                 <property name="label" translatable="yes" context="stock">_Yes</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="has_default">True</property>
-                <property name="receives_default">True</property>
+                <property name="can-focus">True</property>
+                <property name="can-default">True</property>
+                <property name="has-default">True</property>
+                <property name="receives-default">True</property>
                 <property name="use-underline">True</property>
               </object>
               <packing>
@@ -53,8 +53,8 @@
               <object class="GtkButton" id="cancel">
                 <property name="label" translatable="yes" context="stock">_Cancel</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">True</property>
                 <property name="use-underline">True</property>
               </object>
               <packing>
@@ -67,7 +67,7 @@
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="pack_type">end</property>
+            <property name="pack-type">end</property>
             <property name="position">0</property>
           </packing>
         </child>

dbaccess/uiconfig/ui/generalpagedialog.ui

@@ -83,4 +83,4 @@ The new settings you make will overwrite your existing settings.</property>
       </packing>
     </child>
   </object>
-</interface>
+</interface>

dbaccess/uiconfig/ui/savemodifieddialog.ui

@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.40.0 -->
 <interface domain="dba">
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkMessageDialog" id="SaveModifiedDialog">
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
-    <property name="type_hint">dialog</property>
-    <property name="skip_taskbar_hint">True</property>
-    <property name="message_type">question</property>
+    <property name="type-hint">dialog</property>
+    <property name="skip-taskbar-hint">True</property>
+    <property name="message-type">question</property>
     <property name="text" translatable="yes" context="savemodifieddialog|SaveModifiedDialog">Do you want to save the changes?</property>
-    <property name="secondary_text" translatable="yes" context="savemodifieddialog|SaveModifiedDialog">The current record has been changed.</property>
+    <property name="secondary-text" translatable="yes" context="savemodifieddialog|SaveModifiedDialog">The current record has been changed.</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox">
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">12</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="messagedialog-action_area">
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <child>
               <object class="GtkButton" id="no">
                 <property name="label" translatable="yes" context="stock">_No</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">True</property>
                 <property name="use-underline">True</property>
               </object>
               <packing>
@@ -37,10 +37,10 @@
               <object class="GtkButton" id="yes">
                 <property name="label" translatable="yes" context="stock">_Yes</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="has_default">True</property>
-                <property name="receives_default">True</property>
+                <property name="can-focus">True</property>
+                <property name="can-default">True</property>
+                <property name="has-default">True</property>
+                <property name="receives-default">True</property>
                 <property name="use-underline">True</property>
               </object>
               <packing>
@@ -53,8 +53,8 @@
               <object class="GtkButton" id="cancel">
                 <property name="label" translatable="yes" context="stock">_Cancel</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">True</property>
                 <property name="use-underline">True</property>
               </object>
               <packing>
@@ -67,7 +67,7 @@
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="pack_type">end</property>
+            <property name="pack-type">end</property>
             <property name="position">0</property>
           </packing>
         </child>

dbaccess/uiconfig/ui/tabledesignsavemodifieddialog.ui

@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.40.0 -->
 <interface domain="dba">
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkMessageDialog" id="TableDesignSaveModifiedDialog">
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
-    <property name="type_hint">dialog</property>
-    <property name="skip_taskbar_hint">True</property>
-    <property name="message_type">question</property>
+    <property name="type-hint">dialog</property>
+    <property name="skip-taskbar-hint">True</property>
+    <property name="message-type">question</property>
     <property name="text" translatable="yes" context="tabledesignsavemodifieddialog|TableDesignSaveModifiedDialog">Do you want to save the changes?</property>
-    <property name="secondary_text" translatable="yes" context="tabledesignsavemodifieddialog|TableDesignSaveModifiedDialog">The table has been changed.</property>
+    <property name="secondary-text" translatable="yes" context="tabledesignsavemodifieddialog|TableDesignSaveModifiedDialog">The table has been changed.</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox">
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">12</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="messagedialog-action_area">
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <child>
               <object class="GtkButton" id="no">
                 <property name="label" translatable="yes" context="stock">_No</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">True</property>
                 <property name="use-underline">True</property>
               </object>
               <packing>
@@ -37,10 +37,10 @@
               <object class="GtkButton" id="yes">
                 <property name="label" translatable="yes" context="stock">_Yes</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="has_default">True</property>
-                <property name="receives_default">True</property>
+                <property name="can-focus">True</property>
+                <property name="can-default">True</property>
+                <property name="has-default">True</property>
+                <property name="receives-default">True</property>
                 <property name="use-underline">True</property>
               </object>
               <packing>
@@ -53,8 +53,8 @@
               <object class="GtkButton" id="cancel">
                 <property name="label" translatable="yes" context="stock">_Cancel</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">True</property>
                 <property name="use-underline">True</property>
               </object>
               <packing>
@@ -67,7 +67,7 @@
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="pack_type">end</property>
+            <property name="pack-type">end</property>
             <property name="position">0</property>
           </packing>
         </child>

desktop/source/app/app.cxx

@@ -454,7 +454,7 @@ void Desktop::Init()
 
     // We need to have service factory before going further, but see fdo#37195.
     // Doing this will mmap common.rdb, making it not overwritable on windows,
-    // so this can't happen before the synchronization above. Lets rework this
+    // so this can't happen before the synchronization above. Let's rework this
     // so that the above is called *from* CreateApplicationServiceManager or
     // something to enforce this gotcha
     try

desktop/uiconfig/ui/installforalldialog.ui

@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.1 -->
+<!-- Generated with glade 3.40.0 -->
 <interface domain="dkt">
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkMessageDialog" id="InstallForAllDialog">
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
-    <property name="type_hint">dialog</property>
-    <property name="skip_taskbar_hint">True</property>
-    <property name="message_type">question</property>
+    <property name="type-hint">dialog</property>
+    <property name="skip-taskbar-hint">True</property>
+    <property name="message-type">question</property>
     <property name="text" translatable="yes" context="installforalldialog|InstallForAllDialog">For whom do you want to install the extension?</property>
-    <property name="secondary_text" translatable="yes" context="installforalldialog|InstallForAllDialog">Make sure that no further users are working with the same %PRODUCTNAME, when installing an extension for all users in a multi user environment.</property>
+    <property name="secondary-text" translatable="yes" context="installforalldialog|InstallForAllDialog">Make sure that no further users are working with the same %PRODUCTNAME, when installing an extension for all users in a multi user environment.</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox">
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">24</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="messagedialog-action_area">
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <child>
               <object class="GtkButton" id="no">
                 <property name="label" translatable="yes" context="installforalldialog|no">_For all users</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_underline">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">True</property>
+                <property name="use-underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -37,11 +37,11 @@
               <object class="GtkButton" id="yes">
                 <property name="label" translatable="yes" context="installforalldialog|yes">_Only for me</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="has_default">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_underline">True</property>
+                <property name="can-focus">True</property>
+                <property name="can-default">True</property>
+                <property name="has-default">True</property>
+                <property name="receives-default">True</property>
+                <property name="use-underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -53,8 +53,8 @@
               <object class="GtkButton" id="cancel">
                 <property name="label" translatable="yes" context="stock">_Cancel</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">True</property>
                 <property name="use-underline">True</property>
               </object>
               <packing>
@@ -67,7 +67,7 @@
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="pack_type">end</property>
+            <property name="pack-type">end</property>
             <property name="position">0</property>
           </packing>
         </child>

dictionaries

@@ -1 +1 @@
-Subproject commit a2bf59878dd76685803ec260e15d875746ad6e25
+Subproject commit fc2dc383a40e56c0118866c9110954bebc6ea41d

download.lst

@@ -427,9 +427,9 @@ XMLSEC_TARBALL := xmlsec1-1.3.4.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBXML_SHA256SUM := 43ad877b018bc63deb2468d71f95219c2fac196876ef36d1bee51d226173ec93
-LIBXML_VERSION_MICRO := 8
-LIBXML_TARBALL := libxml2-2.12.$(LIBXML_VERSION_MICRO).tar.xz
+LIBXML_SHA256SUM := 25239263dc37f5f55a5393eff27b35f0b7d9ea4b2a7653310598ea8299e3b741
+LIBXML_VERSION_MICRO := 1
+LIBXML_TARBALL := libxml2-2.13.$(LIBXML_VERSION_MICRO).tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
@@ -541,8 +541,8 @@ LIBPNG_TARBALL := libpng-1.6.43.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBTIFF_SHA256SUM := e178649607d1e22b51cf361dd20a3753f244f022eefab1f2f218fc62ebaf87d2
-LIBTIFF_TARBALL := tiff-4.6.0.tar.xz
+LIBTIFF_SHA256SUM := d6da35c9986a4ec845eb96258b3693f8df515f7eb4c1e597ceb03e22788f305b
+LIBTIFF_TARBALL := tiff-4.6.0t.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

drawinglayer/source/processor2d/vclpixelprocessor2d.cxx

@@ -1091,8 +1091,7 @@ void VclPixelProcessor2D::processPatternFillPrimitive2D(
         mpOutputDevice->IntersectClipRegion(vcl::Region(aMask));
         Wallpaper aWallpaper(aTileImage);
         aWallpaper.SetColor(COL_TRANSPARENT);
-        Point aPaperPt(aMaskRect.getX() % aTileImage.GetSizePixel().Width(),
-                       aMaskRect.getY() % aTileImage.GetSizePixel().Height());
+        Point aPaperPt(aMaskRect.getX() % nTileWidth, aMaskRect.getY() % nTileHeight);
         tools::Rectangle aPaperRect(aPaperPt, aTileImage.GetSizePixel());
         aWallpaper.SetRect(aPaperRect);
         mpOutputDevice->DrawWallpaper(aMaskRect, aWallpaper);
@@ -1121,8 +1120,7 @@ void VclPixelProcessor2D::processPatternFillPrimitive2D(
     {
         Wallpaper aWallpaper(aTileImage);
         aWallpaper.SetColor(COL_TRANSPARENT);
-        Point aPaperPt(aMaskRect.getX() % aTileImage.GetSizePixel().Width(),
-                       aMaskRect.getY() % aTileImage.GetSizePixel().Height());
+        Point aPaperPt(aMaskRect.getX() % nTileWidth, aMaskRect.getY() % nTileHeight);
         tools::Rectangle aPaperRect(aPaperPt, aTileImage.GetSizePixel());
         aWallpaper.SetRect(aPaperRect);
         mpOutputDevice->DrawWallpaper(aMaskRect, aWallpaper);

drawinglayer/source/processor2d/vclprocessor2d.cxx

@@ -701,8 +701,31 @@ bool VclProcessor2D::RenderFillGraphicPrimitive2DImpl(
 
     // check if offset is used
     const sal_Int32 nOffsetX(basegfx::fround(rFillGraphicAttribute.getOffsetX() * nBWidth));
+    const sal_Int32 nOffsetY(basegfx::fround(rFillGraphicAttribute.getOffsetY() * nBHeight));
 
-    if (nOffsetX)
+    if (nOffsetX == 0 && nOffsetY == 0)
+    {
+        if (!bPreScaled)
+            aBitmapEx.Scale(aNeededBitmapSizePixel);
+
+        // if the tile is a single pixel big, just flood fill with that pixel color
+        if (aNeededBitmapSizePixel.getWidth() == 1 && aNeededBitmapSizePixel.getHeight() == 1)
+        {
+            Color col = aBitmapEx.GetPixelColor(0, 0);
+            mpOutputDevice->SetLineColor(col);
+            mpOutputDevice->SetFillColor(col);
+            mpOutputDevice->DrawRect(aVisiblePixel);
+        }
+        else
+        {
+            // TODO vcl does not have an optimised path here, it should be passing some kind of fill/tile
+            // operation down to the cairo/skia layers
+            Wallpaper aWallpaper(aBitmapEx);
+            aWallpaper.SetColor(COL_TRANSPARENT);
+            mpOutputDevice->DrawWallpaper(aVisiblePixel, aWallpaper);
+        }
+    }
+    else if (nOffsetX)
     {
         // offset in X, so iterate over Y first and draw lines
         for (sal_Int32 nYPos(nBTop); nYPos < nOTop + nOHeight; nYPos += nBHeight, nPosY++)
@@ -727,11 +750,8 @@ bool VclProcessor2D::RenderFillGraphicPrimitive2DImpl(
             }
         }
     }
-    else
+    else // nOffsetY is used
     {
-        // check if offset is used
-        const sal_Int32 nOffsetY(basegfx::fround(rFillGraphicAttribute.getOffsetY() * nBHeight));
-
         // possible offset in Y, so iterate over X first and draw columns
         for (sal_Int32 nXPos(nBLeft); nXPos < nOLeft + nOWidth; nXPos += nBWidth, nPosX++)
         {

editeng/source/editeng/impedit2.cxx

@@ -3684,30 +3684,34 @@ sal_Int32 ImpEditEngine::GetLineNumberAtIndex( sal_Int32 nPara, sal_Int32 nIndex
 {
     if (!IsFormatted())
         FormatDoc();
-    sal_Int32 nLineNo = -1;
     const ContentNode* pNode = GetEditDoc().GetObject( nPara );
     OSL_ENSURE( pNode, "GetLineNumberAtIndex: invalid paragraph index" );
-    if (pNode)
+    if (!pNode)
+        return -1;
+    // we explicitly allow for the index to point at the character right behind the text
+    const bool bValidIndex = /*0 <= nIndex &&*/ nIndex <= pNode->Len();
+    OSL_ENSURE( bValidIndex, "GetLineNumberAtIndex: invalid index" );
+    const ParaPortion* pPPortion = maParaPortionList.SafeGetObject(nPara);
+    if (!pPPortion)
     {
-        // we explicitly allow for the index to point at the character right behind the text
-        const bool bValidIndex = /*0 <= nIndex &&*/ nIndex <= pNode->Len();
-        OSL_ENSURE( bValidIndex, "GetLineNumberAtIndex: invalid index" );
-        const ParaPortion* pPPortion = maParaPortionList.SafeGetObject(nPara);
-        const EditLineList& rLineList = pPPortion->GetLines();
-        const sal_Int32 nLineCount = rLineList.Count();
-        if (nIndex == pNode->Len())
-            nLineNo = nLineCount > 0 ? nLineCount - 1 : 0;
-        else if (bValidIndex)   // nIndex < pNode->Len()
+        SAL_WARN( "editeng", "ImpEditEngine::GetLineNumberAtIndex missing ParaPortion");
+        return -1;
+    }
+    const EditLineList& rLineList = pPPortion->GetLines();
+    const sal_Int32 nLineCount = rLineList.Count();
+    sal_Int32 nLineNo = -1;
+    if (nIndex == pNode->Len())
+        nLineNo = nLineCount > 0 ? nLineCount - 1 : 0;
+    else if (bValidIndex)   // nIndex < pNode->Len()
+    {
+        sal_Int32 nStart = -1, nEnd = -1;
+        for (sal_Int32 i = 0;  i < nLineCount && nLineNo == -1;  ++i)
         {
-            sal_Int32 nStart = -1, nEnd = -1;
-            for (sal_Int32 i = 0;  i < nLineCount && nLineNo == -1;  ++i)
-            {
-                const EditLine& rLine = rLineList[i];
-                nStart = rLine.GetStart();
-                nEnd   = rLine.GetEnd();
-                if (nStart >= 0 && nStart <= nIndex && nEnd >= 0 && nIndex < nEnd)
-                    nLineNo = i;
-            }
+            const EditLine& rLine = rLineList[i];
+            nStart = rLine.GetStart();
+            nEnd   = rLine.GetEnd();
+            if (nStart >= 0 && nStart <= nIndex && nEnd >= 0 && nIndex < nEnd)
+                nLineNo = i;
         }
     }
     return nLineNo;

editeng/source/editeng/impedit3.cxx

@@ -646,7 +646,7 @@ void ImpEditEngine::CheckPageOverflow()
     if (nParaCount == 1)
     {
         const ParaPortion* pPPortion = GetParaPortions().SafeGetObject(0);
-        bOnlyOneEmptyPara = pPPortion->GetLines().Count() == 1
+        bOnlyOneEmptyPara = pPPortion && pPPortion->GetLines().Count() == 1
                             && pPPortion->GetLines()[0].GetLen() == 0;
     }
 
@@ -3246,7 +3246,7 @@ void ImpEditEngine::RecalcFormatterFontMetrics( FormatterFontMetric& rCurMetrics
         // Fonts without leading cause problems
         if ( ( nIntLeading == 0 ) && (mpRefDev->GetOutDevType() == OUTDEV_PRINTER))
         {
-            // Lets see what Leading one gets on the screen
+            // Let's see what Leading one gets on the screen
             VclPtr<VirtualDevice> pVDev = GetVirtualDevice(mpRefDev->GetMapMode(), mpRefDev->GetDrawMode());
             rFont.SetPhysFont(*pVDev);
             aMetric = pVDev->GetFontMetric();

editeng/source/items/paraitem.cxx

@@ -802,6 +802,7 @@ SvxTabStop::SvxTabStop()
     eAdjustment = SvxTabAdjust::Left;
     m_cDecimal = cDfltDecimalChar;
     cFill = cDfltFillChar;
+    fillDecimal();
 }
 
 
@@ -812,9 +813,10 @@ SvxTabStop::SvxTabStop( const sal_Int32 nPos, const SvxTabAdjust eAdjst,
     eAdjustment = eAdjst;
     m_cDecimal = cDec;
     cFill = cFil;
+    fillDecimal();
 }
 
-void SvxTabStop::fillDecimal() const
+void SvxTabStop::fillDecimal()
 {
     if ( cDfltDecimalChar == m_cDecimal )
         m_cDecimal = SvtSysLocale().GetLocaleData().getNumDecimalSep()[0];

editeng/source/items/svxfont.cxx

@@ -670,6 +670,12 @@ SvxFont& SvxFont::operator=( const SvxFont& rFont )
     return *this;
 }
 
+bool SvxFont::SvxFontSubsetEquals(const SvxFont& rFont) const
+{
+    return nEsc == rFont.GetEscapement() && nPropr == rFont.GetPropr()
+        && eCaseMap == rFont.GetCaseMap();
+}
+
 namespace {
 
 class SvxDoGetCapitalSize : public SvxDoCapitals

editeng/source/items/textitem.cxx

@@ -159,61 +159,24 @@ bool SvxFontListItem::GetPresentation
 
 // class SvxFontItem -----------------------------------------------------
 
-typedef std::unordered_map<size_t, const SfxPoolItem*> SvxFontItemMap;
-
 namespace
 {
-    class SvxFontItemInstanceManager : public ItemInstanceManager
+    class SvxFontItemInstanceManager : public TypeSpecificItemInstanceManager<SvxFontItem>
     {
-        SvxFontItemMap  maRegistered;
-
-    public:
-        SvxFontItemInstanceManager()
-        : ItemInstanceManager(typeid(SvxFontItem).hash_code())
+    protected:
+        virtual size_t hashCode(const SfxPoolItem& rItem) const override
         {
+            const SvxFontItem& rFontItem(static_cast<const SvxFontItem&>(rItem));
+            std::size_t seed(0);
+            o3tl::hash_combine(seed, rItem.Which());
+            o3tl::hash_combine(seed, rFontItem.GetFamilyName().hashCode());
+            o3tl::hash_combine(seed, rFontItem.GetStyleName().hashCode());
+            o3tl::hash_combine(seed, rFontItem.GetFamily());
+            o3tl::hash_combine(seed, rFontItem.GetPitch());
+            o3tl::hash_combine(seed, rFontItem.GetCharSet());
+            return seed;
         }
-
-    private:
-        static size_t hashCode(const SfxPoolItem&);
-
-        // standard interface, accessed exclusively
-        // by implCreateItemEntry/implCleanupItemEntry
-        virtual const SfxPoolItem* find(const SfxPoolItem&) const override;
-        virtual void add(const SfxPoolItem&) override;
-        virtual void remove(const SfxPoolItem&) override;
     };
-
-    size_t SvxFontItemInstanceManager::hashCode(const SfxPoolItem& rItem)
-    {
-        const SvxFontItem& rFontItem(static_cast<const SvxFontItem&>(rItem));
-        std::size_t seed(0);
-        o3tl::hash_combine(seed, rItem.Which());
-        o3tl::hash_combine(seed, rFontItem.GetFamilyName().hashCode());
-        o3tl::hash_combine(seed, rFontItem.GetStyleName().hashCode());
-        o3tl::hash_combine(seed, rFontItem.GetFamily());
-        o3tl::hash_combine(seed, rFontItem.GetPitch());
-        o3tl::hash_combine(seed, rFontItem.GetCharSet());
-        return seed;
-    }
-
-    const SfxPoolItem* SvxFontItemInstanceManager::find(const SfxPoolItem& rItem) const
-    {
-        SvxFontItemMap::const_iterator aHit(maRegistered.find(hashCode(rItem)));
-        if (aHit != maRegistered.end())
-            return aHit->second;
-        return nullptr;
-    }
-
-    void SvxFontItemInstanceManager::add(const SfxPoolItem& rItem)
-    {
-        maRegistered.insert({hashCode(rItem), &rItem});
-    }
-
-    void SvxFontItemInstanceManager::remove(const SfxPoolItem& rItem)
-    {
-        maRegistered.erase(hashCode(rItem));
-    }
-
 }
 
 ItemInstanceManager* SvxFontItem::getItemInstanceManager() const
@@ -446,56 +409,20 @@ void SvxFontItem::dumpAsXml(xmlTextWriterPtr pWriter) const
 
 // class SvxPostureItem --------------------------------------------------
 
-typedef std::unordered_map<size_t, const SfxPoolItem*> SvxPostureItemMap;
-
 namespace
 {
-    class SvxPostureItemInstanceManager : public ItemInstanceManager
+    class SvxPostureItemInstanceManager : public TypeSpecificItemInstanceManager<SvxPostureItem>
     {
-        SvxPostureItemMap  maRegistered;
-
-    public:
-        SvxPostureItemInstanceManager()
-        : ItemInstanceManager(typeid(SvxPostureItem).hash_code())
+    protected:
+        virtual size_t hashCode(const SfxPoolItem& rItem) const override
         {
+            auto const & rPostureItem = static_cast<const SvxPostureItem&>(rItem);
+            std::size_t seed(0);
+            o3tl::hash_combine(seed, rPostureItem.Which());
+            o3tl::hash_combine(seed, rPostureItem. GetEnumValue());
+            return seed;
         }
-
-    private:
-        static size_t hashCode(const SfxPoolItem&);
-
-        // standard interface, accessed exclusively
-        // by implCreateItemEntry/implCleanupItemEntry
-        virtual const SfxPoolItem* find(const SfxPoolItem&) const override;
-        virtual void add(const SfxPoolItem&) override;
-        virtual void remove(const SfxPoolItem&) override;
     };
-
-    size_t SvxPostureItemInstanceManager::hashCode(const SfxPoolItem& rItem)
-    {
-        auto const & rPostureItem = static_cast<const SvxPostureItem&>(rItem);
-        std::size_t seed(0);
-        o3tl::hash_combine(seed, rPostureItem.Which());
-        o3tl::hash_combine(seed, rPostureItem. GetEnumValue());
-        return seed;
-    }
-
-    const SfxPoolItem* SvxPostureItemInstanceManager::find(const SfxPoolItem& rItem) const
-    {
-        auto aHit(maRegistered.find(hashCode(rItem)));
-        if (aHit != maRegistered.end())
-            return aHit->second;
-        return nullptr;
-    }
-
-    void SvxPostureItemInstanceManager::add(const SfxPoolItem& rItem)
-    {
-        maRegistered.insert({hashCode(rItem), &rItem});
-    }
-
-    void SvxPostureItemInstanceManager::remove(const SfxPoolItem& rItem)
-    {
-        maRegistered.erase(hashCode(rItem));
-    }
 }
 
 ItemInstanceManager* SvxPostureItem::getItemInstanceManager() const
@@ -750,58 +677,22 @@ void SvxWeightItem::dumpAsXml(xmlTextWriterPtr pWriter) const
 
 // class SvxFontHeightItem -----------------------------------------------
 
-typedef std::unordered_map<size_t, const SfxPoolItem*> SvxFontHeightItemMap;
-
 namespace
 {
-    class SvxFontHeightItemInstanceManager : public ItemInstanceManager
+    class SvxFontHeightItemInstanceManager : public TypeSpecificItemInstanceManager<SvxFontHeightItem>
     {
-        SvxFontHeightItemMap  maRegistered;
-
-    public:
-        SvxFontHeightItemInstanceManager()
-        : ItemInstanceManager(typeid(SvxFontHeightItem).hash_code())
+    protected:
+        virtual size_t hashCode(const SfxPoolItem& rItem) const override
         {
+            auto const & rFontHeightItem = static_cast<const SvxFontHeightItem&>(rItem);
+            std::size_t seed(0);
+            o3tl::hash_combine(seed, rFontHeightItem.Which());
+            o3tl::hash_combine(seed, rFontHeightItem.GetHeight());
+            o3tl::hash_combine(seed, rFontHeightItem.GetProp());
+            o3tl::hash_combine(seed, rFontHeightItem.GetPropUnit());
+            return seed;
         }
-
-    private:
-        static size_t hashCode(const SfxPoolItem&);
-
-        // standard interface, accessed exclusively
-        // by implCreateItemEntry/implCleanupItemEntry
-        virtual const SfxPoolItem* find(const SfxPoolItem&) const override;
-        virtual void add(const SfxPoolItem&) override;
-        virtual void remove(const SfxPoolItem&) override;
     };
-
-    size_t SvxFontHeightItemInstanceManager::hashCode(const SfxPoolItem& rItem)
-    {
-        auto const & rFontHeightItem = static_cast<const SvxFontHeightItem&>(rItem);
-        std::size_t seed(0);
-        o3tl::hash_combine(seed, rFontHeightItem.Which());
-        o3tl::hash_combine(seed, rFontHeightItem.GetHeight());
-        o3tl::hash_combine(seed, rFontHeightItem.GetProp());
-        o3tl::hash_combine(seed, rFontHeightItem.GetPropUnit());
-        return seed;
-    }
-
-    const SfxPoolItem* SvxFontHeightItemInstanceManager::find(const SfxPoolItem& rItem) const
-    {
-        auto aHit(maRegistered.find(hashCode(rItem)));
-        if (aHit != maRegistered.end())
-            return aHit->second;
-        return nullptr;
-    }
-
-    void SvxFontHeightItemInstanceManager::add(const SfxPoolItem& rItem)
-    {
-        maRegistered.insert({hashCode(rItem), &rItem});
-    }
-
-    void SvxFontHeightItemInstanceManager::remove(const SfxPoolItem& rItem)
-    {
-        maRegistered.erase(hashCode(rItem));
-    }
 }
 
 ItemInstanceManager* SvxFontHeightItem::getItemInstanceManager() const
@@ -948,7 +839,7 @@ static sal_uInt32 lcl_GetRealHeight_Impl(sal_uInt32 nHeight, sal_uInt16 nProp, M
             short nTemp = static_cast<short>(nProp);
             nDiff = nTemp * 20;
             if(!bCoreInTwip)
-                nDiff = static_cast<short>(convertTwipToMm100(static_cast<tools::Long>(nDiff)));
+                nDiff = static_cast<short>(convertTwipToMm100(nDiff));
             break;
         }
         case MapUnit::Map100thMM:
@@ -1106,9 +997,8 @@ bool SvxFontHeightItem::HasMetrics() const
 void SvxFontHeightItem::SetHeight( sal_uInt32 nNewHeight, const sal_uInt16 nNewProp,
                                    MapUnit eUnit )
 {
-    DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" );
-
     ASSERT_CHANGE_REFCOUNTED_ITEM;
+
     if( MapUnit::MapRelative != eUnit )
         nHeight = nNewHeight + ::ItemToControl( short(nNewProp), eUnit,
                                                 FieldUnit::TWIP );
@@ -1124,9 +1014,8 @@ void SvxFontHeightItem::SetHeight( sal_uInt32 nNewHeight, const sal_uInt16 nNewP
 void SvxFontHeightItem::SetHeight( sal_uInt32 nNewHeight, sal_uInt16 nNewProp,
                                    MapUnit eMetric, MapUnit eCoreMetric )
 {
-    DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" );
-
     ASSERT_CHANGE_REFCOUNTED_ITEM;
+
     if( MapUnit::MapRelative != eMetric )
         nHeight = nNewHeight +
                 ::ControlToItem( ::ItemToControl(static_cast<short>(nNewProp), eMetric,
@@ -3078,56 +2967,20 @@ void GetDefaultFonts( SvxFontItem& rLatin, SvxFontItem& rAsian, SvxFontItem& rCo
 
 // class SvxRsidItem -----------------------------------------------------
 
-typedef std::unordered_map<size_t, const SfxPoolItem*> SvxRsidItemMap;
-
 namespace
 {
-    class SvxRsidItemInstanceManager : public ItemInstanceManager
+    class SvxRsidItemInstanceManager : public TypeSpecificItemInstanceManager<SvxRsidItem>
     {
-        SvxRsidItemMap  maRegistered;
-
-    public:
-        SvxRsidItemInstanceManager()
-        : ItemInstanceManager(typeid(SvxRsidItem).hash_code())
+    protected:
+        virtual size_t hashCode(const SfxPoolItem& rItem) const override
         {
+            auto const & rRsidItem = static_cast<const SvxRsidItem&>(rItem);
+            std::size_t seed(0);
+            o3tl::hash_combine(seed, rRsidItem.Which());
+            o3tl::hash_combine(seed, rRsidItem.GetValue());
+            return seed;
         }
-
-    private:
-        static size_t hashCode(const SfxPoolItem&);
-
-        // standard interface, accessed exclusively
-        // by implCreateItemEntry/implCleanupItemEntry
-        virtual const SfxPoolItem* find(const SfxPoolItem&) const override;
-        virtual void add(const SfxPoolItem&) override;
-        virtual void remove(const SfxPoolItem&) override;
     };
-
-    size_t SvxRsidItemInstanceManager::hashCode(const SfxPoolItem& rItem)
-    {
-        auto const & rRsidItem = static_cast<const SvxRsidItem&>(rItem);
-        std::size_t seed(0);
-        o3tl::hash_combine(seed, rRsidItem.Which());
-        o3tl::hash_combine(seed, rRsidItem.GetValue());
-        return seed;
-    }
-
-    const SfxPoolItem* SvxRsidItemInstanceManager::find(const SfxPoolItem& rItem) const
-    {
-        auto aHit(maRegistered.find(hashCode(rItem)));
-        if (aHit != maRegistered.end())
-            return aHit->second;
-        return nullptr;
-    }
-
-    void SvxRsidItemInstanceManager::add(const SfxPoolItem& rItem)
-    {
-        maRegistered.insert({hashCode(rItem), &rItem});
-    }
-
-    void SvxRsidItemInstanceManager::remove(const SfxPoolItem& rItem)
-    {
-        maRegistered.erase(hashCode(rItem));
-    }
 }
 
 ItemInstanceManager* SvxRsidItem::getItemInstanceManager() const

editeng/source/misc/svxacorr.cxx

@@ -2060,7 +2060,6 @@ SvxAutoCorrect::SearchWordsInList(
             rLang = aLanguageTag;
             return pRet;
         }
-        return std::nullopt;
     }
 
     // If it still could not be found here, then keep on searching

extensions/source/ole/oleobjw.hxx

@@ -210,7 +210,7 @@ protected:
     // the IDispatch* are wrapped by objects of this class. Assuming that the functions
     // implemented by the IDispatch object returns another UNO interface then
     // it has to be wrapped to this type. But this is only possible if an object of this
-    // wrapper class knows what type it is represting. The member m_TypeDescription holds this
+    // wrapper class knows what type it is representing. The member m_TypeDescription holds this
     // information.
     // m_TypeDescription is only useful when an object wraps an IDispatch object that implements
     // a UNO interface. The value is set during a call to XInitialization::initialize.

extensions/uiconfig/spropctrlr/ui/browserline.ui

@@ -48,4 +48,4 @@
       <placeholder/>
     </child>
   </object>
-</interface>
+</interface>

extensions/uiconfig/spropctrlr/ui/browserpage.ui

@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
+<!-- Generated with glade 3.40.0 -->
 <interface domain="pcr">
   <requires lib="gtk+" version="3.20"/>
-  <!-- n-columns=1 n-rows=1 -->
+  <!-- n-columns=1 n-rows=2 -->
   <object class="GtkGrid" id="BrowserPage">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <property name="hexpand">True</property>
     <property name="vexpand">True</property>
-    <property name="row_spacing">6</property>
+    <property name="row-spacing">6</property>
     <child>
       <object class="GtkScrolledWindow" id="scrolledwindow">
         <property name="visible">True</property>
-        <property name="can_focus">True</property>
+        <property name="can-focus">True</property>
         <property name="hexpand">True</property>
         <property name="vexpand">True</property>
-        <property name="hscrollbar_policy">never</property>
+        <property name="hscrollbar-policy">never</property>
         <child>
           <object class="GtkViewport">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <child>
               <object class="GtkBox">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="hexpand">True</property>
                 <property name="vexpand">True</property>
                 <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkBox" id="playground">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="valign">start</property>
                     <property name="hexpand">True</property>
                     <property name="vexpand">True</property>
-                    <property name="border_width">6</property>
+                    <property name="border-width">6</property>
                     <property name="orientation">vertical</property>
                     <property name="spacing">6</property>
                     <property name="homogeneous">True</property>
@@ -54,30 +54,30 @@
         </child>
       </object>
       <packing>
-        <property name="left_attach">0</property>
-        <property name="top_attach">0</property>
+        <property name="left-attach">0</property>
+        <property name="top-attach">0</property>
       </packing>
     </child>
     <child>
       <object class="GtkFrame" id="helpframe">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="label_xalign">0</property>
-        <property name="shadow_type">none</property>
+        <property name="can-focus">False</property>
+        <property name="label-xalign">0</property>
+        <property name="shadow-type">none</property>
         <child>
           <object class="GtkTextView" id="helptext">
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="editable">False</property>
-            <property name="cursor_visible">False</property>
+            <property name="can-focus">True</property>
             <property name="margin-start">12</property>
             <property name="margin-top">6</property>
+            <property name="editable">False</property>
+            <property name="cursor-visible">False</property>
           </object>
         </child>
         <child type="label">
           <object class="GtkLabel">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <property name="label" translatable="yes" context="browserpage|help">Help</property>
             <attributes>
               <attribute name="weight" value="bold"/>
@@ -86,8 +86,8 @@
         </child>
       </object>
       <packing>
-        <property name="left_attach">0</property>
-        <property name="top_attach">1</property>
+        <property name="left-attach">0</property>
+        <property name="top-attach">1</property>
       </packing>
     </child>
   </object>

external/libcmis/exceptions.patch.1

@@ -1,12 +1,11 @@
 --- libcmis/src/libcmis/http-session.cxx.orig	2024-06-21 12:22:36.083125022 +0200
 +++ libcmis/src/libcmis/http-session.cxx	2024-06-21 13:08:37.403016695 +0200
-@@ -653,7 +653,8 @@
+@@ -653,7 +653,7 @@
          m_authProvided = authProvider->authenticationQuery( m_username, m_password );
          if ( !m_authProvided )
          {
 -            throw CurlException( "User cancelled authentication request" );
-+            // report this as 401 so it becomes permissionDenied
-+            throw CurlException("User cancelled authentication request", CURLE_OK, "", 401);
++            throw CurlException("User cancelled authentication request", CURLE_OK);
          }
      }
  }
@@ -62,7 +61,7 @@
  
  void HttpSession::initProtocols( )
  {
-@@ -981,11 +972,43 @@
+@@ -981,11 +972,45 @@
              break;
          default:
              msg = what();
@@ -106,6 +105,8 @@
 +                default:
 +                    if ( !isCancelled( ) )
 +                        msg += ": " + m_url;
++                    else if (msg == "User cancelled authentication request")
++                        type = "permissionDenied";
 +                    break;
 +            }
      }

external/libxml2/ExternalPackage_libxml2.mk

@@ -21,7 +21,7 @@ else # COM=MSC
 $(eval $(call gb_ExternalPackage_add_file,libxml2,$(LIBO_URE_LIB_FOLDER)/libxml2.dll,win32/bin.msvc/libxml2.dll))
 endif
 else # OS!=WNT
-$(eval $(call gb_ExternalPackage_add_file,libxml2,$(LIBO_URE_LIB_FOLDER)/libxml2.so.2,.libs/libxml2.so.2.12.$(LIBXML_VERSION_MICRO)))
+$(eval $(call gb_ExternalPackage_add_file,libxml2,$(LIBO_URE_LIB_FOLDER)/libxml2.so.2,.libs/libxml2.so.2.13.$(LIBXML_VERSION_MICRO)))
 endif
 endif # DISABLE_DYNLOADING
 

external/libxml2/libxml2-XMLCALL-redefine.patch.0

@@ -1,11 +1,11 @@
 --- include/libxml/xmlexports.h	2023-05-24 12:48:46.179570708 +0100
 +++ include/libxml/xmlexports.h	2023-05-24 12:48:56.563577488 +0100
-@@ -38,8 +38,6 @@
+@@ -31,8 +31,6 @@
+ #define XMLPUBVAR XMLPUBLIC extern
  
- /** DOC_DISABLE */
  /* Compatibility */
 -#define XMLCALL
 -#define XMLCDECL
- #if !defined(LIBXML_DLL_IMPORT)
- #define LIBXML_DLL_IMPORT XMLPUBVAR
+ #ifndef LIBXML_DLL_IMPORT
+   #define LIBXML_DLL_IMPORT XMLPUBVAR
  #endif

external/libxml2/libxml2-icu-sym.patch.0

@@ -3,14 +3,14 @@ Find bundled ICU in workdir and use debug .libs when needed
 diff -up win32/Makefile.msvc.dt win32/Makefile.msvc
 --- win32/Makefile.msvc.dt	2014-07-18 19:00:23.372103963 +0200
 +++ win32/Makefile.msvc	2014-07-18 19:01:39.347982929 +0200
-@@ -46,6 +46,7 @@ CPPFLAGS = $(CPPFLAGS) /D "_REENTRANT"
+@@ -42,6 +42,7 @@
  CC = cl.exe
  CFLAGS = /nologo /D "_WINDOWS" /D "_MBCS" /D "NOLIBTOOL" /W3 /wd4244 /wd4267 $(CRUNTIME)
  CFLAGS = $(CFLAGS) /I$(XML_SRCDIR) /I$(XML_SRCDIR)\include /I$(INCPREFIX)
 +CFLAGS = $(CFLAGS) /I$(WORKDIR)/UnpackedTarball/icu/source/i18n /I$(WORKDIR)/UnpackedTarball/icu/source/common
- !if "$(WITH_THREADS)" != "no"
- CFLAGS = $(CFLAGS) /D "_REENTRANT"
- !endif
+ !if "$(WITH_THREADS)" == "ctls"
+ CFLAGS = $(CFLAGS) /D "XML_THREAD_LOCAL=__declspec(thread)"
+ !else if "$(WITH_THREADS)" == "posix"
 @@ -62,7 +63,9 @@
  # The linker and its options.
  LD = link.exe

external/libxml2/libxml2-icu.patch.0

@@ -3,14 +3,14 @@ Find bundled ICU in workdir and use debug .libs when needed
 diff -up win32/Makefile.msvc.dt win32/Makefile.msvc
 --- win32/Makefile.msvc.dt	2014-07-18 19:00:23.372103963 +0200
 +++ win32/Makefile.msvc	2014-07-18 19:01:39.347982929 +0200
-@@ -45,6 +45,7 @@ CPPFLAGS = $(CPPFLAGS) /D "_REENTRANT"
+@@ -42,6 +42,7 @@
  CC = cl.exe
  CFLAGS = /nologo /D "_WINDOWS" /D "_MBCS" /D "NOLIBTOOL" /W3 /wd4244 /wd4267 $(CRUNTIME)
  CFLAGS = $(CFLAGS) /I$(XML_SRCDIR) /I$(XML_SRCDIR)\include /I$(INCPREFIX)
 +CFLAGS = $(CFLAGS) /I$(WORKDIR)/UnpackedTarball/icu/source/i18n /I$(WORKDIR)/UnpackedTarball/icu/source/common
- !if "$(WITH_THREADS)" != "no"
- CFLAGS = $(CFLAGS) /D "_REENTRANT"
- !endif
+ !if "$(WITH_THREADS)" == "ctls"
+ CFLAGS = $(CFLAGS) /D "XML_THREAD_LOCAL=__declspec(thread)"
+ !else if "$(WITH_THREADS)" == "posix"
 @@ -67,6 +68,7 @@ CFLAGS = $(CFLAGS) $(SOLARINC)
  # The linker and its options.
  LD = link.exe

external/redland/ExternalProject_raptor.mk

@@ -30,7 +30,7 @@ $(call gb_ExternalProject_get_state_target,raptor,build):
 		CPPFLAGS="$(if $(SYSBASE),-I$(SYSBASE)/usr/include) $(gb_EMSCRIPTEN_CPPFLAGS)" \
 		$(gb_RUN_CONFIGURE) ./configure --disable-gtk-doc \
 			 --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" \
-			--with-www=xml \
+			--without-www \
 			--without-xslt-config \
 			$(gb_CONFIGURE_PLATFORMS) \
 			$(if $(CROSS_COMPILING),$(if $(filter INTEL ARM,$(CPUNAME)),ac_cv_c_bigendian=no)) \

extras/CustomTarget_templates.mk

@@ -9,40 +9,17 @@
 
 $(eval $(call gb_CustomTarget_CustomTarget,extras/source/templates))
 
-# # for OTT templates: mimetype, styles.xml, META-INF/manifest.xml and
-# Thumbnails/thumbnail.png files are automatically added for each template
-# # for OTG templates: mimetype, content.xml, styles.xml, META-INF/manifest.xml and
-# Thumbnails/thumbnail.png files are automatically added for each template
-# list of meta.xml files (one per template) + other files (content.xml, manifest.rdf, settings.xml, pictures...)
-extras_TEMPLATES_XMLFILES := \
-	officorr/Modern_business_letter_sans_serif/meta.xml \
-	officorr/Modern_business_letter_serif/meta.xml \
-	offimisc/Businesscard-with-logo/meta.xml \
-	personal/CV/meta.xml \
-	personal/Resume1page/meta.xml \
-	styles/Default/meta.xml \
-	styles/Modern/meta.xml \
-	styles/Simple/meta.xml \
-	officorr/Modern_business_letter_sans_serif/content.xml \
-	officorr/Modern_business_letter_serif/content.xml \
-	offimisc/Businesscard-with-logo/content.xml \
-	personal/CV/content.xml \
-	personal/Resume1page/content.xml \
-	officorr/Modern_business_letter_sans_serif/manifest.rdf \
-	officorr/Modern_business_letter_serif/manifest.rdf \
-	offimisc/Businesscard-with-logo/manifest.rdf \
-	personal/CV/manifest.rdf \
-	personal/Resume1page/manifest.rdf \
-	offimisc/Businesscard-with-logo/settings.xml \
-	offimisc/Businesscard-with-logo/Pictures/10000201000001F4000000A0108F3F06.png \
-	draw/bpmn/meta.xml \
-	l10n/zh_CN_ott_normal/meta.xml \
-	l10n/zh_CN_ott_normal/content.xml \
-	l10n/ja_ott_normal/meta.xml \
-	l10n/ja_ott_normal/content.xml \
+include $(SRCDIR)/extras/template_files.mk
 
-# param: style-base (e.g. Modern)
-extras_TEMPLATES_XMLFILES_RELATIVE = $(subst $(1)/,,$(filter $(1)/%,$(extras_TEMPLATES_XMLFILES)))
+define run_zip_template_recipe =
+$(call gb_Output_announce,$(subst $(gb_CustomTarget_workdir)/extras/source/,,$@),$(true),ZIP,2)
+$(call gb_Trace_StartRange,$(subst $(gb_CustomTarget_workdir)/extras/source/,,$@),ZIP)
+cd $(dir $<) && \
+$(call gb_Helper_wsl_path,\
+$(WSL) zip -q0X --filesync --must-match $@ mimetype && \
+$(WSL) zip -qrX --must-match $@ $(subst $(dir $<),,$^))
+$(call gb_Trace_EndRange,$(subst $(gb_CustomTarget_workdir)/extras/source/,,$@),ZIP)
+endef
 
 .SECONDEXPANSION:
 # secondexpansion since the patterns not just cover a filename portion, but also include a
@@ -64,48 +41,22 @@ $(gb_CustomTarget_workdir)/extras/source/templates/%.xml : $(SRCDIR)/extras/sour
 	$(call gb_ExternalExecutable_get_command,xsltproc) --nonet -o $@ $(SRCDIR)/extras/util/compact.xsl $<
 	$(call gb_Trace_EndRange,templates/$*.xml,XSL)
 
-# zip files to OTT
+$(gb_CustomTarget_workdir)/extras/source/templates/%.odt \
+$(gb_CustomTarget_workdir)/extras/source/templates/%.otg \
+$(gb_CustomTarget_workdir)/extras/source/templates/%.oth \
+$(gb_CustomTarget_workdir)/extras/source/templates/%.otp \
+$(gb_CustomTarget_workdir)/extras/source/templates/%.ots \
 $(gb_CustomTarget_workdir)/extras/source/templates/%.ott : \
         $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/$$*/,\
-            mimetype $$(call extras_TEMPLATES_XMLFILES_RELATIVE,$$*) ) \
-        $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/$$*/,\
-            styles.xml $$(call extras_TEMPLATES_XMLFILES_RELATIVE,$$*) ) \
-        $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/$$*/,\
-            META-INF/manifest.xml $$(call extras_TEMPLATES_XMLFILES_RELATIVE,$$*) ) \
-        $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/$$*/,\
-            Thumbnails/thumbnail.png $$(call extras_TEMPLATES_XMLFILES_RELATIVE,$$*) )
-	$(call gb_Output_announce,templates/$*.ott,$(true),ZIP,2)
-	$(call gb_Trace_StartRange,templates/$*.ott,ZIP)
-	$(call gb_Helper_abbreviate_dirs,\
-		cd $(dir $<) && \
-		$(call gb_Helper_wsl_path,\
-		$(WSL) zip -q0X --filesync --must-match $@ mimetype && \
-		$(WSL) zip -qrX --must-match $@ styles.xml META-INF/manifest.xml Thumbnails/thumbnail.png && \
-		$(WSL) zip -qrX --must-match $@ $(call extras_TEMPLATES_XMLFILES_RELATIVE,$*)) \
-	)
-	$(call gb_Trace_EndRange,templates/$*.ott,ZIP)
+            mimetype META-INF/manifest.xml content.xml meta.xml styles.xml \
+            $$(call extra_files_TEMPLATES_RELATIVE,$$*))
+	$(run_zip_template_recipe)
 
-# zip files to OTG
-$(gb_CustomTarget_workdir)/extras/source/templates/%.otg : \
-        $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/$$*/,\
-            mimetype $$(call extras_TEMPLATES_XMLFILES_RELATIVE,$$*) ) \
-        $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/$$*/,\
-            content.xml $$(call extras_TEMPLATES_XMLFILES_RELATIVE,$$*) ) \
-        $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/$$*/,\
-            styles.xml $$(call extras_TEMPLATES_XMLFILES_RELATIVE,$$*) ) \
-        $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/$$*/,\
-            META-INF/manifest.xml $$(call extras_TEMPLATES_XMLFILES_RELATIVE,$$*) ) \
-        $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/$$*/,\
-            Thumbnails/thumbnail.png $$(call extras_TEMPLATES_XMLFILES_RELATIVE,$$*) )
-	$(call gb_Output_announce,templates/$*.otg,$(true),ZIP,2)
-	$(call gb_Trace_StartRange,templates/$*.otg,ZIP)
-	$(call gb_Helper_abbreviate_dirs,\
-		cd $(dir $<) && \
-		$(call gb_Helper_wsl_path,\
-		$(WSL) zip -q0X --filesync --must-match $@ mimetype && \
-		$(WSL) zip -qrX --must-match $@ content.xml styles.xml META-INF/manifest.xml Thumbnails/thumbnail.png && \
-		$(WSL) zip -qrX --must-match $@ $(call extras_TEMPLATES_XMLFILES_RELATIVE,$*)) \
-	)
-	$(call gb_Trace_EndRange,templates/$*.otg,ZIP)
+# special case for styles/Default,Modern,Simple - no content.xml for those
+$(gb_CustomTarget_workdir)/extras/source/templates/styles/%.ott : \
+        $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/styles/$$*/,\
+            mimetype META-INF/manifest.xml meta.xml styles.xml \
+            $$(call extra_files_TEMPLATES_RELATIVE,styles/$$*))
+	$(run_zip_template_recipe)
 
 # vim: set noet sw=4 ts=4:

extras/CustomTarget_tplpresnt.mk

@@ -1,143 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_CustomTarget_CustomTarget,extras/source/templates/presnt))
-
-# # for OTP templates: mimetype, content.xml, styles.xml, META-INF/manifest.xml and
-# Thumbnails/thumbnail.png files are automatically added for each template
-# list of meta.xml files (one per template) + other files (content.xml, manifest.rdf, settings.xml, pictures...)
-extras_PRESENTATIONS_XMLFILES := \
-	Beehive/meta.xml  \
-	Blue_Curve/meta.xml  \
-	Blueprint_Plans/meta.xml  \
-	Candy/meta.xml  \
-	DNA/meta.xml  \
-	Focus/meta.xml  \
-	Forestbird/meta.xml  \
-	Grey_Elegant/meta.xml  \
-	Growing_Liberty/meta.xml  \
-	Freshes/meta.xml  \
-	Inspiration/meta.xml  \
-	Lights/meta.xml  \
-	Metropolis/meta.xml  \
-	Midnightblue/meta.xml  \
-	Nature_Illustration/meta.xml  \
-	Pencil/meta.xml  \
-	Piano/meta.xml  \
-	Portfolio/meta.xml  \
-	Progress/meta.xml  \
-	Sunset/meta.xml  \
-	Vintage/meta.xml  \
-	Vivid/meta.xml  \
-	Yellow_Idea/meta.xml  \
-	Freshes/Object_1/content.xml  \
-	Freshes/Object_2/content.xml  \
-	Blueprint_Plans/Pictures/10000000000000580000001F99D2A38C014B254B.png  \
-	Blueprint_Plans/Pictures/100000000000033C0000026D847ACE982C6E20B6.png  \
-	Blueprint_Plans/Pictures/10000000000004220000031A5C2E04AB7C51FB60.png  \
-	Blueprint_Plans/Pictures/1000020100000500000002D03918081590A75FCF.png  \
-	Blueprint_Plans/Pictures/1000020100000500000002D0F25E20EA381A5EBD.png  \
-	Candy/Pictures/10000000000004A800000500DD5BB9FFED422172.png  \
-	Candy/Pictures/10000000000005000000050014DEA376B6E67205.png  \
-	Candy/Pictures/1000000000000780000004383B6CE268A9802A07.png  \
-	Candy/Pictures/10000000000007800000043870026B1FACED0D1B.png  \
-	Freshes/Pictures/10000000000001980000067FB46981E5FBCD5A53.jpg  \
-	Freshes/Pictures/10000000000002C5000003C02FC12A07C25F42DF.jpg  \
-	Freshes/Pictures/10000000000002D50000067FACCA26111F046EB5.jpg  \
-	Freshes/Pictures/100000000000030F0000036F55A62FC34FCAB38E.jpg  \
-	Freshes/Pictures/100000000000049100000359E7B1AC100BA62FBB.jpg  \
-	Freshes/Pictures/10000000000006D7000003A637B7BBC50EDF4D24.jpg  \
-	Freshes/Pictures/1000000000000B8B0000067F7C4C059ECC323C6F.jpg  \
-	Grey_Elegant/Pictures/1000000000000007000000075D9D31963C8C0E25.jpg  \
-	Grey_Elegant/Pictures/1000000000000007000000076677E5BE1EDAF335.jpg  \
-	Grey_Elegant/Pictures/10000000000001920000019230489F7A89351262.jpg  \
-	Grey_Elegant/Pictures/10000109000002950000029599843C084F54196C.svg  \
-	Grey_Elegant/Pictures/100001E0000002950000029531405702AAD800D0.svg  \
-	Grey_Elegant/Pictures/10000201000000190000001945D72F17575B71B4.png  \
-	Grey_Elegant/Pictures/1000020100000019000000194F0EE08BB7018624.png  \
-	Grey_Elegant/Pictures/10000201000000190000001967D610D5BD5B9486.png  \
-	Grey_Elegant/Pictures/100002010000001900000019B19ADF33FD67D860.png  \
-	Grey_Elegant/Pictures/100002010000001900000019CA03B954885E470D.png  \
-	Grey_Elegant/Pictures/10000201000003300000026455AC9786240DB2F8.png  \
-	Grey_Elegant/Pictures/100002510000029500000295D9236A158400ED63.svg  \
-	Grey_Elegant/Pictures/100002800000029500000295458C6106AED5C839.svg  \
-	Grey_Elegant/Pictures/100002CA0000029500000295A190AE1D987B676B.svg  \
-	Grey_Elegant/Pictures/1000DC810000A57800007C20AABC768B7E7ACB30.svg  \
-	Growing_Liberty/Pictures/10000000000007800000043801760C0AF0E62E0B.jpg  \
-	Growing_Liberty/Pictures/10000000000007800000043827B5F54D1F4F498F.jpg  \
-	Growing_Liberty/Pictures/100002010000016A0000029374C9F2B8F26392AD.png  \
-	Growing_Liberty/Pictures/10000201000001F000000351DA39462E363D7ED3.png  \
-	Growing_Liberty/Pictures/10000201000001F10000029333ED1BC48076B5C4.png  \
-	Growing_Liberty/Pictures/10000201000001F3000003548E51808DE171DA02.png  \
-	Growing_Liberty/Pictures/10000C1C0000034200004A6A2C92F38BC117DD3C.svg  \
-	Growing_Liberty/Pictures/10000C340000844B000003422549B923A55839CC.svg  \
-	Growing_Liberty/Pictures/10000C8F0000034200004A6ABD021DA9BD39254C.svg  \
-	Growing_Liberty/Pictures/10000CA90000844B000003426738F0E80CCFF9F3.svg  \
-	Metropolis/Pictures/10000201000003AF000002126A94207C4902B60B.png  \
-	Metropolis/Pictures/100021B200008D2E00004F60B312A649B9EEC188.svg  \
-	Nature_Illustration/Pictures/10000000000004210000031931EA92AB7FB2FD6C.jpg  \
-	Nature_Illustration/Pictures/100000000000042100000319892187DC121460D8.jpg  \
-	Pencil/Pictures/1000020100000088000000870A26C51C993940C3.png  \
-	Pencil/Pictures/100002010000037D0000001C2F14EFE8274AD9FC.png  \
-	Pencil/Pictures/1000020100000402000000A2F7F509AE74DE6C69.png  \
-	Piano/Pictures/100000000000035400000120266623530F1969D0.png  \
-	Piano/Pictures/100002010000033A0000006EDD62437E1CC42053.png  \
-	Vintage/Pictures/10000000000000580000001F99D2A38C014B254B.png  \
-	Vintage/Pictures/10000201000004B000000337490AE22881331C9B.png  \
-	Vintage/Pictures/10000201000004B00000033776CA70A4BFE2196B.png  \
-	Vintage/Pictures/10000201000004B0000003379D1127938561C230.png  \
-	Vintage/Pictures/10000201000004B000000337D99A2303560BD59C.png  \
-
-# param: style-base (e.g. Modern)
-extras_PRESNT_XMLFILES_RELATIVE = $(subst $(1)/,,$(filter $(1)/%,$(extras_PRESENTATIONS_XMLFILES)))
-
-.SECONDEXPANSION:
-# secondexpansion since the patterns not just cover a filename portion, but also include a
-# directory portion withdifferent number of elements
-# copy regular files (mimetype, *.jpg, *.png, *.rdf, *.svg, *.svm, …)
-$(gb_CustomTarget_workdir)/extras/source/templates/presnt/% : $(SRCDIR)/extras/source/templates/presnt/% \
-        | $$(dir $(gb_CustomTarget_workdir)/extras/source/templates/presnt/$$*).dir
-	$(call gb_Output_announce,templates/presnt/$*,$(true),CPY,1)
-	$(call gb_Trace_StartRange,templates/presnt/$*,CPY)
-	cp $< $@
-	$(call gb_Trace_EndRange,templates/presnt/$*,CPY)
-
-# test and copy xml files
-$(gb_CustomTarget_workdir)/extras/source/templates/presnt/%.xml : $(SRCDIR)/extras/source/templates/presnt/%.xml \
-        | $(call gb_ExternalExecutable_get_dependencies,xsltproc) \
-          $$(dir $(gb_CustomTarget_workdir)/extras/source/templates/presnt/$$*.xml).dir
-	$(call gb_Output_announce,templates/presnt/$*.xml,$(true),XSL,1)
-	$(call gb_Trace_StartRange,templates/presnt/$*.xml,XSL)
-	$(call gb_ExternalExecutable_get_command,xsltproc) --nonet -o $@ $(SRCDIR)/extras/util/compact.xsl $<
-	$(call gb_Trace_EndRange,templates/presnt/$*.xml,XSL)
-
-# zip files to OTP
-$(gb_CustomTarget_workdir)/extras/source/templates/presnt/%.otp : \
-        $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/presnt/$$*/,\
-            mimetype $$(call extras_PRESNT_XMLFILES_RELATIVE,$$*) ) \
-        $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/presnt/$$*/,\
-            content.xml $$(call extras_PRESNT_XMLFILES_RELATIVE,$$*) ) \
-        $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/presnt/$$*/,\
-            styles.xml $$(call extras_PRESNT_XMLFILES_RELATIVE,$$*) ) \
-        $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/presnt/$$*/,\
-            META-INF/manifest.xml $$(call extras_PRESNT_XMLFILES_RELATIVE,$$*) ) \
-        $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/presnt/$$*/,\
-            Thumbnails/thumbnail.png $$(call extras_PRESNT_XMLFILES_RELATIVE,$$*) )
-	$(call gb_Output_announce,templates/presnt/$*.otp,$(true),ZIP,2)
-	$(call gb_Trace_StartRange,templates/presnt/$*.otp,ZIP)
-	$(call gb_Helper_abbreviate_dirs,\
-		cd $(dir $<) && \
-		$(call gb_Helper_wsl_path,\
-		$(WSL) zip -q0X --filesync --must-match $@ mimetype && \
-		$(WSL) zip -qrX --must-match $@ content.xml styles.xml META-INF/manifest.xml Thumbnails/thumbnail.png && \
-		$(WSL) zip -qrX --must-match $@ $(call extras_PRESNT_XMLFILES_RELATIVE,$*)) \
-	)
-	$(call gb_Trace_EndRange,templates/presnt/$*.otp,ZIP)
-
-# vim: set noet sw=4 ts=4:

extras/CustomTarget_tplwizard.mk

@@ -1,241 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_CustomTarget_CustomTarget,extras/source/templates/wizard))
-
-# mimetype, content.xml, settings.xml, styles.xml and META-INF/manifest.xml
-# files are automatically added for each template
-# list of meta.xml files (one per template) + other files (manifest.rdf, pictures...)
-extras_WIZARD_XMLFILES := \
-	agenda/10grey/meta.xml \
-	agenda/1simple/meta.xml \
-	agenda/2elegant/meta.xml \
-	agenda/3modern/meta.xml \
-	agenda/4classic/meta.xml \
-	agenda/5blue/meta.xml \
-	agenda/6orange/meta.xml \
-	agenda/7red/meta.xml \
-	agenda/8green/meta.xml \
-	agenda/9colorful/meta.xml \
-	agenda/aw-10grey/meta.xml \
-	agenda/aw-1simple/meta.xml \
-	agenda/aw-2elegant/meta.xml \
-	agenda/aw-3modern/meta.xml \
-	agenda/aw-4classic/meta.xml \
-	agenda/aw-5blue/meta.xml \
-	agenda/aw-6orange/meta.xml \
-	agenda/aw-7red/meta.xml \
-	agenda/aw-8green/meta.xml \
-	agenda/aw-9colorful/meta.xml \
-	agenda/10grey/manifest.rdf \
-	agenda/1simple/manifest.rdf \
-	agenda/2elegant/manifest.rdf \
-	agenda/3modern/manifest.rdf \
-	agenda/4classic/manifest.rdf \
-	agenda/5blue/manifest.rdf \
-	agenda/6orange/manifest.rdf \
-	agenda/7red/manifest.rdf \
-	agenda/8green/manifest.rdf \
-	agenda/9colorful/manifest.rdf \
-	agenda/aw-10grey/manifest.rdf \
-	agenda/aw-1simple/manifest.rdf \
-	agenda/aw-2elegant/manifest.rdf \
-	agenda/aw-3modern/manifest.rdf \
-	agenda/aw-4classic/manifest.rdf \
-	agenda/aw-5blue/manifest.rdf \
-	agenda/aw-6orange/manifest.rdf \
-	agenda/aw-7red/manifest.rdf \
-	agenda/aw-8green/manifest.rdf \
-	agenda/aw-9colorful/manifest.rdf \
-	agenda/2elegant/Pictures/1000000000000280000000052876A81A.gif \
-	agenda/2elegant/Pictures/100002000000008F0000000A83659D51.gif \
-	agenda/aw-2elegant/Pictures/1000000000000280000000052876A81A.gif \
-	agenda/aw-2elegant/Pictures/100002000000008F0000000A83659D51.gif \
-	fax/bus-classic_f/meta.xml \
-	fax/bus-classic-pri_f/meta.xml \
-	fax/bus-modern_f/meta.xml \
-	fax/bus-modern-pri_f/meta.xml \
-	fax/pri-bottle_f/meta.xml \
-	fax/pri-fax_f/meta.xml \
-	fax/pri-lines_f/meta.xml \
-	fax/pri-marine_f/meta.xml \
-	fax/bus-classic_f/manifest.rdf \
-	fax/bus-classic-pri_f/manifest.rdf \
-	fax/bus-modern_f/manifest.rdf \
-	fax/bus-modern-pri_f/manifest.rdf \
-	fax/bus-classic_f/Pictures/200000520000271100001F73A977C564.wmf \
-	fax/bus-modern_f/Pictures/2000004E0000271100001F73772F7F48.wmf \
-	fax/pri-bottle_f/Pictures/200002EB000022DA000024E1F891208C.wmf \
-	fax/pri-fax_f/Pictures/2000032600002711000026A54A905481.wmf \
-	fax/pri-marine_f/Pictures/2000004B0000227F0000227886F3FC0F.wmf \
-	letter/bus-elegant_l/meta.xml \
-	letter/bus-modern_l/meta.xml \
-	letter/bus-office_l/meta.xml \
-	letter/off-elegant_l/meta.xml \
-	letter/off-modern_l/meta.xml \
-	letter/off-office_l/meta.xml \
-	letter/pri-bottle_l/meta.xml \
-	letter/pri-mail_l/meta.xml \
-	letter/pri-marine_l/meta.xml \
-	letter/pri-redline_l/meta.xml \
-	letter/bus-elegant_l/manifest.rdf \
-	letter/bus-modern_l/manifest.rdf \
-	letter/bus-office_l/manifest.rdf \
-	letter/off-elegant_l/manifest.rdf \
-	letter/off-modern_l/manifest.rdf \
-	letter/off-office_l/manifest.rdf \
-	letter/bus-elegant_l/Pictures/10000000000001B8000000824B7EA208.png \
-	letter/bus-modern_l/Pictures/10000000000001B8000000824B7EA208.png \
-	letter/bus-office_l/Pictures/10000000000001B8000000824B7EA208.png \
-	letter/off-elegant_l/Pictures/2000000D00000434000006FD6841386B.svm \
-	letter/off-modern_l/Pictures/10000000000000110000001142D1547F.png \
-	letter/pri-bottle_l/Pictures/200002EB000022DA000024E1F891208C.wmf \
-	letter/pri-mail_l/Pictures/200000430000271100001205CAE80946.wmf \
-	letter/pri-marine_l/Pictures/2000004B0000227F0000227886F3FC0F.wmf \
-	report/cnt-01/meta.xml \
-	report/cnt-011/meta.xml \
-	report/cnt-012/meta.xml \
-	report/cnt-02/meta.xml \
-	report/cnt-021/meta.xml \
-	report/cnt-022/meta.xml \
-	report/cnt-03/meta.xml \
-	report/cnt-031/meta.xml \
-	report/cnt-032/meta.xml \
-	report/cnt-04/meta.xml \
-	report/cnt-041/meta.xml \
-	report/cnt-042/meta.xml \
-	report/cnt-05/meta.xml \
-	report/cnt-051/meta.xml \
-	report/cnt-052/meta.xml \
-	report/cnt-06/meta.xml \
-	report/cnt-061/meta.xml \
-	report/cnt-062/meta.xml \
-	report/cnt-default/meta.xml \
-	report/stl-01/meta.xml \
-	report/stl-02/meta.xml \
-	report/stl-03/meta.xml \
-	report/stl-04/meta.xml \
-	report/stl-05/meta.xml \
-	report/stl-06/meta.xml \
-	report/stl-07/meta.xml \
-	report/stl-08/meta.xml \
-	report/stl-09/meta.xml \
-	report/stl-default/meta.xml \
-	report/stl-01/manifest.rdf \
-	report/stl-02/manifest.rdf \
-	report/stl-03/manifest.rdf \
-	report/stl-04/manifest.rdf \
-	report/stl-05/manifest.rdf \
-	report/stl-06/manifest.rdf \
-	report/stl-07/manifest.rdf \
-	report/stl-08/manifest.rdf \
-	report/stl-09/manifest.rdf \
-	report/stl-default/manifest.rdf \
-	report/stl-01/Pictures/100002000000001400000014E87B6AC5.gif \
-	report/stl-01/Pictures/2000018100001CB100002711BFED37A8.wmf \
-	report/stl-02/Pictures/2000009E0000380100002657BA019D86.wmf \
-	report/stl-03/Pictures/2000024900002711000021F4DCB2DF4A.wmf \
-	report/stl-04/Pictures/10000000000000400000004077CDC8F9.png \
-	report/stl-04/Pictures/10000000000001C6000000E44DCA6C94.jpg \
-	report/stl-05/Pictures/2000036D000027110000145EB7E93049.wmf \
-	report/stl-06/Pictures/100000000000005A000000268DE98CCE.gif \
-	report/stl-06/Pictures/100000000000021B000001E8BE936AB6.gif \
-	report/stl-08/Pictures/100000000000005E0000005E97FB9EF6.jpg \
-	report/stl-09/Pictures/10000000000000050000004D32652675.jpg \
-	report/stl-09/Pictures/100002000000001400000014E87B6AC5.gif \
-	report/stl-09/Pictures/2000025100001D92000017719EB70CFB.wmf \
-	styles/black_white/meta.xml \
-	styles/blackberry/meta.xml \
-	styles/default/meta.xml \
-	styles/diner/meta.xml \
-	styles/fall/meta.xml \
-	styles/glacier/meta.xml \
-	styles/green_grapes/meta.xml \
-	styles/jeans/meta.xml \
-	styles/marine/meta.xml \
-	styles/millennium/meta.xml \
-	styles/nature/meta.xml \
-	styles/neon/meta.xml \
-	styles/night/meta.xml \
-	styles/nostalgic/meta.xml \
-	styles/pastell/meta.xml \
-	styles/pool/meta.xml \
-	styles/pumpkin/meta.xml \
-	styles/xos/meta.xml \
-
-# param: style-base (e.g. agenda/10grey)
-extras_WIZARD_XMLFILES_RELATIVE = $(subst $(1)/,,$(filter $(1)/%,$(extras_WIZARD_XMLFILES)))
-
-.SECONDEXPANSION:
-# secondexpansion since the patterns not just cover a filename portion, but also include a
-# directory portion with different number of elements
-# copy regular files (mimetype, *.jpg, *.png, *.rdf, *.svg, *.svm, …)
-$(gb_CustomTarget_workdir)/extras/source/templates/wizard/% : $(SRCDIR)/extras/source/templates/wizard/% \
-        | $$(dir $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*).dir
-	$(call gb_Output_announce,templates/wizard/$*,$(true),CPY,1)
-	$(call gb_Trace_StartRange,templates/wizard/$*,CPY)
-	cp $< $@
-	$(call gb_Trace_EndRange,templates/wizard/$*,CPY)
-
-# test and copy xml files
-$(gb_CustomTarget_workdir)/extras/source/templates/wizard/%.xml : $(SRCDIR)/extras/source/templates/wizard/%.xml \
-        | $(call gb_ExternalExecutable_get_dependencies,xsltproc) \
-          $$(dir $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*.xml).dir
-	$(call gb_Output_announce,templates/wizard/$*.xml,$(true),XSL,1)
-	$(call gb_Trace_StartRange,templates/wizard/$*.xml,XSL)
-	$(call gb_ExternalExecutable_get_command,xsltproc) --nonet -o $@ $(SRCDIR)/extras/util/compact.xsl $<
-	$(call gb_Trace_EndRange,templates/wizard/$*.xml,XSL)
-
-# zip files to OTT
-$(gb_CustomTarget_workdir)/extras/source/templates/wizard/%.ott : \
-        $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*/,\
-            mimetype $$(call extras_WIZARD_XMLFILES_RELATIVE,$$*) ) \
-        $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*/,\
-            content.xml $$(call extras_WIZARD_XMLFILES_RELATIVE,$$*) ) \
-        $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*/,\
-            settings.xml $$(call extras_WIZARD_XMLFILES_RELATIVE,$$*) ) \
-        $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*/,\
-            styles.xml $$(call extras_WIZARD_XMLFILES_RELATIVE,$$*) ) \
-        $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*/,\
-            META-INF/manifest.xml $$(call extras_WIZARD_XMLFILES_RELATIVE,$$*) )
-	$(call gb_Output_announce,templates/wizard/$*.ott,$(true),ZIP,2)
-	$(call gb_Trace_StartRange,templates/wizard/$*.ott,ZIP)
-	$(call gb_Helper_abbreviate_dirs,\
-		cd $(dir $<) && \
-		$(call gb_Helper_wsl_path,\
-		$(WSL) zip -q0X --filesync --must-match $@ mimetype && \
-		$(WSL) zip -qrX --must-match $@ content.xml settings.xml styles.xml META-INF/manifest.xml && \
-		$(WSL) zip -qrX --must-match $@ $(call extras_WIZARD_XMLFILES_RELATIVE,$*)) \
-	)
-	$(call gb_Trace_EndRange,templates/wizard/$*.ott,ZIP)
-
-# zip files to OTS
-$(gb_CustomTarget_workdir)/extras/source/templates/wizard/%.ots : \
-        $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*/,\
-            mimetype $$(call extras_WIZARD_XMLFILES_RELATIVE,$$*) ) \
-        $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*/,\
-            content.xml $$(call extras_WIZARD_XMLFILES_RELATIVE,$$*) ) \
-        $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*/,\
-            settings.xml $$(call extras_WIZARD_XMLFILES_RELATIVE,$$*) ) \
-        $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*/,\
-            styles.xml $$(call extras_WIZARD_XMLFILES_RELATIVE,$$*) ) \
-        $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*/,\
-            META-INF/manifest.xml $$(call extras_WIZARD_XMLFILES_RELATIVE,$$*) )
-	$(call gb_Output_announce,templates/wizard/$*.ots,$(true),ZIP,2)
-	$(call gb_Trace_StartRange,templates/wizard/$*.ots,ZIP)
-	$(call gb_Helper_abbreviate_dirs,\
-		cd $(dir $<) && \
-		$(call gb_Helper_wsl_path,\
-		$(WSL) zip -q0X --filesync --must-match $@ mimetype && \
-		$(WSL) zip -qrX --must-match $@ content.xml settings.xml styles.xml META-INF/manifest.xml && \
-		$(WSL) zip -qrX --must-match $@ $(call extras_WIZARD_XMLFILES_RELATIVE,$*)) \
-	)
-	$(call gb_Trace_EndRange,templates/wizard/$*.ots,ZIP)
-
-# vim: set noet sw=4 ts=4:

extras/CustomTarget_tplwizdesktop.mk

@@ -1,89 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_CustomTarget_CustomTarget,extras/source/templates/wizard))
-
-# mimetype, content.xml, meta.xml, styles.xml and META-INF/manifest.xml
-# files are automatically added for each template
-# list of meta.xml files (one per template) + other files (manifest.rdf, pictures...)
-extras_WIZDESKTOP_XMLFILES := \
-	desktop/html/meta.xml \
-	desktop/idxexample/meta.xml \
-	desktop/idxexample/Pictures/2000008600001923000012C24E0D0895.wmf \
-
-# param: style-base (e.g. agenda/10grey)
-extras_WIZDESKTOP_XMLFILES_RELATIVE = $(subst $(1)/,,$(filter $(1)/%,$(extras_WIZDESKTOP_XMLFILES)))
-
-.SECONDEXPANSION:
-# secondexpansion since the patterns not just cover a filename portion, but also include a
-# directory portion with different number of elements
-# copy regular files (mimetype, *.jpg, *.png, *.rdf, *.svg, *.svm, …)
-$(gb_CustomTarget_workdir)/extras/source/templates/wizard/% : $(SRCDIR)/extras/source/templates/wizard/% \
-        | $$(dir $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*).dir
-	$(call gb_Output_announce,templates/wizard/$*,$(true),CPY,1)
-	$(call gb_Trace_StartRange,templates/wizard/$*,CPY)
-	cp $< $@
-	$(call gb_Trace_EndRange,templates/wizard/$*,CPY)
-
-# test and copy xml files
-$(gb_CustomTarget_workdir)/extras/source/templates/wizard/%.xml : $(SRCDIR)/extras/source/templates/wizard/%.xml \
-        | $(call gb_ExternalExecutable_get_dependencies,xsltproc) \
-          $$(dir $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*.xml).dir
-	$(call gb_Output_announce,templates/wizard/$*.xml,$(true),XSL,1)
-	$(call gb_Trace_StartRange,templates/wizard/$*.xml,XSL)
-	$(call gb_ExternalExecutable_get_command,xsltproc) --nonet -o $@ $(SRCDIR)/extras/util/compact.xsl $<
-	$(call gb_Trace_EndRange,templates/wizard/$*.xml,XSL)
-
-# zip files to OTH
-$(gb_CustomTarget_workdir)/extras/source/templates/wizard/%.oth : \
-        $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*/,\
-            mimetype $$(call extras_WIZDESKTOP_XMLFILES_RELATIVE,$$*) ) \
-        $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*/,\
-            content.xml $$(call extras_WIZDESKTOP_XMLFILES_RELATIVE,$$*) ) \
-        $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*/,\
-            styles.xml $$(call extras_WIZDESKTOP_XMLFILES_RELATIVE,$$*) ) \
-        $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*/,\
-            settings.xml $$(call extras_WIZDESKTOP_XMLFILES_RELATIVE,$$*) ) \
-        $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*/,\
-            META-INF/manifest.xml $$(call extras_WIZDESKTOP_XMLFILES_RELATIVE,$$*) )
-	$(call gb_Output_announce,templates/wizard/$*.oth,$(true),ZIP,2)
-	$(call gb_Trace_StartRange,templates/wizard/$*.oth,ZIP)
-	$(call gb_Helper_abbreviate_dirs,\
-		cd $(dir $<) && \
-		$(call gb_Helper_wsl_path,\
-		$(WSL) zip -q0X --filesync --must-match $@ mimetype && \
-		$(WSL) zip -qrX --must-match $@ content.xml settings.xml styles.xml META-INF/manifest.xml && \
-		$(WSL) zip -qrX --must-match $@ $(call extras_WIZDESKTOP_XMLFILES_RELATIVE,$*)) \
-	)
-	$(call gb_Trace_EndRange,templates/wizard/$*.oth,ZIP)
-
-# zip files to ODT
-$(gb_CustomTarget_workdir)/extras/source/templates/wizard/%.odt : \
-        $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*/,\
-            mimetype $$(call extras_WIZDESKTOP_XMLFILES_RELATIVE,$$*) ) \
-        $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*/,\
-            content.xml $$(call extras_WIZDESKTOP_XMLFILES_RELATIVE,$$*) ) \
-        $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*/,\
-            settings.xml $$(call extras_WIZDESKTOP_XMLFILES_RELATIVE,$$*) ) \
-        $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*/,\
-            styles.xml $$(call extras_WIZDESKTOP_XMLFILES_RELATIVE,$$*) ) \
-        $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*/,\
-            META-INF/manifest.xml $$(call extras_WIZDESKTOP_XMLFILES_RELATIVE,$$*) )
-	$(call gb_Output_announce,templates/wizard/$*.odt,$(true),ZIP,2)
-	$(call gb_Trace_StartRange,templates/wizard/$*.odt,ZIP)
-	$(call gb_Helper_abbreviate_dirs,\
-		cd $(dir $<) && \
-		$(call gb_Helper_wsl_path,\
-		$(WSL) zip -q0X --filesync --must-match $@ mimetype && \
-		$(WSL) zip -qrX --must-match $@ content.xml settings.xml styles.xml META-INF/manifest.xml && \
-		$(WSL) zip -qrX --must-match $@ $(call extras_WIZDESKTOP_XMLFILES_RELATIVE,$*)) \
-	)
-	$(call gb_Trace_EndRange,templates/wizard/$*.odt,ZIP)
-
-# vim: set noet sw=4 ts=4:

extras/Module_extras.mk

@@ -15,9 +15,6 @@ $(eval $(call gb_Module_add_targets,extras,\
 	CustomTarget_glade \
 	CustomTarget_gallsystem \
 	CustomTarget_templates \
-	CustomTarget_tplpresnt \
-	CustomTarget_tplwizard \
-	CustomTarget_tplwizdesktop \
 	Package_autocorr \
 	Package_autotextuser \
 	Package_cfgsrvnolang \

extras/README.md

@@ -35,8 +35,8 @@ Contains templates, clipart galleries, palettes, symbol font, autocorrections, a
 	+ choose a template category `<Category>`
 	+ unzip `Foo.ot?` (? = p, t, s or g) in `extras/source/templates/<Category>/Foo` (no space allowed in any file names)
 	+ add `<Category>/Foo.ot? /` in `Package_templates.mk` (or `Package_tplpresnt.mk` if it's a presentation)
-	+ in `CustomTarget_templates.mk` (or `CustomTarget_tplpresnt.mk` if it's a presentation):
-		+ add `<Category>/Foo/meta.xml /` and all files which are not automatically added in `extras_TEMPLATES_XMLFILES` (or `extras_PRESENTATIONS_XMLFILES` for presentation)
+	+ in `template_files.mk`:
+		+ add e.g. `<Category>/Foo/settings.xml` (and all other files which are not automatically added) to `extra_files_COMMON` (or `extra_files_PRESENTATIONS` in case of a presentation template)
 	+ for translation of template name
 		+ define a new STR_TEMPLATE_NAMExx in include/sfx2/strings.hrc
 		+ define a new STR_TEMPLATE_NAMExx_DEF in sfx2/inc/strings.hxx

extras/source/autocorr/lang/el/DocumentList.xml

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <block-list:block-list xmlns:block-list="http://openoffice.org/2001/block-list">
+  <block-list:block block-list:abbreviated-name=".*σ&apos;" block-list:name="σ’"/>
+  <block-list:block block-list:abbreviated-name=".*σ’" block-list:name="σ’"/>
   <block-list:block block-list:abbreviated-name=".*σ" block-list:name="ς"/>
   <block-list:block block-list:abbreviated-name="--&gt;" block-list:name="→"/>
   <block-list:block block-list:abbreviated-name=".*-&gt;.*" block-list:name="→"/>

extras/source/autocorr/lang/nl-BE/DocumentList.xml

@@ -10,6 +10,10 @@
   <block-list:block block-list:abbreviated-name="&lt;--" block-list:name="←"/>
   <block-list:block block-list:abbreviated-name="&lt;--&gt;" block-list:name="↔"/>
   <block-list:block block-list:abbreviated-name="&lt;-&gt;" block-list:name="↔"/>
+  <block-list:block block-list:abbreviated-name="&apos;s" block-list:name="’s"/>
+  <block-list:block block-list:abbreviated-name="&apos;t" block-list:name="’t"/>
+  <block-list:block block-list:abbreviated-name="‘s" block-list:name="’s"/>
+  <block-list:block block-list:abbreviated-name="‘t" block-list:name="’t"/>
   <block-list:block block-list:abbreviated-name="1/2" block-list:name="½"/>
   <block-list:block block-list:abbreviated-name="1/4" block-list:name="¼"/>
   <block-list:block block-list:abbreviated-name="3/4" block-list:name="¾"/>

extras/source/autocorr/lang/nl/DocumentList.xml

@@ -10,6 +10,10 @@
   <block-list:block block-list:abbreviated-name="&lt;--" block-list:name="←"/>
   <block-list:block block-list:abbreviated-name="&lt;--&gt;" block-list:name="↔"/>
   <block-list:block block-list:abbreviated-name="&lt;-&gt;" block-list:name="↔"/>
+  <block-list:block block-list:abbreviated-name="&apos;s" block-list:name="’s"/>
+  <block-list:block block-list:abbreviated-name="&apos;t" block-list:name="’t"/>
+  <block-list:block block-list:abbreviated-name="‘s" block-list:name="’s"/>
+  <block-list:block block-list:abbreviated-name="‘t" block-list:name="’t"/>
   <block-list:block block-list:abbreviated-name="aanrijken" block-list:name="aanreiken"/>
   <block-list:block block-list:abbreviated-name="abbonnee" block-list:name="abonnee"/>
   <block-list:block block-list:abbreviated-name="abbonnement" block-list:name="abonnement"/>

extras/template_files.mk

@@ -0,0 +1,307 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# this file lists the contents/parts that make up the individual templates that are created during
+# the build.
+#
+# The Package_*.mk files list the files that should be built and delivered to the installation tree,
+# and CustomTarget_templates.mk has the actual recipes to assemble and package the template files.
+#
+# The split used here follows the split from the Package_*mk files, but that split is arbitrary/
+# artificial, they are ultimately combined into a single variable.
+# A split only matters on the Package level, but even there only the wizard/desktop files are
+# "special" (they are always created/packaged, while the rests is optional/behind a WITH_TEMPLATES
+# conditional)
+
+# Specify filenames relative to SRC_ROOT/extras/source/templates
+# mimetype, META-INF/manifest.xml, content.xml, meta.xml and styles.xml are always assumed to be
+# present and can be omitted
+
+extra_files_COMMON := \
+    draw/bpmn/Thumbnails/thumbnail.png \
+    l10n/ja_ott_normal/manifest.rdf \
+    l10n/ja_ott_normal/settings.xml \
+    l10n/ja_ott_normal/Thumbnails/thumbnail.png \
+    l10n/zh_CN_ott_normal/Thumbnails/thumbnail.png \
+    officorr/Modern_business_letter_sans_serif/manifest.rdf \
+    officorr/Modern_business_letter_sans_serif/Thumbnails/thumbnail.png \
+    officorr/Modern_business_letter_serif/manifest.rdf \
+    officorr/Modern_business_letter_serif/Thumbnails/thumbnail.png \
+    offimisc/Businesscard-with-logo/manifest.rdf \
+    offimisc/Businesscard-with-logo/Pictures/10000201000001F4000000A0108F3F06.png \
+    offimisc/Businesscard-with-logo/settings.xml \
+    offimisc/Businesscard-with-logo/Thumbnails/thumbnail.png \
+    personal/CV/manifest.rdf \
+    personal/CV/Thumbnails/thumbnail.png \
+    personal/Resume1page/manifest.rdf \
+    personal/Resume1page/Thumbnails/thumbnail.png \
+    styles/Default/Thumbnails/thumbnail.png \
+    styles/Modern/Thumbnails/thumbnail.png \
+    styles/Simple/Thumbnails/thumbnail.png \
+
+
+extra_files_PRESENTATIONS := \
+    presnt/Beehive/Thumbnails/thumbnail.png \
+    presnt/Blue_Curve/Thumbnails/thumbnail.png \
+    presnt/Blueprint_Plans/Pictures/10000000000000580000001F99D2A38C014B254B.png  \
+    presnt/Blueprint_Plans/Pictures/100000000000033C0000026D847ACE982C6E20B6.png  \
+    presnt/Blueprint_Plans/Pictures/10000000000004220000031A5C2E04AB7C51FB60.png  \
+    presnt/Blueprint_Plans/Pictures/1000020100000500000002D03918081590A75FCF.png  \
+    presnt/Blueprint_Plans/Pictures/1000020100000500000002D0F25E20EA381A5EBD.png  \
+    presnt/Blueprint_Plans/Thumbnails/thumbnail.png \
+    presnt/Candy/Pictures/10000000000004A800000500DD5BB9FFED422172.png  \
+    presnt/Candy/Pictures/10000000000005000000050014DEA376B6E67205.png  \
+    presnt/Candy/Pictures/1000000000000780000004383B6CE268A9802A07.png  \
+    presnt/Candy/Pictures/10000000000007800000043870026B1FACED0D1B.png  \
+    presnt/Candy/Thumbnails/thumbnail.png \
+    presnt/DNA/Thumbnails/thumbnail.png \
+    presnt/Focus/Thumbnails/thumbnail.png \
+    presnt/Forestbird/Thumbnails/thumbnail.png \
+    presnt/Freshes/Object_1/content.xml \
+    presnt/Freshes/Object_2/content.xml \
+    presnt/Freshes/Pictures/10000000000001980000067FB46981E5FBCD5A53.jpg  \
+    presnt/Freshes/Pictures/10000000000002C5000003C02FC12A07C25F42DF.jpg  \
+    presnt/Freshes/Pictures/10000000000002D50000067FACCA26111F046EB5.jpg  \
+    presnt/Freshes/Pictures/100000000000030F0000036F55A62FC34FCAB38E.jpg  \
+    presnt/Freshes/Pictures/100000000000049100000359E7B1AC100BA62FBB.jpg  \
+    presnt/Freshes/Pictures/10000000000006D7000003A637B7BBC50EDF4D24.jpg  \
+    presnt/Freshes/Pictures/1000000000000B8B0000067F7C4C059ECC323C6F.jpg  \
+    presnt/Freshes/Thumbnails/thumbnail.png \
+    presnt/Grey_Elegant/Pictures/1000000000000007000000075D9D31963C8C0E25.jpg  \
+    presnt/Grey_Elegant/Pictures/1000000000000007000000076677E5BE1EDAF335.jpg  \
+    presnt/Grey_Elegant/Pictures/10000000000001920000019230489F7A89351262.jpg  \
+    presnt/Grey_Elegant/Pictures/10000109000002950000029599843C084F54196C.svg  \
+    presnt/Grey_Elegant/Pictures/100001E0000002950000029531405702AAD800D0.svg  \
+    presnt/Grey_Elegant/Pictures/10000201000000190000001945D72F17575B71B4.png  \
+    presnt/Grey_Elegant/Pictures/1000020100000019000000194F0EE08BB7018624.png  \
+    presnt/Grey_Elegant/Pictures/10000201000000190000001967D610D5BD5B9486.png  \
+    presnt/Grey_Elegant/Pictures/100002010000001900000019B19ADF33FD67D860.png  \
+    presnt/Grey_Elegant/Pictures/100002010000001900000019CA03B954885E470D.png  \
+    presnt/Grey_Elegant/Pictures/10000201000003300000026455AC9786240DB2F8.png  \
+    presnt/Grey_Elegant/Pictures/100002510000029500000295D9236A158400ED63.svg  \
+    presnt/Grey_Elegant/Pictures/100002800000029500000295458C6106AED5C839.svg  \
+    presnt/Grey_Elegant/Pictures/100002CA0000029500000295A190AE1D987B676B.svg  \
+    presnt/Grey_Elegant/Pictures/1000DC810000A57800007C20AABC768B7E7ACB30.svg  \
+    presnt/Grey_Elegant/Thumbnails/thumbnail.png \
+    presnt/Growing_Liberty/Pictures/10000000000007800000043801760C0AF0E62E0B.jpg  \
+    presnt/Growing_Liberty/Pictures/10000000000007800000043827B5F54D1F4F498F.jpg  \
+    presnt/Growing_Liberty/Pictures/100002010000016A0000029374C9F2B8F26392AD.png  \
+    presnt/Growing_Liberty/Pictures/10000201000001F000000351DA39462E363D7ED3.png  \
+    presnt/Growing_Liberty/Pictures/10000201000001F10000029333ED1BC48076B5C4.png  \
+    presnt/Growing_Liberty/Pictures/10000201000001F3000003548E51808DE171DA02.png  \
+    presnt/Growing_Liberty/Pictures/10000C1C0000034200004A6A2C92F38BC117DD3C.svg  \
+    presnt/Growing_Liberty/Pictures/10000C340000844B000003422549B923A55839CC.svg  \
+    presnt/Growing_Liberty/Pictures/10000C8F0000034200004A6ABD021DA9BD39254C.svg  \
+    presnt/Growing_Liberty/Pictures/10000CA90000844B000003426738F0E80CCFF9F3.svg  \
+    presnt/Growing_Liberty/Thumbnails/thumbnail.png \
+    presnt/Inspiration/Thumbnails/thumbnail.png \
+    presnt/Lights/Thumbnails/thumbnail.png \
+    presnt/Metropolis/Pictures/10000201000003AF000002126A94207C4902B60B.png  \
+    presnt/Metropolis/Pictures/100021B200008D2E00004F60B312A649B9EEC188.svg  \
+    presnt/Metropolis/Thumbnails/thumbnail.png \
+    presnt/Midnightblue/Thumbnails/thumbnail.png \
+    presnt/Nature_Illustration/Pictures/10000000000004210000031931EA92AB7FB2FD6C.jpg  \
+    presnt/Nature_Illustration/Pictures/100000000000042100000319892187DC121460D8.jpg  \
+    presnt/Nature_Illustration/Thumbnails/thumbnail.png \
+    presnt/Pencil/Pictures/1000020100000088000000870A26C51C993940C3.png  \
+    presnt/Pencil/Pictures/100002010000037D0000001C2F14EFE8274AD9FC.png  \
+    presnt/Pencil/Pictures/1000020100000402000000A2F7F509AE74DE6C69.png  \
+    presnt/Pencil/Thumbnails/thumbnail.png \
+    presnt/Piano/Pictures/100000000000035400000120266623530F1969D0.png  \
+    presnt/Piano/Pictures/100002010000033A0000006EDD62437E1CC42053.png  \
+    presnt/Piano/Thumbnails/thumbnail.png \
+    presnt/Portfolio/Thumbnails/thumbnail.png \
+    presnt/Progress/Thumbnails/thumbnail.png \
+    presnt/Sunset/Thumbnails/thumbnail.png \
+    presnt/Vintage/Pictures/10000000000000580000001F99D2A38C014B254B.png  \
+    presnt/Vintage/Pictures/10000201000004B000000337490AE22881331C9B.png  \
+    presnt/Vintage/Pictures/10000201000004B00000033776CA70A4BFE2196B.png  \
+    presnt/Vintage/Pictures/10000201000004B0000003379D1127938561C230.png  \
+    presnt/Vintage/Pictures/10000201000004B000000337D99A2303560BD59C.png  \
+    presnt/Vintage/Thumbnails/thumbnail.png \
+    presnt/Vivid/Thumbnails/thumbnail.png \
+    presnt/Yellow_Idea/Thumbnails/thumbnail.png \
+
+
+extra_files_WIZARD := \
+    wizard/agenda/10grey/manifest.rdf \
+    wizard/agenda/10grey/settings.xml \
+    wizard/agenda/1simple/manifest.rdf \
+    wizard/agenda/1simple/settings.xml \
+    wizard/agenda/2elegant/manifest.rdf \
+    wizard/agenda/2elegant/Pictures/1000000000000280000000052876A81A.gif \
+    wizard/agenda/2elegant/Pictures/100002000000008F0000000A83659D51.gif \
+    wizard/agenda/2elegant/settings.xml \
+    wizard/agenda/3modern/manifest.rdf \
+    wizard/agenda/3modern/settings.xml \
+    wizard/agenda/4classic/manifest.rdf \
+    wizard/agenda/4classic/settings.xml \
+    wizard/agenda/5blue/manifest.rdf \
+    wizard/agenda/5blue/settings.xml \
+    wizard/agenda/6orange/manifest.rdf \
+    wizard/agenda/6orange/settings.xml \
+    wizard/agenda/7red/manifest.rdf \
+    wizard/agenda/7red/settings.xml \
+    wizard/agenda/8green/manifest.rdf \
+    wizard/agenda/8green/settings.xml \
+    wizard/agenda/9colorful/manifest.rdf \
+    wizard/agenda/9colorful/settings.xml \
+    wizard/agenda/aw-10grey/manifest.rdf \
+    wizard/agenda/aw-10grey/settings.xml \
+    wizard/agenda/aw-1simple/manifest.rdf \
+    wizard/agenda/aw-1simple/settings.xml \
+    wizard/agenda/aw-2elegant/manifest.rdf \
+    wizard/agenda/aw-2elegant/Pictures/1000000000000280000000052876A81A.gif \
+    wizard/agenda/aw-2elegant/Pictures/100002000000008F0000000A83659D51.gif \
+    wizard/agenda/aw-2elegant/settings.xml \
+    wizard/agenda/aw-3modern/manifest.rdf \
+    wizard/agenda/aw-3modern/settings.xml \
+    wizard/agenda/aw-4classic/manifest.rdf \
+    wizard/agenda/aw-4classic/settings.xml \
+    wizard/agenda/aw-5blue/manifest.rdf \
+    wizard/agenda/aw-5blue/settings.xml \
+    wizard/agenda/aw-6orange/manifest.rdf \
+    wizard/agenda/aw-6orange/settings.xml \
+    wizard/agenda/aw-7red/manifest.rdf \
+    wizard/agenda/aw-7red/settings.xml \
+    wizard/agenda/aw-8green/manifest.rdf \
+    wizard/agenda/aw-8green/settings.xml \
+    wizard/agenda/aw-9colorful/manifest.rdf \
+    wizard/agenda/aw-9colorful/settings.xml \
+    wizard/desktop/html/settings.xml \
+    wizard/desktop/idxexample/settings.xml \
+    wizard/fax/bus-classic_f/manifest.rdf \
+    wizard/fax/bus-classic_f/Pictures/200000520000271100001F73A977C564.wmf \
+    wizard/fax/bus-classic_f/settings.xml \
+    wizard/fax/bus-classic-pri_f/manifest.rdf \
+    wizard/fax/bus-classic-pri_f/settings.xml \
+    wizard/fax/bus-modern_f/manifest.rdf \
+    wizard/fax/bus-modern_f/Pictures/2000004E0000271100001F73772F7F48.wmf \
+    wizard/fax/bus-modern_f/settings.xml \
+    wizard/fax/bus-modern-pri_f/manifest.rdf \
+    wizard/fax/bus-modern-pri_f/settings.xml \
+    wizard/fax/pri-bottle_f/Pictures/200002EB000022DA000024E1F891208C.wmf \
+    wizard/fax/pri-bottle_f/settings.xml \
+    wizard/fax/pri-fax_f/Pictures/2000032600002711000026A54A905481.wmf \
+    wizard/fax/pri-fax_f/settings.xml \
+    wizard/fax/pri-lines_f/settings.xml \
+    wizard/fax/pri-marine_f/Pictures/2000004B0000227F0000227886F3FC0F.wmf \
+    wizard/fax/pri-marine_f/settings.xml \
+    wizard/letter/bus-elegant_l/manifest.rdf \
+    wizard/letter/bus-elegant_l/Pictures/10000000000001B8000000824B7EA208.png \
+    wizard/letter/bus-elegant_l/settings.xml \
+    wizard/letter/bus-modern_l/manifest.rdf \
+    wizard/letter/bus-modern_l/Pictures/10000000000001B8000000824B7EA208.png \
+    wizard/letter/bus-modern_l/settings.xml \
+    wizard/letter/bus-office_l/manifest.rdf \
+    wizard/letter/bus-office_l/Pictures/10000000000001B8000000824B7EA208.png \
+    wizard/letter/bus-office_l/settings.xml \
+    wizard/letter/off-elegant_l/manifest.rdf \
+    wizard/letter/off-elegant_l/Pictures/2000000D00000434000006FD6841386B.svm \
+    wizard/letter/off-elegant_l/settings.xml \
+    wizard/letter/off-modern_l/manifest.rdf \
+    wizard/letter/off-modern_l/Pictures/10000000000000110000001142D1547F.png \
+    wizard/letter/off-modern_l/settings.xml \
+    wizard/letter/off-office_l/manifest.rdf \
+    wizard/letter/off-office_l/settings.xml \
+    wizard/letter/pri-bottle_l/Pictures/200002EB000022DA000024E1F891208C.wmf \
+    wizard/letter/pri-bottle_l/settings.xml \
+    wizard/letter/pri-mail_l/Pictures/200000430000271100001205CAE80946.wmf \
+    wizard/letter/pri-mail_l/settings.xml \
+    wizard/letter/pri-marine_l/Pictures/2000004B0000227F0000227886F3FC0F.wmf \
+    wizard/letter/pri-marine_l/settings.xml \
+    wizard/letter/pri-redline_l/settings.xml \
+    wizard/report/cnt-01/settings.xml \
+    wizard/report/cnt-011/settings.xml \
+    wizard/report/cnt-012/settings.xml \
+    wizard/report/cnt-02/settings.xml \
+    wizard/report/cnt-021/settings.xml \
+    wizard/report/cnt-022/settings.xml \
+    wizard/report/cnt-03/settings.xml \
+    wizard/report/cnt-031/settings.xml \
+    wizard/report/cnt-032/settings.xml \
+    wizard/report/cnt-04/settings.xml \
+    wizard/report/cnt-041/settings.xml \
+    wizard/report/cnt-042/settings.xml \
+    wizard/report/cnt-05/settings.xml \
+    wizard/report/cnt-051/settings.xml \
+    wizard/report/cnt-052/settings.xml \
+    wizard/report/cnt-06/settings.xml \
+    wizard/report/cnt-061/settings.xml \
+    wizard/report/cnt-062/settings.xml \
+    wizard/report/cnt-default/settings.xml \
+    wizard/report/stl-01/manifest.rdf \
+    wizard/report/stl-01/Pictures/100002000000001400000014E87B6AC5.gif \
+    wizard/report/stl-01/Pictures/2000018100001CB100002711BFED37A8.wmf \
+    wizard/report/stl-01/settings.xml \
+    wizard/report/stl-02/manifest.rdf \
+    wizard/report/stl-02/Pictures/2000009E0000380100002657BA019D86.wmf \
+    wizard/report/stl-02/settings.xml \
+    wizard/report/stl-03/manifest.rdf \
+    wizard/report/stl-03/Pictures/2000024900002711000021F4DCB2DF4A.wmf \
+    wizard/report/stl-03/settings.xml \
+    wizard/report/stl-04/manifest.rdf \
+    wizard/report/stl-04/Pictures/10000000000000400000004077CDC8F9.png \
+    wizard/report/stl-04/Pictures/10000000000001C6000000E44DCA6C94.jpg \
+    wizard/report/stl-04/settings.xml \
+    wizard/report/stl-05/manifest.rdf \
+    wizard/report/stl-05/Pictures/2000036D000027110000145EB7E93049.wmf \
+    wizard/report/stl-05/settings.xml \
+    wizard/report/stl-06/manifest.rdf \
+    wizard/report/stl-06/Pictures/100000000000005A000000268DE98CCE.gif \
+    wizard/report/stl-06/Pictures/100000000000021B000001E8BE936AB6.gif \
+    wizard/report/stl-06/settings.xml \
+    wizard/report/stl-07/manifest.rdf \
+    wizard/report/stl-07/settings.xml \
+    wizard/report/stl-08/manifest.rdf \
+    wizard/report/stl-08/Pictures/100000000000005E0000005E97FB9EF6.jpg \
+    wizard/report/stl-08/settings.xml \
+    wizard/report/stl-09/manifest.rdf \
+    wizard/report/stl-09/Pictures/10000000000000050000004D32652675.jpg \
+    wizard/report/stl-09/Pictures/100002000000001400000014E87B6AC5.gif \
+    wizard/report/stl-09/Pictures/2000025100001D92000017719EB70CFB.wmf \
+    wizard/report/stl-09/settings.xml \
+    wizard/report/stl-default/manifest.rdf \
+    wizard/report/stl-default/settings.xml \
+    wizard/styles/black_white/settings.xml \
+    wizard/styles/blackberry/settings.xml \
+    wizard/styles/default/settings.xml \
+    wizard/styles/diner/settings.xml \
+    wizard/styles/fall/settings.xml \
+    wizard/styles/glacier/settings.xml \
+    wizard/styles/green_grapes/settings.xml \
+    wizard/styles/jeans/settings.xml \
+    wizard/styles/marine/settings.xml \
+    wizard/styles/millennium/settings.xml \
+    wizard/styles/nature/settings.xml \
+    wizard/styles/neon/settings.xml \
+    wizard/styles/night/settings.xml \
+    wizard/styles/nostalgic/settings.xml \
+    wizard/styles/pastell/settings.xml \
+    wizard/styles/pool/settings.xml \
+    wizard/styles/pumpkin/settings.xml \
+    wizard/styles/xos/settings.xml \
+
+
+extra_files_WIZDESKTOP := \
+    wizard/desktop/html/settings.xml \
+    wizard/desktop/idxexample/Pictures/2000008600001923000012C24E0D0895.wmf \
+    wizard/desktop/idxexample/settings.xml \
+
+
+extra_files_TEMPLATES := \
+    $(extra_files_COMMON) \
+    $(extra_files_PRESENTATIONS) \
+    $(extra_files_WIZARD) \
+    $(extra_files_WIZDESKTOP) \
+
+
+extra_files_TEMPLATES_RELATIVE = $(subst $(1)/,,$(filter $(1)/%,$(extra_files_TEMPLATES)))
+
+# vim: set noet sw=4 ts=4:

filter/source/graphicfilter/icgm/cgm.cxx

@@ -227,7 +227,7 @@ double CGM::ImplGetFloat( RealPrecision eRealPrecision, sal_uInt32 nRealSize )
         else
         {
             sal_Int32* pLong = static_cast<sal_Int32*>(pPtr);
-            nRetValue = static_cast<double>(abs( pLong[ nSwitch ] ));
+            nRetValue = fabs(static_cast<double>(pLong[nSwitch]));
             nRetValue *= 65536;
             nVal = static_cast<sal_uInt32>( pLong[ nSwitch ^ 1 ] );
             nVal >>= 16;

filter/source/msfilter/msdffimp.cxx

@@ -3894,7 +3894,7 @@ rtl::Reference<SdrObject> SvxMSDffManager::ImportGraphic( SvStream& rSt, SfxItem
             if ( !bGrfRead )
             {
                 /*
-                Still no luck, lets look at the end of this record for a FBSE pool,
+                Still no luck, let's look at the end of this record for a FBSE pool,
                 this fallback is a specific case for how word does it sometimes
                 */
                 bool bOk = rObjData.rSpHd.SeekToEndOfRecord( rSt );

filter/source/msfilter/mstoolbar.cxx

@@ -279,7 +279,7 @@ void TBCData::ImportToolBarControl( CustomToolBarImportHelper& helper, std::vect
         TBCBSpecific* pSpecificInfo = dynamic_cast< TBCBSpecific* >( controlSpecificInfo.get() );
         if ( pSpecificInfo )
         {
-            // if we have an icon then lets set it for the command
+            // if we have an icon then let's set it for the command
             OUString sCommand;
             for (auto const& property : props)
             {

filter/source/xsltdialog/xmlfiltersettingsdialog.cxx

@@ -595,7 +595,7 @@ bool XMLFilterSettingsDialog::insertOrEdit( filter_info_impl* pNewInfo, const fi
 
         if( !bOk )
         {
-            // we failed to add the type, so lets remove the filter
+            // we failed to add the type, so let's remove the filter
             try
             {
                 mxFilterContainer->removeByName( pFilterEntry->maFilterName );
@@ -622,7 +622,7 @@ bool XMLFilterSettingsDialog::insertOrEdit( filter_info_impl* pNewInfo, const fi
 
             if( !bOk )
             {
-                // we failed to add the filter, so lets remove the type
+                // we failed to add the filter, so let's remove the type
                 try
                 {
                     mxTypeDetection->removeByName( pFilterEntry->maType );

filter/uiconfig/ui/pdflinkspage.ui

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.38.2 -->
+<!-- Generated with glade 3.40.0 -->
 <interface domain="flt">
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkBox" id="PdfLinksPage">
@@ -30,9 +30,9 @@
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="receives-default">False</property>
+                <property name="tooltip-text" translatable="yes" context="pdflinkspage|export|tooltip_text">Enable the checkbox to export bookmarks in your document as named destinations in the PDF document.</property>
                 <property name="use-underline">True</property>
                 <property name="draw-indicator">True</property>
-                <property name="tooltip_text" translatable="yes" context="pdflinkspage|export|tooltip_text">Enable the checkbox to export bookmarks in your document as named destinations in the PDF document.</property>
                 <child internal-child="accessible">
                   <object class="AtkObject" id="export-atkobject">
                     <property name="AtkObject::accessible-description" translatable="yes" context="pdflinkspage|extended_tip|export">Enable the checkbox to export bookmarks in your document as named destinations in the PDF document. The destinations correspond to the location of your bookmarks. Use these destinations to create URL links that point to these locations in the PDF document.</property>

filter/uiconfig/ui/pdfoptionsdialog.ui

@@ -1,33 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
+<!-- Generated with glade 3.40.0 -->
 <interface domain="flt">
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkDialog" id="PdfOptionsDialog">
-    <property name="can_focus">False</property>
-    <property name="border_width">6</property>
+    <property name="can-focus">False</property>
+    <property name="border-width">6</property>
     <property name="title" translatable="yes" context="pdfoptionsdialog|PdfOptionsDialog">PDF Options</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
-    <property name="default_width">0</property>
-    <property name="default_height">0</property>
-    <property name="type_hint">dialog</property>
-    <child>
-      <placeholder/>
-    </child>
+    <property name="default-width">0</property>
+    <property name="default-height">0</property>
+    <property name="type-hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">12</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="dialog-action_area1">
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
+            <property name="can-focus">False</property>
+            <property name="layout-style">end</property>
             <child>
               <object class="GtkButton" id="reset">
                 <property name="label" translatable="yes" context="stock">_Reset</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">True</property>
                 <property name="use-underline">True</property>
               </object>
               <packing>
@@ -40,11 +37,11 @@
               <object class="GtkButton" id="ok">
                 <property name="label" translatable="yes" context="pdfoptionsdialog|ok">E_xport</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="has_default">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_underline">True</property>
+                <property name="can-focus">True</property>
+                <property name="can-default">True</property>
+                <property name="has-default">True</property>
+                <property name="receives-default">True</property>
+                <property name="use-underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -56,8 +53,8 @@
               <object class="GtkButton" id="cancel">
                 <property name="label" translatable="yes" context="stock">_Cancel</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">True</property>
                 <property name="use-underline">True</property>
               </object>
               <packing>
@@ -70,8 +67,8 @@
               <object class="GtkButton" id="help">
                 <property name="label" translatable="yes" context="stock">_Help</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">True</property>
                 <property name="use-underline">True</property>
               </object>
               <packing>
@@ -85,47 +82,23 @@
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="pack_type">end</property>
+            <property name="pack-type">end</property>
             <property name="position">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkNotebook" id="tabcontrol">
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
+            <property name="can-focus">True</property>
             <property name="hexpand">True</property>
             <property name="vexpand">True</property>
             <property name="scrollable">True</property>
-            <property name="enable_popup">True</property>
+            <property name="enable-popup">True</property>
             <child>
               <!-- n-columns=1 n-rows=1 -->
               <object class="GtkGrid">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
+                <property name="can-focus">False</property>
                 <child>
                   <placeholder/>
                 </child>
@@ -134,42 +107,18 @@
             <child type="tab">
               <object class="GtkLabel" id="general">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="label" translatable="yes" context="pdfoptionsdialog|general">General</property>
               </object>
               <packing>
-                <property name="tab_fill">False</property>
+                <property name="tab-fill">False</property>
               </packing>
             </child>
             <child>
               <!-- n-columns=1 n-rows=1 -->
               <object class="GtkGrid">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
+                <property name="can-focus">False</property>
                 <child>
                   <placeholder/>
                 </child>
@@ -181,43 +130,19 @@
             <child type="tab">
               <object class="GtkLabel" id="initialview">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="label" translatable="yes" context="pdfoptionsdialog|initialview">Initial View</property>
               </object>
               <packing>
                 <property name="position">1</property>
-                <property name="tab_fill">False</property>
+                <property name="tab-fill">False</property>
               </packing>
             </child>
             <child>
               <!-- n-columns=1 n-rows=1 -->
               <object class="GtkGrid">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
+                <property name="can-focus">False</property>
                 <child>
                   <placeholder/>
                 </child>
@@ -229,43 +154,19 @@
             <child type="tab">
               <object class="GtkLabel" id="userinterface">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="label" translatable="yes" context="pdfoptionsdialog|userinterface">User Interface</property>
               </object>
               <packing>
                 <property name="position">2</property>
-                <property name="tab_fill">False</property>
+                <property name="tab-fill">False</property>
               </packing>
             </child>
             <child>
               <!-- n-columns=1 n-rows=1 -->
               <object class="GtkGrid">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
+                <property name="can-focus">False</property>
                 <child>
                   <placeholder/>
                 </child>
@@ -277,43 +178,19 @@
             <child type="tab">
               <object class="GtkLabel" id="links">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="label" translatable="yes" context="pdfoptionsdialog|links">Links</property>
               </object>
               <packing>
                 <property name="position">3</property>
-                <property name="tab_fill">False</property>
+                <property name="tab-fill">False</property>
               </packing>
             </child>
             <child>
               <!-- n-columns=1 n-rows=1 -->
               <object class="GtkGrid">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
+                <property name="can-focus">False</property>
                 <child>
                   <placeholder/>
                 </child>
@@ -325,43 +202,19 @@
             <child type="tab">
               <object class="GtkLabel" id="security">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="label" translatable="yes" context="pdfoptionsdialog|security">Security</property>
               </object>
               <packing>
                 <property name="position">4</property>
-                <property name="tab_fill">False</property>
+                <property name="tab-fill">False</property>
               </packing>
             </child>
             <child>
               <!-- n-columns=1 n-rows=1 -->
               <object class="GtkGrid">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
+                <property name="can-focus">False</property>
                 <child>
                   <placeholder/>
                 </child>
@@ -373,12 +226,12 @@
             <child type="tab">
               <object class="GtkLabel" id="digitalsignatures">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="label" translatable="yes" context="pdfoptionsdialog|digitalsignatures">Digital Signatures</property>
               </object>
               <packing>
                 <property name="position">5</property>
-                <property name="tab_fill">False</property>
+                <property name="tab-fill">False</property>
               </packing>
             </child>
           </object>

filter/uiconfig/ui/pdfsecuritypage.ui

@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.36.0 -->
+<!-- Generated with glade 3.40.0 -->
 <interface domain="flt">
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkBox" id="PdfSecurityPage">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <property name="hexpand">True</property>
     <property name="vexpand">True</property>
-    <property name="border_width">6</property>
+    <property name="border-width">6</property>
     <property name="spacing">12</property>
     <child>
       <object class="GtkFrame" id="frame2">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="label_xalign">0</property>
-        <property name="shadow_type">none</property>
+        <property name="can-focus">False</property>
+        <property name="label-xalign">0</property>
+        <property name="shadow-type">none</property>
         <child>
           <object class="GtkBox" id="box2">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="orientation">vertical</property>
-            <property name="spacing">12</property>
+            <property name="can-focus">False</property>
             <property name="margin-start">12</property>
             <property name="margin-top">6</property>
+            <property name="orientation">vertical</property>
+            <property name="spacing">12</property>
             <child>
               <object class="GtkButton" id="setpassword">
                 <property name="label" translatable="yes" context="pdfsecuritypage|setpassword">Set _Passwords…</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">True</property>
                 <property name="halign">start</property>
-                <property name="use_underline">True</property>
+                <property name="use-underline">True</property>
                 <child internal-child="accessible">
                   <object class="AtkObject" id="setpassword-atkobject">
                     <property name="AtkObject::accessible-description" translatable="yes" context="pdfsecuritypage|extended_tip|setpassword">Click to open a dialog where you enter the passwords.</property>
@@ -44,32 +44,32 @@
               </packing>
             </child>
             <child>
-              <!-- n-columns=1 n-rows=1 -->
+              <!-- n-columns=1 n-rows=2 -->
               <object class="GtkGrid" id="userpwdset">
-                <property name="can_focus">False</property>
-                <property name="no_show_all">True</property>
+                <property name="can-focus">False</property>
+                <property name="no-show-all">True</property>
                 <child>
                   <object class="GtkLabel" id="label5">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="label" translatable="yes" context="pdfsecuritypage|label5">Open password set</property>
                     <property name="xalign">0</property>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">0</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="label6">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="label" translatable="yes" context="pdfsecuritypage|label6">PDF document will be encrypted</property>
                     <property name="xalign">0</property>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">1</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">1</property>
                   </packing>
                 </child>
               </object>
@@ -80,32 +80,32 @@
               </packing>
             </child>
             <child>
-              <!-- n-columns=1 n-rows=1 -->
+              <!-- n-columns=1 n-rows=2 -->
               <object class="GtkGrid" id="userpwdunset">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <child>
                   <object class="GtkLabel" id="label7">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="label" translatable="yes" context="pdfsecuritypage|label7">No open password set</property>
                     <property name="xalign">0</property>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">0</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="label8">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="label" translatable="yes" context="pdfsecuritypage|label8">PDF document will not be encrypted</property>
                     <property name="xalign">0</property>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">1</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">1</property>
                   </packing>
                 </child>
               </object>
@@ -118,19 +118,19 @@
             <child>
               <!-- n-columns=1 n-rows=1 -->
               <object class="GtkGrid" id="userpwdpdfa">
-                <property name="can_focus">False</property>
-                <property name="no_show_all">True</property>
+                <property name="can-focus">False</property>
+                <property name="no-show-all">True</property>
                 <child>
                   <object class="GtkLabel" id="label30">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="label" translatable="yes" context="pdfsecuritypage|label30">PDF document will not be encrypted due to PDF/A export.</property>
                     <property name="wrap">True</property>
                     <property name="xalign">0</property>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">0</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">0</property>
                   </packing>
                 </child>
               </object>
@@ -141,32 +141,32 @@
               </packing>
             </child>
             <child>
-              <!-- n-columns=1 n-rows=1 -->
+              <!-- n-columns=1 n-rows=2 -->
               <object class="GtkGrid" id="ownerpwdset">
-                <property name="can_focus">False</property>
-                <property name="no_show_all">True</property>
+                <property name="can-focus">False</property>
+                <property name="no-show-all">True</property>
                 <child>
                   <object class="GtkLabel" id="label9">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="label" translatable="yes" context="pdfsecuritypage|label9">Permission password set</property>
                     <property name="xalign">0</property>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">0</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="label11">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="label" translatable="yes" context="pdfsecuritypage|label11">PDF document will be restricted</property>
                     <property name="xalign">0</property>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">1</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">1</property>
                   </packing>
                 </child>
               </object>
@@ -177,32 +177,32 @@
               </packing>
             </child>
             <child>
-              <!-- n-columns=1 n-rows=1 -->
+              <!-- n-columns=1 n-rows=2 -->
               <object class="GtkGrid" id="ownerpwdunset">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <child>
                   <object class="GtkLabel" id="label12">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="label" translatable="yes" context="pdfsecuritypage|label12">No permission password set</property>
                     <property name="xalign">0</property>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">0</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="label13">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="label" translatable="yes" context="pdfsecuritypage|label13">PDF document will be unrestricted</property>
                     <property name="xalign">0</property>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">1</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">1</property>
                   </packing>
                 </child>
               </object>
@@ -215,19 +215,19 @@
             <child>
               <!-- n-columns=1 n-rows=1 -->
               <object class="GtkGrid" id="ownerpwdpdfa">
-                <property name="can_focus">False</property>
-                <property name="no_show_all">True</property>
+                <property name="can-focus">False</property>
+                <property name="no-show-all">True</property>
                 <child>
                   <object class="GtkLabel" id="label14">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="label" translatable="yes" context="pdfsecuritypage|label14">PDF document will not be restricted due to PDF/A export.</property>
                     <property name="wrap">True</property>
                     <property name="xalign">0</property>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">0</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">0</property>
                   </packing>
                 </child>
               </object>
@@ -239,8 +239,8 @@
             </child>
             <child>
               <object class="GtkLabel" id="setpasswordstitle">
-                <property name="can_focus">False</property>
-                <property name="no_show_all">True</property>
+                <property name="can-focus">False</property>
+                <property name="no-show-all">True</property>
                 <property name="label" translatable="yes" context="pdfsecuritypage|setpasswordstitle">Set Passwords</property>
                 <property name="xalign">0</property>
               </object>
@@ -255,7 +255,7 @@
         <child type="label">
           <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <property name="label" translatable="yes" context="pdfsecuritypage|label2">File Encryption and Permission</property>
             <attributes>
               <attribute name="weight" value="bold"/>
@@ -272,31 +272,31 @@
     <child>
       <object class="GtkBox" id="box1">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">12</property>
         <child>
           <object class="GtkFrame" id="printing">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label_xalign">0</property>
-            <property name="shadow_type">none</property>
+            <property name="can-focus">False</property>
+            <property name="label-xalign">0</property>
+            <property name="shadow-type">none</property>
             <child>
-              <!-- n-columns=1 n-rows=1 -->
+              <!-- n-columns=1 n-rows=3 -->
               <object class="GtkGrid" id="grid7">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="row_spacing">6</property>
+                <property name="can-focus">False</property>
                 <property name="margin-start">12</property>
                 <property name="margin-top">6</property>
+                <property name="row-spacing">6</property>
                 <child>
                   <object class="GtkRadioButton" id="printnone">
                     <property name="label" translatable="yes" context="pdfsecuritypage|printnone">_Not permitted</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="use_underline">True</property>
-                    <property name="draw_indicator">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">False</property>
+                    <property name="use-underline">True</property>
+                    <property name="draw-indicator">True</property>
                     <property name="group">printhigh</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="printnone-atkobject">
@@ -305,18 +305,18 @@
                     </child>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">0</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="printlow">
                     <property name="label" translatable="yes" context="pdfsecuritypage|printlow">_Low resolution (150 dpi)</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="use_underline">True</property>
-                    <property name="draw_indicator">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">False</property>
+                    <property name="use-underline">True</property>
+                    <property name="draw-indicator">True</property>
                     <property name="group">printhigh</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="printlow-atkobject">
@@ -325,19 +325,19 @@
                     </child>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">1</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="printhigh">
                     <property name="label" translatable="yes" context="pdfsecuritypage|printhigh">_High resolution</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="use_underline">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">False</property>
+                    <property name="use-underline">True</property>
                     <property name="active">True</property>
-                    <property name="draw_indicator">True</property>
+                    <property name="draw-indicator">True</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="printhigh-atkobject">
                         <property name="AtkObject::accessible-description" translatable="yes" context="pdfsecuritypage|extended_tip|printhigh">The document can be printed in high resolution.</property>
@@ -345,8 +345,8 @@
                     </child>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">2</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">2</property>
                   </packing>
                 </child>
               </object>
@@ -354,7 +354,7 @@
             <child type="label">
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="label" translatable="yes" context="pdfsecuritypage|label1">Printing</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
@@ -371,25 +371,25 @@
         <child>
           <object class="GtkFrame" id="changes">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label_xalign">0</property>
-            <property name="shadow_type">none</property>
+            <property name="can-focus">False</property>
+            <property name="label-xalign">0</property>
+            <property name="shadow-type">none</property>
             <child>
-              <!-- n-columns=1 n-rows=1 -->
+              <!-- n-columns=1 n-rows=5 -->
               <object class="GtkGrid" id="grid8">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="row_spacing">6</property>
+                <property name="can-focus">False</property>
                 <property name="margin-start">12</property>
                 <property name="margin-top">6</property>
+                <property name="row-spacing">6</property>
                 <child>
                   <object class="GtkRadioButton" id="changenone">
                     <property name="label" translatable="yes" context="pdfsecuritypage|changenone">No_t permitted</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="use_underline">True</property>
-                    <property name="draw_indicator">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">False</property>
+                    <property name="use-underline">True</property>
+                    <property name="draw-indicator">True</property>
                     <property name="group">changeany</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="changenone-atkobject">
@@ -398,18 +398,18 @@
                     </child>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">0</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="changeinsdel">
                     <property name="label" translatable="yes" context="pdfsecuritypage|changeinsdel">_Inserting, deleting, and rotating pages</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="use_underline">True</property>
-                    <property name="draw_indicator">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">False</property>
+                    <property name="use-underline">True</property>
+                    <property name="draw-indicator">True</property>
                     <property name="group">changeany</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="changeinsdel-atkobject">
@@ -418,18 +418,18 @@
                     </child>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">1</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="changeform">
                     <property name="label" translatable="yes" context="pdfsecuritypage|changeform">_Filling in form fields</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="use_underline">True</property>
-                    <property name="draw_indicator">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">False</property>
+                    <property name="use-underline">True</property>
+                    <property name="draw-indicator">True</property>
                     <property name="group">changeany</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="changeform-atkobject">
@@ -438,18 +438,18 @@
                     </child>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">2</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">2</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="changecomment">
                     <property name="label" translatable="yes" context="pdfsecuritypage|changecomment">_Commenting, filling in form fields</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="use_underline">True</property>
-                    <property name="draw_indicator">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">False</property>
+                    <property name="use-underline">True</property>
+                    <property name="draw-indicator">True</property>
                     <property name="group">changeany</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="changecomment-atkobject">
@@ -458,19 +458,19 @@
                     </child>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">3</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">3</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="changeany">
                     <property name="label" translatable="yes" context="pdfsecuritypage|changeany">_Any except extracting pages</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="use_underline">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">False</property>
+                    <property name="use-underline">True</property>
                     <property name="active">True</property>
-                    <property name="draw_indicator">True</property>
+                    <property name="draw-indicator">True</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="changeany-atkobject">
                         <property name="AtkObject::accessible-description" translatable="yes" context="pdfsecuritypage|extended_tip|changeany">All changes are permitted, except extracting pages.</property>
@@ -478,8 +478,8 @@
                     </child>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">4</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">4</property>
                   </packing>
                 </child>
               </object>
@@ -487,7 +487,7 @@
             <child type="label">
               <object class="GtkLabel" id="label3">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="label" translatable="yes" context="pdfsecuritypage|label3">Changes</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
@@ -504,26 +504,26 @@
         <child>
           <object class="GtkFrame" id="content">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label_xalign">0</property>
-            <property name="shadow_type">none</property>
+            <property name="can-focus">False</property>
+            <property name="label-xalign">0</property>
+            <property name="shadow-type">none</property>
             <child>
-              <!-- n-columns=1 n-rows=1 -->
+              <!-- n-columns=1 n-rows=2 -->
               <object class="GtkGrid" id="grid9">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="row_spacing">6</property>
+                <property name="can-focus">False</property>
                 <property name="margin-start">12</property>
                 <property name="margin-top">6</property>
+                <property name="row-spacing">6</property>
                 <child>
                   <object class="GtkCheckButton" id="enablecopy">
                     <property name="label" translatable="yes" context="pdfsecuritypage|enablecopy">Ena_ble copying of content</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="use_underline">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">False</property>
+                    <property name="use-underline">True</property>
                     <property name="active">True</property>
-                    <property name="draw_indicator">True</property>
+                    <property name="draw-indicator">True</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="enablecopy-atkobject">
                         <property name="AtkObject::accessible-description" translatable="yes" context="pdfsecuritypage|extended_tip|enablecopy">Select to enable copying of content to the clipboard.</property>
@@ -531,19 +531,19 @@
                     </child>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">0</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="enablea11y">
                     <property name="label" translatable="yes" context="pdfsecuritypage|enablea11y">Enable text access for acce_ssibility tools</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="use_underline">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">False</property>
+                    <property name="use-underline">True</property>
                     <property name="active">True</property>
-                    <property name="draw_indicator">True</property>
+                    <property name="draw-indicator">True</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="enablea11y-atkobject">
                         <property name="AtkObject::accessible-description" translatable="yes" context="pdfsecuritypage|extended_tip|enablea11y">Select to enable text access for accessibility tools.</property>
@@ -551,8 +551,8 @@
                     </child>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">1</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">1</property>
                   </packing>
                 </child>
               </object>
@@ -560,7 +560,7 @@
             <child type="label">
               <object class="GtkLabel" id="label4">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="label" translatable="yes" context="pdfsecuritypage|label4">Content</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>

filter/uiconfig/ui/pdfuserinterfacepage.ui

@@ -1,51 +1,51 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.36.0 -->
+<!-- Generated with glade 3.40.0 -->
 <interface domain="flt">
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">1</property>
     <property name="upper">10</property>
     <property name="value">1</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
+    <property name="step-increment">1</property>
+    <property name="page-increment">10</property>
   </object>
   <object class="GtkBox" id="PdfUserInterfacePage">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <property name="hexpand">True</property>
     <property name="vexpand">True</property>
-    <property name="border_width">6</property>
+    <property name="border-width">6</property>
     <property name="orientation">vertical</property>
     <property name="spacing">6</property>
     <child>
-      <!-- n-columns=1 n-rows=1 -->
+      <!-- n-columns=2 n-rows=2 -->
       <object class="GtkGrid" id="grid1">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="row_spacing">12</property>
-        <property name="column_spacing">12</property>
+        <property name="can-focus">False</property>
+        <property name="row-spacing">12</property>
+        <property name="column-spacing">12</property>
         <child>
           <object class="GtkFrame" id="frame1">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label_xalign">0</property>
-            <property name="shadow_type">none</property>
+            <property name="can-focus">False</property>
+            <property name="label-xalign">0</property>
+            <property name="shadow-type">none</property>
             <child>
-              <!-- n-columns=1 n-rows=1 -->
+              <!-- n-columns=1 n-rows=4 -->
               <object class="GtkGrid" id="grid3">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="row_spacing">6</property>
+                <property name="can-focus">False</property>
                 <property name="margin-start">12</property>
                 <property name="margin-top">6</property>
+                <property name="row-spacing">6</property>
                 <child>
                   <object class="GtkCheckButton" id="center">
                     <property name="label" translatable="yes" context="pdfuserinterfacepage|center">_Center window on screen</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="use_underline">True</property>
-                    <property name="draw_indicator">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">False</property>
+                    <property name="use-underline">True</property>
+                    <property name="draw-indicator">True</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="center-atkobject">
                         <property name="AtkObject::accessible-description" translatable="yes" context="pdfuserinterfacepage|extended_tip|center">Select to generate a PDF file that is shown in a reader window centered on screen.</property>
@@ -53,18 +53,18 @@
                     </child>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">1</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="resize">
                     <property name="label" translatable="yes" context="pdfuserinterfacepage|resize">_Resize window to initial page</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="use_underline">True</property>
-                    <property name="draw_indicator">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">False</property>
+                    <property name="use-underline">True</property>
+                    <property name="draw-indicator">True</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="resize-atkobject">
                         <property name="AtkObject::accessible-description" translatable="yes" context="pdfuserinterfacepage|extended_tip|resize">Select to generate a PDF file that is shown in a window displaying the whole initial page.</property>
@@ -72,18 +72,18 @@
                     </child>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">0</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="open">
                     <property name="label" translatable="yes" context="pdfuserinterfacepage|open">_Open in full screen mode</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="use_underline">True</property>
-                    <property name="draw_indicator">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">False</property>
+                    <property name="use-underline">True</property>
+                    <property name="draw-indicator">True</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="open-atkobject">
                         <property name="AtkObject::accessible-description" translatable="yes" context="pdfuserinterfacepage|extended_tip|open">Select to generate a PDF file that is shown in a full screen reader window in front of all other windows.</property>
@@ -91,18 +91,18 @@
                     </child>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">2</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">2</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="display">
                     <property name="label" translatable="yes" context="pdfuserinterfacepage|display">_Display document title</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="use_underline">True</property>
-                    <property name="draw_indicator">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">False</property>
+                    <property name="use-underline">True</property>
+                    <property name="draw-indicator">True</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="display-atkobject">
                         <property name="AtkObject::accessible-description" translatable="yes" context="pdfuserinterfacepage|extended_tip|display">Select to generate a PDF file that is shown with the document title in the reader's title bar.</property>
@@ -110,8 +110,8 @@
                     </child>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">3</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">3</property>
                   </packing>
                 </child>
               </object>
@@ -119,7 +119,7 @@
             <child type="label">
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="label" translatable="yes" context="pdfuserinterfacepage|label1">Window Options</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
@@ -128,32 +128,32 @@
             </child>
           </object>
           <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
+            <property name="left-attach">0</property>
+            <property name="top-attach">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkFrame" id="frame2">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label_xalign">0</property>
-            <property name="shadow_type">none</property>
+            <property name="can-focus">False</property>
+            <property name="label-xalign">0</property>
+            <property name="shadow-type">none</property>
             <child>
-              <!-- n-columns=1 n-rows=1 -->
+              <!-- n-columns=1 n-rows=3 -->
               <object class="GtkGrid" id="grid4">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="row_spacing">6</property>
+                <property name="can-focus">False</property>
                 <property name="margin-start">12</property>
                 <property name="margin-top">6</property>
+                <property name="row-spacing">6</property>
                 <child>
                   <object class="GtkCheckButton" id="toolbar">
                     <property name="label" translatable="yes" context="pdfuserinterfacepage|toolbar">Hide _toolbar</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="use_underline">True</property>
-                    <property name="draw_indicator">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">False</property>
+                    <property name="use-underline">True</property>
+                    <property name="draw-indicator">True</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="toolbar-atkobject">
                         <property name="AtkObject::accessible-description" translatable="yes" context="pdfuserinterfacepage|extended_tip|toolbar">Select to hide the reader's toolbar when the document is active.</property>
@@ -161,18 +161,18 @@
                     </child>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">1</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="menubar">
                     <property name="label" translatable="yes" context="pdfuserinterfacepage|menubar">Hide _menubar</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="use_underline">True</property>
-                    <property name="draw_indicator">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">False</property>
+                    <property name="use-underline">True</property>
+                    <property name="draw-indicator">True</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="menubar-atkobject">
                         <property name="AtkObject::accessible-description" translatable="yes" context="pdfuserinterfacepage|extended_tip|menubar">Select to hide the reader's menu bar when the document is active.</property>
@@ -180,18 +180,18 @@
                     </child>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">0</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="window">
                     <property name="label" translatable="yes" context="pdfuserinterfacepage|window">Hide _window controls</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="use_underline">True</property>
-                    <property name="draw_indicator">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">False</property>
+                    <property name="use-underline">True</property>
+                    <property name="draw-indicator">True</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="window-atkobject">
                         <property name="AtkObject::accessible-description" translatable="yes" context="pdfuserinterfacepage|extended_tip|window">Select to hide the reader's controls when the document is active.</property>
@@ -199,8 +199,8 @@
                     </child>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">2</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">2</property>
                   </packing>
                 </child>
               </object>
@@ -208,7 +208,7 @@
             <child type="label">
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="label" translatable="yes" context="pdfuserinterfacepage|label2">User Interface Options</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
@@ -217,31 +217,31 @@
             </child>
           </object>
           <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
+            <property name="left-attach">1</property>
+            <property name="top-attach">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkFrame" id="frame3">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label_xalign">0</property>
-            <property name="shadow_type">none</property>
+            <property name="can-focus">False</property>
+            <property name="label-xalign">0</property>
+            <property name="shadow-type">none</property>
             <child>
               <!-- n-columns=1 n-rows=1 -->
               <object class="GtkGrid" id="grid6">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="margin-start">12</property>
                 <property name="margin-top">6</property>
                 <child>
                   <object class="GtkCheckButton" id="effects">
                     <property name="label" translatable="yes" context="pdfuserinterfacepage|effects">_Use transition effects</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="use_underline">True</property>
-                    <property name="draw_indicator">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">False</property>
+                    <property name="use-underline">True</property>
+                    <property name="draw-indicator">True</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="effects-atkobject">
                         <property name="AtkObject::accessible-description" translatable="yes" context="pdfuserinterfacepage|extended_tip|effects">Select to export Impress slide transition effects to respective PDF effects.</property>
@@ -249,8 +249,8 @@
                     </child>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">0</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">0</property>
                   </packing>
                 </child>
               </object>
@@ -258,7 +258,7 @@
             <child type="label">
               <object class="GtkLabel" id="label3">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="label" translatable="yes" context="pdfuserinterfacepage|label3">Transitions</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
@@ -267,34 +267,34 @@
             </child>
           </object>
           <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
+            <property name="left-attach">0</property>
+            <property name="top-attach">1</property>
           </packing>
         </child>
         <child>
           <object class="GtkFrame" id="frame4">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label_xalign">0</property>
-            <property name="shadow_type">none</property>
+            <property name="can-focus">False</property>
+            <property name="label-xalign">0</property>
+            <property name="shadow-type">none</property>
             <child>
-              <!-- n-columns=1 n-rows=1 -->
+              <!-- n-columns=2 n-rows=2 -->
               <object class="GtkGrid" id="grid5">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="row_spacing">6</property>
-                <property name="column_spacing">12</property>
+                <property name="can-focus">False</property>
                 <property name="margin-start">12</property>
                 <property name="margin-top">6</property>
+                <property name="row-spacing">6</property>
+                <property name="column-spacing">12</property>
                 <child>
                   <object class="GtkRadioButton" id="allbookmarks">
                     <property name="label" translatable="yes" context="pdfuserinterfacepage|allbookmarks">Show _All</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="use_underline">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">False</property>
+                    <property name="use-underline">True</property>
                     <property name="active">True</property>
-                    <property name="draw_indicator">True</property>
+                    <property name="draw-indicator">True</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="allbookmarks-atkobject">
                         <property name="AtkObject::accessible-description" translatable="yes" context="pdfuserinterfacepage|extended_tip|allbookmarks">Select to show all bookmark levels when the reader opens the PDF file.</property>
@@ -302,18 +302,18 @@
                     </child>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">0</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="visiblebookmark">
                     <property name="label" translatable="yes" context="pdfuserinterfacepage|visiblebookmark">_Visible levels:</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="use_underline">True</property>
-                    <property name="draw_indicator">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">False</property>
+                    <property name="use-underline">True</property>
+                    <property name="draw-indicator">True</property>
                     <property name="group">allbookmarks</property>
                     <accessibility>
                       <relation type="label-for" target="visiblelevel"/>
@@ -325,19 +325,19 @@
                     </child>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">1</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkSpinButton" id="visiblelevel">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="truncate-multiline">True</property>
                     <property name="adjustment">adjustment1</property>
                     <accessibility>
                       <relation type="labelled-by" target="visiblebookmark"/>
                     </accessibility>
-                    <property name="truncate-multiline">True</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="visiblelevel-atkobject">
                         <property name="AtkObject::accessible-description" translatable="yes" context="pdfuserinterfacepage|extended_tip|visiblelevel">Select to show bookmark levels down to the selected level when the reader opens the PDF file.</property>
@@ -345,8 +345,8 @@
                     </child>
                   </object>
                   <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">1</property>
+                    <property name="left-attach">1</property>
+                    <property name="top-attach">1</property>
                   </packing>
                 </child>
                 <child>
@@ -357,7 +357,7 @@
             <child type="label">
               <object class="GtkLabel" id="label4">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="label" translatable="yes" context="pdfuserinterfacepage|label4">Collapse Outlines</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
@@ -366,8 +366,8 @@
             </child>
           </object>
           <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
+            <property name="left-attach">1</property>
+            <property name="top-attach">1</property>
           </packing>
         </child>
       </object>

filter/uiconfig/ui/testxmlfilter.ui

@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.36.0 -->
+<!-- Generated with glade 3.40.0 -->
 <interface domain="flt">
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkDialog" id="TestXMLFilterDialog">
-    <property name="can_focus">False</property>
-    <property name="border_width">6</property>
+    <property name="can-focus">False</property>
+    <property name="border-width">6</property>
     <property name="title" translatable="yes" context="testxmlfilter|TestXMLFilterDialog">Test XML Filter: %s</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
-    <property name="default_width">0</property>
-    <property name="default_height">0</property>
-    <property name="type_hint">dialog</property>
+    <property name="default-width">0</property>
+    <property name="default-height">0</property>
+    <property name="type-hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">12</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="dialog-action_area1">
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
+            <property name="can-focus">False</property>
+            <property name="layout-style">end</property>
             <child>
               <object class="GtkButton" id="close">
                 <property name="label" translatable="yes" context="stock">_Close</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="has_default">True</property>
-                <property name="receives_default">True</property>
+                <property name="can-focus">True</property>
+                <property name="can-default">True</property>
+                <property name="has-default">True</property>
+                <property name="receives-default">True</property>
                 <property name="use-underline">True</property>
               </object>
               <packing>
@@ -40,8 +40,8 @@
               <object class="GtkButton" id="help">
                 <property name="label" translatable="yes" context="stock">_Help</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">True</property>
                 <property name="use-underline">True</property>
               </object>
               <packing>
@@ -55,63 +55,63 @@
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="pack_type">end</property>
+            <property name="pack-type">end</property>
             <property name="position">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkBox" id="box1">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <property name="orientation">vertical</property>
             <property name="spacing">12</property>
             <child>
               <object class="GtkFrame" id="export">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label_xalign">0</property>
-                <property name="shadow_type">none</property>
+                <property name="can-focus">False</property>
+                <property name="label-xalign">0</property>
+                <property name="shadow-type">none</property>
                 <child>
-                  <!-- n-columns=1 n-rows=1 -->
+                  <!-- n-columns=2 n-rows=4 -->
                   <object class="GtkGrid" id="grid1">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="row_spacing">6</property>
-                    <property name="column_spacing">12</property>
+                    <property name="can-focus">False</property>
                     <property name="margin-start">12</property>
                     <property name="margin-top">6</property>
+                    <property name="row-spacing">6</property>
+                    <property name="column-spacing">12</property>
                     <child>
                       <object class="GtkLabel" id="label3">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="hexpand">True</property>
                         <property name="label" translatable="yes" context="testxmlfilter|label3">XSLT for export</property>
                         <property name="xalign">0</property>
                       </object>
                       <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">0</property>
+                        <property name="left-attach">0</property>
+                        <property name="top-attach">0</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="label4">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="hexpand">True</property>
                         <property name="label" translatable="yes" context="testxmlfilter|label4">Transform document</property>
                         <property name="xalign">0</property>
                       </object>
                       <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">1</property>
+                        <property name="left-attach">0</property>
+                        <property name="top-attach">1</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkButton" id="exportbrowse">
                         <property name="label" translatable="yes" context="testxmlfilter|exportbrowse">Browse...</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
+                        <property name="can-focus">True</property>
+                        <property name="receives-default">True</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="exportbrowse-atkobject">
                             <property name="AtkObject::accessible-description" translatable="yes" context="testxmlfilter|extended_tip|exportbrowse">Locate the file that you want to apply the XML export filter to. The XML code of the transformed file is opened in your default XML editor after transformation.</property>
@@ -119,16 +119,16 @@
                         </child>
                       </object>
                       <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">1</property>
+                        <property name="left-attach">1</property>
+                        <property name="top-attach">1</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkButton" id="currentdocument">
                         <property name="label" translatable="yes" context="testxmlfilter|currentdocument">Current Document</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
+                        <property name="can-focus">True</property>
+                        <property name="receives-default">True</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="currentdocument-atkobject">
                             <property name="AtkObject::accessible-description" translatable="yes" context="testxmlfilter|extended_tip|currentdocument">The front-most open file that matches the XML filter criteria will be used to test the filter. The current XML export filter transforms the file and the resulting XML code is displayed in the XML Filter output window.</property>
@@ -136,14 +136,14 @@
                         </child>
                       </object>
                       <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">2</property>
+                        <property name="left-attach">1</property>
+                        <property name="top-attach">2</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="exportxsltfile">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="xalign">0</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="exportxsltfile-atkobject">
@@ -152,15 +152,15 @@
                         </child>
                       </object>
                       <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">0</property>
+                        <property name="left-attach">1</property>
+                        <property name="top-attach">0</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="currentfilename">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="width_chars">52</property>
+                        <property name="can-focus">False</property>
+                        <property name="width-chars">52</property>
                         <property name="xalign">1</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="currentfilename-atkobject">
@@ -169,8 +169,8 @@
                         </child>
                       </object>
                       <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">3</property>
+                        <property name="left-attach">0</property>
+                        <property name="top-attach">3</property>
                         <property name="width">2</property>
                       </packing>
                     </child>
@@ -182,7 +182,7 @@
                 <child type="label">
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="label" translatable="yes" context="testxmlfilter|label1">Export</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
@@ -199,37 +199,37 @@
             <child>
               <object class="GtkFrame" id="import">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label_xalign">0</property>
-                <property name="shadow_type">none</property>
+                <property name="can-focus">False</property>
+                <property name="label-xalign">0</property>
+                <property name="shadow-type">none</property>
                 <child>
-                  <!-- n-columns=1 n-rows=1 -->
+                  <!-- n-columns=2 n-rows=6 -->
                   <object class="GtkGrid" id="grid2">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="row_spacing">6</property>
-                    <property name="column_spacing">12</property>
+                    <property name="can-focus">False</property>
                     <property name="margin-start">12</property>
                     <property name="margin-top">6</property>
+                    <property name="row-spacing">6</property>
+                    <property name="column-spacing">12</property>
                     <child>
                       <object class="GtkLabel" id="label5">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="hexpand">True</property>
                         <property name="label" translatable="yes" context="testxmlfilter|label5">XSLT for import</property>
                         <property name="xalign">0</property>
                       </object>
                       <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">0</property>
+                        <property name="left-attach">0</property>
+                        <property name="top-attach">0</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkButton" id="importbrowse">
                         <property name="label" translatable="yes" context="testxmlfilter|importbrowse">Browse...</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
+                        <property name="can-focus">True</property>
+                        <property name="receives-default">True</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="importbrowse-atkobject">
                             <property name="AtkObject::accessible-description" translatable="yes" context="testxmlfilter|extended_tip|importbrowse">Opens a file selection dialog. The selected file is opened using the current XML import filter.</property>
@@ -237,16 +237,16 @@
                         </child>
                       </object>
                       <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">3</property>
+                        <property name="left-attach">1</property>
+                        <property name="top-attach">3</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkButton" id="recentfile">
                         <property name="label" translatable="yes" context="testxmlfilter|recentfile">Recent File</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
+                        <property name="can-focus">True</property>
+                        <property name="receives-default">True</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="recentfile-atkobject">
                             <property name="AtkObject::accessible-description" translatable="yes" context="testxmlfilter|extended_tip|recentfile">Re-opens the document that was last opened with this dialog.</property>
@@ -254,27 +254,27 @@
                         </child>
                       </object>
                       <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">4</property>
+                        <property name="left-attach">1</property>
+                        <property name="top-attach">4</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="templateimport">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="hexpand">True</property>
                         <property name="label" translatable="yes" context="testxmlfilter|templateimport">Template for import</property>
                         <property name="xalign">0</property>
                       </object>
                       <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">1</property>
+                        <property name="left-attach">0</property>
+                        <property name="top-attach">1</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="importxsltfile">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="xalign">0</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="importxsltfile-atkobject">
@@ -283,18 +283,18 @@
                         </child>
                       </object>
                       <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">0</property>
+                        <property name="left-attach">1</property>
+                        <property name="top-attach">0</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="displaysource">
                         <property name="label" translatable="yes" context="testxmlfilter|displaysource">Display source</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="draw_indicator">True</property>
+                        <property name="can-focus">True</property>
+                        <property name="receives-default">False</property>
+                        <property name="use-underline">True</property>
+                        <property name="draw-indicator">True</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="displaysource-atkobject">
                             <property name="AtkObject::accessible-description" translatable="yes" context="testxmlfilter|extended_tip|displaysource">Opens the XML source of the selected document in your default XML editor after importing.</property>
@@ -302,27 +302,27 @@
                         </child>
                       </object>
                       <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">2</property>
+                        <property name="left-attach">1</property>
+                        <property name="top-attach">2</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="label6">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="hexpand">True</property>
                         <property name="label" translatable="yes" context="testxmlfilter|label6">Transform file</property>
                         <property name="xalign">0</property>
                       </object>
                       <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">2</property>
+                        <property name="left-attach">0</property>
+                        <property name="top-attach">2</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="importxslttemplate">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="xalign">0</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="importxslttemplate-atkobject">
@@ -331,15 +331,15 @@
                         </child>
                       </object>
                       <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">1</property>
+                        <property name="left-attach">1</property>
+                        <property name="top-attach">1</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="recentfilename">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="width_chars">52</property>
+                        <property name="can-focus">False</property>
+                        <property name="width-chars">52</property>
                         <property name="xalign">1</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="recentfilename-atkobject">
@@ -348,8 +348,8 @@
                         </child>
                       </object>
                       <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">5</property>
+                        <property name="left-attach">0</property>
+                        <property name="top-attach">5</property>
                         <property name="width">2</property>
                       </packing>
                     </child>
@@ -364,7 +364,7 @@
                 <child type="label">
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="label" translatable="yes" context="testxmlfilter|label2">Import</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
@@ -391,9 +391,6 @@
       <action-widget response="-7">close</action-widget>
       <action-widget response="-11">help</action-widget>
     </action-widgets>
-    <child type="titlebar">
-      <placeholder/>
-    </child>
     <child internal-child="accessible">
       <object class="AtkObject" id="TestXMLFilterDialog-atkobject">
         <property name="AtkObject::accessible-description" translatable="yes" context="testxmlfilter|extended_tip|TestXMLFilterDialog">Tests the XSLT stylesheets used by the selected XML filter.</property>

filter/uiconfig/ui/xmlfiltersettings.ui

@@ -291,4 +291,4 @@
       </object>
     </child>
   </object>
-</interface>
+</interface>

filter/uiconfig/ui/xmlfiltertabpagetransformation.ui

@@ -1,43 +1,43 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.36.0 -->
+<!-- Generated with glade 3.40.0 -->
 <interface domain="flt">
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkBox" id="XmlFilterTabPageTransformation">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="border_width">6</property>
+    <property name="can-focus">False</property>
+    <property name="border-width">6</property>
     <property name="orientation">vertical</property>
     <property name="spacing">12</property>
     <child>
-      <!-- n-columns=1 n-rows=1 -->
+      <!-- n-columns=3 n-rows=4 -->
       <object class="GtkGrid" id="grid1">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="hexpand">True</property>
         <property name="vexpand">True</property>
-        <property name="row_spacing">6</property>
-        <property name="column_spacing">12</property>
+        <property name="row-spacing">6</property>
+        <property name="column-spacing">12</property>
         <child>
           <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <property name="label" translatable="yes" context="xmlfiltertabpagetransformation|label2">_DocType:</property>
-            <property name="use_underline">True</property>
-            <property name="mnemonic_widget">doc</property>
+            <property name="use-underline">True</property>
+            <property name="mnemonic-widget">doc</property>
             <property name="xalign">1</property>
           </object>
           <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
+            <property name="left-attach">0</property>
+            <property name="top-attach">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkEntry" id="doc">
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
+            <property name="can-focus">True</property>
             <property name="hexpand">True</property>
-            <property name="activates_default">True</property>
-            <property name="width_chars">32</property>
+            <property name="activates-default">True</property>
+            <property name="width-chars">32</property>
             <property name="truncate-multiline">True</property>
             <child internal-child="accessible">
               <object class="AtkObject" id="doc-atkobject">
@@ -46,31 +46,31 @@
             </child>
           </object>
           <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
+            <property name="left-attach">1</property>
+            <property name="top-attach">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label4">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <property name="label" translatable="yes" context="xmlfiltertabpagetransformation|label4">_XSLT for export:</property>
-            <property name="use_underline">True</property>
-            <property name="mnemonic_widget">xsltexport</property>
+            <property name="use-underline">True</property>
+            <property name="mnemonic-widget">xsltexport</property>
             <property name="xalign">1</property>
           </object>
           <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
+            <property name="left-attach">0</property>
+            <property name="top-attach">1</property>
           </packing>
         </child>
         <child>
           <object class="GtkButton" id="browseexport">
             <property name="label" translatable="yes" context="xmlfiltertabpagetransformation|browseexport">Brows_e...</property>
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="use_underline">True</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">True</property>
+            <property name="use-underline">True</property>
             <child internal-child="accessible">
               <object class="AtkObject" id="browseexport-atkobject">
                 <property name="AtkObject::accessible-description" translatable="yes" context="xmlfiltertabpagetransformation|extended_tip|browseexport">Opens a file selection dialog.</property>
@@ -78,31 +78,31 @@
             </child>
           </object>
           <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">1</property>
+            <property name="left-attach">2</property>
+            <property name="top-attach">1</property>
           </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label5">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <property name="label" translatable="yes" context="xmlfiltertabpagetransformation|label5">XSLT _for import:</property>
-            <property name="use_underline">True</property>
-            <property name="mnemonic_widget">xsltimport</property>
+            <property name="use-underline">True</property>
+            <property name="mnemonic-widget">xsltimport</property>
             <property name="xalign">1</property>
           </object>
           <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
+            <property name="left-attach">0</property>
+            <property name="top-attach">2</property>
           </packing>
         </child>
         <child>
           <object class="GtkButton" id="browseimport">
             <property name="label" translatable="yes" context="xmlfiltertabpagetransformation|browseimport">B_rowse...</property>
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="use_underline">True</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">True</property>
+            <property name="use-underline">True</property>
             <child internal-child="accessible">
               <object class="AtkObject" id="browseimport-atkobject">
                 <property name="AtkObject::accessible-description" translatable="yes" context="xmlfiltertabpagetransformation|extended_tip|browseimport">Opens a file selection dialog.</property>
@@ -110,30 +110,30 @@
             </child>
           </object>
           <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">2</property>
+            <property name="left-attach">2</property>
+            <property name="top-attach">2</property>
           </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label6">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <property name="label" translatable="yes" context="xmlfiltertabpagetransformation|label6">Template for _import:</property>
-            <property name="use_underline">True</property>
-            <property name="mnemonic_widget">tempimport</property>
+            <property name="use-underline">True</property>
+            <property name="mnemonic-widget">tempimport</property>
             <property name="xalign">1</property>
           </object>
           <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">3</property>
+            <property name="left-attach">0</property>
+            <property name="top-attach">3</property>
           </packing>
         </child>
         <child>
           <object class="GtkButton" id="browsetemp">
             <property name="label" translatable="yes" context="xmlfiltertabpagetransformation|browsetemp">Browse...</property>
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">True</property>
             <child internal-child="accessible">
               <object class="AtkObject" id="browsetemp-atkobject">
                 <property name="AtkObject::accessible-description" translatable="yes" context="xmlfiltertabpagetransformation|extended_tip|browsetemp">Opens a file selection dialog.</property>
@@ -141,20 +141,20 @@
             </child>
           </object>
           <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">3</property>
+            <property name="left-attach">2</property>
+            <property name="top-attach">3</property>
           </packing>
         </child>
         <child>
           <object class="GtkComboBoxText" id="xsltexport">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <property name="hexpand">True</property>
-            <property name="has_entry">True</property>
+            <property name="has-entry">True</property>
             <child internal-child="entry">
               <object class="GtkEntry">
+                <property name="can-focus">True</property>
                 <property name="truncate-multiline">True</property>
-                <property name="can_focus">True</property>
               </object>
             </child>
             <child internal-child="accessible">
@@ -164,20 +164,20 @@
             </child>
           </object>
           <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
+            <property name="left-attach">1</property>
+            <property name="top-attach">1</property>
           </packing>
         </child>
         <child>
           <object class="GtkComboBoxText" id="xsltimport">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <property name="hexpand">True</property>
-            <property name="has_entry">True</property>
+            <property name="has-entry">True</property>
             <child internal-child="entry">
               <object class="GtkEntry">
+                <property name="can-focus">True</property>
                 <property name="truncate-multiline">True</property>
-                <property name="can_focus">True</property>
               </object>
             </child>
             <child internal-child="accessible">
@@ -187,20 +187,20 @@
             </child>
           </object>
           <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
+            <property name="left-attach">1</property>
+            <property name="top-attach">2</property>
           </packing>
         </child>
         <child>
           <object class="GtkComboBoxText" id="tempimport">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <property name="hexpand">True</property>
-            <property name="has_entry">True</property>
+            <property name="has-entry">True</property>
             <child internal-child="entry">
               <object class="GtkEntry">
+                <property name="can-focus">True</property>
                 <property name="truncate-multiline">True</property>
-                <property name="can_focus">True</property>
               </object>
             </child>
             <child internal-child="accessible">
@@ -210,8 +210,8 @@
             </child>
           </object>
           <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">3</property>
+            <property name="left-attach">1</property>
+            <property name="top-attach">3</property>
           </packing>
         </child>
         <child>
@@ -228,10 +228,10 @@
       <object class="GtkCheckButton" id="filtercb">
         <property name="label" translatable="yes" context="xmlfiltertabpagetransformation|filtercb">The filter needs XSLT 2.0 processor</property>
         <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">False</property>
-        <property name="use_underline">True</property>
-        <property name="draw_indicator">True</property>
+        <property name="can-focus">True</property>
+        <property name="receives-default">False</property>
+        <property name="use-underline">True</property>
+        <property name="draw-indicator">True</property>
       </object>
       <packing>
         <property name="expand">False</property>

forms/source/component/imgprod.cxx

@@ -125,7 +125,7 @@ void ImageProducer::setImage( css::uno::Reference< css::io::XInputStream > const
 
 void ImageProducer::NewDataAvailable()
 {
-    if( ( GraphicType::NONE == moGraphic->GetType() ) || moGraphic->GetReaderContext() )
+    if (GraphicType::NONE == moGraphic->GetType())
         startProduction();
 }
 
@@ -138,11 +138,11 @@ void ImageProducer::startProduction()
     bool bNotifyEmptyGraphics = false;
 
     // valid stream or filled graphic? => update consumers
-    if( mpStm || ( moGraphic->GetType() != GraphicType::NONE ) )
+    if (mpStm || moGraphic->GetType() != GraphicType::NONE)
     {
         // if we already have a graphic, we don't have to import again;
         // graphic is cleared if a new Stream is set
-        if( ( moGraphic->GetType() == GraphicType::NONE ) || moGraphic->GetReaderContext() )
+        if (moGraphic->GetType() == GraphicType::NONE)
         {
             if ( ImplImportGraphic( *moGraphic ) )
                 maDoneHdl.Call( &*moGraphic );

fpicker/uiconfig/ui/breadcrumb.ui

@@ -30,4 +30,4 @@
       </packing>
     </child>
   </object>
-</interface>
+</interface>

helpcontent2

@@ -1 +1 @@
-Subproject commit 47eaabaeb6b90551dccb72ad5ba9f241ad7608cf
+Subproject commit 5e39c70b93559a266ba9f68344fe8c4c3f2feacf

i18npool/qa/cppunit/test_breakiterator.cxx

@@ -992,6 +992,66 @@ void TestBreakIterator::testWordBoundaries()
         CPPUNIT_ASSERT_EQUAL(sal_Int32(8), aBounds.startPos);
         CPPUNIT_ASSERT_EQUAL(sal_Int32(11), aBounds.endPos);
     }
+
+    //  tdf#161737: narrow no-break space at the end of words resulted spelling mistakes
+    {
+        aLocale.Language = "en";
+        aLocale.Country = "US";
+
+        OUString aTest(u"L’espace fine insécable\u202F!"_ustr);
+        aBounds
+            = m_xBreak->getWordBoundary(aTest, 14, aLocale, i18n::WordType::DICTIONARY_WORD, false);
+        CPPUNIT_ASSERT_EQUAL(sal_Int32(14), aBounds.startPos);
+        // This was 24 (word + NNBSP)
+        CPPUNIT_ASSERT_EQUAL(sal_Int32(23), aBounds.endPos);
+    }
+
+    //  tdf#161737: narrow no-break space between digits resulted spelling mistakes
+    //  as a quick fix, limit NBSP as word-part character only for editing, and not for spell checking
+    //  TODO: remove NBSP by the linguistic module or by the spell checking dictionaries to allow
+    //  to check numbers with thousand separators and with correct suffix
+    {
+        aLocale.Language = "en";
+        aLocale.Country = "US";
+
+        OUString aTest(u"1\u202F000\u202F000"_ustr);
+        aBounds
+            = m_xBreak->getWordBoundary(aTest, 2, aLocale, i18n::WordType::DICTIONARY_WORD, false);
+        // This was 0 (word + NNBSP)
+        CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aBounds.startPos);
+        // This was 8 (word + NNBSP)
+        CPPUNIT_ASSERT_EQUAL(sal_Int32(5), aBounds.endPos);
+    }
+
+    //  tdf#161737: narrow no-break space at the end of words resulted spelling mistakes
+    {
+        aLocale.Language = "hu";
+        aLocale.Country = "HU";
+
+        OUString aTest(u"L’espace fine insécable\u202F!"_ustr);
+        aBounds
+            = m_xBreak->getWordBoundary(aTest, 14, aLocale, i18n::WordType::DICTIONARY_WORD, false);
+        CPPUNIT_ASSERT_EQUAL(sal_Int32(14), aBounds.startPos);
+        // This was 24 (word + NNBSP)
+        CPPUNIT_ASSERT_EQUAL(sal_Int32(23), aBounds.endPos);
+    }
+
+    //  tdf#161737: narrow no-break space between digits resulted spelling mistakes
+    //  as a quick fix, limit NBSP as word-part character only for editing, and not for spell checking
+    //  TODO: remove NBSP by the linguistic module or by the spell checking dictionaries to allow
+    //  to check numbers with thousand separators and with correct suffix
+    {
+        aLocale.Language = "hu";
+        aLocale.Country = "HU";
+
+        OUString aTest(u"1\u202F000\u202F000"_ustr);
+        aBounds
+            = m_xBreak->getWordBoundary(aTest, 2, aLocale, i18n::WordType::DICTIONARY_WORD, false);
+        // This was 0 (word + NNBSP)
+        CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aBounds.startPos);
+        // This was 8 (word + NNBSP)
+        CPPUNIT_ASSERT_EQUAL(sal_Int32(5), aBounds.endPos);
+    }
 }
 
 void TestBreakIterator::testSentenceBoundaries()

i18npool/qa/cppunit/test_textsearch.cxx

@@ -38,6 +38,7 @@ public:
     void testSearches();
     void testWildcardSearch();
     void testApostropheSearch();
+    void testQuotationMarkSearch();
     void testTdf138410();
 
     CPPUNIT_TEST_SUITE(TestTextSearch);
@@ -45,6 +46,7 @@ public:
     CPPUNIT_TEST(testSearches);
     CPPUNIT_TEST(testWildcardSearch);
     CPPUNIT_TEST(testApostropheSearch);
+    CPPUNIT_TEST(testQuotationMarkSearch);
     CPPUNIT_TEST(testTdf138410);
     CPPUNIT_TEST_SUITE_END();
 private:
@@ -404,6 +406,92 @@ void TestTextSearch::testApostropheSearch()
     CPPUNIT_ASSERT( aRes.subRegExpressions > 0 );
 }
 
+void TestTextSearch::testQuotationMarkSearch()
+{
+    // A) find typographic quotation marks also by using ASCII ones
+    OUString str( u"“x”, „y‟, ‘z’, ‚a‛"_ustr );
+    sal_Int32 startPos = 0, endPos = str.getLength();
+
+    // set options
+    util::SearchOptions aOptions;
+    aOptions.algorithmType = util::SearchAlgorithms_ABSOLUTE;
+    aOptions.searchFlag = util::SearchFlags::ALL_IGNORE_CASE;
+    aOptions.searchString = "\"x\"";
+    aOptions.transliterateFlags = static_cast<int>(TransliterationFlags::IGNORE_CASE
+                                | TransliterationFlags::IGNORE_WIDTH);
+    m_xSearch->setOptions( aOptions );
+
+    util::SearchResult aRes;
+
+    // search forward
+    aRes = m_xSearch->searchForward( str, startPos, endPos );
+    // This was 0.
+    CPPUNIT_ASSERT( aRes.subRegExpressions > 0 );
+    CPPUNIT_ASSERT_EQUAL( static_cast<sal_Int32>(0), aRes.startOffset[0] );
+    CPPUNIT_ASSERT_EQUAL( static_cast<sal_Int32>(3), aRes.endOffset[0] );
+
+    // search backwards
+    aRes = m_xSearch->searchBackward( str, endPos, startPos );
+    // This was 0.
+    CPPUNIT_ASSERT( aRes.subRegExpressions > 0 );
+    CPPUNIT_ASSERT_EQUAL( static_cast<sal_Int32>(3), aRes.startOffset[0] );
+    CPPUNIT_ASSERT_EQUAL( static_cast<sal_Int32>(0), aRes.endOffset[0] );
+
+    // B)
+    aOptions.searchString = "\"y\"";
+    m_xSearch->setOptions( aOptions );
+
+    // search forward
+    aRes = m_xSearch->searchForward( str, startPos, endPos );
+    // This was 0.
+    CPPUNIT_ASSERT( aRes.subRegExpressions > 0 );
+    CPPUNIT_ASSERT_EQUAL( static_cast<sal_Int32>(5), aRes.startOffset[0] );
+    CPPUNIT_ASSERT_EQUAL( static_cast<sal_Int32>(8), aRes.endOffset[0] );
+
+    // search backwards
+    aRes = m_xSearch->searchBackward( str, endPos, startPos );
+    // This was 0.
+    CPPUNIT_ASSERT( aRes.subRegExpressions > 0 );
+    CPPUNIT_ASSERT_EQUAL( static_cast<sal_Int32>(8), aRes.startOffset[0] );
+    CPPUNIT_ASSERT_EQUAL( static_cast<sal_Int32>(5), aRes.endOffset[0] );
+
+    // C)
+    aOptions.searchString = "'z'";
+    m_xSearch->setOptions( aOptions );
+
+    // search forward
+    aRes = m_xSearch->searchForward( str, startPos, endPos );
+    // This was 0.
+    CPPUNIT_ASSERT( aRes.subRegExpressions > 0 );
+    CPPUNIT_ASSERT_EQUAL( static_cast<sal_Int32>(10), aRes.startOffset[0] );
+    CPPUNIT_ASSERT_EQUAL( static_cast<sal_Int32>(13), aRes.endOffset[0] );
+
+    // search backwards
+    aRes = m_xSearch->searchBackward( str, endPos, startPos );
+    // This was 0.
+    CPPUNIT_ASSERT( aRes.subRegExpressions > 0 );
+    CPPUNIT_ASSERT_EQUAL( static_cast<sal_Int32>(13), aRes.startOffset[0] );
+    CPPUNIT_ASSERT_EQUAL( static_cast<sal_Int32>(10), aRes.endOffset[0] );
+
+    // D)
+    aOptions.searchString = "'a'";
+    m_xSearch->setOptions( aOptions );
+
+    // search forward
+    aRes = m_xSearch->searchForward( str, startPos, endPos );
+    // This was 0.
+    CPPUNIT_ASSERT( aRes.subRegExpressions > 0 );
+    CPPUNIT_ASSERT_EQUAL( static_cast<sal_Int32>(15), aRes.startOffset[0] );
+    CPPUNIT_ASSERT_EQUAL( static_cast<sal_Int32>(18), aRes.endOffset[0] );
+
+    // search backwards
+    aRes = m_xSearch->searchBackward( str, endPos, startPos );
+    // This was 0.
+    CPPUNIT_ASSERT( aRes.subRegExpressions > 0 );
+    CPPUNIT_ASSERT_EQUAL( static_cast<sal_Int32>(18), aRes.startOffset[0] );
+    CPPUNIT_ASSERT_EQUAL( static_cast<sal_Int32>(15), aRes.endOffset[0] );
+}
+
 void TestTextSearch::testTdf138410()
 {
     OUString str(u"\u0643\u064f\u062a\u064f\u0628 \u0643\u062a\u0628"_ustr);

i18npool/source/breakiterator/data/dict_word.txt

@@ -54,7 +54,7 @@ $Double_Quote       = [\p{Word_Break = Double_Quote}];
 $MidNumLet          = [\p{Word_Break = MidNumLet}];
 $MidNum             = [\p{Word_Break = MidNum}];
 $Numeric            = [\p{Word_Break = Numeric}];
-$ExtendNumLet       = [\p{Word_Break = ExtendNumLet}];
+$ExtendNumLet       = [\p{Word_Break = ExtendNumLet}-[:name = NARROW NO-BREAK SPACE:]];
 $WSegSpace          = [\p{Word_Break = WSegSpace}];
 $Extended_Pict      = [\p{Extended_Pictographic}];
 

i18npool/source/breakiterator/data/dict_word_hu.txt

@@ -53,7 +53,7 @@ $Double_Quote       = [\p{Word_Break = Double_Quote}];
 $MidNumLet          = [\p{Word_Break = MidNumLet}];
 $MidNum             = [\p{Word_Break = MidNum}];
 $Numeric            = [\p{Word_Break = Numeric}];
-$ExtendNumLet       = [\p{Word_Break = ExtendNumLet}];
+$ExtendNumLet       = [\p{Word_Break = ExtendNumLet}-[:name = NARROW NO-BREAK SPACE:]];
 $WSegSpace          = [\p{Word_Break = WSegSpace}];
 $Extended_Pict      = [\p{Extended_Pictographic}];
 

i18npool/source/breakiterator/data/edit_word.txt

@@ -65,7 +65,7 @@ $Extended_Pict      = [\p{Extended_Pictographic}];
 $MidNumLet          = [\p{Word_Break = MidNumLet}-[:name= FULL STOP:]];
 
 # $ExtendNumLet       = [\p{Word_Break = ExtendNumLet}];
-$ExtendNumLet       = [\p{Word_Break = ExtendNumLet}-[:name= LOW LINE:]];
+$ExtendNumLet       = [\p{Word_Break = ExtendNumLet}-[:name= LOW LINE:]-[:name = NARROW NO-BREAK SPACE:]];
 
 ### END CUSTOMIZATION
 
@@ -164,16 +164,18 @@ $Numeric $ExFm* ($MidNum | $MidNumLet | $Single_Quote) $ExFm* $Numeric;
 $Katakana $ExFm*  $Katakana {400};
 
 # rule 13a/b
+# allow to select numbers with narrow no-break spaces as thousand separators
+$ExtendNumLetNNBSP = [\p{Word_Break = ExtendNumLet}];
 
 $ALetterPlus   $ExFm* $ExtendNumLet {200};    #  (13a)
 $Hebrew_Letter $ExFm* $ExtendNumLet {200};    #  (13a)
-$Numeric       $ExFm* $ExtendNumLet {100};    #  (13a)
+$Numeric       $ExFm* $ExtendNumLetNNBSP {100};    #  (13a)
 $Katakana      $ExFm* $ExtendNumLet {400};    #  (13a)
 $ExtendNumLet  $ExFm* $ExtendNumLet {200};    #  (13a)
 
 $ExtendNumLet  $ExFm* $ALetterPlus  {200};    #  (13b)
 $ExtendNumLet  $ExFm* $Hebrew_Letter {200};    #  (13b)
-$ExtendNumLet  $ExFm* $Numeric      {100};    #  (13b)
+$ExtendNumLetNNBSP  $ExFm* $Numeric      {100};    #  (13b)
 $ExtendNumLet  $ExFm* $Katakana     {400};    #  (13b)
 
 # rules 15 - 17

i18npool/source/breakiterator/data/edit_word_hu.txt

@@ -81,7 +81,7 @@ $MidLetter          = [\p{Word_Break = MidLetter} $Symbols_hu];
 $MidNumLet          = [\p{Word_Break = MidNumLet}-[:name= FULL STOP:]];
 
 # $ExtendNumLet       = [\p{Word_Break = ExtendNumLet}];
-$ExtendNumLet       = [\p{Word_Break = ExtendNumLet}-[:name= LOW LINE:]];
+$ExtendNumLet       = [\p{Word_Break = ExtendNumLet}-[:name= LOW LINE:]-[:name = NARROW NO-BREAK SPACE:]];
 
 ### END CUSTOMIZATION
 
@@ -180,16 +180,18 @@ $Numeric $ExFm* ($MidNum | $MidNumLet | $Single_Quote) $ExFm* $Numeric;
 $Katakana $ExFm*  $Katakana {400};
 
 # rule 13a/b
+# allow to select numbers with narrow no-break spaces as thousand separators
+$ExtendNumLetNNBSP = [\p{Word_Break = ExtendNumLet}];
 
 $ALetterPlus   $ExFm* $ExtendNumLet {200};    #  (13a)
 $Hebrew_Letter $ExFm* $ExtendNumLet {200};    #  (13a)
-$Numeric       $ExFm* $ExtendNumLet {100};    #  (13a)
+$Numeric       $ExFm* $ExtendNumLetNNBSP {100};    #  (13a)
 $Katakana      $ExFm* $ExtendNumLet {400};    #  (13a)
 $ExtendNumLet  $ExFm* $ExtendNumLet {200};    #  (13a)
 
 $ExtendNumLet  $ExFm* $ALetterPlus  {200};    #  (13b)
 $ExtendNumLet  $ExFm* $Hebrew_Letter {200};    #  (13b)
-$ExtendNumLet  $ExFm* $Numeric      {100};    #  (13b)
+$ExtendNumLetNNBSP  $ExFm* $Numeric      {100};    #  (13b)
 $ExtendNumLet  $ExFm* $Katakana     {400};    #  (13b)
 
 # rules 15 - 17

i18npool/source/characterclassification/cclass_unicode_parser.cxx

@@ -651,7 +651,7 @@ ParserFlags cclass_Unicode::getFlagsExtended(sal_uInt32 const c, const cclass_Un
             return ((nTypes & KParseTokens::IGNORE_LEADING_WS) ?
                 ParserFlags::CHAR_DONTCARE : (bStart ? ParserFlags::CHAR_WORD : (ParserFlags::CHAR_DONTCARE | ParserFlags::WORD_SEP | ParserFlags::VALUE_SEP) ));
         case U_OTHER_PUNCTUATION:
-            // fdo#61754 Lets see (if we not at the start) if this is midletter
+            // fdo#61754 Let's see (if we not at the start) if this is midletter
             // punctuation and allow it in a word if it is similarly to
             // U_NON_SPACING_MARK, for example U+00B7 MIDDLE DOT.
             // tdf#123575 for U+30FB KATAKANA MIDDLE DOT property is not

i18npool/source/search/textsearch.cxx

@@ -93,6 +93,30 @@ bool isSimpleRegexTrans( TransliterationFlags n )
 {
     return bool(maskSimpleRegexTrans(n));
 }
+
+bool isReplacePunctuation( OUString &rStr )
+{
+    return rStr.indexOf(u'\u2018') > -1 ||
+           rStr.indexOf(u'\u2019') > -1 ||
+           rStr.indexOf(u'\u201A') > -1 ||
+           rStr.indexOf(u'\u201B') > -1 ||
+           rStr.indexOf(u'\u201C') > -1 ||
+           rStr.indexOf(u'\u201D') > -1 ||
+           rStr.indexOf(u'\u201E') > -1 ||
+           rStr.indexOf(u'\u201F') > -1;
+}
+
+OUString replacePunctuation( OUString &rStr )
+{
+    return rStr.replace(u'\u2018', '\'')
+               .replace(u'\u2019', '\'')
+               .replace(u'\u201A', '\'')
+               .replace(u'\u201B', '\'')
+               .replace(u'\u201C', '"')
+               .replace(u'\u201D', '"')
+               .replace(u'\u201E', '"')
+               .replace(u'\u201F', '"');
+}
 };
 
 TextSearch::TextSearch(const Reference < XComponentContext > & rxContext)
@@ -139,10 +163,10 @@ void TextSearch::setOptions2( const SearchOptions2& rOptions )
         // match is not case-altered, leave case-(in)sensitive to regex engine.
         transliterateFlags &= ~TransliterationFlags::IGNORE_CASE;
     }
-    else if ( aSrchPara.searchString.indexOf('\'') > - 1 )
+    else if ( aSrchPara.searchString.indexOf('\'') > - 1 || aSrchPara.searchString.indexOf('"') > - 1 )
     {
         bSearchApostrophe = true;
-        bReplaceApostrophe = aSrchPara.searchString.indexOf(u'\u2019') > -1;
+        bReplaceApostrophe = isReplacePunctuation(aSrchPara.searchString);
     }
 
     // Create Transliteration class
@@ -215,7 +239,7 @@ void TextSearch::setOptions2( const SearchOptions2& rOptions )
     }
 
     if ( bReplaceApostrophe )
-        sSrchStr = sSrchStr.replace(u'\u2019', '\'');
+        sSrchStr = replacePunctuation(sSrchStr);
 
     // Take the new SearchOptions2::AlgorithmType2 field and ignore
     // SearchOptions::algorithmType
@@ -308,7 +332,7 @@ SearchResult TextSearch::searchForward( const OUString& searchStr, sal_Int32 sta
 
     // in non-regex mode, allow searching typographical apostrophe with the ASCII one
     // to avoid regression after using automatic conversion to U+2019 during typing in Writer
-    bool bReplaceApostrophe = bSearchApostrophe && in_str.indexOf(u'\u2019') > -1;
+    bool bReplaceApostrophe = bSearchApostrophe && isReplacePunctuation(in_str);
 
     bUsePrimarySrchStr = true;
 
@@ -340,7 +364,7 @@ SearchResult TextSearch::searchForward( const OUString& searchStr, sal_Int32 sta
         in_str = xTranslit->transliterate(searchStr, nInStartPos, nInEndPos - nInStartPos, offset);
 
         if ( bReplaceApostrophe )
-            in_str = in_str.replace(u'\u2019', '\'');
+            in_str = replacePunctuation(in_str);
 
         // JP 20.6.2001: also the start and end positions must be corrected!
         sal_Int32 newStartPos =
@@ -447,7 +471,7 @@ SearchResult TextSearch::searchBackward( const OUString& searchStr, sal_Int32 st
 
     // in non-regex mode, allow searching typographical apostrophe with the ASCII one
     // to avoid regression after using automatic conversion to U+2019 during typing in Writer
-    bool bReplaceApostrophe = bSearchApostrophe && in_str.indexOf(u'\u2019') > -1;
+    bool bReplaceApostrophe = bSearchApostrophe && isReplacePunctuation(in_str);
 
     bUsePrimarySrchStr = true;
 
@@ -458,7 +482,7 @@ SearchResult TextSearch::searchBackward( const OUString& searchStr, sal_Int32 st
         in_str = xTranslit->transliterate( searchStr, endPos, startPos - endPos, offset );
 
         if ( bReplaceApostrophe )
-            in_str = in_str.replace(u'\u2019', '\'');
+            in_str = replacePunctuation(in_str);
 
         // JP 20.6.2001: also the start and end positions must be corrected!
         sal_Int32 const newStartPos = (startPos < searchStr.getLength())
@@ -508,7 +532,7 @@ SearchResult TextSearch::searchBackward( const OUString& searchStr, sal_Int32 st
     else
     {
         if ( bReplaceApostrophe )
-            in_str = in_str.replace(u'\u2019', '\'');
+            in_str = replacePunctuation(in_str);
 
         sres = (this->*fnBackward)( in_str, startPos, endPos );
     }

icon-themes/breeze/links.txt

@@ -30,6 +30,7 @@ chart2/res/selectrange.png formula/res/refinp1.png
 
 # cmd
 # ==============================================
+cmd/sc_endnotedialog.png cmd/sc_footnotedialog.png
 
 # Add
 cmd/32/adddatefield.png cmd/32/datefield.png

icon-themes/colibre/links.txt

@@ -47,6 +47,7 @@ cmd/sc_insertmenulegend.png cmd/sc_legend.png
 
 # cmd
 # ==============================================
+cmd/sc_endnotedialog.png cmd/sc_footnotedialog.png
 
 # Add
 cmd/32/adddatefield.png cmd/32/datefield.png