[Libreoffice-commits] core.git: reportdesign/source
reportdesign/source/core/sdr/RptObject.cxx | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) New commits: commit 91a3411bb74ad81663a4204f4547c523a1237f7b Author: Mehmet Emin Başoğlu AuthorDate: Mon Jan 27 11:44:37 2020 +0300 Commit: Stephan Bergmann CommitDate: Fri Feb 7 13:34:45 2020 +0100 tdf#54938: Adapt supportsService implementations to cppu::supportsService Change-Id: I5484047a8b0e87d012ca3a37466b9ebf718257b8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87494 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx index 64399bd9117c..ab478828dd7d 100644 --- a/reportdesign/source/core/sdr/RptObject.cxx +++ b/reportdesign/source/core/sdr/RptObject.cxx @@ -425,14 +425,13 @@ void OObjectBase::_propertyChange( const beans::PropertyChangeEvent& /*evt*/ ) bool OObjectBase::supportsService( const OUString& _sServiceName ) const { -bool bSupports = false; - +// TODO: cache xServiceInfo as member? Reference< lang::XServiceInfo > xServiceInfo( m_xReportComponent , UNO_QUERY ); -// TODO: cache xServiceInfo as member? -if ( xServiceInfo.is() ) -bSupports = xServiceInfo->supportsService( _sServiceName ); -return bSupports; +if ( xServiceInfo.is() ) +return cppu::supportsService(xServiceInfo.get(), _sServiceName); +else +return false; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source toolkit/source
sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx|6 ++ toolkit/source/controls/grid/defaultgriddatamodel.cxx |3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) New commits: commit 6dc77b9f16e0b3fba6f801a3c307786a7c8a8ddd Author: Mehmet Emin Başoğlu AuthorDate: Mon Jan 27 15:51:28 2020 +0300 Commit: Muhammet Kara CommitDate: Tue Jan 28 14:49:25 2020 +0100 tdf#88205: Adapt uses of css::uno::Sequence to use initializer_list ctor Change-Id: I13e5c59aa673100655f38328b4b6515a1946fb76 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87524 Tested-by: Jenkins Reviewed-by: Muhammet Kara diff --git a/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx b/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx index c9def241673e..854a2c0c6a94 100644 --- a/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx +++ b/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx @@ -84,8 +84,7 @@ public: virtual uno::Sequence SAL_CALL getSupportedServiceNames() override { -uno::Sequence aServices { "com.sun.star.frame.ToolbarController" }; -return aServices; +return { "com.sun.star.frame.ToolbarController" }; } // XComponent @@ -145,8 +144,7 @@ public: virtual uno::Sequence SAL_CALL getSupportedServiceNames() override { -uno::Sequence aServices { "com.sun.star.frame.ToolbarController" }; -return aServices; +return { "com.sun.star.frame.ToolbarController" }; } // XComponent diff --git a/toolkit/source/controls/grid/defaultgriddatamodel.cxx b/toolkit/source/controls/grid/defaultgriddatamodel.cxx index 1945204c559b..c700ad79b344 100644 --- a/toolkit/source/controls/grid/defaultgriddatamodel.cxx +++ b/toolkit/source/controls/grid/defaultgriddatamodel.cxx @@ -488,8 +488,7 @@ private: Sequence< OUString > SAL_CALL DefaultGridDataModel::getSupportedServiceNames( ) { -Sequence aSeq { "com.sun.star.awt.grid.DefaultGridDataModel" }; -return aSeq; +return { "com.sun.star.awt.grid.DefaultGridDataModel" }; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extensions/source remotebridges/source svx/source unoxml/source
extensions/source/propctrlr/formcontroller.cxx |6 ++ remotebridges/source/unourl_resolver/unourl_resolver.cxx |3 +-- svx/source/unodraw/unobtabl.cxx |3 +-- svx/source/unodraw/unodtabl.cxx |3 +-- svx/source/unodraw/unogtabl.cxx |3 +-- svx/source/unodraw/unohtabl.cxx |3 +-- svx/source/unodraw/unottabl.cxx |3 +-- unoxml/source/rdf/librdf_repository.cxx |3 +-- 8 files changed, 9 insertions(+), 18 deletions(-) New commits: commit 4939a8905207c0aa044156dc583e4cdd6e7eb63e Author: Mehmet Emin Başoğlu AuthorDate: Mon Jan 27 16:37:54 2020 +0300 Commit: Muhammet Kara CommitDate: Mon Jan 27 22:14:11 2020 +0100 tdf#88205: Adapt uses of css::uno::Sequence to use initializer_list ctor Change-Id: Iffb8512c530b33f87076aec9f85b45219c7d07e5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87528 Tested-by: Jenkins Reviewed-by: Muhammet Kara diff --git a/extensions/source/propctrlr/formcontroller.cxx b/extensions/source/propctrlr/formcontroller.cxx index 5ac5f7fed1fb..b9eb032776b0 100644 --- a/extensions/source/propctrlr/formcontroller.cxx +++ b/extensions/source/propctrlr/formcontroller.cxx @@ -127,8 +127,7 @@ namespace pcr Sequence< OUString > FormController::getSupportedServiceNames_static( ) { -Sequence< OUString > aSupported { "com.sun.star.form.PropertyBrowserController" }; -return aSupported; +return { "com.sun.star.form.PropertyBrowserController" }; } @@ -254,8 +253,7 @@ namespace pcr Sequence< OUString > DialogController::getSupportedServiceNames_static( ) { -Sequence< OUString > aSupported { "com.sun.star.awt.PropertyBrowserController" }; -return aSupported; +return { "com.sun.star.awt.PropertyBrowserController" }; } diff --git a/remotebridges/source/unourl_resolver/unourl_resolver.cxx b/remotebridges/source/unourl_resolver/unourl_resolver.cxx index 4339b30a6dab..d4eea66c0269 100644 --- a/remotebridges/source/unourl_resolver/unourl_resolver.cxx +++ b/remotebridges/source/unourl_resolver/unourl_resolver.cxx @@ -46,8 +46,7 @@ namespace unourl_resolver static Sequence< OUString > resolver_getSupportedServiceNames() { -Sequence< OUString > seqNames { "com.sun.star.bridge.UnoUrlResolver" }; -return seqNames; +return { "com.sun.star.bridge.UnoUrlResolver" }; } static OUString resolver_getImplementationName() diff --git a/svx/source/unodraw/unobtabl.cxx b/svx/source/unodraw/unobtabl.cxx index f94369907f73..4d9c5ded9bfd 100644 --- a/svx/source/unodraw/unobtabl.cxx +++ b/svx/source/unodraw/unobtabl.cxx @@ -84,8 +84,7 @@ OUString SAL_CALL SvxUnoBitmapTable::getImplementationName() uno::Sequence< OUString > SAL_CALL SvxUnoBitmapTable::getSupportedServiceNames( ) { -uno::Sequence aSNS { "com.sun.star.drawing.BitmapTable" }; -return aSNS; +return { "com.sun.star.drawing.BitmapTable" }; } NameOrIndex* SvxUnoBitmapTable::createItem() const diff --git a/svx/source/unodraw/unodtabl.cxx b/svx/source/unodraw/unodtabl.cxx index f285ac30c7d1..9cf86c223894 100644 --- a/svx/source/unodraw/unodtabl.cxx +++ b/svx/source/unodraw/unodtabl.cxx @@ -64,8 +64,7 @@ OUString SAL_CALL SvxUnoDashTable::getImplementationName() uno::Sequence< OUString > SAL_CALL SvxUnoDashTable::getSupportedServiceNames( ) { -uno::Sequence aSNS { "com.sun.star.drawing.DashTable" }; -return aSNS; +return { "com.sun.star.drawing.DashTable" }; } NameOrIndex* SvxUnoDashTable::createItem() const diff --git a/svx/source/unodraw/unogtabl.cxx b/svx/source/unodraw/unogtabl.cxx index 4b3842c9d026..d7b66ef76513 100644 --- a/svx/source/unodraw/unogtabl.cxx +++ b/svx/source/unodraw/unogtabl.cxx @@ -63,8 +63,7 @@ OUString SAL_CALL SvxUnoGradientTable::getImplementationName() uno::Sequence< OUString > SAL_CALL SvxUnoGradientTable::getSupportedServiceNames( ) { -uno::Sequence aSNS { "com.sun.star.drawing.GradientTable" }; -return aSNS; +return { "com.sun.star.drawing.GradientTable" }; } diff --git a/svx/source/unodraw/unohtabl.cxx b/svx/source/unodraw/unohtabl.cxx index ec114ba91b10..9adb450007e2 100644 --- a/svx/source/unodraw/unohtabl.cxx +++ b/svx/source/unodraw/unohtabl.cxx @@ -63,8 +63,7 @@ OUString SAL_CALL SvxUnoHatchTable::getImplementationName() uno::Sequence< OUString > SAL_CALL SvxUnoHatchTable::getSupportedServiceNames( ) { -uno::Sequence aSNS { "com.sun.star.drawing.HatchTable" }; -return aSNS; +return { "com.sun.star.drawing.HatchTable" }; } NameOrIndex* SvxUnoHatchTable::createItem() const diff --git a/svx/source/unodraw/unottabl.cxx b/svx/source/unodraw/unottabl.cxx index 9653f36360bb..8a9e48437c5c 100644 --- a/svx/source/unodraw/unottabl.cxx +++ b/svx/source/unodraw/unottabl.cxx @@ -63,8 +63,7 @@ OUString SAL_CALL
[Libreoffice-commits] core.git: svx/source
svx/source/gallery2/codec.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d23faf1d1ae526cc7af5470e60eb7dc7a46e74cc Author: Mehmet Emin Başoğlu AuthorDate: Sun Jan 26 17:11:33 2020 +0300 Commit: Muhammet Kara CommitDate: Mon Jan 27 21:38:17 2020 +0100 tdf#75280: Convert inappropriate use of sal_uIntPtr to better integer types Change-Id: I5c25999a17ed64cc5a2fa586cd7d986d233a67f2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87455 Tested-by: Jenkins Reviewed-by: Muhammet Kara diff --git a/svx/source/gallery2/codec.cxx b/svx/source/gallery2/codec.cxx index 773b769a2678..5063632d1d93 100644 --- a/svx/source/gallery2/codec.cxx +++ b/svx/source/gallery2/codec.cxx @@ -35,7 +35,7 @@ GalleryCodec::~GalleryCodec() bool GalleryCodec::IsCoded( SvStream& rStm, sal_uInt32& rVersion ) { -const sal_uIntPtr nPos = rStm.Tell(); +const sal_uInt64 nPos = rStm.Tell(); boolbRet; sal_uInt8 cByte1, cByte2, cByte3, cByte4, cByte5, cByte6; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/inc
sd/inc/sdresid.hxx |5 + 1 file changed, 1 insertion(+), 4 deletions(-) New commits: commit 20b5c03ae6406a64ffec328e550fd3c9b3f0306c Author: Mehmet Emin Başoğlu AuthorDate: Sat Jan 25 14:58:36 2020 +0300 Commit: Muhammet Kara CommitDate: Sun Jan 26 20:29:14 2020 +0100 tdf#124176: Use pragma once instead of include guards Change-Id: Iaf87f70db32bcdb9ae079732e931b4c80879e247 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87383 Tested-by: Jenkins Reviewed-by: Muhammet Kara diff --git a/sd/inc/sdresid.hxx b/sd/inc/sdresid.hxx index 8ac4ea45405e..20254c0979fb 100644 --- a/sd/inc/sdresid.hxx +++ b/sd/inc/sdresid.hxx @@ -17,14 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SD_INC_SDRESID_HXX -#define INCLUDED_SD_INC_SDRESID_HXX +#pragma once #include #include "sddllapi.h" SD_DLLPUBLIC OUString SdResId(const char* pId); -#endif /* _SD_SDRESID_HXX */ - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svx include/ucbhelper include/unotools include/vcl
include/svx/zoom_def.hxx |5 + include/ucbhelper/authenticationfallback.hxx |5 + include/unotools/docinfohelper.hxx |5 + include/vcl/IContext.hxx |5 + include/vcl/sound.hxx|5 + 5 files changed, 5 insertions(+), 20 deletions(-) New commits: commit 34330368088109fd140cad345f3de1077d195ddd Author: Mehmet Emin Başoğlu AuthorDate: Sat Jan 25 16:23:02 2020 +0300 Commit: Muhammet Kara CommitDate: Sun Jan 26 20:10:59 2020 +0100 tdf#124176: Use pragma once instead of include guards Change-Id: I045ce53c74bfb24be77537986fb5a8fcad3ed173 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87401 Tested-by: Jenkins Reviewed-by: Muhammet Kara diff --git a/include/svx/zoom_def.hxx b/include/svx/zoom_def.hxx index 0289805e0e50..e75dd9a27ac3 100644 --- a/include/svx/zoom_def.hxx +++ b/include/svx/zoom_def.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_ZOOM_DEF_HXX -#define INCLUDED_SVX_ZOOM_DEF_HXX +#pragma once enum class ZoomButtonId { @@ -28,6 +27,4 @@ enum class ZoomButtonId WHOLEPAGE = 0x0004, }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/ucbhelper/authenticationfallback.hxx b/include/ucbhelper/authenticationfallback.hxx index 171ebb7fe15f..a2634b06069b 100644 --- a/include/ucbhelper/authenticationfallback.hxx +++ b/include/ucbhelper/authenticationfallback.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_UCBHELPER_AUTHENTICATIONFALLBACK_HXX -#define INCLUDED_UCBHELPER_AUTHENTICATIONFALLBACK_HXX +#pragma once #include #include @@ -46,6 +45,4 @@ public: } // namespace ucbhelper -#endif /* ! INCLUDED_UCBHELPER_AUTHENTICATIONFALLBACK_HXX*/ - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/unotools/docinfohelper.hxx b/include/unotools/docinfohelper.hxx index ddc28b05279b..081bc3660c97 100644 --- a/include/unotools/docinfohelper.hxx +++ b/include/unotools/docinfohelper.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_UNOTOOLS_DOCINFOHELPER_HXX -#define INCLUDED_UNOTOOLS_DOCINFOHELPER_HXX +#pragma once #include #include @@ -34,6 +33,4 @@ public: } // namespace utl -#endif // INCLUDED_UNOTOOLS_DOCINFOHELPER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/IContext.hxx b/include/vcl/IContext.hxx index 532242f213e5..6af9b20c4453 100644 --- a/include/vcl/IContext.hxx +++ b/include/vcl/IContext.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_VCL_ICONTEXT_HXX -#define INCLUDED_VCL_ICONTEXT_HXX +#pragma once #include #include @@ -46,6 +45,4 @@ private: } // namespace vcl -#endif // INCLUDED_VCL_ICONTEXT_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/include/vcl/sound.hxx b/include/vcl/sound.hxx index 84d3d25c4e35..2df3c800442e 100644 --- a/include/vcl/sound.hxx +++ b/include/vcl/sound.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_SOUND_HXX -#define INCLUDED_VCL_SOUND_HXX +#pragma once #include @@ -29,6 +28,4 @@ public: static void Beep(); }; -#endif // INCLUDED_VCL_SOUND_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits