Merge branch 'master' into feature/gnumake4

Conflicts:
	dbaccess/AllLangResTarget_adabasui.mk
	dbaccess/AllLangResTarget_dba.mk
	dbaccess/AllLangResTarget_dbmm.mk
	dbaccess/AllLangResTarget_sdbt.mk
	dbaccess/Executable_odbcconfig.mk
	dbaccess/JunitTest_dbaccess_unoapi.mk
	dbaccess/Library_adabasui.mk
	dbaccess/Library_dba.mk
	dbaccess/Library_dbaxml.mk
	dbaccess/Library_dbmm.mk
	dbaccess/Library_sdbt.mk
	dbaccess/Makefile
	dbaccess/Module_dbaccess.mk
	dbaccess/Package_inc.mk
	dbaccess/Package_uiconfig.mk
	dbaccess/prj/build.lst
	dbaccess/qa/unoapi/Test.java
	dbaccess/source/core/api/CacheSet.hxx
	dbaccess/source/core/dataaccess/SharedConnection.hxx
	dbaccess/source/core/dataaccess/connection.cxx
	dbaccess/source/filter/xml/xmlAutoStyle.cxx
	dbaccess/source/filter/xml/xmlColumn.cxx
	dbaccess/source/filter/xml/xmlComponent.cxx
	dbaccess/source/filter/xml/xmlConnectionData.cxx
	dbaccess/source/filter/xml/xmlConnectionResource.cxx
	dbaccess/source/filter/xml/xmlDataSource.cxx
	dbaccess/source/filter/xml/xmlDataSourceInfo.cxx
	dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
	dbaccess/source/filter/xml/xmlDataSourceSettings.cxx
	dbaccess/source/filter/xml/xmlDatabaseDescription.cxx
	dbaccess/source/filter/xml/xmlDocuments.cxx
	dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx
	dbaccess/source/filter/xml/xmlHelper.cxx
	dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
	dbaccess/source/filter/xml/xmlLogin.cxx
	dbaccess/source/filter/xml/xmlQuery.cxx
	dbaccess/source/filter/xml/xmlServerDatabase.cxx
	dbaccess/source/filter/xml/xmlTable.cxx
	dbaccess/source/filter/xml/xmlTableFilterList.cxx
	dbaccess/source/filter/xml/xmlTableFilterPattern.cxx
	dbaccess/source/ui/app/AppDetailPageHelper.cxx
	dbaccess/source/ui/app/AppDetailView.cxx
	dbaccess/source/ui/app/AppIconControl.cxx
	dbaccess/source/ui/app/AppSwapWindow.cxx
	dbaccess/source/ui/app/AppTitleWindow.cxx
	dbaccess/source/ui/app/AppView.cxx
	dbaccess/source/ui/browser/AsyncronousLink.cxx
	dbaccess/source/ui/browser/genericcontroller.cxx
	dbaccess/source/ui/control/ColumnControlWindow.cxx
	dbaccess/source/ui/control/RelationControl.cxx
	dbaccess/source/ui/control/SqlNameEdit.cxx
	dbaccess/source/ui/control/TableGrantCtrl.cxx
	dbaccess/source/ui/control/VertSplitView.cxx
	dbaccess/source/ui/control/toolboxcontroller.cxx
	dbaccess/source/ui/dlg/CollectionView.cxx
	dbaccess/source/ui/dlg/ConnectionHelper.cxx
	dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
	dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
	dbaccess/source/ui/dlg/RelationDlg.cxx
	dbaccess/source/ui/dlg/TextConnectionHelper.cxx
	dbaccess/source/ui/dlg/detailpages.cxx
	dbaccess/source/ui/dlg/dlgsize.cxx
	dbaccess/source/ui/dlg/queryorder.cxx
	dbaccess/source/ui/dlg/tablespage.cxx
	dbaccess/source/ui/misc/TableCopyHelper.cxx
	dbaccess/source/ui/misc/ToolBoxHelper.cxx
	dbaccess/source/ui/misc/WExtendPages.cxx
	dbaccess/source/ui/misc/WNameMatch.cxx
	dbaccess/source/ui/misc/WTypeSelect.cxx
	dbaccess/source/ui/querydesign/ConnectionLine.cxx
	dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
	dbaccess/source/ui/querydesign/ConnectionLineData.cxx
	dbaccess/source/ui/querydesign/JAccess.cxx
	dbaccess/source/ui/querydesign/JoinController.cxx
	dbaccess/source/ui/querydesign/JoinDesignView.cxx
	dbaccess/source/ui/querydesign/JoinExchange.cxx
	dbaccess/source/ui/querydesign/JoinTableView.cxx
	dbaccess/source/ui/querydesign/QTableConnection.cxx
	dbaccess/source/ui/querydesign/QTableConnectionData.cxx
	dbaccess/source/ui/querydesign/QTableWindow.cxx
	dbaccess/source/ui/querydesign/QTableWindowData.cxx
	dbaccess/source/ui/querydesign/QueryDesignView.cxx
	dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx
	dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx
	dbaccess/source/ui/querydesign/QueryTextView.cxx
	dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
	dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
	dbaccess/source/ui/querydesign/TableConnection.cxx
	dbaccess/source/ui/querydesign/TableConnectionData.cxx
	dbaccess/source/ui/querydesign/TableWindow.cxx
	dbaccess/source/ui/querydesign/TableWindowAccess.cxx
	dbaccess/source/ui/querydesign/TableWindowData.cxx
	dbaccess/source/ui/querydesign/TableWindowListBox.cxx
	dbaccess/source/ui/querydesign/TableWindowTitle.cxx
	dbaccess/source/ui/querydesign/querydlg.cxx
	dbaccess/source/ui/querydesign/queryview.cxx
	dbaccess/source/ui/relationdesign/RTableConnection.cxx
	dbaccess/source/ui/relationdesign/RelationDesignView.cxx
	dbaccess/source/ui/relationdesign/RelationTableView.cxx
	dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx
	dbaccess/source/ui/tabledesign/FieldDescriptions.cxx
	dbaccess/source/ui/tabledesign/TEditControl.cxx
	dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx
	dbaccess/source/ui/tabledesign/TableDesignView.cxx
	dbaccess/source/ui/tabledesign/TableFieldControl.cxx
	dbaccess/source/ui/tabledesign/TableRow.cxx
	dbaccess/source/ui/tabledesign/TableRowExchange.cxx
	dbaccess/source/ui/tabledesign/TableUndo.cxx
	dbaccess/source/ui/uno/ColumnControl.cxx
	dbaccess/source/ui/uno/ColumnPeer.cxx
	reportdesign/AllLangResTarget_rpt.mk
	reportdesign/AllLangResTarget_rptui.mk
	reportdesign/Library_rpt.mk
	reportdesign/Library_rptui.mk
	reportdesign/Library_rptxml.mk
	reportdesign/Module_reportdesign.mk
	reportdesign/Package_uiconfig.mk
	reportdesign/Package_xml.mk
	reportdesign/prj/build.lst
	reportdesign/prj/makefile.mk

1 files changed, 6 insertions, 7 deletions

diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx
index b47d2182489a..fa16813dd8fa 100644
--- a/dbaccess/source/ui/dlg/adtabdlg.cxx
+++ b/dbaccess/source/ui/dlg/adtabdlg.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -189,7 +190,7 @@ void TableListFacade::updateTableObjectList( bool _bAllowViews )
                     m_pContainerListener = new ::comphelper::OContainerListenerAdapter(this,xContainer);
             }
             sTables = xTables->getElementNames();
-        } // if ( xTables.is() )
+        }
 
         xViewSupp.set( xTableSupp, UNO_QUERY );
         if ( xViewSupp.is() )
@@ -297,13 +298,10 @@ void QueryListFacade::updateTableObjectList( bool /*_bAllowViews*/ )
     try
     {
         ImageProvider aImageProvider( m_xConnection );
-        Image aQueryImage( aImageProvider.getDefaultImage( DatabaseObject::QUERY, false ) );
-        Image aQueryImageHC( aImageProvider.getDefaultImage( DatabaseObject::QUERY, true ) );
+        Image aQueryImage( aImageProvider.getDefaultImage( DatabaseObject::QUERY ) );
 
-        m_rQueryList.SetDefaultExpandedEntryBmp( aQueryImage, BMP_COLOR_NORMAL );
-        m_rQueryList.SetDefaultCollapsedEntryBmp( aQueryImage, BMP_COLOR_NORMAL );
-        m_rQueryList.SetDefaultExpandedEntryBmp( aQueryImageHC, BMP_COLOR_HIGHCONTRAST );
-        m_rQueryList.SetDefaultCollapsedEntryBmp( aQueryImageHC, BMP_COLOR_HIGHCONTRAST );
+        m_rQueryList.SetDefaultExpandedEntryBmp( aQueryImage );
+        m_rQueryList.SetDefaultCollapsedEntryBmp( aQueryImage );
 
         Reference< XQueriesSupplier > xSuppQueries( m_xConnection, UNO_QUERY_THROW );
         Reference< XNameAccess > xQueries( xSuppQueries->getQueries(), UNO_QUERY_THROW );
@@ -531,3 +529,4 @@ String OAddTableDlg::getDialogTitleForContext( IAddTableDialogContext& _rContext
 
 // -----------------------------------------------------------------------------
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */