[Libreoffice-commits] core.git: vcl/inc vcl/win
Stephan Bergmann
sbergman at redhat.com
Mon Feb 24 04:33:24 PST 2014
vcl/inc/win/salframe.h | 2 +-
vcl/win/source/window/salframe.cxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 13afdc0b14494fc6d990ff52efbcaec2b07556d2
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Feb 24 13:32:44 2014 +0100
warning C4805: '==' : unsafe mix of type 'sal_Bool' and type 'bool'
Change-Id: I3719401a0eb68ba9204be19c2dd4f93617bf097c
diff --git a/vcl/inc/win/salframe.h b/vcl/inc/win/salframe.h
index 2309a1b..cddd366 100644
--- a/vcl/inc/win/salframe.h
+++ b/vcl/inc/win/salframe.h
@@ -61,7 +61,7 @@ public:
sal_Bool mbSizeBorder; // has window a sizeable border
sal_Bool mbNoIcon; // is an window without an icon
sal_Bool mbFloatWin; // is a FloatingWindow
- sal_Bool mbFullScreen; // TRUE: in full screen mode
+ bool mbFullScreen; // TRUE: in full screen mode
sal_Bool mbPresentation; // TRUE: Presentation Mode running
sal_Bool mbInShow; // innerhalb eines Show-Aufrufs
sal_Bool mbRestoreMaximize; // Restore-Maximize
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index 390d051..aaae35c 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -867,7 +867,7 @@ WinSalFrame::WinSalFrame()
mbBorder = FALSE;
mbFixBorder = FALSE;
mbSizeBorder = FALSE;
- mbFullScreen = FALSE;
+ mbFullScreen = false;
mbPresentation = FALSE;
mbInShow = FALSE;
mbRestoreMaximize = FALSE;
More information about the Libreoffice-commits
mailing list