[Libreoffice-commits] core.git: vcl/headless vcl/inc vcl/osx vcl/qt5 vcl/source vcl/unx vcl/win
vcl/headless/svpframe.cxx |4
vcl/inc/headless/svpframe.hxx |1 -
vcl/inc/osx/salframe.h |1 -
vcl/inc/qt5/QtFrame.hxx |1 -
vcl/inc/salframe.hxx|1 -
vcl/inc/unx/gtk/gtkframe.hxx|1 -
vcl/inc/unx/salframe.h |1 -
vcl/inc/win/salframe.h |1 -
vcl/osx/salframe.cxx|4
vcl/qt5/QtFrame.cxx |2 --
vcl/source/window/menubarwindow.cxx |3 ---
vcl/unx/generic/window/salframe.cxx |5 -
vcl/unx/gtk3/gtkframe.cxx |4
vcl/win/window/salframe.cxx |5 -
14 files changed, 34 deletions(-)
New commits:
commit 14dfbfe1da056d9570c85df8b5d5bed3943d46e9
Author: Jan-Marek Glogowski
AuthorDate: Sat Jun 11 01:49:02 2022 +0200
Commit: Jan-Marek Glogowski
CommitDate: Wed Jun 15 12:17:36 2022 +0200
Drop SalMenu::DrawMenuBar (is WIN-only)
This follow-up on commit 483f3125ecd4744cbcc2f8fd3cdf243d81a601ff
("WIN drop effectively empty ImplDrawMenuBar") should probably
have been included in it. Windows was the only implementation of
that API, but the API is just called for a native menubar, which
Windows doesn't use (VisibleMenuBar returns false). Maybe Windows
SalFrame::SetMenu should also be dropped?
Change-Id: Ic3600e66c91ce9d56d7f911bce5674e0a9ee833c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135633
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski
diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx
index 62b43dfd0824..9ab3864aa7cd 100644
--- a/vcl/headless/svpframe.cxx
+++ b/vcl/headless/svpframe.cxx
@@ -200,10 +200,6 @@ void SvpSalFrame::SetMenu( SalMenu* )
{
}
-void SvpSalFrame::DrawMenuBar()
-{
-}
-
void SvpSalFrame::SetExtendedFrameStyle( SalExtStyle )
{
}
diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx
index f2fce5c420b4..bb15711aef53 100644
--- a/vcl/inc/headless/svpframe.hxx
+++ b/vcl/inc/headless/svpframe.hxx
@@ -80,7 +80,6 @@ public:
virtual voidSetTitle( const OUString& rTitle ) override;
virtual voidSetIcon( sal_uInt16 nIcon ) override;
virtual voidSetMenu( SalMenu* pMenu ) override;
-virtual voidDrawMenuBar() override;
virtual voidSetExtendedFrameStyle( SalExtStyle nExtStyle )
override;
virtual voidShow( bool bVisible, bool bNoActivate = false
) override;
diff --git a/vcl/inc/osx/salframe.h b/vcl/inc/osx/salframe.h
index 953a17adbcc9..71b8eb45b772 100644
--- a/vcl/inc/osx/salframe.h
+++ b/vcl/inc/osx/salframe.h
@@ -116,7 +116,6 @@ public:
virtual voidSetIcon( sal_uInt16 nIcon ) override;
virtual voidSetRepresentedURL( const OUString& ) override;
virtual voidSetMenu( SalMenu* pSalMenu ) override;
-virtual voidDrawMenuBar() override;
virtual voidShow( bool bVisible, bool bNoActivate = false
) override;
virtual voidSetMinClientSize( tools::Long nWidth,
tools::Long nHeight )
override;
diff --git a/vcl/inc/qt5/QtFrame.hxx b/vcl/inc/qt5/QtFrame.hxx
index dcdca17844ae..562c7d3ba89a 100644
--- a/vcl/inc/qt5/QtFrame.hxx
+++ b/vcl/inc/qt5/QtFrame.hxx
@@ -160,7 +160,6 @@ public:
virtual void SetTitle(const OUString& rTitle) override;
virtual void SetIcon(sal_uInt16 nIcon) override;
virtual void SetMenu(SalMenu* pMenu) override;
-virtual void DrawMenuBar() override;
virtual void registerDragSource(QtDragSource* pDragSource);
virtual void deregisterDragSource(QtDragSource const* pDragSource);
diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx
index e6c111c1dab5..45ed72956656 100644
--- a/vcl/inc/salframe.hxx
+++ b/vcl/inc/salframe.hxx
@@ -144,7 +144,6 @@ public:
virtual voidSetIcon( sal_uInt16 nIcon ) = 0;
virtual voidSetRepresentedURL( const OUString& );
virtual voidSetMenu( SalMenu *pSalMenu ) = 0;
-virtual voidDrawMenuBar() = 0;
virtual voidSetExtendedFrameStyle( SalExtStyle nExtStyle ) = 0;
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index 2adacd1ee5ba..80696439ea79 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -506,7 +506,6 @@ public:
virtual voidSetIcon( sal_uInt16 nIcon ) override;
virtual voidSetMenu( SalMenu *pSalMenu ) override;
SalMenu*GetMenu();
-virtual voidDrawMenuBar() override;
voidEnsureAppMenuWatch();
virtual voidSetExtendedFrameStyle( SalExtStyle nExtStyle )
override;
diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h
index 46d23f71aaf9..597657333128 100644
---
[Libreoffice-commits] core.git: vcl/headless vcl/inc vcl/osx vcl/qt5 vcl/source vcl/unx vcl/win
vcl/headless/svpframe.cxx |4 ++--
vcl/inc/headless/svpframe.hxx |2 +-
vcl/inc/osx/salframe.h |2 +-
vcl/inc/qt5/Qt5Frame.hxx|2 +-
vcl/inc/salframe.hxx|2 +-
vcl/inc/unx/gtk/gtkframe.hxx|2 +-
vcl/inc/unx/salframe.h |2 +-
vcl/inc/win/salframe.h |2 +-
vcl/osx/salframe.cxx|4 ++--
vcl/qt5/Qt5Frame.cxx|4 ++--
vcl/source/app/svapp.cxx| 17 +
vcl/source/window/event.cxx | 12 +---
vcl/unx/generic/window/salframe.cxx |4 ++--
vcl/unx/gtk/gtksalframe.cxx |4 ++--
vcl/unx/gtk3/gtk3gtkframe.cxx |4 ++--
vcl/win/window/salframe.cxx |4 ++--
16 files changed, 35 insertions(+), 36 deletions(-)
New commits:
commit 478f3f019f780ae6f2464ea7ccd7a52a0ea9361c
Author: Noel Grandin
AuthorDate: Tue Oct 30 10:48:22 2018 +0200
Commit: Noel Grandin
CommitDate: Thu Nov 1 06:45:13 2018 +0100
loplugin:useuniqueptr in SalFrame::PostEvent
Change-Id: Ib066b1d6df90f330f2f93ec639bd7bc59a08c024
Reviewed-on: https://gerrit.libreoffice.org/62507
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx
index 9bf3e9cb84e6..e636b46514ac 100644
--- a/vcl/headless/svpframe.cxx
+++ b/vcl/headless/svpframe.cxx
@@ -160,9 +160,9 @@ void SvpSalFrame::ReleaseGraphics( SalGraphics* pGraphics )
delete pSvpGraphics;
}
-bool SvpSalFrame::PostEvent(ImplSVEvent* pData)
+bool SvpSalFrame::PostEvent(std::unique_ptr pData)
{
-m_pInstance->PostEvent( this, pData, SalEvent::UserEvent );
+m_pInstance->PostEvent( this, pData.release(), SalEvent::UserEvent );
return true;
}
diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx
index 309a7b5ce523..15d582ee378d 100644
--- a/vcl/inc/headless/svpframe.hxx
+++ b/vcl/inc/headless/svpframe.hxx
@@ -70,7 +70,7 @@ public:
virtual SalGraphics*AcquireGraphics() override;
virtual voidReleaseGraphics( SalGraphics* pGraphics )
override;
-virtual boolPostEvent(ImplSVEvent* pData) override;
+virtual boolPostEvent(std::unique_ptr pData)
override;
virtual voidSetTitle( const OUString& rTitle ) override;
virtual voidSetIcon( sal_uInt16 nIcon ) override;
diff --git a/vcl/inc/osx/salframe.h b/vcl/inc/osx/salframe.h
index c2b53e270648..c1a55269b517 100644
--- a/vcl/inc/osx/salframe.h
+++ b/vcl/inc/osx/salframe.h
@@ -114,7 +114,7 @@ public:
virtual SalGraphics*AcquireGraphics() override;
virtual voidReleaseGraphics( SalGraphics* pGraphics )
override;
-virtual boolPostEvent(ImplSVEvent* pData) override;
+virtual boolPostEvent(std::unique_ptr pData)
override;
virtual voidSetTitle( const OUString& rTitle ) override;
virtual voidSetIcon( sal_uInt16 nIcon ) override;
virtual voidSetRepresentedURL( const OUString& ) override;
diff --git a/vcl/inc/qt5/Qt5Frame.hxx b/vcl/inc/qt5/Qt5Frame.hxx
index 110fa9b279cf..9d7b15792731 100644
--- a/vcl/inc/qt5/Qt5Frame.hxx
+++ b/vcl/inc/qt5/Qt5Frame.hxx
@@ -123,7 +123,7 @@ public:
virtual SalGraphics* AcquireGraphics() override;
virtual void ReleaseGraphics(SalGraphics* pGraphics) override;
-virtual bool PostEvent(ImplSVEvent* pData) override;
+virtual bool PostEvent(std::unique_ptr pData) override;
virtual void SetTitle(const OUString& rTitle) override;
virtual void SetIcon(sal_uInt16 nIcon) override;
diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx
index f1d4a05e5662..e2662d415fc2 100644
--- a/vcl/inc/salframe.hxx
+++ b/vcl/inc/salframe.hxx
@@ -128,7 +128,7 @@ public:
// Event must be destroyed, when Frame is destroyed
// When Event is called, SalInstance::Yield() must be returned
-virtual boolPostEvent(ImplSVEvent* pData) = 0;
+virtual boolPostEvent(std::unique_ptr pData) = 0;
virtual voidSetTitle( const OUString& rTitle ) = 0;
virtual voidSetIcon( sal_uInt16 nIcon ) = 0;
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index 94547848659e..7b2e78a5414e 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -447,7 +447,7 @@ public:
// Event must be destroyed, when Frame is destroyed
// When Event is called, SalInstance::Yield() must be returned
-virtual boolPostEvent(ImplSVEvent* pData) override;
+virtual boolPostEvent(std::unique_ptr pData)
override;
virtual voidSetTitle( const OUString& rTitle ) override;
virtual voidSetIcon( sal_uInt16 nIcon ) override;
diff --git a/vcl/inc/unx/salframe.h
[Libreoffice-commits] core.git: vcl/headless vcl/inc vcl/osx vcl/qt5 vcl/source vcl/unx vcl/win
vcl/headless/svpprn.cxx |1 -
vcl/inc/salprn.hxx |2 +-
vcl/osx/salinst.cxx |1 -
vcl/qt5/Qt5Instance_Print.cxx |1 -
vcl/source/gdi/print.cxx|1 -
vcl/unx/generic/print/genprnpsp.cxx |1 -
vcl/win/gdi/salprn.cxx | 12
7 files changed, 5 insertions(+), 14 deletions(-)
New commits:
commit 7e45b80b7a0c83b7d6e8dab39dfbfe05012e145d
Author: Noel Grandin
Date: Fri Jun 8 13:40:33 2018 +0200
rename SalPrinterQueueInfo::mpSysData to mpPortName
and simplify, most places can just leave it alone
Change-Id: Id938ec12d21ef244a15b5e5a72626c5ad0d0e124
Reviewed-on: https://gerrit.libreoffice.org/55499
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/vcl/headless/svpprn.cxx b/vcl/headless/svpprn.cxx
index 7b661c1d58e0..fd325227e1f7 100644
--- a/vcl/headless/svpprn.cxx
+++ b/vcl/headless/svpprn.cxx
@@ -218,7 +218,6 @@ void SvpSalInstance::GetPrinterQueueInfo( ImplPrnQueueList*
pList )
pInfo->maDriver = rInfo.m_aDriverName;
pInfo->maLocation = rInfo.m_aLocation;
pInfo->maComment= rInfo.m_aComment;
-pInfo->mpSysData= nullptr;
sal_Int32 nIndex = 0;
while( nIndex != -1 )
diff --git a/vcl/inc/salprn.hxx b/vcl/inc/salprn.hxx
index 780217d33ae1..014f61179b47 100644
--- a/vcl/inc/salprn.hxx
+++ b/vcl/inc/salprn.hxx
@@ -41,7 +41,7 @@ struct VCL_PLUGIN_PUBLIC SalPrinterQueueInfo
OUString maComment;
PrintQueueFlagsmnStatus;
sal_uLong mnJobs;
-OUString* mpSysData;
+std::unique_ptr mpPortName; // only used by Windows backend
SalPrinterQueueInfo();
~SalPrinterQueueInfo();
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index 08302f8150ed..03d3f7a2663f 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -819,7 +819,6 @@ void AquaSalInstance::GetPrinterQueueInfo(
ImplPrnQueueList* pList )
pInfo->maDriver = GetOUString( pType );
pInfo->mnStatus = PrintQueueFlags::NONE;
pInfo->mnJobs = 0;
-pInfo->mpSysData= nullptr;
pList->Add( pInfo );
}
diff --git a/vcl/qt5/Qt5Instance_Print.cxx b/vcl/qt5/Qt5Instance_Print.cxx
index e1b6bdc158c3..bc236fc746af 100644
--- a/vcl/qt5/Qt5Instance_Print.cxx
+++ b/vcl/qt5/Qt5Instance_Print.cxx
@@ -216,7 +216,6 @@ void Qt5Instance::GetPrinterQueueInfo(ImplPrnQueueList*
pList)
pInfo->maDriver = rInfo.m_aDriverName;
pInfo->maLocation = rInfo.m_aLocation;
pInfo->maComment = rInfo.m_aComment;
-pInfo->mpSysData = nullptr;
sal_Int32 nIndex = 0;
while (nIndex != -1)
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index aeed0625d7fa..a98d26589c8b 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -344,7 +344,6 @@ SalPrinterQueueInfo::SalPrinterQueueInfo()
{
mnStatus= PrintQueueFlags::NONE;
mnJobs = QUEUE_JOBS_DONTKNOW;
-mpSysData = nullptr;
}
SalPrinterQueueInfo::~SalPrinterQueueInfo()
diff --git a/vcl/unx/generic/print/genprnpsp.cxx
b/vcl/unx/generic/print/genprnpsp.cxx
index 7a36e3196b9a..d30a518457b5 100644
--- a/vcl/unx/generic/print/genprnpsp.cxx
+++ b/vcl/unx/generic/print/genprnpsp.cxx
@@ -424,7 +424,6 @@ void SalGenericInstance::GetPrinterQueueInfo(
ImplPrnQueueList* pList )
pInfo->maDriver = rInfo.m_aDriverName;
pInfo->maLocation = rInfo.m_aLocation;
pInfo->maComment= rInfo.m_aComment;
-pInfo->mpSysData= nullptr;
sal_Int32 nIndex = 0;
while( nIndex != -1 )
diff --git a/vcl/win/gdi/salprn.cxx b/vcl/win/gdi/salprn.cxx
index 0027263b5af9..0f16b32ab530 100644
--- a/vcl/win/gdi/salprn.cxx
+++ b/vcl/win/gdi/salprn.cxx
@@ -166,7 +166,6 @@ void WinSalInstance::GetPrinterQueueInfo( ImplPrnQueueList*
pList )
pInfo->maPrinterName = o3tl::toU(pWinInfo4[i].pPrinterName);
pInfo->mnStatus = PrintQueueFlags::NONE;
pInfo->mnJobs= 0;
-pInfo->mpSysData = nullptr;
pList->Add( pInfo );
}
}
@@ -202,8 +201,8 @@ void WinSalInstance::GetPrinterQueueState(
SalPrinterQueueInfo* pInfo )
pInfo->maComment = o3tl::toU(pWinInfo2->pComment);
pInfo->mnStatus = ImplWinQueueStatusToSal(
pWinInfo2->Status );
pInfo->mnJobs= pWinInfo2->cJobs;
-if( ! pInfo->mpSysData )
-pInfo->mpSysData = new OUString(aPortName);
+if( ! pInfo->mpPortName )
+pInfo->mpPortName.reset(new OUString(aPortName));
}
rtl_freeMemory(pWinInfo2);
}
@@ -213,7 +212,6 @@ void
[Libreoffice-commits] core.git: vcl/headless vcl/inc vcl/osx vcl/qt5 vcl/source vcl/unx vcl/win
vcl/headless/svpinst.cxx |5 -
vcl/inc/headless/svpinst.hxx |3 ---
vcl/inc/osx/salinst.h |1 -
vcl/inc/qt5/Qt5Instance.hxx |2 --
vcl/inc/salinst.hxx |4 ++--
vcl/inc/unx/salinst.h |2 +-
vcl/inc/win/salinst.h |1 -
vcl/osx/salinst.cxx |5 -
vcl/qt5/Qt5Instance.cxx |2 --
vcl/source/app/salvtables.cxx |6 ++
vcl/unx/generic/app/sm.cxx|6 +++---
vcl/win/app/salinst.cxx |5 -
12 files changed, 12 insertions(+), 30 deletions(-)
New commits:
commit 84efebb5304b2ebbc03e7743b131ce4d5ad10c03
Author: Noel Grandin
Date: Fri Jun 8 13:16:50 2018 +0200
return SalSession with std::unique_ptr
Change-Id: I85527407c0cd2d3b94565fd7e24b0616948c9b0f
Reviewed-on: https://gerrit.libreoffice.org/55497
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index 1128f0d61ee6..ad265e335265 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -491,11 +491,6 @@ bool SvpSalInstance::AnyInput( VclInputFlags nType )
return false;
}
-SalSession* SvpSalInstance::CreateSalSession()
-{
-return nullptr;
-}
-
OUString SvpSalInstance::GetConnectionIdentifier()
{
return OUString();
diff --git a/vcl/inc/headless/svpinst.hxx b/vcl/inc/headless/svpinst.hxx
index 9eef8cdae6f3..cf9ced053c8a 100644
--- a/vcl/inc/headless/svpinst.hxx
+++ b/vcl/inc/headless/svpinst.hxx
@@ -175,9 +175,6 @@ public:
virtual boolIsMainThread() const override;
virtual voidupdateMainThread() override;
-// may return NULL to disable session management
-virtual SalSession* CreateSalSession() override;
-
virtual OpenGLContext* CreateOpenGLContext() override;
virtual OUStringGetConnectionIdentifier() override;
diff --git a/vcl/inc/osx/salinst.h b/vcl/inc/osx/salinst.h
index 6fcb76aec1a7..27d6266501f7 100644
--- a/vcl/inc/osx/salinst.h
+++ b/vcl/inc/osx/salinst.h
@@ -123,7 +123,6 @@ public:
virtual voidDestroyMenu( SalMenu* ) override;
virtual SalMenuItem*CreateMenuItem( const SalItemParams* pItemData )
override;
virtual voidDestroyMenuItem( SalMenuItem* ) override;
-virtual SalSession* CreateSalSession() override;
virtual OpenGLContext* CreateOpenGLContext() override;
virtual OUStringGetConnectionIdentifier() override;
virtual voidAddToRecentDocumentList(const OUString& rFileUrl,
const OUString& rMimeType,
diff --git a/vcl/inc/qt5/Qt5Instance.hxx b/vcl/inc/qt5/Qt5Instance.hxx
index cd0e91124412..84eff744d32b 100644
--- a/vcl/inc/qt5/Qt5Instance.hxx
+++ b/vcl/inc/qt5/Qt5Instance.hxx
@@ -93,8 +93,6 @@ public:
virtual bool DoYield(bool bWait, bool bHandleAllCurrentEvents) override;
virtual bool AnyInput(VclInputFlags nType) override;
-virtual SalSession* CreateSalSession() override;
-
virtual OpenGLContext* CreateOpenGLContext() override;
virtual OUString GetConnectionIdentifier() override;
diff --git a/vcl/inc/salinst.hxx b/vcl/inc/salinst.hxx
index 346352486b30..e04d849e4169 100644
--- a/vcl/inc/salinst.hxx
+++ b/vcl/inc/salinst.hxx
@@ -158,8 +158,8 @@ public:
virtual SalMenuItem*CreateMenuItem( const SalItemParams* pItemData );
virtual voidDestroyMenuItem( SalMenuItem* pItem );
-// may return NULL to disable session management
-virtual SalSession* CreateSalSession() = 0;
+// may return NULL to disable session management, only used by X11 backend
+virtual std::unique_ptr CreateSalSession();
virtual OpenGLContext* CreateOpenGLContext() = 0;
diff --git a/vcl/inc/unx/salinst.h b/vcl/inc/unx/salinst.h
index 2e404dbe76e8..d61995f14d23 100644
--- a/vcl/inc/unx/salinst.h
+++ b/vcl/inc/unx/salinst.h
@@ -72,7 +72,7 @@ public:
virtual std::unique_ptr CreateI18NImeStatus() override;
virtual SalSystem* CreateSalSystem() override;
virtual SalBitmap* CreateSalBitmap() override;
-virtual SalSession* CreateSalSession() override;
+virtual std::unique_ptr CreateSalSession() override;
virtual OpenGLContext* CreateOpenGLContext() override;
virtual boolDoYield(bool bWait, bool
bHandleAllCurrentEvents) override;
diff --git a/vcl/inc/win/salinst.h b/vcl/inc/win/salinst.h
index 43902c065324..77e14012b220 100644
--- a/vcl/inc/win/salinst.h
+++ b/vcl/inc/win/salinst.h
@@ -77,7 +77,6 @@ public:
virtual voidDestroyMenu( SalMenu* ) override;
virtual SalMenuItem*CreateMenuItem( const SalItemParams* pItemData
) override;
virtual voidDestroyMenuItem( SalMenuItem* ) override;
-virtual SalSession* CreateSalSession() override;
virtual OpenGLContext* CreateOpenGLContext() override;
virtual OUStringGetConnectionIdentifier() override;
