Commits

Anonymous committed 84d20c8

#i109930# consistent header files

Comments (0)

Files changed (25)

dbaccess/source/core/api/CacheSet.cxx

 		// search the one and only primary key
 		for(sal_Int32 i=0;i< xKeys->getCount();++i)
 		{
-			::cppu::extractInterface(xProp,xKeys->getByIndex(i));
+			::comphelper::extractInterface(xProp,xKeys->getByIndex(i));
 			sal_Int32 nKeyType = 0;
 			xProp->getPropertyValue(PROPERTY_TYPE) >>= nKeyType;
 			if(KeyType::PRIMARY == nKeyType)
 	{
 		for(sal_Int32 j=0;j<xIndexes->getCount();++j)
 		{
-			::cppu::extractInterface(xIndexColsSup,xIndexes->getByIndex(j));
+			::comphelper::extractInterface(xIndexColsSup,xIndexes->getByIndex(j));
 			if(	xIndexColsSup.is()
 				&& comphelper::getBOOL(xIndexColsSup->getPropertyValue(PROPERTY_ISUNIQUE))
 				&& !comphelper::getBOOL(xIndexColsSup->getPropertyValue(PROPERTY_ISPRIMARYKEYINDEX))
 		// search the one and only primary key
 		for(sal_Int32 i=0;i< xKeys->getCount();++i)
 		{
-			::cppu::extractInterface(xProp,xKeys->getByIndex(i));
+			::comphelper::extractInterface(xProp,xKeys->getByIndex(i));
 			sal_Int32 nKeyType = 0;
 			xProp->getPropertyValue(PROPERTY_TYPE) >>= nKeyType;
 			if(KeyType::PRIMARY == nKeyType)

dbaccess/source/core/api/RowSet.cxx

 	switch(nHandle)
 	{
 		case PROPERTY_ID_ISMODIFIED:
-			m_bModified = cppu::any2bool(rValue);
+			m_bModified = comphelper::any2bool(rValue);
 			break;
 		case PROPERTY_ID_FETCHDIRECTION:
 			if( m_nResultSetType == ResultSetType::FORWARD_ONLY)
 			m_bOwnConnection = sal_True;
 			break;
 		case PROPERTY_ID_TYPEMAP:
-			::cppu::extractInterface(m_xTypeMap,m_aTypeMap);
+			::comphelper::extractInterface(m_xTypeMap,m_aTypeMap);
 			break;
 		default:
 			break;
 							pColumn->setFastPropertyValue_NoBroadcast(PROPERTY_ID_RELATIVEPOSITION,makeAny(sal_Int32(i+1)));
 							pColumn->setFastPropertyValue_NoBroadcast(PROPERTY_ID_WIDTH,makeAny(sal_Int32(227)));
 							pColumn->setFastPropertyValue_NoBroadcast(PROPERTY_ID_ALIGN,makeAny((sal_Int32)0));
-							pColumn->setFastPropertyValue_NoBroadcast(PROPERTY_ID_HIDDEN,::cppu::bool2any(sal_False));
+							pColumn->setFastPropertyValue_NoBroadcast(PROPERTY_ID_HIDDEN,::comphelper::bool2any(sal_False));
 						}
 						catch(Exception&)
 						{

dbaccess/source/core/api/RowSetCache.cxx

 	Reference< XPropertySet> xProp(_xRs,UNO_QUERY);
 
 	sal_Bool bNeedKeySet = !(xProp->getPropertySetInfo()->hasPropertyByName(PROPERTY_ISBOOKMARKABLE) &&
-							 any2bool(xProp->getPropertyValue(PROPERTY_ISBOOKMARKABLE)) && Reference< XRowLocate >(_xRs, UNO_QUERY).is() );
+							 comphelper::any2bool(xProp->getPropertyValue(PROPERTY_ISBOOKMARKABLE)) && Reference< XRowLocate >(_xRs, UNO_QUERY).is() );
 	bNeedKeySet = bNeedKeySet || (xProp->getPropertySetInfo()->hasPropertyByName(PROPERTY_RESULTSETCONCURRENCY) &&
 							::comphelper::getINT32(xProp->getPropertyValue(PROPERTY_RESULTSETCONCURRENCY)) == ResultSetConcurrency::READ_ONLY);
 
 			for(;pIter != pEnd;++pIter)
 			{
 				Reference<XPropertySet> xColumn;
-				::cppu::extractInterface(xColumn,xColumns->getByName(*pIter));
+				::comphelper::extractInterface(xColumn,xColumns->getByName(*pIter));
 				OSL_ENSURE(xColumn.is(),"Column in table is null!");
 				if(xColumn.is())
 				{

dbaccess/source/ext/adabas/AdabasNewDb.cxx

 #include <unotools/pathoptions.hxx>
 #endif
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_
 #include <com/sun/star/beans/PropertyValue.hpp>
 	if(m_bRestore)
 	{
 		aCreateArgs[nPos].Name		= PROPERTY_RESTOREDATABASE;
-		aCreateArgs[nPos++].Value  <<= ::cppu::bool2any(sal_True);
+		aCreateArgs[nPos++].Value  <<= ::comphelper::bool2any(sal_True);
 		aCreateArgs[nPos].Name		= PROPERTY_BACKUPNAME;
 		aCreateArgs[nPos++].Value  <<= ::rtl::OUString(m_Backup_File);
 	}

dbaccess/source/ui/app/AppControllerGen.cxx

 #include <connectivity/dbexception.hxx>
 #include <sfx2/mailmodelapi.hxx>
 #include <svx/dbaexchange.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <tools/diagnose_ex.h>
 #include <tools/urlobj.hxx>
 #include <unotools/bootstrap.hxx>

dbaccess/source/ui/browser/brwctrlr.cxx

 		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));
 			DBG_ASSERT(xParam.is(), "SbaXDataBrowserController::approveParameter: one of the parameters is no property set!");
 			if (xParam.is())
 			{
     if ( !bIsValid )
     {
 	    Reference<XPropertySet> xProp(m_xRowSet,UNO_QUERY);
-	    bIsValid = ::cppu::any2bool(xProp->getPropertyValue(PROPERTY_ISNEW));
+	    bIsValid = ::comphelper::any2bool(xProp->getPropertyValue(PROPERTY_ISNEW));
         if ( !bIsValid )
         {
             bIsValid = m_xParser.is();

dbaccess/source/ui/browser/dataview.cxx

 #include "dataview.hxx"
 #endif
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ 
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #ifndef _COMPHELPER_TYPES_HXX_
 #include <comphelper/types.hxx>

dbaccess/source/ui/browser/sbagrid.cxx

 	Reference< XIndexAccess >  xCols(GetPeer()->getColumns(), UNO_QUERY);
 	Reference< XPropertySet >  xAffectedCol;
 	if (xCols.is() && (nModelPos != (sal_uInt16)-1))
-		::cppu::extractInterface(xAffectedCol,xCols->getByIndex(nModelPos));
+		::comphelper::extractInterface(xAffectedCol,xCols->getByIndex(nModelPos));
 
 	if (xAffectedCol.is())
 	{
 	Reference< XIndexAccess >  xCols(GetPeer()->getColumns(), UNO_QUERY);
 	Reference< XPropertySet >  xAffectedCol;
 	if (xCols.is() && (nModelPos != (sal_uInt16)-1))
-		::cppu::extractInterface(xAffectedCol,xCols->getByIndex(nModelPos));
+		::comphelper::extractInterface(xAffectedCol,xCols->getByIndex(nModelPos));
 
 	// get the field the column is bound to
 	Reference< XPropertySet >  xField = getField(nModelPos);
 			if (xColumnControls.is())
 			{
 				Reference< ::com::sun::star::awt::XTextComponent >  xColControl;
-				::cppu::extractInterface(xColControl,xColumnControls->getByIndex(GetViewColumnPos(nCol)));
+				::comphelper::extractInterface(xColControl,xColumnControls->getByIndex(GetViewColumnPos(nCol)));
 				if (xColControl.is())
 				{
 					m_bActivatingForDrop = sal_True;

dbaccess/source/ui/browser/unodatbr.cxx

 #include <svx/dataaccessdescriptor.hxx>
 #include <svx/databaseregistrationui.hxx>
 #include <svx/gridctrl.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <tools/diagnose_ex.h>
 #include <tools/multisel.hxx>
 #include <tools/urlobj.hxx>
 				// ignore the column when it is a rowversion one
 				if  (   bSuppressVersionCol
                     &&  xColPSI->hasPropertyByName( PROPERTY_ISROWVERSION )
-                    &&  ::cppu::any2bool( xColumn->getPropertyValue( PROPERTY_ISROWVERSION ) )
+                    &&  ::comphelper::any2bool( xColumn->getPropertyValue( PROPERTY_ISROWVERSION ) )
                     )
 					continue;
 
 		::rtl::OUString aName;
 		_rxSource->getPropertyValue(PROPERTY_NAME) >>= aName;
 		if(xNames.is() && xNames->hasByName(aName))
-			::cppu::extractInterface(xRet,xNames->getByName(aName));
+			::comphelper::extractInterface(xRet,xNames->getByName(aName));
 	}
 	return xRet;
 }
 	// escape processing is the only one allowed not to be present
 	_rEscapeProcessing = sal_True;
 	if (_rDescriptor.has(daEscapeProcessing))
-		_rEscapeProcessing = ::cppu::any2bool(_rDescriptor[daEscapeProcessing]);
+		_rEscapeProcessing = ::comphelper::any2bool(_rDescriptor[daEscapeProcessing]);
 }
 
 // -------------------------------------------------------------------------
 				// set this _before_ setting the connection, else the rowset would rebuild it ...
 			xProp->setPropertyValue(PROPERTY_COMMAND_TYPE, makeAny(_nCommandType));
 			xProp->setPropertyValue(PROPERTY_COMMAND, makeAny(_rCommand));
-			xProp->setPropertyValue(PROPERTY_ESCAPE_PROCESSING, ::cppu::bool2any(_bEscapeProcessing));
+			xProp->setPropertyValue(PROPERTY_ESCAPE_PROCESSING, ::comphelper::bool2any(_bEscapeProcessing));
 			if ( m_bPreview )
 			{
 				xProp->setPropertyValue(PROPERTY_FETCHDIRECTION, makeAny(FetchDirection::FORWARD));
 	sal_Int32 nOldType = 0;
 	xRowSetProps->getPropertyValue(PROPERTY_COMMAND_TYPE) >>= nOldType;
 	Reference<XConnection> xOldConnection;
-	::cppu::extractInterface(xOldConnection,xRowSetProps->getPropertyValue(PROPERTY_ACTIVE_CONNECTION));
+	::comphelper::extractInterface(xOldConnection,xRowSetProps->getPropertyValue(PROPERTY_ACTIVE_CONNECTION));
 	// the name of the table or query
 	SvLBoxString* pString = (SvLBoxString*)_pEntry->GetFirstItem(SV_ITEM_ID_BOLDLBSTRING);
 	OSL_ENSURE(pString,"There must be a string item!");
 #if OSL_DEBUG_LEVEL > 1
 		{
 			Reference< XComponent > xComp;
-			::cppu::extractInterface(xComp, xRowSetProps->getPropertyValue(PROPERTY_ACTIVE_CONNECTION));
+			::comphelper::extractInterface(xComp, xRowSetProps->getPropertyValue(PROPERTY_ACTIVE_CONNECTION));
 		}
 #endif
 
 		if ( xQuery.is() )
 		{
 			xQuery->getPropertyValue( PROPERTY_COMMAND ) >>= _rCommand;
-			_bEscapeProcessing = ::cppu::any2bool( xQuery->getPropertyValue( PROPERTY_ESCAPE_PROCESSING ) );
+			_bEscapeProcessing = ::comphelper::any2bool( xQuery->getPropertyValue( PROPERTY_ESCAPE_PROCESSING ) );
 			return sal_True;
 		}
 	}

dbaccess/source/ui/misc/UITools.cxx

 	try
 	{
 		_xDataSource->getPropertyValue(PROPERTY_PASSWORD) >>= sPwd;
-		bPwdReq = ::cppu::any2bool(_xDataSource->getPropertyValue(PROPERTY_ISPASSWORDREQUIRED));
+		bPwdReq = ::comphelper::any2bool(_xDataSource->getPropertyValue(PROPERTY_ISPASSWORDREQUIRED));
 		_xDataSource->getPropertyValue(PROPERTY_USER) >>= sUser;
 	}
 	catch(Exception&)
 	_rxColumn->setPropertyValue(PROPERTY_PRECISION,makeAny(_pFieldDesc->GetPrecision()));
 	_rxColumn->setPropertyValue(PROPERTY_SCALE,makeAny(_pFieldDesc->GetScale()));
 	_rxColumn->setPropertyValue(PROPERTY_ISNULLABLE, makeAny(_pFieldDesc->GetIsNullable()));
-	_rxColumn->setPropertyValue(PROPERTY_ISAUTOINCREMENT,::cppu::bool2any(_pFieldDesc->IsAutoIncrement()));
+	_rxColumn->setPropertyValue(PROPERTY_ISAUTOINCREMENT,::comphelper::bool2any(_pFieldDesc->IsAutoIncrement()));
 	if ( _rxColumn->getPropertySetInfo()->hasPropertyByName(PROPERTY_ISCURRENCY) && _pFieldDesc->IsCurrency() )
-		_rxColumn->setPropertyValue(PROPERTY_ISCURRENCY,::cppu::bool2any(_pFieldDesc->IsCurrency()));
+		_rxColumn->setPropertyValue(PROPERTY_ISCURRENCY,::comphelper::bool2any(_pFieldDesc->IsCurrency()));
 	// set autoincrement value when available
 	// and only set when the entry is not empty, that lets the value in the column untouched
 	if ( _pFieldDesc->IsAutoIncrement() && _pFieldDesc->GetAutoIncrementValue().getLength() && _rxColumn->getPropertySetInfo()->hasPropertyByName(PROPERTY_AUTOINCREMENTCREATION) )

dbaccess/source/ui/misc/databaseobjectview.cxx

 		_rDispatchArguments.realloc( nNewLen );
 
 		_rDispatchArguments[nPos  ].Name = PROPERTY_GRAPHICAL_DESIGN;
-		_rDispatchArguments[nPos++].Value <<= ::cppu::bool2any( !m_bPreferSQLView );
+		_rDispatchArguments[nPos++].Value <<= ::comphelper::bool2any( !m_bPreferSQLView );
 
 		_rDispatchArguments[nPos  ].Name = PROPERTY_COMMAND_TYPE;
         _rDispatchArguments[nPos++].Value <<= m_nCommandType;

dbaccess/source/ui/misc/indexcollection.cxx

 			static const ::rtl::OUString s_sSortPropertyName = ::rtl::OUString::createFromAscii("IsAscending");
 			static const ::rtl::OUString s_sNamePropertyName = ::rtl::OUString::createFromAscii("Name");
 			// the index' own props
-			xIndexDescriptor->setPropertyValue(s_sUniquePropertyName, ::cppu::bool2any(_rPos->bUnique));
+			xIndexDescriptor->setPropertyValue(s_sUniquePropertyName, ::comphelper::bool2any(_rPos->bUnique));
 			xIndexDescriptor->setPropertyValue(s_sNamePropertyName, makeAny(_rPos->sName));
 
 			// the fields
 				OSL_ENSURE(xColDescriptor.is(), "OIndexCollection::commitNewIndex: invalid column descriptor!");
 				if (xColDescriptor.is())
 				{
-					xColDescriptor->setPropertyValue(s_sSortPropertyName, ::cppu::bool2any(aFieldLoop->bSortAscending));
+					xColDescriptor->setPropertyValue(s_sSortPropertyName, ::comphelper::bool2any(aFieldLoop->bSortAscending));
 					xColDescriptor->setPropertyValue(s_sNamePropertyName, makeAny(::rtl::OUString(aFieldLoop->sFieldName)));
 					xAppendCols->appendByDescriptor(xColDescriptor);
 				}
 		static const ::rtl::OUString s_sSortPropertyName = ::rtl::OUString::createFromAscii("IsAscending");
 		static const ::rtl::OUString s_sCatalogPropertyName = ::rtl::OUString::createFromAscii("Catalog");
 
-		_rIndex.bPrimaryKey = ::cppu::any2bool(_rxDescriptor->getPropertyValue(s_sPrimaryIndexPropertyName));
-		_rIndex.bUnique = ::cppu::any2bool(_rxDescriptor->getPropertyValue(s_sUniquePropertyName));
+		_rIndex.bPrimaryKey = ::comphelper::any2bool(_rxDescriptor->getPropertyValue(s_sPrimaryIndexPropertyName));
+		_rIndex.bUnique = ::comphelper::any2bool(_rxDescriptor->getPropertyValue(s_sUniquePropertyName));
 		_rxDescriptor->getPropertyValue(s_sCatalogPropertyName) >>= _rIndex.sDescription;
 
 		// the columns
 
 				// get the relevant properties
 				aCopyTo->sFieldName = *pFieldNames;
-				aCopyTo->bSortAscending = ::cppu::any2bool(xIndexColumn->getPropertyValue(s_sSortPropertyName));
+				aCopyTo->bSortAscending = ::comphelper::any2bool(xIndexColumn->getPropertyValue(s_sSortPropertyName));
 			}
 
 			_rIndex.aFields.resize(aCopyTo - _rIndex.aFields.begin());

dbaccess/source/ui/misc/linkeddocuments.cxx

 #include <com/sun/star/task/XJobExecutor.hpp>
 #endif
 #ifndef _COMPHELPER_EXTRACT_HXX_
-#include <cppuhelper/extract.hxx>
+#include <comphelper/extract.hxx>
 #endif
 #ifndef _COMPHELPER_TYPES_HXX_ 
 #include <comphelper/types.hxx>

dbaccess/source/ui/misc/singledoccontroller.cxx

 #include <connectivity/dbtools.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include <rtl/ustrbuf.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <vcl/msgbox.hxx>

dbaccess/source/ui/querydesign/QueryTextView.cxx

 #include "dbustrings.hrc"
 #endif
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ 
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #ifndef _SV_SPLIT_HXX 
 #include <vcl/split.hxx>

dbaccess/source/ui/querydesign/querycontainerwindow.cxx

 #include "JoinController.hxx"
 #endif
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ 
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #ifndef DBACCESS_SHARED_DBUSTRINGS_HRC
 #include "dbustrings.hrc"

dbaccess/source/ui/querydesign/querycontroller.cxx

 				aProps[2].Value <<= sTranslatedStmt;
 
 				aProps[3].Name = PROPERTY_ENABLE_BROWSER;
-				aProps[3].Value = ::cppu::bool2any(sal_False);
+				aProps[3].Value = ::comphelper::bool2any(sal_False);
 
 				aProps[4].Name = PROPERTY_ACTIVE_CONNECTION;
 				aProps[4].Value <<= getConnection();
 				aProps[7].Value <<= m_sUpdateTableName;
 
 				aProps[8].Name = PROPERTY_ESCAPE_PROCESSING;
-				aProps[8].Value = ::cppu::bool2any(m_bEscapeProcessing);
+				aProps[8].Value = ::comphelper::bool2any(m_bEscapeProcessing);
 
 				xDisp->dispatch(aWantToDispatch, aProps);
 				// check the state of the beamer
             if ( editingQuery() )
 			{
 				xQuery->setPropertyValue( PROPERTY_UPDATE_TABLENAME, makeAny( m_sUpdateTableName ) );
-				xQuery->setPropertyValue( PROPERTY_ESCAPE_PROCESSING,::cppu::bool2any( m_bEscapeProcessing ) );
+				xQuery->setPropertyValue( PROPERTY_ESCAPE_PROCESSING,::comphelper::bool2any( m_bEscapeProcessing ) );
 
 				// layout information
 				getContainer()->SaveUIConfig();

dbaccess/source/ui/tabledesign/FieldDescriptions.cxx

 					    SetHorJustify( ::dbaui::mapTextJustify(::comphelper::getINT32(aValue)));
                 }
 				if(xPropSetInfo->hasPropertyByName(PROPERTY_ISAUTOINCREMENT))
-					SetAutoIncrement(::cppu::any2bool(xAffectedCol->getPropertyValue(PROPERTY_ISAUTOINCREMENT)));
+					SetAutoIncrement(::comphelper::any2bool(xAffectedCol->getPropertyValue(PROPERTY_ISAUTOINCREMENT)));
 			}
 			catch(const Exception&)
 			{
 sal_Bool					OFieldDescription::IsAutoIncrement()		const
 {
 	if ( m_xDest.is() && m_xDestInfo->hasPropertyByName(PROPERTY_ISAUTOINCREMENT) )
-		return ::cppu::any2bool(m_xDest->getPropertyValue(PROPERTY_ISAUTOINCREMENT));
+		return ::comphelper::any2bool(m_xDest->getPropertyValue(PROPERTY_ISAUTOINCREMENT));
 	else
 		return m_bIsAutoIncrement;
 }

dbaccess/source/ui/tabledesign/TableController.cxx

 			OSL_ENSURE(xNameAccess.is(),"no nameaccess for the queries!");
 
 			Reference<XPropertySet> xProp;
-			if(xNameAccess->hasByName(m_sName) && ::cppu::extractInterface(xProp,xNameAccess->getByName(m_sName)) && xProp.is()) 
+			if(xNameAccess->hasByName(m_sName) && ::comphelper::extractInterface(xProp,xNameAccess->getByName(m_sName)) && xProp.is()) 
 			{
 				m_xTable = xProp;
 				startTableListening();

sw/source/core/unocore/unodraw.cxx

                         SdrMark aMark(pObj);
                         aList.InsertEntry(aMark);
                         sal_Int32 nAnchor = 0;
-                        cppu::enum2int( nAnchor, aValue );
+                        comphelper::enum2int( nAnchor, aValue );
                         pDoc->ChgAnchor( aList, (RndStdIds)nAnchor,
                                                 sal_False, sal_True );
                     }

sw/source/filter/ww8/ww8par.cxx

                 xInfo->hasPropertyByName(C2U("ApplyFormDesignMode")))
             {
                 xDocProps->setPropertyValue(C2U("ApplyFormDesignMode"),
-                    cppu::bool2any(bValue));
+                    comphelper::bool2any(bValue));
             }
         }
     }

sw/source/filter/ww8/ww8par3.cxx

     }
 
     sal_Bool bDropDown(sal_True);
-    xPropSet->setPropertyValue(C2U("Dropdown"), cppu::bool2any(bDropDown));
+    xPropSet->setPropertyValue(C2U("Dropdown"), comphelper::bool2any(bDropDown));
 
     if (!maListEntries.empty())
     {

sw/source/ui/dbui/dbtablepreviewdialog.cxx

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

sw/source/ui/envelp/mailmrge.cxx

 #include <com/sun/star/sdbcx/XRowLocate.hpp>
 #include <com/sun/star/sdb/XResultSetAccess.hpp>
 #include <com/sun/star/sdbc/XDataSource.hpp>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/form/XFormController.hpp>
 #include <cppuhelper/implbase1.hxx>

sw/source/ui/uiview/view.cxx

 #include <com/sun/star/frame/FrameSearchFlag.hpp>
 #include <com/sun/star/scanner/ScannerContext.hpp>
 #include <com/sun/star/scanner/XScannerManager.hpp>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <xmloff/xmluconv.hxx>