[Libreoffice-commits] core.git: include/vcl vcl/source

[Julien Nabet (via logerrit)]

 include/vcl/outdevstate.hxx   |    3 +--
 vcl/source/gdi/mtfxmldump.cxx |    2 --
 2 files changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 74d35e143d557a7e65c4443f5b80cb9d406b1fa1
Author:     Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Sat Aug 28 12:19:06 2021 +0200
Commit:     Julien Nabet <serval2...@yahoo.fr>
CommitDate: Sat Aug 28 20:17:46 2021 +0200

    No need to keep PUSH_ALLTEXT (vcl)
    
    Change-Id: Ied83de6e2768998a76aaf28972c45e82f9a95a57
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121192
    Tested-by: Jenkins
    Reviewed-by: Chris Sherlock <chris.sherloc...@gmail.com>
    Reviewed-by: Julien Nabet <serval2...@yahoo.fr>

diff --git a/include/vcl/outdevstate.hxx b/include/vcl/outdevstate.hxx
index b1104a28f34f..e058ad7dd45d 100644
--- a/include/vcl/outdevstate.hxx
+++ b/include/vcl/outdevstate.hxx
@@ -57,8 +57,7 @@ namespace o3tl
 {
     template<> struct typed_flags<PushFlags> : is_typed_flags<PushFlags, 
0xFFFF> {};
 }
-#define PUSH_ALLTEXT  (PushFlags::TEXTCOLOR | PushFlags::TEXTFILLCOLOR | 
PushFlags::TEXTLINECOLOR | PushFlags::OVERLINECOLOR | PushFlags::TEXTALIGN | 
PushFlags::TEXTLAYOUTMODE | PushFlags::TEXTLANGUAGE)
-#define PUSH_ALLFONT  (PUSH_ALLTEXT | PushFlags::FONT)
+#define PUSH_ALLFONT  (PushFlags::TEXTCOLOR | PushFlags::TEXTFILLCOLOR | 
PushFlags::TEXTLINECOLOR | PushFlags::OVERLINECOLOR | PushFlags::TEXTALIGN | 
PushFlags::TEXTLAYOUTMODE | PushFlags::TEXTLANGUAGE | PushFlags::FONT)
 
 // Layout flags for Complex Text Layout
 // These are flag values, i.e they can be combined
diff --git a/vcl/source/gdi/mtfxmldump.cxx b/vcl/source/gdi/mtfxmldump.cxx
index cccc64df808a..4ad870cb019c 100644
--- a/vcl/source/gdi/mtfxmldump.cxx
+++ b/vcl/source/gdi/mtfxmldump.cxx
@@ -27,8 +27,6 @@ OUString collectPushFlags(PushFlags nFlags)
         return "PushAll";
     else if ((nFlags & PUSH_ALLFONT) == PUSH_ALLFONT)
         return "PushAllFont";
-    else if ((nFlags & PUSH_ALLTEXT) == PUSH_ALLTEXT)
-        return "PushAllText";
 
     std::vector<OUString> aStrings;