diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-15 09:44:04 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-15 09:44:04 +0000 |
| commit | eb358d77291eba677141bab113dc27d7aabb0f3e (patch) | |
| tree | 2e96f3b5d0c79beaeb536bbf05c3b8564846e65f /vcl/inc | |
| parent | Adding debian version 4:24.2.1-4. (diff) | |
| download | libreoffice-eb358d77291eba677141bab113dc27d7aabb0f3e.tar.xz libreoffice-eb358d77291eba677141bab113dc27d7aabb0f3e.zip | |
Merging upstream version 4:24.2.2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'vcl/inc')
| -rw-r--r-- | vcl/inc/osx/salnsmenu.h | 10 | ||||
| -rw-r--r-- | vcl/inc/osx/salprn.h | 2 | ||||
| -rw-r--r-- | vcl/inc/salprn.hxx | 2 | ||||
| -rw-r--r-- | vcl/inc/unx/genprn.h | 2 | ||||
| -rw-r--r-- | vcl/inc/win/salprn.h | 2 |
5 files changed, 17 insertions, 1 deletions
diff --git a/vcl/inc/osx/salnsmenu.h b/vcl/inc/osx/salnsmenu.h index 696abca2fc..9e0f9acf68 100644 --- a/vcl/inc/osx/salnsmenu.h +++ b/vcl/inc/osx/salnsmenu.h @@ -35,17 +35,25 @@ class AquaSalMenuItem; { AquaSalMenu* mpMenu; } ++ (BOOL)dispatchSpecialKeyEquivalents:(NSEvent*)pEvent; - (id)initWithMenu:(AquaSalMenu*)pMenu; - (void)menuNeedsUpdate:(NSMenu*)pMenu; - (void)setSalMenu:(AquaSalMenu*)pMenu; @end -@interface SalNSMenuItem : NSMenuItem +@interface SalNSMenuItem : NSMenuItem <NSMenuItemValidation> { AquaSalMenuItem* mpMenuItem; } - (id)initWithMenuItem:(AquaSalMenuItem*)pMenuItem; - (void)menuItemTriggered:(id)aSender; +- (BOOL)validateMenuItem:(NSMenuItem*)pMenuItem; +@end + +@interface SalNSMainMenu : NSMenu +{ +} +- (BOOL)performKeyEquivalent:(NSEvent*)pEvent; @end #endif // INCLUDED_VCL_INC_OSX_SALNSMENU_H diff --git a/vcl/inc/osx/salprn.h b/vcl/inc/osx/salprn.h index 9c26e171db..cd26279517 100644 --- a/vcl/inc/osx/salprn.h +++ b/vcl/inc/osx/salprn.h @@ -84,6 +84,8 @@ class AquaSalInfoPrinter : public SalInfoPrinter virtual OUString GetPaperBinName( const ImplJobSetup* i_pSetupData, sal_uInt16 i_nPaperBin ) override; virtual sal_uInt16 GetPaperBinBySourceIndex(const ImplJobSetup* pSetupData, sal_uInt16 nPaperSource) override; + virtual sal_uInt16 GetSourceIndexByPaperBin(const ImplJobSetup* pSetupData, + sal_uInt16 nPaperBin) override; virtual void InitPaperFormats( const ImplJobSetup* i_pSetupData ) override; virtual int GetLandscapeAngle( const ImplJobSetup* i_pSetupData ) override; diff --git a/vcl/inc/salprn.hxx b/vcl/inc/salprn.hxx index ae0b313dab..05dca2fcab 100644 --- a/vcl/inc/salprn.hxx +++ b/vcl/inc/salprn.hxx @@ -84,6 +84,8 @@ public: virtual OUString GetPaperBinName( const ImplJobSetup* pSetupData, sal_uInt16 nPaperBin ) = 0; virtual sal_uInt16 GetPaperBinBySourceIndex(const ImplJobSetup* pSetupData, sal_uInt16 nPaperSource) = 0; + virtual sal_uInt16 GetSourceIndexByPaperBin(const ImplJobSetup* pSetupData, + sal_uInt16 nPaperSource) = 0; // fills m_aPaperFormats and sets m_bPapersInit to true virtual void InitPaperFormats( const ImplJobSetup* pSetupData ) = 0; diff --git a/vcl/inc/unx/genprn.h b/vcl/inc/unx/genprn.h index abe84b71ca..b4fb2c8b35 100644 --- a/vcl/inc/unx/genprn.h +++ b/vcl/inc/unx/genprn.h @@ -47,6 +47,8 @@ public: virtual OUString GetPaperBinName( const ImplJobSetup* pSetupData, sal_uInt16 nPaperBin ) override; virtual sal_uInt16 GetPaperBinBySourceIndex(const ImplJobSetup* pSetupData, sal_uInt16 nPaperSource) override; + virtual sal_uInt16 GetSourceIndexByPaperBin(const ImplJobSetup* pSetupData, + sal_uInt16 nPaperBin) override; virtual void InitPaperFormats( const ImplJobSetup* pSetupData ) override; virtual int GetLandscapeAngle( const ImplJobSetup* pSetupData ) override; }; diff --git a/vcl/inc/win/salprn.h b/vcl/inc/win/salprn.h index b0ec1697c3..d44687d8e0 100644 --- a/vcl/inc/win/salprn.h +++ b/vcl/inc/win/salprn.h @@ -71,6 +71,8 @@ public: virtual OUString GetPaperBinName( const ImplJobSetup* pSetupData, sal_uInt16 nPaperBin ) override; virtual sal_uInt16 GetPaperBinBySourceIndex(const ImplJobSetup* pSetupData, sal_uInt16 nPaperSource) override; + virtual sal_uInt16 GetSourceIndexByPaperBin(const ImplJobSetup* pSetupData, + sal_uInt16 nPaperBin) override; virtual void InitPaperFormats( const ImplJobSetup* pSetupData ) override; virtual int GetLandscapeAngle( const ImplJobSetup* pSetupData ) override; |