d36f7c5bd2
This reverts commit8bc951daf7. As discussed at <https://lists.freedesktop.org/archives/libreoffice/2018-April/079955.html> "long->sal_Int32 in tools/gen.hxx", that commit caused lots of problems with signed integer overflow, and the original plan was to redo it to consistently use sal_Int64 instead of sal_Int32. <https://gerrit.libreoffice.org/#/c/52471/> "sal_Int32->sal_Int64 in tools/gen.hxx" tried that. However, it failed miserably on Windows, causing odd failures like not writing out Pictures/*.svm streams out into .odp during CppunitTest_sd_export_ooxml2. So the next best approach is to just revert the original commit, at least for now. Includes revert of follow-up8c50aff217"Fix Library_vclplug_qt5". Change-Id: Ia8bf34272d1ed38aac00e5d07a9d13fb03f439ae Reviewed-on: https://gerrit.libreoffice.org/52532 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
84 lines
2.4 KiB
C++
84 lines
2.4 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*
|
|
* This file is part of the LibreOffice project.
|
|
*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
*
|
|
* This file incorporates work covered by the following license notice:
|
|
*
|
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
* contributor license agreements. See the NOTICE file distributed
|
|
* with this work for additional information regarding copyright
|
|
* ownership. The ASF licenses this file to you under the Apache
|
|
* License, Version 2.0 (the "License"); you may not use this file
|
|
* except in compliance with the License. You may obtain a copy of
|
|
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
*/
|
|
|
|
#ifndef INCLUDED_VCL_SALGTYPE_HXX
|
|
#define INCLUDED_VCL_SALGTYPE_HXX
|
|
|
|
#include <sal/types.h>
|
|
#include <o3tl/typed_flags_set.hxx>
|
|
#include <tools/color.hxx>
|
|
|
|
enum class DeviceFormat {
|
|
NONE = -1,
|
|
DEFAULT = 0,
|
|
BITMASK = 1,
|
|
#ifdef IOS
|
|
GRAYSCALE = 8
|
|
#endif
|
|
};
|
|
|
|
constexpr ::Color SALCOLOR_NONE ( 0xFF, 0xFF, 0xFF, 0xFF );
|
|
|
|
// must equal to class Point
|
|
struct SalPoint
|
|
{
|
|
long mnX;
|
|
long mnY;
|
|
};
|
|
|
|
typedef const SalPoint* PCONSTSALPOINT;
|
|
|
|
struct SalTwoRect
|
|
{
|
|
long mnSrcX;
|
|
long mnSrcY;
|
|
long mnSrcWidth;
|
|
long mnSrcHeight;
|
|
long mnDestX;
|
|
long mnDestY;
|
|
long mnDestWidth;
|
|
long mnDestHeight;
|
|
|
|
SalTwoRect(long nSrcX, long nSrcY, long nSrcWidth, long nSrcHeight,
|
|
long nDestX, long nDestY, long nDestWidth, long nDestHeight)
|
|
: mnSrcX(nSrcX), mnSrcY(nSrcY), mnSrcWidth(nSrcWidth), mnSrcHeight(nSrcHeight)
|
|
, mnDestX(nDestX), mnDestY(nDestY), mnDestWidth(nDestWidth), mnDestHeight(nDestHeight)
|
|
{
|
|
}
|
|
};
|
|
|
|
enum class SalROPColor {
|
|
N0, N1, Invert
|
|
};
|
|
|
|
enum class SalInvert {
|
|
NONE = 0x00,
|
|
Highlight = 0x01,
|
|
N50 = 0x02,
|
|
TrackFrame = 0x04
|
|
};
|
|
namespace o3tl
|
|
{
|
|
template<> struct typed_flags<SalInvert> : is_typed_flags<SalInvert, 0x07> {};
|
|
}
|
|
|
|
#endif // INCLUDED_VCL_SALGTYPE_HXX
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|