diff options
Diffstat (limited to 'extensions/source/propctrlr')
24 files changed, 65 insertions, 66 deletions
diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx index 02e663c820c4..f3c0ad6b97de 100644 --- a/extensions/source/propctrlr/browserlistbox.cxx +++ b/extensions/source/propctrlr/browserlistbox.cxx @@ -393,7 +393,6 @@ namespace pcr // doing the commit here, while we, as well as our owner, as well as some other components, // are already "half dead" (means within their dtor) is potentially dangerous. // By definition, CommitModified has to be called (if necessary) before destruction - // #105868# - 2002-12-13 - fs@openoffice.org m_pControlContextImpl->dispose(); m_pControlContextImpl.clear(); @@ -421,7 +420,7 @@ namespace pcr if ( IsModified() && m_xActiveControl.is() ) { // for the time of this commit, notify all events synchronously - // #i63814# / 2006-03-31 / frank.schoenheit@sun.com + // #i63814# m_pControlContextImpl->setNotificationMode( PropertyControlContext_Impl::eSynchronously ); try { @@ -975,7 +974,7 @@ namespace pcr ) if ( (*search)->second.pLine->getControl().get() == _rxControl.get() ) return sal_uInt16( search - m_aOrderedLines.begin() ); - DBG_ERROR( "OBrowserListBox::impl_getControlPos: invalid control - not part of any of our lines!" ); + OSL_FAIL( "OBrowserListBox::impl_getControlPos: invalid control - not part of any of our lines!" ); return (sal_uInt16)-1; } diff --git a/extensions/source/propctrlr/browserlistbox.hxx b/extensions/source/propctrlr/browserlistbox.hxx index d038f58c626d..3f6e4c995e52 100644 --- a/extensions/source/propctrlr/browserlistbox.hxx +++ b/extensions/source/propctrlr/browserlistbox.hxx @@ -45,7 +45,7 @@ #include <set> #include <vector> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <boost/shared_ptr.hpp> //............................................................................ @@ -76,7 +76,7 @@ namespace pcr { } }; - typedef ::std::hash_map< ::rtl::OUString, ListBoxLine, ::rtl::OUStringHash > ListBoxLines; + typedef ::boost::unordered_map< ::rtl::OUString, ListBoxLine, ::rtl::OUStringHash > ListBoxLines; typedef ::std::vector< ListBoxLines::iterator > OrderedListBoxLines; //======================================================================== diff --git a/extensions/source/propctrlr/browserview.cxx b/extensions/source/propctrlr/browserview.cxx index 3ec4e3bf3ded..be772262cd48 100644 --- a/extensions/source/propctrlr/browserview.cxx +++ b/extensions/source/propctrlr/browserview.cxx @@ -114,7 +114,7 @@ namespace pcr if ( ( KEY_DELETE == nKey ) || ( KEY_BACKSPACE == nKey ) ) // silence this, we don't want to propagate this outside the property // browser, as it will probably do harm there - // #i63285# / 2006-12-06 / frank.schoenheit@sun.com + // #i63285# return 1; } return Window::Notify( _rNEvt ); diff --git a/extensions/source/propctrlr/buttonnavigationhandler.cxx b/extensions/source/propctrlr/buttonnavigationhandler.cxx index 6435da2f763b..db097ce89cfb 100644 --- a/extensions/source/propctrlr/buttonnavigationhandler.cxx +++ b/extensions/source/propctrlr/buttonnavigationhandler.cxx @@ -121,7 +121,7 @@ namespace pcr break; default: - DBG_ERROR( "ButtonNavigationHandler::getPropertyState: cannot handle this property!" ); + OSL_FAIL( "ButtonNavigationHandler::getPropertyState: cannot handle this property!" ); break; } @@ -152,7 +152,7 @@ namespace pcr break; default: - DBG_ERROR( "ButtonNavigationHandler::getPropertyValue: cannot handle this property!" ); + OSL_FAIL( "ButtonNavigationHandler::getPropertyValue: cannot handle this property!" ); break; } diff --git a/extensions/source/propctrlr/cellbindinghandler.cxx b/extensions/source/propctrlr/cellbindinghandler.cxx index ea64279b2e81..aa293ce11d0a 100644 --- a/extensions/source/propctrlr/cellbindinghandler.cxx +++ b/extensions/source/propctrlr/cellbindinghandler.cxx @@ -175,7 +175,7 @@ namespace pcr aDependentProperties.push_back( PROPERTY_ID_BOUNDCOLUMN ); // also reset the list entries if the cell range is reset - // #i28319# - 2004-04-27 - fs@openoffice.org + // #i28319# if ( !_bFirstTimeInit ) { try @@ -202,7 +202,7 @@ namespace pcr break; // case PROPERTY_ID_CONTROLSOURCE default: - DBG_ERROR( "CellBindingPropertyHandler::actuatingPropertyChanged: did not register for this property!" ); + OSL_FAIL( "CellBindingPropertyHandler::actuatingPropertyChanged: did not register for this property!" ); } for ( ::std::vector< PropertyId >::const_iterator loopAffected = aDependentProperties.begin(); @@ -282,7 +282,7 @@ namespace pcr break; default: - DBG_ERROR( "CellBindingPropertyHandler::getPropertyValue: cannot handle this!" ); + OSL_FAIL( "CellBindingPropertyHandler::getPropertyValue: cannot handle this!" ); break; } return aReturn; @@ -342,7 +342,7 @@ namespace pcr break; default: - DBG_ERROR( "CellBindingPropertyHandler::setPropertyValue: cannot handle this!" ); + OSL_FAIL( "CellBindingPropertyHandler::setPropertyValue: cannot handle this!" ); break; } @@ -401,7 +401,7 @@ namespace pcr break; default: - DBG_ERROR( "CellBindingPropertyHandler::convertToPropertyValue: cannot handle this!" ); + OSL_FAIL( "CellBindingPropertyHandler::convertToPropertyValue: cannot handle this!" ); break; } @@ -456,7 +456,7 @@ namespace pcr break; default: - DBG_ERROR( "CellBindingPropertyHandler::convertToControlValue: cannot handle this!" ); + OSL_FAIL( "CellBindingPropertyHandler::convertToControlValue: cannot handle this!" ); break; } diff --git a/extensions/source/propctrlr/editpropertyhandler.cxx b/extensions/source/propctrlr/editpropertyhandler.cxx index 9dd3911cd7bd..cb5aac0137b6 100644 --- a/extensions/source/propctrlr/editpropertyhandler.cxx +++ b/extensions/source/propctrlr/editpropertyhandler.cxx @@ -134,7 +134,7 @@ namespace pcr default: - DBG_ERROR( "EditPropertyHandler::getPropertyValue: cannot handle this property!" ); + OSL_FAIL( "EditPropertyHandler::getPropertyValue: cannot handle this property!" ); break; } } diff --git a/extensions/source/propctrlr/eformshelper.cxx b/extensions/source/propctrlr/eformshelper.cxx index 387b3aa06479..0d1120658d86 100644 --- a/extensions/source/propctrlr/eformshelper.cxx +++ b/extensions/source/propctrlr/eformshelper.cxx @@ -47,6 +47,7 @@ #include <functional> #include <algorithm> +#include <o3tl/compat_functional.hxx> //........................................................................ namespace pcr @@ -715,7 +716,7 @@ namespace pcr } _rElementNames.resize( rMapUINameToElement.size() ); - ::std::transform( rMapUINameToElement.begin(), rMapUINameToElement.end(), _rElementNames.begin(), ::std::select1st< MapStringToPropertySet::value_type >() ); + ::std::transform( rMapUINameToElement.begin(), rMapUINameToElement.end(), _rElementNames.begin(), ::o3tl::select1st< MapStringToPropertySet::value_type >() ); } //-------------------------------------------------------------------- diff --git a/extensions/source/propctrlr/eformspropertyhandler.cxx b/extensions/source/propctrlr/eformspropertyhandler.cxx index 68bd6ae46311..338eccc3262d 100644 --- a/extensions/source/propctrlr/eformspropertyhandler.cxx +++ b/extensions/source/propctrlr/eformspropertyhandler.cxx @@ -153,7 +153,7 @@ namespace pcr break; default: - DBG_ERROR( "EFormsPropertyHandler::getPropertyValue: cannot handle this property!" ); + OSL_FAIL( "EFormsPropertyHandler::getPropertyValue: cannot handle this property!" ); break; } } @@ -269,7 +269,7 @@ namespace pcr break; default: - DBG_ERROR( "EFormsPropertyHandler::setPropertyValue: cannot handle this property!" ); + OSL_FAIL( "EFormsPropertyHandler::setPropertyValue: cannot handle this property!" ); break; } @@ -463,7 +463,7 @@ namespace pcr case PROPERTY_ID_XSD_CALCULATION: aDescriptor.PrimaryButtonId = UID_PROP_DLG_XSD_CALCULATION; break; default: - DBG_ERROR( "EFormsPropertyHandler::describePropertyLine: cannot handle this property!" ); + OSL_FAIL( "EFormsPropertyHandler::describePropertyLine: cannot handle this property!" ); break; } @@ -606,7 +606,7 @@ namespace pcr break; default: - DBG_ERROR( "EFormsPropertyHandler::actuatingPropertyChanged: cannot handle this property!" ); + OSL_FAIL( "EFormsPropertyHandler::actuatingPropertyChanged: cannot handle this property!" ); break; } } diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx index 5f1df02469e1..e4716eda777e 100644 --- a/extensions/source/propctrlr/eventhandler.cxx +++ b/extensions/source/propctrlr/eventhandler.cxx @@ -78,6 +78,7 @@ #include <map> #include <algorithm> +#include <o3tl/compat_functional.hxx> //------------------------------------------------------------------------ extern "C" void SAL_CALL createRegistryInfo_EventHandler() @@ -265,7 +266,7 @@ namespace pcr || ( pAssignedEvent->ScriptType.getLength() == 0 ) ) { - DBG_ERROR( "lcl_getAssignedScriptEvent: me thinks this should not happen!" ); + OSL_FAIL( "lcl_getAssignedScriptEvent: me thinks this should not happen!" ); continue; } @@ -304,7 +305,7 @@ namespace pcr EventDescription aKnownEvent; if ( lcl_getEventDescriptionForMethod( _rFormComponentEventDescriptor.EventMethod, aKnownEvent ) ) return aKnownEvent.sListenerClassName; - DBG_ERROR( "lcl_getQualifiedKnownListenerName: unknown method name!" ); + OSL_FAIL( "lcl_getQualifiedKnownListenerName: unknown method name!" ); // somebody assigned an script to a form component event which we don't know // Speaking strictly, this is not really an error - it is possible to do // this programmatically -, but it should rarely happen, since it's not possible @@ -354,7 +355,7 @@ namespace pcr class EventHolder : public EventHolder_Base { private: - typedef ::std::hash_map< ::rtl::OUString, ScriptEventDescriptor, ::rtl::OUStringHash > EventMap; + typedef ::boost::unordered_map< ::rtl::OUString, ScriptEventDescriptor, ::rtl::OUStringHash > EventMap; typedef ::std::map< EventId, EventMap::iterator > EventMapIndexAccess; EventMap m_aEventNameAccess; @@ -845,7 +846,7 @@ namespace pcr StlSyntaxSequence< Property > aReturn( aOrderedProperties.size() ); ::std::transform( aOrderedProperties.begin(), aOrderedProperties.end(), aReturn.begin(), - ::std::select2nd< ::std::map< EventId, Property >::value_type >() ); + ::o3tl::select2nd< ::std::map< EventId, Property >::value_type >() ); return aReturn; } @@ -971,7 +972,7 @@ namespace pcr //-------------------------------------------------------------------- void SAL_CALL EventHandler::actuatingPropertyChanged( const ::rtl::OUString& /*_rActuatingPropertyName*/, const Any& /*_rNewValue*/, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/, sal_Bool /*_bFirstTimeInit*/ ) throw (NullPointerException, RuntimeException) { - DBG_ERROR( "EventHandler::actuatingPropertyChanged: no actuating properties -> no callback (well, this is how it *should* be!)" ); + OSL_FAIL( "EventHandler::actuatingPropertyChanged: no actuating properties -> no callback (well, this is how it *should* be!)" ); } //-------------------------------------------------------------------- diff --git a/extensions/source/propctrlr/eventhandler.hxx b/extensions/source/propctrlr/eventhandler.hxx index 4ea10e0e6463..721ca8a0edac 100644 --- a/extensions/source/propctrlr/eventhandler.hxx +++ b/extensions/source/propctrlr/eventhandler.hxx @@ -79,7 +79,7 @@ namespace pcr sal_Int32 _nUniqueBrowseId ); }; - typedef ::std::hash_map< ::rtl::OUString, EventDescription, ::rtl::OUStringHash > EventMap; + typedef ::boost::unordered_map< ::rtl::OUString, EventDescription, ::rtl::OUStringHash > EventMap; //==================================================================== //= EventHandler diff --git a/extensions/source/propctrlr/fontdialog.cxx b/extensions/source/propctrlr/fontdialog.cxx index 1c06d9310974..0b2548a76bfe 100644 --- a/extensions/source/propctrlr/fontdialog.cxx +++ b/extensions/source/propctrlr/fontdialog.cxx @@ -281,7 +281,7 @@ namespace pcr } catch (Exception&) { - DBG_ERROR("ControlCharacterDialog::translatePropertiesToItems: caught an exception!"); + OSL_FAIL("ControlCharacterDialog::translatePropertiesToItems: caught an exception!"); } _pSet->DisableItem(SID_ATTR_CHAR_CJK_FONT); diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index 63dac91d9b7f..3344a8a62c8b 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -1000,7 +1000,7 @@ namespace pcr String sDisplayName = m_pInfoService->getPropertyTranslation( nPropId ); if ( !sDisplayName.Len() ) { - DBG_ERROR( "FormComponentPropertyHandler::describePropertyLine: did getSupportedProperties not work properly?" ); + OSL_FAIL( "FormComponentPropertyHandler::describePropertyLine: did getSupportedProperties not work properly?" ); throw UnknownPropertyException(); } @@ -1513,7 +1513,7 @@ namespace pcr eResult = InteractiveSelectionResult_Pending; break; default: - DBG_ERROR( "FormComponentPropertyHandler::onInteractivePropertySelection: request for a property which does not have dedicated UI!" ); + OSL_FAIL( "FormComponentPropertyHandler::onInteractivePropertySelection: request for a property which does not have dedicated UI!" ); break; } return eResult; @@ -1801,7 +1801,7 @@ namespace pcr break; default: - DBG_ERROR( "FormComponentPropertyHandler::actuatingPropertyChanged: did not register for this property!" ); + OSL_FAIL( "FormComponentPropertyHandler::actuatingPropertyChanged: did not register for this property!" ); break; } // switch ( nActuatingPropId ) @@ -2389,7 +2389,7 @@ namespace pcr } catch (Exception&) { - DBG_ERROR( "FormComponentPropertyHandler::impl_initFieldList_nothrow: caught an exception!" ); + OSL_FAIL( "FormComponentPropertyHandler::impl_initFieldList_nothrow: caught an exception!" ); } } @@ -2443,7 +2443,7 @@ namespace pcr } catch( const Exception& ) { - DBG_ERROR( "FormComponentPropertyHandler::impl_ensureRowsetConnection_nothrow: caught an exception during error handling!" ); + OSL_FAIL( "FormComponentPropertyHandler::impl_ensureRowsetConnection_nothrow: caught an exception during error handling!" ); } // additional info about what happended String sInfo( PcrRes( RID_STR_UNABLETOCONNECT ) ); @@ -2503,7 +2503,7 @@ namespace pcr } catch (Exception&) { - DBG_ERROR("FormComponentPropertyHandler::impl_describeCursorSource_nothrow: caught an exception !"); + OSL_FAIL("FormComponentPropertyHandler::impl_describeCursorSource_nothrow: caught an exception !"); } } @@ -2846,7 +2846,6 @@ namespace pcr if ( INET_PROT_FILE == aParser.GetProtocol() ) // set the initial directory only for file-URLs. Everything else // is considered to be potentially expensive - // 106126 - 2002/12/10 - fs@openoffice.org aFileDlg.SetDisplayDirectory( sURL ); _rClearBeforeDialog.clear(); @@ -2900,7 +2899,6 @@ namespace pcr if ( INET_PROT_FILE == aParser.GetProtocol() ) // set the initial directory only for file-URLs. Everything else // is considered to be potentially expensive - // 106126 - 2002/12/10 - fs@openoffice.org aFileDlg.SetDisplayDirectory( sDataSource ); const String s_sDatabaseType = String::CreateFromAscii("StarOffice XML (Base)"); diff --git a/extensions/source/propctrlr/formmetadata.cxx b/extensions/source/propctrlr/formmetadata.cxx index 0155062b9dbb..05791a48cc38 100644 --- a/extensions/source/propctrlr/formmetadata.cxx +++ b/extensions/source/propctrlr/formmetadata.cxx @@ -651,7 +651,7 @@ namespace pcr } else { - DBG_ERROR( "DefaultEnumRepresentation::getValueFromDescription: could not translate the enum string!" ); + OSL_FAIL( "DefaultEnumRepresentation::getValueFromDescription: could not translate the enum string!" ); _out_rValue.clear(); } } @@ -675,7 +675,7 @@ namespace pcr } else { - DBG_ERROR( "DefaultEnumRepresentation::getDescriptionForValue: could not translate an enum value" ); + OSL_FAIL( "DefaultEnumRepresentation::getDescriptionForValue: could not translate an enum value" ); } return sReturn; } diff --git a/extensions/source/propctrlr/genericpropertyhandler.cxx b/extensions/source/propctrlr/genericpropertyhandler.cxx index e86830db5624..f273f948e0e4 100644 --- a/extensions/source/propctrlr/genericpropertyhandler.cxx +++ b/extensions/source/propctrlr/genericpropertyhandler.cxx @@ -46,6 +46,7 @@ #include <cppuhelper/extract.hxx> #include <algorithm> +#include <o3tl/compat_functional.hxx> //------------------------------------------------------------------------ extern "C" void SAL_CALL createRegistryInfo_GenericPropertyHandler() @@ -171,7 +172,7 @@ namespace pcr _out_rValue = ::cppu::int2enum( aValues[ index ], m_aEnumType ); else { - DBG_ERROR( "EnumRepresentation::getValueFromDescription: cannot convert!" ); + OSL_FAIL( "EnumRepresentation::getValueFromDescription: cannot convert!" ); _out_rValue.clear(); } } @@ -195,7 +196,7 @@ namespace pcr sDescription = aDescriptions[ index ]; else { - DBG_ERROR( "EnumRepresentation::getDescriptionForValue: cannot convert!" ); + OSL_FAIL( "EnumRepresentation::getDescriptionForValue: cannot convert!" ); } return sDescription; } @@ -614,7 +615,7 @@ namespace pcr Sequence< Property > aReturn( m_aProperties.size() ); ::std::transform( m_aProperties.begin(), m_aProperties.end(), - aReturn.getArray(), ::std::select2nd< PropertyMap::value_type >() ); + aReturn.getArray(), ::o3tl::select2nd< PropertyMap::value_type >() ); return aReturn; } @@ -694,14 +695,14 @@ namespace pcr //-------------------------------------------------------------------- InteractiveSelectionResult SAL_CALL GenericPropertyHandler::onInteractivePropertySelection( const ::rtl::OUString& /*_rPropertyName*/, sal_Bool /*_bPrimary*/, Any& /*_rData*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/ ) throw (UnknownPropertyException, NullPointerException, RuntimeException) { - DBG_ERROR( "GenericPropertyHandler::onInteractivePropertySelection: I'm too dumb to know anything about property browse buttons!" ); + OSL_FAIL( "GenericPropertyHandler::onInteractivePropertySelection: I'm too dumb to know anything about property browse buttons!" ); return InteractiveSelectionResult_Cancelled; } //-------------------------------------------------------------------- void SAL_CALL GenericPropertyHandler::actuatingPropertyChanged( const ::rtl::OUString& /*_rActuatingPropertyName*/, const Any& /*_rNewValue*/, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/, sal_Bool /*_bFirstTimeInit*/ ) throw (NullPointerException, RuntimeException) { - DBG_ERROR( "GenericPropertyHandler::actuatingPropertyChanged: no no no, I did not register for any actuating properties!" ); + OSL_FAIL( "GenericPropertyHandler::actuatingPropertyChanged: no no no, I did not register for any actuating properties!" ); } //-------------------------------------------------------------------- diff --git a/extensions/source/propctrlr/handlerhelper.cxx b/extensions/source/propctrlr/handlerhelper.cxx index fbdf4b18206e..65e5507deb34 100644 --- a/extensions/source/propctrlr/handlerhelper.cxx +++ b/extensions/source/propctrlr/handlerhelper.cxx @@ -113,7 +113,7 @@ namespace pcr break; default: - DBG_ERROR( "PropertyHandlerHelper::describePropertyLine: don't know how to represent this at the UI!" ); + OSL_FAIL( "PropertyHandlerHelper::describePropertyLine: don't know how to represent this at the UI!" ); // NO break! case TypeClass_STRING: diff --git a/extensions/source/propctrlr/pcrcommontypes.hxx b/extensions/source/propctrlr/pcrcommontypes.hxx index 434f395af4e5..7cec06d7e10c 100644 --- a/extensions/source/propctrlr/pcrcommontypes.hxx +++ b/extensions/source/propctrlr/pcrcommontypes.hxx @@ -34,14 +34,14 @@ /** === end UNO includes === **/ #include <rtl/ustring.hxx> -#include <hash_map> +#include <boost/unordered_map.hpp> //........................................................................ namespace pcr { //........................................................................ - typedef ::std::hash_map< ::rtl::OUString, ::com::sun::star::beans::Property, ::rtl::OUStringHash > + typedef ::boost::unordered_map< ::rtl::OUString, ::com::sun::star::beans::Property, ::rtl::OUStringHash > PropertyMap; //........................................................................ diff --git a/extensions/source/propctrlr/pcrservices.cxx b/extensions/source/propctrlr/pcrservices.cxx index 034aee9881ef..15ac891604cf 100644 --- a/extensions/source/propctrlr/pcrservices.cxx +++ b/extensions/source/propctrlr/pcrservices.cxx @@ -117,7 +117,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( } catch (InvalidRegistryException& ) { - OSL_ASSERT("pcr::component_writeInfo: could not create a registry key (InvalidRegistryException) !"); + OSL_FAIL("pcr::component_writeInfo: could not create a registry key (InvalidRegistryException) !"); } return sal_False; diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx index efd52a54ccdb..2499e9aaa360 100644 --- a/extensions/source/propctrlr/propcontroller.cxx +++ b/extensions/source/propctrlr/propcontroller.cxx @@ -990,7 +990,7 @@ namespace pcr catch(Exception&) { - DBG_ERROR("OPropertyBrowserController::impl_rebindToInspectee_nothrow: caught an exception !"); + OSL_FAIL("OPropertyBrowserController::impl_rebindToInspectee_nothrow: caught an exception !"); } } @@ -1121,7 +1121,7 @@ namespace pcr } catch(Exception&) { - DBG_ERROR("OPropertyBrowserController::doInspection : caught an exception !"); + OSL_FAIL("OPropertyBrowserController::doInspection : caught an exception !"); } } @@ -1441,7 +1441,7 @@ namespace pcr } catch(Exception&) { - DBG_ERROR("OPropertyBrowserController::Commit : caught an exception !"); + OSL_FAIL("OPropertyBrowserController::Commit : caught an exception !"); } m_sCommittingProperty = ::rtl::OUString(); diff --git a/extensions/source/propctrlr/propcontroller.hxx b/extensions/source/propctrlr/propcontroller.hxx index e7c02599a723..70bcba95ad90 100644 --- a/extensions/source/propctrlr/propcontroller.hxx +++ b/extensions/source/propctrlr/propcontroller.hxx @@ -68,7 +68,7 @@ #include <comphelper/broadcasthelper.hxx> #include <map> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <vector> #include <memory> @@ -137,9 +137,9 @@ namespace pcr typedef ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyHandler > PropertyHandlerRef; typedef ::std::vector< PropertyHandlerRef > PropertyHandlerArray; - typedef ::std::hash_map< ::rtl::OUString, PropertyHandlerRef, ::rtl::OUStringHash > + typedef ::boost::unordered_map< ::rtl::OUString, PropertyHandlerRef, ::rtl::OUStringHash > PropertyHandlerRepository; - typedef ::std::hash_multimap< ::rtl::OUString, PropertyHandlerRef, ::rtl::OUStringHash > + typedef ::boost::unordered_multimap< ::rtl::OUString, PropertyHandlerRef, ::rtl::OUStringHash > PropertyHandlerMultiRepository; PropertyHandlerRepository m_aPropertyHandlers; PropertyHandlerMultiRepository m_aDependencyHandlers; @@ -157,7 +157,7 @@ namespace pcr /// the property we're just committing ::rtl::OUString m_sCommittingProperty; - typedef ::std::hash_map< ::rtl::OUString, sal_uInt16, ::rtl::OUStringHash > HashString2Int16; + typedef ::boost::unordered_map< ::rtl::OUString, sal_uInt16, ::rtl::OUStringHash > HashString2Int16; HashString2Int16 m_aPageIds; bool m_bContainerFocusListening; diff --git a/extensions/source/propctrlr/propertyhandler.cxx b/extensions/source/propctrlr/propertyhandler.cxx index ee5e4dd67cc4..c3fe86810dba 100644 --- a/extensions/source/propctrlr/propertyhandler.cxx +++ b/extensions/source/propctrlr/propertyhandler.cxx @@ -248,14 +248,14 @@ namespace pcr //-------------------------------------------------------------------- InteractiveSelectionResult SAL_CALL PropertyHandler::onInteractivePropertySelection( const ::rtl::OUString& /*_rPropertyName*/, sal_Bool /*_bPrimary*/, Any& /*_rData*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/ ) throw (UnknownPropertyException, NullPointerException, RuntimeException) { - DBG_ERROR( "PropertyHandler::onInteractivePropertySelection: not implemented!" ); + OSL_FAIL( "PropertyHandler::onInteractivePropertySelection: not implemented!" ); return InteractiveSelectionResult_Cancelled; } //-------------------------------------------------------------------- void SAL_CALL PropertyHandler::actuatingPropertyChanged( const ::rtl::OUString& /*_rActuatingPropertyName*/, const Any& /*_rNewValue*/, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/, sal_Bool /*_bFirstTimeInit*/ ) throw (NullPointerException, RuntimeException) { - DBG_ERROR( "PropertyHandler::actuatingPropertyChanged: not implemented!" ); + OSL_FAIL( "PropertyHandler::actuatingPropertyChanged: not implemented!" ); } //-------------------------------------------------------------------- diff --git a/extensions/source/propctrlr/submissionhandler.cxx b/extensions/source/propctrlr/submissionhandler.cxx index b14153383f6f..3a64005d3541 100644 --- a/extensions/source/propctrlr/submissionhandler.cxx +++ b/extensions/source/propctrlr/submissionhandler.cxx @@ -167,7 +167,7 @@ namespace pcr break; default: - DBG_ERROR( "SubmissionPropertyHandler::getPropertyValue: cannot handle this property!" ); + OSL_FAIL( "SubmissionPropertyHandler::getPropertyValue: cannot handle this property!" ); break; } } diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx index 61dc96f287d7..c403f2d709e7 100644 --- a/extensions/source/propctrlr/taborder.cxx +++ b/extensions/source/propctrlr/taborder.cxx @@ -171,7 +171,7 @@ namespace pcr case FormComponentType::SPINBUTTON: nImageId = RID_SVXIMG_SPINBUTTON; break; case FormComponentType::NAVIGATIONBAR: nImageId = RID_SVXIMG_NAVIGATIONBAR; break; default: - DBG_ERROR( "TabOrderDialog::GetImage: unknown control type" ); + OSL_FAIL( "TabOrderDialog::GetImage: unknown control type" ); } } @@ -215,7 +215,7 @@ namespace pcr else { // no property set -> no tab order - DBG_ERROR( "TabOrderDialog::FillList: invalid control encountered!" ); + OSL_FAIL( "TabOrderDialog::FillList: invalid control encountered!" ); aLB_Controls.Clear(); break; } @@ -223,7 +223,7 @@ namespace pcr } catch( const Exception& ) { - DBG_ERROR( "TabOrderDialog::FillList: caught an exception!" ); + OSL_FAIL( "TabOrderDialog::FillList: caught an exception!" ); } // select first entry diff --git a/extensions/source/propctrlr/taborder.hxx b/extensions/source/propctrlr/taborder.hxx index 9a0d99f68bf2..e10416376704 100644 --- a/extensions/source/propctrlr/taborder.hxx +++ b/extensions/source/propctrlr/taborder.hxx @@ -41,7 +41,6 @@ #include <vcl/fixed.hxx> -#include <tools/list.hxx> #include <comphelper/uno3.hxx> //............................................................................ diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx index c254800af14c..ac69955ac444 100644 --- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx +++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx @@ -163,7 +163,7 @@ namespace pcr ::rtl::Reference< XSDDataType > pType = m_pHelper->getValidatingDataType(); if ( !pType.is() ) { - DBG_ERROR( "XSDValidationPropertyHandler::setPropertyValue: you're trying to set a type facet, without a current type!" ); + OSL_FAIL( "XSDValidationPropertyHandler::setPropertyValue: you're trying to set a type facet, without a current type!" ); return; } @@ -415,7 +415,7 @@ namespace pcr break; default: - DBG_ERROR( "XSDValidationPropertyHandler::describePropertyLine: cannot handle this property!" ); + OSL_FAIL( "XSDValidationPropertyHandler::describePropertyLine: cannot handle this property!" ); break; } @@ -471,7 +471,7 @@ namespace pcr break; default: - DBG_ERROR( "XSDValidationPropertyHandler::onInteractivePropertySelection: unexpected property to build a dedicated UI!" ); + OSL_FAIL( "XSDValidationPropertyHandler::onInteractivePropertySelection: unexpected property to build a dedicated UI!" ); break; } return InteractiveSelectionResult_Cancelled; @@ -503,7 +503,7 @@ namespace pcr ::rtl::Reference< XSDDataType > pType = m_pHelper->getValidatingDataType(); if ( !pType.is() ) { - DBG_ERROR( "XSDValidationPropertyHandler::implPrepareCloneDataCurrentType: invalid current data type!" ); + OSL_FAIL( "XSDValidationPropertyHandler::implPrepareCloneDataCurrentType: invalid current data type!" ); return false; } @@ -542,7 +542,7 @@ namespace pcr ::rtl::Reference< XSDDataType > pType = m_pHelper->getValidatingDataType(); if ( !pType.is() ) { - DBG_ERROR( "XSDValidationPropertyHandler::implPrepareRemoveCurrentDataType: invalid current data type!" ); + OSL_FAIL( "XSDValidationPropertyHandler::implPrepareRemoveCurrentDataType: invalid current data type!" ); return false; } @@ -656,7 +656,7 @@ namespace pcr break; default: - DBG_ERROR( "XSDValidationPropertyHandler::actuatingPropertyChanged: cannot handle this property!" ); + OSL_FAIL( "XSDValidationPropertyHandler::actuatingPropertyChanged: cannot handle this property!" ); return; } |