Commits

Anonymous committed 5c3ffd9

#i109930# consistent header files

  • Participants
  • Parent commits b946aff

Comments (0)

Files changed (5)

File forms/source/component/DatabaseForm.cxx

 	   throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
 	if ((nHandle == PROPERTY_ID_ISMODIFIED) && (m_nResetsPending > 0))
-		return ::cppu::bool2any((sal_False));
+		return ::comphelper::bool2any((sal_False));
 		// don't allow the aggregate which is currently being reset to return a (temporary) "yes"
 	else
 		return OPropertySetAggregationHelper::getFastPropertyValue(nHandle);
 	// on the modified state of the row
 	// 21.02.00 - 73265 - FS)
 	if (bInsertRow)
-		m_xAggregateSet->setPropertyValue(PROPERTY_ISMODIFIED, ::cppu::bool2any(sal_Bool(sal_False)));
+		m_xAggregateSet->setPropertyValue(PROPERTY_ISMODIFIED, ::comphelper::bool2any(sal_Bool(sal_False)));
 
 	aResetGuard.clear();
 	{
 	// and again : ensure the row isn't modified
 	// we already did this after we (and maybe our dependents) resetted the values, but the listeners may have changed the row, too
 	if (bInsertRow)
-		m_xAggregateSet->setPropertyValue(PROPERTY_ISMODIFIED, ::cppu::bool2any((sal_False)));
+		m_xAggregateSet->setPropertyValue(PROPERTY_ISMODIFIED, ::comphelper::bool2any((sal_False)));
 
 	--m_nResetsPending;
 }
 	if (m_aCycle.hasValue())
 	{
 		sal_Int32 nCycle = 0;
-		::cppu::enum2int(nCycle, m_aCycle);
+		::comphelper::enum2int(nCycle, m_aCycle);
 		return nCycle != TabulatorCycle_PAGE;
 	}
 
 				for (sal_Int32 j = 0; j < nCount; ++j)
 				{
 					Reference<XFormComponent> xElement;
-					::cppu::extractInterface(xElement, getByIndex(j));
+					::comphelper::extractInterface(xElement, getByIndex(j));
 					if (xComp == xElement)
 					{
 						Reference<XPropertySet>  xSet(xComp, UNO_QUERY);
 	sal_Int32 nCycle = TabulatorCycle_RECORDS;
 	if (m_aCycle.hasValue())
 	{
-		::cppu::enum2int(nCycle, m_aCycle);
+		::comphelper::enum2int(nCycle, m_aCycle);
 		if (m_aCycle == TabulatorCycle_PAGE)
 				// unknown in earlier versions
 			nCycle = TabulatorCycle_RECORDS;
 	if (nAnyMask & CYCLE)
 	{
 		sal_Int32 nRealCycle = 0;
-		::cppu::enum2int(nRealCycle, m_aCycle);
+		::comphelper::enum2int(nRealCycle, m_aCycle);
 		_rxOutStream->writeShort((sal_Int16)nRealCycle);
 	}
 }
 	if (nVersion > 1)
 	{
 		sal_Int32 nCycle = _rxInStream->readShort();
-		m_aCycle = ::cppu::int2enum(nCycle, ::getCppuType(static_cast<const TabulatorCycle*>(NULL)));
+		m_aCycle = ::comphelper::int2enum(nCycle, ::getCppuType(static_cast<const TabulatorCycle*>(NULL)));
 		m_eNavigation = (NavigationBarMode)_rxInStream->readShort();
 
 		_rxInStream >> sAggregateProp;
 		if (nAnyMask & CYCLE)
 		{
 			sal_Int32 nCycle = _rxInStream->readShort();
-			m_aCycle = ::cppu::int2enum(nCycle, ::getCppuType(static_cast<const TabulatorCycle*>(NULL)));
+			m_aCycle = ::comphelper::int2enum(nCycle, ::getCppuType(static_cast<const TabulatorCycle*>(NULL)));
 		}
 		else
 			m_aCycle.clear();

File forms/source/component/Grid.cxx

     ::osl::ClearableMutexGuard aGuard( m_aMutex );
 
 	Reference<XPropertySet> xSel;
-	if (rElement.hasValue() && !::cppu::extractInterface(xSel, rElement))
+	if (rElement.hasValue() && !::comphelper::extractInterface(xSel, rElement))
 	{
 		throw IllegalArgumentException();
 	}

File forms/source/component/ImageControl.cxx

 		aDialog.SetTitle( sTitle );
 
 		Reference< XFilePickerControlAccess > xController( aDialog.GetFilePicker(), UNO_QUERY_THROW );
-		xController->setValue(ExtendedFilePickerElementIds::CHECKBOX_PREVIEW, 0, ::cppu::bool2any(sal_True));
+		xController->setValue(ExtendedFilePickerElementIds::CHECKBOX_PREVIEW, 0, ::comphelper::bool2any(sal_True));
 
 		Reference<XPropertySet> xBoundField;
 		if ( hasProperty( PROPERTY_BOUNDFIELD, xSet ) )
 			// FS - #64946# - 19.04.99
 			Reference<XPropertySet> xBoundField;
 			if (hasProperty(PROPERTY_BOUNDFIELD, xSet))
-				::cppu::extractInterface(xBoundField, xSet->getPropertyValue(PROPERTY_BOUNDFIELD));
+				::comphelper::extractInterface(xBoundField, xSet->getPropertyValue(PROPERTY_BOUNDFIELD));
 			if (!xBoundField.is())
 			{
 				// but only if our IMAGE_URL property is handled as if it is transient, which is equivalent to

File forms/source/component/ListBox.cxx

         // - this would be unable to reflect in the db column
         if ( hasField() )
         {
-            setFastPropertyValue( PROPERTY_ID_MULTISELECTION, ::cppu::bool2any( ( sal_False ) ) );
+            setFastPropertyValue( PROPERTY_ID_MULTISELECTION, ::comphelper::bool2any( ( sal_False ) ) );
         }
 
         if ( !hasExternalListSource() )

File forms/source/misc/limitedformats.cxx

 			// get the aggregate's enum property value
 			Any aEnumPropertyValue = m_xAggregate->getFastPropertyValue(m_nFormatEnumPropertyHandle);
 			sal_Int32 nValue = -1;
-			::cppu::enum2int(nValue, aEnumPropertyValue);
+			::comphelper::enum2int(nValue, aEnumPropertyValue);
 
 			// get the translation table
 			const FormatEntry* pFormats = lcl_getFormatTable(m_nTableId);
 			// get the old (enum) value from the aggregate
 			Any aEnumPropertyValue = m_xAggregate->getFastPropertyValue(m_nFormatEnumPropertyHandle);
 			sal_Int32 nOldEnumValue = -1;
-			::cppu::enum2int(nOldEnumValue, aEnumPropertyValue);
+			::comphelper::enum2int(nOldEnumValue, aEnumPropertyValue);
 
 			// get the translation table
 			const FormatEntry* pFormats = lcl_getFormatTable(m_nTableId);