Commits

Anonymous committed 6dea45b

#i109930# consistent header files

Comments (0)

Files changed (2)

configmgr/source/registry/cfgregistrykey.cxx

 #include "datalock.hxx"
 #include "typeconverter.hxx"
 #include <osl/diagnose.h>
-#include <cppuhelper/extract.hxx>
+#include <comphelper/extract.hxx>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/container/XNamed.hpp>
 #include <com/sun/star/container/XChild.hpp>
 	if (aDescendant.getValueType().getTypeClass() == com::sun::star::uno::TypeClass_INTERFACE)
 	{
 		com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > xNode;
-		::cppu::extractInterface(xNode, aDescendant);
+		::comphelper::extractInterface(xNode, aDescendant);
 		if (!xNode.is())
 			throw com::sun::star::registry::InvalidRegistryException(UNISTRING("invalid descendant node. No XNameAccess found."), THISREF());
 		return new OConfigurationRegistryKey(xNode, !m_bReadOnly);
             if (sParentLocation.getLength())
 		    {
 			    com::sun::star::uno::Any aDescParent = implGetDescendant(sParentLocation);
-			    ::cppu::extractInterface(xDescParent, aDescParent);
+			    ::comphelper::extractInterface(xDescParent, aDescParent);
 			    if (!xDescParent.is())
 				    throw com::sun::star::registry::InvalidRegistryException(UNISTRING("The internal registry structure seems to be corrupt."), THISREF());
 		    }

connectivity/source/drivers/mozab/MResultSetMetaData.cxx

 {
 	checkColumnIndex(column);
 	sal_Bool bReadOnly = (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)));
 	
 	return m_bReadOnly || bReadOnly || m_pTable->isReadOnly();
 }