Build and warning fixes, Mac, Win, Linux.

Change-Id: I8a8420f96c512e031ba3cde499523b71341dfa94

4 files changed, 32 insertions, 32 deletions

diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx
index 031028942fa5..b020b5d6acad 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.cxx
+++ b/dbaccess/source/ui/dlg/advancedsettings.cxx
@@ -48,7 +48,7 @@ namespace dbaui
     // SpecialSettingsPage
     struct BooleanSettingDesc
     {
-        VclPtr<CheckBox>& ppControl;          // the dialog's control which displays this setting
+        VclPtr<CheckBox>* ppControl;    // the dialog's control which displays this setting
         OString     sControlId;         // the widget name of the control in the .ui
         sal_uInt16  nItemId;            // the ID of the item (in an SfxItemSet) which corresponds to this setting
         bool        bInvertedDisplay;   // true if and only if the checkbox is checked when the item is sal_False, and vice versa
@@ -95,14 +95,14 @@ namespace dbaui
             sal_uInt16 nItemId = setting->nItemId;
             if ( rFeatures.has( nItemId ) )
             {
-                get(setting->ppControl, setting->sControlId);
-                setting->ppControl->SetClickHdl( getControlModifiedLink() );
-                setting->ppControl->Show();
+                get(*setting->ppControl, setting->sControlId);
+                (*setting->ppControl)->SetClickHdl( getControlModifiedLink() );
+                (*setting->ppControl)->Show();
 
                 // check whether this must be a tristate check box
                 const SfxPoolItem& rItem = _rCoreAttrs.Get( nItemId );
                 if ( rItem.ISA( OptionalBoolItem ) )
-                    setting->ppControl->EnableTriState( true );
+                    (*setting->ppControl)->EnableTriState( true );
             }
         }
 
@@ -124,7 +124,7 @@ namespace dbaui
         if ( m_bHasMaxRowScan )
         {
             get(m_pMaxRowScanLabel, "rowsft");
-            get(m_pMaxRowScan, "rows");
+-            get(m_pMaxRowScan, "rows");
             m_pMaxRowScan->SetModifyHdl(getControlModifiedLink());
             m_pMaxRowScan->SetUseThousandSep(false);
             m_pMaxRowScanLabel->Show();
@@ -169,22 +169,22 @@ namespace dbaui
 
         // for easier maintenance, write the table in this form, then copy it to m_aBooleanSettings
         BooleanSettingDesc aSettings[] = {
-            { m_pIsSQL92Check,                 "usesql92",        DSID_SQL92CHECK,            false },
-            { m_pAppendTableAlias,             "append",          DSID_APPEND_TABLE_ALIAS,    false },
-            { m_pAsBeforeCorrelationName,      "useas",           DSID_AS_BEFORE_CORRNAME,    false },
-            { m_pEnableOuterJoin,              "useoj",           DSID_ENABLEOUTERJOIN,       false },
-            { m_pIgnoreDriverPrivileges,       "ignoreprivs",     DSID_IGNOREDRIVER_PRIV,     false },
-            { m_pParameterSubstitution,        "replaceparams",   DSID_PARAMETERNAMESUBST,    false },
-            { m_pSuppressVersionColumn,        "displayver",      DSID_SUPPRESSVERSIONCL,     true },
-            { m_pCatalog,                      "usecatalogname",  DSID_CATALOG,               false },
-            { m_pSchema,                       "useschemaname",   DSID_SCHEMA,                false },
-            { m_pIndexAppendix,                "createindex",     DSID_INDEXAPPENDIX,         false },
-            { m_pDosLineEnds,                  "eol",             DSID_DOSLINEENDS,           false },
-            { m_pCheckRequiredFields,          "ignorecurrency",  DSID_CHECK_REQUIRED_FIELDS, false },
-            { m_pIgnoreCurrency,               "inputchecks",     DSID_IGNORECURRENCY,        false },
-            { m_pEscapeDateTime,               "useodbcliterals", DSID_ESCAPE_DATETIME,       false },
-            { m_pPrimaryKeySupport,            "primarykeys",     DSID_PRIMARY_KEY_SUPPORT,   false },
-            { m_pRespectDriverResultSetType,   "resulttype",      DSID_RESPECTRESULTSETTYPE,  false },
+            { &m_pIsSQL92Check,                 "usesql92",        DSID_SQL92CHECK,            false },
+            { &m_pAppendTableAlias,             "append",          DSID_APPEND_TABLE_ALIAS,    false },
+            { &m_pAsBeforeCorrelationName,      "useas",           DSID_AS_BEFORE_CORRNAME,    false },
+            { &m_pEnableOuterJoin,              "useoj",           DSID_ENABLEOUTERJOIN,       false },
+            { &m_pIgnoreDriverPrivileges,       "ignoreprivs",     DSID_IGNOREDRIVER_PRIV,     false },
+            { &m_pParameterSubstitution,        "replaceparams",   DSID_PARAMETERNAMESUBST,    false },
+            { &m_pSuppressVersionColumn,        "displayver",      DSID_SUPPRESSVERSIONCL,     true  },
+            { &m_pCatalog,                      "usecatalogname",  DSID_CATALOG,               false },
+            { &m_pSchema,                       "useschemaname",   DSID_SCHEMA,                false },
+            { &m_pIndexAppendix,                "createindex",     DSID_INDEXAPPENDIX,         false },
+            { &m_pDosLineEnds,                  "eol",             DSID_DOSLINEENDS,           false },
+            { &m_pCheckRequiredFields,          "ignorecurrency",  DSID_CHECK_REQUIRED_FIELDS, false },
+            { &m_pIgnoreCurrency,               "inputchecks",     DSID_IGNORECURRENCY,        false },
+            { &m_pEscapeDateTime,               "useodbcliterals", DSID_ESCAPE_DATETIME,       false },
+            { &m_pPrimaryKeySupport,            "primarykeys",     DSID_PRIMARY_KEY_SUPPORT,   false },
+            { &m_pRespectDriverResultSetType,   "resulttype",      DSID_RESPECTRESULTSETTYPE,  false }
         };
 
         for ( const BooleanSettingDesc& pCopy : aSettings )
@@ -212,9 +212,9 @@ namespace dbaui
                 ++setting
              )
         {
-            if ( setting->ppControl )
+            if ( (*setting->ppControl) )
             {
-                _rControlList.push_back( new OSaveValueWrapper< CheckBox >( setting->ppControl ) );
+                _rControlList.push_back( new OSaveValueWrapper< CheckBox >( *setting->ppControl ) );
             }
         }
 
@@ -242,7 +242,7 @@ namespace dbaui
                 ++setting
              )
         {
-            if ( !setting->ppControl )
+            if ( !(*setting->ppControl) )
                 continue;
 
             ::boost::optional< bool > aValue(false);
@@ -262,14 +262,14 @@ namespace dbaui
 
             if ( !aValue )
             {
-                setting->ppControl->SetState( TRISTATE_INDET );
+                (*setting->ppControl)->SetState( TRISTATE_INDET );
             }
             else
             {
                 bool bValue = *aValue;
                 if ( setting->bInvertedDisplay )
                     bValue = !bValue;
-                setting->ppControl->Check( bValue );
+                (*setting->ppControl)->Check( bValue );
             }
         }
 
@@ -299,9 +299,9 @@ namespace dbaui
                 ++setting
              )
         {
-            if ( !setting->ppControl )
+            if ( !*setting->ppControl )
                 continue;
-            fillBool( *_rSet, setting->ppControl, setting->nItemId, bChangedSomething, setting->bInvertedDisplay );
+            fillBool( *_rSet, *setting->ppControl, setting->nItemId, bChangedSomething, setting->bInvertedDisplay );
         }
 
         // the non-boolean items
diff --git a/vcl/osx/a11ylistener.cxx b/vcl/osx/a11ylistener.cxx
index bc966361633a..630a126dc7a9 100644
--- a/vcl/osx/a11ylistener.cxx
+++ b/vcl/osx/a11ylistener.cxx
@@ -71,7 +71,7 @@ AquaA11yEventListener::notifyEvent( const AccessibleEventObject& aEvent ) throw(
 {
     NSString * notification = nil;
     id element = m_wrapperObject;
-    Rectangle bounds;
+    ::css::awt::Rectangle bounds;
 
     // TODO: NSAccessibilityValueChanged, NSAccessibilitySelectedRowsChangedNotification
     switch( aEvent.EventId )
diff --git a/vcl/qa/cppunit/complextext.cxx b/vcl/qa/cppunit/complextext.cxx
index 7e3550bf2c43..0c666c356a93 100644
--- a/vcl/qa/cppunit/complextext.cxx
+++ b/vcl/qa/cppunit/complextext.cxx
@@ -44,7 +44,7 @@ void VclComplexTextTest::testArabic()
                            SAL_N_ELEMENTS( pOneTwoThreeUTF8 ) - 1,
                            RTL_TEXTENCODING_UTF8 );
     VclPtr<vcl::Window> pWin = VclPtr<WorkWindow>::Create( (vcl::Window *)nullptr );
-    CPPUNIT_ASSERT( pWin != NULL );
+    CPPUNIT_ASSERT( pWin );
 
     OutputDevice *pOutDev = static_cast< OutputDevice * >( pWin.get() );
 
diff --git a/vcl/qa/cppunit/outdev.cxx b/vcl/qa/cppunit/outdev.cxx
index 80687af4bb65..a32ee7d3fd94 100644
--- a/vcl/qa/cppunit/outdev.cxx
+++ b/vcl/qa/cppunit/outdev.cxx
@@ -74,7 +74,7 @@ void VclOutdevTest::testVirtualDevice()
 
 #if 0
     VclPtr<vcl::Window> pWin = VclPtr<WorkWindow>::Create( (vcl::Window *)nullptr );
-    CPPUNIT_ASSERT( pWin != NULL );
+    CPPUNIT_ASSERT( pWin );
     OutputDevice *pOutDev = static_cast< OutputDevice * >( pWin );
 #endif
 }