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, 39 deletions

diff --git a/dbaccess/source/filter/xml/xmlStyleImport.cxx b/dbaccess/source/filter/xml/xmlStyleImport.cxx
index d24edcc1264d..f48d9b96437c 100644
--- a/dbaccess/source/filter/xml/xmlStyleImport.cxx
+++ b/dbaccess/source/filter/xml/xmlStyleImport.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.
@@ -28,58 +29,23 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_dbaxml.hxx"
 
-#ifndef DBA_XMLSTYLEIMPORT_HXX
 #include "xmlStyleImport.hxx"
-#endif
 
-#ifndef _XMLOFF_NMSPMAP_HXX
 #include <xmloff/nmspmap.hxx>
-#endif
-#ifndef _XMLOFF_XMLNMSPE_HXX
 #include <xmloff/xmlnmspe.hxx>
-#endif
-#ifndef _XMLOFF_XMLIMPPR_HXX
 #include <xmloff/xmlimppr.hxx>
-#endif
-#ifndef _XMLOFF_FAMILIES_HXX_
 #include <xmloff/families.hxx>
-#endif
-#ifndef _XMLOFF_XMLNUMFI_HXX
 #include <xmloff/xmlnumfi.hxx>
-#endif
-#ifndef _XMLOFF_XMLTOKEN_HXX
 #include <xmloff/xmltoken.hxx>
-#endif
-#ifndef _COM_SUN_STAR_STYLE_XSTYLEFAMILIESSUPPLIER_HPP_
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
-#endif
-#ifndef _COM_SUN_STAR_CONTAINER_XNAMECONTAINER_HPP_
 #include <com/sun/star/container/XNameContainer.hpp>
-#endif
-#ifndef _COM_SUN_STAR_TABLE_BORDERLINE_HPP_
 #include <com/sun/star/table/BorderLine.hpp>
-#endif
-#ifndef _COMPHELPER_EXTRACT_HXX_
 #include <comphelper/extract.hxx>
-#endif
-#ifndef _XMLOFF_XMLPROPERTYSETCONTEXT_HXX
 #include <xmloff/xmlprcon.hxx>
-#endif
-#ifndef _XMLOFF_XMLUCONV_HXX
 #include <xmloff/xmluconv.hxx>
-#endif
-#ifndef _TOOLS_DEBUG_HXX
-#include <tools/debug.hxx>
-#endif
-#ifndef DBA_XMLFILTER_HXX
+#include <osl/diagnose.h>
 #include "xmlfilter.hxx"
-#endif
-#ifndef DBA_XMLHELPER_HXX
 #include "xmlHelper.hxx"
-#endif
-#ifndef _TOOLS_DEBUG_HXX
-#include <tools/debug.hxx>
-#endif
 
 
 #define XML_LINE_LEFT 0
@@ -154,7 +120,7 @@ void OTableStyleContext::FillPropertySet(
                         pStyle = PTR_CAST(SvXMLNumFormatContext,pMyStyles->
                             FindStyleChildContext(XML_STYLE_FAMILY_DATA_STYLE, m_sDataStyleName, sal_True));
                     else {
-                        DBG_ERROR("not possible to get style");
+                        OSL_FAIL("not possible to get style");
                     }
                 }
                 if ( pStyle )
@@ -162,7 +128,6 @@ void OTableStyleContext::FillPropertySet(
                     uno::Any aNumberFormat;
                     m_nNumberFormat = pStyle->GetKey();
                     aNumberFormat <<= m_nNumberFormat;
-                    //rPropSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_NUMBERFORMAT)), aNumberFormat);
                     AddProperty(CTF_DB_NUMBERFORMAT, aNumberFormat);
                 }
             }
@@ -180,7 +145,7 @@ void OTableStyleContext::SetDefaults()
 void OTableStyleContext::AddProperty(const sal_Int16 nContextID, const uno::Any& rValue)
 {
     sal_Int32 nIndex(static_cast<OTableStylesContext *>(pStyles)->GetIndex(nContextID));
-    DBG_ASSERT(nIndex != -1, "Property not found in Map");
+    OSL_ENSURE(nIndex != -1, "Property not found in Map");
     XMLPropertyState aPropState(nIndex, rValue);
     GetProperties().push_back(aPropState); // has to be insertes in a sort order later
 }
@@ -361,3 +326,5 @@ ODBFilter& OTableStylesContext::GetOwnImport()
 // -----------------------------------------------------------------------------
 } // dbaxml
 // -----------------------------------------------------------------------------
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */