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 /include/vcl | |
| 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 'include/vcl')
| -rw-r--r-- | include/vcl/print.hxx | 1 | ||||
| -rw-r--r-- | include/vcl/rendercontext/State.hxx | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx index e23cf8d0af..e7c88f56bd 100644 --- a/include/vcl/print.hxx +++ b/include/vcl/print.hxx @@ -228,6 +228,7 @@ public: bool SetPaperBin( sal_uInt16 nPaperBin ); sal_uInt16 GetPaperBin() const; sal_uInt16 GetPaperBinBySourceIndex(sal_uInt16 nPaperSource) const; + sal_uInt16 GetSourceIndexByPaperBin(sal_uInt16 nPaperBin) const; void SetPaper( Paper ePaper ); bool SetPaperSizeUser( const Size& rSize ); /** @return The paper format of the printer's current "jobsetup". Note that if PAPER_USER the actual size can be anything. */ diff --git a/include/vcl/rendercontext/State.hxx b/include/vcl/rendercontext/State.hxx index 0359a486e4..0a3d4327af 100644 --- a/include/vcl/rendercontext/State.hxx +++ b/include/vcl/rendercontext/State.hxx @@ -53,7 +53,6 @@ enum class PushFlags TEXTLAYOUTMODE = 0x0800, TEXTLANGUAGE = 0x1000, OVERLINECOLOR = 0x2000, - RTLENABLED = 0x4000, ALL = 0xFFFF }; } @@ -67,7 +66,7 @@ template <> struct typed_flags<vcl::PushFlags> : is_typed_flags<vcl::PushFlags, #define PUSH_ALLFONT \ (vcl::PushFlags::TEXTCOLOR | vcl::PushFlags::TEXTFILLCOLOR | vcl::PushFlags::TEXTLINECOLOR \ | vcl::PushFlags::OVERLINECOLOR | vcl::PushFlags::TEXTALIGN | vcl::PushFlags::TEXTLAYOUTMODE \ - | vcl::PushFlags::TEXTLANGUAGE | vcl::PushFlags::RTLENABLED | vcl::PushFlags::FONT) + | vcl::PushFlags::TEXTLANGUAGE | vcl::PushFlags::FONT) namespace vcl::text { @@ -115,7 +114,6 @@ struct State LanguageType meTextLanguage = LANGUAGE_SYSTEM; PushFlags mnFlags = PushFlags::NONE; bool mbMapActive = false; - bool mbRTLEnabled = false; }; } |