Kaydet (Commit) 717cdaf4 authored tarafından Jan Holesovsky's avatar Jan Holesovsky

custom widgets: Fix various warnings.

Change-Id: I5d657fa4d6f63b93ad3775a5641d08c6e0f3a615
üst e6dcc08c
...@@ -93,7 +93,7 @@ struct ControlDrawParameters ...@@ -93,7 +93,7 @@ struct ControlDrawParameters
int64_t nValue; int64_t nValue;
}; };
typedef struct _WidgetThemeLibrary WidgetThemeLibrary; typedef struct WidgetThemeLibrary_t WidgetThemeLibrary;
typedef struct _rectangle typedef struct _rectangle
{ {
...@@ -101,7 +101,7 @@ typedef struct _rectangle ...@@ -101,7 +101,7 @@ typedef struct _rectangle
long width, height; long width, height;
} rectangle_t; } rectangle_t;
struct _WidgetThemeLibrary struct WidgetThemeLibrary_t
{ {
uint32_t nSize; uint32_t nSize;
......
...@@ -28,7 +28,7 @@ private: ...@@ -28,7 +28,7 @@ private:
public: public:
CustomWidgetDraw(SvpSalGraphics& rGraphics); CustomWidgetDraw(SvpSalGraphics& rGraphics);
virtual ~CustomWidgetDraw(); ~CustomWidgetDraw() override;
bool isNativeControlSupported(ControlType eType, ControlPart ePart) override; bool isNativeControlSupported(ControlType eType, ControlPart ePart) override;
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include "salgdiimpl.hxx" #include "salgdiimpl.hxx"
#include "sallayout.hxx" #include "sallayout.hxx"
#include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/matrix/b2dhommatrix.hxx>
#include <WidgetDrawInterface.hxx> #include "WidgetDrawInterface.hxx"
#include <config_cairo_canvas.h> #include <config_cairo_canvas.h>
......
...@@ -144,7 +144,7 @@ void MenuFloatingWindow::ApplySettings(vcl::RenderContext& rRenderContext) ...@@ -144,7 +144,7 @@ void MenuFloatingWindow::ApplySettings(vcl::RenderContext& rRenderContext)
ImplGetFrame()->UpdateSettings(aSettings); // Update theme colors. ImplGetFrame()->UpdateSettings(aSettings); // Update theme colors.
StyleSettings aStyle(aSettings.GetStyleSettings()); StyleSettings aStyle(aSettings.GetStyleSettings());
Color aHighlightTextColor = ImplGetSVData()->maNWFData.maMenuBarHighlightTextColor; Color aHighlightTextColor = ImplGetSVData()->maNWFData.maMenuBarHighlightTextColor;
if (aHighlightTextColor != Color(COL_TRANSPARENT)) if (aHighlightTextColor != COL_TRANSPARENT)
{ {
aStyle.SetMenuHighlightTextColor(aHighlightTextColor); aStyle.SetMenuHighlightTextColor(aHighlightTextColor);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment