Caolán McNamara
3 years ago
parent
b7ea66f19a
commit
b7dfd8a125
@ -1,26 +0,0 @@
|
|||||||
From 2382a2f6b4e84e3dc6c3b724b92dae8f991a76be Mon Sep 17 00:00:00 2001
|
|
||||||
From: Stephan Bergmann <sbergman@redhat.com>
|
|
||||||
Date: Mon, 31 May 2021 13:30:37 +0200
|
|
||||||
Subject: [PATCH] Adapt to hamcrest-2.2-3.fc35.noarch.rpm
|
|
||||||
|
|
||||||
Change-Id: Ibddfc30a5f0828ab77235ec1155f1c2e1eef24ee
|
|
||||||
---
|
|
||||||
configure.ac | 2 ++
|
|
||||||
1 file changed, 2 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/configure.ac b/configure.ac
|
|
||||||
index 43fb8d877515..07954b2c3262 100644
|
|
||||||
--- a/configure.ac
|
|
||||||
+++ b/configure.ac
|
|
||||||
@@ -13427,6 +13427,8 @@ if test "$ENABLE_JAVA" != "" -a "$with_junit" != "no" -a "$cross_compiling" != "
|
|
||||||
HAMCREST_JAR=/usr/share/lib/java/hamcrest.jar
|
|
||||||
elif test -e /usr/share/java/hamcrest/core.jar; then
|
|
||||||
HAMCREST_JAR=/usr/share/java/hamcrest/core.jar
|
|
||||||
+ elif test -e /usr/share/java/hamcrest/hamcrest.jar; then
|
|
||||||
+ HAMCREST_JAR=/usr/share/java/hamcrest/hamcrest.jar
|
|
||||||
else
|
|
||||||
HAMCREST_JAR=/usr/share/java/hamcrest.jar
|
|
||||||
fi
|
|
||||||
--
|
|
||||||
2.31.1
|
|
||||||
|
|
||||||
@ -1,80 +0,0 @@
|
|||||||
From 4f85b6ec5964e2d9747f6743f9adc6ef1f951e4a Mon Sep 17 00:00:00 2001
|
|
||||||
From: Stephan Bergmann <sbergman@redhat.com>
|
|
||||||
Date: Wed, 5 May 2021 08:20:18 +0200
|
|
||||||
Subject: [PATCH] Adapt to "libstdc++: Implement LWG 1203 for rvalue iostreams"
|
|
||||||
|
|
||||||
<https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=aa475c4ac80733f85ba47b109fc1900f05e810e2>
|
|
||||||
towards GCC 12, so that now "the return type is the original rvalue stream type
|
|
||||||
not its base class." (And which would thus have caused issues like
|
|
||||||
|
|
||||||
> sfx2/source/control/bindings.cxx:1323:19: error: dynamic_cast from rvalue to reference type '::std::ostringstream &' (aka 'basic_ostringstream<char> &')
|
|
||||||
> ? SAL_STREAM("File: " << pFile << " Line: " << nLine) : ""));
|
|
||||||
> ~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
||||||
> include/sal/log.hxx:198:6: note: expanded from macro 'SAL_STREAM'
|
|
||||||
> (dynamic_cast< ::std::ostringstream & >(::std::ostringstream() << stream).str())
|
|
||||||
> ^
|
|
||||||
> include/sal/log.hxx:341:20: note: expanded from macro 'SAL_INFO'
|
|
||||||
> SAL_WHERE, stream)
|
|
||||||
> ~~~~~~~~~~~^~~~~~~
|
|
||||||
> include/sal/log.hxx:155:68: note: expanded from macro 'SAL_DETAIL_LOG_STREAM'
|
|
||||||
> SAL_DETAIL_LOG_STREAM_PRIVATE_(level, area, where, stream); \
|
|
||||||
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~
|
|
||||||
> include/sal/log.hxx:133:45: note: expanded from macro 'SAL_DETAIL_LOG_STREAM_PRIVATE_'
|
|
||||||
> ::sal::detail::StreamStart() << stream) == 1) \
|
|
||||||
> ^~~~~~
|
|
||||||
|
|
||||||
now. While the issue with old libstdc++ that originally prompted the
|
|
||||||
dynamic_cast was
|
|
||||||
|
|
||||||
> sfx2/source/control/bindings.cxx:1323:19: error: no member named 'str' in 'std::basic_ostream<char>'
|
|
||||||
> ? SAL_STREAM("File: " << pFile << " Line: " << nLine) : ""));
|
|
||||||
> ~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
||||||
> include/sal/log.hxx:194:40: note: expanded from macro 'SAL_STREAM'
|
|
||||||
> (::std::ostringstream() << stream).str()
|
|
||||||
> ^
|
|
||||||
> include/sal/log.hxx:336:20: note: expanded from macro 'SAL_INFO'
|
|
||||||
> SAL_WHERE, stream)
|
|
||||||
> ~~~~~~~~~~~^~~~~~~
|
|
||||||
> include/sal/log.hxx:155:68: note: expanded from macro 'SAL_DETAIL_LOG_STREAM'
|
|
||||||
> SAL_DETAIL_LOG_STREAM_PRIVATE_(level, area, where, stream); \
|
|
||||||
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~
|
|
||||||
> include/sal/log.hxx:133:45: note: expanded from macro 'SAL_DETAIL_LOG_STREAM_PRIVATE_'
|
|
||||||
> ::sal::detail::StreamStart() << stream) == 1) \
|
|
||||||
> ^~~~~~
|
|
||||||
|
|
||||||
.)
|
|
||||||
|
|
||||||
The libstdc++ macro _GLIBCXX_RELEASE is reportedly available since GCC 7.1.
|
|
||||||
|
|
||||||
Change-Id: I1ee6eabb66355c1f28b9d305cbd85bac50d6b0e1
|
|
||||||
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115121
|
|
||||||
Tested-by: Jenkins
|
|
||||||
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
|
|
||||||
|
|
||||||
(cherry picked from commit 1f3dddd6f21d91c429190ae314dadeec409f35f4, plus
|
|
||||||
follow-up 95e26d3dce4f5a3b2d010d5ca47b4e450905a100 "tdf#142326: Adapt to
|
|
||||||
'libstdc++: Implement LWG 1203 for rvalue iostreams'")
|
|
||||||
Change-Id: I7c8fef25e15fcfa9b83924467dc86dc2957fbd7d
|
|
||||||
---
|
|
||||||
include/sal/log.hxx | 5 ++++-
|
|
||||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/include/sal/log.hxx b/include/sal/log.hxx
|
|
||||||
index 6bb0d1b43d3d..a0fa902dbce6 100644
|
|
||||||
--- a/include/sal/log.hxx
|
|
||||||
+++ b/include/sal/log.hxx
|
|
||||||
@@ -186,7 +186,10 @@ inline char const * unwrapStream(SAL_UNUSED_PARAMETER StreamIgnore const &) {
|
|
||||||
|
|
||||||
@since LibreOffice 3.5
|
|
||||||
*/
|
|
||||||
-#if defined _LIBCPP_VERSION || (defined _MSC_VER && _MSC_VER >= 1915)
|
|
||||||
+#if defined _LIBCPP_VERSION \
|
|
||||||
+ || (defined _GLIBCXX_RELEASE \
|
|
||||||
+ && (_GLIBCXX_RELEASE >= 12 || (_GLIBCXX_RELEASE == 11 && __GLIBCXX__ > 20210428))) \
|
|
||||||
+ || (defined _MSC_VER && _MSC_VER >= 1915)
|
|
||||||
#define SAL_STREAM(stream) \
|
|
||||||
(::std::ostringstream() << stream).str()
|
|
||||||
#else
|
|
||||||
--
|
|
||||||
2.31.1
|
|
||||||
|
|
||||||
@ -1,36 +0,0 @@
|
|||||||
From 3766e78348d52b9491179c32e9062e25e58250f7 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
||||||
Date: Thu, 27 May 2021 11:13:29 +0100
|
|
||||||
Subject: [PATCH] add missing xmlns:loext to example_sl-SI.xml
|
|
||||||
|
|
||||||
added to example.xml by
|
|
||||||
|
|
||||||
commit 71ee09947d5a71105d64fd225bb3672dfa7ce834
|
|
||||||
Date: Tue Sep 19 15:37:04 2017 +0200
|
|
||||||
|
|
||||||
TSCP: add advanced classification dialog
|
|
||||||
|
|
||||||
but not to example_sl-SI.xml
|
|
||||||
|
|
||||||
Change-Id: I8aa46554867db8c51bd118b6cc87e649b922cdfb
|
|
||||||
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116157
|
|
||||||
Tested-by: Jenkins
|
|
||||||
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
|
|
||||||
---
|
|
||||||
sfx2/classification/example_sl-SI.xml | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/sfx2/classification/example_sl-SI.xml b/sfx2/classification/example_sl-SI.xml
|
|
||||||
index 99e04a7aab71..13a4bcfdf29a 100644
|
|
||||||
--- a/sfx2/classification/example_sl-SI.xml
|
|
||||||
+++ b/sfx2/classification/example_sl-SI.xml
|
|
||||||
@@ -1,5 +1,5 @@
|
|
||||||
<?xml version="1.0"?>
|
|
||||||
-<baf:BusinessAuthorization xmlns:baf="urn:tscp:names:baf:1.1">
|
|
||||||
+<baf:BusinessAuthorization xmlns:baf="urn:tscp:names:baf:1.1" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0">
|
|
||||||
<baf:PolicyAuthorityName>Avtoriteta primera politike TSCP</baf:PolicyAuthorityName>
|
|
||||||
<baf:PolicyName>Primer politike TSCP</baf:PolicyName>
|
|
||||||
<baf:AdministrativeData>
|
|
||||||
--
|
|
||||||
2.31.1
|
|
||||||
|
|
||||||
File diff suppressed because it is too large
Load Diff
@ -1,201 +0,0 @@
|
|||||||
From 3a19d8b8309070f8c14f3a3b4dc4b098ad64190f Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
||||||
Date: Wed, 9 Jun 2021 10:20:57 +0100
|
|
||||||
Subject: [PATCH 1/2] dtd files are not xml files and shouldn't have xml
|
|
||||||
headers
|
|
||||||
|
|
||||||
so rpminspect is correct in complaining that they are not valid xml
|
|
||||||
on inspecting files claiming to be xml
|
|
||||||
|
|
||||||
Change-Id: I70379989326c2ea63e6a54b3658ebea4684fa5df
|
|
||||||
---
|
|
||||||
framework/dtd/accelerator.dtd | 1 -
|
|
||||||
framework/dtd/event.dtd | 1 -
|
|
||||||
framework/dtd/groupuinames.dtd | 1 -
|
|
||||||
framework/dtd/image.dtd | 1 -
|
|
||||||
framework/dtd/menubar.dtd | 1 -
|
|
||||||
framework/dtd/statusbar.dtd | 1 -
|
|
||||||
framework/dtd/toolbar.dtd | 1 -
|
|
||||||
i18npool/source/localedata/data/locale.dtd | 1 -
|
|
||||||
officecfg/registry/component-schema.dtd | 1 -
|
|
||||||
officecfg/registry/component-update.dtd | 1 -
|
|
||||||
package/dtd/Manifest.dtd | 1 -
|
|
||||||
xmerge/source/xmerge/converter.dtd | 1 -
|
|
||||||
xmloff/dtd/office.dtd | 1 -
|
|
||||||
xmlscript/dtd/dialog.dtd | 1 -
|
|
||||||
xmlscript/dtd/libraries.dtd | 2 --
|
|
||||||
xmlscript/dtd/library.dtd | 2 --
|
|
||||||
xmlscript/dtd/module.dtd | 2 --
|
|
||||||
17 files changed, 20 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/framework/dtd/accelerator.dtd b/framework/dtd/accelerator.dtd
|
|
||||||
index f4dcac65242d..912b652d3cf5 100644
|
|
||||||
--- a/framework/dtd/accelerator.dtd
|
|
||||||
+++ b/framework/dtd/accelerator.dtd
|
|
||||||
@@ -1,4 +1,3 @@
|
|
||||||
-<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!--
|
|
||||||
* This file is part of the LibreOffice project.
|
|
||||||
*
|
|
||||||
diff --git a/framework/dtd/event.dtd b/framework/dtd/event.dtd
|
|
||||||
index 7a66d15e571b..5af4a3dd267f 100644
|
|
||||||
--- a/framework/dtd/event.dtd
|
|
||||||
+++ b/framework/dtd/event.dtd
|
|
||||||
@@ -1,4 +1,3 @@
|
|
||||||
-<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!--
|
|
||||||
* This file is part of the LibreOffice project.
|
|
||||||
*
|
|
||||||
diff --git a/framework/dtd/groupuinames.dtd b/framework/dtd/groupuinames.dtd
|
|
||||||
index a29b77a4f13e..218939cf9bae 100644
|
|
||||||
--- a/framework/dtd/groupuinames.dtd
|
|
||||||
+++ b/framework/dtd/groupuinames.dtd
|
|
||||||
@@ -24,4 +24,3 @@
|
|
||||||
groupuinames:name CDATA #REQUIRED
|
|
||||||
groupuinames:default-ui-name CDATA #REQUIRED
|
|
||||||
>
|
|
||||||
-
|
|
||||||
diff --git a/framework/dtd/image.dtd b/framework/dtd/image.dtd
|
|
||||||
index 59b0f3f92f08..fb69a5e5f4c8 100644
|
|
||||||
--- a/framework/dtd/image.dtd
|
|
||||||
+++ b/framework/dtd/image.dtd
|
|
||||||
@@ -1,4 +1,3 @@
|
|
||||||
-<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!--
|
|
||||||
* This file is part of the LibreOffice project.
|
|
||||||
*
|
|
||||||
diff --git a/framework/dtd/menubar.dtd b/framework/dtd/menubar.dtd
|
|
||||||
index b41431f6d0ef..b3469f7324a6 100644
|
|
||||||
--- a/framework/dtd/menubar.dtd
|
|
||||||
+++ b/framework/dtd/menubar.dtd
|
|
||||||
@@ -1,4 +1,3 @@
|
|
||||||
-<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!--
|
|
||||||
* This file is part of the LibreOffice project.
|
|
||||||
*
|
|
||||||
diff --git a/framework/dtd/statusbar.dtd b/framework/dtd/statusbar.dtd
|
|
||||||
index 9f4e9e2a35c3..40a5609b7cf6 100644
|
|
||||||
--- a/framework/dtd/statusbar.dtd
|
|
||||||
+++ b/framework/dtd/statusbar.dtd
|
|
||||||
@@ -1,4 +1,3 @@
|
|
||||||
-<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!--
|
|
||||||
* This file is part of the LibreOffice project.
|
|
||||||
*
|
|
||||||
diff --git a/framework/dtd/toolbar.dtd b/framework/dtd/toolbar.dtd
|
|
||||||
index 6f2c38260524..7f8ee24e8ab9 100644
|
|
||||||
--- a/framework/dtd/toolbar.dtd
|
|
||||||
+++ b/framework/dtd/toolbar.dtd
|
|
||||||
@@ -1,4 +1,3 @@
|
|
||||||
-<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!--
|
|
||||||
* This file is part of the LibreOffice project.
|
|
||||||
*
|
|
||||||
diff --git a/i18npool/source/localedata/data/locale.dtd b/i18npool/source/localedata/data/locale.dtd
|
|
||||||
index 103ab1721c4e..60006d87f439 100644
|
|
||||||
--- a/i18npool/source/localedata/data/locale.dtd
|
|
||||||
+++ b/i18npool/source/localedata/data/locale.dtd
|
|
||||||
@@ -1,4 +1,3 @@
|
|
||||||
-<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!--
|
|
||||||
* This file is part of the LibreOffice project.
|
|
||||||
*
|
|
||||||
diff --git a/officecfg/registry/component-schema.dtd b/officecfg/registry/component-schema.dtd
|
|
||||||
index 242b9c6ea513..70bd51bf7d13 100644
|
|
||||||
--- a/officecfg/registry/component-schema.dtd
|
|
||||||
+++ b/officecfg/registry/component-schema.dtd
|
|
||||||
@@ -1,4 +1,3 @@
|
|
||||||
-<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!--
|
|
||||||
* This file is part of the LibreOffice project.
|
|
||||||
*
|
|
||||||
diff --git a/officecfg/registry/component-update.dtd b/officecfg/registry/component-update.dtd
|
|
||||||
index d99ee499249e..0659e412305b 100644
|
|
||||||
--- a/officecfg/registry/component-update.dtd
|
|
||||||
+++ b/officecfg/registry/component-update.dtd
|
|
||||||
@@ -1,4 +1,3 @@
|
|
||||||
-<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!--
|
|
||||||
* This file is part of the LibreOffice project.
|
|
||||||
*
|
|
||||||
diff --git a/package/dtd/Manifest.dtd b/package/dtd/Manifest.dtd
|
|
||||||
index 2dbdbf00c81d..9e16a007a799 100644
|
|
||||||
--- a/package/dtd/Manifest.dtd
|
|
||||||
+++ b/package/dtd/Manifest.dtd
|
|
||||||
@@ -46,4 +46,3 @@
|
|
||||||
manifest:key-derivation-name CDATA #REQUIRED
|
|
||||||
manifest:salt CDATA #REQUIRED
|
|
||||||
manifest:iteration-count CDATA #REQUIRED>
|
|
||||||
-
|
|
||||||
diff --git a/xmerge/source/xmerge/converter.dtd b/xmerge/source/xmerge/converter.dtd
|
|
||||||
index f7c09f5c2c58..81ecbe69d80e 100644
|
|
||||||
--- a/xmerge/source/xmerge/converter.dtd
|
|
||||||
+++ b/xmerge/source/xmerge/converter.dtd
|
|
||||||
@@ -82,4 +82,3 @@
|
|
||||||
<!ELEMENT converter-target EMPTY>
|
|
||||||
|
|
||||||
<!ATTLIST converter-target type CDATA #REQUIRED>
|
|
||||||
-
|
|
||||||
diff --git a/xmloff/dtd/office.dtd b/xmloff/dtd/office.dtd
|
|
||||||
index e056d57e5525..5da82955640b 100644
|
|
||||||
--- a/xmloff/dtd/office.dtd
|
|
||||||
+++ b/xmloff/dtd/office.dtd
|
|
||||||
@@ -1,4 +1,3 @@
|
|
||||||
-<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!--
|
|
||||||
* This file is part of the LibreOffice project.
|
|
||||||
*
|
|
||||||
diff --git a/xmlscript/dtd/dialog.dtd b/xmlscript/dtd/dialog.dtd
|
|
||||||
index 1b7e6355631f..7290b8d22257 100644
|
|
||||||
--- a/xmlscript/dtd/dialog.dtd
|
|
||||||
+++ b/xmlscript/dtd/dialog.dtd
|
|
||||||
@@ -1,4 +1,3 @@
|
|
||||||
-<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!--
|
|
||||||
* This file is part of the LibreOffice project.
|
|
||||||
*
|
|
||||||
diff --git a/xmlscript/dtd/libraries.dtd b/xmlscript/dtd/libraries.dtd
|
|
||||||
index 270d89209bba..3b3b82e535b8 100644
|
|
||||||
--- a/xmlscript/dtd/libraries.dtd
|
|
||||||
+++ b/xmlscript/dtd/libraries.dtd
|
|
||||||
@@ -1,4 +1,3 @@
|
|
||||||
-<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!--
|
|
||||||
* This file is part of the LibreOffice project.
|
|
||||||
*
|
|
||||||
@@ -33,4 +32,3 @@
|
|
||||||
library:link %boolean; #REQUIRED
|
|
||||||
library:readonly %boolean; #IMPLIED
|
|
||||||
>
|
|
||||||
-
|
|
||||||
diff --git a/xmlscript/dtd/library.dtd b/xmlscript/dtd/library.dtd
|
|
||||||
index 4f1512692ad6..c0341ed545b5 100644
|
|
||||||
--- a/xmlscript/dtd/library.dtd
|
|
||||||
+++ b/xmlscript/dtd/library.dtd
|
|
||||||
@@ -1,4 +1,3 @@
|
|
||||||
-<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!--
|
|
||||||
* This file is part of the LibreOffice project.
|
|
||||||
*
|
|
||||||
@@ -32,4 +31,3 @@
|
|
||||||
<!ATTLIST library:element
|
|
||||||
library:name CDATA #REQUIRED
|
|
||||||
>
|
|
||||||
-
|
|
||||||
diff --git a/xmlscript/dtd/module.dtd b/xmlscript/dtd/module.dtd
|
|
||||||
index 5b36ac033d89..b77d62f46498 100644
|
|
||||||
--- a/xmlscript/dtd/module.dtd
|
|
||||||
+++ b/xmlscript/dtd/module.dtd
|
|
||||||
@@ -1,4 +1,3 @@
|
|
||||||
-<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!--
|
|
||||||
* This file is part of the LibreOffice project.
|
|
||||||
*
|
|
||||||
@@ -23,4 +22,3 @@
|
|
||||||
script:name CDATA #REQUIRED
|
|
||||||
script:language CDATA #REQUIRED
|
|
||||||
>
|
|
||||||
-
|
|
||||||
--
|
|
||||||
2.31.1
|
|
||||||
|
|
||||||
@ -1,40 +0,0 @@
|
|||||||
From ba66a3c76c8bd2f7f1e86b4a628b92951fcf82b3 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
||||||
Date: Wed, 9 Jun 2021 09:35:28 +0100
|
|
||||||
Subject: [PATCH 2/2] xmllint: Namespace prefix menu on menuseparator is not
|
|
||||||
defined
|
|
||||||
|
|
||||||
xmllint --noout dbaccess/uiconfig/dbapp/toolbar/formobjectbar.xml
|
|
||||||
dbaccess/uiconfig/dbapp/toolbar/formobjectbar.xml:24: namespace error : Namespace prefix menu on menuseparator is not defined
|
|
||||||
<menu:menuseparator/>
|
|
||||||
|
|
||||||
should be a toolbarseparator here
|
|
||||||
|
|
||||||
a problem since...
|
|
||||||
|
|
||||||
commit 4f810905fa74128871f2fe924a3d28a79f4e4261
|
|
||||||
Date: Tue Mar 5 15:42:19 2019 +0100
|
|
||||||
|
|
||||||
sync dbaccess ui files with swriter ui file structure
|
|
||||||
|
|
||||||
Change-Id: I000efac56a0af10bca7c22fba6f88f469ae9b272
|
|
||||||
---
|
|
||||||
dbaccess/uiconfig/dbapp/toolbar/formobjectbar.xml | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/dbaccess/uiconfig/dbapp/toolbar/formobjectbar.xml b/dbaccess/uiconfig/dbapp/toolbar/formobjectbar.xml
|
|
||||||
index b3c2c9c37eef..78e698df3883 100644
|
|
||||||
--- a/dbaccess/uiconfig/dbapp/toolbar/formobjectbar.xml
|
|
||||||
+++ b/dbaccess/uiconfig/dbapp/toolbar/formobjectbar.xml
|
|
||||||
@@ -21,7 +21,7 @@
|
|
||||||
<toolbar:toolbaritem xlink:href=".uno:DBNewForm"/>
|
|
||||||
<toolbar:toolbaritem xlink:href=".uno:DBFormOpen"/>
|
|
||||||
<toolbar:toolbaritem xlink:href=".uno:DBFormEdit"/>
|
|
||||||
- <menu:menuseparator/>
|
|
||||||
+ <toolbar:toolbarseparator/>
|
|
||||||
<toolbar:toolbaritem xlink:href=".uno:DBFormDelete"/>
|
|
||||||
<toolbar:toolbaritem xlink:href=".uno:DBFormRename"/>
|
|
||||||
<toolbar:toolbarseparator/>
|
|
||||||
--
|
|
||||||
2.31.1
|
|
||||||
|
|
||||||
Loading…
Reference in new issue