Merge branch 'master' into feature/gnumake4

Conflicts:
	starmath/JunitTest_sm_unoapi.mk
	starmath/Library_sm.mk
	starmath/Library_smd.mk
	starmath/Makefile
	starmath/prj/build.lst
	starmath/prj/makefile.mk
	starmath/qa/unoapi/Test.java
	starmath/source/detreg.cxx
	starmath/source/register.cxx
	starmath/source/smdetect.cxx
	sw/Library_sw.mk
	sw/Library_swd.mk
	sw/Library_swui.mk
	sw/Library_vbaswobj.mk
	sw/inc/iodetect.hxx
	sw/inc/swddllapi.h
	sw/source/filter/basflt/iodetect.cxx

1 files changed, 4 insertions, 15 deletions

diff --git a/sw/source/ui/config/barcfg.cxx b/sw/source/ui/config/barcfg.cxx
index a271d50fd6dd..9fcc614f6de8 100644
--- a/sw/source/ui/config/barcfg.cxx
+++ b/sw/source/ui/config/barcfg.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.
@@ -29,7 +30,7 @@
 #include "precompiled_sw.hxx"
 
 
-#include <tools/debug.hxx>
+#include <osl/diagnose.h>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <wrtsh.hxx>
@@ -47,9 +48,6 @@ using namespace com::sun::star::uno;
 #define SEL_TYPE_BEZIER         3
 #define SEL_TYPE_GRAPHIC        4
 
-/* ---------------------------------------------------------------------------
-
- ---------------------------------------------------------------------------*/
 SwToolbarConfigItem::SwToolbarConfigItem( sal_Bool bWeb ) :
     ConfigItem(bWeb ? C2U("Office.WriterWeb/ObjectBar") :  C2U("Office.Writer/ObjectBar"),
         CONFIG_MODE_DELAYED_UPDATE|CONFIG_MODE_RELEASE_TREE)
@@ -60,7 +58,7 @@ SwToolbarConfigItem::SwToolbarConfigItem( sal_Bool bWeb ) :
     Sequence<OUString> aNames = GetPropertyNames();
     Sequence<Any> aValues = GetProperties(aNames);
     const Any* pValues = aValues.getConstArray();
-    DBG_ASSERT(aValues.getLength() == aNames.getLength(), "GetProperties failed");
+    OSL_ENSURE(aValues.getLength() == aNames.getLength(), "GetProperties failed");
     if(aValues.getLength() == aNames.getLength())
     {
         for(int nProp = 0; nProp < aNames.getLength(); nProp++)
@@ -74,15 +72,11 @@ SwToolbarConfigItem::SwToolbarConfigItem( sal_Bool bWeb ) :
         }
     }
 }
-/* ---------------------------------------------------------------------------
 
- ---------------------------------------------------------------------------*/
 SwToolbarConfigItem::~SwToolbarConfigItem()
 {
 }
-/* ---------------------------------------------------------------------------
 
- ---------------------------------------------------------------------------*/
 sal_Int32 lcl_getArrayIndex(int nSelType)
 {
     sal_Int32 nRet = -1;
@@ -101,9 +95,7 @@ sal_Int32 lcl_getArrayIndex(int nSelType)
         nRet = SEL_TYPE_GRAPHIC;
     return nRet;
 }
-/* -----------------------------10.10.00 14:38--------------------------------
 
- ---------------------------------------------------------------------------*/
 void SwToolbarConfigItem::SetTopToolbar( sal_Int32 nSelType, sal_Int32 nBarId )
 {
     sal_Int32 nProp = lcl_getArrayIndex(nSelType);
@@ -113,9 +105,7 @@ void SwToolbarConfigItem::SetTopToolbar( sal_Int32 nSelType, sal_Int32 nBarId )
         SetModified();
     }
 }
-/* -----------------------------10.10.00 13:33--------------------------------
 
- ---------------------------------------------------------------------------*/
 Sequence<OUString> SwToolbarConfigItem::GetPropertyNames()
 {
     static const char* aPropNames[] =
@@ -133,9 +123,7 @@ Sequence<OUString> SwToolbarConfigItem::GetPropertyNames()
         pNames[i] = OUString::createFromAscii(aPropNames[i]);
     return aNames;
 }
-/* -----------------------------10.10.00 13:36--------------------------------
 
- ---------------------------------------------------------------------------*/
 void SwToolbarConfigItem::Commit()
 {
     Sequence<OUString> aNames = GetPropertyNames();
@@ -150,3 +138,4 @@ void SwToolbarConfigItem::Commit()
 
 void SwToolbarConfigItem::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {}
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */