[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sw/qa sw/source
sw/qa/extras/ooxmlexport/data/tdf123705.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport8.cxx|4
sw/source/filter/ww8/docxattributeoutput.cxx |3 +++
3 files changed, 7 insertions(+)
New commits:
commit a1e44657ef62488076b0f4cfd271d0a73cbff7d3
Author: Julien Nabet
AuthorDate: Tue Feb 26 19:06:59 2019 +0100
Commit: Miklos Vajna
CommitDate: Tue Apr 2 09:08:32 2019 +0200
tdf#123705: avoid duplicate themeColor
See http://bugs.documentfoundation.org/attachment.cgi?id=149585
+ https://bugs.documentfoundation.org/show_bug.cgi?id=123705#c4
Change-Id: I3c6fb0a1ac46a62c75bb9daeaded1633889416eb
Reviewed-on: https://gerrit.libreoffice.org/68398
Reviewed-by: Julien Nabet
(cherry picked from commit 42398e3860aafd6468688eda6c0da942323b7f82)
Reviewed-on: https://gerrit.libreoffice.org/68614
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/sw/qa/extras/ooxmlexport/data/tdf123705.docx
b/sw/qa/extras/ooxmlexport/data/tdf123705.docx
new file mode 100644
index ..46e053fd464e
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf123705.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
index 66e2228fb368..34a95b685d89 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
@@ -992,6 +992,10 @@ DECLARE_OOXMLEXPORT_TEST(testN830205, "n830205.docx")
getParagraph(1, "XXX");
}
+DECLARE_OOXMLEXPORT_TEST(tdf123705, "tdf123705.docx")
+{
+}
+
DECLARE_OOXMLEXPORT_TEST(testTableAutoColumnFixedSize,
"table-auto-column-fixed-size.docx")
{
uno::Reference xTablesSupplier(mxComponent,
uno::UNO_QUERY);
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index e332bee8d747..366670f86974 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -2753,6 +2753,8 @@ void DocxAttributeOutput::Redline( const SwRedlineData*
pRedlineData)
// we are done exporting the redline attributes.
rtl::Reference
pFontsAttrList_Original(m_pFontsAttrList);
m_pFontsAttrList.clear();
+rtl::Reference
pColorAttrList_Original(m_pColorAttrList);
+m_pColorAttrList.clear();
rtl::Reference
pEastAsianLayoutAttrList_Original(m_pEastAsianLayoutAttrList);
m_pEastAsianLayoutAttrList.clear();
rtl::Reference
pCharLangAttrList_Original(m_pCharLangAttrList);
@@ -2766,6 +2768,7 @@ void DocxAttributeOutput::Redline( const SwRedlineData*
pRedlineData)
// Revert back the original values that were stored in
'm_pFontsAttrList', 'm_pEastAsianLayoutAttrList', 'm_pCharLangAttrList'
m_pFontsAttrList = pFontsAttrList_Original;
+m_pColorAttrList = pColorAttrList_Original;
m_pEastAsianLayoutAttrList =
pEastAsianLayoutAttrList_Original;
m_pCharLangAttrList = pCharLangAttrList_Original;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/registry
connectivity/registry/mysql_jdbc/org/openoffice/Office/DataAccess/Drivers.xcu | 15 ++ connectivity/registry/mysqlc/org/openoffice/Office/DataAccess/Drivers.xcu |5 +++ 2 files changed, 20 insertions(+) New commits: commit 3149ffea4c7285ceebe990640cbfb74d2e10e7e0 Author: Julien Nabet AuthorDate: Tue Mar 26 21:19:15 2019 +0100 Commit: Julien Nabet CommitDate: Wed Mar 27 08:41:22 2019 +0100 tdf#123999: ParameterNameSubstitution in mysqljdbc See https://bugs.documentfoundation.org/show_bug.cgi?id=123999#c14 Change-Id: I47ff6171c873c701794f179b924005c43551ba21 Reviewed-on: https://gerrit.libreoffice.org/69770 Reviewed-by: Julien Nabet Tested-by: Julien Nabet diff --git a/connectivity/registry/mysql_jdbc/org/openoffice/Office/DataAccess/Drivers.xcu b/connectivity/registry/mysql_jdbc/org/openoffice/Office/DataAccess/Drivers.xcu index cae8f705618e..a4e95b04fe9b 100644 --- a/connectivity/registry/mysql_jdbc/org/openoffice/Office/DataAccess/Drivers.xcu +++ b/connectivity/registry/mysql_jdbc/org/openoffice/Office/DataAccess/Drivers.xcu @@ -41,6 +41,11 @@ true + + +true + + @@ -115,6 +120,11 @@ true + + +true + + @@ -194,6 +204,11 @@ true + + +true + + diff --git a/connectivity/registry/mysqlc/org/openoffice/Office/DataAccess/Drivers.xcu b/connectivity/registry/mysqlc/org/openoffice/Office/DataAccess/Drivers.xcu index 04b3999d9d56..1b83115dc7d0 100644 --- a/connectivity/registry/mysqlc/org/openoffice/Office/DataAccess/Drivers.xcu +++ b/connectivity/registry/mysqlc/org/openoffice/Office/DataAccess/Drivers.xcu @@ -52,6 +52,11 @@ true + + +true + + true ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - connectivity/registry
connectivity/registry/mysql_jdbc/org/openoffice/Office/DataAccess/Drivers.xcu | 15 ++ connectivity/registry/mysqlc/org/openoffice/Office/DataAccess/Drivers.xcu |5 +++ 2 files changed, 20 insertions(+) New commits: commit 15f4f8b7bfd666d69381696fe288da24302d2ecd Author: Julien Nabet AuthorDate: Tue Mar 26 21:19:15 2019 +0100 Commit: Julien Nabet CommitDate: Wed Mar 27 14:13:56 2019 +0100 tdf#123999: ParameterNameSubstitution in mysqljdbc See https://bugs.documentfoundation.org/show_bug.cgi?id=123999#c14 Change-Id: I47ff6171c873c701794f179b924005c43551ba21 (cherry picked from commit 3149ffea4c7285ceebe990640cbfb74d2e10e7e0) Reviewed-on: https://gerrit.libreoffice.org/69786 Reviewed-by: Lionel Elie Mamane Tested-by: Jenkins diff --git a/connectivity/registry/mysql_jdbc/org/openoffice/Office/DataAccess/Drivers.xcu b/connectivity/registry/mysql_jdbc/org/openoffice/Office/DataAccess/Drivers.xcu index cae8f705618e..a4e95b04fe9b 100644 --- a/connectivity/registry/mysql_jdbc/org/openoffice/Office/DataAccess/Drivers.xcu +++ b/connectivity/registry/mysql_jdbc/org/openoffice/Office/DataAccess/Drivers.xcu @@ -41,6 +41,11 @@ true + + +true + + @@ -115,6 +120,11 @@ true + + +true + + @@ -194,6 +204,11 @@ true + + +true + + diff --git a/connectivity/registry/mysqlc/org/openoffice/Office/DataAccess/Drivers.xcu b/connectivity/registry/mysqlc/org/openoffice/Office/DataAccess/Drivers.xcu index eccf516fea9a..40e52a03b98c 100644 --- a/connectivity/registry/mysqlc/org/openoffice/Office/DataAccess/Drivers.xcu +++ b/connectivity/registry/mysqlc/org/openoffice/Office/DataAccess/Drivers.xcu @@ -51,6 +51,11 @@ true + + +true + + true ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - icon-themes/sifr icon-themes/sifr_dark icon-themes/sifr_svg sw/uiconfig
icon-themes/sifr/cmd/lc_choosedesign.png |binary icon-themes/sifr/cmd/lc_dataincolumns.png|binary icon-themes/sifr/cmd/lc_datainrows.png |binary icon-themes/sifr/cmd/lc_formdesigntools.png |binary icon-themes/sifr/cmd/lc_outputqualityblackwhite.png |binary icon-themes/sifr/cmd/lc_outputqualitycolor.png |binary icon-themes/sifr/cmd/lc_outputqualitygrayscale.png |binary icon-themes/sifr/cmd/lc_showmultiplepages.png|binary icon-themes/sifr/cmd/lc_showtwopages.png |binary icon-themes/sifr/cmd/lc_signature.png|binary icon-themes/sifr/cmd/lc_signaturelinedialog.png |binary icon-themes/sifr/cmd/lc_signpdf.png |binary icon-themes/sifr/cmd/lc_tabledesign.png |binary icon-themes/sifr_dark/cmd/lc_choosedesign.png|binary icon-themes/sifr_dark/cmd/lc_dataincolumns.png |binary icon-themes/sifr_dark/cmd/lc_datainrows.png |binary icon-themes/sifr_dark/cmd/lc_formdesigntools.png |binary icon-themes/sifr_dark/cmd/lc_outputqualityblackwhite.png |binary icon-themes/sifr_dark/cmd/lc_outputqualitycolor.png |binary icon-themes/sifr_dark/cmd/lc_outputqualitygrayscale.png |binary icon-themes/sifr_dark/cmd/lc_showmultiplepages.png |binary icon-themes/sifr_dark/cmd/lc_showtwopages.png|binary icon-themes/sifr_dark/cmd/lc_signature.png |binary icon-themes/sifr_dark/cmd/lc_signaturelinedialog.png |binary icon-themes/sifr_dark/cmd/lc_signpdf.png |binary icon-themes/sifr_dark/cmd/lc_tabledesign.png |binary icon-themes/sifr_svg/cmd/lc_choosedesign.svg |6 ++ icon-themes/sifr_svg/cmd/lc_dataincolumns.svg|6 ++ icon-themes/sifr_svg/cmd/lc_datainrows.svg |6 ++ icon-themes/sifr_svg/cmd/lc_formdesigntools.svg |6 ++ icon-themes/sifr_svg/cmd/lc_outputqualityblackwhite.svg | 10 ++ icon-themes/sifr_svg/cmd/lc_outputqualitycolor.svg | 10 ++ icon-themes/sifr_svg/cmd/lc_outputqualitygrayscale.svg | 10 ++ icon-themes/sifr_svg/cmd/lc_showmultiplepages.svg|6 ++ icon-themes/sifr_svg/cmd/lc_showtwopages.svg |6 ++ icon-themes/sifr_svg/cmd/lc_signature.svg|6 ++ icon-themes/sifr_svg/cmd/lc_signaturelinedialog.svg |6 ++ icon-themes/sifr_svg/cmd/lc_signpdf.svg |6 ++ icon-themes/sifr_svg/cmd/lc_tabledesign.svg |6 ++ icon-themes/sifr_svg/cmd/sc_outputqualityblackwhite.svg |2 +- icon-themes/sifr_svg/cmd/sc_outputqualitycolor.svg |2 +- sw/uiconfig/swriter/ui/tocindexpage.ui | 14 +++--- 42 files changed, 99 insertions(+), 9 deletions(-) New commits: commit 1971c61ac750e76f33869c323a9e8abe8201cd99 Author: Julien Nabet AuthorDate: Sat Mar 23 14:13:19 2019 +0100 Commit: Andras Timar CommitDate: Sun Mar 24 21:11:02 2019 +0100 tdf#124240: make type in TOC translatable Change-Id: Ie3e713786b096657571d0abe0806b1d45d2b5341 Reviewed-on: https://gerrit.libreoffice.org/69585 Tested-by: Jenkins Reviewed-by: Andras Timar diff --git a/sw/uiconfig/swriter/ui/tocindexpage.ui b/sw/uiconfig/swriter/ui/tocindexpage.ui index 90c5c6e2fa34..4d37bd9f0216 100644 --- a/sw/uiconfig/swriter/ui/tocindexpage.ui +++ b/sw/uiconfig/swriter/ui/tocindexpage.ui @@ -122,13 +122,13 @@ False start - Table of Contents - Alphabetical Index - Table of Figures - Index of Tables - User-Defined - Table of Objects - Bibliography + Table of Contents + Alphabetical Index + Table of Figures + Index of Tables + User-Defined + Table of Objects + Bibliography commit 8bf372672fe404251dd4d9e0d98d5282bbf8069c Author: andreas kainz AuthorDate: Sat Mar 23 22:59:12 2019 +0100 Commit: andreas_kainz CommitDate: Sun Mar 24 21:02:49 2019 +0100 Sifr icon theme update lc_ Change-Id: Id5c80072ac15a1cf2b04fdbcc94e4d506570491a Reviewed-on: https://gerrit.libreoffice.org/69593 Tested-by: Jenkins Reviewed-by: andreas_kainz diff --git a/icon-themes/sifr/cmd/lc_choosedesign.png b/icon-themes/sifr/cmd/lc_choosedesign.png new file mode 100644 index ..61353c3490de Binary files /dev/null and b/icon-themes/sifr/cmd/lc_choosedesign.png differ diff --git a/icon-themes/sifr/cmd/lc_dataincolumns.png
[Libreoffice-commits] core.git: oox/source
oox/source/export/shapes.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 75b0d906e386dae635ca51564da42d62928ffba9 Author: Julien Nabet AuthorDate: Sat Apr 6 11:19:07 2019 +0200 Commit: Julien Nabet CommitDate: Sat Apr 6 12:09:49 2019 +0200 Fix 6a9cf9ba2d37fee9b7c2f190b347e0d7c4a2676a Change-Id: If025c21f3961372f861c8bb9df722fbdae5cc3cb Reviewed-on: https://gerrit.libreoffice.org/70339 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx index 0b28f58003a7..a67fed10124c 100644 --- a/oox/source/export/shapes.cxx +++ b/oox/source/export/shapes.cxx @@ -1165,7 +1165,7 @@ void ShapeExport::WriteGraphicObjectShapePart( const Reference< XShape >& xShape mpURLTransformer->isExternalURL(sURL)); mpFS->singleElementNS( XML_a, XML_hlinkClick, -FSNS( XML_r,XML_id ), USS( sRelId ), +FSNS( XML_r,XML_id ), OUStringToOString( sRelId, RTL_TEXTENCODING_UTF8 ).getStr(), FSEND ); } pFS->endElementNS(mnXmlNamespace, XML_cNvPr); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/source
oox/source/export/shapes.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 88e17ec42b60004b95fbe44b4100c83eddbaf4e6 Author: Julien Nabet AuthorDate: Sat Apr 6 13:12:50 2019 +0200 Commit: Julien Nabet CommitDate: Sat Apr 6 14:02:57 2019 +0200 Follow 4a4b1df72909fe96acdbcb95f90e30bd1a79c5eb Change-Id: I46d62ec8b7f5347fe7a69e6eb7ac0f1affcfd5b8 Reviewed-on: https://gerrit.libreoffice.org/70342 Reviewed-by: Mike Kaganski Tested-by: Jenkins diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx index a67fed10124c..ecc14705a75b 100644 --- a/oox/source/export/shapes.cxx +++ b/oox/source/export/shapes.cxx @@ -1165,7 +1165,7 @@ void ShapeExport::WriteGraphicObjectShapePart( const Reference< XShape >& xShape mpURLTransformer->isExternalURL(sURL)); mpFS->singleElementNS( XML_a, XML_hlinkClick, -FSNS( XML_r,XML_id ), OUStringToOString( sRelId, RTL_TEXTENCODING_UTF8 ).getStr(), +FSNS( XML_r,XML_id ), sRelId.toUtf8(), FSEND ); } pFS->endElementNS(mnXmlNamespace, XML_cNvPr); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/ui/dlg/dbfindex.hxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 27ac7f9bcfafde845dcd1979272b66301a75f53c
Author: Julien Nabet
AuthorDate: Thu May 16 22:23:31 2019 +0200
Commit: Julien Nabet
CommitDate: Fri May 17 10:25:59 2019 +0200
Replace list by deque in dbfindex (dbaccess)
Change-Id: I9503cce6eff31f08c2762940b881ba1dc8633288
goal: to get rid of std::list when not mandatory
Reviewed-on: https://gerrit.libreoffice.org/72434
Reviewed-by: Julien Nabet
Tested-by: Julien Nabet
diff --git a/dbaccess/source/ui/dlg/dbfindex.hxx
b/dbaccess/source/ui/dlg/dbfindex.hxx
index cd086c89b139..d0c23a416a5f 100644
--- a/dbaccess/source/ui/dlg/dbfindex.hxx
+++ b/dbaccess/source/ui/dlg/dbfindex.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_DBACCESS_SOURCE_UI_DLG_DBFINDEX_HXX
#include
-#include
+#include
namespace dbaui
{
@@ -40,7 +40,7 @@ public:
const OUString& GetIndexFileName() const { return aIndexFileName; }
};
-typedef std::list< OTableIndex > TableIndexList;
+typedef std::deque< OTableIndex > TableIndexList;
// OTableInfo
class ODbaseIndexDialog;
@@ -59,7 +59,7 @@ public:
void WriteInfFile( const OUString& rDSN ) const;
};
-typedef std::list< OTableInfo > TableInfoList;
+typedef std::deque< OTableInfo > TableInfoList;
// IndexDialog
class ODbaseIndexDialog : public weld::GenericDialogController
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/ui/dlg/dbfindex.cxx |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit 3c0003c9f0ff5bdc49da046a604a3d2c8cc5d5df Author: Julien Nabet AuthorDate: Thu May 16 22:01:45 2019 +0200 Commit: Julien Nabet CommitDate: Fri May 17 09:21:04 2019 +0200 tdf#125325: fix crash about index managements for dBase See bt here: https://bugs.documentfoundation.org/attachment.cgi?id=151468 Pb is aSearch becomes invalid after _rList.erase(aSearch); line 101 so just test aReturn.GetIndexFileName() isn't empty Change-Id: Iae5b3a7f76fe565f890bd23bfb2ce5d9c6134986 Reviewed-on: https://gerrit.libreoffice.org/72427 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx index 734af6e961bc..fe934b7914c0 100644 --- a/dbaccess/source/ui/dlg/dbfindex.cxx +++ b/dbaccess/source/ui/dlg/dbfindex.cxx @@ -107,8 +107,7 @@ OTableIndex ODbaseIndexDialog::implRemoveIndex(const OUString& _rName, TableInde else _rDisplay.select(static_cast(nPos)); } - -OSL_ENSURE(!_bMustExist || (aSearch != _rList.end()), "ODbaseIndexDialog::implRemoveIndex : did not find the index!"); +OSL_ENSURE(!_bMustExist || !aReturn.GetIndexFileName().isEmpty(), "ODbaseIndexDialog::implRemoveIndex : did not find the index!"); return aReturn; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/print2.cxx |4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
New commits:
commit 7f3d3e74fdcffb55da7fd7f55ac4c1f85d35745c
Author: Julien Nabet
AuthorDate: Fri May 24 22:36:23 2019 +0200
Commit: Julien Nabet
CommitDate: Fri May 24 23:33:14 2019 +0200
tdf#125472: fix RemoveTransparenciesFromMetaFile(vcl/gdi)
Regression from:
https://cgit.freedesktop.org/libreoffice/core/commit/?id=3ff0c23b54ba4e7a534693ba25a3ffb27d1c18e1
+ some slight simplification
Change-Id: Ifa9d4d7d27e80217f778f3625ef4437828600dd3
Reviewed-on: https://gerrit.libreoffice.org/72922
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/vcl/source/gdi/print2.cxx b/vcl/source/gdi/print2.cxx
index 1ca7014778f5..2aec6add9634 100644
--- a/vcl/source/gdi/print2.cxx
+++ b/vcl/source/gdi/print2.cxx
@@ -917,8 +917,6 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const
GDIMetaFile& rInMtf,
bTreatSpecial = true;
}
-ConnectedComponentsList::iterator aCurrCC;
-const ConnectedComponentsList::iterator aLastCC( aCCList.end()
);
boolbSomeComponentsChanged;
// now, this is unfortunate: since changing anyone of
@@ -934,7 +932,7 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const
GDIMetaFile& rInMtf,
bSomeComponentsChanged = false;
// iterate over all current members of aCCList
-for( aCurrCC=aCCList.begin(); aCurrCC != aLastCC; )
+for( auto aCurrCC=aCCList.begin(); aCurrCC !=
aCCList.end(); )
{
// first check if current element's bounds are
// empty. This ensures that empty actions are not
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/uiconfig dbaccess/uiconfig svx/uiconfig
cui/uiconfig/ui/fontfragment.ui |2 +- dbaccess/uiconfig/ui/migrwarndlg.ui |2 +- svx/uiconfig/ui/charsetmenu.ui |2 +- 3 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 47e402169a2e84eb396aa1ef580ca1d9e6125880 Author: Julien Nabet AuthorDate: Mon May 27 22:04:46 2019 +0200 Commit: Julien Nabet CommitDate: Tue May 28 09:44:51 2019 +0200 Fix domain in ui files (cui, dbaccess, svx) Change-Id: I6c09bf2af4b902fdc215ec31bf2dad490e41384e Reviewed-on: https://gerrit.libreoffice.org/73066 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/cui/uiconfig/ui/fontfragment.ui b/cui/uiconfig/ui/fontfragment.ui index 880208c86b49..d57a3695672c 100644 --- a/cui/uiconfig/ui/fontfragment.ui +++ b/cui/uiconfig/ui/fontfragment.ui @@ -1,6 +1,6 @@ - + True diff --git a/dbaccess/uiconfig/ui/migrwarndlg.ui b/dbaccess/uiconfig/ui/migrwarndlg.ui index c504f9b2ac9f..5f25d767a182 100644 --- a/dbaccess/uiconfig/ui/migrwarndlg.ui +++ b/dbaccess/uiconfig/ui/migrwarndlg.ui @@ -1,6 +1,6 @@ - + False diff --git a/svx/uiconfig/ui/charsetmenu.ui b/svx/uiconfig/ui/charsetmenu.ui index 5511cc2c9201..5786eecfcde7 100644 --- a/svx/uiconfig/ui/charsetmenu.ui +++ b/svx/uiconfig/ui/charsetmenu.ui @@ -1,6 +1,6 @@ - + True ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extensions/test
extensions/test/ole/callUnoToJava.htm |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a461d9b2d941c44860b85df937239d982ea07d2c Author: Julien Nabet AuthorDate: Sat May 25 23:02:13 2019 +0200 Commit: Julien Nabet CommitDate: Sat May 25 23:03:34 2019 +0200 Revert "Fix typo" This reverts commit 66fb3ca7cd77c00eac79d8003aef57d78c1d357f. Change-Id: Ibbd6cb3ed2acbc82b676068d0bea21d05368943a Reviewed-on: https://gerrit.libreoffice.org/72967 Reviewed-by: Julien Nabet Tested-by: Julien Nabet diff --git a/extensions/test/ole/callUnoToJava.htm b/extensions/test/ole/callUnoToJava.htm index bb4194a56e19..3b9bf1b2f552 100644 --- a/extensions/test/ole/callUnoToJava.htm +++ b/extensions/test/ole/callUnoToJava.htm @@ -515,7 +515,7 @@ as out parameter. short long -Other test without parameters +Other test with out parameters outValuesMixed outValuesAll in out parameter ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/uiconfig svtools/uiconfig
sfx2/uiconfig/ui/charviewmenu.ui |2 +- svtools/uiconfig/ui/datewindow.ui |2 +- svtools/uiconfig/ui/linewindow.ui |2 +- 3 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 8e2bd8fb1d6f3414b6ade29e37bfcc0dcf3ea038 Author: Julien Nabet AuthorDate: Mon May 27 22:08:29 2019 +0200 Commit: Caolán McNamara CommitDate: Tue May 28 10:20:53 2019 +0200 Fix domain in ui files (sfx2, svtools) Change-Id: Icfa8a2d2f6283b0961aa99debadf1e3d29ddaa53 Reviewed-on: https://gerrit.libreoffice.org/73068 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/sfx2/uiconfig/ui/charviewmenu.ui b/sfx2/uiconfig/ui/charviewmenu.ui index f0ff54ec195b..ab7a2a3e5aad 100644 --- a/sfx2/uiconfig/ui/charviewmenu.ui +++ b/sfx2/uiconfig/ui/charviewmenu.ui @@ -1,6 +1,6 @@ - + True diff --git a/svtools/uiconfig/ui/datewindow.ui b/svtools/uiconfig/ui/datewindow.ui index 84d7ebf4931c..bce2ff038a94 100644 --- a/svtools/uiconfig/ui/datewindow.ui +++ b/svtools/uiconfig/ui/datewindow.ui @@ -1,6 +1,6 @@ - + False diff --git a/svtools/uiconfig/ui/linewindow.ui b/svtools/uiconfig/ui/linewindow.ui index e316a62cd36a..edcce5e72245 100644 --- a/svtools/uiconfig/ui/linewindow.ui +++ b/svtools/uiconfig/ui/linewindow.ui @@ -1,6 +1,6 @@ - + False ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: editeng/source
editeng/source/editeng/editdoc.cxx | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) New commits: commit e8f4bf9df5b6a9b24256d00462d94c430e319134 Author: Julien Nabet AuthorDate: Mon May 27 20:52:18 2019 +0200 Commit: Julien Nabet CommitDate: Tue May 28 10:21:53 2019 +0200 Add comment about this "weird assignment" in editdoc See http://document-foundation-mail-archive.969070.n3.nabble.com/Fishy-assignment-in-editdoc-editeng-td4262109.html Remove the previous comment less clear Change-Id: I06b0bc3254068d58146d9582c2b69afbadbe56ee Reviewed-on: https://gerrit.libreoffice.org/73062 Reviewed-by: Stephan Bergmann Tested-by: Jenkins diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx index 63990e4c9121..73a356054741 100644 --- a/editeng/source/editeng/editdoc.cxx +++ b/editeng/source/editeng/editdoc.cxx @@ -2025,10 +2025,12 @@ void CreateFont( SvxFont& rFont, const SfxItemSet& rSet, bool bSearchInParent, S if ( bSearchInParent || ( rSet.GetItemState( EE_CHAR_RELIEF ) == SfxItemState::SET ) ) rFont.SetRelief( rSet.Get( EE_CHAR_RELIEF ).GetValue() ); -// If comparing the entire font, or if checking before each alteration -// whether the value changes, remains relatively the same thing. -// So possible one MakeUniqFont more in the font, but as a result a quicker -// abortion of the query, or one must each time check bChanged. +// Operator == compares the individual members of the font if the impl pointer is +// not equal. If all members are the same, this assignment makes +// sure that both also point to the same internal instance of the font. +// To avoid this assignment, you would need to check in +// every if statement above whether or not the new value differs from the +// old value before making an assignment. if ( rFont == aPrevFont ) rFont = aPrevFont; // => The same ImpPointer for IsSameInstance } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/inc framework/source sfx2/source
framework/inc/jobs/jobdata.hxx|4 ++-- framework/source/services/desktop.cxx |2 +- sfx2/source/doc/objstor.cxx |4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) New commits: commit 4195323c05244688a093e95bd75c1e4d504a1a60 Author: Julien Nabet AuthorDate: Sat Jun 8 10:18:48 2019 +0200 Commit: Julien Nabet CommitDate: Sat Jun 8 10:19:32 2019 +0200 Typos Change-Id: If8a5aaba35afb270ce30d49b55a0106e020dfbe0 Reviewed-on: https://gerrit.libreoffice.org/73695 Reviewed-by: Julien Nabet Tested-by: Julien Nabet diff --git a/framework/inc/jobs/jobdata.hxx b/framework/inc/jobs/jobdata.hxx index 5a8f9ce12d9d..af48cea7b242 100644 --- a/framework/inc/jobs/jobdata.hxx +++ b/framework/inc/jobs/jobdata.hxx @@ -151,9 +151,9 @@ class JobData final a job can be registered for an event. It can be an empty value! But it will be set from outside any times. Because it's not clear which job this instance should represent if an event -(instaed of an alias) comes in. Because there can be multiple registrations +(instead of an alias) comes in. Because there can be multiple registrations for this event. We use this information only, to merge it with the job specific -arguments. A job can be called so, with a) it's onw config data and b) some dynamic +arguments. A job can be called so, with a) its own config data and b) some dynamic environment data. */ OUString m_sEvent; diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx index 8a91db555c14..5f0ebc707292 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -182,7 +182,7 @@ Desktop::Desktop( const css::uno::Reference< css::uno::XComponentContext >& xCon /*- @short standard destructor -@descr This one do NOTHING! Use dispose() instaed of this. +@descr This one do NOTHING! Use dispose() instead of this. @seealsomethod dispose() *//*-*/ diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index e0feb44ccfae..009f48b27ba5 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -2081,7 +2081,7 @@ bool SfxObjectShell::ConvertFrom Files which are to be opened here should be opened through 'rMedium' to guarantee the right open modes. Especially if the format is retained -(only possible with SfxFilterFlags::SIMULATE or SfxFilterFlags::ONW) file which must +(only possible with SfxFilterFlags::SIMULATE or SfxFilterFlags::OWN) file which must be opened STREAM_SHARE_DENYWRITE. [Return value] @@ -2444,7 +2444,7 @@ bool SfxObjectShell::ConvertTo Files which are to be opened here should be opened through 'rMedium' to guarantee the right open modes. Especially if the format is retained -(only possible with SfxFilterFlags::SIMULATE or SfxFilterFlags::ONW) file which must +(only possible with SfxFilterFlags::SIMULATE or SfxFilterFlags::OWN) file which must be opened STREAM_SHARE_DENYWRITE. [Return value] ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/core/misc/dsntypes.cxx |9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
New commits:
commit d34ed0008f12cfe47dd239672f1941f3c54d97fd
Author: Julien Nabet
AuthorDate: Sun May 19 21:08:52 2019 +0200
Commit: Julien Nabet
CommitDate: Sat Jun 8 16:43:46 2019 +0200
tdf#125381: Manage URLs beginning with an "~" in cutPrefix
(dbaccess/dsntypes)
On Windows or with other renderings than gtk3, the urls may begin with an ~
In this case, cutPrefix returns only empty string
When trying to access Index management for odb files related to dBase
indexes don't display because cutPrefix returns empty url
in dbaccess/source/ui/dlg/detailpages.cxx line 200
198 ::dbaccess::ODsnTypeCollection* pTypeCollection = pTypesItem ?
pTypesItem->getCollection() : nullptr;
199 if (pTypeCollection && pUrlItem &&
pUrlItem->GetValue().getLength())
200 m_sDsn = pTypeCollection->cutPrefix(pUrlItem->GetValue());
Change-Id: I47360e205ddea7b060a31da697bbe9857ad3f4c0
Reviewed-on: https://gerrit.libreoffice.org/72568
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/dbaccess/source/core/misc/dsntypes.cxx
b/dbaccess/source/core/misc/dsntypes.cxx
index 05e64ba5a001..7332ccffa196 100644
--- a/dbaccess/source/core/misc/dsntypes.cxx
+++ b/dbaccess/source/core/misc/dsntypes.cxx
@@ -83,17 +83,20 @@ OUString ODsnTypeCollection::cutPrefix(const OUString&
_sURL) const
OUString sRet;
OUString sOldPattern;
+// on Windows or with gen rendering, the urls may begin with an ~
+const OUString& sCleanURL = comphelper::string::stripStart(_sURL, '~');
+
for (auto const& dsnPrefix : m_aDsnPrefixes)
{
WildCard aWildCard(dsnPrefix);
-if ( sOldPattern.getLength() < dsnPrefix.getLength() &&
aWildCard.Matches(_sURL) )
+if ( sOldPattern.getLength() < dsnPrefix.getLength() &&
aWildCard.Matches(sCleanURL) )
{
// This relies on the fact that all patterns are of the form
// foo*
// that is, the very concept of "prefix" applies.
OUString prefix(comphelper::string::stripEnd(dsnPrefix, '*'));
-OSL_ENSURE(prefix.getLength() <= _sURL.getLength(), "How can A
match B when A shorter than B?");
-sRet = _sURL.copy(prefix.getLength());
+OSL_ENSURE(prefix.getLength() <= sCleanURL.getLength(), "How can A
match B when A shorter than B?");
+sRet = sCleanURL.copy(prefix.getLength());
sOldPattern = dsnPrefix;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit c22d5474388354341fd49530556b594325a3afaf
Author: Julien Nabet
AuthorDate: Sat Jun 8 19:55:48 2019 +0200
Commit: Julien Nabet
CommitDate: Sat Jun 8 20:56:03 2019 +0200
Typo xEqationProperties->xEquationProperties
Change-Id: I960506d2aaf0cf3f36f7af4bfa43169bb0afda5a
Reviewed-on: https://gerrit.libreoffice.org/73720
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx
b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx
index 1c42c5b7e6f2..1f4d7ef504fe 100644
--- a/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx
+++ b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx
@@ -167,7 +167,7 @@ void SchXMLEquationContext::StartElement( const
uno::Reference< xml::sax::XAttri
if( !sAutoStyleName.isEmpty() || bShowEquation || bShowRSquare )
{
-uno::Reference< beans::XPropertySet > xEqationProperties =
chart2::RegressionEquation::create( comphelper::getProcessComponentContext() );
+uno::Reference< beans::XPropertySet > xEquationProperties =
chart2::RegressionEquation::create( comphelper::getProcessComponentContext() );
if( !sAutoStyleName.isEmpty() )
{
@@ -181,20 +181,20 @@ void SchXMLEquationContext::StartElement( const
uno::Reference< xml::sax::XAttri
const_cast< XMLPropStyleContext* >( dynamic_cast< const
XMLPropStyleContext* >( pStyle ));
if( pPropStyleContext )
-pPropStyleContext->FillPropertySet( xEqationProperties );
+pPropStyleContext->FillPropertySet( xEquationProperties );
}
}
-xEqationProperties->setPropertyValue( "ShowEquation", uno::makeAny(
bShowEquation ));
-xEqationProperties->setPropertyValue( "ShowCorrelationCoefficient",
uno::makeAny( bShowRSquare ));
+xEquationProperties->setPropertyValue( "ShowEquation", uno::makeAny(
bShowEquation ));
+xEquationProperties->setPropertyValue( "ShowCorrelationCoefficient",
uno::makeAny( bShowRSquare ));
if( bHasXPos && bHasYPos )
{
chart2::RelativePosition aRelPos;
aRelPos.Primary = static_cast< double >( aPosition.X ) /
static_cast< double >( maChartSize.Width );
aRelPos.Secondary = static_cast< double >( aPosition.Y ) /
static_cast< double >( maChartSize.Height );
-xEqationProperties->setPropertyValue( "RelativePosition",
uno::makeAny( aRelPos ));
+xEquationProperties->setPropertyValue( "RelativePosition",
uno::makeAny( aRelPos ));
}
-mrRegressionStyle.m_xEquationProperties.set( xEqationProperties );
+mrRegressionStyle.m_xEquationProperties.set( xEquationProperties );
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sw/source
sw/source/filter/ww8/ww8par.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit baf574312c68df5674d78066f7bb468481caad40
Author: Julien Nabet
AuthorDate: Tue May 28 10:50:27 2019 +0200
Commit: Miklos Vajna
CommitDate: Thu May 30 09:20:47 2019 +0200
tdf#56738: fix encoding in comments in doc files (>= Word 97)
See https://bugs.documentfoundation.org/show_bug.cgi?id=56738#c3
Change-Id: I8dbab3fe76b2c2d83cbb07509fabe9f784664c03
Reviewed-on: https://gerrit.libreoffice.org/73088
(cherry picked from commit fd01ddd3094dd080a455665342316c79dbee8390)
Reviewed-on: https://gerrit.libreoffice.org/73157
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 70a3e9b44977..00c57b690977 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -2809,7 +2809,9 @@ rtl_TextEncoding SwWW8ImplReader::GetCurrentCharSet()
rtl_TextEncoding eSrcCharSet = m_eHardCharSet;
if (eSrcCharSet == RTL_TEXTENCODING_DONTKNOW)
{
-if (!m_aFontSrcCharSets.empty())
+if (!m_bVer67)
+eSrcCharSet = GetCharSetFromLanguage();
+else if (!m_aFontSrcCharSets.empty())
eSrcCharSet = m_aFontSrcCharSets.top();
if ((eSrcCharSet == RTL_TEXTENCODING_DONTKNOW) && m_nCharFormat >= 0
&& static_cast(m_nCharFormat) < m_vColl.size() )
eSrcCharSet = m_vColl[m_nCharFormat].GetCharSet();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/ww8par.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit fd01ddd3094dd080a455665342316c79dbee8390
Author: Julien Nabet
AuthorDate: Tue May 28 10:50:27 2019 +0200
Commit: Julien Nabet
CommitDate: Wed May 29 14:43:20 2019 +0200
tdf#56738: fix encoding in comments in doc files (>= Word 97)
See https://bugs.documentfoundation.org/show_bug.cgi?id=56738#c3
Change-Id: I8dbab3fe76b2c2d83cbb07509fabe9f784664c03
Reviewed-on: https://gerrit.libreoffice.org/73088
Reviewed-by: Julien Nabet
Tested-by: Julien Nabet
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 04b65f16c3f9..67b25521ff43 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -2822,7 +2822,9 @@ rtl_TextEncoding SwWW8ImplReader::GetCurrentCharSet()
rtl_TextEncoding eSrcCharSet = m_eHardCharSet;
if (eSrcCharSet == RTL_TEXTENCODING_DONTKNOW)
{
-if (!m_aFontSrcCharSets.empty())
+if (!m_bVer67)
+eSrcCharSet = GetCharSetFromLanguage();
+else if (!m_aFontSrcCharSets.empty())
eSrcCharSet = m_aFontSrcCharSets.top();
if ((eSrcCharSet == RTL_TEXTENCODING_DONTKNOW) && m_nCharFormat >= 0
&& static_cast(m_nCharFormat) < m_vColl.size() )
eSrcCharSet = m_vColl[m_nCharFormat].GetCharSet();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/uiconfig
sc/uiconfig/scalc/ui/dataformfragment.ui |2 +- sc/uiconfig/scalc/ui/passfragment.ui |2 +- sc/uiconfig/scalc/ui/recalcquerydialog.ui |2 +- 3 files changed, 3 insertions(+), 3 deletions(-) New commits: commit b8c0edc4dc4f976f27a25ca854a4c6d519dd31d3 Author: Julien Nabet AuthorDate: Mon May 27 21:52:43 2019 +0200 Commit: Caolán McNamara CommitDate: Tue May 28 10:05:04 2019 +0200 Fix domain in ui files (sc) Change-Id: I1cb5d3e6a1bf3c18b637273ed4fac671ad12354e Reviewed-on: https://gerrit.libreoffice.org/73065 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/sc/uiconfig/scalc/ui/dataformfragment.ui b/sc/uiconfig/scalc/ui/dataformfragment.ui index 0bdeffa9fc98..9b1bcf14a7ae 100644 --- a/sc/uiconfig/scalc/ui/dataformfragment.ui +++ b/sc/uiconfig/scalc/ui/dataformfragment.ui @@ -1,6 +1,6 @@ - + True diff --git a/sc/uiconfig/scalc/ui/passfragment.ui b/sc/uiconfig/scalc/ui/passfragment.ui index ad89c0038f77..e7f3f0a131c1 100644 --- a/sc/uiconfig/scalc/ui/passfragment.ui +++ b/sc/uiconfig/scalc/ui/passfragment.ui @@ -1,6 +1,6 @@ - + True diff --git a/sc/uiconfig/scalc/ui/recalcquerydialog.ui b/sc/uiconfig/scalc/ui/recalcquerydialog.ui index 04c185f63326..b66f326f31df 100644 --- a/sc/uiconfig/scalc/ui/recalcquerydialog.ui +++ b/sc/uiconfig/scalc/ui/recalcquerydialog.ui @@ -1,6 +1,6 @@ - + False ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - dbaccess/source
dbaccess/source/core/misc/dsntypes.cxx |9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 3ddccc28c0893ded5a31e1c1d023af22f6ec160f
Author: Julien Nabet
AuthorDate: Sun May 19 21:08:52 2019 +0200
Commit: Xisco Faulí
CommitDate: Thu Jun 13 11:13:29 2019 +0200
tdf#125381: Manage URLs beginning with an "~" in cutPrefix
(dbaccess/dsntypes)
On Windows or with other renderings than gtk3, the urls may begin with an ~
In this case, cutPrefix returns only empty string
When trying to access Index management for odb files related to dBase
indexes don't display because cutPrefix returns empty url
in dbaccess/source/ui/dlg/detailpages.cxx line 200
198 ::dbaccess::ODsnTypeCollection* pTypeCollection = pTypesItem ?
pTypesItem->getCollection() : nullptr;
199 if (pTypeCollection && pUrlItem &&
pUrlItem->GetValue().getLength())
200 m_sDsn = pTypeCollection->cutPrefix(pUrlItem->GetValue());
Change-Id: I47360e205ddea7b060a31da697bbe9857ad3f4c0
Reviewed-on: https://gerrit.libreoffice.org/72568
Reviewed-by: Julien Nabet
(cherry picked from commit d34ed0008f12cfe47dd239672f1941f3c54d97fd)
Reviewed-on: https://gerrit.libreoffice.org/73709
Tested-by: Jenkins
Reviewed-by: Xisco Faulí
(cherry picked from commit 27bd20cf5333a5df29286794b7384520fbc55012)
Reviewed-on: https://gerrit.libreoffice.org/73876
diff --git a/dbaccess/source/core/misc/dsntypes.cxx
b/dbaccess/source/core/misc/dsntypes.cxx
index aeca5a029655..8e88bb586c6c 100644
--- a/dbaccess/source/core/misc/dsntypes.cxx
+++ b/dbaccess/source/core/misc/dsntypes.cxx
@@ -84,17 +84,20 @@ OUString ODsnTypeCollection::cutPrefix(const OUString&
_sURL) const
OUString sRet;
OUString sOldPattern;
+// on Windows or with gen rendering, the urls may begin with an ~
+const OUString& sCleanURL = comphelper::string::stripStart(_sURL, '~');
+
for (auto const& dsnPrefix : m_aDsnPrefixes)
{
WildCard aWildCard(dsnPrefix);
-if ( sOldPattern.getLength() < dsnPrefix.getLength() &&
aWildCard.Matches(_sURL) )
+if ( sOldPattern.getLength() < dsnPrefix.getLength() &&
aWildCard.Matches(sCleanURL) )
{
// This relies on the fact that all patterns are of the form
// foo*
// that is, the very concept of "prefix" applies.
OUString prefix(comphelper::string::stripEnd(dsnPrefix, '*'));
-OSL_ENSURE(prefix.getLength() <= _sURL.getLength(), "How can A
match B when A shorter than B?");
-sRet = _sURL.copy(prefix.getLength());
+OSL_ENSURE(prefix.getLength() <= sCleanURL.getLength(), "How can A
match B when A shorter than B?");
+sRet = sCleanURL.copy(prefix.getLength());
sOldPattern = dsnPrefix;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - dbaccess/source
dbaccess/source/core/misc/dsntypes.cxx |9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 27bd20cf5333a5df29286794b7384520fbc55012
Author: Julien Nabet
AuthorDate: Sun May 19 21:08:52 2019 +0200
Commit: Xisco Faulí
CommitDate: Wed Jun 12 12:39:47 2019 +0200
tdf#125381: Manage URLs beginning with an "~" in cutPrefix
(dbaccess/dsntypes)
On Windows or with other renderings than gtk3, the urls may begin with an ~
In this case, cutPrefix returns only empty string
When trying to access Index management for odb files related to dBase
indexes don't display because cutPrefix returns empty url
in dbaccess/source/ui/dlg/detailpages.cxx line 200
198 ::dbaccess::ODsnTypeCollection* pTypeCollection = pTypesItem ?
pTypesItem->getCollection() : nullptr;
199 if (pTypeCollection && pUrlItem &&
pUrlItem->GetValue().getLength())
200 m_sDsn = pTypeCollection->cutPrefix(pUrlItem->GetValue());
Change-Id: I47360e205ddea7b060a31da697bbe9857ad3f4c0
Reviewed-on: https://gerrit.libreoffice.org/72568
Reviewed-by: Julien Nabet
(cherry picked from commit d34ed0008f12cfe47dd239672f1941f3c54d97fd)
Reviewed-on: https://gerrit.libreoffice.org/73709
Tested-by: Jenkins
Reviewed-by: Xisco Faulí
diff --git a/dbaccess/source/core/misc/dsntypes.cxx
b/dbaccess/source/core/misc/dsntypes.cxx
index 05e64ba5a001..7332ccffa196 100644
--- a/dbaccess/source/core/misc/dsntypes.cxx
+++ b/dbaccess/source/core/misc/dsntypes.cxx
@@ -83,17 +83,20 @@ OUString ODsnTypeCollection::cutPrefix(const OUString&
_sURL) const
OUString sRet;
OUString sOldPattern;
+// on Windows or with gen rendering, the urls may begin with an ~
+const OUString& sCleanURL = comphelper::string::stripStart(_sURL, '~');
+
for (auto const& dsnPrefix : m_aDsnPrefixes)
{
WildCard aWildCard(dsnPrefix);
-if ( sOldPattern.getLength() < dsnPrefix.getLength() &&
aWildCard.Matches(_sURL) )
+if ( sOldPattern.getLength() < dsnPrefix.getLength() &&
aWildCard.Matches(sCleanURL) )
{
// This relies on the fact that all patterns are of the form
// foo*
// that is, the very concept of "prefix" applies.
OUString prefix(comphelper::string::stripEnd(dsnPrefix, '*'));
-OSL_ENSURE(prefix.getLength() <= _sURL.getLength(), "How can A
match B when A shorter than B?");
-sRet = _sURL.copy(prefix.getLength());
+OSL_ENSURE(prefix.getLength() <= sCleanURL.getLength(), "How can A
match B when A shorter than B?");
+sRet = sCleanURL.copy(prefix.getLength());
sOldPattern = dsnPrefix;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - external/python3 scripting/source
external/python3/ExternalPackage_python3.mk |1 + scripting/source/pyprov/mailmerge.py|1 + 2 files changed, 2 insertions(+) New commits: commit 6459ec8046231e258d380efcdaac0a5def23276f Author: Julien Nabet AuthorDate: Sun Dec 18 19:17:53 2016 +0100 Commit: Michael Weghorn CommitDate: Mon Jun 17 21:18:39 2019 +0200 tdf#103363: add unicodedata and import idna encoding for mailmerge Thank you Moggi for your help on how to add unicodedata module to Python! Reviewed-on: https://gerrit.libreoffice.org/32140 Reviewed-by: Julien Nabet Tested-by: Julien Nabet (cherry picked from commit 486efbfc74890582b16f858b8e937d4ae9b66f64) Change-Id: I071e9279d1de4748f9443ac2d624fe925288e408 Reviewed-on: https://gerrit.libreoffice.org/74186 Reviewed-by: Michael Weghorn Tested-by: Michael Weghorn diff --git a/external/python3/ExternalPackage_python3.mk b/external/python3/ExternalPackage_python3.mk index 0bde9ae68c8a..9da2ed4d1957 100644 --- a/external/python3/ExternalPackage_python3.mk +++ b/external/python3/ExternalPackage_python3.mk @@ -112,6 +112,7 @@ $(eval $(call gb_ExternalPackage_add_files,python3,$(LIBO_BIN_FOLDER)/python-cor LO_lib/_testcapi.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ LO_lib/_testimportmultiple.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ LO_lib/_testmultiphase.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ + LO_lib/unicodedata.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ LO_lib/xxlimited.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ LO_lib/zlib.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ )) diff --git a/scripting/source/pyprov/mailmerge.py b/scripting/source/pyprov/mailmerge.py index c8867aa796d1..235472b2a85d 100644 --- a/scripting/source/pyprov/mailmerge.py +++ b/scripting/source/pyprov/mailmerge.py @@ -17,6 +17,7 @@ import unohelper import uno import re import os +import encodings.idna #to implement com::sun::star::mail::XMailServiceProvider #and ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source
filter/source/xsltfilter/LibXSLTTransformer.cxx |4 ++--
filter/source/xsltfilter/LibXSLTTransformer.hxx |4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit c77895fe6fd4f9f38ab00f29cb1e47e8544ebbec
Author: Julien Nabet
AuthorDate: Sat May 11 08:28:05 2019 +0200
Commit: Julien Nabet
CommitDate: Sat May 11 10:54:49 2019 +0200
Replace list by deque in xsltfilter
+ replace remove by erase remove idiom
+ use push_front instead of using insert at beginning
Change-Id: I3320a4e4cadeee05c7ca347987360c3c75fe6b3d
Reviewed-on: https://gerrit.libreoffice.org/72139
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/filter/source/xsltfilter/LibXSLTTransformer.cxx
b/filter/source/xsltfilter/LibXSLTTransformer.cxx
index acc81d4e1196..3be9e7351990 100644
--- a/filter/source/xsltfilter/LibXSLTTransformer.cxx
+++ b/filter/source/xsltfilter/LibXSLTTransformer.cxx
@@ -408,14 +408,14 @@ namespace XSLT
void
LibXSLTTransformer::addListener(const
css::uno::Reference& listener)
{
-m_listeners.insert(m_listeners.begin(), listener);
+m_listeners.push_front(listener);
}
void
LibXSLTTransformer::removeListener(
const css::uno::Reference& listener)
{
-m_listeners.remove(listener);
+m_listeners.erase( std::remove(m_listeners.begin(), m_listeners.end(),
listener ), m_listeners.end() );
}
void
diff --git a/filter/source/xsltfilter/LibXSLTTransformer.hxx
b/filter/source/xsltfilter/LibXSLTTransformer.hxx
index 7261978ed6ed..fb0b222ed29f 100644
--- a/filter/source/xsltfilter/LibXSLTTransformer.hxx
+++ b/filter/source/xsltfilter/LibXSLTTransformer.hxx
@@ -10,7 +10,7 @@
#ifndef INCLUDED_FILTER_SOURCE_XSLTFILTER_LIBXSLTTRANSFORMER_HXX
#define INCLUDED_FILTER_SOURCE_XSLTFILTER_LIBXSLTTRANSFORMER_HXX
-#include
+#include
#include
#include
@@ -109,7 +109,7 @@ namespace XSLT
css::uno::Reference m_rOutputStream;
-typedef ::std::list >
ListenerList;
+typedef ::std::deque >
ListenerList;
ListenerList m_listeners;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cppcanvas/qa
cppcanvas/qa/extras/emfplus/emfplus.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e748bd232b06604999daaf09fa8d209afa4e03f7
Author: Julien Nabet
AuthorDate: Mon May 13 21:12:41 2019 +0200
Commit: Julien Nabet
CommitDate: Mon May 13 22:48:33 2019 +0200
Fix emfplus.cxx cppcanvas/qa
/home/julien/lo/libreoffice/cppcanvas/qa/extras/emfplus/emfplus.cxx: In
member function ‘void testFdo77229::TestBody()’:
/home/julien/lo/libreoffice/cppcanvas/qa/extras/emfplus/emfplus.cxx:79:46:
error: ‘class BitmapColor’ has no member named ‘GetColor’; did you mean
‘getBColor’?
Color aColor(pAccess->GetPixel(142, 140).GetColor());
^~~~
getBColor
Change-Id: I7db2e678ddfadcbd55b3cb87613eeecb79d12ad5
Reviewed-on: https://gerrit.libreoffice.org/72253
Reviewed-by: Jan-Marek Glogowski
Tested-by: Jenkins
diff --git a/cppcanvas/qa/extras/emfplus/emfplus.cxx
b/cppcanvas/qa/extras/emfplus/emfplus.cxx
index b684d9ccee9a..13246ee24cec 100644
--- a/cppcanvas/qa/extras/emfplus/emfplus.cxx
+++ b/cppcanvas/qa/extras/emfplus/emfplus.cxx
@@ -76,7 +76,7 @@ CPPUNIT_TEST_FIXTURE(Test, testFdo77229)
Bitmap aBitmap = load("fdo77229.emf");
Bitmap::ScopedReadAccess pAccess(aBitmap);
// The green star was missing.
-Color aColor(pAccess->GetPixel(142, 140).GetColor());
+Color aColor(pAccess->GetPixel(142, 140));
CPPUNIT_ASSERT_EQUAL(sal_uInt8(0), aColor.GetRed());
CPPUNIT_ASSERT_EQUAL(sal_uInt8(0), aColor.GetBlue());
CPPUNIT_ASSERT(aColor.GetGreen() == 0xfe || aColor.GetGreen() == 0xff);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/registry
connectivity/registry/hsqldb/org/openoffice/Office/DataAccess/Drivers.xcu | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit ff251f4adb4f6addcabf14eedf8d014ca76dfefa Author: Julien Nabet AuthorDate: Tue May 21 22:26:57 2019 +0200 Commit: Julien Nabet CommitDate: Wed May 22 15:07:11 2019 +0200 tdf#122538: add index appendix for hsqldb Regression from https://cgit.freedesktop.org/libreoffice/core/commit/?id=3208fcb3a36d75d6290d9c548430682f153b09db Change-Id: I8f85f0a5838df87671ecb9bdb5751b7ec43c09ea Reviewed-on: https://gerrit.libreoffice.org/72701 Tested-by: Jenkins Reviewed-by: Lionel Elie Mamane diff --git a/connectivity/registry/hsqldb/org/openoffice/Office/DataAccess/Drivers.xcu b/connectivity/registry/hsqldb/org/openoffice/Office/DataAccess/Drivers.xcu index 93935e7c294c..c224b51b168b 100644 --- a/connectivity/registry/hsqldb/org/openoffice/Office/DataAccess/Drivers.xcu +++ b/connectivity/registry/hsqldb/org/openoffice/Office/DataAccess/Drivers.xcu @@ -43,7 +43,7 @@ -false +true @@ -71,7 +71,7 @@ -false +true ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - connectivity/registry
connectivity/registry/hsqldb/org/openoffice/Office/DataAccess/Drivers.xcu | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 0cc10a995bda44ea6680efd2083761f4441280f4 Author: Julien Nabet AuthorDate: Tue May 21 22:26:57 2019 +0200 Commit: Michael Stahl CommitDate: Wed May 22 18:50:43 2019 +0200 tdf#122538: add index appendix for hsqldb Regression from https://cgit.freedesktop.org/libreoffice/core/commit/?id=3208fcb3a36d75d6290d9c548430682f153b09db Change-Id: I8f85f0a5838df87671ecb9bdb5751b7ec43c09ea Reviewed-on: https://gerrit.libreoffice.org/72701 (cherry picked from commit ff251f4adb4f6addcabf14eedf8d014ca76dfefa) Reviewed-on: https://gerrit.libreoffice.org/72777 Reviewed-by: Julien Nabet Tested-by: Michael Stahl diff --git a/connectivity/registry/hsqldb/org/openoffice/Office/DataAccess/Drivers.xcu b/connectivity/registry/hsqldb/org/openoffice/Office/DataAccess/Drivers.xcu index d168838fefdd..4ccc689178fc 100644 --- a/connectivity/registry/hsqldb/org/openoffice/Office/DataAccess/Drivers.xcu +++ b/connectivity/registry/hsqldb/org/openoffice/Office/DataAccess/Drivers.xcu @@ -43,7 +43,7 @@ -false +true @@ -70,7 +70,7 @@ -false +true ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/inc
vcl/inc/opengl/program.hxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 7dda93787a7b55d185f31081394fb6e4f83d3f77 Author: Julien Nabet AuthorDate: Thu May 9 18:32:02 2019 +0200 Commit: Julien Nabet CommitDate: Fri May 10 07:03:50 2019 +0200 Replace list by vector vcl/opengl Change-Id: Ia91e8d470729fff3f34e5f244a7e19359433a2ee Reviewed-on: https://gerrit.libreoffice.org/72068 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/vcl/inc/opengl/program.hxx b/vcl/inc/opengl/program.hxx index 6aadbed9fdde..cc1e28190916 100644 --- a/vcl/inc/opengl/program.hxx +++ b/vcl/inc/opengl/program.hxx @@ -12,7 +12,7 @@ #include -#include +#include #include @@ -53,7 +53,7 @@ private: GLuint mnExtrusionVectorsAttrib; GLuint mnVertexColorsAttrib; -std::list< OpenGLTexture > maTextures; +std::vector< OpenGLTexture > maTextures; boolmbBlending; float mfLastWidth; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/framework/configuration/ChangeRequestQueue.hxx |4
++--
sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx |7
---
2 files changed, 6 insertions(+), 5 deletions(-)
New commits:
commit 28bd55310896deda96ee7d30828239fa5ed03747
Author: Julien Nabet
AuthorDate: Thu May 9 20:10:09 2019 +0200
Commit: Julien Nabet
CommitDate: Fri May 10 07:06:44 2019 +0200
Use std::queue instead of list for ChangeRequestQueueProcessor (sd)
Change-Id: I2520efb92e4aef399b684262e0b7daa72d212598
Reviewed-on: https://gerrit.libreoffice.org/72073
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueue.hxx
b/sd/source/ui/framework/configuration/ChangeRequestQueue.hxx
index 402774412274..d63a64822c49 100644
--- a/sd/source/ui/framework/configuration/ChangeRequestQueue.hxx
+++ b/sd/source/ui/framework/configuration/ChangeRequestQueue.hxx
@@ -22,7 +22,7 @@
#include
-#include
+#include
namespace com { namespace sun { namespace star { namespace drawing { namespace
framework { class XConfigurationChangeRequest; } } } } }
@@ -33,7 +33,7 @@ namespace sd { namespace framework {
ChangeRequestQueueProcessor to process these requests.
*/
class ChangeRequestQueue
-: public ::std::list >
+: public ::std::queue >
{
public:
/** Create an empty queue.
diff --git
a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx
b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx
index 7ac69647522c..7934b5dd5e8b 100644
--- a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx
+++ b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx
@@ -91,7 +91,7 @@ void ChangeRequestQueueProcessor::AddRequest (
TraceRequest(rxRequest);
#endif
-maQueue.push_back(rxRequest);
+maQueue.push(rxRequest);
StartProcessing();
}
@@ -135,7 +135,7 @@ void ChangeRequestQueueProcessor::ProcessOneEvent()
// Get and remove the first entry from the queue.
Reference xRequest (maQueue.front());
-maQueue.pop_front();
+maQueue.pop();
// Execute the change request.
if (xRequest.is())
@@ -176,7 +176,8 @@ void ChangeRequestQueueProcessor::ProcessUntilEmpty()
void ChangeRequestQueueProcessor::Clear()
{
::osl::MutexGuard aGuard (maMutex);
-maQueue.clear();
+ChangeRequestQueue aEmpty;
+maQueue.swap(aEmpty);
}
} } // end of namespace sd::framework::configuration
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: fpicker/source
fpicker/source/office/OfficeFilePicker.cxx |2 +- fpicker/source/office/OfficeFilePicker.hxx |6 +++--- fpicker/source/office/OfficeFolderPicker.cxx |2 +- 3 files changed, 5 insertions(+), 5 deletions(-) New commits: commit 98dced113650aa7bb70c17b626474458d872fcd6 Author: Julien Nabet AuthorDate: Thu May 9 18:30:20 2019 +0200 Commit: Julien Nabet CommitDate: Fri May 10 07:03:28 2019 +0200 Replace lists by vectors in fpicker/office Change-Id: Id8d84ddebdb909583bfb136747374c0500c080e5 Reviewed-on: https://gerrit.libreoffice.org/72067 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx index dd6712541722..8271b9a302c8 100644 --- a/fpicker/source/office/OfficeFilePicker.cxx +++ b/fpicker/source/office/OfficeFilePicker.cxx @@ -22,7 +22,7 @@ #include "iodlg.hxx" #include "RemoteFilesDialog.hxx" -#include +#include #include #include #include diff --git a/fpicker/source/office/OfficeFilePicker.hxx b/fpicker/source/office/OfficeFilePicker.hxx index 9df75d019fb7..e42ef384f06a 100644 --- a/fpicker/source/office/OfficeFilePicker.hxx +++ b/fpicker/source/office/OfficeFilePicker.hxx @@ -34,15 +34,15 @@ #include "commonpicker.hxx" #include "pickercallbacks.hxx" -#include +#include class Dialog; struct FilterEntry; struct ElementEntry_Impl; enum class PickerFlags; -typedef ::std::list< FilterEntry > FilterList; // can be maintained more effectively -typedef ::std::list < ElementEntry_Impl > ElementList; +typedef ::std::vector< FilterEntry > FilterList; // can be maintained more effectively +typedef ::std::vector< ElementEntry_Impl > ElementList; typedef css::beans::StringPair UnoFilterEntry; typedef css::uno::Sequence< UnoFilterEntry > UnoFilterList; // can be transported more effectively diff --git a/fpicker/source/office/OfficeFolderPicker.cxx b/fpicker/source/office/OfficeFolderPicker.cxx index 2c049ed605f0..8868f1cc3e57 100644 --- a/fpicker/source/office/OfficeFolderPicker.cxx +++ b/fpicker/source/office/OfficeFolderPicker.cxx @@ -21,7 +21,7 @@ #include "iodlg.hxx" -#include +#include #include #include #include ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: hwpfilter/source soltools/mkdepend
hwpfilter/source/hstyle.cxx |2 +-
soltools/mkdepend/include.c |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 7cf3574ac9208e70c03eeaca2def0235ec90f55f
Author: Julien Nabet
AuthorDate: Sun Apr 28 16:03:10 2019 +0200
Commit: Stephan Bergmann
CommitDate: Mon Apr 29 09:11:26 2019 +0200
Avoid -Werror=format/stringop-truncation
It also affects gcc 8.3
Change-Id: I896e84d5e1e96abfe81294e921cfcc060e44fb6f
Reviewed-on: https://gerrit.libreoffice.org/71474
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/hwpfilter/source/hstyle.cxx b/hwpfilter/source/hstyle.cxx
index 87fd1efbe978..1848067f14df 100644
--- a/hwpfilter/source/hstyle.cxx
+++ b/hwpfilter/source/hstyle.cxx
@@ -67,7 +67,7 @@ void HWPStyle::SetName(int n, char const *name)
{
if (name)
{
-#if defined __GNUC__ && __GNUC__ == 8 && __GNUC_MINOR__ == 2 && !defined
__clang__
+#if defined __GNUC__ && __GNUC__ == 8 && (__GNUC_MINOR__ == 2 ||
__GNUC_MINOR__ == 3) && !defined __clang__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wstringop-truncation"
#endif
diff --git a/soltools/mkdepend/include.c b/soltools/mkdepend/include.c
index 4af7c47248e5..27f20f40fb98 100644
--- a/soltools/mkdepend/include.c
+++ b/soltools/mkdepend/include.c
@@ -243,7 +243,7 @@ int issymbolic(char *dir, char *component)
struct stat st;
charbuf[ BUFSIZ ], **pp;
-#if defined __GNUC__ && __GNUC__ == 8 && __GNUC_MINOR__ == 2 && !defined
__clang__
+#if defined __GNUC__ && __GNUC__ == 8 && (__GNUC_MINOR__ == 2 ||
__GNUC_MINOR__ == 3) && !defined __clang__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wformat-truncation"
// silence "‘snprintf’ output may be truncated before the last format
character"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svtools/source
svtools/source/dialogs/ServerDetailsControls.cxx | 11 ++-
1 file changed, 6 insertions(+), 5 deletions(-)
New commits:
commit b9b930046368532c61b20637cb0356e195529440
Author: Julien Nabet
AuthorDate: Thu Apr 25 18:54:09 2019 +0200
Commit: Caolán McNamara
CommitDate: Mon Apr 29 13:12:47 2019 +0200
tdf#113834: fix crash when service host empty
The crash affects Windows, not Linux where an error popup appears instead
(MacOs?)
It seems the fact the url was empty triggers an exception in
ucbhelper::Content ctr
So let's put the lines in the try catch and log the exception.
See comments of bugtracker for slight more details.
Change-Id: I60e55be488632ff6e0106fde832a818c6431f58e
Reviewed-on: https://gerrit.libreoffice.org/71321
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/svtools/source/dialogs/ServerDetailsControls.cxx
b/svtools/source/dialogs/ServerDetailsControls.cxx
index e65150b7cff5..23bd16d1eeea 100644
--- a/svtools/source/dialogs/ServerDetailsControls.cxx
+++ b/svtools/source/dialogs/ServerDetailsControls.cxx
@@ -25,6 +25,7 @@
#include
#include
+#include
#include
@@ -446,12 +447,11 @@ IMPL_LINK_NOARG( CmisDetailsContainer, RefreshReposHdl,
weld::Button&, void )
catch( const Exception& )
{}
-// Get the Content
-::ucbhelper::Content aCnt( sUrl, m_xCmdEnv,
comphelper::getProcessComponentContext() );
-Sequence aProps { "Title" };
-
try
{
+// Get the Content
+::ucbhelper::Content aCnt( sUrl, m_xCmdEnv,
comphelper::getProcessComponentContext() );
+Sequence aProps { "Title" };
Reference< XResultSet > xResultSet( aCnt.createCursor( aProps ),
UNO_QUERY_THROW );
Reference< XContentAccess > xAccess( xResultSet, UNO_QUERY_THROW );
while ( xResultSet->next() )
@@ -467,8 +467,9 @@ IMPL_LINK_NOARG( CmisDetailsContainer, RefreshReposHdl,
weld::Button&, void )
m_pDialog->m_xLBRepository->append_text(sName);
}
}
-catch ( const Exception& )
+catch ( const Exception& e)
{
+SAL_WARN( "svtools.dialogs", "RefreshReposHdl exception=" << e );
}
// Auto-select the first one
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/bitmap/BitmapScaleSuperFilter.cxx | 26 +-
1 file changed, 13 insertions(+), 13 deletions(-)
New commits:
commit ff18b00ab438ca627625e263389098307dcfd1cc
Author: Julien Nabet
AuthorDate: Tue Apr 30 21:04:42 2019 +0200
Commit: Julien Nabet
CommitDate: Wed May 1 11:39:35 2019 +0200
Typo Pallete->Palette
Change-Id: I8a7be3738cd84699568ae2711367e49754401609
Reviewed-on: https://gerrit.libreoffice.org/71594
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/vcl/source/bitmap/BitmapScaleSuperFilter.cxx
b/vcl/source/bitmap/BitmapScaleSuperFilter.cxx
index 54f22f2dc5d8..b621ebe95fa7 100644
--- a/vcl/source/bitmap/BitmapScaleSuperFilter.cxx
+++ b/vcl/source/bitmap/BitmapScaleSuperFilter.cxx
@@ -186,7 +186,7 @@ void scaleUp32bit(ScaleContext , long nStartY, long
nEndY)
}
}
-void scaleUpPallete8bit(ScaleContext , long nStartY, long nEndY)
+void scaleUpPalette8bit(ScaleContext , long nStartY, long nEndY)
{
const long nStartX = 0, nEndX = rCtx.mnDestW - 1;
@@ -224,7 +224,7 @@ void scaleUpPallete8bit(ScaleContext , long nStartY,
long nEndY)
}
}
-void scaleUpPalleteGeneral(ScaleContext , long nStartY, long nEndY)
+void scaleUpPaletteGeneral(ScaleContext , long nStartY, long nEndY)
{
const long nStartX = 0, nEndX = rCtx.mnDestW - 1;
@@ -314,7 +314,7 @@ void scaleUp24bit(ScaleContext , long nStartY, long
nEndY)
}
}
-void scaleUpNonPalleteGeneral(ScaleContext , long nStartY, long nEndY)
+void scaleUpNonPaletteGeneral(ScaleContext , long nStartY, long nEndY)
{
const long nStartX = 0, nEndX = rCtx.mnDestW - 1;
@@ -491,7 +491,7 @@ void scaleDown32bit(ScaleContext , long nStartY, long
nEndY)
}
}
-void scaleDownPallete8bit(ScaleContext , long nStartY, long nEndY)
+void scaleDownPalette8bit(ScaleContext , long nStartY, long nEndY)
{
const long nStartX = 0, nEndX = rCtx.mnDestW - 1;
@@ -616,7 +616,7 @@ void scaleDownPallete8bit(ScaleContext , long nStartY,
long nEndY)
}
}
-void scaleDownPalleteGeneral(ScaleContext , long nStartY, long nEndY)
+void scaleDownPaletteGeneral(ScaleContext , long nStartY, long nEndY)
{
const long nStartX = 0, nEndX = rCtx.mnDestW - 1;
@@ -876,7 +876,7 @@ void scaleDown24bit(ScaleContext , long nStartY, long
nEndY)
}
}
-void scaleDownNonPalleteGeneral(ScaleContext , long nStartY, long nEndY)
+void scaleDownNonPaletteGeneral(ScaleContext , long nStartY, long nEndY)
{
const long nStartX = 0, nEndX = rCtx.mnDestW - 1;
@@ -1086,12 +1086,12 @@ BitmapEx BitmapScaleSuperFilter::execute(BitmapEx
const& rBitmap) const
switch( pReadAccess->GetScanlineFormat() )
{
case ScanlineFormat::N8BitPal:
-pScaleRangeFn = bScaleUp ? scaleUpPallete8bit
- : scaleDownPallete8bit;
+pScaleRangeFn = bScaleUp ? scaleUpPalette8bit
+ : scaleDownPalette8bit;
break;
default:
-pScaleRangeFn = bScaleUp ? scaleUpPalleteGeneral
- : scaleDownPalleteGeneral;
+pScaleRangeFn = bScaleUp ? scaleUpPaletteGeneral
+ : scaleDownPaletteGeneral;
break;
}
}
@@ -1102,7 +1102,7 @@ BitmapEx BitmapScaleSuperFilter::execute(BitmapEx const&
rBitmap) const
// a fast path, so we always need to process with a general scaler.
else if (nSourceBitcount != nTargetBitcount)
{
-pScaleRangeFn = bScaleUp ? scaleUpNonPalleteGeneral :
scaleDownNonPalleteGeneral;
+pScaleRangeFn = bScaleUp ? scaleUpNonPaletteGeneral :
scaleDownNonPaletteGeneral;
}
// If we get here then we can only use a fast path, but let's
// still keep the fallback to the general scaler alive.
@@ -1121,8 +1121,8 @@ BitmapEx BitmapScaleSuperFilter::execute(BitmapEx const&
rBitmap) const
pScaleRangeFn = bScaleUp ? scaleUp32bit : scaleDown32bit;
break;
default:
-pScaleRangeFn = bScaleUp ? scaleUpNonPalleteGeneral
- : scaleDownNonPalleteGeneral;
+pScaleRangeFn = bScaleUp ? scaleUpNonPaletteGeneral
+ : scaleDownNonPaletteGeneral;
break;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/ww8scan.hxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 780d0945fb917ead9b98debe57210092cdc59351
Author: Julien Nabet
AuthorDate: Tue May 7 07:49:44 2019 +0200
Commit: Julien Nabet
CommitDate: Tue May 7 09:01:14 2019 +0200
Replace list by deque for maFkpCache (ww8scan)
Change-Id: I5d2699bd3cbbc18844585f8c2619295f974eb7ce
Reviewed-on: https://gerrit.libreoffice.org/71887
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
index 3a109542791a..d22a32180dbf 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -26,7 +26,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
@@ -600,7 +600,7 @@ private:
== 10 : 18549 pap, 47 chp
== 5 : 18515 pap, 47 chp
*/
-std::list> maFkpCache;
+std::deque> maFkpCache;
enum Limits {eMaxCache = 5};
bool NewFkp();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/filter/xml/XMLColumnRowGroupExport.cxx |5 ++---
sc/source/filter/xml/XMLColumnRowGroupExport.hxx |3 +--
2 files changed, 3 insertions(+), 5 deletions(-)
New commits:
commit 76374aa9d2b6c9ad72f8803a2245d05f1d493b86
Author: Julien Nabet
AuthorDate: Tue May 7 07:56:29 2019 +0200
Commit: Julien Nabet
CommitDate: Tue May 7 10:17:42 2019 +0200
Replace list by vector for ScMyColumnRowGroupVec sc/xml
Change-Id: I95292f370d38a95b229f47c10652dfab077299b3
Reviewed-on: https://gerrit.libreoffice.org/71888
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/sc/source/filter/xml/XMLColumnRowGroupExport.cxx
b/sc/source/filter/xml/XMLColumnRowGroupExport.cxx
index 74e9e6a576f1..9cd8e98bc100 100644
--- a/sc/source/filter/xml/XMLColumnRowGroupExport.cxx
+++ b/sc/source/filter/xml/XMLColumnRowGroupExport.cxx
@@ -95,9 +95,8 @@ void ScMyOpenCloseColumnRowGroup::OpenGroup(const
ScMyColumnRowGroup& rGroup)
void ScMyOpenCloseColumnRowGroup::OpenGroups(const sal_Int32 nField)
{
ScMyColumnRowGroupVec::iterator aItr(aTableStart.begin());
-ScMyColumnRowGroupVec::iterator aEndItr(aTableStart.end());
bool bReady(false);
-while(!bReady && aItr != aEndItr)
+while(!bReady && aItr != aTableStart.end())
{
if (aItr->nField == nField)
{
@@ -144,7 +143,7 @@ sal_Int32 ScMyOpenCloseColumnRowGroup::GetLast()
void ScMyOpenCloseColumnRowGroup::Sort()
{
-aTableStart.sort();
+std::sort(aTableStart.begin(), aTableStart.end());
std::sort(aTableEnd.begin(), aTableEnd.end());
}
diff --git a/sc/source/filter/xml/XMLColumnRowGroupExport.hxx
b/sc/source/filter/xml/XMLColumnRowGroupExport.hxx
index 103843f6bb91..6c78ca917174 100644
--- a/sc/source/filter/xml/XMLColumnRowGroupExport.hxx
+++ b/sc/source/filter/xml/XMLColumnRowGroupExport.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_SC_SOURCE_FILTER_XML_XMLCOLUMNROWGROUPEXPORT_HXX
#define INCLUDED_SC_SOURCE_FILTER_XML_XMLCOLUMNROWGROUPEXPORT_HXX
-#include
#include
#include
#include
@@ -35,7 +34,7 @@ struct ScMyColumnRowGroup
bool operator< (const ScMyColumnRowGroup& rGroup) const;
};
-typedef std::list ScMyColumnRowGroupVec;
+typedef std::vector ScMyColumnRowGroupVec;
typedef std::vector ScMyFieldGroupVec;
class ScXMLExport;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmlsecurity/source
xmlsecurity/source/gpg/SecurityEnvironment.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit c6716196b53fa72d4c5f3984a214d4a8cc79d1b4
Author: Julien Nabet
AuthorDate: Tue May 7 07:59:10 2019 +0200
Commit: Julien Nabet
CommitDate: Tue May 7 10:17:18 2019 +0200
Replace list by vector in xmlsecurity/gpg
Change-Id: I746b4b2a83fcf41f38947dffc290574b18a3c691
Reviewed-on: https://gerrit.libreoffice.org/71889
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/xmlsecurity/source/gpg/SecurityEnvironment.cxx
b/xmlsecurity/source/gpg/SecurityEnvironment.cxx
index 99dc064ca6d2..99d256ea4c99 100644
--- a/xmlsecurity/source/gpg/SecurityEnvironment.cxx
+++ b/xmlsecurity/source/gpg/SecurityEnvironment.cxx
@@ -17,7 +17,7 @@
#include
#include
-#include
+#include
#ifdef _WIN32
#include
@@ -120,8 +120,8 @@ OUString
SecurityEnvironmentGpg::getSecurityEnvironmentInformation()
Sequence< Reference < XCertificate > >
SecurityEnvironmentGpg::getCertificatesImpl( bool bPrivateOnly )
{
CertificateImpl* xCert;
-std::list< GpgME::Key > keyList;
-std::list< CertificateImpl* > certsList;
+std::vector< GpgME::Key > keyList;
+std::vector< CertificateImpl* > certsList;
m_ctx->setKeyListMode(GPGME_KEYLIST_MODE_LOCAL);
GpgME::Error err = m_ctx->startKeyListing("", bPrivateOnly );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - vcl/unx
vcl/unx/generic/printer/cupsmgr.cxx | 36
1 file changed, 36 insertions(+)
New commits:
commit 11fc802f001187ab5ba368832d7246c397b98682
Author: Julien Nabet
AuthorDate: Wed Nov 28 20:39:43 2018 +0100
Commit: Caolán McNamara
CommitDate: Tue May 7 12:30:45 2019 +0200
band-aid: deprecated-declarations related to cups
Change-Id: I07438840fc1c3cc8e70559d44954be0c49531525
Reviewed-on: https://gerrit.libreoffice.org/64191
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
(cherry picked from commit e9e49fceac43476d1233ee8106cba5f4831771b9)
Reviewed-on: https://gerrit.libreoffice.org/71896
diff --git a/vcl/unx/generic/printer/cupsmgr.cxx
b/vcl/unx/generic/printer/cupsmgr.cxx
index 630e39437119..dafe671f8b65 100644
--- a/vcl/unx/generic/printer/cupsmgr.cxx
+++ b/vcl/unx/generic/printer/cupsmgr.cxx
@@ -81,7 +81,14 @@ struct GetPPDAttribs
{
// This CUPS method is not at all thread-safe we need
// to dup the pointer to a static buffer it returns ASAP
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
OString aResult = cupsGetPPD(m_aParameter.getStr());
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
MutexGuard aGuard( *m_pSyncMutex );
m_aResult = aResult;
m_aCondition.set();
@@ -214,6 +221,10 @@ void CUPSManager::runDests()
// n#722902 - do a fast-failing check for cups working *at all* first
http_t* p_http;
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
if( (p_http=httpConnectEncrypt(
cupsServer(),
ippPort(),
@@ -230,6 +241,9 @@ void CUPSManager::runDests()
httpClose(p_http);
}
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
}
void CUPSManager::initialize()
@@ -439,7 +453,14 @@ const PPDParser* CUPSManager::createCUPSParser( const
OUString& rPrinter )
rtl_TextEncoding aEncoding = osl_getThreadTextEncoding();
OUString aFileName( OStringToOUString( aPPDFile, aEncoding
) );
// update the printer info with context information
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
ppd_file_t* pPPD = ppdOpenFile( aPPDFile.getStr() );
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
if( pPPD )
{
// create the new parser
@@ -447,7 +468,14 @@ const PPDParser* CUPSManager::createCUPSParser( const
OUString& rPrinter )
pCUPSParser->m_aFile = rPrinter;
pNewParser = pCUPSParser;
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
/*int nConflicts =*/ cupsMarkOptions( pPPD,
pDest->num_options, pDest->options );
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
SAL_INFO("vcl.unx.print", "processing the following
options for printer " << pDest->name << " (instance " << (pDest->instance ==
nullptr ? "null" : pDest->instance) << "):");
for( int k = 0; k < pDest->num_options; k++ )
SAL_INFO("vcl.unx.print",
@@ -468,7 +496,15 @@ const PPDParser* CUPSManager::createCUPSParser( const
OUString& rPrinter )
rInfo.m_aContext = rContext;
// clean up the mess
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
ppdClose( pPPD );
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
+
}
else
SAL_INFO("vcl.unx.print", "ppdOpenFile failed, falling
back to generic driver");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/print2.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3ff0c23b54ba4e7a534693ba25a3ffb27d1c18e1
Author: Julien Nabet
AuthorDate: Sat May 4 11:44:36 2019 +0200
Commit: Julien Nabet
CommitDate: Sat May 4 12:46:53 2019 +0200
Replace list by vector for ConnectedComponentsList
Change-Id: I2e64d4b61605267cca7709c1cfe50d35069f4459
Reviewed-on: https://gerrit.libreoffice.org/71790
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/vcl/source/gdi/print2.cxx b/vcl/source/gdi/print2.cxx
index 1469e87ca7bc..3ec7bbf494db 100644
--- a/vcl/source/gdi/print2.cxx
+++ b/vcl/source/gdi/print2.cxx
@@ -62,7 +62,7 @@ struct ConnectedComponents
boolbIsFullyTransparent;
};
-typedef ::std::list< ConnectedComponents > ConnectedComponentsList;
+typedef ::std::vector< ConnectedComponents > ConnectedComponentsList;
namespace {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - svtools/source
svtools/source/dialogs/ServerDetailsControls.cxx | 11 ++-
1 file changed, 6 insertions(+), 5 deletions(-)
New commits:
commit 580e8c72c83265c9ead0bde6845521558546b3df
Author: Julien Nabet
AuthorDate: Thu Apr 25 18:54:09 2019 +0200
Commit: Caolán McNamara
CommitDate: Fri May 3 17:11:45 2019 +0200
tdf#113834: fix crash when service host empty
The crash affects Windows, not Linux where an error popup appears instead
(MacOs?)
It seems the fact the url was empty triggers an exception in
ucbhelper::Content ctr
So let's put the lines in the try catch and log the exception.
See comments of bugtracker for slight more details.
Change-Id: I60e55be488632ff6e0106fde832a818c6431f58e
Reviewed-on: https://gerrit.libreoffice.org/71321
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
Reviewed-on: https://gerrit.libreoffice.org/71593
diff --git a/svtools/source/dialogs/ServerDetailsControls.cxx
b/svtools/source/dialogs/ServerDetailsControls.cxx
index ec42fdf1e928..f388da0bb1d9 100644
--- a/svtools/source/dialogs/ServerDetailsControls.cxx
+++ b/svtools/source/dialogs/ServerDetailsControls.cxx
@@ -24,6 +24,7 @@
#include
#include
#include
+#include
#include
@@ -445,12 +446,11 @@ IMPL_LINK_NOARG( CmisDetailsContainer, RefreshReposHdl,
weld::Button&, void )
catch( const Exception& )
{}
-// Get the Content
-::ucbhelper::Content aCnt( sUrl, m_xCmdEnv,
comphelper::getProcessComponentContext() );
-Sequence aProps { "Title" };
-
try
{
+// Get the Content
+::ucbhelper::Content aCnt( sUrl, m_xCmdEnv,
comphelper::getProcessComponentContext() );
+Sequence aProps { "Title" };
Reference< XResultSet > xResultSet( aCnt.createCursor( aProps ),
UNO_QUERY_THROW );
Reference< XContentAccess > xAccess( xResultSet, UNO_QUERY_THROW );
while ( xResultSet->next() )
@@ -466,8 +466,9 @@ IMPL_LINK_NOARG( CmisDetailsContainer, RefreshReposHdl,
weld::Button&, void )
m_pDialog->m_xLBRepository->append_text(sName);
}
}
-catch ( const Exception& )
+catch ( const Exception& e)
{
+SAL_WARN( "svtools.dialogs", "RefreshReposHdl exception=" << e );
}
// Auto-select the first one
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dictionaries
dictionaries |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 170fe2bffdd74c611eb8e9d96668a6680cd949ae
Author: Julien Nabet
AuthorDate: Sun May 5 14:10:40 2019 +0200
Commit: Gerrit Code Review
CommitDate: Sun May 5 16:03:44 2019 +0200
Update git submodules
* Update dictionaries from branch 'master'
- Fix logo management for "ca"
Thread 1 "soffice.bin" hit Breakpoint 1, (anonymous
namespace)::GraphicProvider::queryGraphic
(this=0x5b446140, rMediaProperties=uno::Sequence of length 1 =
{...})
at
/home/julien/lo/libreoffice/vcl/source/graphic/UnoGraphicProvider.cxx:430
430 SAL_WARN("svtools", "Could not create graphic: " <<
error);
(gdb) p rMediaProperties
$2 = uno::Sequence of length 1 = {{Name = "URL", Handle = 0, Value =
uno::Any("string":
"file:///home/julien/lo/libreoffice/instdir/program/../share/extensions/dict-ca/images/SC-logo.png"),
State =
com::sun::star::beans::PropertyState::PropertyState_DIRECT_VALUE}}
(gdb) c
Continuing.
warn:svtools:21636:21636:vcl/source/graphic/UnoGraphicProvider.cxx:430:
Could not create graphic: 0x8201(Error Area:Vcl Class:General Code:1)
Change-Id: I4b160ccd6777988ddb0107b663006efdaa48e366
diff --git a/dictionaries b/dictionaries
index 661e18650eb4..23120b6ade92 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 661e18650eb4f810b566fe4cbae64755a7ecf804
+Subproject commit 23120b6ade924b892055e26148c18f44896821c6
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: unoxml/source
unoxml/source/events/eventdispatcher.cxx |4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
New commits:
commit adafd453c564a65eb3b9c435e457c7ee7131b737
Author: Julien Nabet
AuthorDate: Sun May 5 09:44:22 2019 +0200
Commit: Julien Nabet
CommitDate: Sun May 5 10:57:27 2019 +0200
Use returned iterator from erase
Change-Id: I1ae4e4d0adc467f1bcce08fdd07a5dbf94c3111c
Reviewed-on: https://gerrit.libreoffice.org/71815
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/unoxml/source/events/eventdispatcher.cxx
b/unoxml/source/events/eventdispatcher.cxx
index b5d5ef705b31..40a08305bfd0 100644
--- a/unoxml/source/events/eventdispatcher.cxx
+++ b/unoxml/source/events/eventdispatcher.cxx
@@ -69,9 +69,7 @@ namespace DOM { namespace events {
// erase all references to specified listener
if (iter->second.is() && iter->second == aListener)
{
-ListenerMap::iterator tmp_iter = iter;
-++iter;
-rMap.erase(tmp_iter);
+iter = rMap.erase(iter);
}
else
++iter;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmlsecurity/source
xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx |2 +-
xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx |2 +-
xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx |2 +-
xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx |6
+++---
4 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 59278fa913116482c7d02e0729487ccd153545ae
Author: Julien Nabet
AuthorDate: Wed May 8 11:15:50 2019 +0200
Commit: Noel Grandin
CommitDate: Wed May 8 12:15:20 2019 +0200
Replace remaining lists by vectors in xmlsecurity
Change-Id: Ia7e47e8398a0022a281de2b8866e779d471909b0
Reviewed-on: https://gerrit.libreoffice.org/71951
Reviewed-by: Julien Nabet
Tested-by: Noel Grandin
diff --git
a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
index f1c830ad3172..96ad4ac3c8fe 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
@@ -330,7 +330,7 @@ uno::Sequence< uno::Reference < XCertificate > >
SecurityEnvironment_MSCryptImpl
{
sal_Int32 length ;
X509Certificate_MSCryptImpl* xcert ;
-std::list< X509Certificate_MSCryptImpl* > certsList ;
+std::vector< X509Certificate_MSCryptImpl* > certsList ;
PCCERT_CONTEXT pCertContext = nullptr;
//firstly, we try to find private keys in given key store.
diff --git
a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx
b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx
index 0c89f0abd696..2d7c1e49bc8e 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx
@@ -41,7 +41,7 @@
#include
#include
-#include
+#include
#include
#include
diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
index c65d8012af2a..03ad4c11487e 100644
--- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
@@ -278,7 +278,7 @@ SecurityEnvironment_NssImpl::getPersonalCertificates()
{
sal_Int32 length ;
X509Certificate_NssImpl* xcert ;
-std::list< X509Certificate_NssImpl* > certsList ;
+std::vector< X509Certificate_NssImpl* > certsList ;
updateSlots();
//firstly, we try to find private keys in slot
diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx
b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx
index 058f990edb99..9bc2a4f0236b 100644
--- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx
@@ -35,7 +35,7 @@
#include
#include
-#include
+#include
#include
@@ -50,14 +50,14 @@ class SecurityEnvironment_NssImpl : public
::cppu::WeakImplHelper<
{
private:
-std::list< PK11SlotInfo* > m_Slots;
+std::vector< PK11SlotInfo* > m_Slots;
/// The last used certificate which has the private key for signing.
css::uno::Reference m_xSigningCertificate;
osl::Mutex m_mutex;
CERTCertDBHandle* m_pHandler ;
-std::list< PK11SymKey* >m_tSymKeyList ;
+std::vector< PK11SymKey* > m_tSymKeyList ;
public:
SecurityEnvironment_NssImpl();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: l10ntools/source
l10ntools/source/treemerge.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit 70d9e2db8a53a994e323dbb07d42eaebaf5008af
Author: Julien Nabet
AuthorDate: Thu Jul 4 18:51:07 2019 +0200
Commit: Julien Nabet
CommitDate: Thu Jul 4 21:52:12 2019 +0200
cid#1448320: Resource leak in object (l10ntools/treemerge)
Change-Id: I9d09d690e003d73878ef2e30da11cf079d0db441
Reviewed-on: https://gerrit.libreoffice.org/75098
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/l10ntools/source/treemerge.cxx b/l10ntools/source/treemerge.cxx
index 65916d12d3e2..b6d246317b23 100644
--- a/l10ntools/source/treemerge.cxx
+++ b/l10ntools/source/treemerge.cxx
@@ -221,6 +221,9 @@ TreeParser::TreeParser(
TreeParser::~TreeParser()
{
+// be sure m_pSource is freed
+if (m_bIsInitialized)
+xmlFreeDoc( m_pSource );
}
void TreeParser::Extract( const OString& rPOFile )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: test/source
test/source/xmltesttools.cxx | 19 ---
1 file changed, 16 insertions(+), 3 deletions(-)
New commits:
commit 9a6850ba8ef77e4ecf84ae0461b9aaeecaf30438
Author: Julien Nabet
AuthorDate: Thu Jul 4 18:37:20 2019 +0200
Commit: Julien Nabet
CommitDate: Thu Jul 4 21:51:50 2019 +0200
cid#1448518: Resource leak (test/xmltesttools)
Change-Id: I7894b65e2b20ce94d53a7ca04eb229347145686c
Reviewed-on: https://gerrit.libreoffice.org/75097
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/test/source/xmltesttools.cxx b/test/source/xmltesttools.cxx
index 42eeddc12bc3..4b0ba89de7d4 100644
--- a/test/source/xmltesttools.cxx
+++ b/test/source/xmltesttools.cxx
@@ -127,16 +127,29 @@ OUString XmlTestTools::getXPathContent(xmlDocPtr pXmlDoc,
const OString& rXPath)
return s;
}
case XPATH_BOOLEAN:
-return pXmlObj->boolval ? OUString("true") : OUString("false");
+{
+auto boolVal = pXmlObj->boolval;
+xmlXPathFreeObject(pXmlObj);
+return boolVal ? OUString("true") : OUString("false");
+}
case XPATH_NUMBER:
-return OUString::number(pXmlObj->floatval);
+{
+auto floatVal = pXmlObj->floatval;
+xmlXPathFreeObject(pXmlObj);
+return OUString::number(floatVal);
+}
case XPATH_STRING:
-return convert(pXmlObj->stringval);
+{
+auto convertedVal = convert(pXmlObj->stringval);
+xmlXPathFreeObject(pXmlObj);
+return convertedVal;
+}
case XPATH_POINT:
case XPATH_RANGE:
case XPATH_LOCATIONSET:
case XPATH_USERS:
case XPATH_XSLT_TREE:
+xmlXPathFreeObject(pXmlObj);
CPPUNIT_FAIL("Unsupported XPath type");
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: test/source
test/source/xmltesttools.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit 1d29534e11c437c1b47135b64684da542fba2a64
Author: Julien Nabet
AuthorDate: Thu Jul 4 18:19:34 2019 +0200
Commit: Julien Nabet
CommitDate: Thu Jul 4 19:27:46 2019 +0200
cid#1448515: Resource leak (test/xmltesttools)
Change-Id: Ifadb599697fca738a41e4aad098edf4de32e174f
Reviewed-on: https://gerrit.libreoffice.org/75096
Reviewed-by: Michael Stahl
Tested-by: Jenkins
diff --git a/test/source/xmltesttools.cxx b/test/source/xmltesttools.cxx
index 3c186dd08d63..42eeddc12bc3 100644
--- a/test/source/xmltesttools.cxx
+++ b/test/source/xmltesttools.cxx
@@ -85,7 +85,10 @@ OUString XmlTestTools::getXPath(xmlDocPtr pXmlDoc, const
OString& rXPath, const
CPPUNIT_ASSERT_EQUAL_MESSAGE(OString("In <" + OString(pXmlDoc->name) + ">,
XPath '" + rXPath + "' number of nodes is incorrect").getStr(),
1, xmlXPathNodeSetGetLength(pXmlNodes));
if (rAttribute.isEmpty())
+{
+xmlXPathFreeObject(pXmlObj);
return OUString();
+}
xmlNodePtr pXmlNode = pXmlNodes->nodeTab[0];
xmlChar * prop = xmlGetProp(pXmlNode, BAD_CAST(rAttribute.getStr()));
OString sAttAbsent = "In <" + OString(pXmlDoc->name) + ">, XPath '" +
rXPath
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: reportdesign/source
reportdesign/source/ui/dlg/Formula.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 99ec957948ce3af0c40e9cb1560e2de59fbc8912 Author: Julien Nabet AuthorDate: Thu Jul 4 18:55:03 2019 +0200 Commit: Julien Nabet CommitDate: Thu Jul 4 20:15:54 2019 +0200 cid#1448383: Resource leak in object (reportdesign/formula) Change-Id: Ia57e6961dab9be857e81289f8d2d20f82f24643d Reviewed-on: https://gerrit.libreoffice.org/75099 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx index 919deaeec869..08794435871e 100644 --- a/reportdesign/source/ui/dlg/Formula.cxx +++ b/reportdesign/source/ui/dlg/Formula.cxx @@ -97,6 +97,7 @@ FormulaDialog::~FormulaDialog() StoreFormEditData( m_pFormulaData ); m_pEdit = nullptr; m_pAddField.clear(); +free(m_pFormulaData); } // functions for right side ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/dataprovider/htmldataprovider.cxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit 2f6ead197bbff5142199d00a30ab900ebb997754
Author: Julien Nabet
AuthorDate: Thu Jul 4 18:16:09 2019 +0200
Commit: Julien Nabet
CommitDate: Thu Jul 4 23:17:06 2019 +0200
cid#1448425: Resource leak (sc/htmlprovider)
Change-Id: I3c23280da75e51be37c4b66f14f805ca49ebf3cf
Reviewed-on: https://gerrit.libreoffice.org/75095
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/sc/source/ui/dataprovider/htmldataprovider.cxx
b/sc/source/ui/dataprovider/htmldataprovider.cxx
index 516a0b308376..bbe6dd3c514b 100644
--- a/sc/source/ui/dataprovider/htmldataprovider.cxx
+++ b/sc/source/ui/dataprovider/htmldataprovider.cxx
@@ -195,7 +195,12 @@ void HTMLFetchThread::execute()
xmlNodeSetPtr pXmlNodes = pXmlXpathObj->nodesetval;
if (pXmlNodes->nodeNr == 0)
+{
+xmlXPathFreeNodeSet(pXmlNodes);
+xmlXPathFreeNodeSetList(pXmlXpathObj);
+xmlXPathFreeContext(pXmlXpathCtx);
return;
+}
xmlNodePtr pNode = pXmlNodes->nodeTab[0];
handleTable(pNode);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/shells/basesh.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit dca7d930330dff70bf5835d3ae43d598df30f71b
Author: Julien Nabet
AuthorDate: Thu Jul 4 22:12:02 2019 +0200
Commit: Jim Raykowski
CommitDate: Thu Jul 4 23:44:45 2019 +0200
cid#1448299: Constant expression result (sw/basesh)
Change-Id: Id4fab1797be58acd179d6e0fc7c9be21c454e676
Reviewed-on: https://gerrit.libreoffice.org/75105
Tested-by: Jenkins
Reviewed-by: Jim Raykowski
diff --git a/sw/source/uibase/shells/basesh.cxx
b/sw/source/uibase/shells/basesh.cxx
index 0c76cd643f9a..f84787aa5eb0 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -2266,7 +2266,7 @@ void SwBaseShell::ExecBckCol(SfxRequest& rReq)
const SfxItemSet* pArgs = rReq.GetArgs();
sal_uInt16 nSlot(rReq.GetSlot());
-if (!pArgs && ( nSlot != SID_BACKGROUND_COLOR || nSlot !=
SID_TABLE_CELL_BACKGROUND_COLOR ) )
+if (!pArgs && nSlot != SID_BACKGROUND_COLOR && nSlot !=
SID_TABLE_CELL_BACKGROUND_COLOR)
{
return;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - avmedia/source translations
avmedia/source/gstreamer/gstplayer.cxx |5 ++---
translations |2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
New commits:
commit 72d88049bdac3417f6833255dff5a06a0f3eb1c3
Author: Julien Nabet
AuthorDate: Thu Jul 4 18:09:26 2019 +0200
Commit: Julien Nabet
CommitDate: Thu Jul 4 19:03:35 2019 +0200
cid#1448380: Resource leak (avmedia/gstplayer)
Change-Id: Ieaf5f68f17558f27e187241869c8fe01f8e29ba2
Reviewed-on: https://gerrit.libreoffice.org/75094
Reviewed-by: Jan-Marek Glogowski
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/avmedia/source/gstreamer/gstplayer.cxx
b/avmedia/source/gstreamer/gstplayer.cxx
index 35feb8ad5ea2..111622cbac9c 100644
--- a/avmedia/source/gstreamer/gstplayer.cxx
+++ b/avmedia/source/gstreamer/gstplayer.cxx
@@ -846,10 +846,9 @@ uno::Reference< ::media::XPlayerWindow > SAL_CALL
Player::createPlayerWindow( co
if( aSize.Width > 0 && aSize.Height > 0 )
{
-::avmedia::gstreamer::Window* pWindow = new
::avmedia::gstreamer::Window;
if (rArguments.getLength() <= 2)
{
-xRet = pWindow;
+xRet = new ::avmedia::gstreamer::Window;
return xRet;
}
@@ -894,7 +893,7 @@ uno::Reference< ::media::XPlayerWindow > SAL_CALL
Player::createPlayerWindow( co
return nullptr;
}
-xRet = pWindow;
+xRet = new ::avmedia::gstreamer::Window;
g_object_set(G_OBJECT(mpPlaybin), "video-sink", pVideosink, nullptr);
g_object_set(G_OBJECT(mpPlaybin), "force-aspect-ratio", FALSE,
nullptr);
commit a98d5e849e8eb21c04b7f95e8c7b44b6ef582bda
Author: Christian Lohmaier
AuthorDate: Thu Jul 4 18:52:04 2019 +0200
Commit: Gerrit Code Review
CommitDate: Thu Jul 4 19:02:36 2019 +0200
Update git submodules
* Update translations from branch 'master'
- update translations for 6.3.0 rc1
and force-fix errors using pocheck
Change-Id: Icf55b3be0f6fbcb1993f3b4bc57161b89d3429e7
diff --git a/translations b/translations
index a56aea7a0ea2..c93d7c724b8b 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit a56aea7a0ea288b3bd3abf15cfa8ab2506841850
+Subproject commit c93d7c724b8b195aa26808223cb389f1499c8122
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - wizards/com
wizards/com/sun/star/wizards/document/FormHandler.java |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit d726d525924a1869fd0f0e65504de6596eb40e35 Author: Julien Nabet AuthorDate: Sun Jun 30 13:11:10 2019 +0200 Commit: Michael Stahl CommitDate: Fri Jul 5 11:11:12 2019 +0200 tdf#125953: take CLOB into account in form wizard Change-Id: Ie08b47c2892b7da8e516447b868067a6231279c2 Reviewed-on: https://gerrit.libreoffice.org/74927 (cherry picked from commit b59f4fe03a7843cde70a56a282b3a5d7a304f39d) Reviewed-on: https://gerrit.libreoffice.org/75056 Tested-by: Jenkins Reviewed-by: Xisco Faulí (cherry picked from commit 96d1b176f02f0396544e6c13c170f895b13fdfde) Reviewed-on: https://gerrit.libreoffice.org/75073 Reviewed-by: Michael Stahl diff --git a/wizards/com/sun/star/wizards/document/FormHandler.java b/wizards/com/sun/star/wizards/document/FormHandler.java index cae352f2b9ef..6ff44ceb3a47 100644 --- a/wizards/com/sun/star/wizards/document/FormHandler.java +++ b/wizards/com/sun/star/wizards/document/FormHandler.java @@ -114,7 +114,7 @@ public class FormHandler sModelServices[SOGRIDCONTROL] = "com.sun.star.form.component.GridControl"; sModelServices[SOIMAGECONTROL] = "com.sun.star.form.component.DatabaseImageControl"; -oControlData = new ControlData[22]; +oControlData = new ControlData[23]; oControlData[0] = createControlData(DataType.BIT, SOCHECKBOX, CHECKBOX); oControlData[1] = createControlData(DataType.BOOLEAN, SOCHECKBOX, CHECKBOX); oControlData[2] = createControlData(DataType.TINYINT, SONUMERICCONTROL, FORMATTEDFIELD); @@ -136,8 +136,9 @@ public class FormHandler oControlData[18] = createControlData(DataType.VARBINARY, SOIMAGECONTROL, TEXTFIELD); oControlData[19] = createControlData(DataType.LONGVARBINARY, SOIMAGECONTROL, TEXTFIELD); oControlData[20] = createControlData(DataType.BLOB, SOIMAGECONTROL, TEXTFIELD); +oControlData[21] = createControlData(DataType.CLOB, SOIMAGECONTROL, TEXTFIELD); -oControlData[21] = createControlData(DataType.OTHER, SOIMAGECONTROL, TEXTFIELD); +oControlData[22] = createControlData(DataType.OTHER, SOIMAGECONTROL, TEXTFIELD); } public int getControlType(int _fieldtype) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - avmedia/source
avmedia/source/gstreamer/gstplayer.cxx |5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit 280016e6c7df52de040e3b086747237bb9d84e2c
Author: Julien Nabet
AuthorDate: Thu Jul 4 18:09:26 2019 +0200
Commit: Michael Stahl
CommitDate: Fri Jul 5 10:56:51 2019 +0200
cid#1448380: Resource leak (avmedia/gstplayer)
Change-Id: Ieaf5f68f17558f27e187241869c8fe01f8e29ba2
Reviewed-on: https://gerrit.libreoffice.org/75100
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/avmedia/source/gstreamer/gstplayer.cxx
b/avmedia/source/gstreamer/gstplayer.cxx
index 0236f7895b8c..0871ecd2ea53 100644
--- a/avmedia/source/gstreamer/gstplayer.cxx
+++ b/avmedia/source/gstreamer/gstplayer.cxx
@@ -939,10 +939,9 @@ uno::Reference< ::media::XPlayerWindow > SAL_CALL
Player::createPlayerWindow( co
if( aSize.Width > 0 && aSize.Height > 0 )
{
-::avmedia::gstreamer::Window* pWindow = new
::avmedia::gstreamer::Window;
if (rArguments.getLength() <= 2)
{
-xRet = pWindow;
+xRet = new ::avmedia::gstreamer::Window;
return xRet;
}
@@ -986,7 +985,7 @@ uno::Reference< ::media::XPlayerWindow > SAL_CALL
Player::createPlayerWindow( co
return nullptr;
}
-xRet = pWindow;
+xRet = new ::avmedia::gstreamer::Window;
g_object_set(G_OBJECT(mpPlaybin), "video-sink", pVideosink, nullptr);
g_object_set(G_OBJECT(mpPlaybin), "force-aspect-ratio", FALSE,
nullptr);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: reportdesign/source
reportdesign/source/ui/dlg/Formula.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit e011bf1c751833fa4702ee90dee77b6473ebdaf6 Author: Julien Nabet AuthorDate: Fri Jul 5 19:25:02 2019 +0200 Commit: Julien Nabet CommitDate: Fri Jul 5 22:08:09 2019 +0200 Revert "cid#1448383: Resource leak in object (reportdesign/formula)" I should have use delete or unique_ptr This reverts commit 99ec957948ce3af0c40e9cb1560e2de59fbc8912. Change-Id: I746c2307ca0d4d6cdbe8dbb1c6fd6de624666726 Reviewed-on: https://gerrit.libreoffice.org/75144 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx index 08794435871e..919deaeec869 100644 --- a/reportdesign/source/ui/dlg/Formula.cxx +++ b/reportdesign/source/ui/dlg/Formula.cxx @@ -97,7 +97,6 @@ FormulaDialog::~FormulaDialog() StoreFormEditData( m_pFormulaData ); m_pEdit = nullptr; m_pAddField.clear(); -free(m_pFormulaData); } // functions for right side ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/appl/newhelp.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0328e0af9532d5ab26840cf58b9dcbb69bb8c33d
Author: Julien Nabet
AuthorDate: Tue Jun 25 18:32:54 2019 +0200
Commit: Julien Nabet
CommitDate: Fri Jun 28 15:36:58 2019 +0200
tdf#126071: fix assertion with offline help viewer
See bt here:
https://bugs.documentfoundation.org/attachment.cgi?id=152373
+
https://bugs.documentfoundation.org/show_bug.cgi?id=126071#c1
Change-Id: I6b9dcd0771d2e6df0cd89b3b0243d0d8defba685
Reviewed-on: https://gerrit.libreoffice.org/74716
Reviewed-by: Eike Rathke
Tested-by: Jenkins
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 8f6ccd8af2be..fc60111090e1 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -207,7 +207,7 @@ namespace sfx2
Boundary aBoundary = xBreak->getWordBoundary(
rSearchString, nStartPos, aLocale,
WordType::ANYWORD_IGNOREWHITESPACES, true );
-while ( aBoundary.startPos != aBoundary.endPos )
+while ( aBoundary.startPos < aBoundary.endPos )
{
nStartPos = aBoundary.endPos;
OUString sSearchToken( rSearchString.copy(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/doc/DocumentTimerManager.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 12252f27d108402df02a298bbe1b6e8f290b34d7 Author: Julien Nabet AuthorDate: Tue Jun 25 18:27:00 2019 +0200 Commit: Ashod Nakashian CommitDate: Sat Jul 13 03:21:05 2019 +0200 tdf#126004: test EditShell is ok before calling ValidateAllParagraphSignatures See https://bugs.documentfoundation.org/attachment.cgi?id=152295 Change-Id: I6a098a18ef8b119b7cdea7cbabd6d3021bf1fb6f Reviewed-on: https://gerrit.libreoffice.org/74714 Tested-by: Jenkins Reviewed-by: Ashod Nakashian diff --git a/sw/source/core/doc/DocumentTimerManager.cxx b/sw/source/core/doc/DocumentTimerManager.cxx index 266ee7386875..f13a25559f1f 100644 --- a/sw/source/core/doc/DocumentTimerManager.cxx +++ b/sw/source/core/doc/DocumentTimerManager.cxx @@ -200,7 +200,8 @@ IMPL_LINK_NOARG( DocumentTimerManager, DoIdleJobs, Timer*, void ) m_rDoc.getIDocumentFieldsAccess().UpdateRefFields(); // References // Validate and update the paragraph signatures. -m_rDoc.GetEditShell()->ValidateAllParagraphSignatures(true); +if (m_rDoc.GetEditShell()) +m_rDoc.GetEditShell()->ValidateAllParagraphSignatures(true); pTmpRoot->EndAllAction(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - sw/source
sw/source/core/doc/DocumentTimerManager.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit fa088732e195500d1e50318d7c88a46e73a307ea Author: Julien Nabet AuthorDate: Tue Jun 25 18:27:00 2019 +0200 Commit: Xisco Faulí CommitDate: Sun Jul 14 00:03:33 2019 +0200 tdf#126004: test EditShell is ok before calling ValidateAllParagraphSignatures See https://bugs.documentfoundation.org/attachment.cgi?id=152295 Change-Id: I6a098a18ef8b119b7cdea7cbabd6d3021bf1fb6f (cherry picked from commit 12252f27d108402df02a298bbe1b6e8f290b34d7) Reviewed-on: https://gerrit.libreoffice.org/75523 Tested-by: Jenkins Reviewed-by: Xisco Faulí diff --git a/sw/source/core/doc/DocumentTimerManager.cxx b/sw/source/core/doc/DocumentTimerManager.cxx index 266ee7386875..f13a25559f1f 100644 --- a/sw/source/core/doc/DocumentTimerManager.cxx +++ b/sw/source/core/doc/DocumentTimerManager.cxx @@ -200,7 +200,8 @@ IMPL_LINK_NOARG( DocumentTimerManager, DoIdleJobs, Timer*, void ) m_rDoc.getIDocumentFieldsAccess().UpdateRefFields(); // References // Validate and update the paragraph signatures. -m_rDoc.GetEditShell()->ValidateAllParagraphSignatures(true); +if (m_rDoc.GetEditShell()) +m_rDoc.GetEditShell()->ValidateAllParagraphSignatures(true); pTmpRoot->EndAllAction(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/ww8par5.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d32d6fd3ae1d83f10e9ef4ca165e8b87d4f23d76 Author: Julien Nabet AuthorDate: Tue Jul 9 12:35:10 2019 +0200 Commit: Julien Nabet CommitDate: Tue Jul 9 12:36:04 2019 +0200 Revert "Fix typo" This reverts commit af61870279db31da2a278c953feab9162794b543. Change-Id: I86a37a3d521c35cae818104029bcfc341721baed Reviewed-on: https://gerrit.libreoffice.org/75293 Reviewed-by: Julien Nabet Tested-by: Julien Nabet diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index e4452cd7c6cd..8b276eab3138 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -1452,7 +1452,7 @@ eF_ResT SwWW8ImplReader::Read_F_Seq( WW8FieldDesc*, OUString& rStr ) break; case 's': // Outline Level -//#i19682, what I have to do with this value? +//#i19682, what am I to do with this value break; } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: wizards/com
wizards/com/sun/star/wizards/document/FormHandler.java |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit b59f4fe03a7843cde70a56a282b3a5d7a304f39d Author: Julien Nabet AuthorDate: Sun Jun 30 13:11:10 2019 +0200 Commit: Julien Nabet CommitDate: Wed Jul 3 17:38:48 2019 +0200 tdf#125953: take CLOB into account in form wizard Change-Id: Ie08b47c2892b7da8e516447b868067a6231279c2 Reviewed-on: https://gerrit.libreoffice.org/74927 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/wizards/com/sun/star/wizards/document/FormHandler.java b/wizards/com/sun/star/wizards/document/FormHandler.java index cae352f2b9ef..6ff44ceb3a47 100644 --- a/wizards/com/sun/star/wizards/document/FormHandler.java +++ b/wizards/com/sun/star/wizards/document/FormHandler.java @@ -114,7 +114,7 @@ public class FormHandler sModelServices[SOGRIDCONTROL] = "com.sun.star.form.component.GridControl"; sModelServices[SOIMAGECONTROL] = "com.sun.star.form.component.DatabaseImageControl"; -oControlData = new ControlData[22]; +oControlData = new ControlData[23]; oControlData[0] = createControlData(DataType.BIT, SOCHECKBOX, CHECKBOX); oControlData[1] = createControlData(DataType.BOOLEAN, SOCHECKBOX, CHECKBOX); oControlData[2] = createControlData(DataType.TINYINT, SONUMERICCONTROL, FORMATTEDFIELD); @@ -136,8 +136,9 @@ public class FormHandler oControlData[18] = createControlData(DataType.VARBINARY, SOIMAGECONTROL, TEXTFIELD); oControlData[19] = createControlData(DataType.LONGVARBINARY, SOIMAGECONTROL, TEXTFIELD); oControlData[20] = createControlData(DataType.BLOB, SOIMAGECONTROL, TEXTFIELD); +oControlData[21] = createControlData(DataType.CLOB, SOIMAGECONTROL, TEXTFIELD); -oControlData[21] = createControlData(DataType.OTHER, SOIMAGECONTROL, TEXTFIELD); +oControlData[22] = createControlData(DataType.OTHER, SOIMAGECONTROL, TEXTFIELD); } public int getControlType(int _fieldtype) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scripting/java
scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java |
9 +++--
1 file changed, 3 insertions(+), 6 deletions(-)
New commits:
commit 04fbd174cb787ea15fb74abeca37589ab74df6ab
Author: Julien Nabet
AuthorDate: Wed Jul 3 21:46:42 2019 +0200
Commit: Julien Nabet
CommitDate: Wed Jul 3 22:54:07 2019 +0200
cid#1448470: perf inefficient map iterator
Change-Id: If7dd6455ca02d6c78ac997bd9c2924863db1d906
Reviewed-on: https://gerrit.libreoffice.org/75059
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git
a/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java
b/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java
index a8b12e071284..eeb8f9ef2cfc 100644
---
a/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java
+++
b/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java
@@ -338,13 +338,10 @@ public class ParcelDescriptor {
String key;
item = document.createElement("languagedepprops");
-Iterator iter = languagedepprops.keySet().iterator();
-
-while (iter.hasNext()) {
+for (Map.Entry entry :
languagedepprops.entrySet()) {
tempitem = document.createElement("prop");
-key = iter.next();
-tempitem.setAttribute("name", key);
-tempitem.setAttribute("value", languagedepprops.get(key));
+tempitem.setAttribute("name", entry.getKey());
+tempitem.setAttribute("value", entry.getValue());
item.appendChild(tempitem);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: javaunohelper/com
javaunohelper/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer.java |
7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
New commits:
commit 880b0b534cf5780dfe236def0847ded88da84019
Author: Julien Nabet
AuthorDate: Wed Jul 3 22:09:29 2019 +0200
Commit: Julien Nabet
CommitDate: Wed Jul 3 23:08:14 2019 +0200
cid#1448214: perf inefficient map iterator
Change-Id: Ia145b46400acf2b7a35bedf689fc7fe74758a2f3
Reviewed-on: https://gerrit.libreoffice.org/75060
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git
a/javaunohelper/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer.java
b/javaunohelper/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer.java
index a255721046e5..803c02e8340c 100644
--- a/javaunohelper/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer.java
+++ b/javaunohelper/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer.java
@@ -41,15 +41,14 @@ public class MultiTypeInterfaceContainer
if ( (size=map.size()) > 0)
{
Type [] arTypes= new Type[size];
-Iterator it= map.keySet().iterator();
int countTypes= 0;
-while (it.hasNext())
+for (Map.Entry entry : map.entrySet())
{
-Object key= it.next();
-InterfaceContainer cont= map.get(key);
+InterfaceContainer cont= entry.getValue();
if (cont != null && cont.size() > 0)
{
+Object key = entry.getKey();
if (key == null)
arTypes[countTypes++]= new Type();
else if (key instanceof Type)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: javaunohelper/com
javaunohelper/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer.java |
7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
New commits:
commit 4ded63a1aaf3a8ca7916e822a8e7eb342d21929d
Author: Julien Nabet
AuthorDate: Wed Jul 3 22:13:59 2019 +0200
Commit: Julien Nabet
CommitDate: Wed Jul 3 23:18:05 2019 +0200
cid#1448341: perf inefficient map iterator
Change-Id: I5b5ba2b6ed370765e38b51a23175c73dc0e2c8f8
Reviewed-on: https://gerrit.libreoffice.org/75061
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git
a/javaunohelper/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer.java
b/javaunohelper/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer.java
index 803c02e8340c..9b061f81c217 100644
--- a/javaunohelper/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer.java
+++ b/javaunohelper/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer.java
@@ -80,10 +80,9 @@ public class MultiTypeInterfaceContainer
synchronized public InterfaceContainer getContainer(Object key)
{
InterfaceContainer retVal= null;
-Iterator it= map.keySet().iterator();
-while (it.hasNext())
+for (Map.Entry entry : map.entrySet())
{
-Object obj= it.next();
+Object obj= entry.getKey();
if (obj == null && key == null)
{
retVal= map.get(null);
@@ -91,7 +90,7 @@ public class MultiTypeInterfaceContainer
}
else if( obj != null && obj.equals(key))
{
-retVal= map.get(obj);
+retVal= entry.getValue();
break;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - wizards/com
wizards/com/sun/star/wizards/document/FormHandler.java |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit 96d1b176f02f0396544e6c13c170f895b13fdfde Author: Julien Nabet AuthorDate: Sun Jun 30 13:11:10 2019 +0200 Commit: Xisco Faulí CommitDate: Thu Jul 4 11:04:47 2019 +0200 tdf#125953: take CLOB into account in form wizard Change-Id: Ie08b47c2892b7da8e516447b868067a6231279c2 Reviewed-on: https://gerrit.libreoffice.org/74927 (cherry picked from commit b59f4fe03a7843cde70a56a282b3a5d7a304f39d) Reviewed-on: https://gerrit.libreoffice.org/75056 Tested-by: Jenkins Reviewed-by: Xisco Faulí diff --git a/wizards/com/sun/star/wizards/document/FormHandler.java b/wizards/com/sun/star/wizards/document/FormHandler.java index cae352f2b9ef..6ff44ceb3a47 100644 --- a/wizards/com/sun/star/wizards/document/FormHandler.java +++ b/wizards/com/sun/star/wizards/document/FormHandler.java @@ -114,7 +114,7 @@ public class FormHandler sModelServices[SOGRIDCONTROL] = "com.sun.star.form.component.GridControl"; sModelServices[SOIMAGECONTROL] = "com.sun.star.form.component.DatabaseImageControl"; -oControlData = new ControlData[22]; +oControlData = new ControlData[23]; oControlData[0] = createControlData(DataType.BIT, SOCHECKBOX, CHECKBOX); oControlData[1] = createControlData(DataType.BOOLEAN, SOCHECKBOX, CHECKBOX); oControlData[2] = createControlData(DataType.TINYINT, SONUMERICCONTROL, FORMATTEDFIELD); @@ -136,8 +136,9 @@ public class FormHandler oControlData[18] = createControlData(DataType.VARBINARY, SOIMAGECONTROL, TEXTFIELD); oControlData[19] = createControlData(DataType.LONGVARBINARY, SOIMAGECONTROL, TEXTFIELD); oControlData[20] = createControlData(DataType.BLOB, SOIMAGECONTROL, TEXTFIELD); +oControlData[21] = createControlData(DataType.CLOB, SOIMAGECONTROL, TEXTFIELD); -oControlData[21] = createControlData(DataType.OTHER, SOIMAGECONTROL, TEXTFIELD); +oControlData[22] = createControlData(DataType.OTHER, SOIMAGECONTROL, TEXTFIELD); } public int getControlType(int _fieldtype) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sfx2/source
sfx2/source/appl/newhelp.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit cb1c5ae7af997d7643da97235caf95789ba09416
Author: Julien Nabet
AuthorDate: Tue Jun 25 18:32:54 2019 +0200
Commit: Julien Nabet
CommitDate: Fri Jun 28 20:34:30 2019 +0200
tdf#126071: fix assertion with offline help viewer
See bt here:
https://bugs.documentfoundation.org/attachment.cgi?id=152373
+
https://bugs.documentfoundation.org/show_bug.cgi?id=126071#c1
Change-Id: I6b9dcd0771d2e6df0cd89b3b0243d0d8defba685
(cherry picked from commit 0328e0af9532d5ab26840cf58b9dcbb69bb8c33d)
Reviewed-on: https://gerrit.libreoffice.org/74846
Reviewed-by: Eike Rathke
Tested-by: Jenkins
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 034a8987de36..19abe18a466d 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -206,7 +206,7 @@ namespace sfx2
Boundary aBoundary = xBreak->getWordBoundary(
rSearchString, nStartPos, aLocale,
WordType::ANYWORD_IGNOREWHITESPACES, true );
-while ( aBoundary.startPos != aBoundary.endPos )
+while ( aBoundary.startPos < aBoundary.endPos )
{
nStartPos = aBoundary.endPos;
OUString sSearchToken( rSearchString.copy(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sw/uiconfig
sw/uiconfig/swriter/ui/tocindexpage.ui | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) New commits: commit 9a5e5c581eaf86ce0bbf293da40ba18c72fba1bd Author: Julien Nabet AuthorDate: Sat Mar 23 14:13:19 2019 +0100 Commit: Adolfo Jayme Barrientos CommitDate: Tue Apr 23 02:39:32 2019 +0200 tdf#124240: make type in TOC translatable Change-Id: Ie3e713786b096657571d0abe0806b1d45d2b5341 Reviewed-on: https://gerrit.libreoffice.org/69585 Tested-by: Jenkins Reviewed-by: Andras Timar (cherry picked from commit 1971c61ac750e76f33869c323a9e8abe8201cd99) Reviewed-on: https://gerrit.libreoffice.org/69645 Reviewed-by: Adolfo Jayme Barrientos diff --git a/sw/uiconfig/swriter/ui/tocindexpage.ui b/sw/uiconfig/swriter/ui/tocindexpage.ui index 9522028fc1d1..be562370f5ef 100644 --- a/sw/uiconfig/swriter/ui/tocindexpage.ui +++ b/sw/uiconfig/swriter/ui/tocindexpage.ui @@ -122,13 +122,13 @@ False start - Table of Contents - Alphabetical Index - Table of Figures - Index of Tables - User-Defined - Table of Objects - Bibliography + Table of Contents + Alphabetical Index + Table of Figures + Index of Tables + User-Defined + Table of Objects + Bibliography ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/core/api/RowSet.cxx | 14 +++---
dbaccess/source/core/api/callablestatement.cxx |5 +
dbaccess/source/core/api/datacolumn.cxx |7 ++-
dbaccess/source/core/api/definitioncolumn.cxx | 16
dbaccess/source/core/api/preparedstatement.cxx |5 +
dbaccess/source/core/api/querydescriptor.cxx|5 +
dbaccess/source/core/api/resultcolumn.cxx |5 +
dbaccess/source/core/api/resultset.cxx |5 +
dbaccess/source/core/dataaccess/definitioncontainer.cxx |5 +
dbaccess/source/core/dataaccess/documentcontainer.cxx |4 +---
dbaccess/source/core/misc/DatabaseDataProvider.cxx |3 +--
dbaccess/source/ui/browser/dbloader.cxx |5 +
dbaccess/source/ui/browser/sbagrid.cxx |7 ++-
13 files changed, 20 insertions(+), 66 deletions(-)
New commits:
commit 2379f36bd809c3cf3be71315a85946e273023a8c
Author: Julien Nabet
AuthorDate: Fri Aug 16 10:52:32 2019 +0200
Commit: Julien Nabet
CommitDate: Fri Aug 16 15:11:00 2019 +0200
tdf#88205 Adapt uses of css::uno::Sequence to use initializer_list ctor
in dbaccess
Change-Id: I7f91b5fd8ac1dfbf6244c408391a595f5250aa71
Reviewed-on: https://gerrit.libreoffice.org/77563
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/dbaccess/source/core/api/RowSet.cxx
b/dbaccess/source/core/api/RowSet.cxx
index 919ece8761c9..1485d77dcdec 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -478,13 +478,8 @@ sal_Bool SAL_CALL ORowSet::supportsService( const
OUString& _rServiceName )
Sequence< OUString > SAL_CALL ORowSet::getSupportedServiceNames()
{
-Sequence< OUString > aSNS( 5 );
-aSNS[0] = SERVICE_SDBC_RESULTSET;
-aSNS[1] = SERVICE_SDBC_ROWSET;
-aSNS[2] = SERVICE_SDBCX_RESULTSET;
-aSNS[3] = SERVICE_SDB_RESULTSET;
-aSNS[4] = SERVICE_SDB_ROWSET;
-return aSNS;
+return Sequence< OUString >{ SERVICE_SDBC_RESULTSET, SERVICE_SDBC_ROWSET,
+SERVICE_SDBCX_RESULTSET, SERVICE_SDB_RESULTSET,
SERVICE_SDB_ROWSET };
}
// OComponentHelper
@@ -2875,10 +2870,7 @@ sal_Bool ORowSetClone::supportsService( const OUString&
_rServiceName )
Sequence< OUString > ORowSetClone::getSupportedServiceNames( )
{
-Sequence< OUString > aSNS( 2 );
-aSNS[0] = SERVICE_SDBC_RESULTSET;
-aSNS[1] = SERVICE_SDB_RESULTSET;
-return aSNS;
+return Sequence< OUString > { SERVICE_SDBC_RESULTSET,
SERVICE_SDB_RESULTSET };
}
// OComponentHelper
diff --git a/dbaccess/source/core/api/callablestatement.cxx
b/dbaccess/source/core/api/callablestatement.cxx
index 542e7089098d..db0db3695e0d 100644
--- a/dbaccess/source/core/api/callablestatement.cxx
+++ b/dbaccess/source/core/api/callablestatement.cxx
@@ -78,10 +78,7 @@ OUString OCallableStatement::getImplementationName( )
Sequence< OUString > OCallableStatement::getSupportedServiceNames( )
{
-Sequence< OUString > aSNS( 2 );
-aSNS.getArray()[0] = SERVICE_SDBC_CALLABLESTATEMENT;
-aSNS.getArray()[1] = SERVICE_SDB_CALLABLESTATEMENT;
-return aSNS;
+return Sequence< OUString > { SERVICE_SDBC_CALLABLESTATEMENT,
SERVICE_SDB_CALLABLESTATEMENT };
}
// XOutParameters
diff --git a/dbaccess/source/core/api/datacolumn.cxx
b/dbaccess/source/core/api/datacolumn.cxx
index bcf0f9450bfd..3ce0dbb9ccaf 100644
--- a/dbaccess/source/core/api/datacolumn.cxx
+++ b/dbaccess/source/core/api/datacolumn.cxx
@@ -89,11 +89,8 @@ OUString ODataColumn::getImplementationName( )
Sequence< OUString > ODataColumn::getSupportedServiceNames( )
{
-Sequence< OUString > aSNS( 3 );
-aSNS[0] = SERVICE_SDBCX_COLUMN;
-aSNS[1] = SERVICE_SDB_RESULTCOLUMN;
-aSNS[2] = SERVICE_SDB_DATACOLUMN;
-return aSNS;
+return Sequence< OUString > { SERVICE_SDBCX_COLUMN,
SERVICE_SDB_RESULTCOLUMN,
+ SERVICE_SDB_DATACOLUMN };
}
// OComponentHelper
diff --git a/dbaccess/source/core/api/definitioncolumn.cxx
b/dbaccess/source/core/api/definitioncolumn.cxx
index 8ca2c6fd9a6f..2cd33cfbd2fc 100644
--- a/dbaccess/source/core/api/definitioncolumn.cxx
+++ b/dbaccess/source/core/api/definitioncolumn.cxx
@@ -92,10 +92,8 @@ OUString OTableColumnDescriptor::getImplementationName( )
Sequence< OUString > OTableColumnDescriptor::getSupportedServiceNames( )
{
-Sequence< OUString > aSNS( 2 );
-aSNS[0] = m_bActAsDescriptor ? OUString(SERVICE_SDBCX_COLUMNDESCRIPTOR) :
OUString(SERVICE_SDBCX_COLUMN);
-aSNS[1] = SERVICE_SDB_COLUMNSETTINGS;
-return aSNS;
+return Sequence< OUString > { m_bActAsDescriptor?
OUString(SERVICE_SDBCX_COLUMNDESCRIPTOR) : OUString(SERVICE_SDBCX_COLUMN),
+SERVICE_SDB_COLUMNSETTINGS };
}
// comphelper::OPropertyArrayUsageHelper
@@ -438,10 +436,7 @@ OUString
OTableColumnDescriptorWrapper::getImplementationName( )
Sequence<
[Libreoffice-commits] core.git: i18npool/source
i18npool/source/breakiterator/breakiteratorImpl.cxx |3
+--
i18npool/source/calendar/calendarImpl.cxx |6
++
i18npool/source/characterclassification/cclass_unicode.cxx |3
+--
i18npool/source/characterclassification/characterclassificationImpl.cxx |3
+--
i18npool/source/characterclassification/unoscripttypedetector.cxx |3
+--
i18npool/source/collator/collatorImpl.cxx |3
+--
i18npool/source/nativenumber/nativenumbersupplier.cxx |3
+--
i18npool/source/numberformatcode/numberformatcode.cxx |3
+--
i18npool/source/textconversion/textconversionImpl.cxx |3
+--
i18npool/source/transliteration/transliterationImpl.cxx |7
++-
i18npool/source/transliteration/transliteration_commonclass.cxx |3
+--
11 files changed, 13 insertions(+), 27 deletions(-)
New commits:
commit 973424ab312bfe38caa486304f5d9dae2cd59069
Author: Julien Nabet
AuthorDate: Fri Aug 16 14:54:28 2019 +0200
Commit: Julien Nabet
CommitDate: Fri Aug 16 16:03:47 2019 +0200
tdf#88205 Adapt uses of css::uno::Sequence to use initializer_list ctor
in i18npool
Change-Id: I99563b620056e7cd665a2b3330d15c73d0144c7e
Reviewed-on: https://gerrit.libreoffice.org/77583
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/i18npool/source/breakiterator/breakiteratorImpl.cxx
b/i18npool/source/breakiterator/breakiteratorImpl.cxx
index 0eb7737c9156..7fcd4a808c51 100644
--- a/i18npool/source/breakiterator/breakiteratorImpl.cxx
+++ b/i18npool/source/breakiterator/breakiteratorImpl.cxx
@@ -629,8 +629,7 @@ BreakIteratorImpl::supportsService(const OUString&
rServiceName)
Sequence< OUString > SAL_CALL
BreakIteratorImpl::getSupportedServiceNames()
{
-Sequence< OUString > aRet { "com.sun.star.i18n.BreakIterator" };
-return aRet;
+return Sequence< OUString > { "com.sun.star.i18n.BreakIterator" };
}
}
diff --git a/i18npool/source/calendar/calendarImpl.cxx
b/i18npool/source/calendar/calendarImpl.cxx
index 35e70146c3f9..be07222a347f 100644
--- a/i18npool/source/calendar/calendarImpl.cxx
+++ b/i18npool/source/calendar/calendarImpl.cxx
@@ -365,10 +365,8 @@ CalendarImpl::supportsService(const OUString& rServiceName)
Sequence< OUString > SAL_CALL
CalendarImpl::getSupportedServiceNames()
{
-Sequence< OUString > aRet(2);
-aRet[0] = "com.sun.star.i18n.LocaleCalendar";
-aRet[1] = "com.sun.star.i18n.LocaleCalendar2";
-return aRet;
+return Sequence< OUString > { "com.sun.star.i18n.LocaleCalendar",
+"com.sun.star.i18n.LocaleCalendar2" };
}
}
diff --git a/i18npool/source/characterclassification/cclass_unicode.cxx
b/i18npool/source/characterclassification/cclass_unicode.cxx
index 05769bc65eb1..3a2ae64d598d 100644
--- a/i18npool/source/characterclassification/cclass_unicode.cxx
+++ b/i18npool/source/characterclassification/cclass_unicode.cxx
@@ -286,8 +286,7 @@ sal_Bool SAL_CALL cclass_Unicode::supportsService(const
OUString& rServiceName)
Sequence< OUString > SAL_CALL cclass_Unicode::getSupportedServiceNames()
{
-Sequence< OUString > aRet {
"com.sun.star.i18n.CharacterClassification_Unicode" };
-return aRet;
+return Sequence< OUString > {
"com.sun.star.i18n.CharacterClassification_Unicode" };
}
}
diff --git
a/i18npool/source/characterclassification/characterclassificationImpl.cxx
b/i18npool/source/characterclassification/characterclassificationImpl.cxx
index c7db5f0f9df4..5693788316a8 100644
--- a/i18npool/source/characterclassification/characterclassificationImpl.cxx
+++ b/i18npool/source/characterclassification/characterclassificationImpl.cxx
@@ -202,8 +202,7 @@ CharacterClassificationImpl::supportsService(const
OUString& rServiceName)
Sequence< OUString > SAL_CALL
CharacterClassificationImpl::getSupportedServiceNames()
{
-Sequence< OUString > aRet { "com.sun.star.i18n.CharacterClassification" };
-return aRet;
+return Sequence< OUString > { "com.sun.star.i18n.CharacterClassification"
};
}
}
diff --git a/i18npool/source/characterclassification/unoscripttypedetector.cxx
b/i18npool/source/characterclassification/unoscripttypedetector.cxx
index 78324ba85756..dd6847b82c0c 100644
--- a/i18npool/source/characterclassification/unoscripttypedetector.cxx
+++ b/i18npool/source/characterclassification/unoscripttypedetector.cxx
@@ -78,8 +78,7 @@ UnoScriptTypeDetector::supportsService(const OUString&
ServiceName)
css::uno::Sequence< OUString > SAL_CALL
UnoScriptTypeDetector::getSupportedServiceNames()
{
-css::uno::Sequence< OUString > aRet {
"com.sun.star.i18n.ScriptTypeDetector" };
-return aRet;
+return css::uno::Sequence< OUString > {
"com.sun.star.i18n.ScriptTypeDetector" };
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
diff --git a/i18npool/source/collator/collatorImpl.cxx
[Libreoffice-commits] core.git: uui/source xmlhelp/source
uui/source/interactionhandler.cxx | 10 --
xmlhelp/source/treeview/tvfactory.cxx |5 +
2 files changed, 5 insertions(+), 10 deletions(-)
New commits:
commit 51a30d7daee8779ef51d8db58559e4fe15665d1b
Author: Julien Nabet
AuthorDate: Sun Aug 18 13:38:16 2019 +0200
Commit: Julien Nabet
CommitDate: Sun Aug 18 14:32:56 2019 +0200
tdf#88205 Adapt uses of css::uno::Sequence to use initializer_list ctor
in uui, xmlhelp
Change-Id: I588ed4154e6b21e178f2466c58abc08562eddf80
Reviewed-on: https://gerrit.libreoffice.org/77663
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/uui/source/interactionhandler.cxx
b/uui/source/interactionhandler.cxx
index 71286345a177..df06d4ea1d0e 100644
--- a/uui/source/interactionhandler.cxx
+++ b/uui/source/interactionhandler.cxx
@@ -91,13 +91,11 @@ UUIInteractionHandler::supportsService(OUString const &
rServiceName)
uno::Sequence< OUString > SAL_CALL
UUIInteractionHandler::getSupportedServiceNames()
{
-uno::Sequence< OUString > aNames(3);
-aNames[0] = "com.sun.star.task.InteractionHandler";
-// added to indicate support for configuration.backend.MergeRecoveryRequest
-aNames[1] = "com.sun.star.configuration.backend.InteractionHandler";
-aNames[2] = "com.sun.star.uui.InteractionHandler";
+return { "com.sun.star.task.InteractionHandler",
+ // added to indicate support for configuration.backend.MergeRecoveryRequest
+ "com.sun.star.configuration.backend.InteractionHandler",
// for backwards compatibility
-return aNames;
+ "com.sun.star.uui.InteractionHandler" };
}
void SAL_CALL
diff --git a/xmlhelp/source/treeview/tvfactory.cxx
b/xmlhelp/source/treeview/tvfactory.cxx
index 73adce6ae7b4..e4fc02c58e41 100644
--- a/xmlhelp/source/treeview/tvfactory.cxx
+++ b/xmlhelp/source/treeview/tvfactory.cxx
@@ -131,10 +131,7 @@ TVFactory::getImplementationName_static()
Sequence< OUString >
TVFactory::getSupportedServiceNames_static()
{
-Sequence< OUString > seq( 2 );
-seq[0] = "com.sun.star.help.TreeView";
-seq[1] = "com.sun.star.ucb.HiearchyDataSource";
-return seq;
+return { "com.sun.star.help.TreeView",
"com.sun.star.ucb.HiearchyDataSource" };
}
Reference< XSingleServiceFactory >
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source sd/source
sc/source/filter/xml/xmlimprt.cxx | 15 -
sd/source/core/stlfamily.cxx|4 ---
sd/source/core/stlsheet.cxx | 25 -
sd/source/ui/slideshow/slideshow.cxx|4 ---
sd/source/ui/unoidl/SdUnoDrawView.cxx |4 ---
sd/source/ui/unoidl/SdUnoOutlineView.cxx|4 ---
sd/source/ui/unoidl/SdUnoSlideView.cxx |4 ---
sd/source/ui/unoidl/UnoDocumentSettings.cxx | 14 +---
sd/source/ui/unoidl/randomnode.cxx |5
sd/source/ui/unoidl/unocpres.cxx|8 +--
sd/source/ui/unoidl/unodoc.cxx |6 -
sd/source/ui/unoidl/unolayer.cxx|4 ---
sd/source/ui/unoidl/unomodel.cxx| 32 +++-
sd/source/ui/unoidl/unopback.cxx|8 ---
14 files changed, 36 insertions(+), 101 deletions(-)
New commits:
commit 52e086c336cc52dcea410f0c3b8ada8439ebe969
Author: Julien Nabet
AuthorDate: Sun Aug 18 09:45:11 2019 +0200
Commit: Julien Nabet
CommitDate: Sun Aug 18 10:34:30 2019 +0200
tdf#88205 Adapt uses of css::uno::Sequence to use initializer_list ctor
in sc, sd
Change-Id: Id32e76ad3784b99781e87428ed2c23ef02a6
Reviewed-on: https://gerrit.libreoffice.org/77657
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/sc/source/filter/xml/xmlimprt.cxx
b/sc/source/filter/xml/xmlimprt.cxx
index 96c348d34f35..5475bd06df9a 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -116,8 +116,7 @@ OUString ScXMLImport_getImplementationName() throw()
uno::Sequence< OUString > ScXMLImport_getSupportedServiceNames() throw()
{
-const OUString aServiceName( ScXMLImport_getImplementationName() );
-return uno::Sequence< OUString > ( , 1 );
+return { ScXMLImport_getImplementationName() };
}
uno::Reference< uno::XInterface > ScXMLImport_createInstance(
@@ -134,8 +133,7 @@ OUString ScXMLImport_Meta_getImplementationName() throw()
uno::Sequence< OUString > ScXMLImport_Meta_getSupportedServiceNames() throw()
{
-const OUString aServiceName( ScXMLImport_Meta_getImplementationName() );
-return uno::Sequence< OUString > ( , 1 );
+return { ScXMLImport_Meta_getImplementationName() };
}
uno::Reference< uno::XInterface > ScXMLImport_Meta_createInstance(
@@ -152,8 +150,7 @@ OUString ScXMLImport_Styles_getImplementationName() throw()
uno::Sequence< OUString > ScXMLImport_Styles_getSupportedServiceNames() throw()
{
-const OUString aServiceName( ScXMLImport_Styles_getImplementationName() );
-return uno::Sequence< OUString > ( , 1 );
+return { ScXMLImport_Styles_getImplementationName() };
}
uno::Reference< uno::XInterface > ScXMLImport_Styles_createInstance(
@@ -170,8 +167,7 @@ OUString ScXMLImport_Content_getImplementationName() throw()
uno::Sequence< OUString > ScXMLImport_Content_getSupportedServiceNames()
throw()
{
-const OUString aServiceName( ScXMLImport_Content_getImplementationName() );
-return uno::Sequence< OUString > ( , 1 );
+return { ScXMLImport_Content_getImplementationName() };
}
uno::Reference< uno::XInterface > ScXMLImport_Content_createInstance(
@@ -188,8 +184,7 @@ OUString ScXMLImport_Settings_getImplementationName()
throw()
uno::Sequence< OUString > ScXMLImport_Settings_getSupportedServiceNames()
throw()
{
-const OUString aServiceName( ScXMLImport_Settings_getImplementationName()
);
-return uno::Sequence< OUString > ( , 1 );
+return { ScXMLImport_Settings_getImplementationName() };
}
uno::Reference< uno::XInterface > ScXMLImport_Settings_createInstance(
diff --git a/sd/source/core/stlfamily.cxx b/sd/source/core/stlfamily.cxx
index 47ef8a93af51..bb332e7939ab 100644
--- a/sd/source/core/stlfamily.cxx
+++ b/sd/source/core/stlfamily.cxx
@@ -175,9 +175,7 @@ sal_Bool SAL_CALL SdStyleFamily::supportsService( const
OUString& ServiceName )
Sequence< OUString > SAL_CALL SdStyleFamily::getSupportedServiceNames()
{
-OUString aServiceName( "com.sun.star.style.StyleFamily" );
-Sequence< OUString > aSeq( , 1 );
-return aSeq;
+return { "com.sun.star.style.StyleFamily" };
}
// XNamed
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 91cb60028dff..020d28a257b7 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -842,21 +842,16 @@ sal_Bool SAL_CALL SdStyleSheet::supportsService( const
OUString& ServiceName )
Sequence< OUString > SAL_CALL SdStyleSheet::getSupportedServiceNames()
{
-Sequence< OUString > aNameSequence( 10 );
-OUString* pStrings = aNameSequence.getArray();
-
-*pStrings++ = "com.sun.star.style.Style";
-*pStrings++ = "com.sun.star.drawing.FillProperties";
-*pStrings++ = "com.sun.star.drawing.LineProperties";
-*pStrings++ = "com.sun.star.drawing.ShadowProperties";
-*pStrings++ = "com.sun.star.drawing.ConnectorProperties";
-
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/inc/apitools.hxx | 14 +-
1 file changed, 5 insertions(+), 9 deletions(-)
New commits:
commit 9717d79beb5cb474717c111a5e7211b008e3031d
Author: Julien Nabet
AuthorDate: Sun Aug 18 11:28:43 2019 +0200
Commit: Julien Nabet
CommitDate: Sun Aug 18 13:33:38 2019 +0200
Simplify Sequence uses in dbaccess/source/inc/apitools.hxx
Change-Id: Iad57f019f020b1d37ff768d636322e2d0b32c695
Reviewed-on: https://gerrit.libreoffice.org/77662
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/dbaccess/source/inc/apitools.hxx b/dbaccess/source/inc/apitools.hxx
index a3e4228f9913..3271c35f6fba 100644
--- a/dbaccess/source/inc/apitools.hxx
+++ b/dbaccess/source/inc/apitools.hxx
@@ -95,8 +95,7 @@ public:
} \
css::uno::Sequence< OUString > classname::getSupportedServiceNames_Static(
) \
{ \
-css::uno::Sequence< OUString > aSupported { serviceasciiname }; \
-return aSupported; \
+return { serviceasciiname }; \
} \
#define IMPLEMENT_SERVICE_INFO_GETSUPPORTED2_STATIC(classname,
serviceasciiname1, serviceasciiname2)\
@@ -106,10 +105,7 @@ public:
} \
css::uno::Sequence< OUString > classname::getSupportedServiceNames_Static(
) \
{ \
-css::uno::Sequence< OUString > aSupported(2); \
-aSupported[0] = serviceasciiname1;\
-aSupported[1] = serviceasciiname2;\
-return aSupported; \
+return { serviceasciiname1, serviceasciiname2 };\
} \
#define IMPLEMENT_SERVICE_INFO1(classname, implasciiname, serviceasciiname) \
@@ -117,7 +113,7 @@ public:
IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \
css::uno::Sequence< OUString > SAL_CALL
classname::getSupportedServiceNames( ) \
{ \
-return css::uno::Sequence< OUString > { serviceasciiname }; \
+return { serviceasciiname }; \
} \
@@ -126,7 +122,7 @@ public:
IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \
css::uno::Sequence< OUString > SAL_CALL
classname::getSupportedServiceNames( ) \
{ \
-return css::uno::Sequence< OUString > { serviceasciiname1,
serviceasciiname2 };\
+return { serviceasciiname1, serviceasciiname2 };\
}
@@ -146,7 +142,7 @@ public:
IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \
css::uno::Sequence< OUString > SAL_CALL
classname::getSupportedServiceNames( ) \
{ \
-return css::uno::Sequence< OUString > { serviceasciiname1,
serviceasciiname2, serviceasciiname3 }; \
+return { serviceasciiname1, serviceasciiname2, serviceasciiname3 }; \
} \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - unoxml/source vcl/qt5 vcl/source vcl/unx
unoxml/source/dom/documentbuilder.cxx | 15 ++-
unoxml/source/dom/saxbuilder.cxx | 15 ++-
unoxml/source/xpath/xpathapi.cxx | 15 ++-
vcl/qt5/Qt5DragAndDrop.cxx |6 ++
vcl/qt5/Qt5FilePicker.cxx |7 ++-
vcl/source/components/dtranscomp.cxx |4 ++--
vcl/source/uitest/uno/uiobject_uno.cxx |4 +---
vcl/source/uitest/uno/uitest_uno.cxx |4 +---
vcl/unx/generic/dtrans/X11_service.cxx |9 +++--
vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx |7 ++-
vcl/unx/kf5/KF5FilePicker.cxx |8 ++--
11 files changed, 21 insertions(+), 73 deletions(-)
New commits:
commit b49f189d9bfb0b5dca5ac259e6f56b49c2d0d08f
Author: Julien Nabet
AuthorDate: Sun Aug 18 09:29:27 2019 +0200
Commit: Julien Nabet
CommitDate: Sun Aug 18 10:17:36 2019 +0200
tdf#88205 Adapt uses of css::uno::Sequence to use initializer_list ctor
in vcl
Change-Id: Ibd66e5ed9064612b73d08fac179ee46dc5b0a4b6
Reviewed-on: https://gerrit.libreoffice.org/77656
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/vcl/qt5/Qt5DragAndDrop.cxx b/vcl/qt5/Qt5DragAndDrop.cxx
index 2b674e5a8e4f..ea26d5aaeb6f 100644
--- a/vcl/qt5/Qt5DragAndDrop.cxx
+++ b/vcl/qt5/Qt5DragAndDrop.cxx
@@ -120,8 +120,7 @@ sal_Bool SAL_CALL Qt5DragSource::supportsService(OUString
const& ServiceName)
css::uno::Sequence SAL_CALL Qt5DragSource::getSupportedServiceNames()
{
-uno::Sequence aRet{
"com.sun.star.datatransfer.dnd.Qt5DragSource" };
-return aRet;
+return { "com.sun.star.datatransfer.dnd.Qt5DragSource" };
}
Qt5DropTarget::Qt5DropTarget()
@@ -144,8 +143,7 @@ sal_Bool SAL_CALL Qt5DropTarget::supportsService(OUString
const& ServiceName)
css::uno::Sequence SAL_CALL Qt5DropTarget::getSupportedServiceNames()
{
-uno::Sequence aRet{
"com.sun.star.datatransfer.dnd.Qt5DropTarget" };
-return aRet;
+return { "com.sun.star.datatransfer.dnd.Qt5DropTarget" };
}
Qt5DropTarget::~Qt5DropTarget()
diff --git a/vcl/qt5/Qt5FilePicker.cxx b/vcl/qt5/Qt5FilePicker.cxx
index 602ee21569ee..1573f95dd6b5 100644
--- a/vcl/qt5/Qt5FilePicker.cxx
+++ b/vcl/qt5/Qt5FilePicker.cxx
@@ -70,11 +70,8 @@ namespace
{
uno::Sequence FilePicker_getSupportedServiceNames()
{
-uno::Sequence aRet(3);
-aRet[0] = "com.sun.star.ui.dialogs.FilePicker";
-aRet[1] = "com.sun.star.ui.dialogs.SystemFilePicker";
-aRet[2] = "com.sun.star.ui.dialogs.Qt5FilePicker";
-return aRet;
+return { "com.sun.star.ui.dialogs.FilePicker",
"com.sun.star.ui.dialogs.SystemFilePicker",
+ "com.sun.star.ui.dialogs.Qt5FilePicker" };
}
}
diff --git a/vcl/source/components/dtranscomp.cxx
b/vcl/source/components/dtranscomp.cxx
index 2952eff97012..0b2245bbd2f0 100644
--- a/vcl/source/components/dtranscomp.cxx
+++ b/vcl/source/components/dtranscomp.cxx
@@ -405,9 +405,9 @@ void GenericDropTarget::setDefaultActions( sal_Int8)
Sequence< OUString > DropTarget_getSupportedServiceNames()
{
#if defined MACOSX
-return Sequence< OUString > {
"com.sun.star.datatransfer.dnd.OleDropTarget" };
+return { "com.sun.star.datatransfer.dnd.OleDropTarget" };
#elif defined UNX
-return Sequence< OUString > {
"com.sun.star.datatransfer.dnd.X11DropTarget" };
+return { "com.sun.star.datatransfer.dnd.X11DropTarget" };
#else
return GenericDropTarget::getSupportedServiceNames_static();
#endif
diff --git a/vcl/source/uitest/uno/uiobject_uno.cxx
b/vcl/source/uitest/uno/uiobject_uno.cxx
index 714f16a72dbc..5eaef4db584a 100644
--- a/vcl/source/uitest/uno/uiobject_uno.cxx
+++ b/vcl/source/uitest/uno/uiobject_uno.cxx
@@ -197,9 +197,7 @@ sal_Bool UIObjectUnoObj::supportsService(OUString const &
ServiceName)
css::uno::Sequence UIObjectUnoObj::getSupportedServiceNames()
{
-css::uno::Sequence aServiceNames(1);
-aServiceNames[0] = "com.sun.star.ui.test.UIObject";
-return aServiceNames;
+return { "com.sun.star.ui.test.UIObject" };
}
OUString SAL_CALL UIObjectUnoObj::getHierarchy()
diff --git a/vcl/source/uitest/uno/uitest_uno.cxx
b/vcl/source/uitest/uno/uitest_uno.cxx
index 354b30585c69..8ae3b7e284a1 100644
--- a/vcl/source/uitest/uno/uitest_uno.cxx
+++ b/vcl/source/uitest/uno/uitest_uno.cxx
@@ -107,9 +107,7 @@ sal_Bool UITestUnoObj::supportsService(OUString const &
ServiceName)
css::uno::Sequence UITestUnoObj::getSupportedServiceNames()
{
-css::uno::Sequence aServiceNames(1);
-aServiceNames[0] = "com.sun.star.ui.test.UITest";
-return aServiceNames;
+return { "com.sun.star.ui.test.UITest" };
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
diff --git a/vcl/unx/generic/dtrans/X11_service.cxx
b/vcl/unx/generic/dtrans/X11_service.cxx
index 8020b677017f..dc08d85e6099 100644
--- a/vcl/unx/generic/dtrans/X11_service.cxx
+++ b/vcl/unx/generic/dtrans/X11_service.cxx
@@ -37,20 +37,17 @@ using namespace x11;
Sequence<
[Libreoffice-commits] core.git: sw/source
sw/source/core/access/acccell.cxx|6 +-
sw/source/core/access/accdoc.cxx |6 +-
sw/source/core/access/accembedded.cxx|6 +-
sw/source/core/access/accfootnote.cxx| 10 ++
sw/source/core/access/accgraphic.cxx |6 +-
sw/source/core/access/accheaderfooter.cxx| 10 ++
sw/source/core/access/accpage.cxx|6 +-
sw/source/core/access/accpara.cxx|6 +-
sw/source/core/access/acctable.cxx |6 +-
sw/source/core/access/acctextframe.cxx |6 +-
sw/source/core/unocore/SwXTextDefaults.cxx | 17 +++--
sw/source/core/unocore/unofield.cxx |6 +-
sw/source/core/unocore/unoframe.cxx |6 +-
sw/source/core/unocore/unosett.cxx |6 +-
sw/source/core/unocore/unosrch.cxx |6 +-
sw/source/ui/uno/swdetect.cxx|6 +-
sw/source/uibase/uno/SwXDocumentSettings.cxx |6 +-
sw/source/uibase/uno/SwXFilterOptions.cxx|3 +--
sw/source/uibase/uno/unoatxt.cxx |4 +---
sw/source/uibase/uno/unomailmerge.cxx|6 +-
sw/source/uibase/uno/unomod.cxx |4 +---
sw/source/uibase/uno/unotxdoc.cxx| 17 +++--
sw/source/uibase/uno/unotxvw.cxx | 23 ---
23 files changed, 44 insertions(+), 134 deletions(-)
New commits:
commit b68f4ff85bc1d6e008facbc310ddbfb5d799b7a5
Author: Julien Nabet
AuthorDate: Sun Aug 18 10:17:45 2019 +0200
Commit: Julien Nabet
CommitDate: Sun Aug 18 11:28:03 2019 +0200
tdf#88205 Adapt uses of css::uno::Sequence to use initializer_list ctor
in sw
Change-Id: I40bae418b5cf966eb76ba130eb6cb5ceb29efff7
Reviewed-on: https://gerrit.libreoffice.org/77658
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/sw/source/core/access/acccell.cxx
b/sw/source/core/access/acccell.cxx
index d979723a4894..12762fa4a5d5 100644
--- a/sw/source/core/access/acccell.cxx
+++ b/sw/source/core/access/acccell.cxx
@@ -250,11 +250,7 @@ sal_Bool SAL_CALL SwAccessibleCell::supportsService(const
OUString& sTestService
uno::Sequence< OUString > SAL_CALL SwAccessibleCell::getSupportedServiceNames()
{
-uno::Sequence< OUString > aRet(2);
-OUString* pArray = aRet.getArray();
-pArray[0] = "com.sun.star.table.AccessibleCellView";
-pArray[1] = sAccessibleServiceName;
-return aRet;
+return { "com.sun.star.table.AccessibleCellView", sAccessibleServiceName };
}
void SwAccessibleCell::Dispose(bool bRecursive, bool bCanSkipInvisible)
diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx
index 78b5c2757141..35b345d517f8 100644
--- a/sw/source/core/access/accdoc.cxx
+++ b/sw/source/core/access/accdoc.cxx
@@ -435,11 +435,7 @@ sal_Bool SAL_CALL
SwAccessibleDocument::supportsService(const OUString& sTestSer
uno::Sequence< OUString > SAL_CALL
SwAccessibleDocument::getSupportedServiceNames()
{
-uno::Sequence< OUString > aRet(2);
-OUString* pArray = aRet.getArray();
-pArray[0] = sServiceName;
-pArray[1] = sAccessibleServiceName;
-return aRet;
+return { sServiceName, sAccessibleServiceName };
}
// XInterface
diff --git a/sw/source/core/access/accembedded.cxx
b/sw/source/core/access/accembedded.cxx
index dccad7083e86..eb63f192f02c 100644
--- a/sw/source/core/access/accembedded.cxx
+++ b/sw/source/core/access/accembedded.cxx
@@ -84,11 +84,7 @@ sal_Bool SAL_CALL
SwAccessibleEmbeddedObject::supportsService(const OUString& sT
uno::Sequence< OUString > SAL_CALL
SwAccessibleEmbeddedObject::getSupportedServiceNames()
{
-uno::Sequence< OUString > aRet(2);
-OUString* pArray = aRet.getArray();
-pArray[0] = "com.sun.star.text.AccessibleTextEmbeddedObject";
-pArray[1] = sAccessibleServiceName;
-return aRet;
+return { "com.sun.star.text.AccessibleTextEmbeddedObject",
sAccessibleServiceName };
}
uno::Sequence< sal_Int8 > SAL_CALL
SwAccessibleEmbeddedObject::getImplementationId()
diff --git a/sw/source/core/access/accfootnote.cxx
b/sw/source/core/access/accfootnote.cxx
index 14fb78525736..876e8c278364 100644
--- a/sw/source/core/access/accfootnote.cxx
+++ b/sw/source/core/access/accfootnote.cxx
@@ -101,14 +101,8 @@ sal_Bool SAL_CALL
SwAccessibleFootnote::supportsService(const OUString& sTestSer
Sequence< OUString > SAL_CALL SwAccessibleFootnote::getSupportedServiceNames()
{
-Sequence< OUString > aRet(2);
-OUString* pArray = aRet.getArray();
-if( AccessibleRole::END_NOTE == GetRole() )
-pArray[0] = "com.sun.star.text.AccessibleEndnoteView";
-else
-pArray[0] = "com.sun.star.text.AccessibleFootnoteView";
-pArray[1] = sAccessibleServiceName;
-return aRet;
+return { (AccessibleRole::END_NOTE ==
[Libreoffice-commits] core.git: dbaccess/source editeng/source i18npool/source svtools/source writerperfect/source
dbaccess/source/core/api/RowSet.cxx |6
+++---
dbaccess/source/core/api/callablestatement.cxx |2
+-
dbaccess/source/core/api/datacolumn.cxx |3
+--
dbaccess/source/core/api/definitioncolumn.cxx |6
+++---
dbaccess/source/core/api/preparedstatement.cxx |2
+-
dbaccess/source/core/api/querydescriptor.cxx|2
+-
dbaccess/source/core/api/resultcolumn.cxx |2
+-
dbaccess/source/core/api/resultset.cxx |2
+-
dbaccess/source/core/dataaccess/definitioncontainer.cxx |2
+-
dbaccess/source/core/dataaccess/documentcontainer.cxx |2
+-
dbaccess/source/core/misc/DatabaseDataProvider.cxx |2
+-
dbaccess/source/ui/browser/dbloader.cxx |2
+-
dbaccess/source/ui/browser/sbagrid.cxx |2
+-
editeng/source/accessibility/AccessibleImageBullet.cxx |2
+-
editeng/source/uno/unonrule.cxx |2
+-
editeng/source/uno/unotext.cxx |6
+++---
i18npool/source/breakiterator/breakiteratorImpl.cxx |2
+-
i18npool/source/calendar/calendarImpl.cxx |3
+--
i18npool/source/characterclassification/cclass_unicode.cxx |2
+-
i18npool/source/characterclassification/characterclassificationImpl.cxx |2
+-
i18npool/source/characterclassification/unoscripttypedetector.cxx |2
+-
i18npool/source/collator/collatorImpl.cxx |2
+-
i18npool/source/nativenumber/nativenumbersupplier.cxx |2
+-
i18npool/source/numberformatcode/numberformatcode.cxx |2
+-
i18npool/source/textconversion/textconversionImpl.cxx |2
+-
i18npool/source/transliteration/transliterationImpl.cxx |2
+-
i18npool/source/transliteration/transliteration_commonclass.cxx |2
+-
svtools/source/graphic/renderer.cxx |2
+-
svtools/source/hatchwindow/documentcloser.cxx |2
+-
svtools/source/hatchwindow/hatchwindowfactory.cxx |5
+
writerperfect/source/calc/MSWorksCalcImportFilter.cxx |3
+--
writerperfect/source/calc/MWAWCalcImportFilter.cxx |3
+--
writerperfect/source/calc/NumbersImportFilter.cxx |3
+--
writerperfect/source/draw/CDRImportFilter.cxx |3
+--
writerperfect/source/draw/CMXImportFilter.cxx |3
+--
writerperfect/source/draw/FreehandImportFilter.cxx |3
+--
writerperfect/source/draw/MSPUBImportFilter.cxx |3
+--
writerperfect/source/draw/MWAWDrawImportFilter.cxx |3
+--
writerperfect/source/draw/PageMakerImportFilter.cxx |3
+--
writerperfect/source/draw/VisioImportFilter.cxx |3
+--
writerperfect/source/draw/WPGImportFilter.cxx |3
+--
writerperfect/source/impress/KeynoteImportFilter.cxx|3
+--
writerperfect/source/impress/MWAWPresentationImportFilter.cxx |3
+--
writerperfect/source/writer/AbiWordImportFilter.cxx |3
+--
writerperfect/source/writer/EBookImportFilter.cxx |3
+--
writerperfect/source/writer/MSWorksImportFilter.cxx |3
+--
writerperfect/source/writer/MWAWImportFilter.cxx|3
+--
writerperfect/source/writer/PagesImportFilter.cxx |3
+--
writerperfect/source/writer/WordPerfectImportFilter.cxx |3
+--
49 files changed, 55 insertions(+), 79 deletions(-)
New commits:
commit 3d24130986e6a0e1baa2cff61309f0f42cf0c339
Author: Julien Nabet
AuthorDate: Sat Aug 17 11:39:47 2019 +0200
Commit: Julien Nabet
CommitDate: Sat Aug 17 12:26:15 2019 +0200
Use simplified syntax for Sequence
Change-Id: I92ac60fafcc404439c101d1950ed214fce140c91
Reviewed-on: https://gerrit.libreoffice.org/77621
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/dbaccess/source/core/api/RowSet.cxx
b/dbaccess/source/core/api/RowSet.cxx
index 1485d77dcdec..48597c9b2c00 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -478,8 +478,8 @@ sal_Bool SAL_CALL ORowSet::supportsService( const OUString&
_rServiceName )
Sequence< OUString > SAL_CALL ORowSet::getSupportedServiceNames()
{
-
[Libreoffice-commits] core.git: 2 commits - embeddedobj/source filter/source xmloff/source
embeddedobj/source/commonembedding/xfactory.cxx |5 +
filter/source/odfflatxml/OdfFlatXml.cxx |5 +
filter/source/storagefilterdetect/filterdetect.cxx |6 +-
filter/source/t602/t602filter.cxx |9 ++---
filter/source/textfilterdetect/filterdetect.cxx |6 +-
filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx |6 +-
xmloff/source/core/unoatrcn.cxx |4 +---
xmloff/source/core/xmlexp.cxx |5 +
xmloff/source/core/xmlimp.cxx |5 +
xmloff/source/transform/OOo2Oasis.cxx | 11 +++
xmloff/source/transform/Oasis2OOo.cxx |7 ++-
11 files changed, 15 insertions(+), 54 deletions(-)
New commits:
commit b4092c738321cd9f9e2cba18a49519abcbd4451a
Author: Julien Nabet
AuthorDate: Sat Aug 17 12:25:34 2019 +0200
Commit: Julien Nabet
CommitDate: Sat Aug 17 13:29:54 2019 +0200
tdf#88205 Adapt uses of css::uno::Sequence to use initializer_list ctor
in embeddedobj and filter
Change-Id: I2da3fa1df8782e449852358d1c86f5e4bc79ea1a
Reviewed-on: https://gerrit.libreoffice.org/77627
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/embeddedobj/source/commonembedding/xfactory.cxx
b/embeddedobj/source/commonembedding/xfactory.cxx
index 50e926fd7867..1c0209460774 100644
--- a/embeddedobj/source/commonembedding/xfactory.cxx
+++ b/embeddedobj/source/commonembedding/xfactory.cxx
@@ -39,10 +39,7 @@ using namespace ::com::sun::star;
uno::Sequence< OUString >
OOoEmbeddedObjectFactory::impl_staticGetSupportedServiceNames()
{
-uno::Sequence< OUString > aRet(2);
-aRet[0] = "com.sun.star.embed.OOoEmbeddedObjectFactory";
-aRet[1] = "com.sun.star.comp.embed.OOoEmbeddedObjectFactory";
-return aRet;
+return { "com.sun.star.embed.OOoEmbeddedObjectFactory",
"com.sun.star.comp.embed.OOoEmbeddedObjectFactory" };
}
OUString OOoEmbeddedObjectFactory::impl_staticGetImplementationName()
diff --git a/filter/source/odfflatxml/OdfFlatXml.cxx
b/filter/source/odfflatxml/OdfFlatXml.cxx
index 29882d0d4029..8e0a4beb076e 100644
--- a/filter/source/odfflatxml/OdfFlatXml.cxx
+++ b/filter/source/odfflatxml/OdfFlatXml.cxx
@@ -208,10 +208,7 @@ OUString OdfFlatXml::impl_getImplementationName()
Sequence< OUString > OdfFlatXml::impl_getSupportedServiceNames()
{
-Sequence< OUString > lServiceNames(2);
-lServiceNames[0] = "com.sun.star.document.ImportFilter";
-lServiceNames[1] = "com.sun.star.document.ExportFilter";
-return lServiceNames;
+return { "com.sun.star.document.ImportFilter",
"com.sun.star.document.ExportFilter" };
}
Reference< XInterface > SAL_CALL OdfFlatXml::impl_createInstance(const
Reference< XMultiServiceFactory >& fact)
diff --git a/filter/source/storagefilterdetect/filterdetect.cxx
b/filter/source/storagefilterdetect/filterdetect.cxx
index 45bfa1f6cdbf..02ed875c6699 100644
--- a/filter/source/storagefilterdetect/filterdetect.cxx
+++ b/filter/source/storagefilterdetect/filterdetect.cxx
@@ -172,11 +172,7 @@ OUString StorageFilterDetect_getImplementationName()
uno::Sequence StorageFilterDetect_getSupportedServiceNames()
{
-uno::Sequence aRet(2);
-OUString* pArray = aRet.getArray();
-pArray[0] = "com.sun.star.document.ExtendedTypeDetection";
-pArray[1] = "com.sun.star.comp.filters.StorageFilterDetect";
-return aRet;
+return { "com.sun.star.document.ExtendedTypeDetection",
"com.sun.star.comp.filters.StorageFilterDetect" };
}
uno::Reference StorageFilterDetect_createInstance(
diff --git a/filter/source/t602/t602filter.cxx
b/filter/source/t602/t602filter.cxx
index 1f8fe00c91e4..124ec86b0a0d 100644
--- a/filter/source/t602/t602filter.cxx
+++ b/filter/source/t602/t602filter.cxx
@@ -870,11 +870,7 @@ OUString T602ImportFilter_getImplementationName ()
Sequence< OUString > T602ImportFilter_getSupportedServiceNames( )
{
-Sequence < OUString > aRet(2);
-OUString* pArray = aRet.getArray();
-pArray[0] = "com.sun.star.document.ImportFilter";
-pArray[1] = "com.sun.star.document.ExtendedTypeDetection";
-return aRet;
+return { "com.sun.star.document.ImportFilter",
"com.sun.star.document.ExtendedTypeDetection" };
}
Reference< XInterface > T602ImportFilter_createInstance( const Reference<
XMultiServiceFactory > & rSMgr)
@@ -1140,8 +1136,7 @@ OUString T602ImportFilterDialog_getImplementationName ()
Sequence< OUString > T602ImportFilterDialog_getSupportedServiceNames( )
{
-Sequence aRet { "com.sun.star.ui.dialogs.FilterOptionsDialog" };
-return aRet;
+return { "com.sun.star.ui.dialogs.FilterOptionsDialog" };
}
Reference< XInterface > T602ImportFilterDialog_createInstance( const
Reference< XMultiServiceFactory > & )
diff --git a/filter/source/textfilterdetect/filterdetect.cxx
b/filter/source/textfilterdetect/filterdetect.cxx
index 0551f275eecb..b4959639c574 100644
[Libreoffice-commits] core.git: 2 commits - testtools/source toolkit/source ucb/source xmlhelp/source
testtools/source/bridgetest/bridgetest.cxx |3 +--
testtools/source/bridgetest/constructors.cxx|6 ++
testtools/source/bridgetest/cppobj.cxx |3 +--
testtools/source/performance/ubobject.cxx |3 +--
testtools/source/performance/ubtest.cxx |3 +--
toolkit/source/controls/animatedimages.cxx |5 +
toolkit/source/controls/grid/defaultgridcolumnmodel.cxx |4 +---
toolkit/source/controls/grid/gridcolumn.cxx |4 +---
toolkit/source/controls/spinningprogress.cxx|8 +++-
ucb/source/ucp/ext/ucpext_content.cxx |5 +
ucb/source/ucp/ext/ucpext_provider.cxx |5 +
ucb/source/ucp/file/filtask.cxx |4 +---
ucb/source/ucp/hierarchy/hierarchydatasource.cxx|5 +
ucb/source/ucp/package/pkgcontent.cxx |8 +---
xmlhelp/source/cxxhelp/provider/provider.cxx|6 +-
xmlhelp/source/treeview/tvfactory.cxx |3 +--
16 files changed, 19 insertions(+), 56 deletions(-)
New commits:
commit 5ad254ed246cf8d11b55e50ed0ccba5736d0cdbb
Author: Julien Nabet
AuthorDate: Sat Aug 17 12:15:01 2019 +0200
Commit: Julien Nabet
CommitDate: Sat Aug 17 13:30:19 2019 +0200
tdf#88205 Adapt uses of css::uno::Sequence to use initializer_list ctor
in testtools and toolkit
Change-Id: I14b53c27906eb615e68482cbc3918be8da464212
Reviewed-on: https://gerrit.libreoffice.org/77624
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/testtools/source/bridgetest/bridgetest.cxx
b/testtools/source/bridgetest/bridgetest.cxx
index 66be97682ddf..535d8e1fa73c 100644
--- a/testtools/source/bridgetest/bridgetest.cxx
+++ b/testtools/source/bridgetest/bridgetest.cxx
@@ -76,8 +76,7 @@ static Sequence cloneSequence(const Sequence& val);
static Sequence< OUString > getSupportedServiceNames()
{
-OUString aName( SERVICENAME );
-return Sequence< OUString >( , 1 );
+return { SERVICENAME };
}
static bool check( bool b , char const * message )
diff --git a/testtools/source/bridgetest/constructors.cxx
b/testtools/source/bridgetest/constructors.cxx
index 050c2dd6683c..d551e9fdcaa3 100644
--- a/testtools/source/bridgetest/constructors.cxx
+++ b/testtools/source/bridgetest/constructors.cxx
@@ -430,13 +430,11 @@ css::uno::Reference< css::uno::XInterface > create2(
}
OUString getImplementationName2() {
-return
-"comp.test.testtools.bridgetest.Constructors2";
+return "comp.test.testtools.bridgetest.Constructors2";
}
css::uno::Sequence< OUString > getSupportedServiceNames2() {
-css::uno::Sequence< OUString > s {
"test.testtools.bridgetest.Constructors2" };
-return s;
+return { "test.testtools.bridgetest.Constructors2" };
}
::cppu::ImplementationEntry const entries[] = {
diff --git a/testtools/source/bridgetest/cppobj.cxx
b/testtools/source/bridgetest/cppobj.cxx
index 1eb3e9903753..2a5a58be34bb 100644
--- a/testtools/source/bridgetest/cppobj.cxx
+++ b/testtools/source/bridgetest/cppobj.cxx
@@ -69,8 +69,7 @@ namespace bridge_object
static Sequence< OUString > getSupportedServiceNames()
{
-OUString aName( SERVICENAME );
-return Sequence< OUString >( , 1 );
+return { SERVICENAME };
}
diff --git a/testtools/source/performance/ubobject.cxx
b/testtools/source/performance/ubobject.cxx
index ca0582e24e4b..8aff1663ed9c 100644
--- a/testtools/source/performance/ubobject.cxx
+++ b/testtools/source/performance/ubobject.cxx
@@ -47,8 +47,7 @@ namespace benchmark_object
inline static Sequence< OUString > getSupportedServiceNames()
{
-OUString aName( SERVICENAME);
-return Sequence< OUString >( , 1 );
+return { SERVICENAME };
}
diff --git a/testtools/source/performance/ubtest.cxx
b/testtools/source/performance/ubtest.cxx
index 283e73d699c9..a45792a07a4b 100644
--- a/testtools/source/performance/ubtest.cxx
+++ b/testtools/source/performance/ubtest.cxx
@@ -388,8 +388,7 @@ static void createInstance( Reference< T > & rxOut,
inline static Sequence< OUString > getSupportedServiceNames()
{
-OUString aName( SERVICENAME );
-return Sequence< OUString >( , 1 );
+return { SERVICENAME };
}
diff --git a/toolkit/source/controls/animatedimages.cxx
b/toolkit/source/controls/animatedimages.cxx
index bcc0e0628130..efa48cec0b1f 100644
--- a/toolkit/source/controls/animatedimages.cxx
+++ b/toolkit/source/controls/animatedimages.cxx
@@ -292,10 +292,7 @@ namespace toolkit {
Sequence< OUString > SAL_CALL
AnimatedImagesControlModel::getSupportedServiceNames()
{
-Sequence< OUString > aServiceNames(2);
-aServiceNames[0] = "com.sun.star.awt.AnimatedImagesControlModel";
-aServiceNames[1] = "com.sun.star.awt.UnoControlModel";
-return aServiceNames;
+return {
[Libreoffice-commits] core.git: comphelper/source
comphelper/source/compare/AnyCompareFactory.cxx|4 +---
comphelper/source/container/IndexedPropertyValuesContainer.cxx |4 +---
comphelper/source/container/NamedPropertyValuesContainer.cxx |4 +---
comphelper/source/misc/instancelocker.cxx |3 +--
4 files changed, 4 insertions(+), 11 deletions(-)
New commits:
commit e01949e9c56c1605a4eccbae285f85d1b3085e15
Author: Julien Nabet
AuthorDate: Sat Aug 17 12:18:30 2019 +0200
Commit: Julien Nabet
CommitDate: Sat Aug 17 15:26:15 2019 +0200
tdf#88205 Adapt uses of css::uno::Sequence to use initializer_list ctor
in comphelper
Change-Id: I4d9b9e13801ebf7671ff651b931a6c4144860985
Reviewed-on: https://gerrit.libreoffice.org/77626
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/comphelper/source/compare/AnyCompareFactory.cxx
b/comphelper/source/compare/AnyCompareFactory.cxx
index a912bb62e156..e4cec19feeed 100644
--- a/comphelper/source/compare/AnyCompareFactory.cxx
+++ b/comphelper/source/compare/AnyCompareFactory.cxx
@@ -118,9 +118,7 @@ sal_Bool SAL_CALL AnyCompareFactory::supportsService( const
OUString& ServiceNam
Sequence< OUString > SAL_CALL AnyCompareFactory::getSupportedServiceNames( )
{
-const OUString aServiceName( "com.sun.star.ucb.AnyCompareFactory" );
-const Sequence< OUString > aSeq( , 1 );
-return aSeq;
+return { "com.sun.star.ucb.AnyCompareFactory" };
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
diff --git a/comphelper/source/container/IndexedPropertyValuesContainer.cxx
b/comphelper/source/container/IndexedPropertyValuesContainer.cxx
index 7455831214ca..0053cc8e4374 100644
--- a/comphelper/source/container/IndexedPropertyValuesContainer.cxx
+++ b/comphelper/source/container/IndexedPropertyValuesContainer.cxx
@@ -143,9 +143,7 @@ sal_Bool SAL_CALL
IndexedPropertyValuesContainer::supportsService( const OUStrin
css::uno::Sequence< OUString > SAL_CALL
IndexedPropertyValuesContainer::getSupportedServiceNames( )
{
-const OUString aServiceName( "com.sun.star.document.IndexedPropertyValues"
);
-const uno::Sequence< OUString > aSeq( , 1 );
-return aSeq;
+return { "com.sun.star.document.IndexedPropertyValues" };
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
diff --git a/comphelper/source/container/NamedPropertyValuesContainer.cxx
b/comphelper/source/container/NamedPropertyValuesContainer.cxx
index 5cc30b1cf954..13b8f855866f 100644
--- a/comphelper/source/container/NamedPropertyValuesContainer.cxx
+++ b/comphelper/source/container/NamedPropertyValuesContainer.cxx
@@ -151,9 +151,7 @@ sal_Bool SAL_CALL
NamedPropertyValuesContainer::supportsService( const OUString&
css::uno::Sequence< OUString > SAL_CALL
NamedPropertyValuesContainer::getSupportedServiceNames( )
{
-const OUString aServiceName( "com.sun.star.document.NamedPropertyValues" );
-const uno::Sequence< OUString > aSeq( , 1 );
-return aSeq;
+return { "com.sun.star.document.NamedPropertyValues" };
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
diff --git a/comphelper/source/misc/instancelocker.cxx
b/comphelper/source/misc/instancelocker.cxx
index 31e55c20a6e0..ad581840d01d 100644
--- a/comphelper/source/misc/instancelocker.cxx
+++ b/comphelper/source/misc/instancelocker.cxx
@@ -186,8 +186,7 @@ sal_Bool SAL_CALL OInstanceLocker::supportsService( const
OUString& ServiceName
uno::Sequence< OUString > SAL_CALL OInstanceLocker::getSupportedServiceNames()
{
-const OUString aServiceName( "com.sun.star.embed.InstanceLocker" );
-return uno::Sequence< OUString >( , 1 );
+return { "com.sun.star.embed.InstanceLocker" };
}
// OLockListener
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - cppuhelper/source desktop/source desktop/test drawinglayer/source embeddedobj/source extensions/source forms/source fpicker/source
cppuhelper/source/servicemanager.cxx |5 ---
desktop/source/app/officeipcthread.cxx |3 -
desktop/source/lib/lokinteractionhandler.cxx | 12 +++
desktop/test/deployment/active/active_native.cxx |3 -
desktop/test/deployment/passive/passive_native.cxx |3 -
drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx |2 -
embeddedobj/source/commonembedding/xfactory.cxx |5 ---
extensions/source/bibliography/bibload.cxx |7
forms/source/component/FormComponent.cxx |5 ---
forms/source/component/FormsCollection.cxx |7
forms/source/component/scrollbar.cxx |4 --
forms/source/component/spinbutton.cxx|4 --
forms/source/richtext/richtextmodel.cxx | 18 +--
fpicker/source/aqua/SalAquaFilePicker.mm |8 +---
fpicker/source/aqua/SalAquaFolderPicker.mm |5 ---
fpicker/source/win32/VistaFilePicker.cxx |9 ++---
16 files changed, 33 insertions(+), 67 deletions(-)
New commits:
commit 2674cf29a87c8f56ccf9f491c496e36ce4e8e367
Author: Julien Nabet
AuthorDate: Sat Aug 17 16:08:25 2019 +0200
Commit: Julien Nabet
CommitDate: Sat Aug 17 17:03:14 2019 +0200
tdf#88205 Adapt uses of css::uno::Sequence to use initializer_list ctor
in forms and fpicker
Change-Id: Ifa931bed6de434a2ee183c78e8e1be852ca06a56
Reviewed-on: https://gerrit.libreoffice.org/77637
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/forms/source/component/FormComponent.cxx
b/forms/source/component/FormComponent.cxx
index e0c7b3e04bd6..e8c8efca5c6c 100644
--- a/forms/source/component/FormComponent.cxx
+++ b/forms/source/component/FormComponent.cxx
@@ -682,10 +682,7 @@ Sequence SAL_CALL
OControlModel::getSupportedServiceNames()
Sequence< OUString > OControlModel::getSupportedServiceNames_Static()
{
-Sequence< OUString > aServiceNames( 2 );
-aServiceNames[ 0 ] = FRM_SUN_FORMCOMPONENT;
-aServiceNames[ 1 ] = "com.sun.star.form.FormControlModel";
-return aServiceNames;
+return { FRM_SUN_FORMCOMPONENT, "com.sun.star.form.FormControlModel" };
}
// XEventListener
diff --git a/forms/source/component/FormsCollection.cxx
b/forms/source/component/FormsCollection.cxx
index 753deca90143..2b2b52c2545d 100644
--- a/forms/source/component/FormsCollection.cxx
+++ b/forms/source/component/FormsCollection.cxx
@@ -95,12 +95,7 @@ sal_Bool SAL_CALL OFormsCollection::supportsService( const
OUString& _rServiceNa
css::uno::Sequence SAL_CALL
OFormsCollection::getSupportedServiceNames()
{
-css::uno::Sequence aReturn(2);
-
-aReturn[0] = "com.sun.star.form.Forms";
-aReturn[1] = "com.sun.star.form.FormComponents";
-
-return aReturn;
+return { "com.sun.star.form.Forms", "com.sun.star.form.FormComponents" };
}
// XCloneable
diff --git a/forms/source/component/scrollbar.cxx
b/forms/source/component/scrollbar.cxx
index 2e153c3d71f3..b478a58c69e2 100644
--- a/forms/source/component/scrollbar.cxx
+++ b/forms/source/component/scrollbar.cxx
@@ -118,9 +118,7 @@ namespace frm
// to benefit from the functionality for binding to spreadsheet cells
Sequence< OUString > SAL_CALL OScrollBarModel::getSupportedServiceNames()
{
-Sequence< OUString > aOwnNames( 2 );
-aOwnNames[ 0 ] = FRM_SUN_COMPONENT_SCROLLBAR;
-aOwnNames[ 1 ] = BINDABLE_INTEGER_VALUE_RANGE;
+Sequence< OUString > aOwnNames { FRM_SUN_COMPONENT_SCROLLBAR,
BINDABLE_INTEGER_VALUE_RANGE };
return ::comphelper::combineSequences(
getAggregateServiceNames(),
diff --git a/forms/source/component/spinbutton.cxx
b/forms/source/component/spinbutton.cxx
index 9d6b618c3506..d9504a55b616 100644
--- a/forms/source/component/spinbutton.cxx
+++ b/forms/source/component/spinbutton.cxx
@@ -71,9 +71,7 @@ namespace frm
// to benefit from the functionality for binding to spreadsheet cells
Sequence< OUString > SAL_CALL OSpinButtonModel::getSupportedServiceNames()
{
-Sequence< OUString > aOwnNames( 2 );
-aOwnNames[ 0 ] = FRM_SUN_COMPONENT_SPINBUTTON;
-aOwnNames[ 1 ] = BINDABLE_INTEGER_VALUE_RANGE;
+Sequence< OUString > aOwnNames { FRM_SUN_COMPONENT_SPINBUTTON,
BINDABLE_INTEGER_VALUE_RANGE };
return ::comphelper::combineSequences(
getAggregateServiceNames(),
diff --git a/forms/source/richtext/richtextmodel.cxx
b/forms/source/richtext/richtextmodel.cxx
index 3d1e7a75e834..9ec22b913924 100644
--- a/forms/source/richtext/richtextmodel.cxx
+++ b/forms/source/richtext/richtextmodel.cxx
@@ -233,15 +233,15 @@ namespace frm
Sequence< OUString > SAL_CALL ORichTextModel::getSupportedServiceNames()
{
-Sequence< OUString > aOwnNames( 8 );
[Libreoffice-commits] core.git: editeng/source
editeng/source/accessibility/AccessibleImageBullet.cxx |4 +---
editeng/source/uno/unonrule.cxx|4 +---
editeng/source/uno/unotext.cxx |8 +++-
3 files changed, 5 insertions(+), 11 deletions(-)
New commits:
commit 39921c1657d0d131ab7ed6c5490052f53bb764cb
Author: Julien Nabet
AuthorDate: Thu Aug 15 20:02:41 2019 +0200
Commit: Julien Nabet
CommitDate: Thu Aug 15 20:49:30 2019 +0200
tdf#88205 Adapt uses of css::uno::Sequence to use initializer_list ctor
in editeng
Change-Id: If4b7e216edf7d589c59f50e6d0ef91d669af2d15
Reviewed-on: https://gerrit.libreoffice.org/77542
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/editeng/source/accessibility/AccessibleImageBullet.cxx
b/editeng/source/accessibility/AccessibleImageBullet.cxx
index b596e292cb0d..3c9f7a0fc89b 100644
--- a/editeng/source/accessibility/AccessibleImageBullet.cxx
+++ b/editeng/source/accessibility/AccessibleImageBullet.cxx
@@ -359,9 +359,7 @@ namespace accessibility
uno::Sequence< OUString > SAL_CALL
AccessibleImageBullet::getSupportedServiceNames()
{
-
-const OUString sServiceName
("com.sun.star.accessibility.AccessibleContext");
-return uno::Sequence< OUString > (, 1);
+return uno::Sequence< OUString >{
"com.sun.star.accessibility.AccessibleContext" };
}
void AccessibleImageBullet::SetIndexInParent( sal_Int32 nIndex )
diff --git a/editeng/source/uno/unonrule.cxx b/editeng/source/uno/unonrule.cxx
index 3f2f344d9179..c9df5b169448 100644
--- a/editeng/source/uno/unonrule.cxx
+++ b/editeng/source/uno/unonrule.cxx
@@ -165,9 +165,7 @@ sal_Bool SAL_CALL SvxUnoNumberingRules::supportsService(
const OUString& Service
Sequence< OUString > SAL_CALL SvxUnoNumberingRules::getSupportedServiceNames(
)
{
-OUString aService( "com.sun.star.text.NumberingRules" );
-Sequence< OUString > aSeq( , 1 );
-return aSeq;
+return Sequence< OUString > { "com.sun.star.text.NumberingRules" };
}
Sequence
SvxUnoNumberingRules::getNumberingRuleByIndex(sal_Int32 nIndex) const
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index fc83f3fff196..74d453939ce5 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -1442,11 +1442,9 @@ uno::Sequence< OUString > SAL_CALL
SvxUnoTextRangeBase::getSupportedServiceNames
uno::Sequence< OUString >
SvxUnoTextRangeBase::getSupportedServiceNames_Static()
{
-uno::Sequence< OUString > aSeq(3);
-aSeq[0] = "com.sun.star.style.CharacterProperties";
-aSeq[1] = "com.sun.star.style.CharacterPropertiesComplex";
-aSeq[2] = "com.sun.star.style.CharacterPropertiesAsian";
-return aSeq;
+return uno::Sequence< OUString >{ "com.sun.star.style.CharacterProperties",
+
"com.sun.star.style.CharacterPropertiesComplex",
+
"com.sun.star.style.CharacterPropertiesAsian" };
}
// XTextRangeCompare
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerperfect/source
writerperfect/source/calc/MSWorksCalcImportFilter.cxx | 15
writerperfect/source/calc/MWAWCalcImportFilter.cxx| 14
writerperfect/source/calc/NumbersImportFilter.cxx | 14
writerperfect/source/draw/CDRImportFilter.cxx | 14
writerperfect/source/draw/CMXImportFilter.cxx | 14
writerperfect/source/draw/FreehandImportFilter.cxx| 14
writerperfect/source/draw/MSPUBImportFilter.cxx | 14
writerperfect/source/draw/MWAWDrawImportFilter.cxx| 14
writerperfect/source/draw/PageMakerImportFilter.cxx | 14
writerperfect/source/draw/VisioImportFilter.cxx | 14
writerperfect/source/draw/WPGImportFilter.cxx | 14
writerperfect/source/impress/KeynoteImportFilter.cxx | 29 ++--
writerperfect/source/impress/MWAWPresentationImportFilter.cxx | 14
writerperfect/source/writer/AbiWordImportFilter.cxx | 14
writerperfect/source/writer/EBookImportFilter.cxx | 14
writerperfect/source/writer/MSWorksImportFilter.cxx | 15
writerperfect/source/writer/MWAWImportFilter.cxx | 14
writerperfect/source/writer/PagesImportFilter.cxx | 14
writerperfect/source/writer/WordPerfectImportFilter.cxx | 35 --
19 files changed, 73 insertions(+), 231 deletions(-)
New commits:
commit f817ce79d501ce32d54d6c8a3492f1913fb85a55
Author: Julien Nabet
AuthorDate: Thu Aug 15 19:44:25 2019 +0200
Commit: Julien Nabet
CommitDate: Thu Aug 15 20:49:17 2019 +0200
tdf#88205 Adapt uses of css::uno::Sequence to use initializer_list ctor
in writerperfect
+ remove some using
Change-Id: I7ced8e49ba2d85a4354d9a5d048531c023faacf0
Reviewed-on: https://gerrit.libreoffice.org/77540
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
index 919184a1fd75..e1c9b18d4163 100644
--- a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
+++ b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
@@ -34,12 +34,6 @@
using namespace ::com::sun::star;
-using uno::Exception;
-using uno::RuntimeException;
-using uno::Sequence;
-using uno::XComponentContext;
-using uno::XInterface;
-
namespace MSWorksCalcImportFilterInternal
{
/// returns the list of stream name present in a folder
@@ -435,13 +429,10 @@ sal_Bool SAL_CALL
MSWorksCalcImportFilter::supportsService(const OUString& rServ
return cppu::supportsService(this, rServiceName);
}
-Sequence SAL_CALL MSWorksCalcImportFilter::getSupportedServiceNames()
+css::uno::Sequence SAL_CALL
MSWorksCalcImportFilter::getSupportedServiceNames()
{
-Sequence aRet(2);
-OUString* pArray = aRet.getArray();
-pArray[0] = "com.sun.star.document.ImportFilter";
-pArray[1] = "com.sun.star.document.ExtendedTypeDetection";
-return aRet;
+return css::uno::Sequence{ "com.sun.star.document.ImportFilter",
+
"com.sun.star.document.ExtendedTypeDetection" };
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
diff --git a/writerperfect/source/calc/MWAWCalcImportFilter.cxx
b/writerperfect/source/calc/MWAWCalcImportFilter.cxx
index ce9834bdf8ec..5e4236d4772f 100644
--- a/writerperfect/source/calc/MWAWCalcImportFilter.cxx
+++ b/writerperfect/source/calc/MWAWCalcImportFilter.cxx
@@ -17,11 +17,6 @@
#include "MWAWCalcImportFilter.hxx"
-using com::sun::star::uno::RuntimeException;
-using com::sun::star::uno::Sequence;
-using com::sun::star::uno::XComponentContext;
-using com::sun::star::uno::XInterface;
-
static bool handleEmbeddedMWAWGraphicObject(const librevenge::RVNGBinaryData&
data,
OdfDocumentHandler* pHandler,
const OdfStreamType streamType)
@@ -116,13 +111,10 @@ sal_Bool SAL_CALL
MWAWCalcImportFilter::supportsService(const OUString& rService
return cppu::supportsService(this, rServiceName);
}
-Sequence SAL_CALL MWAWCalcImportFilter::getSupportedServiceNames()
+css::uno::Sequence SAL_CALL
MWAWCalcImportFilter::getSupportedServiceNames()
{
-Sequence aRet(2);
-OUString* pArray = aRet.getArray();
-pArray[0] = "com.sun.star.document.ImportFilter";
-pArray[1] = "com.sun.star.document.ExtendedTypeDetection";
-return aRet;
+return css::uno::Sequence{ "com.sun.star.document.ImportFilter",
+
"com.sun.star.document.ExtendedTypeDetection" };
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
diff --git a/writerperfect/source/calc/NumbersImportFilter.cxx
b/writerperfect/source/calc/NumbersImportFilter.cxx
index 8cf18b492b9e..0352b2fa2981 100644
--- a/writerperfect/source/calc/NumbersImportFilter.cxx
[Libreoffice-commits] core.git: svtools/source
svtools/source/graphic/renderer.cxx |3 +--
svtools/source/hatchwindow/documentcloser.cxx |3 +--
svtools/source/hatchwindow/hatchwindowfactory.cxx |8
3 files changed, 6 insertions(+), 8 deletions(-)
New commits:
commit c368e0c00e98212e783ae98a18616ea5d0ca6da6
Author: Julien Nabet
AuthorDate: Thu Aug 15 19:56:03 2019 +0200
Commit: Julien Nabet
CommitDate: Thu Aug 15 23:00:38 2019 +0200
tdf#88205 Adapt uses of css::uno::Sequence to use initializer_list ctor
in svtools
Change-Id: I0f0ec621a4476763dbc93b41118bfd4f570145e9
Reviewed-on: https://gerrit.libreoffice.org/77541
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/svtools/source/graphic/renderer.cxx
b/svtools/source/graphic/renderer.cxx
index bae898873953..655e07ef72d5 100644
--- a/svtools/source/graphic/renderer.cxx
+++ b/svtools/source/graphic/renderer.cxx
@@ -151,8 +151,7 @@ sal_Bool SAL_CALL GraphicRendererVCL::supportsService(
const OUString& ServiceNa
uno::Sequence< OUString > SAL_CALL
GraphicRendererVCL::getSupportedServiceNames()
{
-uno::Sequence aSeq { "com.sun.star.graphic.GraphicRendererVCL" };
-return aSeq;
+return uno::Sequence{"com.sun.star.graphic.GraphicRendererVCL" };
}
diff --git a/svtools/source/hatchwindow/documentcloser.cxx
b/svtools/source/hatchwindow/documentcloser.cxx
index e94403073477..58d4f4ecbd96 100644
--- a/svtools/source/hatchwindow/documentcloser.cxx
+++ b/svtools/source/hatchwindow/documentcloser.cxx
@@ -220,8 +220,7 @@ sal_Bool SAL_CALL ODocumentCloser::supportsService( const
OUString& ServiceName
uno::Sequence< OUString > SAL_CALL ODocumentCloser::getSupportedServiceNames()
{
-const OUString aServiceName( "com.sun.star.embed.DocumentCloser" );
-return uno::Sequence< OUString >( , 1 );
+return uno::Sequence< OUString > { "com.sun.star.embed.DocumentCloser" };
}
}
diff --git a/svtools/source/hatchwindow/hatchwindowfactory.cxx
b/svtools/source/hatchwindow/hatchwindowfactory.cxx
index 63004c951004..9bd711d18b51 100644
--- a/svtools/source/hatchwindow/hatchwindowfactory.cxx
+++ b/svtools/source/hatchwindow/hatchwindowfactory.cxx
@@ -74,10 +74,10 @@ sal_Bool SAL_CALL OHatchWindowFactory::supportsService(
const OUString& ServiceN
uno::Sequence< OUString > SAL_CALL
OHatchWindowFactory::getSupportedServiceNames()
{
-uno::Sequence< OUString > aRet(2);
-aRet[0] = "com.sun.star.embed.HatchWindowFactory";
-aRet[1] = "com.sun.star.comp.embed.HatchWindowFactory";
-return aRet;
+return uno::Sequence{
+"com.sun.star.embed.HatchWindowFactory",
+"com.sun.star.comp.embed.HatchWindowFactory"
+};
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: readlicense_oo/docs
readlicense_oo/docs/readme.xrm |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5eeed4ef360ddfefaa489d71da788e1e9f217398 Author: Julien Nabet AuthorDate: Thu Aug 15 14:53:05 2019 +0200 Commit: Julien Nabet CommitDate: Thu Aug 15 23:00:58 2019 +0200 Related tdf#101957: glibc2 should be at least 2.14 Change-Id: Ifd634e32fd0482da41dcb76e33a7de3302e0bc6e Reviewed-on: https://gerrit.libreoffice.org/77517 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/readlicense_oo/docs/readme.xrm b/readlicense_oo/docs/readme.xrm index 50dcc99859c2..c7f3e46a74ba 100644 --- a/readlicense_oo/docs/readme.xrm +++ b/readlicense_oo/docs/readme.xrm @@ -65,7 +65,7 @@ - glibc2 version 2.5 or higher; + glibc2 version 2.14 or higher; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: hwpfilter/source include/test io/test linguistic/source oox/source pyuno/source reportdesign/source
hwpfilter/source/hwpreader.hxx |9 ++---
include/test/testinteractionhandler.hxx |8 +++-
io/test/stm/pumptest.cxx|4 +---
linguistic/source/dlistimp.cxx |3 +--
linguistic/source/gciterator.cxx|3 +--
linguistic/source/lngopt.cxx|3 +--
linguistic/source/lngsvcmgr.cxx |3 +--
oox/source/core/filterbase.cxx |5 +
pyuno/source/loader/pyuno_loader.cxx|3 +--
reportdesign/source/core/api/FormattedField.cxx |6 +-
reportdesign/source/core/api/Shape.cxx |4 +---
11 files changed, 14 insertions(+), 37 deletions(-)
New commits:
commit 7d3041beb90de4f3495addf139463860049740fb
Author: Julien Nabet
AuthorDate: Sat Aug 17 18:52:37 2019 +0200
Commit: Julien Nabet
CommitDate: Sat Aug 17 20:10:43 2019 +0200
tdf#88205 Adapt uses of css::uno::Sequence to use initializer_list ctor
in hwpfilter, include/test, io, linguistic, oox, pyuno, reportdesign
Change-Id: I5c265c4fde85dd6d7faab8ae82809c4a0e6dd69b
Reviewed-on: https://gerrit.libreoffice.org/77646
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/hwpfilter/source/hwpreader.hxx b/hwpfilter/source/hwpreader.hxx
index 6d6bf2c27204..16459320a4d1 100644
--- a/hwpfilter/source/hwpreader.hxx
+++ b/hwpfilter/source/hwpreader.hxx
@@ -194,8 +194,7 @@ Reference< XInterface > HwpImportFilter_CreateInstance(
Sequence< OUString > HwpImportFilter::getSupportedServiceNames_Static() throw
()
{
-Sequence< OUString > aRet {
HwpImportFilter::getImplementationName_Static() };
-return aRet;
+return { HwpImportFilter::getImplementationName_Static() };
}
HwpImportFilter::HwpImportFilter(const Reference< XMultiServiceFactory >&
rFact)
@@ -284,11 +283,7 @@ OUString HwpImportFilter::detect( css::uno::Sequence<
css::beans::PropertyValue
Sequence< OUString> HwpImportFilter::getSupportedServiceNames()
{
-Sequence < OUString > aRet(2);
-OUString* pArray = aRet.getArray();
-pArray[0] = SERVICE_NAME1;
-pArray[1] = SERVICE_NAME2;
-return aRet;
+return { SERVICE_NAME1, SERVICE_NAME2 };
}
extern "C"
diff --git a/include/test/testinteractionhandler.hxx
b/include/test/testinteractionhandler.hxx
index 5e871c68af12..8d63b7ae9546 100644
--- a/include/test/testinteractionhandler.hxx
+++ b/include/test/testinteractionhandler.hxx
@@ -57,13 +57,11 @@ public:
virtual css::uno::Sequence SAL_CALL getSupportedServiceNames()
override
{
-css::uno::Sequence aNames(3);
-aNames[0] = "com.sun.star.task.InteractionHandler";
+return { "com.sun.star.task.InteractionHandler",
// added to indicate support for
configuration.backend.MergeRecoveryRequest
-aNames[1] = "com.sun.star.configuration.backend.InteractionHandler";
-aNames[2] = "com.sun.star.uui.InteractionHandler";
+ "com.sun.star.configuration.backend.InteractionHandler",
// for backwards compatibility
-return aNames;
+ "com.sun.star.uui.InteractionHandler" };
}
virtual void SAL_CALL initialize(css::uno::Sequence const &
/*rArguments*/) override
diff --git a/io/test/stm/pumptest.cxx b/io/test/stm/pumptest.cxx
index d337bc21a81a..a2bdf4ff804f 100644
--- a/io/test/stm/pumptest.cxx
+++ b/io/test/stm/pumptest.cxx
@@ -414,9 +414,7 @@ Reference< XInterface > SAL_CALL OPumpTest_CreateInstance(
const Reference< XMul
Sequence OPumpTest_getSupportedServiceNames() throw()
{
-OUString s = OPumpTest_getServiceName();
-Sequence< OUString > seq( , 1 );
-return seq;
+return { OPumpTest_getServiceName() };
}
OUString OPumpTest_getServiceName() throw()
diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx
index e9b5da8d4e95..062e2ad0b017 100644
--- a/linguistic/source/dlistimp.cxx
+++ b/linguistic/source/dlistimp.cxx
@@ -694,8 +694,7 @@ uno::Sequence< OUString > SAL_CALL
DicList::getSupportedServiceNames( )
uno::Sequence< OUString > DicList::getSupportedServiceNames_Static() throw()
{
-uno::Sequence< OUString > aSNS { "com.sun.star.linguistic2.DictionaryList"
};
-return aSNS;
+return { "com.sun.star.linguistic2.DictionaryList" };
}
void * DicList_getFactory( const sal_Char * pImplName,
diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx
index 247f430d9c06..0b284d660abc 100644
--- a/linguistic/source/gciterator.cxx
+++ b/linguistic/source/gciterator.cxx
@@ -1188,8 +1188,7 @@ static OUString
GrammarCheckingIterator_getImplementationName() throw()
static uno::Sequence< OUString >
GrammarCheckingIterator_getSupportedServiceNames() throw()
{
-uno::Sequence aSNS {
"com.sun.star.linguistic2.ProofreadingIterator" };
-return aSNS;
+return { "com.sun.star.linguistic2.ProofreadingIterator" };
}
/// @throws uno::Exception
diff
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/ado/ADriver.cxx |5 +
connectivity/source/drivers/component/CResultSet.cxx |5 +
connectivity/source/drivers/dbase/DResultSet.cxx |5 +
connectivity/source/drivers/file/FDriver.cxx |5 +
connectivity/source/drivers/firebird/Driver.cxx |5 +
connectivity/source/drivers/flat/EResultSet.cxx |5 +
connectivity/source/drivers/hsqldb/HDriver.cxx |5 +
connectivity/source/drivers/mysql_jdbc/YDriver.cxx |5 +
connectivity/source/drivers/mysqlc/mysqlc_connection.cxx |4 +---
connectivity/source/drivers/mysqlc/mysqlc_driver.cxx |4 +---
connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx |5 +
connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.cxx |4 +---
connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx |5 +
connectivity/source/drivers/mysqlc/mysqlc_statement.cxx |4 +---
connectivity/source/drivers/odbc/OResultSet.cxx |5 +
connectivity/source/sdbcx/VColumn.cxx|8
+---
connectivity/source/sdbcx/VIndex.cxx |8
+---
connectivity/source/sdbcx/VIndexColumn.cxx |7 +--
connectivity/source/sdbcx/VKey.cxx |8
+---
connectivity/source/sdbcx/VKeyColumn.cxx |8
+---
connectivity/source/sdbcx/VTable.cxx |8
+---
21 files changed, 21 insertions(+), 97 deletions(-)
New commits:
commit e6196c6c9c85bdf446899a50da81adbfb7037d85
Author: Julien Nabet
AuthorDate: Sat Aug 17 15:44:34 2019 +0200
Commit: Julien Nabet
CommitDate: Sat Aug 17 18:43:28 2019 +0200
tdf#88205 Adapt uses of css::uno::Sequence to use initializer_list ctor
in connectivity
Change-Id: I00eeffd9a13cfad6bbf84ea2d4ab720eb8c45ed8
Reviewed-on: https://gerrit.libreoffice.org/77635
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/connectivity/source/drivers/ado/ADriver.cxx
b/connectivity/source/drivers/ado/ADriver.cxx
index 69381285eb7d..d97d018bc202 100644
--- a/connectivity/source/drivers/ado/ADriver.cxx
+++ b/connectivity/source/drivers/ado/ADriver.cxx
@@ -85,10 +85,7 @@ OUString ODriver::getImplementationName_Static( )
Sequence< OUString > ODriver::getSupportedServiceNames_Static( )
{
-Sequence< OUString > aSNS( 2 );
-aSNS[0] = "com.sun.star.sdbc.Driver";
-aSNS[1] = "com.sun.star.sdbcx.Driver";
-return aSNS;
+return { "com.sun.star.sdbc.Driver", "com.sun.star.sdbcx.Driver" };
}
css::uno::Reference< css::uno::XInterface >
connectivity::ado::ODriver_CreateInstance(const css::uno::Reference<
css::lang::XMultiServiceFactory >& _rxFactory)
diff --git a/connectivity/source/drivers/component/CResultSet.cxx
b/connectivity/source/drivers/component/CResultSet.cxx
index 79d97a62d29f..6c3e463d2012 100644
--- a/connectivity/source/drivers/component/CResultSet.cxx
+++ b/connectivity/source/drivers/component/CResultSet.cxx
@@ -51,10 +51,7 @@ OUString SAL_CALL
OComponentResultSet::getImplementationName( )
Sequence< OUString > SAL_CALL OComponentResultSet::getSupportedServiceNames( )
{
-Sequence< OUString > aSupported(2);
-aSupported[0] = "com.sun.star.sdbc.ResultSet";
-aSupported[1] = "com.sun.star.sdbcx.ResultSet";
-return aSupported;
+return { "com.sun.star.sdbc.ResultSet", "com.sun.star.sdbcx.ResultSet" };
}
sal_Bool SAL_CALL OComponentResultSet::supportsService( const OUString&
_rServiceName )
diff --git a/connectivity/source/drivers/dbase/DResultSet.cxx
b/connectivity/source/drivers/dbase/DResultSet.cxx
index 737a87bf559d..572eaa27d69c 100644
--- a/connectivity/source/drivers/dbase/DResultSet.cxx
+++ b/connectivity/source/drivers/dbase/DResultSet.cxx
@@ -54,10 +54,7 @@ OUString SAL_CALL ODbaseResultSet::getImplementationName( )
Sequence< OUString > SAL_CALL ODbaseResultSet::getSupportedServiceNames( )
{
-Sequence< OUString > aSupported(2);
-aSupported[0] = "com.sun.star.sdbc.ResultSet";
-aSupported[1] = "com.sun.star.sdbcx.ResultSet";
-return aSupported;
+return { "com.sun.star.sdbc.ResultSet", "com.sun.star.sdbcx.ResultSet" };
}
sal_Bool SAL_CALL ODbaseResultSet::supportsService( const OUString&
_rServiceName )
diff --git a/connectivity/source/drivers/file/FDriver.cxx
b/connectivity/source/drivers/file/FDriver.cxx
index 584a0a08b95f..25ccc578f959 100644
--- a/connectivity/source/drivers/file/FDriver.cxx
+++ b/connectivity/source/drivers/file/FDriver.cxx
@@ -67,10 +67,7 @@ OUString OFileDriver::getImplementationName_Static( )
Sequence< OUString > OFileDriver::getSupportedServiceNames_Static( )
{
-Sequence< OUString > aSNS( 2 );
-aSNS[0] =
[Libreoffice-commits] core.git: 2 commits - scaddins/source scripting/source sfx2/source stoc/source stoc/test
scaddins/source/analysis/analysis.cxx |6 +-
scaddins/source/datefunc/datefunc.cxx |6 +-
scaddins/source/pricing/pricing.cxx |6 +-
scripting/source/dlgprov/dlgprov.cxx |8 +++-
scripting/source/provider/BrowseNodeFactoryImpl.cxx |5 +
scripting/source/provider/MasterScriptProvider.cxx| 13 -
scripting/source/provider/MasterScriptProviderFactory.cxx |8 ++--
scripting/source/vbaevents/eventhelper.cxx|6 ++
sfx2/source/appl/appdispatchprovider.cxx |5 +
sfx2/source/appl/xpackcreator.cxx |5 +
sfx2/source/dialog/backingcomp.cxx|5 +
sfx2/source/doc/ownsubfilterservice.cxx |5 +
sfx2/source/view/frmload.cxx |5 +
stoc/source/javaloader/javaloader.cxx |5 +
stoc/source/proxy_factory/proxyfac.cxx|3 +--
stoc/source/servicemanager/servicemanager.cxx | 10 ++
stoc/test/testsmgr_cpnt.cxx |5 +
17 files changed, 25 insertions(+), 81 deletions(-)
New commits:
commit c5be21da5072a78525ee07bb16dfcf391b8dbf32
Author: Julien Nabet
AuthorDate: Sat Aug 17 21:02:20 2019 +0200
Commit: Julien Nabet
CommitDate: Sat Aug 17 22:16:38 2019 +0200
tdf#88205 Adapt uses of css::uno::Sequence to use initializer_list ctor
in scaddins, scripting
Change-Id: I92e6380f535aec12c1f1c5c51d8b544c8a7d9611
Reviewed-on: https://gerrit.libreoffice.org/77650
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/scaddins/source/analysis/analysis.cxx
b/scaddins/source/analysis/analysis.cxx
index f9a398a8abb7..9e7cf05aa91c 100644
--- a/scaddins/source/analysis/analysis.cxx
+++ b/scaddins/source/analysis/analysis.cxx
@@ -148,11 +148,7 @@ OUString AnalysisAddIn::getImplementationName_Static()
uno::Sequence< OUString > AnalysisAddIn::getSupportedServiceNames_Static()
{
-uno::Sequence< OUString > aRet(2);
-OUString* pArray = aRet.getArray();
-pArray[0] = ADDIN_SERVICE;
-pArray[1] = MY_SERVICE;
-return aRet;
+return { ADDIN_SERVICE, MY_SERVICE };
}
uno::Reference< uno::XInterface > AnalysisAddIn_CreateInstance(
diff --git a/scaddins/source/datefunc/datefunc.cxx
b/scaddins/source/datefunc/datefunc.cxx
index 32c785643470..8f3832869266 100644
--- a/scaddins/source/datefunc/datefunc.cxx
+++ b/scaddins/source/datefunc/datefunc.cxx
@@ -177,11 +177,7 @@ OUString ScaDateAddIn::getImplementationName_Static()
uno::Sequence< OUString > ScaDateAddIn::getSupportedServiceNames_Static()
{
-uno::Sequence< OUString > aRet( 2 );
-OUString* pArray = aRet.getArray();
-pArray[0] = ADDIN_SERVICE;
-pArray[1] = MY_SERVICE;
-return aRet;
+return { ADDIN_SERVICE, MY_SERVICE };
}
// XServiceName
diff --git a/scaddins/source/pricing/pricing.cxx
b/scaddins/source/pricing/pricing.cxx
index 6c3a6449b0d1..1d0fb69a1011 100644
--- a/scaddins/source/pricing/pricing.cxx
+++ b/scaddins/source/pricing/pricing.cxx
@@ -177,11 +177,7 @@ OUString ScaPricingAddIn::getImplementationName_Static()
uno::Sequence< OUString > ScaPricingAddIn::getSupportedServiceNames_Static()
{
-uno::Sequence< OUString > aRet( 2 );
-OUString* pArray = aRet.getArray();
-pArray[0] = ADDIN_SERVICE;
-pArray[1] = MY_SERVICE;
-return aRet;
+return { ADDIN_SERVICE, MY_SERVICE };
}
// XServiceName
diff --git a/scripting/source/dlgprov/dlgprov.cxx
b/scripting/source/dlgprov/dlgprov.cxx
index 59bfbdfe041f..ef5673bafbfd 100644
--- a/scripting/source/dlgprov/dlgprov.cxx
+++ b/scripting/source/dlgprov/dlgprov.cxx
@@ -166,11 +166,9 @@ namespace dlgprov
static Sequence< OUString > getSupportedServiceNames_DialogProviderImpl()
{
-Sequence< OUString > aNames(3);
-aNames[0] = "com.sun.star.awt.DialogProvider";
-aNames[1] = "com.sun.star.awt.DialogProvider2";
-aNames[2] = "com.sun.star.awt.ContainerWindowProvider";
-return aNames;
+return { "com.sun.star.awt.DialogProvider",
+ "com.sun.star.awt.DialogProvider2",
+ "com.sun.star.awt.ContainerWindowProvider" };
}
diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.cxx
b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
index e89452c3c971..92ce1be6c273 100644
--- a/scripting/source/provider/BrowseNodeFactoryImpl.cxx
+++ b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
@@ -623,10 +623,7 @@ BrowseNodeFactoryImpl::getOrganizerHierarchy()
Sequence< OUString >
bnf_getSupportedServiceNames( )
{
-OUString str_name(
-"com.sun.star.script.browse.BrowseNodeFactory");
-
-return Sequence< OUString >( _name, 1 );
+return {
[Libreoffice-commits] core.git: svx/source
svx/source/accessibility/GraphCtlAccessibleContext.cxx |
10 +---
svx/source/fmcomp/fmgridif.cxx |
5 --
svx/source/form/legacyformcontroller.cxx |
5 --
svx/source/table/tabledesign.cxx |
8 ---
svx/source/tbxctrls/tbunosearchcontrollers.cxx |
5 --
svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx |
3 -
svx/source/unodraw/XPropertyTable.cxx |
24 ++
svx/source/unodraw/unomod.cxx |
8 ---
svx/source/unodraw/unoshcol.cxx|
5 --
svx/source/xml/xmlgrhlp.cxx|
8 +--
10 files changed, 21 insertions(+), 60 deletions(-)
New commits:
commit 4073994154fbcb3b3ae7ff396fee916a994265c7
Author: Julien Nabet
AuthorDate: Sat Aug 17 20:53:12 2019 +0200
Commit: Julien Nabet
CommitDate: Sat Aug 17 22:16:51 2019 +0200
tdf#88205 Adapt uses of css::uno::Sequence to use initializer_list ctor
in svx
Change-Id: I70cba5dbfed9b2bbfe82d89c9dc6a5875c953bd3
Reviewed-on: https://gerrit.libreoffice.org/77649
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx
b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
index cd90f449c9bb..f37c14b873a1 100644
--- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx
+++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
@@ -501,13 +501,9 @@ sal_Bool SAL_CALL
SvxGraphCtrlAccessibleContext::supportsService( const OUString
Sequence< OUString > SAL_CALL
SvxGraphCtrlAccessibleContext::getSupportedServiceNames()
{
-Sequence< OUString > aSNs( 3 );
-
-aSNs[0] = "com.sun.star.accessibility.Accessible";
-aSNs[1] = "com.sun.star.accessibility.AccessibleContext";
-aSNs[2] = "com.sun.star.drawing.AccessibleGraphControl";
-
-return aSNs;
+return { "com.sun.star.accessibility.Accessible",
+ "com.sun.star.accessibility.AccessibleContext",
+ "com.sun.star.drawing.AccessibleGraphControl" };
}
// XTypeProvider
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index fb89600530f8..e5c5b4e0ae4d 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -381,10 +381,7 @@ OUString SAL_CALL FmXGridControl::getImplementationName()
css::uno::Sequence SAL_CALL
FmXGridControl::getSupportedServiceNames()
{
-Sequence< OUString > aServiceNames(2);
-aServiceNames[0] = FM_SUN_CONTROL_GRIDCONTROL;
-aServiceNames[1] = "com.sun.star.awt.UnoControl";
-return aServiceNames;
+return { FM_SUN_CONTROL_GRIDCONTROL, "com.sun.star.awt.UnoControl" };
}
diff --git a/svx/source/form/legacyformcontroller.cxx
b/svx/source/form/legacyformcontroller.cxx
index a310423da8d0..9e14d3758cd1 100644
--- a/svx/source/form/legacyformcontroller.cxx
+++ b/svx/source/form/legacyformcontroller.cxx
@@ -185,10 +185,7 @@ namespace svxform
Sequence< OUString > SAL_CALL
LegacyFormController::getSupportedServiceNames( )
{
-Sequence< OUString > aServices(2);
-aServices.getArray()[0] = "com.sun.star.form.FormController";
-aServices.getArray()[1] = "com.sun.star.awt.control.TabController";
-return aServices;
+return { "com.sun.star.form.FormController",
"com.sun.star.awt.control.TabController" };
}
}
diff --git a/svx/source/table/tabledesign.cxx b/svx/source/table/tabledesign.cxx
index a27a8d810fc0..0a4f81417f63 100644
--- a/svx/source/table/tabledesign.cxx
+++ b/svx/source/table/tabledesign.cxx
@@ -214,9 +214,7 @@ sal_Bool SAL_CALL TableDesignStyle::supportsService( const
OUString& ServiceName
Sequence< OUString > SAL_CALL TableDesignStyle::getSupportedServiceNames()
{
-OUString aServiceName("com.sun.star.style.Style");
-Sequence< OUString > aSeq( , 1 );
-return aSeq;
+return { "com.sun.star.style.Style" };
}
// XStyle
@@ -464,9 +462,7 @@ sal_Bool SAL_CALL TableDesignFamily::supportsService( const
OUString& ServiceNam
Sequence< OUString > SAL_CALL TableDesignFamily::getSupportedServiceNames()
{
-OUString aServiceName("com.sun.star.style.StyleFamily");
-Sequence< OUString > aSeq( , 1 );
-return aSeq;
+return { "com.sun.star.style.StyleFamily" };
}
// XNamed
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index 1beda67e61d6..9499da1a99fa 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -1372,10 +1372,7 @@ sal_Bool SAL_CALL FindbarDispatcher::supportsService(
const OUString& ServiceNam
css::uno::Sequence< OUString > SAL_CALL
[Libreoffice-commits] core.git: sc/source
sc/source/ui/docshell/docsh.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 86d55aaad49a3f83b61894afd81f195b37a142af
Author: Julien Nabet
AuthorDate: Wed Aug 21 22:13:58 2019 +0200
Commit: Kohei Yoshida
CommitDate: Wed Aug 21 23:01:29 2019 +0200
Fix full url for calc/styles by adding missing '/'
warn:sc:1272:1272:sc/source/filter/orcus/orcusfiltersimpl.cxx:149: Unable
to load styles from xml file! boost::filesystem::file_size: Aucun fichier ou
dossier de ce type
Thread 1 "soffice.bin" hit Breakpoint 2, (anonymous namespace)::lookup
(file=0x556435a0, mode=(anonymous namespace)::LOOKUP_MODE_NORMAL,
override=false, key="BRAND_BASE_DIRshare", requestStack=0x0)
at /home/julien/lo/libreoffice/sal/rtl/bootstrap.cxx:860
860OUString v;
(gdb) bt
0 0x77f2ae45 in (anonymous namespace)::lookup(Bootstrap_Impl
const*, (anonymous namespace)::LookupMode, bool, rtl::OUString const&,
(anonymous namespace)::ExpandRequestLink const*)
(file=0x556435a0, mode=(anonymous namespace)::LOOKUP_MODE_NORMAL,
override=false, key="BRAND_BASE_DIRshare", requestStack=0x0) at
/home/julien/lo/libreoffice/sal/rtl/bootstrap.cxx:860
1 0x77f2b7f6 in (anonymous namespace)::expandMacros(Bootstrap_Impl
const*, rtl::OUString const&, (anonymous namespace)::LookupMode, (anonymous
namespace)::ExpandRequestLink const*)
(file=0x556435a0, text="$BRAND_BASE_DIRshare/calc/styles.xml",
mode=(anonymous namespace)::LOOKUP_MODE_NORMAL, requestStack=0x0) at
/home/julien/lo/libreoffice/sal/rtl/bootstrap.cxx:995
2 0x77f2aa0d in
rtl_bootstrap_expandMacros_from_handle(rtlBootstrapHandle, rtl_uString**)
(handle=0x556435a0, macro=0x7ffefb90) at
/home/julien/lo/libreoffice/sal/rtl/bootstrap.cxx:791
3 0x77f2aa60 in rtl_bootstrap_expandMacros(rtl_uString**)
(macro=0x7ffefb90) at /home/julien/lo/libreoffice/sal/rtl/bootstrap.cxx:797
4 0x7fffde89e675 in rtl::Bootstrap::expandMacros(rtl::OUString&)
(macro="$BRAND_BASE_DIRshare/calc/styles.xml") at
/home/julien/lo/libreoffice/include/rtl/bootstrap.hxx:131
5 0x7fffde890d5f in ScDocShell::Load(SfxMedium&) (this=0x58034760,
rMedium=...) at /home/julien/lo/libreoffice/sc/source/ui/docshell/docsh.cxx:613
Change-Id: I5e4019c730f25d32b431dbd01c5668189be6cc66
Reviewed-on: https://gerrit.libreoffice.org/77936
Tested-by: Jenkins
Reviewed-by: Kohei Yoshida
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 6859942b79d4..a12b84f0938a 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -609,7 +609,7 @@ bool ScDocShell::Load( SfxMedium& rMedium )
{
/* Create styles that are imported through Orcus */
-OUString aURL("$BRAND_BASE_DIR" LIBO_SHARE_FOLDER
"/calc/styles.xml");
+OUString aURL("$BRAND_BASE_DIR/" LIBO_SHARE_FOLDER
"/calc/styles.xml");
rtl::Bootstrap::expandMacros(aURL);
OUString aPath;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - sc/source
sc/source/ui/docshell/docsh.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit bc19862ab3b13f55e9364ba5cfe8547bf30adac7
Author: Julien Nabet
AuthorDate: Wed Aug 21 22:13:58 2019 +0200
Commit: Kohei Yoshida
CommitDate: Thu Aug 22 15:55:17 2019 +0200
Fix full url for calc/styles by adding missing '/'
warn:sc:1272:1272:sc/source/filter/orcus/orcusfiltersimpl.cxx:149: Unable
to load styles from xml file! boost::filesystem::file_size: Aucun fichier ou
dossier de ce type
Thread 1 "soffice.bin" hit Breakpoint 2, (anonymous namespace)::lookup
(file=0x556435a0, mode=(anonymous namespace)::LOOKUP_MODE_NORMAL,
override=false, key="BRAND_BASE_DIRshare", requestStack=0x0)
at /home/julien/lo/libreoffice/sal/rtl/bootstrap.cxx:860
860OUString v;
(gdb) bt
0 0x77f2ae45 in (anonymous namespace)::lookup(Bootstrap_Impl
const*, (anonymous namespace)::LookupMode, bool, rtl::OUString const&,
(anonymous namespace)::ExpandRequestLink const*)
(file=0x556435a0, mode=(anonymous namespace)::LOOKUP_MODE_NORMAL,
override=false, key="BRAND_BASE_DIRshare", requestStack=0x0) at
/home/julien/lo/libreoffice/sal/rtl/bootstrap.cxx:860
1 0x77f2b7f6 in (anonymous namespace)::expandMacros(Bootstrap_Impl
const*, rtl::OUString const&, (anonymous namespace)::LookupMode, (anonymous
namespace)::ExpandRequestLink const*)
(file=0x556435a0, text="$BRAND_BASE_DIRshare/calc/styles.xml",
mode=(anonymous namespace)::LOOKUP_MODE_NORMAL, requestStack=0x0) at
/home/julien/lo/libreoffice/sal/rtl/bootstrap.cxx:995
2 0x77f2aa0d in
rtl_bootstrap_expandMacros_from_handle(rtlBootstrapHandle, rtl_uString**)
(handle=0x556435a0, macro=0x7ffefb90) at
/home/julien/lo/libreoffice/sal/rtl/bootstrap.cxx:791
3 0x77f2aa60 in rtl_bootstrap_expandMacros(rtl_uString**)
(macro=0x7ffefb90) at /home/julien/lo/libreoffice/sal/rtl/bootstrap.cxx:797
4 0x7fffde89e675 in rtl::Bootstrap::expandMacros(rtl::OUString&)
(macro="$BRAND_BASE_DIRshare/calc/styles.xml") at
/home/julien/lo/libreoffice/include/rtl/bootstrap.hxx:131
5 0x7fffde890d5f in ScDocShell::Load(SfxMedium&) (this=0x58034760,
rMedium=...) at /home/julien/lo/libreoffice/sc/source/ui/docshell/docsh.cxx:613
Change-Id: I5e4019c730f25d32b431dbd01c5668189be6cc66
Reviewed-on: https://gerrit.libreoffice.org/77936
Tested-by: Jenkins
Reviewed-by: Kohei Yoshida
(cherry picked from commit 86d55aaad49a3f83b61894afd81f195b37a142af)
Reviewed-on: https://gerrit.libreoffice.org/77955
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 48b0532f73a7..372686daacbc 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -604,7 +604,7 @@ bool ScDocShell::Load( SfxMedium& rMedium )
{
/* Create styles that are imported through Orcus */
-OUString aURL("$BRAND_BASE_DIR" LIBO_SHARE_FOLDER
"/calc/styles.xml");
+OUString aURL("$BRAND_BASE_DIR/" LIBO_SHARE_FOLDER
"/calc/styles.xml");
rtl::Bootstrap::expandMacros(aURL);
OUString aPath;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vbahelper/source
vbahelper/source/vbahelper/vbacolorformat.cxx |2 +-
vbahelper/source/vbahelper/vbacolorformat.hxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 1c539c548b662104431e283aa4a62cb81174380b
Author: Julien Nabet
AuthorDate: Tue Aug 27 20:08:41 2019 +0200
Commit: Julien Nabet
CommitDate: Wed Aug 28 07:18:11 2019 +0200
Typo: HAPICOLOR_WITHE->HAPICOLOR_WHITE (vbahelper)
Change-Id: I51a43e190345a1e981f9bd524d8b2feaf0eb2521
Reviewed-on: https://gerrit.libreoffice.org/78207
Reviewed-by: Julien Nabet
Tested-by: Julien Nabet
diff --git a/vbahelper/source/vbahelper/vbacolorformat.cxx
b/vbahelper/source/vbahelper/vbacolorformat.cxx
index 7c72c65a1eeb..653d0db23a2a 100644
--- a/vbahelper/source/vbahelper/vbacolorformat.cxx
+++ b/vbahelper/source/vbahelper/vbacolorformat.cxx
@@ -27,7 +27,7 @@ sal_Int32
MsoColorIndices::getColorIndex( sal_Int32 nIndex )
{
const static sal_Int32 COLORINDICES[56] =
-{ HAPICOLOR_BLACK, HAPICOLOR_WITHE, HAPICOLOR_RED,
HAPICOLOR_BRIGHTGREEN, HAPICOLOR_BLUE, HAPICOLOR_YELLOW, HAPICOLOR_PINK,
+{ HAPICOLOR_BLACK, HAPICOLOR_WHITE, HAPICOLOR_RED,
HAPICOLOR_BRIGHTGREEN, HAPICOLOR_BLUE, HAPICOLOR_YELLOW, HAPICOLOR_PINK,
HAPICOLOR_TURQUOISE, HAPICOLOR_DARKRED, HAPICOLOR_GREEN,
HAPICOLOR_DARKBLUE, HAPICOLOR_DARKYELLOW, HAPICOLOR_VIOLET,
HAPICOLOR_TEAL, HAPICOLOR_GRAY_25_PERCENT, HAPICOLOR_GRAY_50_PERCENT,
HAPICOLOR_PERIWINCKLE, HAPICOLOR_PLUM,
HAPICOLOR_IVORY, HAPICOLOR_LIGHTTURQUOISE, HAPICOLOR_DARKPRUPLE,
HAPICOLOR_CORAL, HAPICOLOR_OCEANBLUE, HAPICOLOR_ICEBLUE,
diff --git a/vbahelper/source/vbahelper/vbacolorformat.hxx
b/vbahelper/source/vbahelper/vbacolorformat.hxx
index d1573a0f0b5d..746c87c9fadc 100644
--- a/vbahelper/source/vbahelper/vbacolorformat.hxx
+++ b/vbahelper/source/vbahelper/vbacolorformat.hxx
@@ -40,7 +40,7 @@ public:
struct MsoColorIndices
{
const static sal_Int32 HAPICOLOR_BLACK = 0;
-const static sal_Int32 HAPICOLOR_WITHE = 16777215;
+const static sal_Int32 HAPICOLOR_WHITE = 16777215;
const static sal_Int32 HAPICOLOR_RED = 16711680;
const static sal_Int32 HAPICOLOR_BRIGHTGREEN = 65280;
const static sal_Int32 HAPICOLOR_BLUE = 255;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source
cui/source/dialogs/QrCodeGenDialog.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8cecd48af5dbd290d06641b7feeb7c0969752d57 Author: Julien Nabet AuthorDate: Fri Aug 30 17:04:20 2019 +0200 Commit: Julien Nabet CommitDate: Fri Aug 30 21:42:10 2019 +0200 tdf#127233: QR-code generator, use UTF-8 encoding Thank you Mike Kaganski for reference here: https://bugs.documentfoundation.org/show_bug.cgi?id=127233#c4 Change-Id: I01bbc408df8bc87cf4e8be52143efb9fc3fa1e38 Reviewed-on: https://gerrit.libreoffice.org/78304 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/cui/source/dialogs/QrCodeGenDialog.cxx b/cui/source/dialogs/QrCodeGenDialog.cxx index 661d36678c07..7bd72ff0fc1c 100644 --- a/cui/source/dialogs/QrCodeGenDialog.cxx +++ b/cui/source/dialogs/QrCodeGenDialog.cxx @@ -259,7 +259,7 @@ OUString QrCodeGenDialog::GenerateQRCode(OUString aQRText, long aQRECC, int aQRB } //OuString to char* qrtext -OString o = OUStringToOString(aQRText, RTL_TEXTENCODING_ASCII_US); +OString o = OUStringToOString(aQRText, RTL_TEXTENCODING_UTF8); const char* qrtext = o.pData->buffer; //From Qr Code library. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: uitest/ui_logger_dsl
uitest/ui_logger_dsl/UI_Object_commands.tx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit c5ea75a55db0be7d528c0c580bb994f1ae88afb3
Author: Julien Nabet
AuthorDate: Sat Aug 31 17:20:09 2019 +0200
Commit: Julien Nabet
CommitDate: Sat Aug 31 17:20:52 2019 +0200
Let's revert this so no confusion.
This reverts commit 367719e77747bc142ac4b7ec5ee10d7c5e519c16.
Change-Id: I36e4aef93f04fe593692edaa804512020464aa95
Reviewed-on: https://gerrit.libreoffice.org/78354
Reviewed-by: Julien Nabet
Tested-by: Julien Nabet
diff --git a/uitest/ui_logger_dsl/UI_Object_commands.tx
b/uitest/ui_logger_dsl/UI_Object_commands.tx
index 0f766d87a4dc..58697a0fe216 100644
--- a/uitest/ui_logger_dsl/UI_Object_commands.tx
+++ b/uitest/ui_logger_dsl/UI_Object_commands.tx
@@ -43,7 +43,7 @@ ListBoxUIObject:
'Select element with position ' POS=INT 'in' list_id=STRING ('from'
parent_id=ID)?
;
//=
-//helper grammar for EditUIObject
+//hellper grammar for EditUIObject
action_on_UIObject:
Type_action | SELECT | Clear
;
@@ -62,4 +62,4 @@ Clear:
//helper functions for SpinUIObject
increase_or_ecrease:
'Increase' | 'Decrease'
-;
+;
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - connectivity/source
connectivity/source/drivers/firebird/DatabaseMetaData.cxx |9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 6155fae67c104dd38114abacb31e19fe565d
Author: Julien Nabet
AuthorDate: Fri Aug 30 16:59:58 2019 +0200
Commit: Julien Nabet
CommitDate: Sat Aug 31 08:35:17 2019 +0200
tdf#118809: Fill DatabaseProductName and DatabaseProductVersion for Firebird
Thank you to Drew Jensen for the suggestion here:
https://bugs.documentfoundation.org/show_bug.cgi?id=118809#c3
Change-Id: Ie9b5a2c744b158100b2306b27b1d56a30afc5182
Reviewed-on: https://gerrit.libreoffice.org/78302
Tested-by: Jenkins
Reviewed-by: Julien Nabet
(cherry picked from commit 50785ac52579153ed78a4fba268a54fd4d0e710e)
Reviewed-on: https://gerrit.libreoffice.org/78335
Reviewed-by: Lionel Elie Mamane
diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
index f3fad5ff3636..71543c013913 100644
--- a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
+++ b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
@@ -598,12 +598,17 @@ OUString SAL_CALL ODatabaseMetaData::getDriverVersion()
OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion( )
{
-return OUString();
+uno::Reference< XStatement > xSelect = m_pConnection->createStatement();
+
+uno::Reference< XResultSet > xRs = xSelect->executeQuery("SELECT
rdb$get_context('SYSTEM', 'ENGINE_VERSION') as version from rdb$database");
+xRs->next(); // first and only row
+uno::Reference< XRow > xRow( xRs, UNO_QUERY_THROW );
+return xRow->getString(1);
}
OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName( )
{
-return OUString();
+return "Firebird (engine12)";
}
OUString SAL_CALL ODatabaseMetaData::getProcedureTerm( )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/firebird/DatabaseMetaData.cxx | 11 ---
1 file changed, 8 insertions(+), 3 deletions(-)
New commits:
commit 58bed4f3c03098e72cd05cd298136a7029c05a6d
Author: Julien Nabet
AuthorDate: Sat Aug 31 10:05:20 2019 +0200
Commit: Julien Nabet
CommitDate: Sat Aug 31 11:01:59 2019 +0200
Related tdf#118809: add some XDatabaseMetaData for Firebird
getStringFunctions
getTimeDateFunctions
getNumericFunctions
Thank you Drew Jensen for suggestion
(see https://bugs.documentfoundation.org/show_bug.cgi?id=118809#c4)
Change-Id: I1e3b7d9559f4e520260de39ee4b8ad078cc80c87
Reviewed-on: https://gerrit.libreoffice.org/78337
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
index 57af351924e3..7de45f9021d8 100644
--- a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
+++ b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
@@ -638,12 +638,15 @@ OUString SAL_CALL
ODatabaseMetaData::getSearchStringEscape( )
OUString SAL_CALL ODatabaseMetaData::getStringFunctions( )
{
-return OUString();
+return
"ASCII_CHAR,ASCII_VAL,BIT_LENGTH,CHAR_LENGTH,CHAR_TO_UUID,CHARACTER_LENGTH,"
+
"GEN_UUID,HASH,LEFT,LOWER,LPAD,OCTET_LENGTH,OVERLAY,POSITION,REPLACE,REVERSE,"
+ "RIGHT,RPAD,SUBSTRING,TRIM,UPPER,UUID_TO_CHAR";
}
OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions( )
{
-return OUString();
+return "CURRENT_DATE,CURRENT_TIME,CURRENT_TIMESTAMP,DATEADD, DATEDIFF,"
+ "EXTRACT,'NOW','TODAY','TOMORROW','YESTERDAY'";
}
OUString SAL_CALL ODatabaseMetaData::getSystemFunctions( )
@@ -653,7 +656,9 @@ OUString SAL_CALL ODatabaseMetaData::getSystemFunctions( )
OUString SAL_CALL ODatabaseMetaData::getNumericFunctions( )
{
-return OUString();
+return "ABS,ACOS,ASIN,ATAN,ATAN2,BIN_AND,BIN_NOT,BIN_OR,BIN_SHL,"
+ "BIN_SHR,BIN_XOR,CEIL,CEILING,COS,COSH,COT,EXP,FLOOR,LN,"
+
"LOG,LOG10,MOD,PI,POWER,RAND,ROUND,SIGN,SIN,SINH,SQRT,TAN,TANH,TRUNC";
}
sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar( )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/firebird/DatabaseMetaData.cxx |9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 50785ac52579153ed78a4fba268a54fd4d0e710e
Author: Julien Nabet
AuthorDate: Fri Aug 30 16:59:58 2019 +0200
Commit: Julien Nabet
CommitDate: Sat Aug 31 05:37:08 2019 +0200
tdf#118809: Fill DatabaseProductName and DatabaseProductVersion for Firebird
Thank you to Drew Jensen for the suggestion here:
https://bugs.documentfoundation.org/show_bug.cgi?id=118809#c3
Change-Id: Ie9b5a2c744b158100b2306b27b1d56a30afc5182
Reviewed-on: https://gerrit.libreoffice.org/78302
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
index f73cc5e62a8d..57af351924e3 100644
--- a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
+++ b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
@@ -598,12 +598,17 @@ OUString SAL_CALL ODatabaseMetaData::getDriverVersion()
OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion( )
{
-return OUString();
+uno::Reference< XStatement > xSelect = m_pConnection->createStatement();
+
+uno::Reference< XResultSet > xRs = xSelect->executeQuery("SELECT
rdb$get_context('SYSTEM', 'ENGINE_VERSION') as version from rdb$database");
+xRs->next(); // first and only row
+uno::Reference< XRow > xRow( xRs, UNO_QUERY_THROW );
+return xRow->getString(1);
}
OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName( )
{
-return OUString();
+return "Firebird (engine12)";
}
OUString SAL_CALL ODatabaseMetaData::getProcedureTerm( )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/qa dbaccess/source
dbaccess/qa/unit/hsql_binary_import.cxx|6 ++
dbaccess/qa/unit/tdf119625.cxx |7 +++
dbaccess/qa/unit/tdf126268.cxx |7 +++
dbaccess/source/core/dataaccess/datasource.cxx |5 +
dbaccess/source/core/misc/dsntypes.cxx |7 ++-
5 files changed, 31 insertions(+), 1 deletion(-)
New commits:
commit 2252aba08121566e834dc530f31339e15bd94dec
Author: Julien Nabet
AuthorDate: Wed Aug 28 22:13:13 2019 +0200
Commit: Julien Nabet
CommitDate: Thu Aug 29 20:54:47 2019 +0200
tdf#127180: Propose migration + Firebird by default only in experimental
See:
http://document-foundation-mail-archive.969070.n3.nabble.com/About-putting-back-Firebird-experimental-td4265392.html#a4265519
Change-Id: I651baa78d345ce56e8d38d56aba096d04a225c5c
Reviewed-on: https://gerrit.libreoffice.org/78240
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/dbaccess/qa/unit/hsql_binary_import.cxx
b/dbaccess/qa/unit/hsql_binary_import.cxx
index 2c1c332629cb..5b0249a9497f 100644
--- a/dbaccess/qa/unit/hsql_binary_import.cxx
+++ b/dbaccess/qa/unit/hsql_binary_import.cxx
@@ -45,6 +45,10 @@ void HsqlBinaryImportTest::setUp()
void HsqlBinaryImportTest::testBinaryImport()
{
+SvtMiscOptions aMiscOptions;
+bool oldValue = aMiscOptions.IsExperimentalMode();
+
+aMiscOptions.SetExperimentalMode(true);
// the migration requires the file to be writable
utl::TempFile const temp(createTempCopy("hsqldb_migration_test.odb"));
uno::Reference const xDocument =
getDocumentForUrl(temp.GetURL());
@@ -87,6 +91,8 @@ void HsqlBinaryImportTest::testBinaryImport()
CPPUNIT_ASSERT_EQUAL(sal_Int16{ 1998 }, date.Year);
closeDocument(uno::Reference(xDocument, uno::UNO_QUERY));
+if (!oldValue)
+aMiscOptions.SetExperimentalMode(false);
}
CPPUNIT_TEST_SUITE_REGISTRATION(HsqlBinaryImportTest);
diff --git a/dbaccess/qa/unit/tdf119625.cxx b/dbaccess/qa/unit/tdf119625.cxx
index d38e85bb75a3..e1bb46b087f7 100644
--- a/dbaccess/qa/unit/tdf119625.cxx
+++ b/dbaccess/qa/unit/tdf119625.cxx
@@ -63,6 +63,11 @@ static const expect_t expect[]
void Tdf119625Test::testTime()
{
+SvtMiscOptions aMiscOptions;
+bool oldValue = aMiscOptions.IsExperimentalMode();
+
+aMiscOptions.SetExperimentalMode(true);
+
// the migration requires the file to be writable
utl::TempFile const temp(createTempCopy("tdf119625.odb"));
uno::Reference const xDocument =
getDocumentForUrl(temp.GetURL());
@@ -106,6 +111,8 @@ void Tdf119625Test::testTime()
CPPUNIT_ASSERT(!xRes->next());
closeDocument(uno::Reference(xDocument, uno::UNO_QUERY));
+if (!oldValue)
+aMiscOptions.SetExperimentalMode(false);
}
CPPUNIT_TEST_SUITE_REGISTRATION(Tdf119625Test);
diff --git a/dbaccess/qa/unit/tdf126268.cxx b/dbaccess/qa/unit/tdf126268.cxx
index ffbe6361a231..9d41b95809aa 100644
--- a/dbaccess/qa/unit/tdf126268.cxx
+++ b/dbaccess/qa/unit/tdf126268.cxx
@@ -56,6 +56,11 @@ static const expect_t expect[] = {
void Tdf126268Test::testNumbers()
{
+SvtMiscOptions aMiscOptions;
+bool oldValue = aMiscOptions.IsExperimentalMode();
+
+aMiscOptions.SetExperimentalMode(true);
+
// the migration requires the file to be writable
utl::TempFile const temp(createTempCopy("tdf126268.odb"));
uno::Reference const xDocument =
getDocumentForUrl(temp.GetURL());
@@ -80,6 +85,8 @@ void Tdf126268Test::testNumbers()
CPPUNIT_ASSERT(!xRes->next());
closeDocument(uno::Reference(xDocument, uno::UNO_QUERY));
+if (!oldValue)
+aMiscOptions.SetExperimentalMode(false);
}
CPPUNIT_TEST_SUITE_REGISTRATION(Tdf126268Test);
diff --git a/dbaccess/source/core/dataaccess/datasource.cxx
b/dbaccess/source/core/dataaccess/datasource.cxx
index e01583da6266..edad6f160f7d 100644
--- a/dbaccess/source/core/dataaccess/datasource.cxx
+++ b/dbaccess/source/core/dataaccess/datasource.cxx
@@ -63,6 +63,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -615,6 +616,10 @@ Reference< XConnection >
ODatabaseSource::buildLowLevelConnection(const OUString
//ignore when we don't have a model. E.g. Mailmerge, data sources,
fields...
bIgnoreMigration = true;
}
+SvtMiscOptions aMiscOptions;
+
+if (!aMiscOptions.IsExperimentalMode())
+bIgnoreMigration = true;
if(!bIgnoreMigration && m_pImpl->m_sConnectURL == "sdbc:embedded:hsqldb")
{
diff --git a/dbaccess/source/core/misc/dsntypes.cxx
b/dbaccess/source/core/misc/dsntypes.cxx
index 7332ccffa196..86aedb385245 100644
--- a/dbaccess/source/core/misc/dsntypes.cxx
+++ b/dbaccess/source/core/misc/dsntypes.cxx
@@ -20,6 +20,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -286,7 +287,11 @@ bool ODsnTypeCollection::isEmbeddedDatabase( const
OUString& _sURL )
OUString ODsnTypeCollection::getEmbeddedDatabase()
{
-return
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0-29' - 4 commits - libreofficekit/qa pyuno/source vcl/unx
libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx |8 ++
libreofficekit/qa/gtktiledviewer/gtv-helpers.cxx|2
pyuno/source/module/pyuno_type.cxx |4 +
vcl/unx/generic/printer/cupsmgr.cxx | 36
vcl/unx/gtk/gloactiongroup.cxx |8 ++
5 files changed, 56 insertions(+), 2 deletions(-)
New commits:
commit 33039f987b5e098f14ae7aa9d4d7f104688ce98f
Author: Julien Nabet
AuthorDate: Wed Nov 28 20:39:43 2018 +0100
Commit: Aron Budea
CommitDate: Fri Sep 6 15:19:07 2019 +0200
band-aid: deprecated-declarations related to cups
Change-Id: I07438840fc1c3cc8e70559d44954be0c49531525
Reviewed-on: https://gerrit.libreoffice.org/64191
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
(cherry picked from commit e9e49fceac43476d1233ee8106cba5f4831771b9)
(cherry picked from commit ca9aae711332e5affef75b1f11c45761a5a3b4a5)
diff --git a/vcl/unx/generic/printer/cupsmgr.cxx
b/vcl/unx/generic/printer/cupsmgr.cxx
index 328e9246e9f5..a9d499035a5a 100644
--- a/vcl/unx/generic/printer/cupsmgr.cxx
+++ b/vcl/unx/generic/printer/cupsmgr.cxx
@@ -81,7 +81,14 @@ struct GetPPDAttribs
{
// This CUPS method is not at all thread-safe we need
// to dup the pointer to a static buffer it returns ASAP
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
OString aResult = cupsGetPPD(m_aParameter.getStr());
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
MutexGuard aGuard( *m_pSyncMutex );
m_aResult = aResult;
m_aCondition.set();
@@ -214,6 +221,10 @@ void CUPSManager::runDests()
// n#722902 - do a fast-failing check for cups working *at all* first
http_t* p_http;
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
if( (p_http=httpConnectEncrypt(
cupsServer(),
ippPort(),
@@ -230,6 +241,9 @@ void CUPSManager::runDests()
httpClose(p_http);
}
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
}
void CUPSManager::initialize()
@@ -438,7 +452,14 @@ const PPDParser* CUPSManager::createCUPSParser( const
OUString& rPrinter )
rtl_TextEncoding aEncoding = osl_getThreadTextEncoding();
OUString aFileName( OStringToOUString( aPPDFile, aEncoding
) );
// update the printer info with context information
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
ppd_file_t* pPPD = ppdOpenFile( aPPDFile.getStr() );
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
if( pPPD )
{
// create the new parser
@@ -446,7 +467,14 @@ const PPDParser* CUPSManager::createCUPSParser( const
OUString& rPrinter )
pCUPSParser->m_aFile = rPrinter;
pNewParser = pCUPSParser;
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
/*int nConflicts =*/ cupsMarkOptions( pPPD,
pDest->num_options, pDest->options );
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
SAL_INFO("vcl.unx.print", "processing the following
options for printer " << pDest->name << " (instance " << (pDest->instance ==
nullptr ? "null" : pDest->instance) << "):");
for( int k = 0; k < pDest->num_options; k++ )
SAL_INFO("vcl.unx.print",
@@ -467,7 +495,15 @@ const PPDParser* CUPSManager::createCUPSParser( const
OUString& rPrinter )
rInfo.m_aContext = rContext;
// clean up the mess
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
ppdClose( pPPD );
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
+
}
else
SAL_INFO("vcl.unx.print", "ppdOpenFile failed, falling
back to generic driver");
commit 3a3b8ff32c5f937e293b1822cce6a851b0589893
Author: Julien Nabet
AuthorDate: Sat Sep 29 13:18:49 2018 +0200
Commit: Aron Budea
CommitDate: Fri Sep 6 15:18:51 2019 +0200
band-aid: deprecated-declarations related to gtk
Don't hesitate to revert this one but only if there's a patch to fix it.
Change-Id: Ib15352e1a94d0542120f6710acfe19887494ed51
Reviewed-on: https://gerrit.libreoffice.org/61142
Tested-by: Jenkins
Reviewed-by: Julien Nabet
(cherry picked from commit 618d474f059a75c2ac04df16c830d71a88690118)
(cherry picked from commit 986d47dbf57008643d8126e7d71de47f32a15508)
diff --git
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/firebird/DatabaseMetaData.cxx | 22 +++---
connectivity/source/drivers/firebird/DatabaseMetaData.hxx |2 +
2 files changed, 14 insertions(+), 10 deletions(-)
New commits:
commit 7289828e106081ddae0e053d306fef5ffd0dee3b
Author: Julien Nabet
AuthorDate: Wed Sep 11 21:24:39 2019 +0200
Commit: Julien Nabet
CommitDate: Wed Sep 11 23:10:47 2019 +0200
tdf#120945: Relationship of tables isn't recognized by formwizard
The patch implements getExportedKeys which was lacking.
Console logs:
warn:connectivity.firebird:13144:18512:connectivity/source/drivers/firebird/DatabaseMetaData.cxx:1468:
Not yet implemented
warn:legacy.osl:13144:18512:connectivity/source/drivers/firebird/DatabaseMetaData.cxx:1469:
Not implemented yet!
The only difference with getImportedKeys is the fact that :
- in getImportedKeys, table name of Where condition is the foreign key
- in getExportedKeys, table name of Where condition should be the primary
key
Instead of duplicating the whole code of getImportedKeys,
I created a local function which contains the main part.
Change-Id: Ia4497524fecf098257eec27e44e016a7cbe23480
Reviewed-on: https://gerrit.libreoffice.org/78822
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
index 7de45f9021d8..76d32e70ba8d 100644
--- a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
+++ b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
@@ -1460,20 +1460,19 @@ uno::Reference< XResultSet > SAL_CALL
ODatabaseMetaData::getVersionColumns(
}
uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getExportedKeys(
-const Any&, const OUString&, const OUString& )
+const Any&, const OUString&, const OUString& table )
{
-// List the columns in a table which are foreign keys. This is actually
-// never used anywhere in the LO codebase currently. Retrieval from
firebird
-// requires using a 5-table join.
-SAL_WARN("connectivity.firebird", "Not yet implemented");
-OSL_FAIL("Not implemented yet!");
-// TODO implement
-return new
ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eExportedKeys);
+return ODatabaseMetaData::lcl_getKeys(false, table);
}
uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getImportedKeys(
const Any&, const OUString&, const OUString& table )
{
+return ODatabaseMetaData::lcl_getKeys(true, table);
+}
+
+uno::Reference< XResultSet > ODatabaseMetaData::lcl_getKeys(const bool&
bIsImport, const OUString& table )
+{
ODatabaseMetaDataResultSet* pResultSet = new
ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eImportedKeys);
uno::Reference< XResultSet > xResultSet = pResultSet;
@@ -1501,8 +1500,11 @@ uno::Reference< XResultSet > SAL_CALL
ODatabaseMetaData::getImportedKeys(
"ON PRIM.RDB$INDEX_NAME = PRIMARY_INDEX.RDB$INDEX_NAME "
"INNER JOIN RDB$INDEX_SEGMENTS AS FOREIGN_INDEX "
"ON FOREI.RDB$INDEX_NAME = FOREIGN_INDEX.RDB$INDEX_NAME "
- "WHERE FOREI.RDB$CONSTRAINT_TYPE = 'FOREIGN KEY' "
- "AND FOREI.RDB$RELATION_NAME = '"+ table +"'";
+ "WHERE FOREI.RDB$CONSTRAINT_TYPE = 'FOREIGN KEY' ";
+if (bIsImport)
+sSQL = sSQL + "AND FOREI.RDB$RELATION_NAME = '"+ table +"'";
+else
+sSQL = sSQL + "AND PRIM.RDB$RELATION_NAME = '"+ table +"'";
uno::Reference< XResultSet > rs = statement->executeQuery(sSQL);
uno::Reference< XRow > xRow( rs, UNO_QUERY_THROW );
diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.hxx
b/connectivity/source/drivers/firebird/DatabaseMetaData.hxx
index dc55940fcfe5..95e744bcf7ef 100644
--- a/connectivity/source/drivers/firebird/DatabaseMetaData.hxx
+++ b/connectivity/source/drivers/firebird/DatabaseMetaData.hxx
@@ -38,6 +38,8 @@ namespace connectivity
class ODatabaseMetaData : public ODatabaseMetaData_BASE
{
::rtl::Reference m_pConnection;
+private:
+css::uno::Reference< css::sdbc::XResultSet > lcl_getKeys( const
bool& bIsImport, const OUString& table );
public:
explicit ODatabaseMetaData(Connection* _pCon);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - connectivity/source
connectivity/source/drivers/firebird/DatabaseMetaData.cxx | 22 +++---
connectivity/source/drivers/firebird/DatabaseMetaData.hxx |2 +
2 files changed, 14 insertions(+), 10 deletions(-)
New commits:
commit c5b79cd7fd0f6f34d2275d659eb3fc763fc363db
Author: Julien Nabet
AuthorDate: Wed Sep 11 21:24:39 2019 +0200
Commit: Julien Nabet
CommitDate: Thu Sep 12 11:32:58 2019 +0200
tdf#120945: Relationship of tables isn't recognized by formwizard
The patch implements getExportedKeys which was lacking.
Console logs:
warn:connectivity.firebird:13144:18512:connectivity/source/drivers/firebird/DatabaseMetaData.cxx:1468:
Not yet implemented
warn:legacy.osl:13144:18512:connectivity/source/drivers/firebird/DatabaseMetaData.cxx:1469:
Not implemented yet!
The only difference with getImportedKeys is the fact that :
- in getImportedKeys, table name of Where condition is the foreign key
- in getExportedKeys, table name of Where condition should be the primary
key
Instead of duplicating the whole code of getImportedKeys,
I created a local function which contains the main part.
Change-Id: Ia4497524fecf098257eec27e44e016a7cbe23480
Reviewed-on: https://gerrit.libreoffice.org/78822
Tested-by: Jenkins
Reviewed-by: Julien Nabet
(cherry picked from commit 7289828e106081ddae0e053d306fef5ffd0dee3b)
Reviewed-on: https://gerrit.libreoffice.org/78823
Reviewed-by: Lionel Elie Mamane
Tested-by: Julien Nabet
diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
index bd2aae8de53d..655e5c67151b 100644
--- a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
+++ b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
@@ -1460,20 +1460,19 @@ uno::Reference< XResultSet > SAL_CALL
ODatabaseMetaData::getVersionColumns(
}
uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getExportedKeys(
-const Any&, const OUString&, const OUString& )
+const Any&, const OUString&, const OUString& table )
{
-// List the columns in a table which are foreign keys. This is actually
-// never used anywhere in the LO codebase currently. Retrieval from
firebird
-// requires using a 5-table join.
-SAL_WARN("connectivity.firebird", "Not yet implemented");
-OSL_FAIL("Not implemented yet!");
-// TODO implement
-return new
ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eExportedKeys);
+return ODatabaseMetaData::lcl_getKeys(false, table);
}
uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getImportedKeys(
const Any&, const OUString&, const OUString& table )
{
+return ODatabaseMetaData::lcl_getKeys(true, table);
+}
+
+uno::Reference< XResultSet > ODatabaseMetaData::lcl_getKeys(const bool&
bIsImport, const OUString& table )
+{
ODatabaseMetaDataResultSet* pResultSet = new
ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eImportedKeys);
uno::Reference< XResultSet > xResultSet = pResultSet;
@@ -1501,8 +1500,11 @@ uno::Reference< XResultSet > SAL_CALL
ODatabaseMetaData::getImportedKeys(
"ON PRIM.RDB$INDEX_NAME = PRIMARY_INDEX.RDB$INDEX_NAME "
"INNER JOIN RDB$INDEX_SEGMENTS AS FOREIGN_INDEX "
"ON FOREI.RDB$INDEX_NAME = FOREIGN_INDEX.RDB$INDEX_NAME "
- "WHERE FOREI.RDB$CONSTRAINT_TYPE = 'FOREIGN KEY' "
- "AND FOREI.RDB$RELATION_NAME = '"+ table +"'";
+ "WHERE FOREI.RDB$CONSTRAINT_TYPE = 'FOREIGN KEY' ";
+if (bIsImport)
+sSQL = sSQL + "AND FOREI.RDB$RELATION_NAME = '"+ table +"'";
+else
+sSQL = sSQL + "AND PRIM.RDB$RELATION_NAME = '"+ table +"'";
uno::Reference< XResultSet > rs = statement->executeQuery(sSQL);
uno::Reference< XRow > xRow( rs, UNO_QUERY_THROW );
diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.hxx
b/connectivity/source/drivers/firebird/DatabaseMetaData.hxx
index dc55940fcfe5..95e744bcf7ef 100644
--- a/connectivity/source/drivers/firebird/DatabaseMetaData.hxx
+++ b/connectivity/source/drivers/firebird/DatabaseMetaData.hxx
@@ -38,6 +38,8 @@ namespace connectivity
class ODatabaseMetaData : public ODatabaseMetaData_BASE
{
::rtl::Reference m_pConnection;
+private:
+css::uno::Reference< css::sdbc::XResultSet > lcl_getKeys( const
bool& bIsImport, const OUString& table );
public:
explicit ODatabaseMetaData(Connection* _pCon);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - sc/source
sc/source/ui/dataprovider/htmldataprovider.cxx | 13 +
1 file changed, 13 insertions(+)
New commits:
commit 07e1ad042f2dacff441129b1adbb1ed58dd6b16e
Author: Julien Nabet
AuthorDate: Tue Sep 10 21:16:43 2019 +0200
Commit: Eike Rathke
CommitDate: Thu Sep 12 23:12:06 2019 +0200
tdf#127461: fix data provider crashes
See bts provided in the bugtracker
Change-Id: I1cc38add93446f8372c80ca45962b04bfa627923
Reviewed-on: https://gerrit.libreoffice.org/78803
Tested-by: Jenkins
Reviewed-by: Julien Nabet
(cherry picked from commit ec57f6eca37192ada29cda1d37ec192472c0d9ef)
Reviewed-on: https://gerrit.libreoffice.org/78813
Reviewed-by: Eike Rathke
diff --git a/sc/source/ui/dataprovider/htmldataprovider.cxx
b/sc/source/ui/dataprovider/htmldataprovider.cxx
index d82fc76700f5..6f7328bab06c 100644
--- a/sc/source/ui/dataprovider/htmldataprovider.cxx
+++ b/sc/source/ui/dataprovider/htmldataprovider.cxx
@@ -192,8 +192,21 @@ void HTMLFetchThread::execute()
OString aID = OUStringToOString(maID, RTL_TEXTENCODING_UTF8);
xmlXPathContextPtr pXmlXpathCtx = xmlXPathNewContext(pHtmlPtr);
xmlXPathObjectPtr pXmlXpathObj =
xmlXPathEvalExpression(BAD_CAST(aID.getStr()), pXmlXpathCtx);
+
+if (!pXmlXpathObj)
+{
+xmlXPathFreeContext(pXmlXpathCtx);
+return;
+}
xmlNodeSetPtr pXmlNodes = pXmlXpathObj->nodesetval;
+if (!pXmlNodes)
+{
+xmlXPathFreeNodeSetList(pXmlXpathObj);
+xmlXPathFreeContext(pXmlXpathCtx);
+return;
+}
+
if (pXmlNodes->nodeNr == 0)
return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/dataprovider/htmldataprovider.cxx | 13 +
1 file changed, 13 insertions(+)
New commits:
commit ec57f6eca37192ada29cda1d37ec192472c0d9ef
Author: Julien Nabet
AuthorDate: Tue Sep 10 21:16:43 2019 +0200
Commit: Julien Nabet
CommitDate: Wed Sep 11 09:59:54 2019 +0200
tdf#127461: fix data provider crashes
See bts provided in the bugtracker
Change-Id: I1cc38add93446f8372c80ca45962b04bfa627923
Reviewed-on: https://gerrit.libreoffice.org/78803
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/sc/source/ui/dataprovider/htmldataprovider.cxx
b/sc/source/ui/dataprovider/htmldataprovider.cxx
index bbe6dd3c514b..b8b7b3746d2c 100644
--- a/sc/source/ui/dataprovider/htmldataprovider.cxx
+++ b/sc/source/ui/dataprovider/htmldataprovider.cxx
@@ -192,8 +192,21 @@ void HTMLFetchThread::execute()
OString aID = OUStringToOString(maID, RTL_TEXTENCODING_UTF8);
xmlXPathContextPtr pXmlXpathCtx = xmlXPathNewContext(pHtmlPtr);
xmlXPathObjectPtr pXmlXpathObj =
xmlXPathEvalExpression(BAD_CAST(aID.getStr()), pXmlXpathCtx);
+
+if (!pXmlXpathObj)
+{
+xmlXPathFreeContext(pXmlXpathCtx);
+return;
+}
xmlNodeSetPtr pXmlNodes = pXmlXpathObj->nodesetval;
+if (!pXmlNodes)
+{
+xmlXPathFreeNodeSetList(pXmlXpathObj);
+xmlXPathFreeContext(pXmlXpathCtx);
+return;
+}
+
if (pXmlNodes->nodeNr == 0)
{
xmlXPathFreeNodeSet(pXmlNodes);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/filter/hsqldb/fbcreateparser.cxx |6 +-
1 file changed, 1 insertion(+), 5 deletions(-)
New commits:
commit 2acafef57153bfa1ade59e887a55457ba677b976
Author: Julien Nabet
AuthorDate: Tue Sep 10 07:17:06 2019 +0200
Commit: Julien Nabet
CommitDate: Tue Sep 10 08:40:41 2019 +0200
Revert "Related tdf#127040: fix START WITH"
-1 isn't a problem.
The only pb was record length
This reverts commit f4f8bccbd4e2c3979a83d5b2f49e16a99a3a2016.
Change-Id: I3108e451bf10b2e96dff5eeb040e77feeb67875a
Reviewed-on: https://gerrit.libreoffice.org/78791
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/dbaccess/source/filter/hsqldb/fbcreateparser.cxx
b/dbaccess/source/filter/hsqldb/fbcreateparser.cxx
index edb3fcd6cc6f..756b2bd3d445 100644
--- a/dbaccess/source/filter/hsqldb/fbcreateparser.cxx
+++ b/dbaccess/source/filter/hsqldb/fbcreateparser.cxx
@@ -184,11 +184,7 @@ OUString FbCreateStmtParser::compose() const
// start with 0:
// HSQLDB: first value will be 0.
// Firebird: first value will be 1.
-// but we can't put -1 for Firebird in case HSQLDB begins to 0
-sal_Int32 nStartValue = columnIter->getStartValue();
-if (nStartValue)
---nStartValue;
-sSql.append(nStartValue);
+sSql.append(columnIter->getStartValue() - 1);
sSql.append(")");
}
else if (!columnIter->isNullable())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/ui/control/FieldDescControl.cxx |6 --
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 0f85a718dc0d241a8aa1b2d27accb575367691fe
Author: Julien Nabet
AuthorDate: Sun Sep 15 16:55:40 2019 +0200
Commit: Julien Nabet
CommitDate: Sun Sep 15 18:41:52 2019 +0200
tdf#127548: Assertion when creating table in Design
+ fix segfault by resetting m_xContainer and m_xBuilder when disposing
Regression from:
https://cgit.freedesktop.org/libreoffice/core/commit/?id=8c66efa030e98cfdf5da20be368566d64e43c5d1
Change-Id: Ib80dc035b9fbddcf9665d534376a4dc36ec2e9e5
Reviewed-on: https://gerrit.libreoffice.org/78942
Reviewed-by: Caolán McNamara
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx
b/dbaccess/source/ui/control/FieldDescControl.cxx
index e04ac5500a08..86a1ed6eb6c0 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -147,6 +147,8 @@ void OFieldDescControl::dispose()
m_xType.reset();
m_xAutoIncrementValue.reset();
m_xFormat.reset();
+m_xContainer.reset();
+m_xBuilder.reset();
TabPage::dispose();
}
@@ -421,7 +423,7 @@ void OFieldDescControl::ActivateAggregate( EControlType
eType )
m_xDefaultText = m_xBuilder->weld_label("DefaultValueText");
m_xDefaultText->show();
m_xDefault = std::make_unique(
-m_xBuilder->weld_spin_button("DefaultValue"),
STR_HELP_DEFAULT_VALUE, FIELD_PROPERTY_DEFAULT);
+m_xBuilder->weld_entry("DefaultValue"),
STR_HELP_DEFAULT_VALUE, FIELD_PROPERTY_DEFAULT);
InitializeControl(m_xDefault->GetWidget(),HID_TAB_ENT_DEFAULT);
m_xDefault->show();
break;
@@ -581,7 +583,7 @@ void OFieldDescControl::ActivateAggregate( EControlType
eType )
m_xFormatText->show();
m_xFormatSample = std::make_unique(
-m_xBuilder->weld_spin_button("FormatText"),
STR_HELP_FORMAT_CODE, -1);
+m_xBuilder->weld_entry("FormatText"),
STR_HELP_FORMAT_CODE, -1);
m_xFormatSample->set_editable(false);
m_xFormatSample->set_sensitive(false);
InitializeControl(m_xFormatSample->GetWidget(),HID_TAB_ENT_FORMAT_SAMPLE);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source include/filter sd/source
filter/source/msfilter/svdfppt.cxx | 226 ++--
include/filter/msfilter/svdfppt.hxx | 26 ++--
sd/source/filter/ppt/pptin.cxx | 108 -
3 files changed, 180 insertions(+), 180 deletions(-)
New commits:
commit b32ac08a12380228202c396fba36d8ecd85252da
Author: Julien Nabet
AuthorDate: Sun Sep 8 13:10:33 2019 +0200
Commit: Julien Nabet
CommitDate: Mon Sep 9 15:34:19 2019 +0200
sd: prefix members of SdrPowerPointImport
Change-Id: Ia758c5c5bb0c448a5e051557c3ae48e8349c0c92
Reviewed-on: https://gerrit.libreoffice.org/78762
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/filter/source/msfilter/svdfppt.cxx
b/filter/source/msfilter/svdfppt.cxx
index 3d47c924bc66..92b8a7392dcd 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -1328,16 +1328,16 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt,
DffObjData& rObjData, Svx
SdrPowerPointImport::SdrPowerPointImport( PowerPointImportParam& rParam, const
OUString& rBaseURL ) :
SdrEscherImport ( rParam, rBaseURL ),
-bOk ( rStCtrl.GetErrorCode() == ERRCODE_NONE ),
-nPersistPtrCnt ( 0 ),
-pDefaultSheet ( nullptr ),
-nCurrentPageNum ( 0 ),
-nDocStreamPos ( 0 ),
-nPageColorsNum ( 0x ),
-ePageColorsKind ( PPT_MASTERPAGE ),
-eCurrentPageKind( PPT_MASTERPAGE )
+m_bOk ( rStCtrl.GetErrorCode() == ERRCODE_NONE ),
+m_nPersistPtrCnt ( 0 ),
+m_pDefaultSheet ( nullptr ),
+m_nCurrentPageNum ( 0 ),
+m_nDocStreamPos ( 0 ),
+m_nPageColorsNum ( 0x ),
+m_ePageColorsKind ( PPT_MASTERPAGE ),
+m_eCurrentPageKind( PPT_MASTERPAGE )
{
-if ( bOk )
+if ( m_bOk )
{
rStCtrl.Seek( STREAM_SEEK_TO_END );
nStreamLen = rStCtrl.Tell();
@@ -1346,9 +1346,9 @@ SdrPowerPointImport::SdrPowerPointImport(
PowerPointImportParam& rParam, const O
sal_uInt32 nCurrentUserEdit = rParam.aCurrentUserAtom.nCurrentUserEdit;
if (nCurrentUserEdit && checkSeek(rStCtrl, nCurrentUserEdit))
{
-ReadPptUserEditAtom( rStCtrl, aUserEditAtom );
+ReadPptUserEditAtom( rStCtrl, m_aUserEditAtom );
}
-if ( !aUserEditAtom.nOffsetPersistDirectory )
+if ( !m_aUserEditAtom.nOffsetPersistDirectory )
{ // if there is no UserEditAtom try to search the last one
rStCtrl.Seek( 0 );
@@ -1360,34 +1360,34 @@ SdrPowerPointImport::SdrPowerPointImport(
PowerPointImportParam& rParam, const O
if ( pHd->nRecType == PPT_PST_UserEditAtom )
{
pHd->SeekToBegOfRecord( rStCtrl );
-ReadPptUserEditAtom( rStCtrl, aUserEditAtom );
+ReadPptUserEditAtom( rStCtrl, m_aUserEditAtom );
break;
}
}
if ( !pHd )
-bOk = false;
+m_bOk = false;
}
}
if ( rStCtrl.GetError() != ERRCODE_NONE )
-bOk = false;
+m_bOk = false;
-if ( bOk )
+if ( m_bOk )
{
-nPersistPtrCnt = aUserEditAtom.nMaxPersistWritten + 1;
-if ( ( nPersistPtrCnt >> 2 ) > nStreamLen ) // sj: at least
nPersistPtrCnt is not allowed to be greater than filesize
-bOk = false;// (it should not be
greater than the PPT_PST_PersistPtrIncrementalBlock, but
+m_nPersistPtrCnt = m_aUserEditAtom.nMaxPersistWritten + 1;
+if ( ( m_nPersistPtrCnt >> 2 ) > nStreamLen ) // sj: at least
m_nPersistPtrCnt is not allowed to be greater than filesize
+m_bOk = false;// (it should not be
greater than the PPT_PST_PersistPtrIncrementalBlock, but
// we are reading this
block later, so we do not have access yet)
-if ( bOk && ( nPersistPtrCnt < ( SAL_MAX_UINT32 / sizeof( sal_uInt32 )
) -1 ) )
-pPersistPtr.reset( new (std::nothrow) sal_uInt32[ nPersistPtrCnt +
1 ] );
-if ( !pPersistPtr )
-bOk = false;
-if ( bOk )
+if ( m_bOk && ( m_nPersistPtrCnt < ( SAL_MAX_UINT32 / sizeof(
sal_uInt32 ) ) -1 ) )
+m_pPersistPtr.reset( new (std::nothrow) sal_uInt32[
m_nPersistPtrCnt + 1 ] );
+if ( !m_pPersistPtr )
+m_bOk = false;
+if ( m_bOk )
{
-memset( pPersistPtr.get(), 0x00, (nPersistPtrCnt+1) *
sizeof(sal_uInt32) );
+memset( m_pPersistPtr.get(), 0x00, (m_nPersistPtrCnt+1) *
sizeof(sal_uInt32) );
// SJ: new search mechanism from bottom to top (Issue 21122)
-PptUserEditAtom aCurrentEditAtom( aUserEditAtom );
+PptUserEditAtom aCurrentEditAtom( m_aUserEditAtom );
sal_uInt32
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/filter/hsqldb/fbcreateparser.cxx |6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit f4f8bccbd4e2c3979a83d5b2f49e16a99a3a2016
Author: Julien Nabet
AuthorDate: Mon Sep 9 22:12:38 2019 +0200
Commit: Julien Nabet
CommitDate: Mon Sep 9 22:57:02 2019 +0200
Related tdf#127040: fix START WITH
Change-Id: I1dc5223015b787bcc122617d8ad9db6fabad20b2
Reviewed-on: https://gerrit.libreoffice.org/78787
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/dbaccess/source/filter/hsqldb/fbcreateparser.cxx
b/dbaccess/source/filter/hsqldb/fbcreateparser.cxx
index 756b2bd3d445..edb3fcd6cc6f 100644
--- a/dbaccess/source/filter/hsqldb/fbcreateparser.cxx
+++ b/dbaccess/source/filter/hsqldb/fbcreateparser.cxx
@@ -184,7 +184,11 @@ OUString FbCreateStmtParser::compose() const
// start with 0:
// HSQLDB: first value will be 0.
// Firebird: first value will be 1.
-sSql.append(columnIter->getStartValue() - 1);
+// but we can't put -1 for Firebird in case HSQLDB begins to 0
+sal_Int32 nStartValue = columnIter->getStartValue();
+if (nStartValue)
+--nStartValue;
+sSql.append(nStartValue);
sSql.append(")");
}
else if (!columnIter->isNullable())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
