[Libreoffice-commits] core.git: codemaker/source configmgr/source desktop/source framework/source i18npool/source idl/source include/xmlreader sal/Module_sal.mk sal/osl sal/rtl stoc/source stoc/test s
codemaker/source/cppumaker/cpputype.cxx |6 +- configmgr/source/childaccess.cxx |2 configmgr/source/data.cxx |7 +- configmgr/source/xcsparser.cxx|2 configmgr/source/xcuparser.cxx|2 desktop/source/deployment/misc/dp_misc.cxx|4 - framework/source/accelerators/storageholder.cxx |2 framework/source/fwi/classes/protocolhandlercache.cxx | 12 ++-- framework/source/services/substitutepathvars.cxx |2 framework/source/services/urltransformer.cxx |2 framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx | 17 ++--- framework/source/uiconfiguration/uiconfigurationmanager.cxx | 17 ++--- i18npool/source/localedata/localedata.cxx | 29 -- idl/source/cmptools/lex.cxx |4 - idl/source/objects/object.cxx |3 - idl/source/objects/types.cxx |2 idl/source/prj/database.cxx |2 include/xmlreader/pad.hxx |2 sal/Module_sal.mk |1 sal/osl/unx/file_url.cxx |9 +-- sal/osl/unx/tempfile.cxx | 12 ++-- sal/rtl/bootstrap.cxx |6 +- sal/rtl/uri.cxx |4 - stoc/source/inspect/introspection.cxx |2 stoc/source/uriproc/ExternalUriReferenceTranslator.cxx|4 - stoc/source/uriproc/UriReference.cxx |2 stoc/source/uriproc/UriReferenceFactory.cxx |7 +- stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx |9 +-- stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx |2 stoc/test/uriproc/test_uriproc.cxx|2 svl/source/numbers/zforlist.cxx | 29 -- svl/source/numbers/zformat.cxx|4 - svx/source/gengal/gengal.cxx |2 tools/source/fsys/urlobj.cxx | 25 tools/source/inet/inetmime.cxx|4 - tools/source/misc/extendapplicationenvironment.cxx|2 ucb/source/core/ucb.cxx |2 ucb/source/ucp/inc/urihelper.hxx |2 ucb/source/ucp/webdav-neon/NeonUri.cxx|3 - unoidl/source/sourceprovider-parser.y |3 - unotools/source/config/pathoptions.cxx|2 vcl/source/window/syswin.cxx |2 xmloff/source/draw/xexptran.cxx |2 43 files changed, 131 insertions(+), 128 deletions(-) New commits: commit 0f874472c672175135520101837ff0c9d4701d7f Author: Noel Grandin AuthorDate: Thu Oct 17 20:33:50 2019 +0200 Commit: Noel Grandin CommitDate: Mon Oct 21 08:36:01 2019 +0200 size some stringbuffer to prevent re-alloc found by the simple expidient of putting asserts in the resize routine. Where an explicit const size is used, I started with 32 and kept doubling until that site did not need resizing anymore. Change-Id: I998787edc940d0a3ba23b5ac37131ab9ecd300f4 Reviewed-on: https://gerrit.libreoffice.org/81138 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/codemaker/source/cppumaker/cpputype.cxx b/codemaker/source/cppumaker/cpputype.cxx index 67b842f0c3d1..a16256d4c353 100644 --- a/codemaker/source/cppumaker/cpputype.cxx +++ b/codemaker/source/cppumaker/cpputype.cxx @@ -1004,7 +1004,7 @@ OUString CppuType::resolveAllTypedefs(OUString const & name) const u2b(dynamic_cast(*ent).getType()), &k2)); k1 += k2; //TODO: overflow } -OUStringBuffer b; +OUStringBuffer b(k1*2 + n.getLength()); for (sal_Int32 i = 0; i != k1; ++i) { b.append("[]"); } @@ -2675,7 +2675,7 @@ OUString typeToIdentifier(OUString const & name) { sal_Int32 k; OUString n(b2u(codemaker::UnoType::decompose(u2b(name), &k))); -OUStringBuffer b; +OUStringBuffer b(4*k + n.getLength()); for (sal_Int32 i = 0; i != k; ++i) { b.append("seq_"); } @@ -3587,7 +3587,7 @@ void ServiceType::dumpHppFile( for (const unoidl::SingleInterfaceBasedServiceEntity::Constructor::Parameter& par
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/doc/objcont.cxx |2 +- sfx2/source/doc/objserv.cxx |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 9112c18524c9f5e67d6cbb282586a439e3020cdb Author: Samuel Mehrbrodt AuthorDate: Fri Oct 18 11:27:11 2019 +0200 Commit: Samuel Mehrbrodt CommitDate: Mon Oct 21 08:34:04 2019 +0200 Don't create unnecessary tempfiles for opened doc A copy of the doc was created for each opened file as a temp file. Try to avoid that. Change-Id: I11db2a9c8d77b954de56a6e977b1555c8f876416 Reviewed-on: https://gerrit.libreoffice.org/81031 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx index ecc131177fb9..8837e9fb82a7 100644 --- a/sfx2/source/doc/objcont.cxx +++ b/sfx2/source/doc/objcont.cxx @@ -404,7 +404,7 @@ void SfxObjectShell::UpdateFromTemplate_Impl( ) // tdf#113935 - do not remove this line - somehow, it makes the process // of switching from viewing a read-only document to opening it in writable // mode much faster. -uno::Reference< embed::XStorage > xDocStor = pFile->GetStorage(); +uno::Reference< embed::XStorage > xDocStor = pFile->GetStorage(false); // only for own storage formats if ( !pFile->GetFilter() || !pFile->GetFilter()->IsOwnFormat() ) diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index 5e04a0c09c34..afcbfe14e14a 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -1608,7 +1608,7 @@ uno::Sequence< security::DocumentSignatureInformation > SfxObjectShell::GetDocum uno::Reference< io::XInputStream >() ); else { -if (GetMedium()->GetStorage().is()) +if (GetMedium()->GetStorage(false).is()) { // Something ZIP-based. // Only call into xmlsecurity if we see a signature stream, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - compilerplugins/clang include/sfx2 include/svx sd/source sfx2/source svx/source
compilerplugins/clang/virtualdead.unusedparams.results |9 - include/sfx2/emojiviewitem.hxx |2 +- include/sfx2/thumbnailviewitem.hxx |2 +- include/svx/fmtools.hxx|2 +- include/svx/svdhdl.hxx |2 +- sd/source/ui/view/viewoverlaymanager.cxx |4 ++-- sfx2/source/control/emojiviewitem.cxx |2 +- sfx2/source/control/thumbnailview.cxx |4 ++-- sfx2/source/control/thumbnailviewitem.cxx |2 +- svx/source/fmcomp/gridctrl.cxx |2 +- svx/source/form/fmtools.cxx|4 ++-- svx/source/svdraw/svdhdl.cxx |2 +- svx/source/svdraw/svdmrkv.cxx |2 +- 13 files changed, 15 insertions(+), 24 deletions(-) New commits: commit 4a20922e0eebe9c7a9fe59b3aac8a8d996bee0e7 Author: Noel Grandin AuthorDate: Fri Oct 18 10:55:51 2019 +0200 Commit: Noel Grandin CommitDate: Mon Oct 21 08:33:22 2019 +0200 loplugin:virtualdead unused param in ThumbnailViewItem::calculateItemsPosition Change-Id: I8db99a3672e3603a25ee1f6ca4741a02b73c9516 Reviewed-on: https://gerrit.libreoffice.org/81184 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/compilerplugins/clang/virtualdead.unusedparams.results b/compilerplugins/clang/virtualdead.unusedparams.results index 9ed08fc878f6..c216a504b8b7 100644 --- a/compilerplugins/clang/virtualdead.unusedparams.results +++ b/compilerplugins/clang/virtualdead.unusedparams.results @@ -148,9 +148,6 @@ include/sfx2/sidebar/TitleBar.hxx:61 include/sfx2/stbitem.hxx:100 _Bool SfxStatusBarControl::MouseButtonUp(const class MouseEvent &,) 0 -include/sfx2/thumbnailviewitem.hxx:118 -void ThumbnailViewItem::calculateItemsPosition(const long,const long,const long,unsigned int,const struct ThumbnailItemAttributes *,) -10111 include/svl/svdde.hxx:228 _Bool DdeGetPutItem::Put(const class DdeData *,) 0 diff --git a/include/sfx2/emojiviewitem.hxx b/include/sfx2/emojiviewitem.hxx index e0aa57675f9a..0e995664e768 100644 --- a/include/sfx2/emojiviewitem.hxx +++ b/include/sfx2/emojiviewitem.hxx @@ -26,7 +26,7 @@ public: virtual void Paint (drawinglayer::processor2d::BaseProcessor2D *pProcessor, const ThumbnailItemAttributes *pAttrs) override; -virtual void calculateItemsPosition (const long nThumbnailHeight, const long nDisplayHeight, +virtual void calculateItemsPosition (const long nThumbnailHeight, const long nPadding, sal_uInt32 nMaxTextLength, const ThumbnailItemAttributes *pAttrs) override; private: diff --git a/include/sfx2/thumbnailviewitem.hxx b/include/sfx2/thumbnailviewitem.hxx index 1d001de2469b..a3d1a09b1fb0 100644 --- a/include/sfx2/thumbnailviewitem.hxx +++ b/include/sfx2/thumbnailviewitem.hxx @@ -115,7 +115,7 @@ public: const tools::Rectangle& getDrawArea () const { return maDrawArea; } -virtual void calculateItemsPosition (const long nThumbnailHeight, const long nDisplayHeight, +virtual void calculateItemsPosition (const long nThumbnailHeight, const long nPadding, sal_uInt32 nMaxTextLength, const ThumbnailItemAttributes *pAttrs); diff --git a/sfx2/source/control/emojiviewitem.cxx b/sfx2/source/control/emojiviewitem.cxx index f393738d045f..52bbf1d0f2e0 100644 --- a/sfx2/source/control/emojiviewitem.cxx +++ b/sfx2/source/control/emojiviewitem.cxx @@ -37,7 +37,7 @@ EmojiViewItem::~EmojiViewItem () } -void EmojiViewItem::calculateItemsPosition (const long /*nThumbnailHeight*/, const long, +void EmojiViewItem::calculateItemsPosition (const long /*nThumbnailHeight*/, const long /*nPadding*/, sal_uInt32 nMaxTextLength, const ThumbnailItemAttributes *pAttrs) { diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx index 9d4225539351..6f4ca606ea1b 100644 --- a/sfx2/source/control/thumbnailview.cxx +++ b/sfx2/source/control/thumbnailview.cxx @@ -354,7 +354,7 @@ void ThumbnailView::CalculateItemPositions (bool bScrollBarUsed) } pItem->setDrawArea(::tools::Rectangle( Point(x,y), Size(mnItemWidth, mnItemHeight) )); - pItem->calculateItemsPosition(mnThumbnailHeight,mnDisplayHeight,mnItemPadding,mpItemAttrs->nMaxTextLength,mpItemAttrs.get()); + pItem->calculateItemsPosition(mnThumbnailHeight,mnItemPadding,mpItemAttrs->nMaxTextLength,mpItemAttrs.get()); if ( !((nCurCount+1) % mnCols) ) { @@ -1510,7 +1510,7 @@ void SfxThumbnailView::CalculateItemPositions(bool bScrollBarUsed)
[Libreoffice-commits] core.git: 2 commits - compilerplugins/clang cui/qa cui/source include/svx svx/source
compilerplugins/clang/virtualdead.unusedparams.results |6 - cui/qa/unit/cui-dialogs-test.cxx |2 - cui/source/factory/dlgfact.cxx |2 - cui/source/factory/dlgfact.hxx |2 - include/svx/svdundo.hxx| 16 +++ include/svx/svxdlg.hxx |2 - svx/source/svdraw/svdundo.cxx | 18 - svx/source/table/tablecontroller.cxx |3 -- 8 files changed, 22 insertions(+), 29 deletions(-) New commits: commit d5ec8bc929d243fbd707b916883d0a192d5bb072 Author: Noel Grandin AuthorDate: Thu Oct 17 16:31:21 2019 +0200 Commit: Noel Grandin CommitDate: Mon Oct 21 08:32:27 2019 +0200 loplugin:virtualdead unused param in GetSdrRepeatComment Change-Id: I0a27d1a200e8af50adf98de2c5ba7d3c7e199b00 Reviewed-on: https://gerrit.libreoffice.org/81180 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/compilerplugins/clang/virtualdead.unusedparams.results b/compilerplugins/clang/virtualdead.unusedparams.results index 0e644962f556..08ae23369b67 100644 --- a/compilerplugins/clang/virtualdead.unusedparams.results +++ b/compilerplugins/clang/virtualdead.unusedparams.results @@ -187,9 +187,6 @@ include/svx/selectioncontroller.hxx:48 include/svx/svdhdl.hxx:242 void SdrHdl::onHelpRequest(const class HelpEvent &,) 0 -include/svx/svdundo.hxx:69 -class rtl::OUString SdrUndoAction::GetSdrRepeatComment(class SdrView &,)const -0 include/vcl/accessibletable.hxx:91 class tools::Rectangle vcl::table::IAccessibleTable::GetFieldCharacterBounds(int,int,int,) 001 diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx index 7b100cb9314b..7a33a71297c6 100644 --- a/include/svx/svdundo.hxx +++ b/include/svx/svdundo.hxx @@ -66,7 +66,7 @@ public: virtual void Repeat(SfxRepeatTarget& rView) override; virtual OUString GetRepeatComment(SfxRepeatTarget& rView) const override; -virtual OUString GetSdrRepeatComment(SdrView& rView) const; +virtual OUString GetSdrRepeatComment() const; virtual bool CanSdrRepeat(SdrView& rView) const; virtual void SdrRepeat(SdrView& rView); @@ -103,7 +103,7 @@ public: void SetComment(const OUString& rStr) { aComment=rStr; } void SetObjDescription(const OUString& rStr) { aObjDescription=rStr; } virtual OUString GetComment() const override; -virtual OUString GetSdrRepeatComment(SdrView& rView) const override; +virtual OUString GetSdrRepeatComment() const override; virtual void Undo() override; virtual void Redo() override; @@ -172,7 +172,7 @@ public: virtual void Redo() override; virtual OUString GetComment() const override; -virtual OUString GetSdrRepeatComment(SdrView& rView) const override; +virtual OUString GetSdrRepeatComment() const override; }; /** @@ -192,7 +192,7 @@ public: virtual void Redo() override; virtual OUString GetComment() const override; -virtual OUString GetSdrRepeatComment(SdrView& rView) const override; +virtual OUString GetSdrRepeatComment() const override; virtual void SdrRepeat(SdrView& rView) override; virtual bool CanSdrRepeat(SdrView& rView) const override; @@ -296,7 +296,7 @@ public: virtual void Redo() override; virtual OUString GetComment() const override; -virtual OUString GetSdrRepeatComment(SdrView& rView) const override; +virtual OUString GetSdrRepeatComment() const override; virtual void SdrRepeat(SdrView& rView) override; virtual bool CanSdrRepeat(SdrView& rView) const override; @@ -413,7 +413,7 @@ public: virtual void Redo() override; virtual OUString GetComment() const override; -virtual OUString GetSdrRepeatComment(SdrView& rView) const override; +virtual OUString GetSdrRepeatComment() const override; virtual void SdrRepeat(SdrView& rView) override; virtual bool CanSdrRepeat(SdrView& rView) const override; @@ -569,7 +569,7 @@ public: virtual void Redo() override; virtual OUString GetComment() const override; -virtual OUString GetSdrRepeatComment(SdrView& rView) const override; +virtual OUString GetSdrRepeatComment() const override; virtual void SdrRepeat(SdrView& rView) override; virtual bool CanSdrRepeat(SdrView& rView) const override; @@ -607,7 +607,7 @@ public: SdrUndoCopyPage(SdrPage& rNewPg): SdrUndoNewPage(rNewPg) {} virtual OUString GetComment() const override; -virtual OUString GetSdrRepeatComment(SdrView& rView) const override; +virtual OUString GetSdrRepeatComment() const override; virtual void SdrRepeat(SdrView& rView) override; virtual bool CanSdrRepeat(SdrView& rView) const override; diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx index 8d79d0c65b20..e27e6cf42c58 100644 --- a/svx/source/svdraw/svdundo.cxx ++
[Libreoffice-commits] core.git: 2 commits - cui/uiconfig sw/uiconfig
cui/uiconfig/ui/applylocalizedpage.ui | 42 ++ sw/uiconfig/swriter/ui/columnpage.ui | 28 +- 2 files changed, 45 insertions(+), 25 deletions(-) New commits: commit de4839e66d3d195315729b95cc144cdab96b6e74 Author: andreas kainz AuthorDate: Sun Oct 20 23:35:08 2019 +0200 Commit: andreas_kainz CommitDate: Mon Oct 21 08:13:17 2019 +0200 tdf#127773 AutoCorrect Dialog Localized Tab Change-Id: I7a54bd963447e98b13760b52938b0f46df5a90c1 Reviewed-on: https://gerrit.libreoffice.org/81188 Tested-by: Jenkins Reviewed-by: andreas_kainz diff --git a/cui/uiconfig/ui/applylocalizedpage.ui b/cui/uiconfig/ui/applylocalizedpage.ui index 6fec332aee47..57a8869834ae 100644 --- a/cui/uiconfig/ui/applylocalizedpage.ui +++ b/cui/uiconfig/ui/applylocalizedpage.ui @@ -212,6 +212,7 @@ True False 6 +12 Repla_ce @@ -225,12 +226,14 @@ 0 0 +2 True False +12 _Start quote: True startsingle @@ -277,8 +280,8 @@ -0 -2 +1 +1 @@ -296,14 +299,15 @@ -0 -5 +1 +3 True False +12 _End quote: True endsingle @@ -311,7 +315,7 @@ 0 -3 +2 @@ -350,10 +354,13 @@ -0 -4 +1 +2 + + + @@ -390,6 +397,7 @@ True False 6 +12 Repla_ce @@ -403,12 +411,14 @@ 0 0 +2 True False +12 _Start quote: True startdouble @@ -455,8 +465,8 @@ -0 -2 +1 +1 @@ -474,14 +484,15 @@ -0 -5 +1 +3 True False +12 _End quote: True enddouble @@ -489,7 +500,7 @@ 0 -3 +2 @@ -528,10 +539,13 @@
[Libreoffice-commits] core.git: cui/uiconfig
cui/uiconfig/ui/wordcompletionpage.ui |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 3e8fb860d92160e41a1aef5a0a53e4447120eb2e Author: andreas kainz AuthorDate: Sun Oct 20 23:40:47 2019 +0200 Commit: andreas_kainz CommitDate: Mon Oct 21 01:36:37 2019 +0200 tdf#127773 AutoCorrect Dialog Wordcomplete Tab sizegroup fix Change-Id: Iae6958172a5f7943cc5032845a29d258c3ffd79f Reviewed-on: https://gerrit.libreoffice.org/81189 Tested-by: Jenkins Reviewed-by: andreas_kainz diff --git a/cui/uiconfig/ui/wordcompletionpage.ui b/cui/uiconfig/ui/wordcompletionpage.ui index d884ed7c9ede..d56b3ac28b75 100644 --- a/cui/uiconfig/ui/wordcompletionpage.ui +++ b/cui/uiconfig/ui/wordcompletionpage.ui @@ -376,8 +376,9 @@ - + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: qadevOOo/objdsc sc/qa
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationShapeObj.csv |1 - sc/qa/extras/scannotationshapeobj.cxx|5 + 2 files changed, 5 insertions(+), 1 deletion(-) New commits: commit 3874ac30beeb65a7048ff31bf052ecc87c185b69 Author: Jens Carl AuthorDate: Sun Oct 20 01:47:24 2019 -0700 Commit: Jens Carl CommitDate: Mon Oct 21 01:34:05 2019 +0200 tdf#45904 Move XGluePointsSupplier Java test to C++ Move XGluePointsSupplier Java test to C++ for ScAnnotationShapeObj. Change-Id: I573f28f1b1bdf8e8fa41ef14cfd3d8ea4deaf751 Reviewed-on: https://gerrit.libreoffice.org/81150 Tested-by: Jenkins Reviewed-by: Jens Carl diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationShapeObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationShapeObj.csv index c83b8f6f107f..fa1477b94f04 100644 --- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationShapeObj.csv +++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationShapeObj.csv @@ -125,7 +125,6 @@ "ScAnnotationShapeObj";"com::sun::star::drawing::TextProperties";"TextAnimationStartInside" "ScAnnotationShapeObj";"com::sun::star::drawing::TextProperties";"TextAnimationStopInside" "ScAnnotationShapeObj";"com::sun::star::drawing::TextProperties";"TextWritingMode" -"ScAnnotationShapeObj";"com::sun::star::drawing::XGluePointsSupplier#optional";"getGluePoints()" "ScAnnotationShapeObj";"com::sun::star::drawing::FillProperties";"FillStyle" "ScAnnotationShapeObj";"com::sun::star::drawing::FillProperties";"FillColor" "ScAnnotationShapeObj";"com::sun::star::drawing::FillProperties";"FillTransparence" diff --git a/sc/qa/extras/scannotationshapeobj.cxx b/sc/qa/extras/scannotationshapeobj.cxx index f8e0fa0d93d9..567a7a904d3e 100644 --- a/sc/qa/extras/scannotationshapeobj.cxx +++ b/sc/qa/extras/scannotationshapeobj.cxx @@ -9,6 +9,7 @@ #include #include +#include #include #include #include @@ -37,6 +38,7 @@ namespace sc_apitest { class ScAnnotationShapeObj : public CalcUnoApiTest, public apitest::CaptionShape, + public apitest::XGluePointsSupplier, public apitest::XShape, public apitest::XShapeDescriptor, public apitest::XSimpleText, @@ -55,6 +57,9 @@ public: // CaptionShape CPPUNIT_TEST(testCaptionShapeProperties); +// XGluePointsSupplier +CPPUNIT_TEST(testGetGluePoints); + // XShape CPPUNIT_TEST(testGetSetSize); CPPUNIT_TEST(testGetSetPosition); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - compilerplugins/clang include/vcl sw/inc sw/source vcl/source
compilerplugins/clang/virtualdead.unusedparams.results |6 -- include/vcl/idle.hxx |3 +-- include/vcl/task.hxx |3 +-- include/vcl/timer.hxx |3 +-- include/vcl/treelist.hxx |6 +- include/vcl/treelistbox.hxx|3 +-- sw/inc/SwDocIdle.hxx |3 +-- sw/source/core/doc/SwDocIdle.cxx |2 +- vcl/source/app/idle.cxx|2 +- vcl/source/app/scheduler.cxx |4 ++-- vcl/source/app/timer.cxx |2 +- vcl/source/treelist/treelist.cxx |7 +++ vcl/source/treelist/treelistbox.cxx|4 +--- 13 files changed, 15 insertions(+), 33 deletions(-) New commits: commit fec35bf15da6f226ee90bc19e538ee36cc47a172 Author: Noel Grandin AuthorDate: Thu Oct 17 16:17:45 2019 +0200 Commit: Noel Grandin CommitDate: Sun Oct 20 21:54:00 2019 +0200 loplugin:virtualdead unused param in Task::UpdateMinPeriod Change-Id: Ie24f56fed811b3b317d6c20e15289e7cecfb738d Reviewed-on: https://gerrit.libreoffice.org/81157 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/compilerplugins/clang/virtualdead.unusedparams.results b/compilerplugins/clang/virtualdead.unusedparams.results index 186a2780eaba..353e844c8218 100644 --- a/compilerplugins/clang/virtualdead.unusedparams.results +++ b/compilerplugins/clang/virtualdead.unusedparams.results @@ -211,9 +211,6 @@ include/vcl/ITiledRenderable.hxx:209 include/vcl/opengl/OpenGLContext.hxx:141 struct SystemWindowData OpenGLContext::generateWinData(class vcl::Window *,_Bool,) 10 -include/vcl/task.hxx:71 -unsigned long Task::UpdateMinPeriod(unsigned long,unsigned long,)const -01 include/xmloff/xmlimp.hxx:244 class SvXMLImportContext * SvXMLImport::CreateDocumentContext(const unsigned short,const class rtl::OUString &,const class com::sun::star::uno::Reference &,) 110 diff --git a/include/vcl/idle.hxx b/include/vcl/idle.hxx index f58061313611..7bbd52d41f3b 100644 --- a/include/vcl/idle.hxx +++ b/include/vcl/idle.hxx @@ -35,8 +35,7 @@ private: sal_uInt64GetTimeout() const = delete; protected: -virtual sal_uInt64 UpdateMinPeriod( -sal_uInt64 nMinPeriod, sal_uInt64 nTimeNow ) const override; +virtual sal_uInt64 UpdateMinPeriod( sal_uInt64 nTimeNow ) const override; Idle( bool bAuto, const sal_Char *pDebugName ); diff --git a/include/vcl/task.hxx b/include/vcl/task.hxx index f39661461d99..0fc124de7a65 100644 --- a/include/vcl/task.hxx +++ b/include/vcl/task.hxx @@ -64,11 +64,10 @@ protected: * need another mechanism to wake up the Scheduler or rely on other * Tasks to be scheduled, or simply use a polling Timer. * - * @param nMinPeriod the currently expected sleep time * @param nTimeNow the current time * @return the sleep time of the Task to become ready */ -virtual sal_uInt64 UpdateMinPeriod( sal_uInt64 nMinPeriod, sal_uInt64 nTimeNow ) const = 0; +virtual sal_uInt64 UpdateMinPeriod( sal_uInt64 nTimeNow ) const = 0; public: Task( const sal_Char *pDebugName ); diff --git a/include/vcl/timer.hxx b/include/vcl/timer.hxx index 2ee882f60596..088a1e50e9c9 100644 --- a/include/vcl/timer.hxx +++ b/include/vcl/timer.hxx @@ -31,8 +31,7 @@ class VCL_DLLPUBLIC Timer : public Task protected: virtual void SetDeletionFlags() override; -virtual sal_uInt64 UpdateMinPeriod( -sal_uInt64 nMinPeriod, sal_uInt64 nTimeNow ) const override; +virtual sal_uInt64 UpdateMinPeriod( sal_uInt64 nTimeNow ) const override; Timer( bool bAuto, const sal_Char *pDebugName ); diff --git a/sw/inc/SwDocIdle.hxx b/sw/inc/SwDocIdle.hxx index 38072f8f3cdf..708dc1c1cb78 100644 --- a/sw/inc/SwDocIdle.hxx +++ b/sw/inc/SwDocIdle.hxx @@ -39,8 +39,7 @@ private: SwDoc &m_rDoc; protected: -virtual sal_uInt64 UpdateMinPeriod( -sal_uInt64 nMinPeriod, sal_uInt64 nTimeNow ) const override; +virtual sal_uInt64 UpdateMinPeriod( sal_uInt64 nTimeNow ) const override; public: SwDocIdle( SwDoc &doc ); diff --git a/sw/source/core/doc/SwDocIdle.cxx b/sw/source/core/doc/SwDocIdle.cxx index d2bf04f408dc..24f51c90e908 100644 --- a/sw/source/core/doc/SwDocIdle.cxx +++ b/sw/source/core/doc/SwDocIdle.cxx @@ -30,7 +30,7 @@ namespace sw { -sal_uInt64 SwDocIdle::UpdateMinPeriod( sal_uInt64 /* nMinPeriod */, sal_uInt64 /* nTimeNow */ ) const +sal_uInt64 SwDocIdle::UpdateMinPeriod( sal_uInt64 /* nTimeNow */ ) const { bool bReadyForSchedule = true; diff --git a/vcl/source/app/idle.cxx b/vcl/source/app/idle.cxx index a9a509775a7b..301cbb0bb727 100644 --- a/vcl/source/app/idle.cxx +++ b/vcl/source/app/idle.cxx @@ -52,7 +52,7 @@ void Idle::Start() Ta
[Libreoffice-commits] core.git: 2 commits - cui/uiconfig dbaccess/source
cui/uiconfig/ui/acorreplacepage.ui|1 - dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx |5 +++-- dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx |4 ++-- dbaccess/source/ui/dlg/dbwizsetup.cxx | 20 ++-- dbaccess/source/ui/dlg/generalpage.cxx|5 - dbaccess/source/ui/dlg/generalpage.hxx|4 +++- dbaccess/source/ui/inc/dbwizsetup.hxx |2 ++ 7 files changed, 28 insertions(+), 13 deletions(-) New commits: commit 1d5261adcc7ad4178a242651449d189fdbdd91a9 Author: Caolán McNamara AuthorDate: Sun Oct 20 18:44:18 2019 +0100 Commit: Caolán McNamara CommitDate: Sun Oct 20 21:15:57 2019 +0200 Don't need an explicit width_request here I suspect the fix of autocorrect dialog width grows on change of new to replace commit f6a2b24ce17293043f7ddbed0bc218264be6487d Author: Caolán McNamara Date: Mon Sep 30 14:18:29 2019 +0100 negates the need for the explicit arbitrary width_request added in tdf#127773 AutoCorrect Dialog AutoCorrect Tab update commit f5bdc014192f92d06ad278ac4ccbdb52c4958b6a Author: andreas kainz Date: Wed Oct 2 23:54:46 2019 +0200 Change-Id: I538e98928e50874e5d3c382e454f68c2ac61f0b0 Reviewed-on: https://gerrit.libreoffice.org/81174 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/cui/uiconfig/ui/acorreplacepage.ui b/cui/uiconfig/ui/acorreplacepage.ui index d01afe97eda0..0121257447fc 100644 --- a/cui/uiconfig/ui/acorreplacepage.ui +++ b/cui/uiconfig/ui/acorreplacepage.ui @@ -22,7 +22,6 @@ 12 -100 True False end commit c02c1c2eee57ebf2da29605f62a366720624cb9e Author: Caolán McNamara AuthorDate: Sun Oct 20 18:22:43 2019 +0100 Commit: Caolán McNamara CommitDate: Sun Oct 20 21:15:37 2019 +0200 cid#1453991 Wrapper object use after free Change-Id: I6476c765589cbb3996ad8832a0e159aa4d965d32 Reviewed-on: https://gerrit.libreoffice.org/81173 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx index 98c5b890252a..42bfc5c88079 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx @@ -722,12 +722,12 @@ using namespace ::com::sun::star; return bChangedSomething; } -std::unique_ptr OFinalDBPageSetup::CreateFinalDBTabPageSetup(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rAttrSet) +std::unique_ptr OFinalDBPageSetup::CreateFinalDBTabPageSetup(weld::Container* pPage, ODbTypeWizDialogSetup* pController, const SfxItemSet& _rAttrSet) { return std::make_unique(pPage, pController, _rAttrSet); } -OFinalDBPageSetup::OFinalDBPageSetup(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rCoreAttrs) +OFinalDBPageSetup::OFinalDBPageSetup(weld::Container* pPage, ODbTypeWizDialogSetup* pController, const SfxItemSet& _rCoreAttrs) : OGenericAdministrationPage(pPage, pController, "dbaccess/ui/finalpagewizard.ui", "PageFinal", _rCoreAttrs) , m_xFTFinalHeader(m_xBuilder->weld_label("headerText")) , m_xFTFinalHelpText(m_xBuilder->weld_label("helpText")) @@ -741,6 +741,7 @@ using namespace ::com::sun::star; m_xCBOpenAfterwards->connect_toggled(LINK(this, OFinalDBPageSetup, OnOpenSelected)); m_xCBStartTableWizard->connect_toggled(LINK(this,OGenericAdministrationPage,OnControlModifiedButtonClick)); m_xRBRegisterDataSource->set_active(true); +pController->SetFinalPage(this); } OFinalDBPageSetup::~OFinalDBPageSetup() diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx index d8715bdcf984..9c3f5cb47a17 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx @@ -245,9 +245,9 @@ namespace dbaui { public: virtual boolFillItemSet ( SfxItemSet* _rCoreAttrs ) override; -static std::unique_ptr CreateFinalDBTabPageSetup(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rAttrSet); +static std::unique_ptr CreateFinalDBTabPageSetup(weld::Container* pPage, ODbTypeWizDialogSetup* pController, const SfxItemSet& _rAttrSet); -OFinalDBPageSetup(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rCoreAttrs); +OFinalDBPageSetup(weld::Container* pPage, ODbTypeWizDialogSetup* pController, const SfxItemSet& _rCoreAttrs); virtual ~OFinalDBPageSetup() override; bool IsDatabaseDocumentToBeRegistered() const; bool IsDatabaseDocumentToBeOpened() const; di
[Libreoffice-commits] core.git: sw/uiconfig
sw/uiconfig/swriter/ui/columnpage.ui |2 ++ 1 file changed, 2 insertions(+) New commits: commit e49b1917dde9f573fefc3b669c6820f51e96497f Author: Caolán McNamara AuthorDate: Sun Oct 20 18:54:37 2019 +0100 Commit: Caolán McNamara CommitDate: Sun Oct 20 21:15:21 2019 +0200 fix "invalid cast from 'GtkImage' to 'GtkLabel'" warnings Change-Id: Ic7d0457102b4077dad49d56741ca04e9afe49e8d Reviewed-on: https://gerrit.libreoffice.org/81175 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/sw/uiconfig/swriter/ui/columnpage.ui b/sw/uiconfig/swriter/ui/columnpage.ui index db7093a06bfc..9cc79dde13d2 100644 --- a/sw/uiconfig/swriter/ui/columnpage.ui +++ b/sw/uiconfig/swriter/ui/columnpage.ui @@ -453,6 +453,7 @@ False 0 True + @@ -507,6 +508,7 @@ False 0 True + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: compilerplugins/clang include/xmloff sw/source xmloff/source
compilerplugins/clang/virtualdead.unusedparams.results |3 --- include/xmloff/txtimp.hxx |2 +- sw/source/filter/xml/xmlimp.cxx|2 +- sw/source/filter/xml/xmltbli.cxx |4 ++-- sw/source/filter/xml/xmltexti.cxx |3 +-- sw/source/filter/xml/xmltexti.hxx |2 +- xmloff/source/text/XMLIndexTOCContext.cxx |4 ++-- xmloff/source/text/XMLSectionImportContext.cxx |4 ++-- xmloff/source/text/txtimp.cxx |2 +- 9 files changed, 11 insertions(+), 15 deletions(-) New commits: commit 8e4b0329dd49d79359d89d7c0209fba4072caeef Author: Noel Grandin AuthorDate: Thu Oct 17 16:08:35 2019 +0200 Commit: Noel Grandin CommitDate: Sun Oct 20 20:09:37 2019 +0200 loplugin:virtualdead unused param in RedlineAdjustStartNodeCursor Change-Id: Ic8eaad705b0cf8289035f7eee3ad01439fc24ee7 Reviewed-on: https://gerrit.libreoffice.org/81155 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/compilerplugins/clang/virtualdead.unusedparams.results b/compilerplugins/clang/virtualdead.unusedparams.results index 6a2cf9cc55f4..a22567d37cea 100644 --- a/compilerplugins/clang/virtualdead.unusedparams.results +++ b/compilerplugins/clang/virtualdead.unusedparams.results @@ -217,9 +217,6 @@ include/vcl/task.hxx:71 include/vcl/treelist.hxx:304 void SvListView::ModelIsMoving(class SvTreeListEntry *,class SvTreeListEntry *,unsigned long,) 100 -include/xmloff/txtimp.hxx:677 -void XMLTextImportHelper::RedlineAdjustStartNodeCursor(_Bool,) -0 include/xmloff/xmlimp.hxx:244 class SvXMLImportContext * SvXMLImport::CreateDocumentContext(const unsigned short,const class rtl::OUString &,const class com::sun::star::uno::Reference &,) 110 diff --git a/include/xmloff/txtimp.hxx b/include/xmloff/txtimp.hxx index 0a9108cab66c..f2db2826cf2d 100644 --- a/include/xmloff/txtimp.hxx +++ b/include/xmloff/txtimp.hxx @@ -674,7 +674,7 @@ public: /// range is not within bool bIsOutsideOfParagraph); -virtual void RedlineAdjustStartNodeCursor( bool bStart ); +virtual void RedlineAdjustStartNodeCursor(); virtual void SetShowChanges( bool bShowChanges ); virtual void SetRecordChanges( bool bRecordChanges ); virtual void SetChangesProtectionKey( diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index f940c8eb3ff1..c198632b2261 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -903,7 +903,7 @@ void SwXMLImport::endDocument() /* Was called too early. Moved from SwXMLBodyContext_Impl::EndElement */ -GetTextImport()->RedlineAdjustStartNodeCursor( false ); +GetTextImport()->RedlineAdjustStartNodeCursor(); if( (getImportFlags() & SvXMLImportFlags::CONTENT) || ((getImportFlags() & SvXMLImportFlags::MASTERSTYLES) && IsStylesOnlyMode()) ) diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index ed0049353326..b7807e0e87d6 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -1337,7 +1337,7 @@ SwXMLTableContext::SwXMLTableContext( SwXMLImport& rImport, GetImport().GetTextImport()->SetCursor( xText->createTextCursor() ); // take care of open redlines for tables -GetImport().GetTextImport()->RedlineAdjustStartNodeCursor(true); +GetImport().GetTextImport()->RedlineAdjustStartNodeCursor(); } if( pXTable ) { @@ -1388,7 +1388,7 @@ SwXMLTableContext::~SwXMLTableContext() m_pRows.reset(); // close redlines on table end nodes -GetImport().GetTextImport()->RedlineAdjustStartNodeCursor(false); +GetImport().GetTextImport()->RedlineAdjustStartNodeCursor(); } SvXMLImportContextRef SwXMLTableContext::CreateChildContext( sal_uInt16 nPrefix, diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx index 9d8fe1fdcd52..788bec5c2d47 100644 --- a/sw/source/filter/xml/xmltexti.cxx +++ b/sw/source/filter/xml/xmltexti.cxx @@ -1005,8 +1005,7 @@ void SwXMLTextImportHelper::RedlineSetCursor( // else: ignore redline (wasn't added before, else we'd have a helper) } -void SwXMLTextImportHelper::RedlineAdjustStartNodeCursor( -bool /*bStart*/) +void SwXMLTextImportHelper::RedlineAdjustStartNodeCursor() { OUString rId = GetOpenRedlineId(); if ((nullptr != pRedlineHelper) && !rId.isEmpty()) diff --git a/sw/source/filter/xml/xmltexti.hxx b/sw/source/filter/xml/xmltexti.hxx index 61b9d6cd0a5a..1aefcfe641e0 100644 --- a/sw/source/filter/xml/xmltexti.hxx +++ b/sw/source/filter/xml/xmltexti.hxx @@ -98,7 +98,7 @@ public: const OUString& rId, /// ID used to RedlineAdd() call bool bStart,/// start or end Cursor bool bIsOutsideOfParagraph) override; -virtual void RedlineAdjustStar
[Libreoffice-commits] core.git: compilerplugins/clang include/xmloff xmloff/inc xmloff/source
compilerplugins/clang/virtualdead.unusedparams.results |3 --- include/xmloff/xmlevent.hxx|4 +--- xmloff/inc/XMLScriptContextFactory.hxx |4 +--- xmloff/inc/XMLStarBasicContextFactory.hxx |4 +--- xmloff/source/script/XMLEventImportHelper.cxx |2 +- xmloff/source/script/XMLScriptContextFactory.cxx |3 +-- xmloff/source/script/XMLStarBasicContextFactory.cxx|3 +-- 7 files changed, 6 insertions(+), 17 deletions(-) New commits: commit 1db6a4c78f688e8f9af5505e691bcae079c2348f Author: Noel Grandin AuthorDate: Thu Oct 17 15:54:33 2019 +0200 Commit: Noel Grandin CommitDate: Sun Oct 20 20:09:23 2019 +0200 loplugin:virtualdead unused param in XMLEventContextFactory::CreateContext Change-Id: I6fda2e04724d69fd218ffc85f9881b429714e63b Reviewed-on: https://gerrit.libreoffice.org/81154 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/compilerplugins/clang/virtualdead.unusedparams.results b/compilerplugins/clang/virtualdead.unusedparams.results index 3ac03d4acaa3..6a2cf9cc55f4 100644 --- a/compilerplugins/clang/virtualdead.unusedparams.results +++ b/compilerplugins/clang/virtualdead.unusedparams.results @@ -220,9 +220,6 @@ include/vcl/treelist.hxx:304 include/xmloff/txtimp.hxx:677 void XMLTextImportHelper::RedlineAdjustStartNodeCursor(_Bool,) 0 -include/xmloff/xmlevent.hxx:129 -class SvXMLImportContext * XMLEventContextFactory::CreateContext(class SvXMLImport &,unsigned short,const class rtl::OUString &,const class com::sun::star::uno::Reference &,class XMLEventsImportContext *,const class rtl::OUString &,const class rtl::OUString &,) -110 include/xmloff/xmlimp.hxx:244 class SvXMLImportContext * SvXMLImport::CreateDocumentContext(const unsigned short,const class rtl::OUString &,const class com::sun::star::uno::Reference &,) 110 diff --git a/include/xmloff/xmlevent.hxx b/include/xmloff/xmlevent.hxx index b0fa87403f62..5907d7acb4e6 100644 --- a/include/xmloff/xmlevent.hxx +++ b/include/xmloff/xmlevent.hxx @@ -134,9 +134,7 @@ public: /// the context for the enclosing element XMLEventsImportContext* rEvents, /// the event name (as understood by the API) -const OUString& rApiEventName, -/// the event type name (as registered) -const OUString& rApiLanguage) = 0; +const OUString& rApiEventName) = 0; }; diff --git a/xmloff/inc/XMLScriptContextFactory.hxx b/xmloff/inc/XMLScriptContextFactory.hxx index 07027dcf16cd..029c404f00b8 100644 --- a/xmloff/inc/XMLScriptContextFactory.hxx +++ b/xmloff/inc/XMLScriptContextFactory.hxx @@ -45,9 +45,7 @@ public: /// the context for the enclosing element XMLEventsImportContext * rEvents, /// the event name (as understood by the API) - const OUString & rApiEventName, - /// the event type name (as registered) - const OUString & rLanguage) override; + const OUString & rApiEventName) override; }; #endif // INCLUDED_XMLOFF_INC_XMLSCRIPTCONTEXTFACTORY_HXX diff --git a/xmloff/inc/XMLStarBasicContextFactory.hxx b/xmloff/inc/XMLStarBasicContextFactory.hxx index 5ac877eacb69..8bce42b86bad 100644 --- a/xmloff/inc/XMLStarBasicContextFactory.hxx +++ b/xmloff/inc/XMLStarBasicContextFactory.hxx @@ -45,9 +45,7 @@ public: /// the context for the enclosing element XMLEventsImportContext* rEvents, /// the event name (as understood by the API) -const OUString& rApiEventName, -/// the event type name (as registered) -const OUString& rLanguage) override; +const OUString& rApiEventName) override; }; #endif diff --git a/xmloff/source/script/XMLEventImportHelper.cxx b/xmloff/source/script/XMLEventImportHelper.cxx index 42788bb1e0b2..1e2c39e144ae 100644 --- a/xmloff/source/script/XMLEventImportHelper.cxx +++ b/xmloff/source/script/XMLEventImportHelper.cxx @@ -133,7 +133,7 @@ SvXMLImportContext* XMLEventImportHelper::CreateContext( // delegate to factory pContext = aFactoryIterator->second->CreateContext( rImport, nPrefix, rLocalName, xAttrList, -rEvents, aNameIter->second, aScriptLanguage); +rEvents, aNameIter->second); } } diff --git a/xmloff/source/script/XMLScriptContextFactory.cxx b/xmloff/source/script/XMLScriptContextFactory.cxx index 6fbbf53a7ebf..35b13d0ed95a 100644 --- a/xmloff/source/script/XMLScriptContextFactory.cxx +++ b/xmloff/source/script/XMLScriptContextFactory.cxx @@ -50,8 +50,7 @@ SvXMLImportContext * XMLScriptContextFactory::CreateContext const OUString & rLocalName, const Reference & xAttrList, XMLEventsImportContext * rEvents, - const OUString & rApiEventName, - const OUString & /*rApiLanguage*/) + const OUString & rApiEventName) { OUString sURLVa
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx |6 -- dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx |6 +++--- dbaccess/source/ui/dlg/dbwizsetup.cxx |8 ++-- dbaccess/source/ui/inc/dbwizsetup.hxx |2 ++ 4 files changed, 15 insertions(+), 7 deletions(-) New commits: commit 4dde0d06bdc00c3783cfe94e8f918a8913274c4e Author: Caolán McNamara AuthorDate: Sun Oct 20 15:55:23 2019 +0100 Commit: Caolán McNamara CommitDate: Sun Oct 20 19:16:47 2019 +0200 cid#1453991 Wrapper object use after free Change-Id: I4ea3ed40deaf20e91e1a0a42ee115cf761853875 Reviewed-on: https://gerrit.libreoffice.org/81170 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx index 5172e0126e65..98c5b890252a 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx @@ -53,6 +53,7 @@ #include "finteraction.hxx" #include #include +#include #include "TextConnectionHelper.hxx" #include @@ -219,12 +220,12 @@ using namespace ::com::sun::star; OGenericAdministrationPage::callModifiedHdl(); } -std::unique_ptr OMySQLIntroPageSetup::CreateMySQLIntroTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rAttrSet) +std::unique_ptr OMySQLIntroPageSetup::CreateMySQLIntroTabPage(weld::Container* pPage, ODbTypeWizDialogSetup* pController, const SfxItemSet& rAttrSet) { return std::make_unique(pPage, pController, rAttrSet); } -OMySQLIntroPageSetup::OMySQLIntroPageSetup(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rCoreAttrs) +OMySQLIntroPageSetup::OMySQLIntroPageSetup(weld::Container* pPage, ODbTypeWizDialogSetup* pController, const SfxItemSet& _rCoreAttrs) : OGenericAdministrationPage(pPage, pController, "dbaccess/ui/dbwizmysqlintropage.ui", "DBWizMysqlIntroPage", _rCoreAttrs) , m_xODBCDatabase(m_xBuilder->weld_radio_button("odbc")) , m_xJDBCDatabase(m_xBuilder->weld_radio_button("jdbc")) @@ -233,6 +234,7 @@ using namespace ::com::sun::star; m_xODBCDatabase->connect_toggled(LINK(this, OMySQLIntroPageSetup, OnSetupModeSelected)); m_xJDBCDatabase->connect_toggled(LINK(this, OMySQLIntroPageSetup, OnSetupModeSelected)); m_xNATIVEDatabase->connect_toggled(LINK(this, OMySQLIntroPageSetup, OnSetupModeSelected)); +pController->SetIntroPage(this); } OMySQLIntroPageSetup::~OMySQLIntroPageSetup() diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx index 422500e19938..d8715bdcf984 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx @@ -31,8 +31,8 @@ #include namespace dbaui - { +class ODbTypeWizDialogSetup; // OSpreadSheetConnectionPageSetup class OSpreadSheetConnectionPageSetup final : public OConnectionTabPageSetup @@ -197,10 +197,10 @@ namespace dbaui VIA_NATIVE }; -OMySQLIntroPageSetup(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreAttrs); +OMySQLIntroPageSetup(weld::Container* pPage, ODbTypeWizDialogSetup* pController, const SfxItemSet& rCoreAttrs); virtual ~OMySQLIntroPageSetup() override; -static std::unique_ptr CreateMySQLIntroTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rAttrSet); +static std::unique_ptr CreateMySQLIntroTabPage(weld::Container* pPage, ODbTypeWizDialogSetup* pController, const SfxItemSet& rAttrSet); ConnectionType getMySQLMode() const; voidSetClickHdl( const Link& rLink ) { maClickHdl = rLink; } diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx index a68ec099e218..e85971a64cb1 100644 --- a/dbaccess/source/ui/dlg/dbwizsetup.cxx +++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx @@ -446,6 +446,12 @@ void ODbTypeWizDialogSetup::clearPassword() m_pImpl->clearPassword(); } +void ODbTypeWizDialogSetup::SetIntroPage(OMySQLIntroPageSetup* pPage) +{ +m_pMySQLIntroPage = pPage; +m_pMySQLIntroPage->SetClickHdl(LINK( this, ODbTypeWizDialogSetup, ImplClickHdl ) ); +} + std::unique_ptr ODbTypeWizDialogSetup::createPage(WizardState _nState) { std::unique_ptr xPage; @@ -515,8 +521,6 @@ std::unique_ptr ODbTypeWizDialogSetup::createPage(WizardState _nSta break; case PAGE_DBSETUPWIZARD_MYSQL_INTRO: xPage = OMySQLIntroPageSetup::CreateMySQLIntroTabPage(pPageContainer, this, *m_pOutSet); -m_pMySQLIntroPage = static_cast(xPage.get()); -m_pMySQLIntroPage->SetClickHdl(LINK( this, ODbTypeWizDialogSetup, Imp
[Libreoffice-commits] core.git: sc/source
sc/source/filter/excel/xipivot.cxx |4 1 file changed, 4 insertions(+) New commits: commit 7b96f6252b02074f20dc99215339f62f21c86399 Author: Caolán McNamara AuthorDate: Sun Oct 20 16:42:10 2019 +0100 Commit: Caolán McNamara CommitDate: Sun Oct 20 19:15:43 2019 +0200 ofz#18301 Timeout in xlsfuzzer Change-Id: I7e18899fe2c0ef2d1b553bbbaab383e7ea9f1451 Reviewed-on: https://gerrit.libreoffice.org/81171 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/sc/source/filter/excel/xipivot.cxx b/sc/source/filter/excel/xipivot.cxx index 37ca835669b7..62a9e10ff2dd 100644 --- a/sc/source/filter/excel/xipivot.cxx +++ b/sc/source/filter/excel/xipivot.cxx @@ -29,6 +29,7 @@ #include #include #include +#include #include #include @@ -1409,6 +1410,9 @@ void XclImpPivotTable::Convert() if( !mxPCache || !mxPCache->IsValid() ) return; +if (utl::ConfigManager::IsFuzzing()) //just too slow +return; + ScDPSaveData aSaveData; // *** global settings *** ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7562be3f0a1483d65078842da2b18aa8cf0c177b Author: Olivier Hallot AuthorDate: Sun Oct 20 13:25:27 2019 -0300 Commit: Gerrit Code Review CommitDate: Sun Oct 20 19:07:36 2019 +0200 Update git submodules * Update helpcontent2 from branch 'master' - Reduce string repetition in XForm Help page Change-Id: I929b44f50e430a61262e570ac745818806e99b67 Reviewed-on: https://gerrit.libreoffice.org/81172 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 5eb66f297b2b..7c3eed27fda4 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 5eb66f297b2b67b0ff3b06fc027c22875f0b198a +Subproject commit 7c3eed27fda495e3b373623eb723cccb690a1470 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/01/xformsdataadd.xhp |6 -- 1 file changed, 4 insertions(+), 2 deletions(-) New commits: commit 7c3eed27fda495e3b373623eb723cccb690a1470 Author: Olivier Hallot AuthorDate: Sun Oct 20 13:25:27 2019 -0300 Commit: Olivier Hallot CommitDate: Sun Oct 20 19:07:36 2019 +0200 Reduce string repetition in XForm Help page Change-Id: I929b44f50e430a61262e570ac745818806e99b67 Reviewed-on: https://gerrit.libreoffice.org/81172 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/01/xformsdataadd.xhp b/source/text/shared/01/xformsdataadd.xhp index a22eb22bf..18d488204 100644 --- a/source/text/shared/01/xformsdataadd.xhp +++ b/source/text/shared/01/xformsdataadd.xhp @@ -63,7 +63,9 @@ Specifies if the item must be included on the XForm. + The Condition button opens the Add Condition dialog where you can enter used namespaces and full XPath expressions. + @@ -71,7 +73,7 @@ Declares the item as relevant. - The Condition button opens the Add Condition dialog where you can enter used namespaces and full XPath expressions. + @@ -87,7 +89,7 @@ Declares the item as read-only. - The Condition button opens the Add Condition dialog where you can enter used namespaces and full XPath expressions. + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Unit Test: CppunitTest_sc_opencl_test failing on Windows
Hi Luke, On Sun, Oct 20, 2019 at 10:09 PM Luke Benes wrote: > After > https://cgit.freedesktop.org/libreoffice/core/commit/?id=4ee424b3ddc6 > Pre-allocate an ScInterpreter object for each thread... > > Both 32 and 64-bit windows builds are failing with the following error: > D:/lode/dev/core/sc/qa/unit/opencl-test.cxx(573) : error : Assertion > Test name: ScOpenCLTest::testCompilerNested > double equality assertion failed > - Expected: 629 > - Actual : 609 > - Delta : 0.0629 > > You can limit the execution to just one particular test by: > > make CppunitTest_sc_opencl_test CPPUNIT_TEST_NAME="testXYZ" > > > Dennis, Could you take a look at this? > Sure, I will look into this tomorrow. Thanks a lot for testing. Thanks, Dennis ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Unit Test: CppunitTest_sc_opencl_test failing on Windows
After https://cgit.freedesktop.org/libreoffice/core/commit/?id=4ee424b3ddc6 Pre-allocate an ScInterpreter object for each thread... Both 32 and 64-bit windows builds are failing with the following error: D:/lode/dev/core/sc/qa/unit/opencl-test.cxx(573) : error : Assertion Test name: ScOpenCLTest::testCompilerNested double equality assertion failed - Expected: 629 - Actual : 609 - Delta : 0.0629 D:/lode/dev/core/sc/qa/unit/opencl-test.cxx(590) : error : Assertion Test name: ScOpenCLTest::testCompilerString double equality assertion failed - Expected: 2 - Actual : 1 - Delta : 0.0002 D:/lode/dev/core/sc/qa/unit/opencl-test.cxx(611) : error : Assertion Test name: ScOpenCLTest::testCompilerInEq double equality assertion failed - Expected: 2 - Actual : 4 - Delta : 0.0002 Failures !!! Run: 223 Failure total: 3 Failures: 3 Errors: 0 You can limit the execution to just one particular test by: make CppunitTest_sc_opencl_test CPPUNIT_TEST_NAME="testXYZ" Dennis, Could you take a look at this? Thanks! ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: filter/source
filter/source/graphicfilter/ipict/ipict.cxx | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) New commits: commit cf0f5d056efe28eb6177fbcfb80efe3337e5c5f2 Author: Caolán McNamara AuthorDate: Sun Oct 20 15:40:45 2019 +0100 Commit: Caolán McNamara CommitDate: Sun Oct 20 17:25:24 2019 +0200 cid#1441466 silence Untrusted loop bound Change-Id: I692f591cb3bee63ec0a0a77b3d9a4a54973451ad Reviewed-on: https://gerrit.libreoffice.org/81169 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx index 560841037b98..e2d0e9cacd3d 100644 --- a/filter/source/graphicfilter/ipict/ipict.cxx +++ b/filter/source/graphicfilter/ipict/ipict.cxx @@ -1094,14 +1094,14 @@ sal_uLong PictReader::ReadPixMapEtc( BitmapEx &rBitmap, bool bBaseAddr, bool bCo nByteCount++; } size_t i = 0; -while (i < nByteWidth) +while (i < aScanline.size()) { pPict->ReadUChar( nFlagCounterByte ); if ( ( nFlagCounterByte & 0x80 ) == 0) { nCount = static_cast(nFlagCounterByte) + 1; -if ((i + nCount) > nByteWidth) -nCount = nByteWidth - i; +if ((i + nCount) > aScanline.size()) +nCount = aScanline.size() - i; if (pPict->remainingSize() < nCount) return 0x; while( nCount-- ) @@ -1115,8 +1115,8 @@ sal_uLong PictReader::ReadPixMapEtc( BitmapEx &rBitmap, bool bBaseAddr, bool bCo if (pPict->remainingSize() < 1) return 0x; nCount = ( 1 - sal_Int16( static_cast(nFlagCounterByte) | 0xff00 ) ); -if (( i + nCount) > nByteWidth) -nCount = nByteWidth - i; +if (( i + nCount) > aScanline.size()) +nCount = aScanline.size() - i; pPict->ReadUChar( nDat ); while( nCount-- ) aScanline[ i++ ] = nDat; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
oox export of chart transparency
Hi all, in connection with discussions in bug 108065, I looked at the export of transparency in charts. https://bugs.documentfoundation.org/show_bug.cgi?id=108065 [FILESAVE DOCX] Gradient property of the data series not preserved when saved as DOCX The problem has several reasons a) void DrawingML::WriteGradientFill(awt::Gradient rGradient, const uno::Reference& rXPropSet) expects a property "FillTransparenceGradient" but in charts only "FillTransparenceGradientName" is available. b) void ChartExport::exportFill( const Reference< XPropertySet >& xPropSet ) does not consider transparency gradient in case of solid fill. c) import of a chart considers transparency only on data point filling. What I have done so far is in https://gerrit.libreoffice.org/#/c/81165/1 My questions: To get a gradient form "FillTransparenceGradientName", I have found "com.sun.star.drawing.TransparencyGradientTable". To use it, I need a model. That is available in class ChartExport, but not in the base class DrawingML. Is there a way to get the gradient itself from its name in DrawingML::WriteGradientFill()? My idea for the export works for charts in Calc and Writer. But any (e.g. a default shape without any gradient or transparency) export from odp to pptx crashes. So I'm doing something fundamental wrong. But what? Kind regards Regina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - sc/source
sc/source/filter/lotus/op.cxx | 15 +++ sc/source/ui/dbgui/csvruler.cxx |4 2 files changed, 11 insertions(+), 8 deletions(-) New commits: commit 531600e390ec14f5ac39979d8234283993a85ef9 Author: Caolán McNamara AuthorDate: Sun Oct 20 12:30:32 2019 +0100 Commit: Caolán McNamara CommitDate: Sun Oct 20 16:22:35 2019 +0200 cid#1448338 Untrusted value as argument Change-Id: Ifba1ab62cb7681a5fba2e50fb74870e234f14769 Reviewed-on: https://gerrit.libreoffice.org/81161 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/sc/source/filter/lotus/op.cxx b/sc/source/filter/lotus/op.cxx index a9a3ba9692f6..b59550f80338 100644 --- a/sc/source/filter/lotus/op.cxx +++ b/sc/source/filter/lotus/op.cxx @@ -576,12 +576,9 @@ void OP_SheetName123(LotusContext& rContext, SvStream& rStream, sal_uInt16 nLeng } // B0 36 [sheet number (2 bytes?)] [sheet name (null terminated char array)] - -sal_uInt16 nDummy; -rStream.ReadUInt16( nDummy ); // ignore the first 2 bytes (B0 36). -rStream.ReadUInt16( nDummy ); -SCTAB nSheetNum = static_cast(nDummy); -rContext.pDoc->MakeTable(nSheetNum); +rStream.SeekRel(2); // ignore the first 2 bytes (B0 36). +sal_uInt16 nSheetNum(0); +rStream.ReadUInt16(nSheetNum); ::std::vector sSheetName; sSheetName.reserve(nLength-4); @@ -592,10 +589,12 @@ void OP_SheetName123(LotusContext& rContext, SvStream& rStream, sal_uInt16 nLeng sSheetName.push_back(c); } +if (!ValidTab(nSheetNum)) +return; + +rContext.pDoc->MakeTable(nSheetNum); if (!sSheetName.empty()) { -if (!ValidTab(nSheetNum) || nSheetNum >= rContext.pDoc->GetTableCount()) -return; OUString aName(sSheetName.data(), strlen(sSheetName.data()), rContext.eCharVon); rContext.pDoc->RenameTab(nSheetNum, aName); } commit dbf445b69100c4cb931179abc316a456e02a60df Author: Caolán McNamara AuthorDate: Sun Oct 20 12:17:55 2019 +0100 Commit: Caolán McNamara CommitDate: Sun Oct 20 16:22:22 2019 +0200 cid#1454871 uninitialized member Change-Id: Ice63beecf4adf0a0799efee09ffb77d85996345b Reviewed-on: https://gerrit.libreoffice.org/81160 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/sc/source/ui/dbgui/csvruler.cxx b/sc/source/ui/dbgui/csvruler.cxx index 2812f1a5ffbc..294f22526974 100644 --- a/sc/source/ui/dbgui/csvruler.cxx +++ b/sc/source/ui/dbgui/csvruler.cxx @@ -94,6 +94,10 @@ ScCsvRuler::ScCsvRuler(ScCsvLayoutData& rData, ScCsvTableBox* pTableBox) : ScCsvControl(rData) , mpTableBox(pTableBox) , mnPosCursorLast(1) +, mnPosMTStart(0) +, mnPosMTCurr(0) +, mbPosMTMoved(false) +, mnSplitSize(0) , mbTracking(false) { } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/rangeutl.hxx |2 +- sc/source/core/tool/rangeutl.cxx|1 - sc/source/ui/app/inputwin.cxx |1 - sc/source/ui/dbgui/consdlg.cxx | 10 -- sc/source/ui/inc/consdlg.hxx|1 - sc/source/ui/miscdlgs/anyrefdg.cxx |1 - sc/source/ui/miscdlgs/optsolver.cxx |1 - sc/source/ui/unoobj/cellsuno.cxx|1 - sc/source/ui/unoobj/docuno.cxx |1 - sc/source/ui/view/tabvwsh3.cxx |1 - 10 files changed, 5 insertions(+), 15 deletions(-) New commits: commit ae453b7018f2fa1a0f0bc37c0557bd4e2eae9a71 Author: Mike Kaganski AuthorDate: Sun Oct 20 14:33:35 2019 +0300 Commit: Mike Kaganski CommitDate: Sun Oct 20 14:44:06 2019 +0200 ScRangeUtil is utility class; don't instantiate it Change-Id: Id5bf48b62c644fa3c37faf324b9f5b971ca18557 Reviewed-on: https://gerrit.libreoffice.org/81162 Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/sc/inc/rangeutl.hxx b/sc/inc/rangeutl.hxx index 54aba7bf817c..a6e395a38b26 100644 --- a/sc/inc/rangeutl.hxx +++ b/sc/inc/rangeutl.hxx @@ -38,7 +38,7 @@ enum RutlNameScope { RUTL_NONE=0, RUTL_NAMES, RUTL_DBASE }; class SC_DLLPUBLIC ScRangeUtil { public: -ScRangeUtil() {} +ScRangeUtil() = delete; static bool MakeArea( const OUString& rAreaStr, ScArea& rArea, diff --git a/sc/source/core/tool/rangeutl.cxx b/sc/source/core/tool/rangeutl.cxx index aed6ed61e5b1..a2d146ff694b 100644 --- a/sc/source/core/tool/rangeutl.cxx +++ b/sc/source/core/tool/rangeutl.cxx @@ -241,7 +241,6 @@ bool ScRangeUtil::MakeRangeFromName ( ScAddress::Details const & rDetails ) { bool bResult = false; -ScRangeUtil aRangeUtil; SCTAB nTab = 0; SCCOL nColStart = 0; SCCOL nColEnd = 0; diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index 4ff8735e0950..6e8ee9bc2cb6 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -2161,7 +2161,6 @@ static ScNameInputType lcl_GetInputType( const OUString& rText ) ScRange aRange; ScAddress aAddress; -ScRangeUtil aRangeUtil; SCTAB nNameTab; sal_Int32 nNumeric; diff --git a/sc/source/ui/dbgui/consdlg.cxx b/sc/source/ui/dbgui/consdlg.cxx index 3cb87621353e..3378a92f8bb8 100644 --- a/sc/source/ui/dbgui/consdlg.cxx +++ b/sc/source/ui/dbgui/consdlg.cxx @@ -76,7 +76,6 @@ ScConsolidateDlg::ScConsolidateDlg(SfxBindings* pB, SfxChildWindow* pCW, weld::W GetViewData() ) , pDoc( static_cast(SfxViewShell::Current())-> GetViewData().GetDocument() ) -, pRangeUtil ( new ScRangeUtil ) , nAreaDataCount ( 0 ) , nWhichCons ( rArgSet.GetPool()->GetWhich( SID_CONSOLIDATE ) ) , bDlgLostFocus ( false ) @@ -109,7 +108,7 @@ ScConsolidateDlg::~ScConsolidateDlg() void ScConsolidateDlg::Init() { -OSL_ENSURE( pDoc && pRangeUtil, "Error in Ctor" ); +OSL_ENSURE( pDoc, "Error in Ctor" ); OUString aStr; sal_uInt16 i=0; @@ -215,7 +214,7 @@ void ScConsolidateDlg::FillAreaLists() m_xLbDataArea->append_text( aStrUndefined ); m_xLbDestArea->append_text( aStrUndefined ); -if ( pRangeUtil && pAreaData && (nAreaDataCount > 0) ) +if ( pAreaData && (nAreaDataCount > 0) ) { for ( size_t i=0; (i 0) +if ( (nSelPos > 0) && (nAreaDataCount > 0) && (pAreaData != nullptr) ) { diff --git a/sc/source/ui/inc/consdlg.hxx b/sc/source/ui/inc/consdlg.hxx index 067944402a18..9d292c156e4a 100644 --- a/sc/source/ui/inc/consdlg.hxx +++ b/sc/source/ui/inc/consdlg.hxx @@ -49,7 +49,6 @@ private: ScConsolidateParam const theConsData; ScViewData& rViewData; ScDocument* const pDoc; -std::unique_ptr pRangeUtil; std::unique_ptr pAreaData; size_t nAreaDataCount; sal_uInt16 const nWhichCons; diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx index 3a21ac941788..406c9bf57cdb 100644 --- a/sc/source/ui/miscdlgs/anyrefdg.cxx +++ b/sc/source/ui/miscdlgs/anyrefdg.cxx @@ -144,7 +144,6 @@ bool ScFormulaReferenceHelper::ParseWithNames( ScRangeList& rRanges, const OUStr return true; ScAddress::Details aDetails(pDoc->GetAddressConvention(), 0, 0); -ScRangeUtil aRangeUtil; bool bError = false; sal_Int32 nIdx {0}; diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx index 12c26f40fc22..e7ff94257ee0 100644 --- a/sc/source/ui/miscdlgs/optsolver.cxx +++ b/sc/source/ui/miscdlgs/optsolver.cxx @@ -748,7 +748,6 @@ void ScOptSolverDlg::ShowError( bool bCondition, formula::RefEdit* pFocus ) bool ScOptSolverDlg::ParseRef( ScRange& rRange, const OUString& rInput, bool bAllowRange ) { -ScRangeUtil aRangeUtil; ScAddress::Details aDetails(m
[Libreoffice-commits] help.git: help3xsl/links.txt.xsl
help3xsl/links.txt.xsl | 24 +--- 1 file changed, 17 insertions(+), 7 deletions(-) New commits: commit 5eb66f297b2b67b0ff3b06fc027c22875f0b198a Author: Olivier Hallot AuthorDate: Sun Oct 20 08:04:44 2019 -0300 Commit: Olivier Hallot CommitDate: Sun Oct 20 14:40:22 2019 +0200 Update icon replacement table Change-Id: I4a83337dea81a6bda5d464a305e02ad65ee5a97d Reviewed-on: https://gerrit.libreoffice.org/81159 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/help3xsl/links.txt.xsl b/help3xsl/links.txt.xsl index 93e1cef22..7a8cbada1 100644 --- a/help3xsl/links.txt.xsl +++ b/help3xsl/links.txt.xsl @@ -239,14 +239,12 @@ cmd/sc_alignhorizontalcenter.png cmd/lc_graphicfiltersmooth.png cmd/lc_graphicfilterinvert.png -cmd/lc_graphicfilterinvert.png cmd/lc_graphicdialog.png cmd/lc_graphicfilterinvert.png cmd/lc_graphicdialog.png cmd/lc_insertcaptiondialog.png cmd/sc_graphicfiltersmooth.png cmd/sc_graphicfilterinvert.png -cmd/sc_graphicfilterinvert.png cmd/sc_graphicdialog.png cmd/sc_graphicfilterinvert.png cmd/sc_graphicdialog.png @@ -1006,7 +1004,7 @@ cmd/sc_grafred.png cmd/sc_grafgreen.png cmd/sc_grafblue.png -cmd/sc_graphicfilterinvert.png +cmd/sc_grafgamma.png cmd/sc_graftransparence.png cmd/sc_helpindex.png cmd/sc_open.png @@ -1269,14 +1267,14 @@ cmd/sc_grafblue.png cmd/sc_grafgreen.png cmd/sc_grafred.png -cmd/sc_graphicfilterinvert.png +cmd/sc_grafgamma.png cmd/lc_spacepara1.png cmd/lc_spacepara1.png cmd/lc_spacepara15.png cmd/lc_spacepara2.png cmd/lc_spacepara1.png cmd/sc_grafblue.png -cmd/sc_graphicfilterinvert.png +cmd/sc_grafgamma.png cmd/sc_grafgreen.png cmd/sc_grafred.png cmd/sc_backgroundcolor.png @@ -1288,7 +1286,7 @@ cmd/lc_cancel.png cmd/lc_ok.png cmd/sc_inserttable.png -cmd/sc_text.png +cmd/sc_insertframe.png cmd/sc_insertgraphic.png cmd/sc_insertobject.png cmd/sc_insertbookmark.png @@ -1333,7 +1331,7 @@ cmd/sc_downsearch.png cmd/sc_upsearch.png cmd/sc_inserttable.png -cmd/sc_text.png +cmd/sc_insertframe.png cmd/sc_showsinglepage.png cmd/sc_insertdraw.png cmd/sc_choosecontrols.png @@ -1405,6 +1403,18 @@ cmd/sc_drawchart.png cmd/sc_insertfixedtext.png cmd/lc_insertfixedtext.png +cmd/32/edit.png +cmd/32/checkbox.png +cmd/32/combobox.png +cmd/32/datefield.png +cmd/lc_edit.png +cmd/lc_checkbox.png +cmd/lc_combobox.png +cmd/lc_datefield.png +cmd/sc_edit.png +cmd/sc_checkbox.png +cmd/sc_combobox.png +cmd/sc_datefield.png cmd/32/paralefttoright.png cmd/32/pararighttoleft.png cmd/32/animationeffects.png ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ca26cf32ce927d89e3c5403bae49f5953f36cae4 Author: Olivier Hallot AuthorDate: Sun Oct 20 08:04:44 2019 -0300 Commit: Gerrit Code Review CommitDate: Sun Oct 20 14:40:22 2019 +0200 Update git submodules * Update helpcontent2 from branch 'master' - Update icon replacement table Change-Id: I4a83337dea81a6bda5d464a305e02ad65ee5a97d Reviewed-on: https://gerrit.libreoffice.org/81159 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index feabf2f3a4c1..5eb66f297b2b 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit feabf2f3a4c1d749f7b768509585431fa60b83a4 +Subproject commit 5eb66f297b2b67b0ff3b06fc027c22875f0b198a ___ 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/core/tool/rangeutl.cxx |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit f99982a40fda08a037083f4b942ffb349d76e939 Author: Mike Kaganski AuthorDate: Sun Oct 20 12:51:12 2019 +0200 Commit: Mike Kaganski CommitDate: Sun Oct 20 14:26:10 2019 +0200 Avoid converting same string to uppercase twice Change-Id: I8f6be79525f1383bc27eb799efbaa1009cbaed50 Reviewed-on: https://gerrit.libreoffice.org/81153 Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/sc/source/core/tool/rangeutl.cxx b/sc/source/core/tool/rangeutl.cxx index aa2c519cd4aa..aed6ed61e5b1 100644 --- a/sc/source/core/tool/rangeutl.cxx +++ b/sc/source/core/tool/rangeutl.cxx @@ -268,10 +268,11 @@ bool ScRangeUtil::MakeRangeFromName ( //then check for local range names ScRangeName* pRangeNames = pDoc->GetRangeName( nTable ); ScRangeData* pData = nullptr; +aName = ScGlobal::pCharClass->uppercase(aName); if ( pRangeNames ) -pData = pRangeNames->findByUpperName(ScGlobal::pCharClass->uppercase(aName)); +pData = pRangeNames->findByUpperName(aName); if (!pData) -pData = pDoc->GetRangeName()->findByUpperName(ScGlobal::pCharClass->uppercase(aName)); +pData = pDoc->GetRangeName()->findByUpperName(aName); if (pData) { OUString aStrArea; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit aaf1361032277e3174a4facac55d1df92c4313cf Author: Olivier Hallot AuthorDate: Sun Oct 20 06:37:01 2019 -0300 Commit: Gerrit Code Review CommitDate: Sun Oct 20 12:32:19 2019 +0200 Update git submodules * Update helpcontent2 from branch 'master' - Fix last D'oh! errors in Help page Change-Id: I2cbeac04cb0434292f32e981b92f58a6bd7a9560 Reviewed-on: https://gerrit.libreoffice.org/81152 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index ba7142303144..feabf2f3a4c1 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit ba714230314482bf2bc11680a0694a3388c1ddd7 +Subproject commit feabf2f3a4c1d749f7b768509585431fa60b83a4 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/02/0117.xhp |4 ++-- source/text/swriter/main0120.xhp | 18 +- 2 files changed, 11 insertions(+), 11 deletions(-) New commits: commit feabf2f3a4c1d749f7b768509585431fa60b83a4 Author: Olivier Hallot AuthorDate: Sun Oct 20 06:37:01 2019 -0300 Commit: Olivier Hallot CommitDate: Sun Oct 20 12:32:19 2019 +0200 Fix last D'oh! errors in Help page Change-Id: I2cbeac04cb0434292f32e981b92f58a6bd7a9560 Reviewed-on: https://gerrit.libreoffice.org/81152 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/02/0117.xhp b/source/text/shared/02/0117.xhp index d192476c3..afaabb620 100644 --- a/source/text/shared/02/0117.xhp +++ b/source/text/shared/02/0117.xhp @@ -361,11 +361,11 @@ -Image Buttonmore controls bar +Image Buttonmore controls bar - Icon + Icon image button Creates a button displayed as an image. Aside from the graphic representation, an image button has the same properties as a "normal" button. diff --git a/source/text/swriter/main0120.xhp b/source/text/swriter/main0120.xhp index b72ef6091..4884eb799 100644 --- a/source/text/swriter/main0120.xhp +++ b/source/text/swriter/main0120.xhp @@ -18,12 +18,12 @@ -Form +Form Contains commands for activate form design mode, open control wizards and insert form controls in your text document. -Design Mode +Design Mode Enable or disable form design mode. -Control Wizards +Control Wizards Enable or disable control wizards. @@ -31,21 +31,21 @@ - + -More fields +More fields Date, time, numerical, currency and pattern form fields. - + - - + + -Automatic Control Focus +Automatic Control Focus Enable or disable Automatic Control Focus ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/qa
sal/qa/rtl/uri/rtl_testuri.cxx | 18 ++ 1 file changed, 6 insertions(+), 12 deletions(-) New commits: commit ad936dea0829fa15ef2d55e180cd55327f282512 Author: Stephan Bergmann AuthorDate: Sat Oct 19 21:07:23 2019 +0200 Commit: Stephan Bergmann CommitDate: Sun Oct 20 12:09:50 2019 +0200 Replace some uses of OUStringChar with string literals (At least MSVC++ 14.14, aka Visual Studio 2017 version 15.7, apparently requires `"\xDFFF"` to be written with a `u` prefix in the concatenated string literal u"\xD800" "\U000103FF" "\xDFFF" "A" to avoid "error C2022: '57343': too big for character", so prefix all the individual string literals in such concatenations, even if that should be redundant.) Change-Id: Ief69e6c7ae71fe2c4c9c56c38fab0bc782ceb82c Reviewed-on: https://gerrit.libreoffice.org/81142 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/sal/qa/rtl/uri/rtl_testuri.cxx b/sal/qa/rtl/uri/rtl_testuri.cxx index b69013e1ed36..fc7e1d30a751 100644 --- a/sal/qa/rtl/uri/rtl_testuri.cxx +++ b/sal/qa/rtl/uri/rtl_testuri.cxx @@ -181,11 +181,10 @@ void Test::test_Uri() { // Check surrogate handling: -aText1 = OUStringChar(u'\xD800') + // %ED%A0%80 - OUStringChar(u'\xD800') + // %F0%90%8F%BF - OUStringChar(u'\xDFFF') + - OUStringChar(u'\xDFFF') + // %ED%BF%BF - "A"; // A +aText1 = u"\xD800" // %ED%A0%80 + u"\U000103FF" // 0xD800,0xDFFF -> %F0%90%8F%BF + u"\xDFFF" // %ED%BF%BF + u"A"; // A aText2 = "%ED%A0%80" "%F0%90%8F%BF" "%ED%BF%BF" "A"; CPPUNIT_ASSERT_EQUAL_MESSAGE( "failure 11", @@ -207,11 +206,7 @@ void Test::test_Uri() { RTL_TEXTENCODING_UTF8)); aText1 = "%ed%a0%80" "%f0%90%8f%bf" "%ed%bf%bf" "A"; -aText2 = "%ED%A0%80" + - OUStringChar(u'\xD800') + - OUStringChar(u'\xDFFF') + - "%ED%BF%BF" - "A"; +aText2 = u"%ED%A0%80" u"\U000103FF" u"%ED%BF%BF" u"A"; CPPUNIT_ASSERT_EQUAL_MESSAGE( "failure 14", aText2, @@ -247,8 +242,7 @@ void Test::test_Uri() { // Check IURI handling: aText1 = "%30%C3%BF"; -aText2 = "%30" + - OUStringChar(u'\x00FF'); +aText2 = u"%30\u00FF"; CPPUNIT_ASSERT_EQUAL_MESSAGE( "failure 18", aText2, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-6.0-29-20191019'
Tag 'cp-6.0-29-20191019' created by Andras Timar at 2019-10-20 09:50 + cp-6.0-29-20191019 Changes since cp-6.0-29-20190912-21: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-6.0-29-20191019'
Tag 'cp-6.0-29-20191019' created by Andras Timar at 2019-10-20 09:50 + cp-6.0-29-20191019 Changes since co-6.0-24: Andras Timar (1): tdf#123500 double '~' character in translation --- source/fr/officecfg/registry/data/org/openoffice/Office/UI.po |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-6.0-29-20191019'
Tag 'cp-6.0-29-20191019' created by Andras Timar at 2019-10-20 09:50 + cp-6.0-29-20191019 Changes since cp-6.0-19: Andras Timar (1): remove executable bit from *.aff and *.dic files --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/cp-6.0-29-20191019'
Tag 'cp-6.0-29-20191019' created by Andras Timar at 2019-10-20 09:50 + cp-6.0-29-20191019 Changes since cp-6.0-7: Adolfo Jayme Barrientos (1): .howtoget, now more Collabora-y --- help3xsl/default.css |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Changes to 'refs/tags/cp-4.0.8-1'
Tag 'cp-4.0.8-1' created by Andras Timar at 2019-10-20 09:48 + cp-4.0.8-1 Changes since cp-4.0.7-1-45: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: i18npool/source
i18npool/source/transliteration/transliteration_body.cxx | 12 +++- 1 file changed, 3 insertions(+), 9 deletions(-) New commits: commit a2b46aa93fe1ce1d98e8fed5a0987b106aeacec8 Author: Arkadiy Illarionov AuthorDate: Sun Oct 20 11:57:11 2019 +0300 Commit: Arkadiy Illarionov CommitDate: Sun Oct 20 11:46:05 2019 +0200 Drop redundant conditions nMappingType is checked in lcl_getMappingTypeForToggleCase Change-Id: I5e13ffad9028ca40d23e5ca19d765b3ee43c5724 Reviewed-on: https://gerrit.libreoffice.org/81151 Tested-by: Jenkins Reviewed-by: Arkadiy Illarionov diff --git a/i18npool/source/transliteration/transliteration_body.cxx b/i18npool/source/transliteration/transliteration_body.cxx index a320b46d36aa..6d6c710b57c2 100644 --- a/i18npool/source/transliteration/transliteration_body.cxx +++ b/i18npool/source/transliteration/transliteration_body.cxx @@ -100,9 +100,7 @@ Transliteration_body::transliterateImpl( for (i = 0; i < nCount; i++) { // take care of TOGGLE_CASE transliteration: -MappingType nTmpMappingType = nMappingType; -if (nMappingType == (MappingType::LowerToUpper | MappingType::UpperToLower)) -nTmpMappingType = lcl_getMappingTypeForToggleCase( nMappingType, in[i] ); +MappingType nTmpMappingType = lcl_getMappingTypeForToggleCase( nMappingType, in[i] ); const i18nutil::Mapping &map = i18nutil::casefolding::getValue( in, i, nCount, aLocale, nTmpMappingType ); nOffCount += map.nmap; @@ -118,9 +116,7 @@ Transliteration_body::transliterateImpl( for (i = 0; i < nCount; i++) { // take care of TOGGLE_CASE transliteration: -MappingType nTmpMappingType = nMappingType; -if (nMappingType == (MappingType::LowerToUpper | MappingType::UpperToLower)) -nTmpMappingType = lcl_getMappingTypeForToggleCase( nMappingType, in[i] ); +MappingType nTmpMappingType = lcl_getMappingTypeForToggleCase( nMappingType, in[i] ); const i18nutil::Mapping &map = i18nutil::casefolding::getValue( in, i, nCount, aLocale, nTmpMappingType ); for (sal_Int32 k = 0; k < map.nmap; k++) @@ -158,9 +154,7 @@ Transliteration_body::transliterateImpl( for ( sal_Int32 i = 0; i < nCount; i++) { // take care of TOGGLE_CASE transliteration: -MappingType nTmpMappingType = nMappingType; -if (nMappingType == (MappingType::LowerToUpper | MappingType::UpperToLower)) -nTmpMappingType = lcl_getMappingTypeForToggleCase( nMappingType, in[i] ); +MappingType nTmpMappingType = lcl_getMappingTypeForToggleCase( nMappingType, in[i] ); const i18nutil::Mapping &map = i18nutil::casefolding::getValue( in, i, nCount, aLocale, nTmpMappingType ); for (sal_Int32 k = 0; k < map.nmap; k++) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b67af57b98bfccc6d1a9671bb3428194c6cf6ce8 Author: Olivier Hallot AuthorDate: Sun Oct 20 00:34:51 2019 -0300 Commit: Gerrit Code Review CommitDate: Sun Oct 20 10:33:10 2019 +0200 Update git submodules * Update helpcontent2 from branch 'master' - Remove D'oh! errors in Help Page Change-Id: I8ab35df77621eae157ebb6a76f3ab6af6fa271a7 Reviewed-on: https://gerrit.libreoffice.org/81148 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index d655a0a1f0f3..ba7142303144 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit d655a0a1f0f37bd8d188ddd82121b125414495a9 +Subproject commit ba714230314482bf2bc11680a0694a3388c1ddd7 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/sbasic/shared/special_vba_func.xhp |1 - 1 file changed, 1 deletion(-) New commits: commit ba714230314482bf2bc11680a0694a3388c1ddd7 Author: Olivier Hallot AuthorDate: Sun Oct 20 00:34:51 2019 -0300 Commit: Olivier Hallot CommitDate: Sun Oct 20 10:33:10 2019 +0200 Remove D'oh! errors in Help Page Change-Id: I8ab35df77621eae157ebb6a76f3ab6af6fa271a7 Reviewed-on: https://gerrit.libreoffice.org/81148 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/sbasic/shared/special_vba_func.xhp b/source/text/sbasic/shared/special_vba_func.xhp index 4eb266954..14ce307dd 100644 --- a/source/text/sbasic/shared/special_vba_func.xhp +++ b/source/text/sbasic/shared/special_vba_func.xhp @@ -45,7 +45,6 @@ VBA Statements - ___ 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 ec6e0a7d3363bd6a4db02ce7b88ddc3d9013ace4 Author: Adolfo Jayme Barrientos AuthorDate: Sun Oct 20 02:29:42 2019 -0500 Commit: Adolfo Jayme Barrientos CommitDate: Sun Oct 20 02:29:48 2019 -0500 readlicense_oo: Bump minimum GTK requirement 3.18 is required to build since commit 12b01c535a05516e1b7c75c316f0cde8e12e3e0b, and GTK 2 support was removed in commit 1ae450504cf57457f9702684b1517fda1dd3c481 Change-Id: I9143cdbf8447934bace2ca6aca06292f96755835 diff --git a/readlicense_oo/docs/readme.xrm b/readlicense_oo/docs/readme.xrm index c7f3e46a74ba..aca4ace61ce6 100644 --- a/readlicense_oo/docs/readme.xrm +++ b/readlicense_oo/docs/readme.xrm @@ -73,7 +73,7 @@ - gtk version 2.10.4 or higher; + GTK version 3.18 or higher; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits