From 61391c43f5808aadfa5fafb25a1bd7c2ae541b70 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 12 Feb 2020 16:16:59 +0000 Subject: all ItemWindows are now welded MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit where native widgetery is hostable in a vcl toolbar or a native one Change-Id: I942ada335bb4bd6ced0f3352f632e25787f68597 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88598 Tested-by: Jenkins Reviewed-by: Caolán McNamara --- sd/source/ui/dlg/diactrl.cxx | 2 +- sd/source/ui/dlg/gluectrl.cxx | 4 ++-- sd/source/ui/inc/diactrl.hxx | 2 +- sd/source/ui/inc/gluectrl.hxx | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/dlg/diactrl.cxx b/sd/source/ui/dlg/diactrl.cxx index ffe04874eef0..a9155c1d66d7 100644 --- a/sd/source/ui/dlg/diactrl.cxx +++ b/sd/source/ui/dlg/diactrl.cxx @@ -176,7 +176,7 @@ void SdTbxCtlDiaPages::StateChanged( sal_uInt16, } } -VclPtr SdTbxCtlDiaPages::CreateItemWindow( vcl::Window* pParent ) +VclPtr SdTbxCtlDiaPages::CreateItemWindow( vcl::Window* pParent ) { VclPtr pWindow = VclPtr::Create(pParent, m_xFrame); pWindow->Show(); diff --git a/sd/source/ui/dlg/gluectrl.cxx b/sd/source/ui/dlg/gluectrl.cxx index ee2e49a9d7bb..cb27432added 100644 --- a/sd/source/ui/dlg/gluectrl.cxx +++ b/sd/source/ui/dlg/gluectrl.cxx @@ -180,12 +180,12 @@ void SdTbxCtlGlueEscDir::StateChanged( sal_uInt16 nSId, SfxToolBoxControl::StateChanged( nSId, eState, pState ); } -VclPtr SdTbxCtlGlueEscDir::CreateItemWindow( vcl::Window *pParent ) +VclPtr SdTbxCtlGlueEscDir::CreateItemWindow( vcl::Window *pParent ) { if( GetSlotId() == SID_GLUE_ESCDIR ) return VclPtr::Create( pParent, m_xFrame ).get(); - return VclPtr(); + return VclPtr(); } /** diff --git a/sd/source/ui/inc/diactrl.hxx b/sd/source/ui/inc/diactrl.hxx index 3aa9d11edde8..17dcad0ab9e0 100644 --- a/sd/source/ui/inc/diactrl.hxx +++ b/sd/source/ui/inc/diactrl.hxx @@ -57,7 +57,7 @@ class SdTbxCtlDiaPages : public SfxToolBoxControl public: virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; - virtual VclPtr CreateItemWindow( vcl::Window *pParent ) override; + virtual VclPtr CreateItemWindow( vcl::Window *pParent ) override; SFX_DECL_TOOLBOX_CONTROL(); diff --git a/sd/source/ui/inc/gluectrl.hxx b/sd/source/ui/inc/gluectrl.hxx index 650edc8d840a..ecf1acede60c 100644 --- a/sd/source/ui/inc/gluectrl.hxx +++ b/sd/source/ui/inc/gluectrl.hxx @@ -61,7 +61,7 @@ private: public: virtual void StateChanged( sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pState ) override; - virtual VclPtr CreateItemWindow( vcl::Window *pParent ) override; + virtual VclPtr CreateItemWindow( vcl::Window *pParent ) override; SFX_DECL_TOOLBOX_CONTROL(); -- cgit /cp-4.2'>distro/collabora/cp-4.2 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/javaunohelper
AgeCommit message (Expand)Author
2020-09-01Fix typo in codeAndrea Gelmini
2020-08-05add dependency to juh,jurt,ridl,unoil pomsRene Engelhard
2020-07-10replace usage of blacklist with excludelist for IWYUThorsten Behrens
2020-06-04Upcoming loplugin:elidestringvar: javaunohelperStephan Bergmann
2020-05-09compact namespace in i18npool..ooxNoel Grandin
2020-05-06Move all public Java classes to libreoffice.jarSamuel Mehrbrodt
2020-03-10Fix typoAndrea Gelmini
2020-02-04tdf#117331 Merge jurt and unoil into ridlSamuel Mehrbrodt
2019-12-19sal_Char->char in idlc..linguisticNoel Grandin
2019-11-13Extend loplugin:salbool to loplugin:fakeboolStephan Bergmann
2019-08-12Fix typosAndrea Gelmini
2019-07-27Fix typosAndrea Gelmini
2019-07-20Fix typosAndrea Gelmini
2019-07-03cid#1448341: perf inefficient map iteratorJulien Nabet
2019-07-03cid#1448214: perf inefficient map iteratorJulien Nabet
2019-05-27@deprecated should be with @DeprecatedTomoyuki Kubota
2019-05-16javaunohelper: blind fix for Android build broken by 2d22f8bb15c1Michael Stahl
2019-05-16tdf#42949 Fix IWYU warnings in javaunohelper/Gabor Kelemen
2019-05-10an uno -> a unoCaolán McNamara
2019-04-01tdf#120703 PVS: Silence V522 warningsMike Kaganski
2019-03-07log nice exception messages whereever possibleNoel Grandin