diff options
author | Chris Sherlock <chris.sherlock79@gmail.com> | 2021-09-03 02:19:33 +1000 |
---|---|---|
committer | Tomaž Vajngerl <quikee@gmail.com> | 2021-09-28 08:20:32 +0200 |
commit | 4dd6af856d574ad66ebb4b822a36ba70af9945e2 (patch) | |
tree | c67ddea9c5551e069cb75fe0901cdcfa3f00b054 /basic | |
parent | 1734e97222324c137ecd084ad2464abdff2698d1 (diff) |
vcl: rename OutDevState to Stack
I have moved the header file to include/vcl/rendercontext as this will
eventually be part of the RenderContext split from OutputDevice.
State and associated enums have also been moved to the vcl namespace. I
have also moved ComplexTextLayoutFlags into the vcl::text namespace.
Change-Id: I0abbf560e75b45a272854b267e948c240cd69091
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121524
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'basic')
-rw-r--r-- | basic/inc/pch/precompiled_sb.hxx | 10 | ||||
-rw-r--r-- | basic/source/runtime/inputbox.cxx | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/basic/inc/pch/precompiled_sb.hxx b/basic/inc/pch/precompiled_sb.hxx index 450e386e5f19..d327c88c5f58 100644 --- a/basic/inc/pch/precompiled_sb.hxx +++ b/basic/inc/pch/precompiled_sb.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2021-05-14 22:14:54 using: + Generated on 2021-09-12 11:49:52 using: ./bin/update_pch basic sb --cutoff=2 --exclude:system --exclude:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -40,10 +40,12 @@ #include <osl/thread.h> #include <osl/time.h> #include <rtl/character.hxx> +#include <rtl/math.h> #include <rtl/math.hxx> #include <rtl/string.hxx> #include <rtl/textenc.h> #include <rtl/ustrbuf.hxx> +#include <rtl/ustring.h> #include <rtl/ustring.hxx> #include <sal/log.hxx> #include <sal/saldllapi.h> @@ -58,7 +60,6 @@ #include <vcl/mapmod.hxx> #include <vcl/metaactiontypes.hxx> #include <vcl/outdev.hxx> -#include <vcl/outdevstate.hxx> #include <vcl/region.hxx> #include <vcl/rendercontext/AddFontSubstituteFlags.hxx> #include <vcl/rendercontext/AntialiasingFlags.hxx> @@ -69,7 +70,10 @@ #include <vcl/rendercontext/GetDefaultFontFlags.hxx> #include <vcl/rendercontext/ImplMapRes.hxx> #include <vcl/rendercontext/InvertFlags.hxx> +#include <vcl/rendercontext/RasterOp.hxx> #include <vcl/rendercontext/SalLayoutFlags.hxx> +#include <vcl/rendercontext/State.hxx> +#include <vcl/rendercontext/SystemTextColorFlags.hxx> #include <vcl/salnativewidgets.hxx> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> @@ -84,6 +88,7 @@ #include <basegfx/vector/b2enums.hxx> #include <com/sun/star/awt/DeviceInfo.hpp> #include <com/sun/star/drawing/LineCap.hpp> +#include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Reference.h> #include <com/sun/star/uno/Reference.hxx> @@ -97,6 +102,7 @@ #include <o3tl/float_int_conversion.hxx> #include <o3tl/safeint.hxx> #include <svl/SfxBroadcaster.hxx> +#include <svl/numformat.hxx> #include <svl/zforlist.hxx> #include <tools/color.hxx> #include <tools/debug.hxx> diff --git a/basic/source/runtime/inputbox.cxx b/basic/source/runtime/inputbox.cxx index e409b1352bfd..36d604298bad 100644 --- a/basic/source/runtime/inputbox.cxx +++ b/basic/source/runtime/inputbox.cxx @@ -78,7 +78,7 @@ void SvRTLInputBox::PositionDialog(tools::Long nXTwips, tools::Long nYTwips) { Point aDlgPosApp( nXTwips, nYTwips ); OutputDevice* pDefaultDevice = Application::GetDefaultDevice(); - pDefaultDevice->Push(PushFlags::MAPMODE); + pDefaultDevice->Push(vcl::PushFlags::MAPMODE); pDefaultDevice->SetMapMode(MapMode( MapUnit::MapAppFont)); aDlgPosApp = pDefaultDevice->LogicToPixel(aDlgPosApp, MapMode(MapUnit::MapTwip)); pDefaultDevice->Pop(); |