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 /dbaccess | |
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 'dbaccess')
-rw-r--r-- | dbaccess/inc/pch/precompiled_dbu.hxx | 11 | ||||
-rw-r--r-- | dbaccess/source/ui/browser/dataview.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/tabledesign/TEditControl.cxx | 2 |
3 files changed, 8 insertions, 7 deletions
diff --git a/dbaccess/inc/pch/precompiled_dbu.hxx b/dbaccess/inc/pch/precompiled_dbu.hxx index 00d2edff1c4b..9bfc030bc5ab 100644 --- a/dbaccess/inc/pch/precompiled_dbu.hxx +++ b/dbaccess/inc/pch/precompiled_dbu.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:15:31 using: + Generated on 2021-09-12 11:51:31 using: ./bin/update_pch dbaccess dbu --cutoff=12 --exclude:system --exclude:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: @@ -32,6 +32,7 @@ #include <limits> #include <map> #include <memory> +#include <mutex> #include <new> #include <optional> #include <ostream> @@ -87,7 +88,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> @@ -98,7 +98,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> @@ -143,7 +146,6 @@ #include <com/sun/star/frame/XTerminateListener.hpp> #include <com/sun/star/frame/XTitle.hpp> #include <com/sun/star/frame/XTitleChangeBroadcaster.hpp> -#include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/EventObject.hpp> #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/lang/XInitialization.hpp> @@ -172,7 +174,6 @@ #include <com/sun/star/util/URL.hpp> #include <com/sun/star/util/XNumberFormatter.hpp> #include <comphelper/comphelperdllapi.h> -#include <comphelper/interfacecontainer2.hxx> #include <comphelper/namedvaluecollection.hxx> #include <comphelper/sequence.hxx> #include <comphelper/types.hxx> @@ -220,11 +221,11 @@ #include <uno/data.h> #include <unotools/eventlisteneradapter.hxx> #include <unotools/fontdefs.hxx> +#include <unotools/resmgr.hxx> #include <unotools/sharedunocomponent.hxx> #include <unotools/unotoolsdllapi.h> #endif // PCH_LEVEL >= 3 #if PCH_LEVEL >= 4 -#include <ConnectionLineData.hxx> #include <FieldDescriptions.hxx> #include <IClipBoardTest.hxx> #include <QEnumTypes.hxx> diff --git a/dbaccess/source/ui/browser/dataview.cxx b/dbaccess/source/ui/browser/dataview.cxx index b48a3f0adb17..74ceea688ba1 100644 --- a/dbaccess/source/ui/browser/dataview.cxx +++ b/dbaccess/source/ui/browser/dataview.cxx @@ -70,7 +70,7 @@ namespace dbaui { // draw the background { - rRenderContext.Push(PushFlags::LINECOLOR | PushFlags::FILLCOLOR); + rRenderContext.Push(vcl::PushFlags::LINECOLOR | vcl::PushFlags::FILLCOLOR); rRenderContext.SetLineColor(COL_TRANSPARENT); rRenderContext.SetFillColor(GetSettings().GetStyleSettings().GetFaceColor()); rRenderContext.DrawRect(_rRect); diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index a89397ccb2a5..8fa367060361 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -302,7 +302,7 @@ void OTableEditorCtrl::PaintCell(OutputDevice& rDev, const tools::Rectangle& rRe { const OUString aText( GetCellText( m_nCurrentPos, nColumnId )); - rDev.Push( PushFlags::CLIPREGION ); + rDev.Push( vcl::PushFlags::CLIPREGION ); rDev.SetClipRegion(vcl::Region(rRect)); rDev.DrawText( rRect, aText, DrawTextFlags::Left | DrawTextFlags::VCenter ); rDev.Pop(); |