summaryrefslogtreecommitdiff
path: root/vcl/inc
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/inc')
-rw-r--r--vcl/inc/vcl/salnativewidgets.hxx18
-rw-r--r--vcl/inc/vcl/wrkwin.hxx11
2 files changed, 21 insertions, 8 deletions
diff --git a/vcl/inc/vcl/salnativewidgets.hxx b/vcl/inc/vcl/salnativewidgets.hxx
index e16df97f3c5f..c8fb0cb40d21 100644
--- a/vcl/inc/vcl/salnativewidgets.hxx
+++ b/vcl/inc/vcl/salnativewidgets.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: salnativewidgets.hxx,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.108.2 $
*
* This file is part of OpenOffice.org.
*
@@ -402,11 +402,17 @@ class ImplControlValue
{ mTristate = nTristate; mString = sString; mNumber = nNumeric; mOptionalVal = aOptVal; };
inline ImplControlValue( ButtonValue nTristate, rtl::OUString sString, long nNumeric ) \
{ mTristate = nTristate; mString = sString; mNumber = nNumeric; mOptionalVal = NULL; };
- inline ImplControlValue( ButtonValue nTristate ) { mTristate = nTristate; mOptionalVal = NULL; };
- inline ImplControlValue( rtl::OUString sString ) { mString = sString; mOptionalVal = NULL; };
- inline ImplControlValue( long nNumeric ) { mNumber = nNumeric; mOptionalVal = NULL; };
- inline ImplControlValue( void * aOptVal ) { mOptionalVal = aOptVal; };
- inline ImplControlValue() { mTristate = BUTTONVALUE_DONTKNOW; mNumber = 0; mOptionalVal = NULL; };
+ explicit ImplControlValue( ButtonValue nTristate )
+ : mTristate(nTristate), mNumber(0), mOptionalVal(NULL) {}
+ explicit ImplControlValue( rtl::OUString& rString )
+ : mTristate(BUTTONVALUE_DONTKNOW), mString(rString), mNumber(0), mOptionalVal(NULL) {}
+ explicit ImplControlValue( long nNumeric )
+ : mTristate(BUTTONVALUE_DONTKNOW), mNumber( nNumeric), mOptionalVal(NULL) {}
+ explicit ImplControlValue( void* aOptVal )
+ : mTristate(BUTTONVALUE_DONTKNOW), mNumber(0), mOptionalVal(aOptVal) {}
+ inline ImplControlValue()
+ : mTristate(BUTTONVALUE_DONTKNOW), mNumber(0), mOptionalVal(NULL) {}
+
inline ~ImplControlValue() { mOptionalVal = NULL; };
inline ButtonValue getTristateVal( void ) const { return mTristate; }
diff --git a/vcl/inc/vcl/wrkwin.hxx b/vcl/inc/vcl/wrkwin.hxx
index 3d9c090272ab..8b2701420a2f 100644
--- a/vcl/inc/vcl/wrkwin.hxx
+++ b/vcl/inc/vcl/wrkwin.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: wrkwin.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.138.1 $
*
* This file is part of OpenOffice.org.
*
@@ -82,7 +82,14 @@ public:
virtual BOOL Close();
- void ShowFullScreenMode( BOOL bFullScreenMode = TRUE, sal_Int32 nDisplay = 0 );
+ /** The default value of nDisplay = -1 means "don't care" and
+ allows to backends to use any screen [** or display? terminology!]
+ they like (most probably the current one).
+
+ NOTE: The default value cannot be 0, because 0 is a legitimate
+ screen number.
+ */
+ void ShowFullScreenMode( BOOL bFullScreenMode = TRUE, sal_Int32 nDisplay = -1 );
void EndFullScreenMode() { ShowFullScreenMode( FALSE ); }
BOOL IsFullScreenMode() const { return mbFullScreenMode; }