Commits

Martin Hollmichel  committed bcf21fc

#109930# consistent headerfile usage

  • Participants
  • Parent commits a553f6a

Comments (0)

Files changed (98)

File basic/source/classes/sbunoobj.cxx

 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <cppuhelper/typeprovider.hxx>
-#include <cppuhelper/extract.hxx>
+#include <comphelper/extract.hxx>
 #include <comphelper/processfactory.hxx>
 
 #include <rtl/ustrbuf.hxx>
 using namespace com::sun::star::container;
 using namespace com::sun::star::bridge;
 using namespace cppu;
+using namespace comphelper;
 
 
 #include<basic/sbstar.hxx>

File comphelper/inc/comphelper/extract.hxx

 #include <com/sun/star/uno/Any.hxx>
 #include "cppu/unotype.hxx"
 
-namespace cppu
+namespace comphelper
 {
 
 /**

File comphelper/inc/comphelper/property.hxx

 
 	sal_Bool bModified(sal_False);
 	ENUMTYPE aNewValue;
-	::cppu::any2enum(aNewValue, _rValueToSet);
+	::comphelper::any2enum(aNewValue, _rValueToSet);
 		// will throw an exception if not convertible
 
 	if (aNewValue != _rCurrentValue)

File comphelper/prj/d.lst

 ..\inc\comphelper\*.hxx %_DEST%\inc%_EXT%\comphelper\*.hxx
 ..\inc\comphelper\*.h %_DEST%\inc%_EXT%\comphelper\*.h
 mkdir: %_DEST%\inc%_EXT%\cppuhelper
-..\inc\comphelper\extract.hxx %_DEST%\inc%_EXT%\cppuhelper\extract.hxx
 ..\version.mk  %_DEST%\inc%_EXT%\comphelper\version.mk

File comphelper/source/container/enumerablemap.cxx

         virtual bool isLess( const Any& _lhs, const Any& _rhs ) const
         {
             sal_Int32 lhs(0), rhs(0);
-            if  (   !::cppu::enum2int( lhs, _lhs )
-                ||  !::cppu::enum2int( rhs, _rhs )
+            if  (   !::comphelper::enum2int( lhs, _lhs )
+                ||  !::comphelper::enum2int( rhs, _rhs )
                 ||  !_lhs.getValueType().equals( m_enumType )
                 ||  !_rhs.getValueType().equals( m_enumType )
                 )

File comphelper/source/misc/types.cxx

 sal_Int32 getEnumAsINT32(const Any& _rAny) throw(IllegalArgumentException)
 {
 	sal_Int32 nReturn = 0;
-	if (! ::cppu::enum2int(nReturn,_rAny) )
+	if (! ::comphelper::enum2int(nReturn,_rAny) )
 		throw IllegalArgumentException();
 	return nReturn;
 }
 			case TypeClass_ENUM:
 			{
 				sal_Int32 nAsInt32 = 0;
-				bConversionSuccess = ::cppu::enum2int(nAsInt32, _rValue);
+				bConversionSuccess = ::comphelper::enum2int(nAsInt32, _rValue);
 				bRes = bConversionSuccess && (nAsInt32== *reinterpret_cast<const sal_Int32*>(pData));
 				break;
 			}

File connectivity/source/commontools/DateConversion.cxx

 				case DataType::SMALLINT:
 					if (_rVal.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_BOOLEAN)
 					{
-						if (::cppu::any2bool(_rVal))
+						if (::comphelper::any2bool(_rVal))
 							aRet.appendAscii("1");
 						else
 							aRet.appendAscii("0");

File connectivity/source/commontools/FValue.cxx

 #include "connectivity/FValue.hxx"
 #include "connectivity/CommonTools.hxx"
 #include <connectivity/dbconversion.hxx>
-#include <cppuhelper/extract.hxx>
+#include <comphelper/extract.hxx>
 #include <com/sun/star/io/XInputStream.hpp>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/logfile.hxx>
         case TypeClass_ENUM:
         {
             sal_Int32 enumValue( 0 );
-            ::cppu::enum2int( enumValue, _rValue );
+            ::comphelper::enum2int( enumValue, _rValue );
             (*this) = enumValue;
         }
         break;

File connectivity/source/commontools/TIndexes.cxx

 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
 using namespace cppu;
+using namespace comphelper;
 
 typedef connectivity::sdbcx::OCollection OCollection_TYPE;
 // -----------------------------------------------------------------------------

File connectivity/source/commontools/TKeys.cxx

 	Reference< XPropertySet > xColProp;
 	for(sal_Int32 i=0;i<xColumns->getCount();++i)
 	{
-		::cppu::extractInterface(xColProp,xColumns->getByIndex(i));
+		::comphelper::extractInterface(xColProp,xColumns->getByIndex(i));
 		aSql += ::dbtools::quoteName( aQuote,getString(xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME))))
 						+ 	::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(","));
 	}

File connectivity/source/commontools/TTableHelper.cxx

 		);
 
 	Reference< XPropertySet > xOld;
-	if(::cppu::extractInterface(xOld,m_pColumns->getByIndex(index)) && xOld.is())
+	if(::comphelper::extractInterface(xOld,m_pColumns->getByIndex(index)) && xOld.is())
 		alterColumnByName(getString(xOld->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))),descriptor);
 }
 

File connectivity/source/commontools/dbtools.cxx

 	}
 	return getDefaultNumberFormat(nDataType,
 					nScale,
-					::cppu::any2bool(_xColumn->getPropertyValue(::rtl::OUString::createFromAscii("IsCurrency"))),
+					::comphelper::any2bool(_xColumn->getPropertyValue(::rtl::OUString::createFromAscii("IsCurrency"))),
 					_xTypes,
 					_rLocale);
 }
 			try
 			{
 				xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD)) >>= sPwd;
-				bPwdReq = ::cppu::any2bool(xProp->getPropertyValue(::rtl::OUString::createFromAscii("IsPasswordRequired")));
+				bPwdReq = ::comphelper::any2bool(xProp->getPropertyValue(::rtl::OUString::createFromAscii("IsPasswordRequired")));
 				xProp->getPropertyValue(::rtl::OUString::createFromAscii("User")) >>= sUser;
 			}
 			catch(Exception&)

File connectivity/source/cpool/ZPoolCollection.cxx

 	{
 		if (xDirectAccess.is() && xDirectAccess->hasByName(_rPath))
 		{
-			if (!::cppu::extractInterface(xNode, xDirectAccess->getByName(_rPath)))
+			if (!::comphelper::extractInterface(xNode, xDirectAccess->getByName(_rPath)))
 				OSL_ENSURE(sal_False, "OConfigurationNode::openNode: could not open the node!");
 		}
 		else if (xHierarchyAccess.is())
 		{
-			if (!::cppu::extractInterface(xNode, xHierarchyAccess->getByHierarchicalName(_rPath)))
+			if (!::comphelper::extractInterface(xNode, xHierarchyAccess->getByHierarchicalName(_rPath)))
 				OSL_ENSURE(sal_False, "OConfigurationNode::openNode: could not open the node!");
 		}
 

File connectivity/source/drivers/adabas/BTables.cxx

 
 	for(sal_Int32 i=0;i<xColumns->getCount();++i)
 	{
-		::cppu::extractInterface(xColProp,xColumns->getByIndex(i));
+		::comphelper::extractInterface(xColProp,xColumns->getByIndex(i));
 		if(xColProp.is())
 		{
 			::rtl::OUString aDescription = getString(xColProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DESCRIPTION)));
 
 	for(sal_Int32 i=0;i<nCount;++i)
 	{
-		if(::cppu::extractInterface(xColProp,xColumns->getByIndex(i)) && xColProp.is())
+		if(::comphelper::extractInterface(xColProp,xColumns->getByIndex(i)) && xColProp.is())
 		{
 
 			aSql += aQuote + getString(xColProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))) + aQuote;
 		sal_Bool bPKey = sal_False;
 		for( sal_Int32 key=0; key<xKeys->getCount(); ++key )
 		{
-			if(::cppu::extractInterface(xColProp,xKeys->getByIndex(key)) && xColProp.is())
+			if(::comphelper::extractInterface(xColProp,xKeys->getByIndex(key)) && xColProp.is())
 			{
 
 				sal_Int32 nKeyType		= getINT32(xColProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)));
 					aSql += ::rtl::OUString::createFromAscii(" PRIMARY KEY (");
 					for( sal_Int32 column=0; column<xColumns->getCount(); ++column )
 					{
-						if(::cppu::extractInterface(xColProp,xColumns->getByIndex(column)) && xColProp.is())
+						if(::comphelper::extractInterface(xColProp,xColumns->getByIndex(column)) && xColProp.is())
 							aSql += aQuote + getString(xColProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))) + aQuote
 										+ 	::rtl::OUString::createFromAscii(",");
 					}
 					aSql += ::rtl::OUString::createFromAscii(" UNIQUE (");
 					for( sal_Int32 column=0; column<xColumns->getCount(); ++column )
 					{
-						if(::cppu::extractInterface(xColProp,xColumns->getByIndex(column)) && xColProp.is())
+						if(::comphelper::extractInterface(xColProp,xColumns->getByIndex(column)) && xColProp.is())
 							aSql += aQuote + getString(xColProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))) + aQuote
 										+ ::rtl::OUString::createFromAscii(",");
 					}
 
 					for ( sal_Int32 column=0; column<xColumns->getCount(); ++column )
 					{
-						if(::cppu::extractInterface(xColProp,xColumns->getByIndex(column)) && xColProp.is())
+						if(::comphelper::extractInterface(xColProp,xColumns->getByIndex(column)) && xColProp.is())
 							aSql += aQuote + getString(xColProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))) + aQuote
 										+ ::rtl::OUString::createFromAscii(",");
 					}

File connectivity/source/drivers/dbase/DDatabaseMetaData.cxx

 		if(match(tableNamePattern,*pTabBegin,'\0'))
 		{
 			Reference< XColumnsSupplier> xTable;
-			::cppu::extractInterface(xTable,xNames->getByName(*pTabBegin));
+			::comphelper::extractInterface(xTable,xNames->getByName(*pTabBegin));
 			OSL_ENSURE(xTable.is(),"Table not found! Normallya exception had to be thrown here!");
 			aRow[3] = new ORowSetValueDecorator(*pTabBegin);
 
 				{
 					aRow[4] = new ORowSetValueDecorator(*pBegin);
 
-					::cppu::extractInterface(xColumn,xColumns->getByName(*pBegin));
+					::comphelper::extractInterface(xColumn,xColumns->getByName(*pBegin));
 					OSL_ENSURE(xColumn.is(),"Columns contains a column who isn't a fastpropertyset!");
 					aRow[5] = new ORowSetValueDecorator(getINT32(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))));
 					aRow[6] = new ORowSetValueDecorator(getString(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME))));
 	aRow[10]	= new ORowSetValueDecorator(::rtl::OUString::createFromAscii("A"));
 
 	Reference< XIndexesSupplier> xTable;
-	::cppu::extractInterface(xTable,xNames->getByName(table));
+	::comphelper::extractInterface(xTable,xNames->getByName(table));
 	aRow[3] = new ORowSetValueDecorator(table);
 	aRow[7] = new ORowSetValueDecorator((sal_Int32)3);
 
 	Reference< XPropertySet> xIndex;
 	for(;pBegin != pEnd;++pBegin)
 	{
-		::cppu::extractInterface(xIndex,xIndexes->getByName(*pBegin));
+		::comphelper::extractInterface(xIndex,xIndexes->getByName(*pBegin));
 		OSL_ENSURE(xIndex.is(),"Indexes contains a column who isn't a fastpropertyset!");
 
 		if(unique && !getBOOL(xIndex->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISUNIQUE))))

File connectivity/source/drivers/dbase/DTable.cxx

 		Reference<XPropertySet> xIndex = isUniqueByColumnName(i);
 		if (xIndex.is())
 		{
-			::cppu::extractInterface(xCol,m_pColumns->getByIndex(i));
+			::comphelper::extractInterface(xCol,m_pColumns->getByIndex(i));
 			OSL_ENSURE(xCol.is(),"ODbaseTable::DeleteRow column is null!");
 			if(xCol.is())
 			{
 		Reference<XPropertySet> xIndex;
 		for(sal_Int32 i=0;i<m_pIndexes->getCount();++i)
 		{
-			::cppu::extractInterface(xIndex,m_pIndexes->getByIndex(i));
+			::comphelper::extractInterface(xIndex,m_pIndexes->getByIndex(i));
 			if(xIndex.is() && getBOOL(xIndex->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISUNIQUE))))
 			{
 				Reference<XNameAccess> xCols(Reference<XColumnsSupplier>(xIndex,UNO_QUERY)->getColumns());
 			for(nPos = 0;nPos<_xCols->getCount();++nPos)
 			{
 				Reference<XPropertySet> xFindCol;
-				::cppu::extractInterface(xFindCol,_xCols->getByIndex(nPos));
+				::comphelper::extractInterface(xFindCol,_xCols->getByIndex(nPos));
 				OSL_ENSURE(xFindCol.is(),"ODbaseTable::UpdateBuffer column is null!");
 				if(aCase(getString(xFindCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))),aColName))
 					break;
 			for(nPos = 0;nPos<_xCols->getCount();++nPos)
 			{
 				Reference<XPropertySet> xFindCol;
-				::cppu::extractInterface(xFindCol,_xCols->getByIndex(nPos));
+				::comphelper::extractInterface(xFindCol,_xCols->getByIndex(nPos));
 				if(aCase(getString(xFindCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))),aColName))
 					break;
 			}

File connectivity/source/drivers/file/FDatabaseMetaData.cxx

 				aRows.push_back(aRow);
 
 				Reference< XPropertySet> xTable;
-				::cppu::extractInterface(xTable,xNames->getByName(*pBegin));
+				::comphelper::extractInterface(xTable,xNames->getByName(*pBegin));
 				if(xTable.is())
 				{
 					Reference<XUnoTunnel> xTunnel(xTable,UNO_QUERY);

File connectivity/source/drivers/file/FResultSetMetaData.cxx

 	checkColumnIndex(column);
 	return m_pTable->isReadOnly() || (
                             (m_xColumns->get())[column-1]->getPropertySetInfo()->hasPropertyByName(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FUNCTION)) &&
-						        ::cppu::any2bool((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FUNCTION))));
+						        ::comphelper::any2bool((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FUNCTION))));
 }
 // -------------------------------------------------------------------------
 

File connectivity/source/drivers/flat/EDatabaseMetaData.cxx

 		if(match(tableNamePattern,*pTabBegin,'\0'))
 		{
 			Reference< XColumnsSupplier> xTable;
-			::cppu::extractInterface(xTable,xNames->getByName(*pTabBegin));
+			::comphelper::extractInterface(xTable,xNames->getByName(*pTabBegin));
 			aRow[3] = new ORowSetValueDecorator(*pTabBegin);
 
 			Reference< XNameAccess> xColumns = xTable->getColumns();
 				{
 					aRow[4] = new ORowSetValueDecorator(*pBegin);
 
-					::cppu::extractInterface(xColumn,xColumns->getByName(*pBegin));
+					::comphelper::extractInterface(xColumn,xColumns->getByName(*pBegin));
 					OSL_ENSURE(xColumn.is(),"Columns contains a column who isn't a fastpropertyset!");
 					aRow[5] = new ORowSetValueDecorator(getINT32(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))));
 					aRow[6] = new ORowSetValueDecorator(getString(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME))));

File connectivity/source/manager/mdrivermanager.cxx

 		Reference< XServiceInfo > xSI;
 		while (xEnumDrivers->hasMoreElements())
 		{
-			::cppu::extractInterface( xFactory, xEnumDrivers->nextElement() );
+			::comphelper::extractInterface( xFactory, xEnumDrivers->nextElement() );
 			OSL_ENSURE( xFactory.is(), "OSDBCDriverManager::bootstrapDrivers: no factory extracted" );
 
 			if ( xFactory.is() )

File cppuhelper/prj/d.lst

 ..\inc\cppuhelper\shlib.hxx %_DEST%\inc%_EXT%\cppuhelper\shlib.hxx
 ..\inc\cppuhelper\basemutex.hxx %_DEST%\inc%_EXT%\cppuhelper\basemutex.hxx
 ..\inc\cppuhelper\bootstrap.hxx %_DEST%\inc%_EXT%\cppuhelper\bootstrap.hxx
-..\inc\cppuhelper\extract.hxx %_DEST%\inc%_EXT%\cppuhelper\extract.hxx
 ..\inc\cppuhelper\exc_hlp.hxx %_DEST%\inc%_EXT%\cppuhelper\exc_hlp.hxx
 ..\inc\cppuhelper\typeprovider.hxx %_DEST%\inc%_EXT%\cppuhelper\typeprovider.hxx
 ..\inc\cppuhelper\factory.hxx %_DEST%\inc%_EXT%\cppuhelper\factory.hxx

File editeng/source/items/textitem.cxx

 #include <com/sun/star/frame/status/FontHeight.hpp>
 #include <vcl/bitmapex.hxx>
 #include <tools/stream.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <math.h>
 #include <rtl/math.hxx>
 #include <unotools/fontdefs.hxx>

File editeng/source/uno/unonrule.cxx

 #include <vos/mutex.hxx>
 #include <vcl/graph.hxx>
 #include <svtools/grfmgr.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <rtl/uuid.h>
 #include <rtl/memory.h>
 

File framework/source/classes/menumanager.cxx

 #include <unotools/localfilehelper.hxx>
 
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #include <tools/urlobj.hxx>
 

File framework/source/helper/statusindicatorfactory.cxx

 #include <com/sun/star/frame/XLayoutManager.hpp>
 
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 
 //-----------------------------------------------

File framework/source/helper/vclstatusindicator.cxx

 // includes of external modules
 
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #include <vcl/svapp.hxx>
 

File framework/source/inc/pattern/window.hxx

 // other includes
 
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #include <vcl/window.hxx>
 #include <vcl/syswin.hxx>

File framework/source/layoutmanager/layoutmanager.cxx

 #include <vcl/svapp.hxx>
 #include <vcl/i18nhelp.hxx>
 #include <vcl/wall.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <toolkit/awt/vclxwindow.hxx>
 #include <toolkit/awt/vclxmenu.hxx>
 #include <comphelper/mediadescriptor.hxx>

File framework/source/loadenv/loadenv.cxx

 #include <vcl/syswin.hxx>
 
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #include <unotools/moduleoptions.hxx>
 #include <svtools/sfxecode.hxx>

File framework/source/services/taskcreatorsrv.cxx

 #include <vcl/svapp.hxx>
 
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #include <vcl/window.hxx>
 

File framework/source/tabwin/tabwindow.cxx

 #include <vcl/window.hxx>
 #include <vcl/wrkwin.hxx>
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #include <comphelper/sequenceashashmap.hxx>
 

File framework/source/uielement/addonstoolbarmanager.cxx

 #include <svtools/imgdef.hxx>
 #include <svtools/toolboxcontroller.hxx>
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 
 #include <svtools/miscopt.hxx>

File framework/source/uielement/addonstoolbarwrapper.cxx

 //_________________________________________________________________________________________________________________
 
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #include <toolkit/awt/vclxwindow.hxx>
 #include <comphelper/processfactory.hxx>

File framework/source/uielement/langselectionstatusbarcontroller.cxx

 #include <vcl/window.hxx>
 #include <vcl/status.hxx>
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #include <toolkit/helper/convert.hxx>
 
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <comphelper/processfactory.hxx>
 
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <tools/gen.hxx>
 #include <com/sun/star/awt/Command.hpp>
 #include <svl/languageoptions.hxx>

File framework/source/uielement/logoimagestatusbarcontroller.cxx

 #include <vcl/window.hxx>
 #include <vcl/status.hxx>
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #include <toolkit/helper/convert.hxx>
 

File framework/source/uielement/logotextstatusbarcontroller.cxx

 #include <vcl/window.hxx>
 #include <vcl/status.hxx>
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #include <toolkit/helper/convert.hxx>
 

File framework/source/uielement/menubarmanager.cxx

 #include <unotools/cmdoptions.hxx>
 #include <unotools/localfilehelper.hxx>
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #include <tools/urlobj.hxx>
 #include <vcl/svapp.hxx>

File framework/source/uielement/simpletextstatusbarcontroller.cxx

 #include <vcl/window.hxx>
 #include <vcl/status.hxx>
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #include <toolkit/helper/convert.hxx>
 

File framework/source/uielement/statusbarmanager.cxx

 //_________________________________________________________________________________________________________________
 
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #include <svtools/statusbarcontroller.hxx>
 

File framework/source/uielement/statusbarwrapper.cxx

 //_________________________________________________________________________________________________________________
 #include <comphelper/processfactory.hxx>
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 
 #include <tools/solar.h>

File framework/source/uielement/toolbarmanager.cxx

 #include <svtools/toolboxcontroller.hxx>
 #include <unotools/cmdoptions.hxx>
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #include <comphelper/mediadescriptor.hxx>
 #include <svtools/miscopt.hxx>

File framework/source/uielement/toolbarsmenucontroller.cxx

 #include <tools/urlobj.hxx>
 #include <rtl/ustrbuf.hxx>
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #include <vcl/window.hxx>
 #include <svtools/menuoptions.hxx>

File framework/source/uielement/toolbarwrapper.cxx

 //_________________________________________________________________________________________________________________
 
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #include <toolkit/awt/vclxwindow.hxx>
 #include <comphelper/processfactory.hxx>

File linguistic/source/gciterator.cxx

 #include <cppuhelper/implbase4.hxx>
 #include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/interfacecontainer.h>
-#include <cppuhelper/extract.hxx>
+#include <comphelper/extract.hxx>
 #include <cppuhelper/factory.hxx>
 #include <i18npool/mslangid.hxx>
 #include <unotools/processfactory.hxx>

File linguistic/source/lngsvcmgr.cxx

 #include <i18npool/lang.h>
 #include <i18npool/mslangid.hxx>
 #include <cppuhelper/factory.hxx>
-#include <cppuhelper/extract.hxx>
+#include <comphelper/extract.hxx>
 #include <rtl/logfile.hxx>
 
 #include "lngsvcmgr.hxx"
                     uno::Reference< lang::XSingleServiceFactory > xFactory;
 
                     uno::Reference< linguistic2::XSpellChecker > xSvc;
-					if ( cppu::extractInterface( xCompFactory, aCurrent ) || ::cppu::extractInterface( xFactory, aCurrent ) )
+					if ( comphelper::extractInterface( xCompFactory, aCurrent ) || ::comphelper::extractInterface( xFactory, aCurrent ) )
 					{
 						try
 						{
                     uno::Reference< lang::XSingleServiceFactory > xFactory;
 
                     uno::Reference< linguistic2::XProofreader > xSvc;
-                    if ( cppu::extractInterface( xCompFactory, aCurrent ) || ::cppu::extractInterface( xFactory, aCurrent ) )
+                    if ( comphelper::extractInterface( xCompFactory, aCurrent ) || ::comphelper::extractInterface( xFactory, aCurrent ) )
                     {
                         try
                         {
                     uno::Reference< lang::XSingleServiceFactory > xFactory;
 
                     uno::Reference< linguistic2::XHyphenator > xSvc;
-					if ( cppu::extractInterface( xCompFactory, aCurrent ) || ::cppu::extractInterface( xFactory, aCurrent ) )
+					if ( comphelper::extractInterface( xCompFactory, aCurrent ) || ::comphelper::extractInterface( xFactory, aCurrent ) )
 					{
 						try
 						{
                     uno::Reference< lang::XSingleServiceFactory > xFactory;
 
                     uno::Reference< linguistic2::XThesaurus > xSvc;
-					if ( cppu::extractInterface( xCompFactory, aCurrent ) || ::cppu::extractInterface( xFactory, aCurrent ) )
+					if ( comphelper::extractInterface( xCompFactory, aCurrent ) || ::comphelper::extractInterface( xFactory, aCurrent ) )
 					{
 						try
 						{

File sal/osl/unx/makefile.mk

 PRJ=..$/..
 
 PRJNAME=sal
-.IF "$(WORK_STAMP)"=="MIX364"
-TARGET=cppsal
-.ELSE
 TARGET=cpposl
-.ENDIF
 USE_LDUMP2=TRUE
 
 PROJECTPCH4DLL=TRUE

File sfx2/source/appl/shutdownicon.cxx

     if (aArguments.getLength() > 2)
     {
         sal_Bool bVeto = sal_True;
-        bVeto = ::cppu::any2bool(aArguments[2]);
+        bVeto = ::comphelper::any2bool(aArguments[2]);
         m_bVeto = bVeto;
         return;
     }
 			try
 			{
 				sal_Bool bQuickstart = sal_False;
-				bQuickstart = ::cppu::any2bool( aArguments[0] );
+				bQuickstart = ::comphelper::any2bool( aArguments[0] );
 				if( !bQuickstart && !GetAutostart() )
 					return;
                 aGuard.clear();
     if ( aArguments.getLength() > 1 )
     {
 			sal_Bool bAutostart = sal_False;
-			bAutostart = ::cppu::any2bool( aArguments[1] );
+			bAutostart = ::comphelper::any2bool( aArguments[1] );
             if (bAutostart && !GetAutostart())
                 SetAutostart( sal_True );
             if (!bAutostart && GetAutostart())

File sfx2/source/doc/objmisc.cxx

 #include <com/sun/star/script/provider/XScriptProviderSupplier.hpp>
 
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 
 #include <com/sun/star/uno/Reference.h>

File sfx2/source/inet/inettbc.cxx

 #include <svl/folderrestriction.hxx>
 #include <vcl/toolbox.hxx>
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #ifndef _VOS_THREAD_HXX //autogen
 #include <vos/thread.hxx>

File sfx2/source/menu/virtmenu.cxx

 #include <com/sun/star/frame/XFramesSupplier.hpp>
 #include <comphelper/processfactory.hxx>
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #include <tools/urlobj.hxx>
 

File sfx2/source/statbar/stbitem.cxx

 #include <svl/stritem.hxx>
 #include <svl/intitem.hxx>
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #include <toolkit/helper/convert.hxx>
 

File sfx2/source/view/viewfrm.cxx

 #include <com/sun/star/frame/XLayoutManager.hpp>
 
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #ifndef _SPLITWIN_HXX //autogen
 #include <vcl/splitwin.hxx>

File sfx2/source/view/viewsh.cxx

 #include <framework/actiontriggerhelper.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/sequenceashashmap.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 
 
 #include <sfx2/app.hxx>

File svl/source/items/cenumitm.cxx

 #include <whassert.hxx>
 
 #ifndef _CPPUHELPER_EXTRACT_HXX_
-#include <cppuhelper/extract.hxx>
+#include <comphelper/extract.hxx>
 #endif
 
 //============================================================================
 {
 	sal_Int32 nTheValue = 0;
 
-	if ( ::cppu::enum2int( nTheValue, rVal ) )
+	if ( ::comphelper::enum2int( nTheValue, rVal ) )
 	{
 		SetEnumValue(USHORT(nTheValue));
 		return true;

File svtools/source/dialogs/addresstemplate.cxx

 #include <vcl/msgbox.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #ifndef _CPPUHELPER_EXTRACT_HXX_
-#include <cppuhelper/extract.hxx>
+#include <comphelper/extract.hxx>
 #endif
 #include <comphelper/interaction.hxx>
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
 				// get the table and the columns
 				Reference< XColumnsSupplier > xSuppTableCols;
 				if (m_xCurrentDatasourceTables->hasByName(sSelectedTable))
-					::cppu::extractInterface(xSuppTableCols, m_xCurrentDatasourceTables->getByName(sSelectedTable));
+					::comphelper::extractInterface(xSuppTableCols, m_xCurrentDatasourceTables->getByName(sSelectedTable));
 				Reference< XNameAccess > xColumns;
 				if (xSuppTableCols.is())
 					xColumns = xSuppTableCols->getColumns();

File svtools/source/uno/addrtempuno.cxx

 #include "addresstemplate.hxx"
 #endif
 #ifndef _CPPUHELPER_EXTRACT_HXX_
-#include <cppuhelper/extract.hxx>
+#include <comphelper/extract.hxx>
 #endif
 #include <cppuhelper/typeprovider.hxx>
 #include <comphelper/property.hxx>

File svtools/source/uno/contextmenuhelper.cxx

 #include <vos/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/image.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <toolkit/awt/vclxwindow.hxx>
 #include <toolkit/awt/vclxmenu.hxx>
  

File svtools/source/uno/genericunodialog.cxx

 #include <com/sun/star/ucb/AlreadyInitializedException.hpp>
 
 #include <toolkit/awt/vclxwindow.hxx>
-#include <cppuhelper/extract.hxx>
+#include <comphelper/extract.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include <comphelper/property.hxx>
 #include <osl/diagnose.h>
 		case UNODIALOG_PROPERTY_ID_PARENT:
 		{
 			Reference<starawt::XWindow> xNew;
-			::cppu::extractInterface(xNew, rValue);
+			::comphelper::extractInterface(xNew, rValue);
 			if (xNew != m_xParent)
 			{
 				rConvertedValue <<= xNew;

File svtools/source/uno/statusbarcontroller.cxx

 #include <imgdef.hxx>
 #include <svtools/miscopt.hxx>
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 
 using namespace ::cppu;

File svtools/source/uno/toolboxcontroller.cxx

 #include <svtools/miscopt.hxx>
 
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #include <vcl/toolbox.hxx>
 

File svx/source/dialog/docrecovery.cxx

 #include <vcl/scrbar.hxx>
 
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 
 //#include "com/sun/star/lang/XMultiServiceFactory.hpp"

File svx/source/dialog/srchdlg.cxx

 #include <svl/intitem.hxx>
 
 #include <sfx2/app.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 
 #define _SVX_SRCHDLG_CXX
 #include "srchdlg.hxx"

File svx/source/fmcomp/dbaexchange.cxx

 			_rxForm->getPropertyValue(FM_PROP_COMMAND)		>>= sCommand;
 			_rxForm->getPropertyValue(FM_PROP_DATASOURCE)	>>= sDatasource;
 			_rxForm->getPropertyValue(FM_PROP_URL)			>>= sURL;
-			bTryToParse = ::cppu::any2bool(_rxForm->getPropertyValue(FM_PROP_ESCAPE_PROCESSING));
+			bTryToParse = ::comphelper::any2bool(_rxForm->getPropertyValue(FM_PROP_ESCAPE_PROCESSING));
 		}
 		catch(Exception&)
 		{
 		try
 		{
 			::rtl::OUString sFilter, sSort;
-			if (::cppu::any2bool(_rxLivingForm->getPropertyValue(FM_PROP_APPLYFILTER)))
+			if (::comphelper::any2bool(_rxLivingForm->getPropertyValue(FM_PROP_APPLYFILTER)))
 				_rxLivingForm->getPropertyValue(FM_PROP_FILTER) >>= sFilter;
 			_rxLivingForm->getPropertyValue(FM_PROP_SORT) >>= sSort;
 			bHasFilterOrSort = (sFilter.getLength()>0) || (sSort.getLength()>0);

File svx/source/fmcomp/fmgridcl.cxx

 using namespace ::com::sun::star::util;
 using namespace ::com::sun::star::container;
 using namespace ::cppu;
+using namespace ::comphelper;
 using namespace ::svxform;
 using namespace ::svx;
 
 			try
 			{
 				Reference< ::com::sun::star::beans::XPropertySet >	xColumn;
-				::cppu::extractInterface(xColumn, xColumns->getByIndex(nPos));
+				::comphelper::extractInterface(xColumn, xColumns->getByIndex(nPos));
 				::rtl::OUString aHelpText;
 				xColumn->getPropertyValue(FM_PROP_HELPTEXT) >>= aHelpText;
 				if ( aHelpText.getLength() )
 
 		Reference< ::com::sun::star::container::XIndexContainer >  xColumns(static_cast<FmGridControl*>(GetParent())->GetPeer()->getColumns());
 		Reference< ::com::sun::star::beans::XPropertySet> xColumn;
-		::cppu::extractInterface(xColumn, xColumns->getByIndex(nPos2));
+		::comphelper::extractInterface(xColumn, xColumns->getByIndex(nPos2));
 		Reference< ::com::sun::star::view::XSelectionSupplier >  xSelSupplier(xColumns, UNO_QUERY);
 		if (xSelSupplier.is())
 			xSelSupplier->select(makeAny(xColumn));
 	if (pMenu && xCols.is() && nColId)
 	{
 		Reference< ::com::sun::star::beans::XPropertySet > xSet;
-		::cppu::extractInterface(xSet, xCols->getByIndex(nPos));
+		::comphelper::extractInterface(xSet, xCols->getByIndex(nPos));
 		sal_Int16 nClassId;
 		xSet->getPropertyValue(FM_PROP_CLASSID) >>= nClassId;
 
 			Any aHidden,aName;
 			for (sal_uInt16 i=0; i<xCols->getCount(); ++i)
 			{
-				::cppu::extractInterface(xCurCol, xCols->getByIndex(i));
+				::comphelper::extractInterface(xCurCol, xCols->getByIndex(i));
 				DBG_ASSERT(xCurCol.is(), "FmGridHeader::PreExecuteColumnContextMenu : the Peer has invalid columns !");
 				aHidden = xCurCol->getPropertyValue(FM_PROP_HIDDEN);
 				DBG_ASSERT(aHidden.getValueType().getTypeClass() == TypeClass_BOOLEAN,
 		case SID_FM_DELETECOL:
 		{
 			Reference< XInterface >  xCol;
-			::cppu::extractInterface(xCol, xCols->getByIndex(nPos));
+			::comphelper::extractInterface(xCol, xCols->getByIndex(nPos));
 			xCols->removeByIndex(nPos);
 			::comphelper::disposeComponent(xCol);
 		}	break;
 		case SID_FM_HIDECOL:
 		{
 			Reference< ::com::sun::star::beans::XPropertySet >	xCurCol;
-			::cppu::extractInterface(xCurCol, xCols->getByIndex(nPos));
+			::comphelper::extractInterface(xCurCol, xCols->getByIndex(nPos));
 			xCurCol->setPropertyValue(FM_PROP_HIDDEN, makeAny((sal_Bool)sal_True));
 		}
 		break;
 			Reference< ::com::sun::star::beans::XPropertySet >	xCurCol;
 			for (sal_uInt16 i=0; i<xCols->getCount(); ++i)
 			{
-				::cppu::extractInterface(xCurCol, xCols->getByIndex(i));
+				::comphelper::extractInterface(xCurCol, xCols->getByIndex(i));
 				xCurCol->setPropertyValue(FM_PROP_HIDDEN, makeAny((sal_Bool)sal_False));
 			}
 			// TODO : there must be a more clever way to do this ....
 				Reference< ::com::sun::star::beans::XPropertySet >	xCurCol;
 				for (sal_uInt16 i=0; i<xCols->getCount() && nExecutionResult; ++i)
 				{
-					::cppu::extractInterface(xCurCol, xCols->getByIndex(i));
+					::comphelper::extractInterface(xCurCol, xCols->getByIndex(i));
 					Any aHidden = xCurCol->getPropertyValue(FM_PROP_HIDDEN);
 					if (::comphelper::getBOOL(aHidden))
 						if (!--nExecutionResult)
 	const DbGridRowRef& xRow = GetCurrentRow();
 	// waehrend Positionierung wird kein abgleich  der Properties vorgenommen
 	Reference<XPropertySet> xSet(evt.Source,UNO_QUERY);
-	if (xRow.Is() && (::cppu::any2bool(xSet->getPropertyValue(FM_PROP_ISNEW))|| CompareBookmark(getDataSource()->getBookmark(), xRow->GetBookmark())))
+	if (xRow.Is() && (any2bool(xSet->getPropertyValue(FM_PROP_ISNEW))|| CompareBookmark(getDataSource()->getBookmark(), xRow->GetBookmark())))
 	{
 		if (evt.PropertyName == FM_PROP_ISMODIFIED)
 		{
 				Any aSelection = xSelSupplier->getSelection();
 				Reference< ::com::sun::star::beans::XPropertySet >	xColumn;
 				if (aSelection.getValueType().getTypeClass() == TypeClass_INTERFACE)
-					::cppu::extractInterface(xColumn, aSelection);
+					::comphelper::extractInterface(xColumn, aSelection);
 				Reference< XInterface >  xCurrent;
 				for (sal_uInt16 i=0; i<xColumns->getCount(); ++i)
 				{
-					::cppu::extractInterface(xCurrent, xColumns->getByIndex(i));
+					::comphelper::extractInterface(xCurrent, xColumns->getByIndex(i));
 					if (xCurrent == xColumn)
 					{
 						markColumn(GetColumnIdFromModelPos(i));
 		Reference< XInterface > xCurrent;
 		for (i = 0; !xCol.is() && i < xColumns->getCount(); i++)
 		{
-			::cppu::extractInterface(xCurrent, xColumns->getByIndex(i));
+			::comphelper::extractInterface(xCurrent, xColumns->getByIndex(i));
 			if (xCurrent == pCol->getModel())
 			{
 				xCol = pCol->getModel();
 	for (i = 0; i < xColumns->getCount(); ++i)
 	{
 		Reference< ::com::sun::star::beans::XPropertySet > xCol;
-		::cppu::extractInterface(xCol, xColumns->getByIndex(i));
+		::comphelper::extractInterface(xCol, xColumns->getByIndex(i));
 
 		aName  = (const sal_Unicode*)::comphelper::getString(xCol->getPropertyValue(FM_PROP_LABEL));
 
 	for (i = 0; i < xColumns->getCount(); ++i)
 	{
 		Reference< ::com::sun::star::beans::XPropertySet > xCol;
-		::cppu::extractInterface(xCol, xColumns->getByIndex(i));
+		::comphelper::extractInterface(xCol, xColumns->getByIndex(i));
 		aHidden = xCol->getPropertyValue(FM_PROP_HIDDEN);
 		if (::comphelper::getBOOL(aHidden))
 			HideColumn(GetColumnIdFromModelPos((sal_uInt16)i));
 		if ( pCol )
 		{
 			Reference< XPropertySet > xColumnModel;
-			::cppu::extractInterface( xColumnModel, xColumns->getByIndex( i ) );
+			::comphelper::extractInterface( xColumnModel, xColumns->getByIndex( i ) );
 
 			InitColumnByField( pCol, xColumnModel, xFieldsAsNames, _rxFields );
 		}
 					if (nSelectedColumn != SAL_MAX_UINT16)
 					{
 						Reference< XPropertySet >  xColumn;
-						::cppu::extractInterface(xColumn,xColumns->getByIndex(nSelectedColumn));
+						::comphelper::extractInterface(xColumn,xColumns->getByIndex(nSelectedColumn));
 						xSelSupplier->select(makeAny(xColumn));
 					}
 					else

File svx/source/fmcomp/fmgridif.cxx

 
 		for ( i = 0; i < m_xColumns->getCount(); i++)
 		{
-			::cppu::extractInterface(xCurrent, m_xColumns->getByIndex(i));
+			::comphelper::extractInterface(xCurrent, m_xColumns->getByIndex(i));
 			if (evt.Source == xCurrent)
 				break;
 		}
 		Reference< XPropertySet > xCol;
 		for (sal_Int32 i = 0; i < m_xColumns->getCount(); i++)
 		{
-			::cppu::extractInterface(xCol, m_xColumns->getByIndex(i));
+			::comphelper::extractInterface(xCol, m_xColumns->getByIndex(i));
 			removeColumnListeners(xCol);
 		}
 		Reference< XContainer >  xContainer(m_xColumns, UNO_QUERY);
 		Reference< XPropertySet >  xCol;
 		for (sal_Int32 i = 0; i < Columns->getCount(); i++)
 		{
-			::cppu::extractInterface(xCol, Columns->getByIndex(i));
+			::comphelper::extractInterface(xCol, Columns->getByIndex(i));
 			addColumnListeners(xCol);
 		}
 
 		return;
 
 	Reference< XPropertySet >  xSet;
-	::cppu::extractInterface(xSet, evt.Element);
+	::comphelper::extractInterface(xSet, evt.Element);
 	addColumnListeners(xSet);
 
 	Reference< XPropertySet >  xNewColumn(xSet);
 
 	Reference< XPropertySet >  xNewColumn;
 	Reference< XPropertySet >  xOldColumn;
-	::cppu::extractInterface(xNewColumn, evt.Element);
-	::cppu::extractInterface(xOldColumn, evt.ReplacedElement);
+	::comphelper::extractInterface(xNewColumn, evt.Element);
+	::comphelper::extractInterface(xOldColumn, evt.ReplacedElement);
 
 	sal_Bool bWasEditing = pGrid->IsEditing();
 	if (bWasEditing)
 	pGrid->RemoveColumn(pGrid->GetColumnIdFromModelPos((sal_uInt16)::comphelper::getINT32(evt.Accessor)));
 
 	Reference< XPropertySet >  xOldColumn;
-	::cppu::extractInterface(xOldColumn, evt.Element);
+	::comphelper::extractInterface(xOldColumn, evt.Element);
 	removeColumnListeners(xOldColumn);
 }
 

File svx/source/fmcomp/gridcell.cxx

     Any aSupplier( xUnoModel->getPropertyValue(FM_PROP_FORMATSSUPPLIER));
     if (aSupplier.hasValue())
     {
-        ::cppu::extractInterface(m_xSupplier, aSupplier);
+        ::comphelper::extractInterface(m_xSupplier, aSupplier);
         if (m_xSupplier.is())
         {
             // wenn wir den Supplier vom Model nehmen, dann auch den Key
         Reference< ::com::sun::star::container::XNameAccess >    xTablesNames;
         Reference< ::com::sun::star::beans::XPropertySet >       xComposerFieldAsSet;
 
-        ::cppu::extractInterface(xFieldNames, xComposerAsSet->getPropertyValue(FM_PROP_SELECTED_FIELDS));
-        ::cppu::extractInterface(xTablesNames, xComposerAsSet->getPropertyValue(FM_PROP_SELECTED_TABLES));
-        ::cppu::extractInterface(xComposerFieldAsSet, xFieldNames->getByName(aName));
+        ::comphelper::extractInterface(xFieldNames, xComposerAsSet->getPropertyValue(FM_PROP_SELECTED_FIELDS));
+        ::comphelper::extractInterface(xTablesNames, xComposerAsSet->getPropertyValue(FM_PROP_SELECTED_TABLES));
+        ::comphelper::extractInterface(xComposerFieldAsSet, xFieldNames->getByName(aName));
 
         if (xComposerFieldAsSet.is() && ::comphelper::hasProperty(FM_PROP_TABLENAME, xComposerFieldAsSet) &&
             ::comphelper::hasProperty(FM_PROP_FIELDSOURCE, xComposerFieldAsSet))
 
                 Reference< ::com::sun::star::sdbcx::XColumnsSupplier >  xSupplyCols(xListCursor, UNO_QUERY);
                 Reference< ::com::sun::star::container::XIndexAccess >  xFields(xSupplyCols->getColumns(), UNO_QUERY);
-                ::cppu::extractInterface(xDataField, xFields->getByIndex(0));
+                ::comphelper::extractInterface(xDataField, xFields->getByIndex(0));
                 if (!xDataField.is())
                     return;
             }

File svx/source/fmcomp/gridctrl.cxx

 		for (sal_Int32 i = 0; i < xColumns->getCount(); ++i)
 		{
 			Reference< XPropertySet > xColSet;
-			::cppu::extractInterface(xColSet, xColumns->getByIndex(i));
+			::comphelper::extractInterface(xColSet, xColumns->getByIndex(i));
 			pColumn = new DataColumn(xColSet);
 			m_aVariants.Insert(pColumn, LIST_APPEND);
 		}

File svx/source/form/fmPropBrw.cxx

 #include <sfx2/objitem.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/viewfrm.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <tools/shl.hxx>

File svx/source/form/fmshimp.cxx

 	aNames[0] = ::rtl::OUString::createFromAscii("FormControlPilotsEnabled");
 	Sequence< Any > aFlags = GetProperties(aNames);
 	if (1 == aFlags.getLength())
-		m_bUseWizards = ::cppu::any2bool(aFlags[0]);
+		m_bUseWizards = ::comphelper::any2bool(aFlags[0]);
 }
 
 //------------------------------------------------------------------------
 	Sequence< ::rtl::OUString > aNames(1);
 	aNames[0] = ::rtl::OUString::createFromAscii("FormControlPilotsEnabled");
 	Sequence< Any > aValues(1);
-	aValues[0] = ::cppu::bool2any(m_bUseWizards);
+	aValues[0] = ::comphelper::bool2any(m_bUseWizards);
 	PutProperties(aNames, aValues);
 }
 

File svx/source/form/fmtools.cxx

 #include <sfx2/bindings.hxx>
 #include <svl/eitem.hxx>
 #include <svl/stritem.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <tools/debug.hxx>
 #include <tools/string.hxx>
 #include <vcl/stdtext.hxx>

File svx/source/form/formcontroller.cxx

         {
             Any aVal        = xSet->getPropertyValue(FM_PROP_CYCLE);
             sal_Int32 aVal2 = 0;
-            ::cppu::enum2int(aVal2,aVal);
+            ::comphelper::enum2int(aVal2,aVal);
             m_bCycle        = !aVal.hasValue() || aVal2 == TabulatorCycle_RECORDS;
             m_bCanUpdate    = aStaticTools.canUpdate(xSet);
             m_bCanInsert    = aStaticTools.canInsert(xSet);
             for (sal_Int32 i=0; i<aFinalValues.getLength(); ++i, ++pFinalValues)
             {
                 Reference< XPropertySet > xParam;
-                ::cppu::extractInterface(xParam, aRequest.Parameters->getByIndex(i));
+                ::comphelper::extractInterface(xParam, aRequest.Parameters->getByIndex(i));
                 if (xParam.is())
                 {
 #ifdef DBG_UTIL

File svx/source/unodraw/unoshap2.cxx

 #include <sfx2/fcontnr.hxx>
 #endif
 
-#include "toolkit/unohlp.hxx"
+#include "toolkit/helper/vclunohelper.hxx"
 
 //----------------------------------------------------------------------
 SvxGraphicObject::SvxGraphicObject( SdrObject* pObj ) throw()

File svx/source/unodraw/unoshape.cxx

 #include <comphelper/extract.hxx>
 #include "svx/shapepropertynotifier.hxx"
 #include <comphelper/serviceinfohelper.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <comphelper/serviceinfohelper.hxx>
 #include <rtl/uuid.h>
 #include <rtl/memory.h>

File svx/source/xoutdev/xattrbmp.cxx

 #include <vcl/window.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/bitmapex.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <svl/style.hxx>
 #include <editeng/memberids.hrc>
 

File toolkit/prj/d.lst

 ..\inc\toolkit\helper\accessiblefactory.hxx %_DEST%\inc%_EXT%\toolkit\helper\accessiblefactory.hxx
 ..\inc\toolkit\helper\fixedhyperbase.hxx %_DEST%\inc%_EXT%\toolkit\helper\fixedhyperbase.hxx
 
-..\inc\toolkit\helper\vclunohelper.hxx %_DEST%\inc%_EXT%\toolkit\unohlp.hxx
 ..\inc\toolkit\dllapi.h %_DEST%\inc%_EXT%\toolkit\dllapi.h
 
 mkdir: %_DEST%\inc%_EXT%\layout

File toolkit/source/controls/unocontrolmodel.cxx

 #include <toolkit/controls/unocontrolmodel.hxx>
 #include <toolkit/helper/macros.hxx>
 #include <cppuhelper/typeprovider.hxx>
-#include <cppuhelper/extract.hxx>
+#include <comphelper/extract.hxx>
 #include <rtl/memory.h>
 #include <rtl/uuid.h>
 #include <tools/diagnose_ex.h>
 			else if ( rType.getTypeClass() == TypeClass_ENUM )
             {
                 sal_Int32 nAsInt = 0;
-                ::cppu::enum2int( nAsInt, rValue );
+                ::comphelper::enum2int( nAsInt, rValue );
 				OutStream->writeLong( nAsInt );
             }
 #if OSL_DEBUG_LEVEL > 0
                 else if ( pType->getTypeClass() == TypeClass_ENUM )
                 {
                     sal_Int32 nAsInt = InStream->readLong();
-                    aValue = ::cppu::int2enum( nAsInt, *pType );
+                    aValue = ::comphelper::int2enum( nAsInt, *pType );
                 }
                 else
                 {
                         sal_Int32 nValue = 0;
                         bConverted = ( rValue >>= nValue );
                         if ( bConverted )
-                            rConvertedValue = ::cppu::int2enum( nValue, *pDestType );
+                            rConvertedValue = ::comphelper::int2enum( nValue, *pDestType );
 					}
 					break;
 					default: ; // avoid compiler warning

File toolkit/source/controls/unocontrols.cxx

 	// have it enabled by default because of 85071)
 	uno::Reference< awt::XVclWindowPeer >  xVclWindowPeer( getPeer(), uno::UNO_QUERY );
 	if ( xVclWindowPeer.is() )
-		xVclWindowPeer->setProperty( GetPropertyName( BASEPROPERTY_AUTOTOGGLE ), ::cppu::bool2any( sal_True ) );
+		xVclWindowPeer->setProperty( GetPropertyName( BASEPROPERTY_AUTOTOGGLE ), ::comphelper::bool2any( sal_True ) );
 }
 
 void UnoRadioButtonControl::addItemListener(const uno::Reference < awt::XItemListener > & l) throw(uno::RuntimeException)

File unotools/source/config/confignode.cxx

 			Reference< XInterface > xNode;
 			if (m_xDirectAccess.is() && m_xDirectAccess->hasByName(sNormalized))
 			{
-				if (!::cppu::extractInterface(xNode, m_xDirectAccess->getByName(sNormalized)))
+				if (!::comphelper::extractInterface(xNode, m_xDirectAccess->getByName(sNormalized)))
 				    OSL_ENSURE(sal_False, "OConfigurationNode::openNode: could not open the node!");
 			}
 			else if (m_xHierarchyAccess.is())
 			{
-				if (!::cppu::extractInterface(xNode, m_xHierarchyAccess->getByHierarchicalName(_rPath)))
+				if (!::comphelper::extractInterface(xNode, m_xHierarchyAccess->getByHierarchicalName(_rPath)))
 				    OSL_ENSURE(sal_False, "OConfigurationNode::openNode: could not open the node!");
 			}
             if (xNode.is())
 					Sequence< Any > aCreationArgs(3);
 					aCreationArgs[0] = makeAny(PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath")), 0, makeAny(_rPath), PropertyState_DIRECT_VALUE));
 					aCreationArgs[1] = makeAny(PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("depth")), 0, makeAny((sal_Int32)_nDepth), PropertyState_DIRECT_VALUE));
-					aCreationArgs[2] = makeAny(PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("lazywrite")), 0, ::cppu::bool2any(_bLazyWrite), PropertyState_DIRECT_VALUE));
+					aCreationArgs[2] = makeAny(PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("lazywrite")), 0, ::comphelper::bool2any(_bLazyWrite), PropertyState_DIRECT_VALUE));
 
 					::rtl::OUString sAccessService = ::rtl::OUString::createFromAscii(CM_READONLY == _eMode
 						? "com.sun.star.configuration.ConfigurationAccess"

File xmloff/source/core/SettingsExportHelper.cxx

 		break;
 		case uno::TypeClass_BOOLEAN:
 		{
-			exportBool(::cppu::any2bool(aAny), rName);
+			exportBool(::comphelper::any2bool(aAny), rName);
 		}
 		break;
 		case uno::TypeClass_BYTE:

File xmloff/source/core/xmlexp.cxx

 						mxExportInfo->setPropertyValue(sProgressCurrent, aAny);
 					}
                     if (xPropertySetInfo->hasPropertyByName(sRepeat))
-                        mxExportInfo->setPropertyValue(sRepeat, cppu::bool2any(mpProgressBarHelper->GetRepeat()));
+                        mxExportInfo->setPropertyValue(sRepeat, comphelper::bool2any(mpProgressBarHelper->GetRepeat()));
 				}
 				if (mpNumExport && (mnExportFlags & (EXPORT_AUTOSTYLES | EXPORT_STYLES)))
 				{
 			if (xPropertySetInfo->hasPropertyByName(sUsePrettyPrinting))
 			{
 				uno::Any aAny = mxExportInfo->getPropertyValue(sUsePrettyPrinting);
-				if (::cppu::any2bool(aAny))
+				if (::comphelper::any2bool(aAny))
 					mnExportFlags |= EXPORT_PRETTY;
 				else
 					mnExportFlags &= ~EXPORT_PRETTY;
                 {
                     uno::Any aAny = mxExportInfo->getPropertyValue(sRepeat);
                     if (aAny.getValueType() == getBooleanCppuType())
-                        mpProgressBarHelper->SetRepeat(::cppu::any2bool(aAny));
+                        mpProgressBarHelper->SetRepeat(::comphelper::any2bool(aAny));
                     else {
                         DBG_ERRORFILE("why is it no boolean?");
                     }

File xmloff/source/core/xmlimp.cxx

 					mxImportInfo->setPropertyValue(sProgressCurrent, aAny);
 				}
                 if (xPropertySetInfo->hasPropertyByName(sRepeat))
-                    mxImportInfo->setPropertyValue(sRepeat, cppu::bool2any(mpProgressBarHelper->GetRepeat()));
+                    mxImportInfo->setPropertyValue(sRepeat, comphelper::bool2any(mpProgressBarHelper->GetRepeat()));
                 // pProgressBarHelper is deleted in dtor
 			}
 			OUString sNumberStyles(RTL_CONSTASCII_USTRINGPARAM(XML_NUMBERSTYLES));
                 {
                     uno::Any aAny = mxImportInfo->getPropertyValue(sRepeat);
                     if (aAny.getValueType() == getBooleanCppuType())
-                        mpProgressBarHelper->SetRepeat(::cppu::any2bool(aAny));
+                        mpProgressBarHelper->SetRepeat(::comphelper::any2bool(aAny));
                     else {
                         DBG_ERRORFILE("why is it no boolean?");
                     }

File xmloff/source/draw/animexp.cxx

 using ::rtl::OUStringBuffer;
 
 using namespace ::std;
-using namespace ::cppu;
+using namespace ::comphelper;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::drawing;

File xmloff/source/draw/animimp.cxx

 using ::rtl::OUStringBuffer;
 
 using namespace ::std;
-using namespace ::cppu;
+using namespace ::comphelper;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::xml;
 using namespace ::com::sun::star::xml::sax;

File xmloff/source/draw/eventimp.cxx

 
                     pProperties->Name = OUString( RTL_CONSTASCII_USTRINGPARAM("PlayFull") );
                     pProperties->Handle = -1;
-                    pProperties->Value = ::cppu::bool2any(mbPlayFull);
+                    pProperties->Value = ::comphelper::bool2any(mbPlayFull);
                     pProperties->State = beans::PropertyState_DIRECT_VALUE;
                     break;
 

File xmloff/source/draw/ximpshap.cxx

 				if( xPropsInfo.is() )
 				{
 					if( !mbIsPlaceholder && xPropsInfo->hasPropertyByName(OUString(RTL_CONSTASCII_USTRINGPARAM("IsEmptyPresentationObject") )))
-						xProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("IsEmptyPresentationObject") ), ::cppu::bool2any( sal_False ) );
+						xProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("IsEmptyPresentationObject") ), ::comphelper::bool2any( sal_False ) );
 
 					if( mbIsUserTransformed && xPropsInfo->hasPropertyByName(OUString(RTL_CONSTASCII_USTRINGPARAM("IsPlaceholderDependent") )))
-						xProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("IsPlaceholderDependent") ), ::cppu::bool2any( sal_False ) );
+						xProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("IsPlaceholderDependent") ), ::comphelper::bool2any( sal_False ) );
 				}
 			}
 		}
 
 			uno::Reference< beans::XPropertySetInfo > xPropsInfo( xPropset->getPropertySetInfo() );
 			if( xPropsInfo.is() && xPropsInfo->hasPropertyByName(OUString(RTL_CONSTASCII_USTRINGPARAM("IsEmptyPresentationObject") )))
-				xPropset->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("IsEmptyPresentationObject") ), ::cppu::bool2any( mbIsPlaceholder ) );
+				xPropset->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("IsEmptyPresentationObject") ), ::comphelper::bool2any( mbIsPlaceholder ) );
 
 			if( !mbIsPlaceholder )
 			{
 				if( xPropsInfo.is() )
 				{
 					if( xPropsInfo->hasPropertyByName(OUString(RTL_CONSTASCII_USTRINGPARAM("IsPlaceholderDependent") )))
-						xProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("IsPlaceholderDependent") ), ::cppu::bool2any( sal_False ) );
+						xProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("IsPlaceholderDependent") ), ::comphelper::bool2any( sal_False ) );
 				}
 			}
 		}
 			{
 				uno::Reference< beans::XPropertySetInfo > xPropsInfo( xProps->getPropertySetInfo() );
 				if( xPropsInfo.is() && xPropsInfo->hasPropertyByName(OUString(RTL_CONSTASCII_USTRINGPARAM("IsEmptyPresentationObject") )))
-					xProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("IsEmptyPresentationObject") ), ::cppu::bool2any( sal_False ) );
+					xProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("IsEmptyPresentationObject") ), ::comphelper::bool2any( sal_False ) );
 
 				uno::Any aAny;
 
 				if( xPropsInfo.is() )
 				{
 					if( xPropsInfo->hasPropertyByName(OUString(RTL_CONSTASCII_USTRINGPARAM("IsPlaceholderDependent") )))
-						xProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("IsPlaceholderDependent") ), ::cppu::bool2any( sal_False ) );
+						xProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("IsPlaceholderDependent") ), ::comphelper::bool2any( sal_False ) );
 				}
 			}
 		}
 				if( xPropsInfo.is() )
 				{
 					if( !mbIsPlaceholder && xPropsInfo->hasPropertyByName(OUString(RTL_CONSTASCII_USTRINGPARAM("IsEmptyPresentationObject") )))
-						xProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("IsEmptyPresentationObject") ), ::cppu::bool2any( sal_False ) );
+						xProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("IsEmptyPresentationObject") ), ::comphelper::bool2any( sal_False ) );
 
 					if( mbIsUserTransformed && xPropsInfo->hasPropertyByName(OUString(RTL_CONSTASCII_USTRINGPARAM("IsPlaceholderDependent") )))
-						xProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("IsPlaceholderDependent") ), ::cppu::bool2any( sal_False ) );
+						xProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("IsPlaceholderDependent") ), ::comphelper::bool2any( sal_False ) );
 				}
 			}
 		}
 				if( xPropsInfo.is() )
 				{
 					if( !mbIsPlaceholder && xPropsInfo->hasPropertyByName(OUString(RTL_CONSTASCII_USTRINGPARAM("IsEmptyPresentationObject") )))
-						xProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("IsEmptyPresentationObject") ), ::cppu::bool2any( sal_False ) );
+						xProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("IsEmptyPresentationObject") ), ::comphelper::bool2any( sal_False ) );
 
 					if( mbIsUserTransformed && xPropsInfo->hasPropertyByName(OUString(RTL_CONSTASCII_USTRINGPARAM("IsPlaceholderDependent") )))
-						xProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("IsPlaceholderDependent") ), ::cppu::bool2any( sal_False ) );
+						xProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("IsPlaceholderDependent") ), ::comphelper::bool2any( sal_False ) );
 				}
 			}
 		}

File xmloff/source/draw/ximpshow.cxx

 using ::rtl::OUStringBuffer;
 
 using namespace ::std;
-using namespace ::cppu;
+using namespace ::comphelper;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::xml;
 using namespace ::com::sun::star::xml::sax;

File xmloff/source/forms/elementexport.cxx

 							sal_Bool bMultiLine = sal_False;
 							if (m_xPropertyInfo->hasPropertyByName(PROPERTY_MULTILINE))
 								// grid columns do not have this property ....
-								bMultiLine = ::cppu::any2bool(m_xProps->getPropertyValue(PROPERTY_MULTILINE));
+								bMultiLine = ::comphelper::any2bool(m_xProps->getPropertyValue(PROPERTY_MULTILINE));
 
                             if ( bMultiLine )
 								m_eType = TEXT_AREA;

File xmloff/source/forms/elementimport.cxx

 				// create and store a new PropertyValue
 				PropertyValue aNewValue;
 				aNewValue.Name = pProperty->sPropertyName;
-				aNewValue.Value <<= (sal_Int16)::cppu::any2bool(aBooleanValue);
+				aNewValue.Value <<= (sal_Int16)::comphelper::any2bool(aBooleanValue);
 
 				implPushBackPropertyValue(aNewValue);
 			}

File xmloff/source/forms/eventimport.cxx

 		ConstMapPropertySet2ScriptSequenceIterator aRegisteredEventsPos;
 		for (sal_Int32 i=0; i<nCount; ++i)
 		{
-			::cppu::extractInterface(xCurrent, _rxContainer->getByIndex(i));
+			::comphelper::extractInterface(xCurrent, _rxContainer->getByIndex(i));
 			if (xCurrent.is())
 			{
 				aRegisteredEventsPos = m_aEvents.find(xCurrent);

File xmloff/source/forms/officeforms.cxx

 
 		// set the property
 		if (_rxPropInfo->hasPropertyByName(_rPropName))
-			_rxProps->setPropertyValue(_rPropName, ::cppu::bool2any(bValue));
+			_rxProps->setPropertyValue(_rPropName, ::comphelper::bool2any(bValue));
 	}
 
 	//-------------------------------------------------------------------------
 		// retrieve the property value
 		sal_Bool bValue = _bDefault;
 		if (_rxPropInfo->hasPropertyByName(_rPropName))
-			bValue = ::cppu::any2bool(_rxProps->getPropertyValue(_rPropName));
+			bValue = ::comphelper::any2bool(_rxProps->getPropertyValue(_rPropName));
 
 		// convert into a string
 		::rtl::OUStringBuffer aValue;

File xmloff/source/forms/propertyexport.cxx

 		Any aCurrentValue = m_xProps->getPropertyValue( _rPropertyName );
 		if (aCurrentValue.hasValue())
 		{
-			bCurrentValue = ::cppu::any2bool(aCurrentValue);
+			bCurrentValue = ::comphelper::any2bool(aCurrentValue);
 			// this will extract a boolean value even if the Any contains a int or short or something like that ...
 
 			if (_nBooleanAttributeFlags & BOOLATTR_INVERSE_SEMANTICS)
 
 		if (aValue.hasValue())
 		{	// we have a non-void current value
-			::cppu::enum2int(nCurrentValue, aValue);
+			::comphelper::enum2int(nCurrentValue, aValue);
 
 			// add the attribute
 			if ((_nDefault != nCurrentValue) || _bVoidDefault)
 			{
 				// convert it into an int32
 				sal_Int32 nValue = 0;
-				::cppu::enum2int(nValue, _rValue);
+				::comphelper::enum2int(nValue, _rValue);
 				m_rContext.getGlobalContext().GetMM100UnitConverter().convertNumber(aBuffer, nValue);
 			}
 			break;

File xmloff/source/forms/propertyimport.cxx

 					::rtl::OString("PropertyConversion::convertString: could not convert \"")
 				+=	::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(), RTL_TEXTENCODING_ASCII_US)
 				+=	::rtl::OString("\" into a boolean!"));
-			aReturn = ::cppu::bool2any(_bInvertBoolean ? !bValue : bValue);
+			aReturn = ::comphelper::bool2any(_bInvertBoolean ? !bValue : bValue);
 		}
 		break;