loplugin:oncevar in cppcanvas..drawinglayer

Change-Id: I5456aad61fb0dfe6830eae62b91d1a6399d6343f
Reviewed-on: https://gerrit.libreoffice.org/39128
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

23 files changed, 36 insertions, 74 deletions

diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index 573f9cf14157..2d23d0c19e8f 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -166,9 +166,9 @@ ORowSet::ORowSet( const Reference< css::uno::XComponentContext >& _rxContext )
     m_pMySelf = this;
     m_aActiveConnection <<= m_xActiveConnection;
 
-    sal_Int32 nRBT  = PropertyAttribute::READONLY   | PropertyAttribute::BOUND      | PropertyAttribute::TRANSIENT;
-    sal_Int32 nRT   = PropertyAttribute::READONLY   | PropertyAttribute::TRANSIENT;
-    sal_Int32 nBT   = PropertyAttribute::BOUND      | PropertyAttribute::TRANSIENT;
+    sal_Int32 const nRBT = PropertyAttribute::READONLY   | PropertyAttribute::BOUND      | PropertyAttribute::TRANSIENT;
+    sal_Int32 const nRT  = PropertyAttribute::READONLY   | PropertyAttribute::TRANSIENT;
+    sal_Int32 const nBT  = PropertyAttribute::BOUND      | PropertyAttribute::TRANSIENT;
 
     m_aPrematureParamValues->get().resize( 0 );
 
@@ -2850,7 +2850,7 @@ ORowSetClone::ORowSetClone( const Reference<XComponentContext>& _rContext, ORowS
     m_pColumns = new ORowSetDataColumns(xMeta.is() && xMeta->supportsMixedCaseQuotedIdentifiers(),
                                         aColumns,*this,m_aMutex,aNames);
 
-    sal_Int32 nRT   = PropertyAttribute::READONLY   | PropertyAttribute::TRANSIENT;
+    sal_Int32 const nRT = PropertyAttribute::READONLY   | PropertyAttribute::TRANSIENT;
 
     // sdb.RowSet Properties
     registerMayBeVoidProperty(PROPERTY_ACTIVE_CONNECTION,PROPERTY_ID_ACTIVE_CONNECTION, PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY,   &rParent.m_aActiveConnection,   cppu::UnoType<XConnection>::get());
diff --git a/dbaccess/source/core/dataaccess/connection.cxx b/dbaccess/source/core/dataaccess/connection.cxx
index accc80ac7e56..95a53242d9b2 100644
--- a/dbaccess/source/core/dataaccess/connection.cxx
+++ b/dbaccess/source/core/dataaccess/connection.cxx
@@ -319,12 +319,11 @@ OConnection::OConnection(ODatabaseSource& _rDB
             Reference<XResultSet> xRes = xMeta->getTableTypes();
             if(xRes.is())
             {
-                OUString sView("VIEW");
                 Reference<XRow> xRow(xRes,UNO_QUERY);
                 while(xRes->next())
                 {
                     OUString sValue = xRow->getString(1);
-                    if( !xRow->wasNull() && sValue == sView)
+                    if( !xRow->wasNull() && sValue == "VIEW")
                     {
                         m_bSupportsViews = true;
                         break;
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
index cb2bbea06c2a..ee3109b5e2b4 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -1742,13 +1742,12 @@ Reference< XUIConfigurationManager2 > const & ODatabaseDocument::getUIConfigurat
         xConfigStorage = getDocumentSubStorage( aUIConfigFolderName, ElementModes::READWRITE );
         if ( xConfigStorage.is() )
         {
-            OUString aUIConfigMediaType( "application/vnd.sun.xml.ui.configuration" );
             OUString aMediaType;
             Reference< XPropertySet > xPropSet( xConfigStorage, UNO_QUERY );
             Any a = xPropSet->getPropertyValue( INFO_MEDIATYPE );
             if ( !( a >>= aMediaType ) ||  aMediaType.isEmpty() )
             {
-                a <<= aUIConfigMediaType;
+                a <<= OUString("application/vnd.sun.xml.ui.configuration");
                 xPropSet->setPropertyValue( INFO_MEDIATYPE, a );
             }
         }
diff --git a/dbaccess/source/core/dataaccess/databaseregistrations.cxx b/dbaccess/source/core/dataaccess/databaseregistrations.cxx
index 2ce22ba32448..6734c2e7dc57 100644
--- a/dbaccess/source/core/dataaccess/databaseregistrations.cxx
+++ b/dbaccess/source/core/dataaccess/databaseregistrations.cxx
@@ -184,23 +184,11 @@ namespace dbaccess
         if (aNodeForName.isValid())
             throw ElementExistException( _rName, *this );
 
-        OUString sNewNodeName;
+        // make unique
+        OUString sNewNodeName = "org.openoffice." + _rName;
+        while ( m_aConfigurationRoot.hasByName( sNewNodeName ) )
         {
-            OUStringBuffer aNewNodeName;
-            aNewNodeName.append( "org.openoffice." );
-            aNewNodeName.append( _rName );
-
-            // make unique
-            OUStringBuffer aReset( aNewNodeName );
-            sNewNodeName = aNewNodeName.makeStringAndClear();
-            sal_Int32 i=2;
-            while ( m_aConfigurationRoot.hasByName( sNewNodeName ) )
-            {
-                aNewNodeName = aReset;
-                aNewNodeName.append( " " );
-                aNewNodeName.append( i );
-                sNewNodeName = aNewNodeName.makeStringAndClear();
-            }
+            sNewNodeName = "org.openoffice." + _rName + " 2";
         }
 
         ::utl::OConfigurationNode aNewNode( m_aConfigurationRoot.createNode( sNewNodeName ) );
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index b271d29ddcff..9532e54bd133 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -2134,9 +2134,8 @@ void OApplicationController::renameEntry()
                         }
                         catch(const ElementExistException& e)
                         {
-                            OUString sStatus("S1000");
-                            OUString sMsg = OUString( ModuleRes( STR_NAME_ALREADY_EXISTS ) );
-                            showError(SQLExceptionInfo(SQLException(sMsg.replaceAll("#", e.Message), e.Context, sStatus, 0, Any())));
+                            OUString sMsg( ModuleRes( STR_NAME_ALREADY_EXISTS ) );
+                            showError(SQLExceptionInfo(SQLException(sMsg.replaceAll("#", e.Message), e.Context, "S1000", 0, Any())));
                         }
                         catch(const Exception& )
                         {
diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx
index 08af0e8e7fd4..eecaa2a59cdd 100644
--- a/dbaccess/source/ui/app/AppDetailView.cxx
+++ b/dbaccess/source/ui/app/AppDetailView.cxx
@@ -76,8 +76,7 @@ OCreationList::OCreationList( OTasksWindow& _rParent )
     ,m_pMouseDownEntry( nullptr )
     ,m_pLastActiveEntry( nullptr )
 {
-    sal_uInt16 nSize = SPACEBETWEENENTRIES;
-    SetSpaceBetweenEntries(nSize);
+    SetSpaceBetweenEntries(SPACEBETWEENENTRIES);
     SetSelectionMode( SelectionMode::NONE );
     SetExtendedWinBits( EWB_NO_AUTO_CURENTRY );
     SetNodeDefaultImages( );
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index 0517b4382832..241fa9aa19ad 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -3413,7 +3413,6 @@ void SbaTableQueryBrowser::implAdministrate( SvTreeListEntry* _pApplyTo )
     try
     {
         // get the desktop object
-        sal_Int32 nFrameSearchFlag = FrameSearchFlag::ALL | FrameSearchFlag::GLOBAL ;
         Reference< XDesktop2 > xFrameLoader = Desktop::create( getORB() );
 
         // the initial selection
@@ -3443,7 +3442,7 @@ void SbaTableQueryBrowser::implAdministrate( SvTreeListEntry* _pApplyTo )
             xFrameLoader->loadComponentFromURL(
                 xDocumentModel->getURL(),
                 "_default",
-                nFrameSearchFlag,
+                FrameSearchFlag::ALL | FrameSearchFlag::GLOBAL,
                 aLoadArgPV
             );
         }
diff --git a/dbaccess/source/ui/control/TableGrantCtrl.cxx b/dbaccess/source/ui/control/TableGrantCtrl.cxx
index 08a16e8761e5..91cd2b3c64b3 100644
--- a/dbaccess/source/ui/control/TableGrantCtrl.cxx
+++ b/dbaccess/source/ui/control/TableGrantCtrl.cxx
@@ -137,8 +137,8 @@ void OTableGrantControl::Init()
 
     UpdateTables();
     // set browser mode
-    BrowserMode nMode = BrowserMode::COLUMNSELECTION | BrowserMode::HLINES | BrowserMode::VLINES |
-                        BrowserMode::HIDECURSOR      | BrowserMode::HIDESELECT;
+    BrowserMode const nMode = BrowserMode::COLUMNSELECTION | BrowserMode::HLINES | BrowserMode::VLINES |
+                              BrowserMode::HIDECURSOR      | BrowserMode::HIDESELECT;
 
     SetMode(nMode);
 }
diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx
index 8b768662079f..07fcb331ce65 100644
--- a/dbaccess/source/ui/control/dbtreelistbox.cxx
+++ b/dbaccess/source/ui/control/dbtreelistbox.cxx
@@ -65,8 +65,7 @@ DBTreeListBox::DBTreeListBox( vcl::Window* pParent, WinBits nWinStyle )
 
 void DBTreeListBox::init()
 {
-    sal_uInt16 nSize = SPACEBETWEENENTRIES;
-    SetSpaceBetweenEntries(nSize);
+    SetSpaceBetweenEntries(SPACEBETWEENENTRIES);
 
     m_aTimer.SetTimeout(900);
     m_aTimer.SetInvokeHandler(LINK(this, DBTreeListBox, OnTimeOut));
diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx b/dbaccess/source/ui/dlg/CollectionView.cxx
index 7084019c5d5d..019cb59cabf7 100644
--- a/dbaccess/source/ui/dlg/CollectionView.cxx
+++ b/dbaccess/source/ui/dlg/CollectionView.cxx
@@ -157,10 +157,9 @@ IMPL_LINK_NOARG(OCollectionView, Save_Click, Button*, void)
                     aValue.Value <<= OUString("folder");
                     aValues[1] <<= aValue;
 
-                    InteractionClassification eClass = InteractionClassification_ERROR;
-                    css::ucb::IOErrorCode eError = IOErrorCode_NOT_EXISTING_PATH;
-                    OUString sTemp;
-                    InteractiveAugmentedIOException aException(sTemp,Reference<XInterface>(),eClass,eError,aValues);
+                    InteractiveAugmentedIOException aException(OUString(),Reference<XInterface>(),
+                                                               InteractionClassification_ERROR,
+                                                               IOErrorCode_NOT_EXISTING_PATH,aValues);
 
                     Reference<XInteractionHandler2> xHandler(
                         InteractionHandler::createWithParent(m_xContext, VCLUnoHelper::GetInterface( this )));
diff --git a/dbaccess/source/ui/dlg/DriverSettings.cxx b/dbaccess/source/ui/dlg/DriverSettings.cxx
index b553697a88f0..549ec62b9b9c 100644
--- a/dbaccess/source/ui/dlg/DriverSettings.cxx
+++ b/dbaccess/source/ui/dlg/DriverSettings.cxx
@@ -53,20 +53,6 @@ void ODriversSettings::getSupportedIndirectSettings( const OUString& _sURLPrefix
 
     ::connectivity::DriversConfig aDriverConfig(_xContext);
     const ::comphelper::NamedValueCollection& aProperties = aDriverConfig.getProperties(_sURLPrefix);
-#if OSL_DEBUG_LEVEL > 0
-    {
-        Sequence< NamedValue > aNamedValues;
-        aProperties >>= aNamedValues;
-        for (   const NamedValue* loop = aNamedValues.getConstArray();
-                loop != aNamedValues.getConstArray() + aNamedValues.getLength();
-                ++loop
-            )
-        {
-            int dummy = 0;
-            (void)dummy;
-        }
-    }
-#endif
     typedef std::pair<sal_uInt16, OUString> TProperties;
     TProperties aProps[] = { TProperties(DSID_SHOWDELETEDROWS,OUString("ShowDeleted"))
                             ,TProperties(DSID_CHARSET,OUString("CharSet"))
diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
index 6e8316400133..88a777396536 100644
--- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
@@ -401,7 +401,7 @@ namespace dbaui
 
     OUString OTextConnectionHelper::GetSeparator( const ComboBox& rBox, const OUString& rList )
     {
-        sal_Unicode nTok = '\t';
+        sal_Unicode const nTok = '\t';
         sal_Int32 nPos(rBox.GetEntryPos( rBox.GetText() ));
 
         if( nPos == COMBOBOX_ENTRY_NOTFOUND )
diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx
index 79f10f3ca6fa..76c7160d5ac5 100644
--- a/dbaccess/source/ui/dlg/dbfindex.cxx
+++ b/dbaccess/source/ui/dlg/dbfindex.cxx
@@ -297,8 +297,8 @@ void ODbaseIndexDialog::Init()
 
     Sequence< OUString> aFolderContent( ::utl::LocalFileHelper::GetFolderContents(m_aDSN,bFolder));
 
-    OUString aIndexExt("ndx");
-    OUString aTableExt("dbf");
+    OUString const aIndexExt("ndx");
+    OUString const aTableExt("dbf");
 
     std::vector< OUString > aUsedIndexes;
 
diff --git a/dbaccess/source/ui/dlg/textconnectionsettings.cxx b/dbaccess/source/ui/dlg/textconnectionsettings.cxx
index af6d70529a5e..6c741ad71424 100644
--- a/dbaccess/source/ui/dlg/textconnectionsettings.cxx
+++ b/dbaccess/source/ui/dlg/textconnectionsettings.cxx
@@ -71,8 +71,7 @@ namespace dbaui
     {
         if ( m_pTextConnectionHelper->prepareLeave() )
         {
-            bool bUnused = false;
-            m_pTextConnectionHelper->FillItemSet( m_rItems, bUnused );
+            m_pTextConnectionHelper->FillItemSet( m_rItems, false/*bUnused*/ );
             EndDialog( RET_OK );
         }
     }
diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx
index da48f4bcb9fc..5e3861764afe 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -843,8 +843,7 @@ bool callColumnFormatDialog(vcl::Window* _pParent,
 
     if (!bText)
     {
-        double dPreviewVal = 1234.56789;
-        SvxNumberInfoItem aFormatter(_pFormatter, dPreviewVal, SID_ATTR_NUMBERFORMAT_INFO);
+        SvxNumberInfoItem aFormatter(_pFormatter, 1234.56789, SID_ATTR_NUMBERFORMAT_INFO);
         pFormatDescriptor->Put(aFormatter);
     }
 
diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx
index 1457bea1227c..d66e4c7bd02c 100644
--- a/dbaccess/source/ui/misc/WCopyTable.cxx
+++ b/dbaccess/source/ui/misc/WCopyTable.cxx
@@ -1035,7 +1035,7 @@ void OCopyTableWizard::loadData(  const ICopyTableSourceObject& _rSourceObject,
     _rColumns.clear();
 
     OFieldDescription* pActFieldDescr = nullptr;
-    OUString sCreateParam("x");
+    OUString const sCreateParam("x");
     // ReadOnly-Flag
     // On drop no line must be editable.
     // On add only empty lines must be editable.
@@ -1509,7 +1509,7 @@ TOTypeInfoSP OCopyTableWizard::convertType(const TOTypeInfoSP& _pType, bool& _bN
         if ( !pType.get() )
         {
             _bNotConvert = false;
-            OUString sCreate("x");
+            OUString const sCreate("x");
             pType = ::dbaui::getTypeInfoFromType(m_aDestTypeInfo,DataType::VARCHAR,_pType->aTypeName,sCreate,50,0,false,bForce);
             if ( !pType.get() )
                 pType = m_pTypeInfo;
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index 80e8cd603343..9b25e3f9bd95 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -2080,7 +2080,7 @@ sal_Int32 OSelectionBrowseBox::GetNoneVisibleRows() const
 {
     sal_Int32 nErg(0);
     // only the first 11 row are interesting
-    sal_Int32 nSize = SAL_N_ELEMENTS(nVisibleRowMask);
+    sal_Int32 const nSize = SAL_N_ELEMENTS(nVisibleRowMask);
     for(sal_Int32 i=0;i<nSize;i++)
     {
         if(!m_bVisibleRow[i])
@@ -2092,7 +2092,7 @@ sal_Int32 OSelectionBrowseBox::GetNoneVisibleRows() const
 void OSelectionBrowseBox::SetNoneVisbleRow(long nRows)
 {
     // only the first 11 row are interesting
-    sal_Int32 nSize = SAL_N_ELEMENTS(nVisibleRowMask);
+    sal_Int32 const nSize = SAL_N_ELEMENTS(nVisibleRowMask);
     for(sal_Int32 i=0;i< nSize;i++)
         m_bVisibleRow[i] = !(nRows & nVisibleRowMask[i]);
 }
diff --git a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
index edc491324117..f6d30e1e3c32 100644
--- a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
+++ b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
@@ -157,7 +157,6 @@ namespace dbaui
     }
     bool OQueryContainerWindow::PreNotify( NotifyEvent& rNEvt )
     {
-        bool bHandled = false;
         if (rNEvt.GetType() == MouseNotifyEvent::GETFOCUS && m_pViewSwitch)
         {
             OJoinController& rController = m_pViewSwitch->getDesignView()->getController();
@@ -165,7 +164,7 @@ namespace dbaui
             rController.InvalidateFeature(SID_COPY);
             rController.InvalidateFeature(SID_PASTE);
         }
-        return bHandled || ODataView::PreNotify(rNEvt);
+        return ODataView::PreNotify(rNEvt);
     }
     void OQueryContainerWindow::showPreview(const Reference<XFrame>& _xFrame)
     {
diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx
index a3264d3cb609..b300210f2d18 100644
--- a/dbaccess/source/ui/tabledesign/TableController.cxx
+++ b/dbaccess/source/ui/tabledesign/TableController.cxx
@@ -825,7 +825,7 @@ void OTableController::loadData()
             pTabEdRow->SetReadOnly(!bIsAlterAllowed);
             // search for type
             bool bForce;
-            OUString sCreate("x");
+            OUString const sCreate("x");
             TOTypeInfoSP pTypeInfo = ::dbaui::getTypeInfoFromType(m_aTypeInfo,nType,sTypeName,sCreate,nPrecision,nScale,bIsAutoIncrement,bForce);
             if ( !pTypeInfo.get() )
                 pTypeInfo = m_pTypeInfo;
diff --git a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
index 7478afbab513..604314e1a6f2 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
@@ -64,8 +64,8 @@ void OTableRowView::Init()
     // set up HandleColumn for at maximum 5 digits
     InsertHandleColumn(static_cast<sal_uInt16>(GetTextWidth(OUString('0')) * 4)/*, sal_True */);
 
-    BrowserMode nMode = BrowserMode::COLUMNSELECTION | BrowserMode::MULTISELECTION | BrowserMode::KEEPHIGHLIGHT |
-                        BrowserMode::HLINES | BrowserMode::VLINES | BrowserMode::AUTOSIZE_LASTCOL;
+    BrowserMode const nMode = BrowserMode::COLUMNSELECTION | BrowserMode::MULTISELECTION | BrowserMode::KEEPHIGHLIGHT |
+                              BrowserMode::HLINES | BrowserMode::VLINES | BrowserMode::AUTOSIZE_LASTCOL;
 
     SetMode(nMode);
 }
diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
index 19c48c2b457d..f6a7953214b2 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
@@ -213,7 +213,6 @@ void OTableDesignView::resizeDocumentView(tools::Rectangle& _rPlayground)
 
 bool OTableDesignView::PreNotify( NotifyEvent& rNEvt )
 {
-    bool bHandled = false;
     if (rNEvt.GetType() == MouseNotifyEvent::GETFOCUS)
     {
         if( GetDescWin() && GetDescWin()->HasChildPathFocus() )
@@ -224,7 +223,7 @@ bool OTableDesignView::PreNotify( NotifyEvent& rNEvt )
             m_eChildFocus = NONE;
     }
 
-    return bHandled || ODataView::PreNotify(rNEvt);
+    return ODataView::PreNotify(rNEvt);
 }
 
 IClipboardTest* OTableDesignView::getActiveChild() const
diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
index cce951ac698b..2b674638efd4 100644
--- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
+++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
@@ -262,7 +262,6 @@ void OTableFieldDescWin::LoseFocus()
 
 bool OTableFieldDescWin::PreNotify( NotifyEvent& rNEvt )
 {
-    bool bHandled = false;
     if (rNEvt.GetType() == MouseNotifyEvent::GETFOCUS)
     {
         if( getGenPage() && getGenPage()->HasChildPathFocus() )
@@ -270,7 +269,7 @@ bool OTableFieldDescWin::PreNotify( NotifyEvent& rNEvt )
         else
             m_eChildFocus = HELP;
     }
-    return bHandled || TabPage::PreNotify(rNEvt);
+    return TabPage::PreNotify(rNEvt);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/uno/ColumnPeer.cxx b/dbaccess/source/ui/uno/ColumnPeer.cxx
index 3700aa5d7637..1e7bae1ca536 100644
--- a/dbaccess/source/ui/uno/ColumnPeer.cxx
+++ b/dbaccess/source/ui/uno/ColumnPeer.cxx
@@ -86,7 +86,7 @@ void OColumnPeer::setColumn(const Reference< XPropertySet>& _xColumn)
 
             m_pActFieldDescr = new OFieldDescription(_xColumn,true);
             // search for type
-            OUString sCreateParam("x");
+            OUString const sCreateParam("x");
             bool bForce;
             TOTypeInfoSP pTypeInfo = ::dbaui::getTypeInfoFromType(*pFieldControl->getTypeInfo(),nType,sTypeName,sCreateParam,nPrecision,nScale,bAutoIncrement,bForce);
             if ( !pTypeInfo.get() )