diff options
Diffstat (limited to 'extensions/source/propctrlr')
92 files changed, 1293 insertions, 1293 deletions
diff --git a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx b/extensions/source/propctrlr/MasterDetailLinkDialog.cxx index e8c3a34d0098..db14cb4b76dd 100644 --- a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx +++ b/extensions/source/propctrlr/MasterDetailLinkDialog.cxx @@ -56,15 +56,15 @@ namespace pcr } //--------------------------------------------------------------------- - ::rtl::OUString SAL_CALL MasterDetailLinkDialog::getImplementationName() throw(RuntimeException) + OUString SAL_CALL MasterDetailLinkDialog::getImplementationName() throw(RuntimeException) { return getImplementationName_static(); } //--------------------------------------------------------------------- - ::rtl::OUString MasterDetailLinkDialog::getImplementationName_static() throw(RuntimeException) + OUString MasterDetailLinkDialog::getImplementationName_static() throw(RuntimeException) { - return ::rtl::OUString("org.openoffice.comp.form.ui.MasterDetailLinkDialog"); + return OUString("org.openoffice.comp.form.ui.MasterDetailLinkDialog"); } //--------------------------------------------------------------------- @@ -77,7 +77,7 @@ namespace pcr ::comphelper::StringSequence MasterDetailLinkDialog::getSupportedServiceNames_static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString("com.sun.star.form.MasterDetailLinkDialog"); + aSupported.getArray()[0] = OUString("com.sun.star.form.MasterDetailLinkDialog"); return aSupported; } diff --git a/extensions/source/propctrlr/MasterDetailLinkDialog.hxx b/extensions/source/propctrlr/MasterDetailLinkDialog.hxx index e9882e7000b6..0121c364cb29 100644 --- a/extensions/source/propctrlr/MasterDetailLinkDialog.hxx +++ b/extensions/source/propctrlr/MasterDetailLinkDialog.hxx @@ -40,8 +40,8 @@ namespace pcr MasterDetailLinkDialog(const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& _rxContext); // XServiceInfo - static methods - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static(void) throw( ::com::sun::star::uno::RuntimeException ); - static ::rtl::OUString getImplementationName_static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static(void) throw( ::com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >&); private: @@ -49,7 +49,7 @@ namespace pcr virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XPropertySet @@ -65,9 +65,9 @@ namespace pcr ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xDetail; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xMaster; - ::rtl::OUString m_sExplanation; - ::rtl::OUString m_sDetailLabel; - ::rtl::OUString m_sMasterLabel; + OUString m_sExplanation; + OUString m_sDetailLabel; + OUString m_sMasterLabel; }; //........................................................................ diff --git a/extensions/source/propctrlr/browserline.cxx b/extensions/source/propctrlr/browserline.cxx index a6d3da201d7c..a8ec00ca0b77 100644 --- a/extensions/source/propctrlr/browserline.cxx +++ b/extensions/source/propctrlr/browserline.cxx @@ -57,7 +57,7 @@ namespace pcr DBG_NAME(OBrowserLine) //------------------------------------------------------------------ - OBrowserLine::OBrowserLine( const ::rtl::OUString& _rEntryName, Window* pParent ) + OBrowserLine::OBrowserLine( const OUString& _rEntryName, Window* pParent ) :m_sEntryName( _rEntryName ) ,m_aFtTitle(pParent) ,m_pControlWindow( NULL ) @@ -94,7 +94,7 @@ namespace pcr } //------------------------------------------------------------------ - void OBrowserLine::SetComponentHelpIds( const rtl::OString& _rHelpId, const rtl::OString& _sPrimaryButtonId, const rtl::OString& _sSecondaryButtonId ) + void OBrowserLine::SetComponentHelpIds( const OString& _rHelpId, const OString& _sPrimaryButtonId, const OString& _sSecondaryButtonId ) { if ( m_pControlWindow ) m_pControlWindow->SetHelpId( _rHelpId ); @@ -294,7 +294,7 @@ namespace pcr //------------------------------------------------------------------ XubString OBrowserLine::GetTitle() const { - rtl::OUString sDisplayName = m_aFtTitle.GetText(); + OUString sDisplayName = m_aFtTitle.GetText(); // for Issue 69452 if (Application::GetSettings().GetLayoutRTL()) @@ -390,7 +390,7 @@ namespace pcr rpButton = new PushButton( m_pTheParent, WB_NOPOINTERFOCUS ); rpButton->SetGetFocusHdl( LINK( this, OBrowserLine, OnButtonFocus ) ); rpButton->SetClickHdl( LINK( this, OBrowserLine, OnButtonClicked ) ); - rpButton->SetText(rtl::OUString("...")); + rpButton->SetText(OUString("...")); } rpButton->Show(); @@ -401,7 +401,7 @@ namespace pcr } //------------------------------------------------------------------ - void OBrowserLine::impl_getImagesFromURL_nothrow( const ::rtl::OUString& _rImageURL, Image& _out_rImage ) + void OBrowserLine::impl_getImagesFromURL_nothrow( const OUString& _rImageURL, Image& _out_rImage ) { try { @@ -409,7 +409,7 @@ namespace pcr Reference< XGraphicProvider > xGraphicProvider( GraphicProvider::create(xContext) ); Sequence< PropertyValue > aMediaProperties(1); - aMediaProperties[0].Name = ::rtl::OUString( "URL" ); + aMediaProperties[0].Name = OUString( "URL" ); aMediaProperties[0].Value <<= _rImageURL; Reference< XGraphic > xGraphic( xGraphicProvider->queryGraphic( aMediaProperties ), UNO_QUERY_THROW ); @@ -422,7 +422,7 @@ namespace pcr } //------------------------------------------------------------------ - void OBrowserLine::ShowBrowseButton( const ::rtl::OUString& _rImageURL, sal_Bool _bPrimary ) + void OBrowserLine::ShowBrowseButton( const OUString& _rImageURL, sal_Bool _bPrimary ) { PushButton& rButton( impl_ensureButton( _bPrimary ) ); diff --git a/extensions/source/propctrlr/browserline.hxx b/extensions/source/propctrlr/browserline.hxx index ddfdcd3c9d2c..c137198e753b 100644 --- a/extensions/source/propctrlr/browserline.hxx +++ b/extensions/source/propctrlr/browserline.hxx @@ -50,7 +50,7 @@ namespace pcr class OBrowserLine { private: - ::rtl::OUString m_sEntryName; + OUString m_sEntryName; FixedText m_aFtTitle; Size m_aOutputSize; Point m_aLinePos; @@ -67,7 +67,7 @@ namespace pcr bool m_bReadOnly; public: - OBrowserLine( const ::rtl::OUString& _rEntryName, Window* pParent); + OBrowserLine( const OUString& _rEntryName, Window* pParent); ~OBrowserLine(); void setControl( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >& _rxControl ); @@ -80,10 +80,10 @@ namespace pcr return m_pControlWindow; } - const ::rtl::OUString& + const OUString& GetEntryName() const { return m_sEntryName; } - void SetComponentHelpIds( const rtl::OString& _rHelpId, const rtl::OString& _sPrimaryButtonId, const rtl::OString& _sSecondaryButtonId ); + void SetComponentHelpIds( const OString& _rHelpId, const OString& _sPrimaryButtonId, const OString& _sSecondaryButtonId ); void SetTitle(const String& rString ); void FullFillTitleString(); @@ -99,7 +99,7 @@ namespace pcr void SetTabOrder(Window* pRefWindow, sal_uInt16 nFlags ); sal_Bool GrabFocus(); - void ShowBrowseButton( const ::rtl::OUString& _rImageURL, sal_Bool _bPrimary ); + void ShowBrowseButton( const OUString& _rImageURL, sal_Bool _bPrimary ); void ShowBrowseButton( const Image& _rImage, sal_Bool _bPrimary ); void ShowBrowseButton( sal_Bool _bPrimary ); void HideBrowseButton( sal_Bool _bPrimary ); @@ -123,7 +123,7 @@ namespace pcr void impl_layoutComponents(); PushButton& impl_ensureButton( bool _bPrimary ); - void impl_getImagesFromURL_nothrow( const ::rtl::OUString& _rImageURL, Image& _out_rImage ); + void impl_getImagesFromURL_nothrow( const OUString& _rImageURL, Image& _out_rImage ); }; //............................................................................ diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx index 342a9a454525..fa6bfcc36aca 100644 --- a/extensions/source/propctrlr/browserlistbox.cxx +++ b/extensions/source/propctrlr/browserlistbox.cxx @@ -229,7 +229,7 @@ namespace pcr void PropertyControlContext_Impl::impl_checkAlive_throw() const { if ( impl_isDisposed_nothrow() ) - throw DisposedException( ::rtl::OUString(), *const_cast< PropertyControlContext_Impl* >( this ) ); + throw DisposedException( OUString(), *const_cast< PropertyControlContext_Impl* >( this ) ); } //-------------------------------------------------------------------- @@ -533,7 +533,7 @@ namespace pcr } //------------------------------------------------------------------ - void OBrowserListBox::SetHelpText( const ::rtl::OUString& _rHelpText ) + void OBrowserListBox::SetHelpText( const OUString& _rHelpText ) { OSL_ENSURE( HasHelpSection(), "OBrowserListBox::SetHelpText: help section not visible!" ); m_pHelpWindow->SetText( _rHelpText ); @@ -654,7 +654,7 @@ namespace pcr } //------------------------------------------------------------------ - void OBrowserListBox::SetPropertyValue(const ::rtl::OUString& _rEntryName, const Any& _rValue, bool _bUnknownValue ) + void OBrowserListBox::SetPropertyValue(const OUString& _rEntryName, const Any& _rValue, bool _bUnknownValue ) { ListBoxLines::iterator line = m_aLines.begin(); for ( ; line != m_aLines.end() && ( line->aName != _rEntryName ); ++line ) @@ -675,7 +675,7 @@ namespace pcr } //------------------------------------------------------------------------ - sal_uInt16 OBrowserListBox::GetPropertyPos( const ::rtl::OUString& _rEntryName ) const + sal_uInt16 OBrowserListBox::GetPropertyPos( const OUString& _rEntryName ) const { sal_uInt16 nRet = LISTBOX_ENTRY_NOTFOUND; for ( ListBoxLines::const_iterator linePos = m_aLines.begin(); @@ -694,7 +694,7 @@ namespace pcr } //------------------------------------------------------------------------ - bool OBrowserListBox::impl_getBrowserLineForName( const ::rtl::OUString& _rEntryName, BrowserLinePointer& _out_rpLine ) const + bool OBrowserListBox::impl_getBrowserLineForName( const OUString& _rEntryName, BrowserLinePointer& _out_rpLine ) const { ListBoxLines::const_iterator line = m_aLines.begin(); for ( ; line != m_aLines.end() && ( line->aName != _rEntryName ); ++line ) @@ -708,7 +708,7 @@ namespace pcr } //------------------------------------------------------------------------ - void OBrowserListBox::EnablePropertyControls( const ::rtl::OUString& _rEntryName, sal_Int16 _nControls, bool _bEnable ) + void OBrowserListBox::EnablePropertyControls( const OUString& _rEntryName, sal_Int16 _nControls, bool _bEnable ) { BrowserLinePointer pLine; if ( impl_getBrowserLineForName( _rEntryName, pLine ) ) @@ -716,7 +716,7 @@ namespace pcr } //------------------------------------------------------------------------ - void OBrowserListBox::EnablePropertyLine( const ::rtl::OUString& _rEntryName, bool _bEnable ) + void OBrowserListBox::EnablePropertyLine( const OUString& _rEntryName, bool _bEnable ) { BrowserLinePointer pLine; if ( impl_getBrowserLineForName( _rEntryName, pLine ) ) @@ -724,7 +724,7 @@ namespace pcr } //------------------------------------------------------------------------ - Reference< XPropertyControl > OBrowserListBox::GetPropertyControl( const ::rtl::OUString& _rEntryName ) + Reference< XPropertyControl > OBrowserListBox::GetPropertyControl( const OUString& _rEntryName ) { BrowserLinePointer pLine; if ( impl_getBrowserLineForName( _rEntryName, pLine ) ) @@ -913,10 +913,10 @@ namespace pcr #ifdef DBG_UTIL if ( !_rLine.xHandler.is() ) { - ::rtl::OString sMessage( "OBrowserListBox::impl_setControlAsPropertyValue: no handler -> no conversion (property: '" ); - ::rtl::OUString sPropertyName( _rLine.pLine->GetEntryName() ); - sMessage += ::rtl::OString( sPropertyName.getStr(), sPropertyName.getLength(), RTL_TEXTENCODING_ASCII_US ); - sMessage += ::rtl::OString( "')!" ); + OString sMessage( "OBrowserListBox::impl_setControlAsPropertyValue: no handler -> no conversion (property: '" ); + OUString sPropertyName( _rLine.pLine->GetEntryName() ); + sMessage += OString( sPropertyName.getStr(), sPropertyName.getLength(), RTL_TEXTENCODING_ASCII_US ); + sMessage += OString( "')!" ); OSL_FAIL( sMessage.getStr() ); } #endif @@ -944,10 +944,10 @@ namespace pcr #ifdef DBG_UTIL if ( !_rLine.xHandler.is() ) { - ::rtl::OString sMessage( "OBrowserListBox::impl_getControlAsPropertyValue: no handler -> no conversion (property: '" ); - ::rtl::OUString sPropertyName( _rLine.pLine->GetEntryName() ); - sMessage += ::rtl::OString( sPropertyName.getStr(), sPropertyName.getLength(), RTL_TEXTENCODING_ASCII_US ); - sMessage += ::rtl::OString( "')!" ); + OString sMessage( "OBrowserListBox::impl_getControlAsPropertyValue: no handler -> no conversion (property: '" ); + OUString sPropertyName( _rLine.pLine->GetEntryName() ); + sMessage += OString( sPropertyName.getStr(), sPropertyName.getLength(), RTL_TEXTENCODING_ASCII_US ); + sMessage += OString( "')!" ); OSL_FAIL( sMessage.getStr() ); } #endif @@ -1070,7 +1070,7 @@ namespace pcr } //------------------------------------------------------------------ - sal_Bool OBrowserListBox::RemoveEntry( const ::rtl::OUString& _rName ) + sal_Bool OBrowserListBox::RemoveEntry( const OUString& _rName ) { sal_uInt16 nPos = 0; ListBoxLines::iterator it = m_aLines.begin(); @@ -1181,8 +1181,8 @@ namespace pcr m_aOutOfDateLines.insert( nPos ); rLine.pLine->SetComponentHelpIds( HelpIdUrl::getHelpId( _rPropertyData.HelpURL ), - rtl::OUStringToOString( _rPropertyData.PrimaryButtonId, RTL_TEXTENCODING_UTF8 ), - rtl::OUStringToOString( _rPropertyData.SecondaryButtonId, RTL_TEXTENCODING_UTF8 ) + OUStringToOString( _rPropertyData.PrimaryButtonId, RTL_TEXTENCODING_UTF8 ), + OUStringToOString( _rPropertyData.SecondaryButtonId, RTL_TEXTENCODING_UTF8 ) ); if ( _rPropertyData.bReadOnly ) diff --git a/extensions/source/propctrlr/browserlistbox.hxx b/extensions/source/propctrlr/browserlistbox.hxx index 4766cc4f6b6c..347604136007 100644 --- a/extensions/source/propctrlr/browserlistbox.hxx +++ b/extensions/source/propctrlr/browserlistbox.hxx @@ -54,12 +54,12 @@ namespace pcr typedef ::boost::shared_ptr< OBrowserLine > BrowserLinePointer; struct ListBoxLine { - ::rtl::OUString aName; + OUString aName; BrowserLinePointer pLine; ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyHandler > xHandler; - ListBoxLine( const ::rtl::OUString& rName, BrowserLinePointer _pLine, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyHandler >& _rxHandler ) + ListBoxLine( const OUString& rName, BrowserLinePointer _pLine, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyHandler >& _rxHandler ) : aName( rName ), pLine( _pLine ), xHandler( _rxHandler ) @@ -141,21 +141,21 @@ namespace pcr void EnableHelpSection( bool _bEnable ); bool HasHelpSection() const; - void SetHelpText( const ::rtl::OUString& _rHelpText ); + void SetHelpText( const OUString& _rHelpText ); void SetHelpLineLimites( sal_Int32 _nMinLines, sal_Int32 _nMaxLines ); void Clear(); sal_uInt16 InsertEntry( const OLineDescriptor&, sal_uInt16 nPos = EDITOR_LIST_APPEND ); - sal_Bool RemoveEntry( const ::rtl::OUString& _rName ); + sal_Bool RemoveEntry( const OUString& _rName ); void ChangeEntry( const OLineDescriptor&, sal_uInt16 nPos ); - void SetPropertyValue( const ::rtl::OUString& rEntryName, const ::com::sun::star::uno::Any& rValue, bool _bUnknownValue ); - sal_uInt16 GetPropertyPos( const ::rtl::OUString& rEntryName ) const; + void SetPropertyValue( const OUString& rEntryName, const ::com::sun::star::uno::Any& rValue, bool _bUnknownValue ); + sal_uInt16 GetPropertyPos( const OUString& rEntryName ) const; ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl > - GetPropertyControl( const ::rtl::OUString& rEntryName ); - void EnablePropertyControls( const ::rtl::OUString& _rEntryName, sal_Int16 _nControls, bool _bEnable ); - void EnablePropertyLine( const ::rtl::OUString& _rEntryName, bool _bEnable ); + GetPropertyControl( const OUString& rEntryName ); + void EnablePropertyControls( const OUString& _rEntryName, sal_Int16 _nControls, bool _bEnable ); + void EnablePropertyLine( const OUString& _rEntryName, bool _bEnable ); sal_Int32 GetMinimumWidth(); sal_Int32 GetMinimumHeight(); @@ -208,7 +208,7 @@ namespace pcr <TRUE/> if and only if a non-<NULL/> line for the given entry name could be found. */ - bool impl_getBrowserLineForName( const ::rtl::OUString& _rEntryName, BrowserLinePointer& _out_rpLine ) const; + bool impl_getBrowserLineForName( const OUString& _rEntryName, BrowserLinePointer& _out_rpLine ) const; /** returns the preferred height (in pixels) of the help section, or 0 if we currently don't have a help section diff --git a/extensions/source/propctrlr/buttonnavigationhandler.cxx b/extensions/source/propctrlr/buttonnavigationhandler.cxx index bef8d73f25bb..d4b25c2f84ec 100644 --- a/extensions/source/propctrlr/buttonnavigationhandler.cxx +++ b/extensions/source/propctrlr/buttonnavigationhandler.cxx @@ -53,7 +53,7 @@ namespace pcr DBG_CTOR( ButtonNavigationHandler, NULL ); m_aContext.createComponent( - ::rtl::OUString( "com.sun.star.form.inspection.FormComponentPropertyHandler" ), + OUString( "com.sun.star.form.inspection.FormComponentPropertyHandler" ), m_xSlaveHandler ); if ( !m_xSlaveHandler.is() ) throw RuntimeException(); @@ -66,16 +66,16 @@ namespace pcr } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL ButtonNavigationHandler::getImplementationName_static( ) throw (RuntimeException) + OUString SAL_CALL ButtonNavigationHandler::getImplementationName_static( ) throw (RuntimeException) { - return ::rtl::OUString( "com.sun.star.comp.extensions.ButtonNavigationHandler" ); + return OUString( "com.sun.star.comp.extensions.ButtonNavigationHandler" ); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL ButtonNavigationHandler::getSupportedServiceNames_static( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL ButtonNavigationHandler::getSupportedServiceNames_static( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSupported( 1 ); - aSupported[0] = ::rtl::OUString( "com.sun.star.form.inspection.ButtonNavigationHandler" ); + Sequence< OUString > aSupported( 1 ); + aSupported[0] = OUString( "com.sun.star.form.inspection.ButtonNavigationHandler" ); return aSupported; } @@ -87,7 +87,7 @@ namespace pcr } //-------------------------------------------------------------------- - PropertyState SAL_CALL ButtonNavigationHandler::getPropertyState( const ::rtl::OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) + PropertyState SAL_CALL ButtonNavigationHandler::getPropertyState( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throw( _rPropertyName ) ); @@ -116,7 +116,7 @@ namespace pcr } //-------------------------------------------------------------------- - Any SAL_CALL ButtonNavigationHandler::getPropertyValue( const ::rtl::OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL ButtonNavigationHandler::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throw( _rPropertyName ) ); @@ -147,7 +147,7 @@ namespace pcr } //-------------------------------------------------------------------- - void SAL_CALL ButtonNavigationHandler::setPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) + void SAL_CALL ButtonNavigationHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throw( _rPropertyName ) ); @@ -201,16 +201,16 @@ namespace pcr } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL ButtonNavigationHandler::getActuatingProperties( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL ButtonNavigationHandler::getActuatingProperties( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aActuating( 2 ); + Sequence< OUString > aActuating( 2 ); aActuating[0] = PROPERTY_BUTTONTYPE; aActuating[1] = PROPERTY_TARGET_URL; return aActuating; } //-------------------------------------------------------------------- - InteractiveSelectionResult SAL_CALL ButtonNavigationHandler::onInteractivePropertySelection( const ::rtl::OUString& _rPropertyName, sal_Bool _bPrimary, Any& _rData, const Reference< XObjectInspectorUI >& _rxInspectorUI ) throw (UnknownPropertyException, NullPointerException, RuntimeException) + InteractiveSelectionResult SAL_CALL ButtonNavigationHandler::onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, Any& _rData, const Reference< XObjectInspectorUI >& _rxInspectorUI ) throw (UnknownPropertyException, NullPointerException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throw( _rPropertyName ) ); @@ -231,7 +231,7 @@ namespace pcr } //-------------------------------------------------------------------- - void SAL_CALL ButtonNavigationHandler::actuatingPropertyChanged( const ::rtl::OUString& _rActuatingPropertyName, const Any& /*_rNewValue*/, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool /*_bFirstTimeInit*/ ) throw (NullPointerException, RuntimeException) + void SAL_CALL ButtonNavigationHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& /*_rNewValue*/, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool /*_bFirstTimeInit*/ ) throw (NullPointerException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throw( _rActuatingPropertyName ) ); @@ -257,7 +257,7 @@ namespace pcr } //-------------------------------------------------------------------- - LineDescriptor SAL_CALL ButtonNavigationHandler::describePropertyLine( const ::rtl::OUString& _rPropertyName, const Reference< XPropertyControlFactory >& _rxControlFactory ) throw (UnknownPropertyException, NullPointerException, RuntimeException) + LineDescriptor SAL_CALL ButtonNavigationHandler::describePropertyLine( const OUString& _rPropertyName, const Reference< XPropertyControlFactory >& _rxControlFactory ) throw (UnknownPropertyException, NullPointerException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throw( _rPropertyName ) ); diff --git a/extensions/source/propctrlr/buttonnavigationhandler.hxx b/extensions/source/propctrlr/buttonnavigationhandler.hxx index 5cd55f7bfd59..b2b704db5ab5 100644 --- a/extensions/source/propctrlr/buttonnavigationhandler.hxx +++ b/extensions/source/propctrlr/buttonnavigationhandler.hxx @@ -44,8 +44,8 @@ namespace pcr ButtonNavigationHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext ); - static ::rtl::OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); + static OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); protected: ~ButtonNavigationHandler(); @@ -55,16 +55,16 @@ namespace pcr protected: // XPropertyHandler overriables virtual void SAL_CALL inspect( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxIntrospectee ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NullPointerException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getActuatingProperties( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::inspection::InteractiveSelectionResult - SAL_CALL onInteractivePropertySelection( const ::rtl::OUString& _rPropertyName, sal_Bool _bPrimary, ::com::sun::star::uno::Any& _rData, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL actuatingPropertyChanged( const ::rtl::OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, ::com::sun::star::uno::Any& _rData, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::inspection::LineDescriptor - SAL_CALL describePropertyLine( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + SAL_CALL describePropertyLine( const OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); // PropertyHandler overridables virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > diff --git a/extensions/source/propctrlr/cellbindinghandler.cxx b/extensions/source/propctrlr/cellbindinghandler.cxx index 4162df9970b1..3106efcd4e18 100644 --- a/extensions/source/propctrlr/cellbindinghandler.cxx +++ b/extensions/source/propctrlr/cellbindinghandler.cxx @@ -61,16 +61,16 @@ namespace pcr } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL CellBindingPropertyHandler::getImplementationName_static( ) throw (RuntimeException) + OUString SAL_CALL CellBindingPropertyHandler::getImplementationName_static( ) throw (RuntimeException) { - return ::rtl::OUString( "com.sun.star.comp.extensions.CellBindingPropertyHandler" ); + return OUString( "com.sun.star.comp.extensions.CellBindingPropertyHandler" ); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL CellBindingPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL CellBindingPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSupported( 1 ); - aSupported[0] = ::rtl::OUString( "com.sun.star.form.inspection.CellBindingPropertyHandler" ); + Sequence< OUString > aSupported( 1 ); + aSupported[0] = OUString( "com.sun.star.form.inspection.CellBindingPropertyHandler" ); return aSupported; } @@ -92,9 +92,9 @@ namespace pcr } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL CellBindingPropertyHandler::getActuatingProperties( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL CellBindingPropertyHandler::getActuatingProperties( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aInterestingProperties( 3 ); + Sequence< OUString > aInterestingProperties( 3 ); aInterestingProperties[0] = PROPERTY_LIST_CELL_RANGE; aInterestingProperties[1] = PROPERTY_BOUND_CELL; aInterestingProperties[2] = PROPERTY_CONTROLSOURCE; @@ -102,7 +102,7 @@ namespace pcr } //-------------------------------------------------------------------- - void SAL_CALL CellBindingPropertyHandler::actuatingPropertyChanged( const ::rtl::OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (NullPointerException, RuntimeException) + void SAL_CALL CellBindingPropertyHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (NullPointerException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nActuatingPropId( impl_getPropertyId_throw( _rActuatingPropertyName ) ); @@ -168,7 +168,7 @@ namespace pcr try { if ( !xSource.is() ) - setPropertyValue( PROPERTY_STRINGITEMLIST, makeAny( Sequence< ::rtl::OUString >() ) ); + setPropertyValue( PROPERTY_STRINGITEMLIST, makeAny( Sequence< OUString >() ) ); } catch( const Exception& ) { @@ -181,7 +181,7 @@ namespace pcr // ----- DataField ----- case PROPERTY_ID_CONTROLSOURCE: { - ::rtl::OUString sControlSource; + OUString sControlSource; _rNewValue >>= sControlSource; if ( impl_isSupportedProperty_nothrow( PROPERTY_ID_BOUND_CELL ) ) _rxInspectorUI->enablePropertyUI( PROPERTY_BOUND_CELL, sControlSource.isEmpty() ); @@ -230,7 +230,7 @@ namespace pcr } //-------------------------------------------------------------------- - Any SAL_CALL CellBindingPropertyHandler::getPropertyValue( const ::rtl::OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL CellBindingPropertyHandler::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throw( _rPropertyName ) ); @@ -276,7 +276,7 @@ namespace pcr } //-------------------------------------------------------------------- - void SAL_CALL CellBindingPropertyHandler::setPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) + void SAL_CALL CellBindingPropertyHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throw( _rPropertyName ) ); @@ -348,7 +348,7 @@ namespace pcr } //-------------------------------------------------------------------- - Any SAL_CALL CellBindingPropertyHandler::convertToPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL CellBindingPropertyHandler::convertToPropertyValue( const OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); Any aPropertyValue; @@ -359,7 +359,7 @@ namespace pcr PropertyId nPropId( m_pInfoService->getPropertyId( _rPropertyName ) ); - ::rtl::OUString sControlValue; + OUString sControlValue; OSL_VERIFY( _rControlValue >>= sControlValue ); switch( nPropId ) { @@ -396,7 +396,7 @@ namespace pcr } //-------------------------------------------------------------------- - Any SAL_CALL CellBindingPropertyHandler::convertToControlValue( const ::rtl::OUString& _rPropertyName, + Any SAL_CALL CellBindingPropertyHandler::convertToControlValue( const OUString& _rPropertyName, const Any& _rPropertyValue, const Type& /*_rControlValueType*/ ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -468,7 +468,7 @@ namespace pcr if ( bAllowCellLinking ) { aProperties[ --nPos ] = Property( PROPERTY_BOUND_CELL, PROPERTY_ID_BOUND_CELL, - ::getCppuType( static_cast< ::rtl::OUString* >( NULL ) ), 0 ); + ::getCppuType( static_cast< OUString* >( NULL ) ), 0 ); } if ( bAllowCellIntLinking ) { @@ -478,7 +478,7 @@ namespace pcr if ( bAllowListCellRange ) { aProperties[ --nPos ] = Property( PROPERTY_LIST_CELL_RANGE, PROPERTY_ID_LIST_CELL_RANGE, - ::getCppuType( static_cast< ::rtl::OUString* >( NULL ) ), 0 ); + ::getCppuType( static_cast< OUString* >( NULL ) ), 0 ); } } diff --git a/extensions/source/propctrlr/cellbindinghandler.hxx b/extensions/source/propctrlr/cellbindinghandler.hxx index bb771ddf90d1..1dedcf78a1ac 100644 --- a/extensions/source/propctrlr/cellbindinghandler.hxx +++ b/extensions/source/propctrlr/cellbindinghandler.hxx @@ -50,21 +50,21 @@ namespace pcr const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext ); - static ::rtl::OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); + static OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); protected: ~CellBindingPropertyHandler(); protected: // XPropertyHandler overriables - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rControlValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rPropertyValue, const ::com::sun::star::uno::Type& _rControlValueType ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rControlValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rPropertyValue, const ::com::sun::star::uno::Type& _rControlValueType ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getActuatingProperties( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL actuatingPropertyChanged( const ::rtl::OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); // PropertyHandler overridables virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > diff --git a/extensions/source/propctrlr/cellbindinghelper.cxx b/extensions/source/propctrlr/cellbindinghelper.cxx index ebaa842a2b11..718223996ac7 100644 --- a/extensions/source/propctrlr/cellbindinghelper.cxx +++ b/extensions/source/propctrlr/cellbindinghelper.cxx @@ -60,15 +60,15 @@ namespace pcr namespace { //.................................................................... - struct StringCompare : public ::std::unary_function< ::rtl::OUString, bool > + struct StringCompare : public ::std::unary_function< OUString, bool > { private: - ::rtl::OUString m_sReference; + OUString m_sReference; public: - StringCompare( const ::rtl::OUString& _rReference ) : m_sReference( _rReference ) { } + StringCompare( const OUString& _rReference ) : m_sReference( _rReference ) { } - inline bool operator()( const ::rtl::OUString& _rCompare ) + inline bool operator()( const OUString& _rCompare ) { return ( _rCompare == m_sReference ) ? true : false; } @@ -147,7 +147,7 @@ namespace pcr } //------------------------------------------------------------------------ - bool CellBindingHelper::convertStringAddress( const ::rtl::OUString& _rAddressDescription, CellAddress& /* [out] */ _rAddress ) const + bool CellBindingHelper::convertStringAddress( const OUString& _rAddressDescription, CellAddress& /* [out] */ _rAddress ) const { Any aAddress; return doConvertAddressRepresentations( @@ -161,15 +161,15 @@ namespace pcr } //------------------------------------------------------------------------ - bool CellBindingHelper::doConvertAddressRepresentations( const ::rtl::OUString& _rInputProperty, const Any& _rInputValue, - const ::rtl::OUString& _rOutputProperty, Any& _rOutputValue, bool _bIsRange ) const SAL_THROW(()) + bool CellBindingHelper::doConvertAddressRepresentations( const OUString& _rInputProperty, const Any& _rInputValue, + const OUString& _rOutputProperty, Any& _rOutputValue, bool _bIsRange ) const SAL_THROW(()) { bool bSuccess = false; Reference< XPropertySet > xConverter( createDocumentDependentInstance( _bIsRange ? OUString(SERVICE_RANGEADDRESS_CONVERSION) : OUString(SERVICE_ADDRESS_CONVERSION), - ::rtl::OUString(), + OUString(), Any() ), UNO_QUERY @@ -195,7 +195,7 @@ namespace pcr } //------------------------------------------------------------------------ - bool CellBindingHelper::convertStringAddress( const ::rtl::OUString& _rAddressDescription, + bool CellBindingHelper::convertStringAddress( const OUString& _rAddressDescription, CellRangeAddress& /* [out] */ _rAddress ) const { Any aAddress; @@ -222,7 +222,7 @@ namespace pcr } //------------------------------------------------------------------------ - Reference< XValueBinding > CellBindingHelper::createCellBindingFromStringAddress( const ::rtl::OUString& _rAddress, bool _bSupportIntegerExchange ) const + Reference< XValueBinding > CellBindingHelper::createCellBindingFromStringAddress( const OUString& _rAddress, bool _bSupportIntegerExchange ) const { Reference< XValueBinding > xBinding; if ( !m_xDocument.is() ) @@ -238,7 +238,7 @@ namespace pcr } //------------------------------------------------------------------------ - Reference< XListEntrySource > CellBindingHelper::createCellListSourceFromStringAddress( const ::rtl::OUString& _rAddress ) const + Reference< XListEntrySource > CellBindingHelper::createCellListSourceFromStringAddress( const OUString& _rAddress ) const { Reference< XListEntrySource > xSource; @@ -257,7 +257,7 @@ namespace pcr } //------------------------------------------------------------------------ - Reference< XInterface > CellBindingHelper::createDocumentDependentInstance( const ::rtl::OUString& _rService, const ::rtl::OUString& _rArgumentName, + Reference< XInterface > CellBindingHelper::createDocumentDependentInstance( const OUString& _rService, const OUString& _rArgumentName, const Any& _rArgumentValue ) const { Reference< XInterface > xReturn; @@ -322,10 +322,10 @@ namespace pcr } //------------------------------------------------------------------------ - ::rtl::OUString CellBindingHelper::getStringAddressFromCellBinding( const Reference< XValueBinding >& _rxBinding ) const + OUString CellBindingHelper::getStringAddressFromCellBinding( const Reference< XValueBinding >& _rxBinding ) const { CellAddress aAddress; - ::rtl::OUString sAddress; + OUString sAddress; if ( getAddressFromCellBinding( _rxBinding, aAddress ) ) { Any aStringAddress; @@ -339,11 +339,11 @@ namespace pcr } //------------------------------------------------------------------------ - ::rtl::OUString CellBindingHelper::getStringAddressFromCellListSource( const Reference< XListEntrySource >& _rxSource ) const + OUString CellBindingHelper::getStringAddressFromCellListSource( const Reference< XListEntrySource >& _rxSource ) const { OSL_PRECOND( !_rxSource.is() || isCellRangeListSource( _rxSource ), "CellBindingHelper::getStringAddressFromCellListSource: this is no cell list source!" ); - ::rtl::OUString sAddress; + OUString sAddress; if ( !m_xDocument.is() ) // very bad ... return sAddress; @@ -372,7 +372,7 @@ namespace pcr } //------------------------------------------------------------------------ - bool CellBindingHelper::isSpreadsheetDocumentWhichSupplies( const ::rtl::OUString& _rService ) const + bool CellBindingHelper::isSpreadsheetDocumentWhichSupplies( const OUString& _rService ) const { bool bYesItIs = false; @@ -382,11 +382,11 @@ namespace pcr Reference< XMultiServiceFactory > xDocumentFactory( m_xDocument, UNO_QUERY ); OSL_ENSURE( xDocumentFactory.is(), "CellBindingHelper::isSpreadsheetDocumentWhichSupplies: spreadsheet document, but no factory?" ); - Sequence< ::rtl::OUString > aAvailableServices; + Sequence< OUString > aAvailableServices; if ( xDocumentFactory.is() ) aAvailableServices = xDocumentFactory->getAvailableServiceNames( ); - const ::rtl::OUString* pFound = ::std::find_if( + const OUString* pFound = ::std::find_if( aAvailableServices.getConstArray(), aAvailableServices.getConstArray() + aAvailableServices.getLength(), StringCompare( _rService ) @@ -504,7 +504,7 @@ namespace pcr } //------------------------------------------------------------------------ - bool CellBindingHelper::doesComponentSupport( const Reference< XInterface >& _rxComponent, const ::rtl::OUString& _rService ) const + bool CellBindingHelper::doesComponentSupport( const Reference< XInterface >& _rxComponent, const OUString& _rService ) const { bool bDoes = false; Reference< XServiceInfo > xSI( _rxComponent, UNO_QUERY ); diff --git a/extensions/source/propctrlr/cellbindinghelper.hxx b/extensions/source/propctrlr/cellbindinghelper.hxx index 12b9c65b42ee..b791bb0b8b1e 100644 --- a/extensions/source/propctrlr/cellbindinghelper.hxx +++ b/extensions/source/propctrlr/cellbindinghelper.hxx @@ -74,7 +74,7 @@ namespace pcr */ ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XValueBinding > createCellBindingFromStringAddress( - const ::rtl::OUString& _rAddress, + const OUString& _rAddress, bool _bSupportIntegerExchange = false ) const; @@ -90,7 +90,7 @@ namespace pcr /** gets a cell range list source binding for the given address */ ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntrySource > - createCellListSourceFromStringAddress( const ::rtl::OUString& _rAddress ) const; + createCellListSourceFromStringAddress( const OUString& _rAddress ) const; /** creates a string representation for the given value binding's address @@ -101,7 +101,7 @@ namespace pcr The binding is a valid cell binding, or <NULL/> @see isCellBinding */ - ::rtl::OUString getStringAddressFromCellBinding( + OUString getStringAddressFromCellBinding( const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XValueBinding >& _rxBinding ) const; @@ -128,7 +128,7 @@ namespace pcr The object is a valid cell range list source, or <NULL/> @see isCellRangeListSource */ - ::rtl::OUString getStringAddressFromCellListSource( + OUString getStringAddressFromCellListSource( const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntrySource >& _rxSource ) const; @@ -204,27 +204,27 @@ namespace pcr /** creates an address object from a string representation of a cell address */ bool convertStringAddress( - const ::rtl::OUString& _rAddressDescription, + const OUString& _rAddressDescription, ::com::sun::star::table::CellAddress& /* [out] */ _rAddress ) const; /** creates an address range object from a string representation of a cell range address */ bool convertStringAddress( - const ::rtl::OUString& _rAddressDescription, + const OUString& _rAddressDescription, ::com::sun::star::table::CellRangeAddress& /* [out] */ _rAddress ) const; /** determines if our document is a spreadsheet document, *and* can supply the given service */ - bool isSpreadsheetDocumentWhichSupplies( const ::rtl::OUString& _rService ) const; + bool isSpreadsheetDocumentWhichSupplies( const OUString& _rService ) const; /** checkes whether a given component supports a given servive */ bool doesComponentSupport( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxComponent, - const ::rtl::OUString& _rService + const OUString& _rService ) const; /** uses the document (it's factory interface, respectively) to create a component instance @@ -239,8 +239,8 @@ namespace pcr */ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createDocumentDependentInstance( - const ::rtl::OUString& _rService, - const ::rtl::OUString& _rArgumentName, + const OUString& _rService, + const OUString& _rArgumentName, const ::com::sun::star::uno::Any& _rArgumentValue ) const; @@ -265,9 +265,9 @@ namespace pcr @see com::sun::star::table::CellRangeAddressConversion */ bool doConvertAddressRepresentations( - const ::rtl::OUString& _rInputProperty, + const OUString& _rInputProperty, const ::com::sun::star::uno::Any& _rInputValue, - const ::rtl::OUString& _rOutputProperty, + const OUString& _rOutputProperty, ::com::sun::star::uno::Any& _rOutputValue, bool _bIsRange ) const SAL_THROW(()); diff --git a/extensions/source/propctrlr/commoncontrol.hxx b/extensions/source/propctrlr/commoncontrol.hxx index f7708a20c6ea..f8aaa357c0cf 100644 --- a/extensions/source/propctrlr/commoncontrol.hxx +++ b/extensions/source/propctrlr/commoncontrol.hxx @@ -319,7 +319,7 @@ namespace pcr inline void CommonBehaviourControl< CONTROL_INTERFACE, CONTROL_WINDOW >::impl_checkDisposed_throw() { if ( ComponentBaseClass::rBHelper.bDisposed ) - throw ::com::sun::star::lang::DisposedException( ::rtl::OUString(), *this ); + throw ::com::sun::star::lang::DisposedException( OUString(), *this ); } //............................................................................ diff --git a/extensions/source/propctrlr/composeduiupdate.cxx b/extensions/source/propctrlr/composeduiupdate.cxx index 855cc0d985bc..87a174b958c6 100644 --- a/extensions/source/propctrlr/composeduiupdate.cxx +++ b/extensions/source/propctrlr/composeduiupdate.cxx @@ -62,7 +62,7 @@ namespace pcr }; //================================================================ - typedef ::std::set< ::rtl::OUString > StringBag; + typedef ::std::set< OUString > StringBag; typedef ::std::map< sal_Int16, StringBag > MapIntToStringBag; } @@ -138,16 +138,16 @@ namespace pcr void dispose(); // XObjectInspectorUI overridables - virtual void SAL_CALL enablePropertyUI( const ::rtl::OUString& _rPropertyName, ::sal_Bool _bEnable ) throw (RuntimeException); - virtual void SAL_CALL enablePropertyUIElements( const ::rtl::OUString& _rPropertyName, ::sal_Int16 _nElements, ::sal_Bool _bEnable ) throw (RuntimeException); - virtual void SAL_CALL rebuildPropertyUI( const ::rtl::OUString& _rPropertyName ) throw (RuntimeException); - virtual void SAL_CALL showPropertyUI( const ::rtl::OUString& _rPropertyName ) throw (RuntimeException); - virtual void SAL_CALL hidePropertyUI( const ::rtl::OUString& _rPropertyName ) throw (RuntimeException); - virtual void SAL_CALL showCategory( const ::rtl::OUString& _rCategory, ::sal_Bool _bShow ) throw (RuntimeException); - virtual Reference< XPropertyControl > SAL_CALL getPropertyControl( const ::rtl::OUString& _rPropertyName ) throw (RuntimeException); + virtual void SAL_CALL enablePropertyUI( const OUString& _rPropertyName, ::sal_Bool _bEnable ) throw (RuntimeException); + virtual void SAL_CALL enablePropertyUIElements( const OUString& _rPropertyName, ::sal_Int16 _nElements, ::sal_Bool _bEnable ) throw (RuntimeException); + virtual void SAL_CALL rebuildPropertyUI( const OUString& _rPropertyName ) throw (RuntimeException); + virtual void SAL_CALL showPropertyUI( const OUString& _rPropertyName ) throw (RuntimeException); + virtual void SAL_CALL hidePropertyUI( const OUString& _rPropertyName ) throw (RuntimeException); + virtual void SAL_CALL showCategory( const OUString& _rCategory, ::sal_Bool _bShow ) throw (RuntimeException); + virtual Reference< XPropertyControl > SAL_CALL getPropertyControl( const OUString& _rPropertyName ) throw (RuntimeException); virtual void SAL_CALL registerControlObserver( const Reference< XPropertyControlObserver >& Observer ) throw (RuntimeException); virtual void SAL_CALL revokeControlObserver( const Reference< XPropertyControlObserver >& Observer ) throw (RuntimeException); - virtual void SAL_CALL setHelpSectionText( const ::rtl::OUString& _HelpText ) throw (NoSupportException, RuntimeException); + virtual void SAL_CALL setHelpSectionText( const OUString& _HelpText ) throw (NoSupportException, RuntimeException); // UNOCompatibleNonUNOReference overridables virtual void SAL_CALL acquire() throw(); @@ -163,7 +163,7 @@ namespace pcr void checkDisposed() const; private: - void impl_markElementEnabledOrDisabled( const ::rtl::OUString& _rPropertyName, sal_Int16 _nElementIdOrZero, sal_Bool _bEnable ); + void impl_markElementEnabledOrDisabled( const OUString& _rPropertyName, sal_Int16 _nElementIdOrZero, sal_Bool _bEnable ); /** calls <member>m_pUIChangeNotification</member> at <member>m_rMaster</member> */ @@ -242,7 +242,7 @@ namespace pcr //---------------------------------------------------------------- namespace { - void lcl_markStringKeyPositiveOrNegative( const ::rtl::OUString& _rKeyName, StringBag& _rPositives, StringBag& _rNegatives, sal_Bool _bMarkPositive ) + void lcl_markStringKeyPositiveOrNegative( const OUString& _rKeyName, StringBag& _rPositives, StringBag& _rNegatives, sal_Bool _bMarkPositive ) { if ( _bMarkPositive ) { @@ -256,7 +256,7 @@ namespace pcr } //---------------------------------------------------------------- - void CachedInspectorUI::enablePropertyUI( const ::rtl::OUString& _rPropertyName, sal_Bool _bEnable ) throw (RuntimeException) + void CachedInspectorUI::enablePropertyUI( const OUString& _rPropertyName, sal_Bool _bEnable ) throw (RuntimeException) { MethodGuard aGuard( *this ); if ( !m_rMaster.shouldContinuePropertyHandling( _rPropertyName ) ) @@ -267,7 +267,7 @@ namespace pcr } //---------------------------------------------------------------- - void CachedInspectorUI::impl_markElementEnabledOrDisabled( const ::rtl::OUString& _rPropertyName, sal_Int16 _nElementIdOrZero, sal_Bool _bEnable ) + void CachedInspectorUI::impl_markElementEnabledOrDisabled( const OUString& _rPropertyName, sal_Int16 _nElementIdOrZero, sal_Bool _bEnable ) { if ( _nElementIdOrZero == 0 ) return; @@ -287,7 +287,7 @@ namespace pcr } //---------------------------------------------------------------- - void CachedInspectorUI::enablePropertyUIElements( const ::rtl::OUString& _rPropertyName, sal_Int16 _nElements, sal_Bool _bEnable ) throw (RuntimeException) + void CachedInspectorUI::enablePropertyUIElements( const OUString& _rPropertyName, sal_Int16 _nElements, sal_Bool _bEnable ) throw (RuntimeException) { MethodGuard aGuard( *this ); if ( !m_rMaster.shouldContinuePropertyHandling( _rPropertyName ) ) @@ -301,7 +301,7 @@ namespace pcr } //---------------------------------------------------------------- - void CachedInspectorUI::rebuildPropertyUI( const ::rtl::OUString& _rPropertyName ) throw (RuntimeException) + void CachedInspectorUI::rebuildPropertyUI( const OUString& _rPropertyName ) throw (RuntimeException) { MethodGuard aGuard( *this ); if ( !m_rMaster.shouldContinuePropertyHandling( _rPropertyName ) ) @@ -313,7 +313,7 @@ namespace pcr } //---------------------------------------------------------------- - void CachedInspectorUI::showPropertyUI( const ::rtl::OUString& _rPropertyName ) throw (RuntimeException) + void CachedInspectorUI::showPropertyUI( const OUString& _rPropertyName ) throw (RuntimeException) { MethodGuard aGuard( *this ); if ( !m_rMaster.shouldContinuePropertyHandling( _rPropertyName ) ) @@ -327,7 +327,7 @@ namespace pcr } //---------------------------------------------------------------- - void CachedInspectorUI::hidePropertyUI( const ::rtl::OUString& _rPropertyName ) throw (RuntimeException) + void CachedInspectorUI::hidePropertyUI( const OUString& _rPropertyName ) throw (RuntimeException) { MethodGuard aGuard( *this ); if ( !m_rMaster.shouldContinuePropertyHandling( _rPropertyName ) ) @@ -338,7 +338,7 @@ namespace pcr } //---------------------------------------------------------------- - void CachedInspectorUI::showCategory( const ::rtl::OUString& _rCategory, sal_Bool _bShow ) throw (RuntimeException) + void CachedInspectorUI::showCategory( const OUString& _rCategory, sal_Bool _bShow ) throw (RuntimeException) { MethodGuard aGuard( *this ); @@ -347,7 +347,7 @@ namespace pcr } //---------------------------------------------------------------- - Reference< XPropertyControl > SAL_CALL CachedInspectorUI::getPropertyControl( const ::rtl::OUString& _rPropertyName ) throw (RuntimeException) + Reference< XPropertyControl > SAL_CALL CachedInspectorUI::getPropertyControl( const OUString& _rPropertyName ) throw (RuntimeException) { MethodGuard aGuard( *this ); if ( !m_rMaster.shouldContinuePropertyHandling( _rPropertyName ) ) @@ -375,7 +375,7 @@ namespace pcr } //---------------------------------------------------------------- - void SAL_CALL CachedInspectorUI::setHelpSectionText( const ::rtl::OUString& _HelpText ) throw (NoSupportException, RuntimeException) + void SAL_CALL CachedInspectorUI::setHelpSectionText( const OUString& _HelpText ) throw (NoSupportException, RuntimeException) { m_rMaster.getDelegatorUI()->setHelpSectionText( _HelpText ); } @@ -481,7 +481,7 @@ namespace pcr //============================================================ /** a typedef for a ->XObjectInspectorUI member function taking a string */ - typedef void ( SAL_CALL XObjectInspectorUI::*FPropertyUISetter )( const ::rtl::OUString& ); + typedef void ( SAL_CALL XObjectInspectorUI::*FPropertyUISetter )( const OUString& ); //============================================================ //= PropertyUIOperator @@ -489,7 +489,7 @@ namespace pcr /** an STL-compatible struct which calls a certain member method (taking a string) at a given ->XObjectInspectorUI instance */ - struct PropertyUIOperator : public ::std::unary_function< ::rtl::OUString, void > + struct PropertyUIOperator : public ::std::unary_function< OUString, void > { private: Reference< XObjectInspectorUI > m_xUpdater; @@ -502,7 +502,7 @@ namespace pcr { } - void operator()( const ::rtl::OUString& _rPropertyName ) + void operator()( const OUString& _rPropertyName ) { ((m_xUpdater.get())->*m_pSetter)( _rPropertyName ); } @@ -522,7 +522,7 @@ namespace pcr class IStringKeyBooleanUIUpdate { public: - virtual void updateUIForKey( const ::rtl::OUString& _rKey, sal_Bool _bFlag ) const = 0; + virtual void updateUIForKey( const OUString& _rKey, sal_Bool _bFlag ) const = 0; virtual ~IStringKeyBooleanUIUpdate() { } }; @@ -548,11 +548,11 @@ namespace pcr { } // IStringKeyBooleanUIUpdate - virtual void updateUIForKey( const ::rtl::OUString& _rKey, sal_Bool _bFlag ) const; + virtual void updateUIForKey( const OUString& _rKey, sal_Bool _bFlag ) const; }; //............................................................ - void EnablePropertyUIElement::updateUIForKey( const ::rtl::OUString& _rKey, sal_Bool _bFlag ) const + void EnablePropertyUIElement::updateUIForKey( const OUString& _rKey, sal_Bool _bFlag ) const { m_xUIUpdate->enablePropertyUIElements( _rKey, m_nElement, _bFlag ); } @@ -562,7 +562,7 @@ namespace pcr //============================================================ /** a ->XObjectInspectorUI method taking a string and a boolean */ - typedef void ( SAL_CALL XObjectInspectorUI::*FPropertyUIFlagSetter )( const ::rtl::OUString&, sal_Bool ); + typedef void ( SAL_CALL XObjectInspectorUI::*FPropertyUIFlagSetter )( const OUString&, sal_Bool ); //============================================================ //= DefaultStringKeyBooleanUIUpdate @@ -579,7 +579,7 @@ namespace pcr public: DefaultStringKeyBooleanUIUpdate( const Reference< XObjectInspectorUI >& _rxUIUpdate, FPropertyUIFlagSetter _pSetter ); // IStringKeyBooleanUIUpdate - virtual void updateUIForKey( const ::rtl::OUString& _rKey, sal_Bool _bFlag ) const; + virtual void updateUIForKey( const OUString& _rKey, sal_Bool _bFlag ) const; }; //............................................................ @@ -590,7 +590,7 @@ namespace pcr } //............................................................ - void DefaultStringKeyBooleanUIUpdate::updateUIForKey( const ::rtl::OUString& _rKey, sal_Bool _bFlag ) const + void DefaultStringKeyBooleanUIUpdate::updateUIForKey( const OUString& _rKey, sal_Bool _bFlag ) const { ((m_xUIUpdate.get())->*m_pSetter)( _rKey, _bFlag ); } @@ -601,7 +601,7 @@ namespace pcr /** an STL-compatible structure which applies a ->IStringKeyBooleanUIUpdate::updateUIForKey operation with a fixed boolean value, for a given string value */ - struct BooleanUIAspectUpdate : public ::std::unary_function< ::rtl::OUString, void > + struct BooleanUIAspectUpdate : public ::std::unary_function< OUString, void > { private: const IStringKeyBooleanUIUpdate& m_rUpdater; @@ -614,7 +614,7 @@ namespace pcr { } - void operator()( const ::rtl::OUString& _rPropertyName ) + void operator()( const OUString& _rPropertyName ) { m_rUpdater.updateUIForKey( _rPropertyName, m_bFlag ); } @@ -630,7 +630,7 @@ namespace pcr //============================================================ /** an STL-compatible structure subtracting a given string from a fixed ->StringBag */ - struct StringBagComplement : public ::std::unary_function< ::rtl::OUString, void > + struct StringBagComplement : public ::std::unary_function< OUString, void > { private: StringBag& m_rMinuend; @@ -638,7 +638,7 @@ namespace pcr public: StringBagComplement( StringBag& _rMinuend ) :m_rMinuend( _rMinuend ) { } - void operator()( const ::rtl::OUString& _rPropertyToSubtract ) + void operator()( const OUString& _rPropertyToSubtract ) { m_rMinuend.erase( _rPropertyToSubtract ); } @@ -830,7 +830,7 @@ namespace pcr } //---------------------------------------------------------------- - bool ComposedPropertyUIUpdate::shouldContinuePropertyHandling( const ::rtl::OUString& _rName ) const + bool ComposedPropertyUIUpdate::shouldContinuePropertyHandling( const OUString& _rName ) const { if ( !m_pPropertyCheck ) return true; diff --git a/extensions/source/propctrlr/composeduiupdate.hxx b/extensions/source/propctrlr/composeduiupdate.hxx index 4ae7769a10c5..04899f15598b 100644 --- a/extensions/source/propctrlr/composeduiupdate.hxx +++ b/extensions/source/propctrlr/composeduiupdate.hxx @@ -44,7 +44,7 @@ namespace pcr class SAL_NO_VTABLE IPropertyExistenceCheck { public: - virtual ::sal_Bool SAL_CALL hasPropertyByName( const ::rtl::OUString& _rName ) throw (::com::sun::star::uno::RuntimeException) = 0; + virtual ::sal_Bool SAL_CALL hasPropertyByName( const OUString& _rName ) throw (::com::sun::star::uno::RuntimeException) = 0; protected: ~IPropertyExistenceCheck() {} @@ -143,7 +143,7 @@ namespace pcr /** invokes m_pPropertyCheck to check whether a given property should be handled */ - bool shouldContinuePropertyHandling( const ::rtl::OUString& _rName ) const; + bool shouldContinuePropertyHandling( const OUString& _rName ) const; private: /// determines whether the instance is already disposed diff --git a/extensions/source/propctrlr/controlfontdialog.cxx b/extensions/source/propctrlr/controlfontdialog.cxx index d7b17559a744..861583f686be 100644 --- a/extensions/source/propctrlr/controlfontdialog.cxx +++ b/extensions/source/propctrlr/controlfontdialog.cxx @@ -78,15 +78,15 @@ namespace pcr } //--------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OControlFontDialog::getImplementationName() throw(RuntimeException) + OUString SAL_CALL OControlFontDialog::getImplementationName() throw(RuntimeException) { return getImplementationName_static(); } //--------------------------------------------------------------------- - ::rtl::OUString OControlFontDialog::getImplementationName_static() throw(RuntimeException) + OUString OControlFontDialog::getImplementationName_static() throw(RuntimeException) { - return ::rtl::OUString("org.openoffice.comp.form.ui.OControlFontDialog"); + return OUString("org.openoffice.comp.form.ui.OControlFontDialog"); } //--------------------------------------------------------------------- @@ -99,7 +99,7 @@ namespace pcr ::comphelper::StringSequence OControlFontDialog::getSupportedServiceNames_static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString("com.sun.star.form.ControlFontDialog"); + aSupported.getArray()[0] = OUString("com.sun.star.form.ControlFontDialog"); return aSupported; } diff --git a/extensions/source/propctrlr/controlfontdialog.hxx b/extensions/source/propctrlr/controlfontdialog.hxx index b0108c8c513d..c0db06a47b63 100644 --- a/extensions/source/propctrlr/controlfontdialog.hxx +++ b/extensions/source/propctrlr/controlfontdialog.hxx @@ -61,12 +61,12 @@ namespace pcr virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - static methods - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static(void) throw( ::com::sun::star::uno::RuntimeException ); - static ::rtl::OUString getImplementationName_static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static(void) throw( ::com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >&); diff --git a/extensions/source/propctrlr/defaultforminspection.cxx b/extensions/source/propctrlr/defaultforminspection.cxx index 0f2c2a1eab90..7fb4906752b4 100644 --- a/extensions/source/propctrlr/defaultforminspection.cxx +++ b/extensions/source/propctrlr/defaultforminspection.cxx @@ -73,28 +73,28 @@ namespace pcr } //------------------------------------------------------------------------ - ::rtl::OUString SAL_CALL DefaultFormComponentInspectorModel::getImplementationName( ) throw(RuntimeException) + OUString SAL_CALL DefaultFormComponentInspectorModel::getImplementationName( ) throw(RuntimeException) { return getImplementationName_static(); } //------------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL DefaultFormComponentInspectorModel::getSupportedServiceNames( ) throw(RuntimeException) + Sequence< OUString > SAL_CALL DefaultFormComponentInspectorModel::getSupportedServiceNames( ) throw(RuntimeException) { return getSupportedServiceNames_static(); } //------------------------------------------------------------------------ - ::rtl::OUString DefaultFormComponentInspectorModel::getImplementationName_static( ) throw(RuntimeException) + OUString DefaultFormComponentInspectorModel::getImplementationName_static( ) throw(RuntimeException) { - return ::rtl::OUString("org.openoffice.comp.extensions.DefaultFormComponentInspectorModel"); + return OUString("org.openoffice.comp.extensions.DefaultFormComponentInspectorModel"); } //------------------------------------------------------------------------ - Sequence< ::rtl::OUString > DefaultFormComponentInspectorModel::getSupportedServiceNames_static( ) throw(RuntimeException) + Sequence< OUString > DefaultFormComponentInspectorModel::getSupportedServiceNames_static( ) throw(RuntimeException) { - Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString("com.sun.star.form.inspection.DefaultFormComponentInspectorModel"); + Sequence< OUString > aSupported(1); + aSupported[0] = OUString("com.sun.star.form.inspection.DefaultFormComponentInspectorModel"); return aSupported; } @@ -152,7 +152,7 @@ namespace pcr { if ( aFactories[i].isFormOnly && !m_bUseFormComponentHandlers ) continue; - *pReturn++ <<= ::rtl::OUString::createFromAscii( aFactories[i].serviceName ); + *pReturn++ <<= OUString::createFromAscii( aFactories[i].serviceName ); } aReturn.realloc( pReturn - aReturn.getArray() ); @@ -180,7 +180,7 @@ namespace pcr PropertyCategoryDescriptor* pReturn = aReturn.getArray(); for ( sal_Int32 i=0; i<nCategories; ++i, ++pReturn ) { - pReturn->ProgrammaticName = ::rtl::OUString::createFromAscii( aCategories[i].programmaticName ); + pReturn->ProgrammaticName = OUString::createFromAscii( aCategories[i].programmaticName ); pReturn->UIName = String( PcrRes( aCategories[i].uiNameResId ) ); pReturn->HelpURL = HelpIdUrl::getHelpURL( aCategories[i].helpId ); } @@ -189,7 +189,7 @@ namespace pcr } //-------------------------------------------------------------------- - ::sal_Int32 SAL_CALL DefaultFormComponentInspectorModel::getPropertyOrderIndex( const ::rtl::OUString& _rPropertyName ) throw (RuntimeException) + ::sal_Int32 SAL_CALL DefaultFormComponentInspectorModel::getPropertyOrderIndex( const OUString& _rPropertyName ) throw (RuntimeException) { sal_Int32 nPropertyId( m_pInfoService->getPropertyId( _rPropertyName ) ); if ( nPropertyId == -1 ) @@ -221,12 +221,12 @@ namespace pcr if ( arguments.size() == 2 ) { // constructor: "createWithHelpSection( long, long )" if ( !( arguments[0] >>= nMinHelpTextLines ) || !( arguments[1] >>= nMaxHelpTextLines ) ) - throw IllegalArgumentException( ::rtl::OUString(), *this, 0 ); + throw IllegalArgumentException( OUString(), *this, 0 ); createWithHelpSection( nMinHelpTextLines, nMaxHelpTextLines ); return; } - throw IllegalArgumentException( ::rtl::OUString(), *this, 0 ); + throw IllegalArgumentException( OUString(), *this, 0 ); } //-------------------------------------------------------------------- @@ -239,7 +239,7 @@ namespace pcr void DefaultFormComponentInspectorModel::createWithHelpSection( sal_Int32 _nMinHelpTextLines, sal_Int32 _nMaxHelpTextLines ) { if ( ( _nMinHelpTextLines <= 0 ) || ( _nMaxHelpTextLines <= 0 ) || ( _nMinHelpTextLines > _nMaxHelpTextLines ) ) - throw IllegalArgumentException( ::rtl::OUString(), *this, 0 ); + throw IllegalArgumentException( OUString(), *this, 0 ); enableHelpSectionProperties( _nMinHelpTextLines, _nMaxHelpTextLines ); m_bConstructed = true; diff --git a/extensions/source/propctrlr/defaultforminspection.hxx b/extensions/source/propctrlr/defaultforminspection.hxx index a4075dc2aea6..543de989a440 100644 --- a/extensions/source/propctrlr/defaultforminspection.hxx +++ b/extensions/source/propctrlr/defaultforminspection.hxx @@ -47,21 +47,21 @@ namespace pcr ~DefaultFormComponentInspectorModel(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // XObjectInspectorModel virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getHandlerFactories() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::inspection::PropertyCategoryDescriptor > SAL_CALL describeCategories( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Int32 SAL_CALL getPropertyOrderIndex( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL getPropertyOrderIndex( const OUString& PropertyName ) throw (::com::sun::star::uno::RuntimeException); // XInitialization virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); public: // XServiceInfo - static versions - static ::rtl::OUString getImplementationName_static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static( ) throw(::com::sun::star::uno::RuntimeException); + static OUString getImplementationName_static( ) throw(::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static( ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); diff --git a/extensions/source/propctrlr/defaulthelpprovider.cxx b/extensions/source/propctrlr/defaulthelpprovider.cxx index 6eadb114baa5..695159f15667 100644 --- a/extensions/source/propctrlr/defaulthelpprovider.cxx +++ b/extensions/source/propctrlr/defaulthelpprovider.cxx @@ -73,16 +73,16 @@ namespace pcr } //------------------------------------------------------------------------ - ::rtl::OUString DefaultHelpProvider::getImplementationName_static( ) throw(RuntimeException) + OUString DefaultHelpProvider::getImplementationName_static( ) throw(RuntimeException) { - return ::rtl::OUString("org.openoffice.comp.extensions.DefaultHelpProvider"); + return OUString("org.openoffice.comp.extensions.DefaultHelpProvider"); } //------------------------------------------------------------------------ - Sequence< ::rtl::OUString > DefaultHelpProvider::getSupportedServiceNames_static( ) throw(RuntimeException) + Sequence< OUString > DefaultHelpProvider::getSupportedServiceNames_static( ) throw(RuntimeException) { - Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString("com.sun.star.inspection.DefaultHelpProvider"); + Sequence< OUString > aSupported(1); + aSupported[0] = OUString("com.sun.star.inspection.DefaultHelpProvider"); return aSupported; } @@ -96,7 +96,7 @@ namespace pcr void SAL_CALL DefaultHelpProvider::focusGained( const Reference< XPropertyControl >& _Control ) throw (RuntimeException) { if ( !m_xInspectorUI.is() ) - throw RuntimeException( ::rtl::OUString(), *this ); + throw RuntimeException( OUString(), *this ); try { @@ -128,14 +128,14 @@ namespace pcr return; } - throw IllegalArgumentException( ::rtl::OUString(), *this, 0 ); + throw IllegalArgumentException( OUString(), *this, 0 ); } //-------------------------------------------------------------------- void DefaultHelpProvider::create( const Reference< XObjectInspectorUI >& _rxUI ) { if ( !_rxUI.is() ) - throw IllegalArgumentException( ::rtl::OUString(), *this, 1 ); + throw IllegalArgumentException( OUString(), *this, 1 ); try { @@ -172,9 +172,9 @@ namespace pcr } //-------------------------------------------------------------------- - ::rtl::OUString DefaultHelpProvider::impl_getHelpText_nothrow( const Reference< XPropertyControl >& _rxControl ) + OUString DefaultHelpProvider::impl_getHelpText_nothrow( const Reference< XPropertyControl >& _rxControl ) { - ::rtl::OUString sHelpText; + OUString sHelpText; OSL_PRECOND( _rxControl.is(), "DefaultHelpProvider::impl_getHelpText_nothrow: illegal control!" ); if ( !_rxControl.is() ) return sHelpText; diff --git a/extensions/source/propctrlr/defaulthelpprovider.hxx b/extensions/source/propctrlr/defaulthelpprovider.hxx index cf0444c58740..3d8ee8060d63 100644 --- a/extensions/source/propctrlr/defaulthelpprovider.hxx +++ b/extensions/source/propctrlr/defaulthelpprovider.hxx @@ -52,8 +52,8 @@ namespace pcr DefaultHelpProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext ); // XServiceInfo - static versions - static ::rtl::OUString getImplementationName_static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static( ) throw(::com::sun::star::uno::RuntimeException); + static OUString getImplementationName_static( ) throw(::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static( ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); @@ -73,7 +73,7 @@ namespace pcr private: Window* impl_getVclControlWindow_nothrow( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >& _rxControl ); - ::rtl::OUString impl_getHelpText_nothrow( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >& _rxControl ); + OUString impl_getHelpText_nothrow( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >& _rxControl ); }; //........................................................................ diff --git a/extensions/source/propctrlr/editpropertyhandler.cxx b/extensions/source/propctrlr/editpropertyhandler.cxx index f31ca74a7c0a..bca96ac2dc3a 100644 --- a/extensions/source/propctrlr/editpropertyhandler.cxx +++ b/extensions/source/propctrlr/editpropertyhandler.cxx @@ -64,21 +64,21 @@ namespace pcr } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL EditPropertyHandler::getImplementationName_static( ) throw (RuntimeException) + OUString SAL_CALL EditPropertyHandler::getImplementationName_static( ) throw (RuntimeException) { - return ::rtl::OUString( "com.sun.star.comp.extensions.EditPropertyHandler" ); + return OUString( "com.sun.star.comp.extensions.EditPropertyHandler" ); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL EditPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL EditPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSupported( 1 ); - aSupported[0] = ::rtl::OUString( "com.sun.star.form.inspection.EditPropertyHandler" ); + Sequence< OUString > aSupported( 1 ); + aSupported[0] = OUString( "com.sun.star.form.inspection.EditPropertyHandler" ); return aSupported; } //-------------------------------------------------------------------- - Any SAL_CALL EditPropertyHandler::getPropertyValue( const ::rtl::OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL EditPropertyHandler::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throw( _rPropertyName ) ); @@ -134,7 +134,7 @@ namespace pcr } //-------------------------------------------------------------------- - void SAL_CALL EditPropertyHandler::setPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) + void SAL_CALL EditPropertyHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throw( _rPropertyName ) ); @@ -229,38 +229,38 @@ namespace pcr } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL EditPropertyHandler::getSupersededProperties( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL EditPropertyHandler::getSupersededProperties( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - ::std::vector< ::rtl::OUString > aSuperseded; + ::std::vector< OUString > aSuperseded; if ( implHaveBothScrollBarProperties() ) { - aSuperseded.push_back( static_cast<const rtl::OUString&>(PROPERTY_HSCROLL) ); - aSuperseded.push_back( static_cast<const rtl::OUString&>(PROPERTY_VSCROLL) ); + aSuperseded.push_back( static_cast<const OUString&>(PROPERTY_HSCROLL) ); + aSuperseded.push_back( static_cast<const OUString&>(PROPERTY_VSCROLL) ); } if ( implHaveTextTypeProperty() ) { - aSuperseded.push_back( static_cast<const rtl::OUString&>(PROPERTY_RICHTEXT) ); - aSuperseded.push_back( static_cast<const rtl::OUString&>(PROPERTY_MULTILINE) ); + aSuperseded.push_back( static_cast<const OUString&>(PROPERTY_RICHTEXT) ); + aSuperseded.push_back( static_cast<const OUString&>(PROPERTY_MULTILINE) ); } if ( aSuperseded.empty() ) - return Sequence< ::rtl::OUString >(); - return Sequence< ::rtl::OUString >( &(*aSuperseded.begin()), aSuperseded.size() ); + return Sequence< OUString >(); + return Sequence< OUString >( &(*aSuperseded.begin()), aSuperseded.size() ); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL EditPropertyHandler::getActuatingProperties( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL EditPropertyHandler::getActuatingProperties( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - ::std::vector< ::rtl::OUString > aInterestingActuatingProps; + ::std::vector< OUString > aInterestingActuatingProps; if ( implHaveTextTypeProperty() ) - aInterestingActuatingProps.push_back( static_cast<const rtl::OUString&>(PROPERTY_TEXTTYPE) ); - aInterestingActuatingProps.push_back( static_cast<const rtl::OUString&>(PROPERTY_MULTILINE) ); - return Sequence< ::rtl::OUString >( &(*aInterestingActuatingProps.begin()), aInterestingActuatingProps.size() ); + aInterestingActuatingProps.push_back( static_cast<const OUString&>(PROPERTY_TEXTTYPE) ); + aInterestingActuatingProps.push_back( static_cast<const OUString&>(PROPERTY_MULTILINE) ); + return Sequence< OUString >( &(*aInterestingActuatingProps.begin()), aInterestingActuatingProps.size() ); } //-------------------------------------------------------------------- - void SAL_CALL EditPropertyHandler::actuatingPropertyChanged( const ::rtl::OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (NullPointerException, RuntimeException) + void SAL_CALL EditPropertyHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (NullPointerException, RuntimeException) { if ( !_rxInspectorUI.is() ) throw NullPointerException(); @@ -285,7 +285,7 @@ namespace pcr _rxInspectorUI->enablePropertyUI( PROPERTY_LINEEND_FORMAT, nTextType != TEXTTYPE_SINGLELINE ); _rxInspectorUI->enablePropertyUI( PROPERTY_VERTICAL_ALIGN, nTextType == TEXTTYPE_SINGLELINE ); - _rxInspectorUI->showCategory( ::rtl::OUString( "Data" ), nTextType != TEXTTYPE_RICHTEXT ); + _rxInspectorUI->showCategory( OUString( "Data" ), nTextType != TEXTTYPE_RICHTEXT ); } break; diff --git a/extensions/source/propctrlr/editpropertyhandler.hxx b/extensions/source/propctrlr/editpropertyhandler.hxx index 803f1ca6d668..62d13b4ad231 100644 --- a/extensions/source/propctrlr/editpropertyhandler.hxx +++ b/extensions/source/propctrlr/editpropertyhandler.hxx @@ -41,19 +41,19 @@ namespace pcr const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext ); - static ::rtl::OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); + static OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); protected: ~EditPropertyHandler(); protected: // XPropertyHandler overriables - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupersededProperties( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getActuatingProperties( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL actuatingPropertyChanged( const ::rtl::OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupersededProperties( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getActuatingProperties( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); // PropertyHandler overridables virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > diff --git a/extensions/source/propctrlr/eformshelper.cxx b/extensions/source/propctrlr/eformshelper.cxx index 0306c7fdb87c..daae33437f13 100644 --- a/extensions/source/propctrlr/eformshelper.cxx +++ b/extensions/source/propctrlr/eformshelper.cxx @@ -56,9 +56,9 @@ namespace pcr namespace { //-------------------------------------------------------------------- - ::rtl::OUString composeModelElementUIName( const ::rtl::OUString& _rModelName, const ::rtl::OUString& _rElementName ) + OUString composeModelElementUIName( const OUString& _rModelName, const OUString& _rElementName ) { - ::rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; aBuffer.appendAscii( "[" ); aBuffer.append( _rModelName ); aBuffer.appendAscii( "] " ); @@ -222,11 +222,11 @@ namespace pcr if ( _bDoListening ) { - xBindingProps->addPropertyChangeListener( ::rtl::OUString(), _rxListener ); + xBindingProps->addPropertyChangeListener( OUString(), _rxListener ); } else { - xBindingProps->removePropertyChangeListener( ::rtl::OUString(), _rxListener ); + xBindingProps->removePropertyChangeListener( OUString(), _rxListener ); } } @@ -298,7 +298,7 @@ namespace pcr } //-------------------------------------------------------------------- - void EFormsHelper::getFormModelNames( ::std::vector< ::rtl::OUString >& /* [out] */ _rModelNames ) const SAL_THROW(()) + void EFormsHelper::getFormModelNames( ::std::vector< OUString >& /* [out] */ _rModelNames ) const SAL_THROW(()) { if ( m_xDocument.is() ) { @@ -310,7 +310,7 @@ namespace pcr OSL_ENSURE( xForms.is(), "EFormsHelper::getFormModelNames: invalid forms container!" ); if ( xForms.is() ) { - Sequence< ::rtl::OUString > aModelNames = xForms->getElementNames(); + Sequence< OUString > aModelNames = xForms->getElementNames(); _rModelNames.resize( aModelNames.getLength() ); ::std::copy( aModelNames.getConstArray(), aModelNames.getConstArray() + aModelNames.getLength(), _rModelNames.begin() @@ -325,7 +325,7 @@ namespace pcr } //-------------------------------------------------------------------- - void EFormsHelper::getBindingNames( const ::rtl::OUString& _rModelName, ::std::vector< ::rtl::OUString >& /* [out] */ _rBindingNames ) const SAL_THROW(()) + void EFormsHelper::getBindingNames( const OUString& _rModelName, ::std::vector< OUString >& /* [out] */ _rBindingNames ) const SAL_THROW(()) { _rBindingNames.resize( 0 ); try @@ -337,7 +337,7 @@ namespace pcr OSL_ENSURE( xBindings.is(), "EFormsHelper::getBindingNames: invalid bindings container obtained from the model!" ); if ( xBindings.is() ) { - Sequence< ::rtl::OUString > aNames = xBindings->getElementNames(); + Sequence< OUString > aNames = xBindings->getElementNames(); _rBindingNames.resize( aNames.getLength() ); ::std::copy( aNames.getConstArray(), aNames.getConstArray() + aNames.getLength(), _rBindingNames.begin() ); } @@ -350,7 +350,7 @@ namespace pcr } //-------------------------------------------------------------------- - Reference< xforms::XModel > EFormsHelper::getFormModelByName( const ::rtl::OUString& _rModelName ) const SAL_THROW(()) + Reference< xforms::XModel > EFormsHelper::getFormModelByName( const OUString& _rModelName ) const SAL_THROW(()) { Reference< xforms::XModel > xReturn; try @@ -387,9 +387,9 @@ namespace pcr } //-------------------------------------------------------------------- - ::rtl::OUString EFormsHelper::getCurrentFormModelName() const SAL_THROW(()) + OUString EFormsHelper::getCurrentFormModelName() const SAL_THROW(()) { - ::rtl::OUString sModelName; + OUString sModelName; try { Reference< xforms::XModel > xFormsModel( getCurrentFormModel() ); @@ -422,9 +422,9 @@ namespace pcr } //-------------------------------------------------------------------- - ::rtl::OUString EFormsHelper::getCurrentBindingName() const SAL_THROW(()) + OUString EFormsHelper::getCurrentBindingName() const SAL_THROW(()) { - ::rtl::OUString sBindingName; + OUString sBindingName; try { Reference< XPropertySet > xBinding( getCurrentBinding() ); @@ -489,7 +489,7 @@ namespace pcr m_xBindableControl->setValueBinding( xBinding ); impl_toggleBindingPropertyListening_throw( true, NULL ); - ::std::set< ::rtl::OUString > aSet; + ::std::set< OUString > aSet; firePropertyChanges( xOldBinding, _rxBinding, aSet ); } catch( const Exception& ) @@ -499,25 +499,25 @@ namespace pcr } //-------------------------------------------------------------------- - Reference< XPropertySet > EFormsHelper::getOrCreateBindingForModel( const ::rtl::OUString& _rTargetModel, const ::rtl::OUString& _rBindingName ) const SAL_THROW(()) + Reference< XPropertySet > EFormsHelper::getOrCreateBindingForModel( const OUString& _rTargetModel, const OUString& _rBindingName ) const SAL_THROW(()) { OSL_ENSURE( !_rBindingName.isEmpty(), "EFormsHelper::getOrCreateBindingForModel: invalid binding name!" ); return implGetOrCreateBinding( _rTargetModel, _rBindingName ); } //-------------------------------------------------------------------- - Reference< XPropertySet > EFormsHelper::implGetOrCreateBinding( const ::rtl::OUString& _rTargetModel, const ::rtl::OUString& _rBindingName ) const SAL_THROW(()) + Reference< XPropertySet > EFormsHelper::implGetOrCreateBinding( const OUString& _rTargetModel, const OUString& _rBindingName ) const SAL_THROW(()) { OSL_ENSURE( !( _rTargetModel.isEmpty() && !_rBindingName.isEmpty() ), "EFormsHelper::implGetOrCreateBinding: no model, but a binding name?" ); Reference< XPropertySet > xBinding; try { - ::rtl::OUString sTargetModel( _rTargetModel ); + OUString sTargetModel( _rTargetModel ); // determine the model which the binding should belong to if ( sTargetModel.isEmpty() ) { - ::std::vector< ::rtl::OUString > aModelNames; + ::std::vector< OUString > aModelNames; getFormModelNames( aModelNames ); if ( !aModelNames.empty() ) sTargetModel = *aModelNames.begin(); @@ -549,12 +549,12 @@ namespace pcr { // find a nice name for it String sBaseName( PcrRes( RID_STR_BINDING_UI_NAME ) ); - sBaseName += rtl::OUString(" "); + sBaseName += OUString(" "); String sNewName; sal_Int32 nNumber = 1; do { - sNewName = sBaseName + ::rtl::OUString::valueOf( nNumber++ ); + sNewName = sBaseName + OUString::valueOf( nNumber++ ); } while ( xBindingNames->hasByName( sNewName ) ); Reference< XNamed > xName( xBinding, UNO_QUERY_THROW ); @@ -609,9 +609,9 @@ namespace pcr } //-------------------------------------------------------------------- - ::rtl::OUString EFormsHelper::getModelElementUIName( const EFormsHelper::ModelElementType _eType, const Reference< XPropertySet >& _rxElement ) const SAL_THROW(()) + OUString EFormsHelper::getModelElementUIName( const EFormsHelper::ModelElementType _eType, const Reference< XPropertySet >& _rxElement ) const SAL_THROW(()) { - ::rtl::OUString sUIName; + OUString sUIName; try { // determine the model which the element belongs to @@ -621,7 +621,7 @@ namespace pcr OSL_ENSURE( xHelper.is(), "EFormsHelper::getModelElementUIName: invalid element or model!" ); if ( xHelper.is() ) { - ::rtl::OUString sElementName = ( _eType == Submission ) ? xHelper->getSubmissionName( _rxElement, sal_True ) : xHelper->getBindingName( _rxElement, sal_True ); + OUString sElementName = ( _eType == Submission ) ? xHelper->getSubmissionName( _rxElement, sal_True ) : xHelper->getBindingName( _rxElement, sal_True ); Reference< xforms::XModel > xModel( xHelper, UNO_QUERY_THROW ); sUIName = composeModelElementUIName( xModel->getID(), sElementName ); } @@ -635,7 +635,7 @@ namespace pcr } //-------------------------------------------------------------------- - Reference< XPropertySet > EFormsHelper::getModelElementFromUIName( const EFormsHelper::ModelElementType _eType, const ::rtl::OUString& _rUIName ) const SAL_THROW(()) + Reference< XPropertySet > EFormsHelper::getModelElementFromUIName( const EFormsHelper::ModelElementType _eType, const OUString& _rUIName ) const SAL_THROW(()) { const MapStringToPropertySet& rMapUINameToElement( ( _eType == Submission ) ? m_aSubmissionUINames : m_aBindingUINames ); MapStringToPropertySet::const_iterator pos = rMapUINameToElement.find( _rUIName ); @@ -645,24 +645,24 @@ namespace pcr } //-------------------------------------------------------------------- - void EFormsHelper::getAllElementUINames( const ModelElementType _eType, ::std::vector< ::rtl::OUString >& /* [out] */ _rElementNames, bool _bPrepentEmptyEntry ) + void EFormsHelper::getAllElementUINames( const ModelElementType _eType, ::std::vector< OUString >& /* [out] */ _rElementNames, bool _bPrepentEmptyEntry ) { MapStringToPropertySet& rMapUINameToElement( ( _eType == Submission ) ? m_aSubmissionUINames : m_aBindingUINames ); rMapUINameToElement.clear(); _rElementNames.resize( 0 ); if ( _bPrepentEmptyEntry ) - rMapUINameToElement[ ::rtl::OUString() ] = Reference< XPropertySet >(); + rMapUINameToElement[ OUString() ] = Reference< XPropertySet >(); try { // obtain the model names - ::std::vector< ::rtl::OUString > aModels; + ::std::vector< OUString > aModels; getFormModelNames( aModels ); _rElementNames.reserve( aModels.size() * 2 ); // heuristics // for every model, obtain the element - for ( ::std::vector< ::rtl::OUString >::const_iterator pModelName = aModels.begin(); + for ( ::std::vector< OUString >::const_iterator pModelName = aModels.begin(); pModelName != aModels.end(); ++pModelName ) @@ -693,8 +693,8 @@ namespace pcr xElement->setPropertyValue( PROPERTY_MODEL, makeAny( xModel ) ); } #endif - ::rtl::OUString sElementName = ( _eType == Submission ) ? xHelper->getSubmissionName( xElement, sal_True ) : xHelper->getBindingName( xElement, sal_True ); - ::rtl::OUString sUIName = composeModelElementUIName( *pModelName, sElementName ); + OUString sElementName = ( _eType == Submission ) ? xHelper->getSubmissionName( xElement, sal_True ) : xHelper->getBindingName( xElement, sal_True ); + OUString sUIName = composeModelElementUIName( *pModelName, sElementName ); OSL_ENSURE( rMapUINameToElement.find( sUIName ) == rMapUINameToElement.end(), "EFormsHelper::getAllElementUINames: duplicate name!" ); rMapUINameToElement.insert( MapStringToPropertySet::value_type( sUIName, xElement ) ); @@ -711,7 +711,7 @@ namespace pcr } //-------------------------------------------------------------------- - void EFormsHelper::firePropertyChange( const ::rtl::OUString& _rName, const Any& _rOldValue, const Any& _rNewValue ) const + void EFormsHelper::firePropertyChange( const OUString& _rName, const Any& _rOldValue, const Any& _rNewValue ) const { if ( m_aPropertyListeners.empty() ) return; @@ -737,7 +737,7 @@ namespace pcr } //-------------------------------------------------------------------- - void EFormsHelper::firePropertyChanges( const Reference< XPropertySet >& _rxOldProps, const Reference< XPropertySet >& _rxNewProps, ::std::set< ::rtl::OUString >& _rFilter ) const + void EFormsHelper::firePropertyChanges( const Reference< XPropertySet >& _rxOldProps, const Reference< XPropertySet >& _rxNewProps, ::std::set< OUString >& _rFilter ) const { if ( m_aPropertyListeners.empty() ) return; diff --git a/extensions/source/propctrlr/eformshelper.hxx b/extensions/source/propctrlr/eformshelper.hxx index d4ba742fc817..4c7cab782d77 100644 --- a/extensions/source/propctrlr/eformshelper.hxx +++ b/extensions/source/propctrlr/eformshelper.hxx @@ -41,7 +41,7 @@ namespace pcr { //........................................................................ - typedef ::std::map< ::rtl::OUString, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >, ::std::less< ::rtl::OUString > > + typedef ::std::map< OUString, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >, ::std::less< OUString > > MapStringToPropertySet; //==================================================================== @@ -117,16 +117,16 @@ namespace pcr /** retrieves the names of all XForms models in the document the control lives in */ - void getFormModelNames( ::std::vector< ::rtl::OUString >& /* [out] */ _rModelNames ) const SAL_THROW(()); + void getFormModelNames( ::std::vector< OUString >& /* [out] */ _rModelNames ) const SAL_THROW(()); /** retrieves the names of all bindings for a given model @see getFormModelNames */ - void getBindingNames( const ::rtl::OUString& _rModelName, ::std::vector< ::rtl::OUString >& /* [out] */ _rBindingNames ) const SAL_THROW(()); + void getBindingNames( const OUString& _rModelName, ::std::vector< OUString >& /* [out] */ _rBindingNames ) const SAL_THROW(()); /// retrieves the XForms model (within the control model's document) with the given name ::com::sun::star::uno::Reference< ::com::sun::star::xforms::XModel > - getFormModelByName( const ::rtl::OUString& _rModelName ) const SAL_THROW(()); + getFormModelByName( const OUString& _rModelName ) const SAL_THROW(()); /** retrieves the model which the active binding of the control model belongs to */ @@ -135,7 +135,7 @@ namespace pcr /** retrieves the name of the model which the active binding of the control model belongs to */ - ::rtl::OUString + OUString getCurrentFormModelName() const SAL_THROW(()); /** retrieves the binding instance which is currently attached to the control model @@ -145,7 +145,7 @@ namespace pcr /** retrieves the name of the binding instance which is currently attached to the control model */ - ::rtl::OUString + OUString getCurrentBindingName() const SAL_THROW(()); /** sets a new binding at the control model @@ -172,7 +172,7 @@ namespace pcr have a binding with this name, a new binding is created and returned. */ ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > - getOrCreateBindingForModel( const ::rtl::OUString& _rTargetModel, const ::rtl::OUString& _rBindingName ) const SAL_THROW(()); + getOrCreateBindingForModel( const OUString& _rTargetModel, const OUString& _rBindingName ) const SAL_THROW(()); /** types of sub-elements of a model */ @@ -186,7 +186,7 @@ namespace pcr @see getModelElementFromUIName @see getAllElementUINames */ - ::rtl::OUString + OUString getModelElementUIName( const ModelElementType _eType, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxElement @@ -202,7 +202,7 @@ namespace pcr ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getModelElementFromUIName( const ModelElementType _eType, - const ::rtl::OUString& _rUIName + const OUString& _rUIName ) const SAL_THROW(()); /** retrieves the UI names of all elements of all models in our document @@ -215,7 +215,7 @@ namespace pcr */ void getAllElementUINames( const ModelElementType _eType, - ::std::vector< ::rtl::OUString >& /* [out] */ _rElementNames, + ::std::vector< OUString >& /* [out] */ _rElementNames, bool _bPrepentEmptyEntry ); @@ -223,14 +223,14 @@ namespace pcr void firePropertyChanges( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxOldProps, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxNewProps, - ::std::set< ::rtl::OUString >& _rFilter + ::std::set< OUString >& _rFilter ) const; /** fires a change in a single property, if the property value changed, and if we have a listener interested in property changes */ void firePropertyChange( - const ::rtl::OUString& _rName, + const OUString& _rName, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Any& _rNewValue ) const; @@ -240,7 +240,7 @@ namespace pcr /// implementation for both <member>getOrCreateBindingForModel</member> ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > - implGetOrCreateBinding( const ::rtl::OUString& _rTargetModel, const ::rtl::OUString& _rBindingName ) const SAL_THROW(()); + implGetOrCreateBinding( const OUString& _rTargetModel, const OUString& _rBindingName ) const SAL_THROW(()); void impl_toggleBindingPropertyListening_throw( bool _bDoListen, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxConcreteListenerOrNull ); diff --git a/extensions/source/propctrlr/eformspropertyhandler.cxx b/extensions/source/propctrlr/eformspropertyhandler.cxx index 848f6f52c47e..063735450d2b 100644 --- a/extensions/source/propctrlr/eformspropertyhandler.cxx +++ b/extensions/source/propctrlr/eformspropertyhandler.cxx @@ -72,30 +72,30 @@ namespace pcr } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL EFormsPropertyHandler::getImplementationName_static( ) throw (RuntimeException) + OUString SAL_CALL EFormsPropertyHandler::getImplementationName_static( ) throw (RuntimeException) { - return ::rtl::OUString( "com.sun.star.comp.extensions.EFormsPropertyHandler" ); + return OUString( "com.sun.star.comp.extensions.EFormsPropertyHandler" ); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL EFormsPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL EFormsPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSupported( 1 ); - aSupported[0] = ::rtl::OUString( "com.sun.star.form.inspection.XMLFormsPropertyHandler" ); + Sequence< OUString > aSupported( 1 ); + aSupported[0] = OUString( "com.sun.star.form.inspection.XMLFormsPropertyHandler" ); return aSupported; } //-------------------------------------------------------------------- - ::rtl::OUString EFormsPropertyHandler::getModelNamePropertyValue() const + OUString EFormsPropertyHandler::getModelNamePropertyValue() const { - ::rtl::OUString sModelName = m_pHelper->getCurrentFormModelName(); + OUString sModelName = m_pHelper->getCurrentFormModelName(); if ( sModelName.isEmpty() ) sModelName = m_sBindingLessModelName; return sModelName; } //-------------------------------------------------------------------- - Any SAL_CALL EFormsPropertyHandler::getPropertyValue( const ::rtl::OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL EFormsPropertyHandler::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throw( _rPropertyName ) ); @@ -131,11 +131,11 @@ namespace pcr if ( xBindingProps.is() ) { aReturn = xBindingProps->getPropertyValue( _rPropertyName ); - DBG_ASSERT( aReturn.getValueType().equals( ::getCppuType( static_cast< ::rtl::OUString* >( NULL ) ) ), + DBG_ASSERT( aReturn.getValueType().equals( ::getCppuType( static_cast< OUString* >( NULL ) ) ), "EFormsPropertyHandler::getPropertyValue: invalid BindingExpression value type!" ); } else - aReturn <<= ::rtl::OUString(); + aReturn <<= OUString(); } break; @@ -147,9 +147,9 @@ namespace pcr catch( const Exception& ) { #if OSL_DEBUG_LEVEL > 0 - ::rtl::OString sMessage( "EFormsPropertyHandler::getPropertyValue: caught an exception!" ); + OString sMessage( "EFormsPropertyHandler::getPropertyValue: caught an exception!" ); sMessage += "\n(have been asked for the \""; - sMessage += ::rtl::OString( _rPropertyName.getStr(), _rPropertyName.getLength(), RTL_TEXTENCODING_ASCII_US ); + sMessage += OString( _rPropertyName.getStr(), _rPropertyName.getLength(), RTL_TEXTENCODING_ASCII_US ); sMessage += "\" property.)"; OSL_FAIL( sMessage.getStr() ); #endif @@ -158,7 +158,7 @@ namespace pcr } //-------------------------------------------------------------------- - void SAL_CALL EFormsPropertyHandler::setPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) + void SAL_CALL EFormsPropertyHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throw( _rPropertyName ) ); @@ -187,17 +187,17 @@ namespace pcr // if the model changed, reset the binding to NULL if ( m_pHelper->getCurrentFormModelName() != m_sBindingLessModelName ) { - ::rtl::OUString sOldBindingName = m_pHelper->getCurrentBindingName(); + OUString sOldBindingName = m_pHelper->getCurrentBindingName(); m_pHelper->setBinding( NULL ); firePropertyChange( PROPERTY_BINDING_NAME, PROPERTY_ID_BINDING_NAME, - makeAny( sOldBindingName ), makeAny( ::rtl::OUString() ) ); + makeAny( sOldBindingName ), makeAny( OUString() ) ); } } break; case PROPERTY_ID_BINDING_NAME: { - ::rtl::OUString sNewBindingName; + OUString sNewBindingName; OSL_VERIFY( _rValue >>= sNewBindingName ); bool bPreviouslyEmptyModel = !m_pHelper->getCurrentFormModel().is(); @@ -223,7 +223,7 @@ namespace pcr // However, there's no such mechanism in place currently. m_bSimulatingModelChange = true; firePropertyChange( PROPERTY_XML_DATA_MODEL, PROPERTY_ID_XML_DATA_MODEL, - makeAny( ::rtl::OUString() ), makeAny( getModelNamePropertyValue() ) ); + makeAny( OUString() ), makeAny( getModelNamePropertyValue() ) ); m_bSimulatingModelChange = false; } } @@ -248,7 +248,7 @@ namespace pcr DBG_ASSERT( xBindingProps.is(), "EFormsPropertyHandler::setPropertyValue: how can I set a property if there's no binding?" ); if ( xBindingProps.is() ) { - DBG_ASSERT( _rValue.getValueType().equals( ::getCppuType( static_cast< ::rtl::OUString* >( NULL ) ) ), + DBG_ASSERT( _rValue.getValueType().equals( ::getCppuType( static_cast< OUString* >( NULL ) ) ), "EFormsPropertyHandler::setPropertyValue: invalid value type!" ); xBindingProps->setPropertyValue( _rPropertyName, _rValue ); } @@ -316,7 +316,7 @@ namespace pcr } //-------------------------------------------------------------------- - Any SAL_CALL EFormsPropertyHandler::convertToPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL EFormsPropertyHandler::convertToPropertyValue( const OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); Any aReturn; @@ -327,7 +327,7 @@ namespace pcr PropertyId nPropId( m_pInfoService->getPropertyId( _rPropertyName ) ); - ::rtl::OUString sControlValue; + OUString sControlValue; switch ( nPropId ) { case PROPERTY_ID_LIST_BINDING: @@ -349,7 +349,7 @@ namespace pcr } //-------------------------------------------------------------------- - Any SAL_CALL EFormsPropertyHandler::convertToControlValue( const ::rtl::OUString& _rPropertyName, const Any& _rPropertyValue, const Type& _rControlValueType ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL EFormsPropertyHandler::convertToControlValue( const OUString& _rPropertyName, const Any& _rPropertyValue, const Type& _rControlValueType ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); Any aReturn; @@ -382,32 +382,32 @@ namespace pcr } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL EFormsPropertyHandler::getActuatingProperties( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL EFormsPropertyHandler::getActuatingProperties( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_pHelper.get() ) - return Sequence< ::rtl::OUString >(); + return Sequence< OUString >(); - ::std::vector< ::rtl::OUString > aInterestedInActuations( 2 ); + ::std::vector< OUString > aInterestedInActuations( 2 ); aInterestedInActuations[ 0 ] = PROPERTY_XML_DATA_MODEL; aInterestedInActuations[ 1 ] = PROPERTY_BINDING_NAME; - return Sequence< ::rtl::OUString >( &(*aInterestedInActuations.begin()), aInterestedInActuations.size() ); + return Sequence< OUString >( &(*aInterestedInActuations.begin()), aInterestedInActuations.size() ); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL EFormsPropertyHandler::getSupersededProperties( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL EFormsPropertyHandler::getSupersededProperties( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_pHelper.get() ) - return Sequence< ::rtl::OUString >(); + return Sequence< OUString >(); - Sequence< ::rtl::OUString > aReturn( 1 ); + Sequence< OUString > aReturn( 1 ); aReturn[ 0 ] = PROPERTY_INPUT_REQUIRED; return aReturn; } //-------------------------------------------------------------------- - LineDescriptor SAL_CALL EFormsPropertyHandler::describePropertyLine( const ::rtl::OUString& _rPropertyName, + LineDescriptor SAL_CALL EFormsPropertyHandler::describePropertyLine( const OUString& _rPropertyName, const Reference< XPropertyControlFactory >& _rxControlFactory ) throw (UnknownPropertyException, NullPointerException, RuntimeException) { @@ -419,7 +419,7 @@ namespace pcr LineDescriptor aDescriptor; sal_Int16 nControlType = PropertyControlType::TextField; - ::std::vector< ::rtl::OUString > aListEntries; + ::std::vector< OUString > aListEntries; PropertyId nPropId( impl_getPropertyId_throw( _rPropertyName ) ); switch ( nPropId ) { @@ -436,18 +436,18 @@ namespace pcr case PROPERTY_ID_BINDING_NAME: { nControlType = PropertyControlType::ComboBox; - ::rtl::OUString sCurrentModel( getModelNamePropertyValue() ); + OUString sCurrentModel( getModelNamePropertyValue() ); if ( !sCurrentModel.isEmpty() ) m_pHelper->getBindingNames( sCurrentModel, aListEntries ); } break; - case PROPERTY_ID_BIND_EXPRESSION: aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_BIND_EXPRESSION); break; - case PROPERTY_ID_XSD_REQUIRED: aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_XSD_REQUIRED); break; - case PROPERTY_ID_XSD_RELEVANT: aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_XSD_RELEVANT); break; - case PROPERTY_ID_XSD_READONLY: aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_XSD_READONLY); break; - case PROPERTY_ID_XSD_CONSTRAINT: aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_XSD_CONSTRAINT); break; - case PROPERTY_ID_XSD_CALCULATION: aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_XSD_CALCULATION); break; + case PROPERTY_ID_BIND_EXPRESSION: aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_BIND_EXPRESSION); break; + case PROPERTY_ID_XSD_REQUIRED: aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_XSD_REQUIRED); break; + case PROPERTY_ID_XSD_RELEVANT: aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_XSD_RELEVANT); break; + case PROPERTY_ID_XSD_READONLY: aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_XSD_READONLY); break; + case PROPERTY_ID_XSD_CONSTRAINT: aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_XSD_CONSTRAINT); break; + case PROPERTY_ID_XSD_CALCULATION: aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_XSD_CALCULATION); break; default: OSL_FAIL( "EFormsPropertyHandler::describePropertyLine: cannot handle this property!" ); @@ -468,13 +468,13 @@ namespace pcr } aDescriptor.DisplayName = m_pInfoService->getPropertyTranslation( nPropId ); - aDescriptor.Category = ::rtl::OUString( "Data" ); + aDescriptor.Category = OUString( "Data" ); aDescriptor.HelpURL = HelpIdUrl::getHelpURL( m_pInfoService->getPropertyHelpId( nPropId ) ); return aDescriptor; } //-------------------------------------------------------------------- - InteractiveSelectionResult SAL_CALL EFormsPropertyHandler::onInteractivePropertySelection( const ::rtl::OUString& _rPropertyName, sal_Bool /*_bPrimary*/, Any& _rData, const Reference< XObjectInspectorUI >& _rxInspectorUI ) throw (UnknownPropertyException, NullPointerException, RuntimeException) + InteractiveSelectionResult SAL_CALL EFormsPropertyHandler::onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool /*_bPrimary*/, Any& _rData, const Reference< XObjectInspectorUI >& _rxInspectorUI ) throw (UnknownPropertyException, NullPointerException, RuntimeException) { if ( !_rxInspectorUI.is() ) throw NullPointerException(); @@ -505,22 +505,22 @@ namespace pcr // the binding for the dialog to work with Reference< XPropertySet > xBinding( m_pHelper->getCurrentBinding() ); // the aspect of the binding which the dialog should modify - ::rtl::OUString sFacetName( _rPropertyName ); + OUString sFacetName( _rPropertyName ); OSL_ENSURE( xModel.is() && xBinding.is() && !sFacetName.isEmpty(), "EFormsPropertyHandler::onInteractivePropertySelection: something is missing for the dialog initialization!" ); if ( !( xModel.is() && xBinding.is() && !sFacetName.isEmpty() ) ) return InteractiveSelectionResult_Cancelled; - xDialogProps->setPropertyValue( ::rtl::OUString( "FormModel" ), makeAny( xModel ) ); - xDialogProps->setPropertyValue( ::rtl::OUString( "Binding" ), makeAny( xBinding ) ); - xDialogProps->setPropertyValue( ::rtl::OUString( "FacetName" ), makeAny( sFacetName ) ); + xDialogProps->setPropertyValue( OUString( "FormModel" ), makeAny( xModel ) ); + xDialogProps->setPropertyValue( OUString( "Binding" ), makeAny( xBinding ) ); + xDialogProps->setPropertyValue( OUString( "FacetName" ), makeAny( sFacetName ) ); if ( !xDialog->execute() ) // cancelled return InteractiveSelectionResult_Cancelled; - _rData = xDialogProps->getPropertyValue( ::rtl::OUString( "ConditionValue" ) ); + _rData = xDialogProps->getPropertyValue( OUString( "ConditionValue" ) ); return InteractiveSelectionResult_ObtainedValue; } catch( const Exception& ) @@ -551,7 +551,7 @@ namespace pcr } //-------------------------------------------------------------------- - void SAL_CALL EFormsPropertyHandler::actuatingPropertyChanged( const ::rtl::OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (NullPointerException, RuntimeException) + void SAL_CALL EFormsPropertyHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (NullPointerException, RuntimeException) { if ( !_rxInspectorUI.is() ) throw NullPointerException(); @@ -571,7 +571,7 @@ namespace pcr { if ( m_bSimulatingModelChange ) break; - ::rtl::OUString sDataModelName; + OUString sDataModelName; OSL_VERIFY( _rNewValue >>= sDataModelName ); sal_Bool bBoundToSomeModel = !sDataModelName.isEmpty(); _rxInspectorUI->rebuildPropertyUI( PROPERTY_BINDING_NAME ); diff --git a/extensions/source/propctrlr/eformspropertyhandler.hxx b/extensions/source/propctrlr/eformspropertyhandler.hxx index cbad1720c6d9..cbeb8cc3feb5 100644 --- a/extensions/source/propctrlr/eformspropertyhandler.hxx +++ b/extensions/source/propctrlr/eformspropertyhandler.hxx @@ -41,7 +41,7 @@ namespace pcr ::std::auto_ptr< EFormsHelper > m_pHelper; /** current value of the Model property, if there is no binding, yet */ - ::rtl::OUString m_sBindingLessModelName; + OUString m_sBindingLessModelName; /** are we currently simulating a propertyChange event of the Model property? */ bool m_bSimulatingModelChange; @@ -51,27 +51,27 @@ namespace pcr const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext ); - static ::rtl::OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); + static OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); protected: ~EFormsPropertyHandler(); protected: // XPropertyHandler overriables - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getActuatingProperties( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupersededProperties( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::inspection::LineDescriptor - SAL_CALL describePropertyLine( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + SAL_CALL describePropertyLine( const OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::inspection::InteractiveSelectionResult - SAL_CALL onInteractivePropertySelection( const ::rtl::OUString& _rPropertyName, sal_Bool _bPrimary, ::com::sun::star::uno::Any& _rData, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL actuatingPropertyChanged( const ::rtl::OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rControlValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rPropertyValue, const ::com::sun::star::uno::Type& _rControlValueType ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, ::com::sun::star::uno::Any& _rData, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rControlValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rPropertyValue, const ::com::sun::star::uno::Type& _rControlValueType ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException); @@ -86,7 +86,7 @@ namespace pcr An extra method is necessary here, which respects both the value set at our helper, and <member>m_sBindingLessModelName</member> */ - ::rtl::OUString getModelNamePropertyValue() const; + OUString getModelNamePropertyValue() const; }; //........................................................................ diff --git a/extensions/source/propctrlr/enumrepresentation.hxx b/extensions/source/propctrlr/enumrepresentation.hxx index 0834b7888c49..2d8d373af540 100644 --- a/extensions/source/propctrlr/enumrepresentation.hxx +++ b/extensions/source/propctrlr/enumrepresentation.hxx @@ -39,19 +39,19 @@ namespace pcr public: /** retrieves all descriptions of all possible values of the enumeration property */ - virtual ::std::vector< ::rtl::OUString > SAL_CALL getDescriptions( + virtual ::std::vector< OUString > SAL_CALL getDescriptions( ) const = 0; /** converts a given description into a property value */ virtual void SAL_CALL getValueFromDescription( - const ::rtl::OUString& _rDescription, + const OUString& _rDescription, ::com::sun::star::uno::Any& _out_rValue ) const = 0; /** converts a given property value into a description */ - virtual ::rtl::OUString SAL_CALL getDescriptionForValue( + virtual OUString SAL_CALL getDescriptionForValue( const ::com::sun::star::uno::Any& _rEnumValue ) const = 0; diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx index 5422e02aa025..fb058aa74279 100644 --- a/extensions/source/propctrlr/eventhandler.cxx +++ b/extensions/source/propctrlr/eventhandler.cxx @@ -142,14 +142,14 @@ namespace pcr //= EventDescription //==================================================================== EventDescription::EventDescription( EventId _nId, const sal_Char* _pListenerNamespaceAscii, const sal_Char* _pListenerClassAsciiName, - const sal_Char* _pListenerMethodAsciiName, sal_uInt16 _nDisplayNameResId, const rtl::OString& _sHelpId, const rtl::OString& _sUniqueBrowseId ) + const sal_Char* _pListenerMethodAsciiName, sal_uInt16 _nDisplayNameResId, const OString& _sHelpId, const OString& _sUniqueBrowseId ) :sDisplayName( String( PcrRes( _nDisplayNameResId ) ) ) - ,sListenerMethodName( ::rtl::OUString::createFromAscii( _pListenerMethodAsciiName ) ) + ,sListenerMethodName( OUString::createFromAscii( _pListenerMethodAsciiName ) ) ,sHelpId( _sHelpId ) ,sUniqueBrowseId( _sUniqueBrowseId ) ,nId( _nId ) { - ::rtl::OUStringBuffer aQualifiedListenerClass; + OUStringBuffer aQualifiedListenerClass; aQualifiedListenerClass.appendAscii( "com.sun.star." ); aQualifiedListenerClass.appendAscii( _pListenerNamespaceAscii ); aQualifiedListenerClass.appendAscii( "." ); @@ -165,11 +165,11 @@ namespace pcr //.................................................................... #define DESCRIBE_EVENT( asciinamespace, asciilistener, asciimethod, id_postfix ) \ s_aKnownEvents.insert( EventMap::value_type( \ - ::rtl::OUString::createFromAscii( asciimethod ), \ + OUString::createFromAscii( asciimethod ), \ EventDescription( ++nEventId, asciinamespace, asciilistener, asciimethod, RID_STR_EVT_##id_postfix, HID_EVT_##id_postfix, UID_BRWEVT_##id_postfix ) ) ) //.................................................................... - bool lcl_getEventDescriptionForMethod( const ::rtl::OUString& _rMethodName, EventDescription& _out_rDescription ) + bool lcl_getEventDescriptionForMethod( const OUString& _rMethodName, EventDescription& _out_rDescription ) { static EventMap s_aKnownEvents; if ( s_aKnownEvents.empty() ) @@ -224,9 +224,9 @@ namespace pcr } //.................................................................... - ::rtl::OUString lcl_getEventPropertyName( const ::rtl::OUString& _rListenerClassName, const ::rtl::OUString& _rMethodName ) + OUString lcl_getEventPropertyName( const OUString& _rListenerClassName, const OUString& _rMethodName ) { - ::rtl::OUStringBuffer aPropertyName; + OUStringBuffer aPropertyName; aPropertyName.append( _rListenerClassName ); aPropertyName.append( (sal_Unicode)';' ); aPropertyName.append( _rMethodName.getStr() ); @@ -271,10 +271,10 @@ namespace pcr sal_Int32 nPrefixLen = aScriptEvent.ScriptCode.indexOf( ':' ); OSL_ENSURE( nPrefixLen > 0, "lcl_getAssignedScriptEvent: illegal location!" ); - ::rtl::OUString sLocation = aScriptEvent.ScriptCode.copy( 0, nPrefixLen ); - ::rtl::OUString sMacroPath = aScriptEvent.ScriptCode.copy( nPrefixLen + 1 ); + OUString sLocation = aScriptEvent.ScriptCode.copy( 0, nPrefixLen ); + OUString sMacroPath = aScriptEvent.ScriptCode.copy( nPrefixLen + 1 ); - ::rtl::OUStringBuffer aNewStyleSpec; + OUStringBuffer aNewStyleSpec; aNewStyleSpec.appendAscii( "vnd.sun.star.script:" ); aNewStyleSpec.append ( sMacroPath ); aNewStyleSpec.appendAscii( "?language=Basic&location=" ); @@ -283,13 +283,13 @@ namespace pcr aScriptEvent.ScriptCode = aNewStyleSpec.makeStringAndClear(); // also, this new-style spec requires the script code to be "Script" instead of "StarBasic" - aScriptEvent.ScriptType = ::rtl::OUString( "Script" ); + aScriptEvent.ScriptType = OUString( "Script" ); } return aScriptEvent; } //................................................................ - ::rtl::OUString lcl_getQualifiedKnownListenerName( const ScriptEventDescriptor& _rFormComponentEventDescriptor ) + OUString lcl_getQualifiedKnownListenerName( const ScriptEventDescriptor& _rFormComponentEventDescriptor ) { EventDescription aKnownEvent; if ( lcl_getEventDescriptionForMethod( _rFormComponentEventDescriptor.EventMethod, aKnownEvent ) ) @@ -344,7 +344,7 @@ namespace pcr class EventHolder : public EventHolder_Base { private: - typedef ::boost::unordered_map< ::rtl::OUString, ScriptEventDescriptor, ::rtl::OUStringHash > EventMap; + typedef ::boost::unordered_map< OUString, ScriptEventDescriptor, OUStringHash > EventMap; typedef ::std::map< EventId, EventMap::iterator > EventMapIndexAccess; EventMap m_aEventNameAccess; @@ -353,18 +353,18 @@ namespace pcr public: EventHolder( ); - void addEvent( EventId _nId, const ::rtl::OUString& _rEventName, const ScriptEventDescriptor& _rScriptEvent ); + void addEvent( EventId _nId, const OUString& _rEventName, const ScriptEventDescriptor& _rScriptEvent ); /** effectively the same as getByName, but instead of converting the ScriptEventDescriptor to the weird format used by the macro assignment dialog, it is returned directly */ - ScriptEventDescriptor getNormalizedDescriptorByName( const ::rtl::OUString& _rEventName ) const; + ScriptEventDescriptor getNormalizedDescriptorByName( const OUString& _rEventName ) const; // XNameReplace - virtual void SAL_CALL replaceByName( const ::rtl::OUString& _rName, const Any& aElement ) throw (IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException); - virtual Any SAL_CALL getByName( const ::rtl::OUString& _rName ) throw (NoSuchElementException, WrappedTargetException, RuntimeException); - virtual Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (RuntimeException); - virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& _rName ) throw (RuntimeException); + virtual void SAL_CALL replaceByName( const OUString& _rName, const Any& aElement ) throw (IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException); + virtual Any SAL_CALL getByName( const OUString& _rName ) throw (NoSuchElementException, WrappedTargetException, RuntimeException); + virtual Sequence< OUString > SAL_CALL getElementNames( ) throw (RuntimeException); + virtual ::sal_Bool SAL_CALL hasByName( const OUString& _rName ) throw (RuntimeException); virtual Type SAL_CALL getElementType( ) throw (RuntimeException); virtual ::sal_Bool SAL_CALL hasElements( ) throw (RuntimeException); @@ -372,7 +372,7 @@ namespace pcr ~EventHolder( ); private: - ScriptEventDescriptor impl_getDescriptor_throw( const ::rtl::OUString& _rEventName ) const; + ScriptEventDescriptor impl_getDescriptor_throw( const OUString& _rEventName ) const; }; DBG_NAME( EventHolder ) @@ -391,7 +391,7 @@ namespace pcr } //------------------------------------------------------------------------ - void EventHolder::addEvent( EventId _nId, const ::rtl::OUString& _rEventName, const ScriptEventDescriptor& _rScriptEvent ) + void EventHolder::addEvent( EventId _nId, const OUString& _rEventName, const ScriptEventDescriptor& _rScriptEvent ) { ::std::pair< EventMap::iterator, bool > insertionResult = m_aEventNameAccess.insert( EventMap::value_type( _rEventName, _rScriptEvent ) ); @@ -400,56 +400,56 @@ namespace pcr } //------------------------------------------------------------------------ - ScriptEventDescriptor EventHolder::getNormalizedDescriptorByName( const ::rtl::OUString& _rEventName ) const + ScriptEventDescriptor EventHolder::getNormalizedDescriptorByName( const OUString& _rEventName ) const { return impl_getDescriptor_throw( _rEventName ); } //------------------------------------------------------------------------ - ScriptEventDescriptor EventHolder::impl_getDescriptor_throw( const ::rtl::OUString& _rEventName ) const + ScriptEventDescriptor EventHolder::impl_getDescriptor_throw( const OUString& _rEventName ) const { EventMap::const_iterator pos = m_aEventNameAccess.find( _rEventName ); if ( pos == m_aEventNameAccess.end() ) - throw NoSuchElementException( ::rtl::OUString(), *const_cast< EventHolder* >( this ) ); + throw NoSuchElementException( OUString(), *const_cast< EventHolder* >( this ) ); return pos->second; } //------------------------------------------------------------------------ - void SAL_CALL EventHolder::replaceByName( const ::rtl::OUString& _rName, const Any& _rElement ) throw (IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException) + void SAL_CALL EventHolder::replaceByName( const OUString& _rName, const Any& _rElement ) throw (IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException) { EventMap::iterator pos = m_aEventNameAccess.find( _rName ); if ( pos == m_aEventNameAccess.end() ) - throw NoSuchElementException( ::rtl::OUString(), *this ); + throw NoSuchElementException( OUString(), *this ); Sequence< PropertyValue > aScriptDescriptor; OSL_VERIFY( _rElement >>= aScriptDescriptor ); ::comphelper::NamedValueCollection aExtractor( aScriptDescriptor ); - pos->second.ScriptType = aExtractor.getOrDefault( "EventType", ::rtl::OUString() ); - pos->second.ScriptCode = aExtractor.getOrDefault( "Script", ::rtl::OUString() ); + pos->second.ScriptType = aExtractor.getOrDefault( "EventType", OUString() ); + pos->second.ScriptCode = aExtractor.getOrDefault( "Script", OUString() ); } //------------------------------------------------------------------------ - Any SAL_CALL EventHolder::getByName( const ::rtl::OUString& _rName ) throw (NoSuchElementException, WrappedTargetException, RuntimeException) + Any SAL_CALL EventHolder::getByName( const OUString& _rName ) throw (NoSuchElementException, WrappedTargetException, RuntimeException) { ScriptEventDescriptor aDescriptor( impl_getDescriptor_throw( _rName ) ); Any aRet; Sequence< PropertyValue > aScriptDescriptor( 2 ); - aScriptDescriptor[0].Name = ::rtl::OUString("EventType"); + aScriptDescriptor[0].Name = OUString("EventType"); aScriptDescriptor[0].Value <<= aDescriptor.ScriptType; - aScriptDescriptor[1].Name = ::rtl::OUString("Script"); + aScriptDescriptor[1].Name = OUString("Script"); aScriptDescriptor[1].Value <<= aDescriptor.ScriptCode; return makeAny( aScriptDescriptor ); } //------------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL EventHolder::getElementNames( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL EventHolder::getElementNames( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aReturn( m_aEventIndexAccess.size() ); - ::rtl::OUString* pReturn = aReturn.getArray(); + Sequence< OUString > aReturn( m_aEventIndexAccess.size() ); + OUString* pReturn = aReturn.getArray(); // SvxMacroAssignDlg has a weird API: It expects a XNameReplace, means a container whose // main access method is by name. In it's UI, it shows the possible events in exactly the @@ -469,7 +469,7 @@ namespace pcr } //------------------------------------------------------------------------ - sal_Bool SAL_CALL EventHolder::hasByName( const ::rtl::OUString& _rName ) throw (RuntimeException) + sal_Bool SAL_CALL EventHolder::hasByName( const OUString& _rName ) throw (RuntimeException) { EventMap::const_iterator pos = m_aEventNameAccess.find( _rName ); return pos != m_aEventNameAccess.end(); @@ -511,35 +511,35 @@ namespace pcr } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL EventHandler::getImplementationName( ) throw (RuntimeException) + OUString SAL_CALL EventHandler::getImplementationName( ) throw (RuntimeException) { return getImplementationName_static(); } //-------------------------------------------------------------------- - ::sal_Bool SAL_CALL EventHandler::supportsService( const ::rtl::OUString& ServiceName ) throw (RuntimeException) + ::sal_Bool SAL_CALL EventHandler::supportsService( const OUString& ServiceName ) throw (RuntimeException) { - StlSyntaxSequence< ::rtl::OUString > aAllServices( getSupportedServiceNames() ); + StlSyntaxSequence< OUString > aAllServices( getSupportedServiceNames() ); return ::std::find( aAllServices.begin(), aAllServices.end(), ServiceName ) != aAllServices.end(); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL EventHandler::getSupportedServiceNames( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL EventHandler::getSupportedServiceNames( ) throw (RuntimeException) { return getSupportedServiceNames_static(); } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL EventHandler::getImplementationName_static( ) throw (RuntimeException) + OUString SAL_CALL EventHandler::getImplementationName_static( ) throw (RuntimeException) { - return ::rtl::OUString( "com.sun.star.comp.extensions.EventHandler" ); + return OUString( "com.sun.star.comp.extensions.EventHandler" ); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL EventHandler::getSupportedServiceNames_static( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL EventHandler::getSupportedServiceNames_static( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSupported( 1 ); - aSupported[0] = ::rtl::OUString( "com.sun.star.form.inspection.EventHandler" ); + Sequence< OUString > aSupported( 1 ); + aSupported[0] = OUString( "com.sun.star.form.inspection.EventHandler" ); return aSupported; } @@ -590,7 +590,7 @@ namespace pcr } //-------------------------------------------------------------------- - Any SAL_CALL EventHandler::getPropertyValue( const ::rtl::OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL EventHandler::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -618,7 +618,7 @@ namespace pcr } //-------------------------------------------------------------------- - void SAL_CALL EventHandler::setPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) + void SAL_CALL EventHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -651,11 +651,11 @@ namespace pcr } //-------------------------------------------------------------------- - Any SAL_CALL EventHandler::convertToPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL EventHandler::convertToPropertyValue( const OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - ::rtl::OUString sNewScriptCode; + OUString sNewScriptCode; OSL_VERIFY( _rControlValue >>= sNewScriptCode ); Sequence< ScriptEventDescriptor > aAllAssignedEvents; @@ -679,7 +679,7 @@ namespace pcr } //-------------------------------------------------------------------- - Any SAL_CALL EventHandler::convertToControlValue( const ::rtl::OUString& /*_rPropertyName*/, const Any& _rPropertyValue, const Type& _rControlValueType ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL EventHandler::convertToControlValue( const OUString& /*_rPropertyName*/, const Any& _rPropertyValue, const Type& _rControlValueType ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -690,7 +690,7 @@ namespace pcr "EventHandler::convertToControlValue: unexpected ControlValue type class!" ); (void)_rControlValueType; - ::rtl::OUString sScript( aScriptEvent.ScriptCode ); + OUString sScript( aScriptEvent.ScriptCode ); if ( !sScript.isEmpty() ) { // format is: "name (location, language)" @@ -700,16 +700,16 @@ namespace pcr Reference< XUriReferenceFactory > xUriRefFac = UriReferenceFactory::create( m_aContext.getUNOContext() ); Reference< XVndSunStarScriptUrlReference > xScriptUri( xUriRefFac->parse( sScript ), UNO_QUERY_THROW ); - ::rtl::OUStringBuffer aComposeBuffer; + OUStringBuffer aComposeBuffer; // name aComposeBuffer.append( xScriptUri->getName() ); // location - const ::rtl::OUString sLocationParamName( "location" ); - const ::rtl::OUString sLocation = xScriptUri->getParameter( sLocationParamName ); - const ::rtl::OUString sLangParamName( "language" ); - const ::rtl::OUString sLanguage = xScriptUri->getParameter( sLangParamName ); + const OUString sLocationParamName( "location" ); + const OUString sLocation = xScriptUri->getParameter( sLocationParamName ); + const OUString sLangParamName( "language" ); + const OUString sLanguage = xScriptUri->getParameter( sLangParamName ); if ( !(sLocation.isEmpty() && sLanguage.isEmpty()) ) { @@ -744,7 +744,7 @@ namespace pcr } //-------------------------------------------------------------------- - PropertyState SAL_CALL EventHandler::getPropertyState( const ::rtl::OUString& /*_rPropertyName*/ ) throw (UnknownPropertyException, RuntimeException) + PropertyState SAL_CALL EventHandler::getPropertyState( const OUString& /*_rPropertyName*/ ) throw (UnknownPropertyException, RuntimeException) { return PropertyState_DIRECT_VALUE; } @@ -779,7 +779,7 @@ namespace pcr sal_Int32 listenerCount = aListeners.getLength(); Property aCurrentProperty; - ::rtl::OUString sListenerClassName; + OUString sListenerClassName; // loop through all listeners and all methods, and see which we can present at the UI const Type* pListeners = aListeners.getConstArray(); @@ -794,9 +794,9 @@ namespace pcr continue; // loop through all methods - Sequence< ::rtl::OUString > aMethods( comphelper::getEventMethodsForType( *pListeners ) ); + Sequence< OUString > aMethods( comphelper::getEventMethodsForType( *pListeners ) ); - const ::rtl::OUString* pMethods = aMethods.getConstArray(); + const OUString* pMethods = aMethods.getConstArray(); sal_uInt32 methodCount = aMethods.getLength(); for (sal_uInt32 method = 0 ; method < methodCount ; ++method, ++pMethods ) @@ -829,7 +829,7 @@ namespace pcr { aOrderedProperties[ loop->second.nId ] = Property( loop->first, loop->second.nId, - ::getCppuType( static_cast< const ::rtl::OUString* >( NULL ) ), + ::getCppuType( static_cast< const OUString* >( NULL ) ), PropertyAttribute::BOUND ); } @@ -840,21 +840,21 @@ namespace pcr } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL EventHandler::getSupersededProperties( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL EventHandler::getSupersededProperties( ) throw (RuntimeException) { // none - return Sequence< ::rtl::OUString >( ); + return Sequence< OUString >( ); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL EventHandler::getActuatingProperties( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL EventHandler::getActuatingProperties( ) throw (RuntimeException) { // none - return Sequence< ::rtl::OUString >( ); + return Sequence< OUString >( ); } //-------------------------------------------------------------------- - LineDescriptor SAL_CALL EventHandler::describePropertyLine( const ::rtl::OUString& _rPropertyName, + LineDescriptor SAL_CALL EventHandler::describePropertyLine( const OUString& _rPropertyName, const Reference< XPropertyControlFactory >& _rxControlFactory ) throw (UnknownPropertyException, NullPointerException, RuntimeException) { @@ -871,20 +871,20 @@ namespace pcr const EventDescription& rEvent = impl_getEventForName_throw( _rPropertyName ); aDescriptor.DisplayName = rEvent.sDisplayName; aDescriptor.HelpURL = HelpIdUrl::getHelpURL( rEvent.sHelpId ); - aDescriptor.PrimaryButtonId = rtl::OStringToOUString(rEvent.sUniqueBrowseId, RTL_TEXTENCODING_UTF8); + aDescriptor.PrimaryButtonId = OStringToOUString(rEvent.sUniqueBrowseId, RTL_TEXTENCODING_UTF8); aDescriptor.HasPrimaryButton = sal_True; - aDescriptor.Category = ::rtl::OUString( "Events" ); + aDescriptor.Category = OUString( "Events" ); return aDescriptor; } //-------------------------------------------------------------------- - ::sal_Bool SAL_CALL EventHandler::isComposable( const ::rtl::OUString& /*_rPropertyName*/ ) throw (UnknownPropertyException, RuntimeException) + ::sal_Bool SAL_CALL EventHandler::isComposable( const OUString& /*_rPropertyName*/ ) throw (UnknownPropertyException, RuntimeException) { return sal_False; } //-------------------------------------------------------------------- - InteractiveSelectionResult SAL_CALL EventHandler::onInteractivePropertySelection( const ::rtl::OUString& _rPropertyName, sal_Bool /*_bPrimary*/, Any& /*_rData*/, const Reference< XObjectInspectorUI >& _rxInspectorUI ) throw (UnknownPropertyException, NullPointerException, RuntimeException) + InteractiveSelectionResult SAL_CALL EventHandler::onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool /*_bPrimary*/, Any& /*_rData*/, const Reference< XObjectInspectorUI >& _rxInspectorUI ) throw (UnknownPropertyException, NullPointerException, RuntimeException) { if ( !_rxInspectorUI.is() ) throw NullPointerException(); @@ -909,8 +909,8 @@ namespace pcr } // the initial selection in the dialog - Sequence< ::rtl::OUString > aNames( pEventHolder->getElementNames() ); - const ::rtl::OUString* pChosenEvent = ::std::find( aNames.getConstArray(), aNames.getConstArray() + aNames.getLength(), rForEvent.sListenerMethodName ); + Sequence< OUString > aNames( pEventHolder->getElementNames() ); + const OUString* pChosenEvent = ::std::find( aNames.getConstArray(), aNames.getConstArray() + aNames.getLength(), rForEvent.sListenerMethodName ); sal_uInt16 nInitialSelection = (sal_uInt16)( pChosenEvent - aNames.getConstArray() ); // the dialog @@ -959,7 +959,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) + void SAL_CALL EventHandler::actuatingPropertyChanged( const OUString& /*_rActuatingPropertyName*/, const Any& /*_rNewValue*/, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/, sal_Bool /*_bFirstTimeInit*/ ) throw (NullPointerException, RuntimeException) { OSL_FAIL( "EventHandler::actuatingPropertyChanged: no actuating properties -> no callback (well, this is how it *should* be!)" ); } @@ -1083,12 +1083,12 @@ namespace pcr { Reference< XScriptEventsSupplier > xEventsSupplier( m_xComponent, UNO_QUERY_THROW ); Reference< XNameContainer > xEvents( xEventsSupplier->getEvents(), UNO_QUERY_THROW ); - Sequence< ::rtl::OUString > aEventNames( xEvents->getElementNames() ); + Sequence< OUString > aEventNames( xEvents->getElementNames() ); sal_Int32 nEventCount = aEventNames.getLength(); _out_rEvents.realloc( nEventCount ); - const ::rtl::OUString* pNames = aEventNames.getConstArray(); + const OUString* pNames = aEventNames.getConstArray(); ScriptEventDescriptor* pDescs = _out_rEvents.getArray(); for( sal_Int32 i = 0 ; i < nEventCount ; ++i, ++pNames, ++pDescs ) @@ -1117,7 +1117,7 @@ namespace pcr } else { - ::rtl::OUString sControlService; + OUString sControlService; OSL_VERIFY( m_xComponent->getPropertyValue( PROPERTY_DEFAULTCONTROL ) >>= sControlService ); xReturn = m_aContext.createComponent( sControlService ); @@ -1126,7 +1126,7 @@ namespace pcr } //-------------------------------------------------------------------- - const EventDescription& EventHandler::impl_getEventForName_throw( const ::rtl::OUString& _rPropertyName ) const + const EventDescription& EventHandler::impl_getEventForName_throw( const OUString& _rPropertyName ) const { EventMap::const_iterator pos = m_aEvents.find( _rPropertyName ); if ( pos == m_aEvents.end() ) @@ -1137,7 +1137,7 @@ namespace pcr //-------------------------------------------------------------------- namespace { - static bool lcl_endsWith( const ::rtl::OUString& _rText, const ::rtl::OUString& _rCheck ) + static bool lcl_endsWith( const OUString& _rText, const OUString& _rCheck ) { sal_Int32 nTextLen = _rText.getLength(); sal_Int32 nCheckLen = _rCheck.getLength(); @@ -1152,8 +1152,8 @@ namespace pcr { try { - ::rtl::OUString sScriptCode( _rScriptEvent.ScriptCode ); - ::rtl::OUString sScriptType( _rScriptEvent.ScriptType ); + OUString sScriptCode( _rScriptEvent.ScriptCode ); + OUString sScriptType( _rScriptEvent.ScriptType ); bool bResetScript = sScriptCode.isEmpty(); sal_Int32 nObjectIndex = impl_getComponentIndexInParent_throw(); @@ -1211,17 +1211,17 @@ namespace pcr { try { - ::rtl::OUString sScriptCode( _rScriptEvent.ScriptCode ); + OUString sScriptCode( _rScriptEvent.ScriptCode ); bool bResetScript = sScriptCode.isEmpty(); Reference< XScriptEventsSupplier > xEventsSupplier( m_xComponent, UNO_QUERY_THROW ); Reference< XNameContainer > xEvents( xEventsSupplier->getEvents(), UNO_QUERY_THROW ); - ::rtl::OUStringBuffer aCompleteName; + OUStringBuffer aCompleteName; aCompleteName.append( _rScriptEvent.ListenerType ); aCompleteName.appendAscii( "::" ); aCompleteName.append( _rScriptEvent.EventMethod ); - ::rtl::OUString sCompleteName( aCompleteName.makeStringAndClear() ); + OUString sCompleteName( aCompleteName.makeStringAndClear() ); bool bExists = xEvents->hasByName( sCompleteName ); diff --git a/extensions/source/propctrlr/eventhandler.hxx b/extensions/source/propctrlr/eventhandler.hxx index c87d4e4c4c33..4ed4ace860df 100644 --- a/extensions/source/propctrlr/eventhandler.hxx +++ b/extensions/source/propctrlr/eventhandler.hxx @@ -44,11 +44,11 @@ namespace pcr struct EventDescription { public: - ::rtl::OUString sDisplayName; - ::rtl::OUString sListenerClassName; - ::rtl::OUString sListenerMethodName; - ::rtl::OString sHelpId; - ::rtl::OString sUniqueBrowseId; + OUString sDisplayName; + OUString sListenerClassName; + OUString sListenerMethodName; + OString sHelpId; + OString sUniqueBrowseId; EventId nId; EventDescription() @@ -62,11 +62,11 @@ namespace pcr const sal_Char* _pListenerClassAsciiName, const sal_Char* _pListenerMethodAsciiName, sal_uInt16 _nDisplayNameResId, - const rtl::OString& _sHelpId, - const rtl::OString& _sUniqueBrowseId ); + const OString& _sHelpId, + const OString& _sUniqueBrowseId ); }; - typedef ::boost::unordered_map< ::rtl::OUString, EventDescription, ::rtl::OUStringHash > EventMap; + typedef ::boost::unordered_map< OUString, EventDescription, OUStringHash > EventMap; //==================================================================== //= EventHandler @@ -97,8 +97,8 @@ namespace pcr public: // XServiceInfo - static versions - static ::rtl::OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); + static OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > Create( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext ); protected: @@ -111,22 +111,22 @@ namespace pcr protected: // XPropertyHandler overridables virtual void SAL_CALL inspect( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxIntrospectee ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rControlValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rPropertyValue, const ::com::sun::star::uno::Type& _rControlValueType ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rControlValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rPropertyValue, const ::com::sun::star::uno::Type& _rControlValueType ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getSupportedProperties() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupersededProperties( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getActuatingProperties( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::inspection::LineDescriptor SAL_CALL describePropertyLine( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL isComposable( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupersededProperties( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getActuatingProperties( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::inspection::LineDescriptor SAL_CALL describePropertyLine( const OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL isComposable( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::inspection::InteractiveSelectionResult - SAL_CALL onInteractivePropertySelection( const ::rtl::OUString& _rPropertyName, sal_Bool _bPrimary, ::com::sun::star::uno::Any& _rData, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL actuatingPropertyChanged( const ::rtl::OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, ::com::sun::star::uno::Any& _rData, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL suspend( sal_Bool _bSuspend ) throw (::com::sun::star::uno::RuntimeException); // XComponent @@ -134,9 +134,9 @@ namespace pcr virtual void SAL_CALL disposing(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); private: /** returns the script events associated with our introspectee @@ -209,7 +209,7 @@ namespace pcr if our introspectee does not have an event with the given logical name (see ->getSupportedProperties) */ const EventDescription& - impl_getEventForName_throw( const ::rtl::OUString& _rPropertyName ) const; + impl_getEventForName_throw( const OUString& _rPropertyName ) const; /** returns the index of our component within its parent, if this parent can be obtained (XChild::getParent) and supports an ->XIndexAccess interface diff --git a/extensions/source/propctrlr/fontdialog.cxx b/extensions/source/propctrlr/fontdialog.cxx index 71423732aff4..0402d6cbca2f 100644 --- a/extensions/source/propctrlr/fontdialog.cxx +++ b/extensions/source/propctrlr/fontdialog.cxx @@ -79,14 +79,14 @@ namespace pcr _rxProps ); public: - sal_Bool getCheckFontProperty(const ::rtl::OUString& _rPropName, ::com::sun::star::uno::Any& _rValue); - ::rtl::OUString getStringFontProperty(const ::rtl::OUString& _rPropName, const ::rtl::OUString& _rDefault); - sal_Int16 getInt16FontProperty(const ::rtl::OUString& _rPropName, const sal_Int16 _nDefault); - sal_Int32 getInt32FontProperty(const ::rtl::OUString& _rPropName, const sal_Int32 _nDefault); - float getFloatFontProperty(const ::rtl::OUString& _rPropName, const float _nDefault); + sal_Bool getCheckFontProperty(const OUString& _rPropName, ::com::sun::star::uno::Any& _rValue); + OUString getStringFontProperty(const OUString& _rPropName, const OUString& _rDefault); + sal_Int16 getInt16FontProperty(const OUString& _rPropName, const sal_Int16 _nDefault); + sal_Int32 getInt32FontProperty(const OUString& _rPropName, const sal_Int32 _nDefault); + float getFloatFontProperty(const OUString& _rPropName, const float _nDefault); void invalidateItem( - const ::rtl::OUString& _rPropName, + const OUString& _rPropName, sal_uInt16 _nItemId, SfxItemSet& _rSet, sal_Bool _bForceInvalidation = sal_False); @@ -101,7 +101,7 @@ namespace pcr } //------------------------------------------------------------------------ - sal_Bool OFontPropertyExtractor::getCheckFontProperty(const ::rtl::OUString& _rPropName, Any& _rValue) + sal_Bool OFontPropertyExtractor::getCheckFontProperty(const OUString& _rPropName, Any& _rValue) { _rValue = m_xPropValueAccess->getPropertyValue(_rPropName); if (m_xPropStateAccess.is()) @@ -111,7 +111,7 @@ namespace pcr } //------------------------------------------------------------------------ - ::rtl::OUString OFontPropertyExtractor::getStringFontProperty(const ::rtl::OUString& _rPropName, const ::rtl::OUString& _rDefault) + OUString OFontPropertyExtractor::getStringFontProperty(const OUString& _rPropName, const OUString& _rDefault) { Any aValue; if (getCheckFontProperty(_rPropName, aValue)) @@ -121,7 +121,7 @@ namespace pcr } //------------------------------------------------------------------------ - sal_Int16 OFontPropertyExtractor::getInt16FontProperty(const ::rtl::OUString& _rPropName, const sal_Int16 _nDefault) + sal_Int16 OFontPropertyExtractor::getInt16FontProperty(const OUString& _rPropName, const sal_Int16 _nDefault) { Any aValue; if (getCheckFontProperty(_rPropName, aValue)) @@ -133,7 +133,7 @@ namespace pcr } //------------------------------------------------------------------------ - sal_Int32 OFontPropertyExtractor::getInt32FontProperty(const ::rtl::OUString& _rPropName, const sal_Int32 _nDefault) + sal_Int32 OFontPropertyExtractor::getInt32FontProperty(const OUString& _rPropName, const sal_Int32 _nDefault) { Any aValue; if (getCheckFontProperty(_rPropName, aValue)) @@ -145,7 +145,7 @@ namespace pcr } //------------------------------------------------------------------------ - float OFontPropertyExtractor::getFloatFontProperty(const ::rtl::OUString& _rPropName, const float _nDefault) + float OFontPropertyExtractor::getFloatFontProperty(const OUString& _rPropName, const float _nDefault) { Any aValue; if (getCheckFontProperty(_rPropName, aValue)) @@ -155,7 +155,7 @@ namespace pcr } //------------------------------------------------------------------------ - void OFontPropertyExtractor::invalidateItem(const ::rtl::OUString& _rPropName, sal_uInt16 _nItemId, SfxItemSet& _rSet, sal_Bool _bForceInvalidation) + void OFontPropertyExtractor::invalidateItem(const OUString& _rPropName, sal_uInt16 _nItemId, SfxItemSet& _rSet, sal_Bool _bForceInvalidation) { if ( _bForceInvalidation || ( m_xPropStateAccess.is() @@ -200,8 +200,8 @@ namespace pcr ::com::sun::star::awt::FontDescriptor aDefaultFont = VCLUnoHelper::CreateFontDescriptor(aDefaultVCLFont); // get the current properties - ::rtl::OUString aFontName = aPropExtractor.getStringFontProperty(PROPERTY_FONT_NAME, aDefaultFont.Name); - ::rtl::OUString aFontStyleName = aPropExtractor.getStringFontProperty(PROPERTY_FONT_STYLENAME, aDefaultFont.StyleName); + OUString aFontName = aPropExtractor.getStringFontProperty(PROPERTY_FONT_NAME, aDefaultFont.Name); + OUString aFontStyleName = aPropExtractor.getStringFontProperty(PROPERTY_FONT_STYLENAME, aDefaultFont.StyleName); sal_Int16 nFontFamily = aPropExtractor.getInt16FontProperty(PROPERTY_FONT_FAMILY, aDefaultFont.Family); sal_Int16 nFontCharset = aPropExtractor.getInt16FontProperty(PROPERTY_FONT_CHARSET, aDefaultFont.CharSet); float nFontHeight = aPropExtractor.getFloatFontProperty(PROPERTY_FONT_HEIGHT, (float)aDefaultFont.Height); @@ -288,7 +288,7 @@ namespace pcr //------------------------------------------------------------------------ namespace { - void lcl_pushBackPropertyValue( Sequence< NamedValue >& _out_properties, const ::rtl::OUString& _name, const Any& _value ) + void lcl_pushBackPropertyValue( Sequence< NamedValue >& _out_properties, const OUString& _name, const Any& _value ) { _out_properties.realloc( _out_properties.getLength() + 1 ); _out_properties[ _out_properties.getLength() - 1 ] = NamedValue( _name, _value ); @@ -311,8 +311,8 @@ namespace pcr const SvxFontItem& rFontItem = static_cast<const SvxFontItem&>(_rSet.Get(CFID_FONT)); - lcl_pushBackPropertyValue( _out_properties, PROPERTY_FONT_NAME , makeAny(::rtl::OUString(rFontItem.GetFamilyName()))); - lcl_pushBackPropertyValue( _out_properties, PROPERTY_FONT_STYLENAME, makeAny(::rtl::OUString(rFontItem.GetStyleName()))); + lcl_pushBackPropertyValue( _out_properties, PROPERTY_FONT_NAME , makeAny(OUString(rFontItem.GetFamilyName()))); + lcl_pushBackPropertyValue( _out_properties, PROPERTY_FONT_STYLENAME, makeAny(OUString(rFontItem.GetStyleName()))); lcl_pushBackPropertyValue( _out_properties, PROPERTY_FONT_FAMILY , makeAny((sal_Int16)rFontItem.GetFamily())); lcl_pushBackPropertyValue( _out_properties, PROPERTY_FONT_CHARSET , makeAny((sal_Int16)rFontItem.GetCharSet())); } @@ -539,7 +539,7 @@ namespace pcr { SID_ATTR_CHAR_FONTLIST, 0 } }; - _rpPool = new SfxItemPool(rtl::OUString("PCRControlFontItemPool"), CFID_FIRST_ITEM_ID, CFID_LAST_ITEM_ID, + _rpPool = new SfxItemPool(OUString("PCRControlFontItemPool"), CFID_FIRST_ITEM_ID, CFID_LAST_ITEM_ID, aItemInfos, _rppDefaults); _rpPool->FreezeIdRanges(); diff --git a/extensions/source/propctrlr/formbrowsertools.cxx b/extensions/source/propctrlr/formbrowsertools.cxx index c6cdb04d80aa..b2e56658b628 100644 --- a/extensions/source/propctrlr/formbrowsertools.cxx +++ b/extensions/source/propctrlr/formbrowsertools.cxx @@ -37,12 +37,12 @@ namespace pcr using namespace ::com::sun::star::beans; //------------------------------------------------------------------------ - ::rtl::OUString GetUIHeadlineName(sal_Int16 nClassId, const Any& aUnoObj) + OUString GetUIHeadlineName(sal_Int16 nClassId, const Any& aUnoObj) { PcrClient aResourceAccess; // this ensures that we have our resource file loaded - ::rtl::OUString sClassName; + OUString sClassName; switch (nClassId) { case FormComponentType::TEXTFIELD: diff --git a/extensions/source/propctrlr/formbrowsertools.hxx b/extensions/source/propctrlr/formbrowsertools.hxx index a385f578d6d5..2df90d5ab6bd 100644 --- a/extensions/source/propctrlr/formbrowsertools.hxx +++ b/extensions/source/propctrlr/formbrowsertools.hxx @@ -32,7 +32,7 @@ namespace pcr { //............................................................................ - ::rtl::OUString GetUIHeadlineName(sal_Int16 _nClassId, const ::com::sun::star::uno::Any& _rUnoObject); + OUString GetUIHeadlineName(sal_Int16 _nClassId, const ::com::sun::star::uno::Any& _rUnoObject); sal_Int16 classifyComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxComponent ); //======================================================================== @@ -53,10 +53,10 @@ namespace pcr struct FindPropertyByName : public ::std::unary_function< ::com::sun::star::beans::Property, bool > { private: - ::rtl::OUString m_sName; + OUString m_sName; public: - FindPropertyByName( const ::rtl::OUString& _rName ) : m_sName( _rName ) { } + FindPropertyByName( const OUString& _rName ) : m_sName( _rName ) { } bool operator()( const ::com::sun::star::beans::Property& _rProp ) const { return m_sName == _rProp.Name; diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index 008b4b5909c6..2b68425ae3af 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -329,7 +329,7 @@ namespace pcr if ( PROPERTY_ID_IMAGE_URL == nPropId && ( _rValue >>= xGrfObj ) ) { DBG_ASSERT( xGrfObj.is(), "FormComponentPropertyHandler::setPropertyValue() xGrfObj is invalid"); - rtl::OUString sObjectID( GRAPHOBJ_URLPREFIX ); + OUString sObjectID( GRAPHOBJ_URLPREFIX ); sObjectID = sObjectID + xGrfObj->getUniqueID(); m_xComponent->setPropertyValue( _rPropertyName, uno::makeAny( sObjectID ) ); } @@ -936,28 +936,28 @@ namespace pcr { ::osl::MutexGuard aGuard( m_aMutex ); ::std::vector< OUString > aInterestingProperties; - aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_DATASOURCE) ); - aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_COMMAND) ); - aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_COMMANDTYPE) ); - aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_LISTSOURCE) ); - aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_LISTSOURCETYPE) ); - aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_SUBMIT_ENCODING) ); - aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_REPEAT) ); - aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_TABSTOP) ); - aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_BORDER) ); - aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_CONTROLSOURCE) ); - aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_DROPDOWN) ); - aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_IMAGE_URL) ); - aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_TARGET_URL) ); - aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_STRINGITEMLIST) ); - aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_BUTTONTYPE) ); - aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_ESCAPE_PROCESSING) ); - aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_TRISTATE) ); - aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_DECIMAL_ACCURACY) ); - aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_SHOWTHOUSANDSEP) ); - aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_FORMATKEY) ); - aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_EMPTY_IS_NULL) ); - aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_TOGGLE) ); + aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_DATASOURCE) ); + aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_COMMAND) ); + aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_COMMANDTYPE) ); + aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_LISTSOURCE) ); + aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_LISTSOURCETYPE) ); + aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_SUBMIT_ENCODING) ); + aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_REPEAT) ); + aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_TABSTOP) ); + aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_BORDER) ); + aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_CONTROLSOURCE) ); + aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_DROPDOWN) ); + aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_IMAGE_URL) ); + aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_TARGET_URL) ); + aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_STRINGITEMLIST) ); + aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_BUTTONTYPE) ); + aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_ESCAPE_PROCESSING) ); + aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_TRISTATE) ); + aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_DECIMAL_ACCURACY) ); + aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_SHOWTHOUSANDSEP) ); + aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_FORMATKEY) ); + aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_EMPTY_IS_NULL) ); + aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_TOGGLE) ); return Sequence< OUString >( &(*aInterestingProperties.begin()), aInterestingProperties.size() ); } @@ -1014,39 +1014,39 @@ namespace pcr { case PROPERTY_ID_DEFAULT_SELECT_SEQ: case PROPERTY_ID_SELECTEDITEMS: - aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_SELECTION); + aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_SELECTION); break; case PROPERTY_ID_FILTER: - aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_FILTER); + aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_FILTER); break; case PROPERTY_ID_SORT: - aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_ORDER); + aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_ORDER); break; case PROPERTY_ID_MASTERFIELDS: case PROPERTY_ID_DETAILFIELDS: nControlType = PropertyControlType::StringListField; - aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_FORMLINKFIELDS); + aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_FORMLINKFIELDS); break; case PROPERTY_ID_COMMAND: - aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_SQLCOMMAND); + aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_SQLCOMMAND); break; case PROPERTY_ID_TABINDEX: { Reference< XControlContainer > xControlContext( impl_getContextControlContainer_nothrow() ); if ( xControlContext.is() ) - aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_TABINDEX); + aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_TABINDEX); nControlType = PropertyControlType::NumericField; }; break; case PROPERTY_ID_FONT: bReadOnly = sal_True; - aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_FONT_TYPE); + aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_FONT_TYPE); break; case PROPERTY_ID_TARGET_URL: @@ -1054,7 +1054,7 @@ namespace pcr { aDescriptor.Control = new OFileUrlControl( impl_getDefaultDialogParent_nothrow(), WB_TABSTOP | WB_BORDER ); - aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(( PROPERTY_ID_TARGET_URL == nPropId ) + aDescriptor.PrimaryButtonId = OUString::createFromAscii(( PROPERTY_ID_TARGET_URL == nPropId ) ? UID_PROP_DLG_ATTR_TARGET_URL : UID_PROP_DLG_IMAGE_URL); } break; @@ -1072,13 +1072,13 @@ namespace pcr switch( nPropId ) { case PROPERTY_ID_BACKGROUNDCOLOR: - aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_BACKGROUNDCOLOR); break; + aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_BACKGROUNDCOLOR); break; case PROPERTY_ID_FILLCOLOR: - aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_FILLCOLOR); break; + aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_FILLCOLOR); break; case PROPERTY_ID_SYMBOLCOLOR: - aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_SYMBOLCOLOR); break; + aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_SYMBOLCOLOR); break; case PROPERTY_ID_BORDERCOLOR: - aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_BORDERCOLOR); break; + aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_BORDERCOLOR); break; } break; @@ -1102,7 +1102,7 @@ namespace pcr case PROPERTY_ID_CONTROLLABEL: bReadOnly = sal_True; - aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_CONTROLLABEL); + aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_CONTROLLABEL); break; case PROPERTY_ID_FORMATKEY: @@ -1132,7 +1132,7 @@ namespace pcr aDescriptor.Control = pControl; pControl->SetFormatSupplier( pSupplier ); - aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_NUMBER_FORMAT); + aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_NUMBER_FORMAT); } else { @@ -1357,7 +1357,7 @@ namespace pcr // DataSource case PROPERTY_ID_DATASOURCE: { - aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_ATTR_DATASOURCE); + aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_ATTR_DATASOURCE); ::std::vector< OUString > aListEntries; @@ -2458,7 +2458,7 @@ namespace pcr _out_rProperty.DisplayName = m_pInfoService->getPropertyTranslation( PROPERTY_ID_COMMAND ); _out_rProperty.HelpURL = HelpIdUrl::getHelpURL( m_pInfoService->getPropertyHelpId( PROPERTY_ID_COMMAND ) ); - _out_rProperty.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_SQLCOMMAND); + _out_rProperty.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_SQLCOMMAND); //////////////////////////////////////////////////////////// sal_Int32 nCommandType = CommandType::COMMAND; @@ -2883,7 +2883,7 @@ namespace pcr { ::sfx2::FileDialogHelper aFileDlg( ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, 0, - rtl::OUString("sdatabase")); + OUString("sdatabase")); OUString sDataSource; OSL_VERIFY( impl_getPropertyValue_throw( PROPERTY_DATASOURCE ) >>= sDataSource ); @@ -2893,7 +2893,7 @@ namespace pcr // is considered to be potentially expensive aFileDlg.SetDisplayDirectory( sDataSource ); - const SfxFilter* pFilter = SfxFilter::GetFilterByName(rtl::OUString("StarOffice XML (Base)")); + const SfxFilter* pFilter = SfxFilter::GetFilterByName(OUString("StarOffice XML (Base)")); OSL_ENSURE(pFilter,"Filter: StarOffice XML (Base) could not be found!"); if ( pFilter ) { diff --git a/extensions/source/propctrlr/formcomponenthandler.hxx b/extensions/source/propctrlr/formcomponenthandler.hxx index 61036725692c..7c0fc5150055 100644 --- a/extensions/source/propctrlr/formcomponenthandler.hxx +++ b/extensions/source/propctrlr/formcomponenthandler.hxx @@ -80,9 +80,9 @@ namespace pcr ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI > m_xBrowserUI; /// the string indicating a "default" (VOID) value in list-like controls - ::rtl::OUString m_sDefaultValueString; + OUString m_sDefaultValueString; /// all properties to whose control's we added ->m_sDefaultValueString - ::std::set< ::rtl::OUString > m_aPropertiesWithDefListEntry; + ::std::set< OUString > m_aPropertiesWithDefListEntry; /// type of our component ComponentClassification m_eComponentClass; /// is our component a (database) sub form? @@ -104,8 +104,8 @@ namespace pcr // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - static ::rtl::OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); + static OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); protected: ~FormComponentPropertyHandler(); @@ -114,19 +114,19 @@ namespace pcr virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); // XPropertyHandler overridables - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rControlValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rPropertyValue, const ::com::sun::star::uno::Type& _rControlValueType ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rControlValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rPropertyValue, const ::com::sun::star::uno::Type& _rControlValueType ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupersededProperties() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getActuatingProperties() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::inspection::LineDescriptor SAL_CALL describePropertyLine( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupersededProperties() throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getActuatingProperties() throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::inspection::LineDescriptor SAL_CALL describePropertyLine( const OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::inspection::InteractiveSelectionResult - SAL_CALL onInteractivePropertySelection( const ::rtl::OUString& _rPropertyName, sal_Bool _bPrimary, ::com::sun::star::uno::Any& _rData, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL actuatingPropertyChanged( const ::rtl::OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, ::com::sun::star::uno::Any& _rData, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL suspend( sal_Bool _bSuspend ) throw (::com::sun::star::uno::RuntimeException); // XComponent @@ -152,7 +152,7 @@ namespace pcr /** const-version of ->getPropertyValue */ - ::com::sun::star::uno::Any impl_getPropertyValue_throw( const ::rtl::OUString& _rPropertyName ) const; + ::com::sun::star::uno::Any impl_getPropertyValue_throw( const OUString& _rPropertyName ) const; // some property values are faked, and not used in the way they're provided by our component void impl_normalizePropertyValue_nothrow( ::com::sun::star::uno::Any& _rValue, PropertyId _nPropId ) const; @@ -164,7 +164,7 @@ namespace pcr /** initializes the list of field names, if we're handling a control which supports the DataField property */ - void impl_initFieldList_nothrow( ::std::vector< ::rtl::OUString >& rFieldNames ) const; + void impl_initFieldList_nothrow( ::std::vector< OUString >& rFieldNames ) const; /** obtaines the RowSet to which our component belongs @@ -216,14 +216,14 @@ namespace pcr @precond m_xRowSetConnection is not <NULL/> */ - void impl_fillTableNames_throw( ::std::vector< ::rtl::OUString >& _out_rNames ) const; + void impl_fillTableNames_throw( ::std::vector< OUString >& _out_rNames ) const; /** describes the UI for selecting a query name @precond m_xRowSetConnection is not <NULL/> */ - void impl_fillQueryNames_throw( ::std::vector< ::rtl::OUString >& _out_rNames ) const; + void impl_fillQueryNames_throw( ::std::vector< OUString >& _out_rNames ) const; /** describes the UI for selecting a query name @@ -231,8 +231,8 @@ namespace pcr m_xRowSetConnection is not <NULL/> */ void impl_fillQueryNames_throw( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xQueryNames - ,::std::vector< ::rtl::OUString >& _out_rNames - ,const ::rtl::OUString& _sName = ::rtl::OUString() ) const; + ,::std::vector< OUString >& _out_rNames + ,const OUString& _sName = OUString() ) const; /** describes the UI for selecting a ListSource (for list-like form controls) @precond @@ -254,7 +254,7 @@ namespace pcr @return <TRUE/> if and only if the user successfully changed the property */ - bool impl_dialogListSelection_nothrow( const ::rtl::OUString& _rProperty, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const; + bool impl_dialogListSelection_nothrow( const OUString& _rProperty, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const; /** executes a dialog for chosing a filter or sort criterion for a database form @param _bFilter @@ -267,7 +267,7 @@ namespace pcr @return <TRUE/> if and only if the user successfully chose a clause */ - bool impl_dialogFilterOrSort_nothrow( bool _bFilter, ::rtl::OUString& _out_rSelectedClause, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const; + bool impl_dialogFilterOrSort_nothrow( bool _bFilter, OUString& _out_rSelectedClause, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const; /** executes a dialog which allows the user to chose the columns linking a sub to a master form, and sets the respective MasterFields / SlaveFields @@ -428,7 +428,7 @@ namespace pcr /** returns the URL of our context document @return */ - ::rtl::OUString impl_getDocumentURL_nothrow() const; + OUString impl_getDocumentURL_nothrow() const; private: DECL_LINK( OnDesignerClosed, void* ); diff --git a/extensions/source/propctrlr/formcontroller.cxx b/extensions/source/propctrlr/formcontroller.cxx index 26084a394eb2..732c639aab5f 100644 --- a/extensions/source/propctrlr/formcontroller.cxx +++ b/extensions/source/propctrlr/formcontroller.cxx @@ -113,31 +113,31 @@ namespace pcr IMPLEMENT_GET_IMPLEMENTATION_ID( FormController ) //------------------------------------------------------------------------ - ::rtl::OUString SAL_CALL FormController::getImplementationName( ) throw(RuntimeException) + OUString SAL_CALL FormController::getImplementationName( ) throw(RuntimeException) { return m_aServiceDescriptor.GetImplementationName(); } //------------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL FormController::getSupportedServiceNames( ) throw(RuntimeException) + Sequence< OUString > SAL_CALL FormController::getSupportedServiceNames( ) throw(RuntimeException) { - Sequence< ::rtl::OUString > aSupported( m_aServiceDescriptor.GetSupportedServiceNames() ); + Sequence< OUString > aSupported( m_aServiceDescriptor.GetSupportedServiceNames() ); aSupported.realloc( aSupported.getLength() + 1 ); - aSupported[ aSupported.getLength() - 1 ] = ::rtl::OUString( "com.sun.star.inspection.ObjectInspector" ); + aSupported[ aSupported.getLength() - 1 ] = OUString( "com.sun.star.inspection.ObjectInspector" ); return aSupported; } //------------------------------------------------------------------------ - ::rtl::OUString FormController::getImplementationName_static( ) throw(RuntimeException) + OUString FormController::getImplementationName_static( ) throw(RuntimeException) { - return ::rtl::OUString("org.openoffice.comp.extensions.FormController"); + return OUString("org.openoffice.comp.extensions.FormController"); } //------------------------------------------------------------------------ - Sequence< ::rtl::OUString > FormController::getSupportedServiceNames_static( ) throw(RuntimeException) + Sequence< OUString > FormController::getSupportedServiceNames_static( ) throw(RuntimeException) { - Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString("com.sun.star.form.PropertyBrowserController"); + Sequence< OUString > aSupported(1); + aSupported[0] = OUString("com.sun.star.form.PropertyBrowserController"); return aSupported; } @@ -169,7 +169,7 @@ namespace pcr aProps[0] = Property( PROPERTY_CURRENTPAGE, OWN_PROPERTY_ID_CURRENTPAGE, - ::getCppuType( static_cast< ::rtl::OUString* >( NULL ) ), + ::getCppuType( static_cast< OUString* >( NULL ) ), PropertyAttribute::TRANSIENT ); aProps[1] = Property( @@ -256,16 +256,16 @@ namespace pcr //= DialogController //==================================================================== //------------------------------------------------------------------------ - ::rtl::OUString DialogController::getImplementationName_static( ) throw(RuntimeException) + OUString DialogController::getImplementationName_static( ) throw(RuntimeException) { - return ::rtl::OUString("org.openoffice.comp.extensions.DialogController"); + return OUString("org.openoffice.comp.extensions.DialogController"); } //------------------------------------------------------------------------ - Sequence< ::rtl::OUString > DialogController::getSupportedServiceNames_static( ) throw(RuntimeException) + Sequence< OUString > DialogController::getSupportedServiceNames_static( ) throw(RuntimeException) { - Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString("com.sun.star.awt.PropertyBrowserController"); + Sequence< OUString > aSupported(1); + aSupported[0] = OUString("com.sun.star.awt.PropertyBrowserController"); return aSupported; } diff --git a/extensions/source/propctrlr/formcontroller.hxx b/extensions/source/propctrlr/formcontroller.hxx index 3cb2f5cdc177..ef21dda890a8 100644 --- a/extensions/source/propctrlr/formcontroller.hxx +++ b/extensions/source/propctrlr/formcontroller.hxx @@ -35,9 +35,9 @@ namespace pcr //==================================================================== struct ServiceDescriptor { - ::rtl::OUString + OUString ( *GetImplementationName )( void ); - ::com::sun::star::uno::Sequence< ::rtl::OUString > + ::com::sun::star::uno::Sequence< OUString > ( *GetSupportedServiceNames )( void ); }; @@ -69,8 +69,8 @@ namespace pcr ); // XServiceInfo - static versions - static ::rtl::OUString getImplementationName_static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static( ) throw(::com::sun::star::uno::RuntimeException); + static OUString getImplementationName_static( ) throw(::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static( ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); @@ -81,8 +81,8 @@ namespace pcr DECLARE_XTYPEPROVIDER() // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // XPropertySet and friends virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); @@ -111,8 +111,8 @@ namespace pcr { public: // XServiceInfo - static versions - static ::rtl::OUString getImplementationName_static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static( ) throw(::com::sun::star::uno::RuntimeException); + static OUString getImplementationName_static( ) throw(::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static( ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); diff --git a/extensions/source/propctrlr/formgeometryhandler.cxx b/extensions/source/propctrlr/formgeometryhandler.cxx index 807164e19589..6738b66ae02c 100644 --- a/extensions/source/propctrlr/formgeometryhandler.cxx +++ b/extensions/source/propctrlr/formgeometryhandler.cxx @@ -214,21 +214,21 @@ namespace pcr const Reference< XComponentContext >& _rxContext ); - static ::rtl::OUString SAL_CALL getImplementationName_static( ) throw (RuntimeException); - static Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static( ) throw (RuntimeException); + static OUString SAL_CALL getImplementationName_static( ) throw (RuntimeException); + static Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (RuntimeException); protected: ~FormGeometryHandler(); protected: // XPropertyHandler overriables - virtual Any SAL_CALL getPropertyValue( const ::rtl::OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException); - virtual LineDescriptor SAL_CALL describePropertyLine( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + virtual Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException); + virtual LineDescriptor SAL_CALL describePropertyLine( const OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException); - virtual Sequence< ::rtl::OUString > SAL_CALL getActuatingProperties( ) throw (RuntimeException); - virtual void SAL_CALL actuatingPropertyChanged( const ::rtl::OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& _rOldValue, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (NullPointerException, RuntimeException); + virtual Sequence< OUString > SAL_CALL getActuatingProperties( ) throw (RuntimeException); + virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& _rOldValue, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (NullPointerException, RuntimeException); // OComponentHandler overridables virtual void SAL_CALL disposing(); @@ -312,21 +312,21 @@ namespace pcr } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL FormGeometryHandler::getImplementationName_static( ) throw (RuntimeException) + OUString SAL_CALL FormGeometryHandler::getImplementationName_static( ) throw (RuntimeException) { - return ::rtl::OUString( "com.sun.star.comp.extensions.FormGeometryHandler" ); + return OUString( "com.sun.star.comp.extensions.FormGeometryHandler" ); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL FormGeometryHandler::getSupportedServiceNames_static( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL FormGeometryHandler::getSupportedServiceNames_static( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSupported( 1 ); - aSupported[0] = ::rtl::OUString( "com.sun.star.form.inspection.FormGeometryHandler" ); + Sequence< OUString > aSupported( 1 ); + aSupported[0] = OUString( "com.sun.star.form.inspection.FormGeometryHandler" ); return aSupported; } //-------------------------------------------------------------------- - Any SAL_CALL FormGeometryHandler::getPropertyValue( const ::rtl::OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL FormGeometryHandler::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throw( _rPropertyName ) ); @@ -375,7 +375,7 @@ namespace pcr } //-------------------------------------------------------------------- - void SAL_CALL FormGeometryHandler::setPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) + void SAL_CALL FormGeometryHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throw( _rPropertyName ) ); @@ -441,7 +441,7 @@ namespace pcr } //-------------------------------------------------------------------- - LineDescriptor SAL_CALL FormGeometryHandler::describePropertyLine( const ::rtl::OUString& _rPropertyName, + LineDescriptor SAL_CALL FormGeometryHandler::describePropertyLine( const OUString& _rPropertyName, const Reference< XPropertyControlFactory >& _rxControlFactory ) throw (UnknownPropertyException, NullPointerException, RuntimeException) { @@ -508,15 +508,15 @@ namespace pcr } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL FormGeometryHandler::getActuatingProperties( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL FormGeometryHandler::getActuatingProperties( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aInterestedIn(1); + Sequence< OUString > aInterestedIn(1); aInterestedIn[0] = PROPERTY_TEXT_ANCHOR_TYPE; return aInterestedIn; } //-------------------------------------------------------------------- - void SAL_CALL FormGeometryHandler::actuatingPropertyChanged( const ::rtl::OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool /*_bFirstTimeInit*/ ) throw (NullPointerException, RuntimeException) + void SAL_CALL FormGeometryHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool /*_bFirstTimeInit*/ ) throw (NullPointerException, RuntimeException) { if ( !_rxInspectorUI.is() ) throw NullPointerException(); @@ -600,7 +600,7 @@ namespace pcr if ( !xPSI->hasPropertyByName( PROPERTY_ANCHOR ) ) return false; Reference< XServiceInfo > xSI( m_xAssociatedShape, UNO_QUERY_THROW ); - if ( xSI->supportsService( ::rtl::OUString( "com.sun.star.sheet.Shape" ) ) ) + if ( xSI->supportsService( OUString( "com.sun.star.sheet.Shape" ) ) ) return true; } catch( const Exception& ) @@ -710,10 +710,10 @@ namespace pcr { struct EventTranslation { - ::rtl::OUString sPropertyName; + OUString sPropertyName; Any aNewPropertyValue; - EventTranslation( const ::rtl::OUString& _propertyName, const Any& _newPropertyValue ) + EventTranslation( const OUString& _propertyName, const Any& _newPropertyValue ) :sPropertyName( _propertyName ) ,aNewPropertyValue( _newPropertyValue ) { @@ -779,7 +779,7 @@ namespace pcr try { Reference< XPropertySet > xShapeProperties( m_xShape, UNO_QUERY_THROW ); - xShapeProperties->addPropertyChangeListener( ::rtl::OUString(), this ); + xShapeProperties->addPropertyChangeListener( OUString(), this ); } catch( const Exception& ) { @@ -794,7 +794,7 @@ namespace pcr try { Reference< XPropertySet > xShapeProperties( m_xShape, UNO_QUERY_THROW ); - xShapeProperties->removePropertyChangeListener( ::rtl::OUString(), this ); + xShapeProperties->removePropertyChangeListener( OUString(), this ); } catch( const Exception& ) { diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx index cefae712007f..2fdf007266d1 100644 --- a/extensions/source/propctrlr/formlinkdialog.cxx +++ b/extensions/source/propctrlr/formlinkdialog.cxx @@ -86,7 +86,7 @@ namespace pcr bool GetFieldName( LinkParticipant _eWhich, String& /* [out] */ _rName ) const; void SetFieldName( LinkParticipant _eWhich, const String& _rName ); - void fillList( LinkParticipant _eWhich, const Sequence< ::rtl::OUString >& _rFieldNames ); + void fillList( LinkParticipant _eWhich, const Sequence< OUString >& _rFieldNames ); private: DECL_LINK( OnFieldNameChanged, ComboBox* ); @@ -109,12 +109,12 @@ namespace pcr } //------------------------------------------------------------------------ - void FieldLinkRow::fillList( LinkParticipant _eWhich, const Sequence< ::rtl::OUString >& _rFieldNames ) + void FieldLinkRow::fillList( LinkParticipant _eWhich, const Sequence< OUString >& _rFieldNames ) { ComboBox* pBox = ( _eWhich == eDetailField ) ? &m_aDetailColumn : &m_aMasterColumn; - const ::rtl::OUString* pFieldName = _rFieldNames.getConstArray(); - const ::rtl::OUString* pFieldNameEnd = pFieldName + _rFieldNames.getLength(); + const OUString* pFieldName = _rFieldNames.getConstArray(); + const OUString* pFieldNameEnd = pFieldName + _rFieldNames.getLength(); for ( ; pFieldName != pFieldNameEnd; ++pFieldName ) pBox->InsertEntry( *pFieldName ); } @@ -149,9 +149,9 @@ namespace pcr //------------------------------------------------------------------------ FormLinkDialog::FormLinkDialog( Window* _pParent, const Reference< XPropertySet >& _rxDetailForm, const Reference< XPropertySet >& _rxMasterForm, const Reference< XComponentContext >& _rxContext, - const ::rtl::OUString& _sExplanation, - const ::rtl::OUString& _sDetailLabel, - const ::rtl::OUString& _sMasterLabel) + const OUString& _sExplanation, + const OUString& _sDetailLabel, + const OUString& _sMasterLabel) :ModalDialog( _pParent, PcrRes( RID_DLG_FORMLINKS ) ) ,m_aExplanation( this, PcrRes( FT_EXPLANATION ) ) ,m_aDetailLabel( this, PcrRes( FT_DETAIL_LABEL ) ) @@ -194,8 +194,8 @@ namespace pcr void FormLinkDialog::commitLinkPairs() { // collect the field lists from the rows - ::std::vector< ::rtl::OUString > aDetailFields; aDetailFields.reserve( 4 ); - ::std::vector< ::rtl::OUString > aMasterFields; aMasterFields.reserve( 4 ); + ::std::vector< OUString > aDetailFields; aDetailFields.reserve( 4 ); + ::std::vector< OUString > aMasterFields; aMasterFields.reserve( 4 ); const FieldLinkRow* aRows[] = { m_aRow1.get(), m_aRow2.get(), m_aRow3.get(), m_aRow4.get() @@ -219,10 +219,10 @@ namespace pcr Reference< XPropertySet > xDetailFormProps( m_xDetailForm, UNO_QUERY ); if ( xDetailFormProps.is() ) { - ::rtl::OUString *pFields = aDetailFields.empty() ? 0 : &aDetailFields[0]; - xDetailFormProps->setPropertyValue( PROPERTY_DETAILFIELDS, makeAny( Sequence< ::rtl::OUString >( pFields, aDetailFields.size() ) ) ); + OUString *pFields = aDetailFields.empty() ? 0 : &aDetailFields[0]; + xDetailFormProps->setPropertyValue( PROPERTY_DETAILFIELDS, makeAny( Sequence< OUString >( pFields, aDetailFields.size() ) ) ); pFields = aMasterFields.empty() ? 0 : &aMasterFields[0]; - xDetailFormProps->setPropertyValue( PROPERTY_MASTERFIELDS, makeAny( Sequence< ::rtl::OUString >( pFields, aMasterFields.size() ) ) ); + xDetailFormProps->setPropertyValue( PROPERTY_MASTERFIELDS, makeAny( Sequence< OUString >( pFields, aMasterFields.size() ) ) ); } } catch( const Exception& ) @@ -245,10 +245,10 @@ namespace pcr //------------------------------------------------------------------------ void FormLinkDialog::initializeFieldLists() { - Sequence< ::rtl::OUString > sDetailFields; + Sequence< OUString > sDetailFields; getFormFields( m_xDetailForm, sDetailFields ); - Sequence< ::rtl::OUString > sMasterFields; + Sequence< OUString > sMasterFields; getFormFields( m_xMasterForm, sMasterFields ); FieldLinkRow* aRows[] = { @@ -293,14 +293,14 @@ namespace pcr } //------------------------------------------------------------------------ - void FormLinkDialog::initializeFieldRowsFrom( Sequence< ::rtl::OUString >& _rDetailFields, Sequence< ::rtl::OUString >& _rMasterFields ) + void FormLinkDialog::initializeFieldRowsFrom( Sequence< OUString >& _rDetailFields, Sequence< OUString >& _rMasterFields ) { // our UI does allow 4 fields max _rDetailFields.realloc( 4 ); _rMasterFields.realloc( 4 ); - const ::rtl::OUString* pDetailFields = _rDetailFields.getConstArray(); - const ::rtl::OUString* pMasterFields = _rMasterFields.getConstArray(); + const OUString* pDetailFields = _rDetailFields.getConstArray(); + const OUString* pMasterFields = _rMasterFields.getConstArray(); FieldLinkRow* aRows[] = { m_aRow1.get(), m_aRow2.get(), m_aRow3.get(), m_aRow4.get() @@ -317,8 +317,8 @@ namespace pcr { try { - Sequence< ::rtl::OUString > aDetailFields; - Sequence< ::rtl::OUString > aMasterFields; + Sequence< OUString > aDetailFields; + Sequence< OUString > aMasterFields; Reference< XPropertySet > xDetailFormProps( m_xDetailForm, UNO_QUERY ); if ( xDetailFormProps.is() ) @@ -370,7 +370,7 @@ namespace pcr try { sal_Int32 nCommandType = CommandType::COMMAND; - ::rtl::OUString sCommand; + OUString sCommand; xFormProps->getPropertyValue( PROPERTY_COMMANDTYPE ) >>= nCommandType; xFormProps->getPropertyValue( PROPERTY_COMMAND ) >>= sCommand; @@ -388,12 +388,12 @@ namespace pcr } //------------------------------------------------------------------------ - void FormLinkDialog::getFormFields( const Reference< XPropertySet >& _rxForm, Sequence< ::rtl::OUString >& /* [out] */ _rNames ) const SAL_THROW(( )) + void FormLinkDialog::getFormFields( const Reference< XPropertySet >& _rxForm, Sequence< OUString >& /* [out] */ _rNames ) const SAL_THROW(( )) { _rNames.realloc( 0 ); ::dbtools::SQLExceptionInfo aErrorInfo; - ::rtl::OUString sCommand; + OUString sCommand; try { WaitObject aWaitCursor( const_cast< FormLinkDialog* >( this ) ); @@ -430,7 +430,7 @@ namespace pcr { ::svt::OLocalResourceAccess aStringAccess( PcrRes( RID_DLG_FORMLINKS ), RSC_MODALDIALOG ); sErrorMessage = PcrRes(STR_ERROR_RETRIEVING_COLUMNS).toString(); - sErrorMessage.SearchAndReplace(rtl::OUString('#'), sCommand); + sErrorMessage.SearchAndReplace(OUString('#'), sCommand); } SQLContext aContext; @@ -476,7 +476,7 @@ namespace pcr Reference< XNameAccess > xTables; if ( xTablesInForm.is() ) xTables = xTablesInForm->getTables(); - Sequence< ::rtl::OUString > aTableNames; + Sequence< OUString > aTableNames; if ( xTables.is() ) aTableNames = xTables->getElementNames(); @@ -496,7 +496,7 @@ namespace pcr //------------------------------------------------------------------------ sal_Bool FormLinkDialog::getExistingRelation( const Reference< XPropertySet >& _rxLHS, const Reference< XPropertySet >& /*_rxRHS*/, // TODO: fix the usage of _rxRHS. This is issue #i81956#. - Sequence< ::rtl::OUString >& _rLeftFields, Sequence< ::rtl::OUString >& _rRightFields ) const + Sequence< OUString >& _rLeftFields, Sequence< OUString >& _rRightFields ) const { try { @@ -511,14 +511,14 @@ namespace pcr Reference< XColumnsSupplier > xKeyColSupp( xKey, UNO_QUERY ); Reference< XIndexAccess > xKeyColumns; Reference< XPropertySet > xKeyColumn; - ::rtl::OUString sColumnName, sRelatedColumnName; + OUString sColumnName, sRelatedColumnName; const sal_Int32 keyCount = xKeys->getCount(); for ( sal_Int32 key = 0; key < keyCount; ++key ) { xKeys->getByIndex( key ) >>= xKey; sal_Int32 nKeyType = 0; - xKey->getPropertyValue( ::rtl::OUString( "Type" ) ) >>= nKeyType; + xKey->getPropertyValue( OUString( "Type" ) ) >>= nKeyType; if ( nKeyType != KeyType::FOREIGN ) continue; @@ -542,7 +542,7 @@ namespace pcr if ( xKeyColumn.is() ) { xKeyColumn->getPropertyValue( PROPERTY_NAME ) >>= sColumnName; - xKeyColumn->getPropertyValue( ::rtl::OUString( "RelatedColumn" ) ) >>= sRelatedColumnName; + xKeyColumn->getPropertyValue( OUString( "RelatedColumn" ) ) >>= sRelatedColumnName; _rLeftFields[ column ] = sColumnName; _rRightFields[ column ] = sRelatedColumnName; @@ -574,7 +574,7 @@ namespace pcr // only show the button when both forms are based on the same data source if ( bEnable ) { - ::rtl::OUString sMasterDS, sDetailDS; + OUString sMasterDS, sDetailDS; xMasterFormProps->getPropertyValue( PROPERTY_DATASOURCE ) >>= sMasterDS; xDetailFormProps->getPropertyValue( PROPERTY_DATASOURCE ) >>= sDetailDS; bEnable = ( sMasterDS == sDetailDS ); diff --git a/extensions/source/propctrlr/formlinkdialog.hxx b/extensions/source/propctrlr/formlinkdialog.hxx index 7c859fc01cdf..48aa39db7213 100644 --- a/extensions/source/propctrlr/formlinkdialog.hxx +++ b/extensions/source/propctrlr/formlinkdialog.hxx @@ -64,13 +64,13 @@ namespace pcr ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xMasterForm; - ::com::sun::star::uno::Sequence< ::rtl::OUString > + ::com::sun::star::uno::Sequence< OUString > m_aRelationDetailColumns; - ::com::sun::star::uno::Sequence< ::rtl::OUString > + ::com::sun::star::uno::Sequence< OUString > m_aRelationMasterColumns; - ::rtl::OUString m_sDetailLabel; - ::rtl::OUString m_sMasterLabel; + OUString m_sDetailLabel; + OUString m_sMasterLabel; public: FormLinkDialog( @@ -78,9 +78,9 @@ namespace pcr const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxDetailForm, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxMasterForm, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, - const ::rtl::OUString& _sExplanation = ::rtl::OUString(), - const ::rtl::OUString& _sDetailLabel = ::rtl::OUString(), - const ::rtl::OUString& _sMasterLabel = ::rtl::OUString() + const OUString& _sExplanation = OUString(), + const OUString& _sDetailLabel = OUString(), + const OUString& _sMasterLabel = OUString() ); ~FormLinkDialog( ); @@ -100,8 +100,8 @@ namespace pcr void commitLinkPairs(); void initializeFieldRowsFrom( - ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rDetailFields, - ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rMasterFields + ::com::sun::star::uno::Sequence< OUString >& _rDetailFields, + ::com::sun::star::uno::Sequence< OUString >& _rMasterFields ); String getFormDataSourceType( @@ -110,7 +110,7 @@ namespace pcr void getFormFields( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxForm, - ::com::sun::star::uno::Sequence< ::rtl::OUString >& /* [out] */ _rNames + ::com::sun::star::uno::Sequence< OUString >& /* [out] */ _rNames ) const SAL_THROW(()); void ensureFormConnection( @@ -128,8 +128,8 @@ namespace pcr sal_Bool getExistingRelation( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxLHS, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxRHS, - ::com::sun::star::uno::Sequence< ::rtl::OUString >& /* [out] */ _rLeftFields, - ::com::sun::star::uno::Sequence< ::rtl::OUString >& /* [out] */ _rRightFields + ::com::sun::star::uno::Sequence< OUString >& /* [out] */ _rLeftFields, + ::com::sun::star::uno::Sequence< OUString >& /* [out] */ _rRightFields ) const; }; diff --git a/extensions/source/propctrlr/formmetadata.cxx b/extensions/source/propctrlr/formmetadata.cxx index a150e3160fac..f1cb08caff6e 100644 --- a/extensions/source/propctrlr/formmetadata.cxx +++ b/extensions/source/propctrlr/formmetadata.cxx @@ -42,21 +42,21 @@ namespace pcr { String sName; String sTranslation; - rtl::OString sHelpId; + OString sHelpId; sal_Int32 nId; sal_uInt32 nUIFlags; OPropertyInfoImpl( - const ::rtl::OUString& rName, + const OUString& rName, sal_Int32 _nId, const String& aTranslation, - const rtl::OString&, + const OString&, sal_uInt32 _nUIFlags); }; //------------------------------------------------------------------------ - OPropertyInfoImpl::OPropertyInfoImpl(const ::rtl::OUString& _rName, sal_Int32 _nId, - const String& aString, const rtl::OString& sHid, sal_uInt32 _nUIFlags) + OPropertyInfoImpl::OPropertyInfoImpl(const OUString& _rName, sal_Int32 _nId, + const String& aString, const OString& sHid, sal_uInt32 _nUIFlags) :sName(_rName) ,sTranslation(aString) ,sHelpId(sHid) @@ -381,10 +381,10 @@ namespace pcr } //------------------------------------------------------------------------ - rtl::OString OPropertyInfoService::getPropertyHelpId(sal_Int32 _nId) const + OString OPropertyInfoService::getPropertyHelpId(sal_Int32 _nId) const { const OPropertyInfoImpl* pInfo = getPropertyInfo(_nId); - return (pInfo) ? pInfo->sHelpId : rtl::OString(); + return (pInfo) ? pInfo->sHelpId : OString(); } //------------------------------------------------------------------------ @@ -402,7 +402,7 @@ namespace pcr } //------------------------------------------------------------------------ - ::std::vector< ::rtl::OUString > OPropertyInfoService::getPropertyEnumRepresentations(sal_Int32 _nId) const + ::std::vector< OUString > OPropertyInfoService::getPropertyEnumRepresentations(sal_Int32 _nId) const { OSL_ENSURE( ( ( getPropertyUIFlags( _nId ) & PROP_FLAG_ENUM ) != 0 ) || ( _nId == PROPERTY_ID_TARGET_FRAME ), "OPropertyInfoService::getPropertyEnumRepresentations: this is no enum property!" ); @@ -506,7 +506,7 @@ namespace pcr break; } - ::std::vector< ::rtl::OUString > aReturn; + ::std::vector< OUString > aReturn; if ( nStringItemsResId ) { @@ -526,7 +526,7 @@ namespace pcr } //------------------------------------------------------------------------ - sal_Bool OPropertyInfoService::isComposeable( const ::rtl::OUString& _rPropertyName ) const + sal_Bool OPropertyInfoService::isComposeable( const OUString& _rPropertyName ) const { sal_Int32 nId = getPropertyId( _rPropertyName ); if ( nId == -1 ) @@ -593,17 +593,17 @@ namespace pcr } //-------------------------------------------------------------------- - ::std::vector< ::rtl::OUString > SAL_CALL DefaultEnumRepresentation::getDescriptions() const + ::std::vector< OUString > SAL_CALL DefaultEnumRepresentation::getDescriptions() const { return m_rMetaData.getPropertyEnumRepresentations( m_nPropertyId ); } //-------------------------------------------------------------------- - void SAL_CALL DefaultEnumRepresentation::getValueFromDescription( const ::rtl::OUString& _rDescription, Any& _out_rValue ) const + void SAL_CALL DefaultEnumRepresentation::getValueFromDescription( const OUString& _rDescription, Any& _out_rValue ) const { sal_uInt32 nPropertyUIFlags = m_rMetaData.getPropertyUIFlags( m_nPropertyId ); - ::std::vector< ::rtl::OUString > aEnumStrings = m_rMetaData.getPropertyEnumRepresentations( m_nPropertyId ); - ::std::vector< ::rtl::OUString >::const_iterator pos = ::std::find( aEnumStrings.begin(), aEnumStrings.end(), _rDescription ); + ::std::vector< OUString > aEnumStrings = m_rMetaData.getPropertyEnumRepresentations( m_nPropertyId ); + ::std::vector< OUString >::const_iterator pos = ::std::find( aEnumStrings.begin(), aEnumStrings.end(), _rDescription ); if ( pos != aEnumStrings.end() ) { sal_Int32 nPos = pos - aEnumStrings.begin(); @@ -642,9 +642,9 @@ namespace pcr } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL DefaultEnumRepresentation::getDescriptionForValue( const Any& _rEnumValue ) const + OUString SAL_CALL DefaultEnumRepresentation::getDescriptionForValue( const Any& _rEnumValue ) const { - ::rtl::OUString sReturn; + OUString sReturn; sal_Int32 nIntValue = -1; OSL_VERIFY( ::cppu::enum2int( nIntValue, _rEnumValue ) ); @@ -653,7 +653,7 @@ namespace pcr // enum value starting with 1 --nIntValue; - ::std::vector< ::rtl::OUString > aEnumStrings = m_rMetaData.getPropertyEnumRepresentations( m_nPropertyId ); + ::std::vector< OUString > aEnumStrings = m_rMetaData.getPropertyEnumRepresentations( m_nPropertyId ); if ( ( nIntValue >= 0 ) && ( nIntValue < (sal_Int32)aEnumStrings.size() ) ) { sReturn = aEnumStrings[ nIntValue ]; diff --git a/extensions/source/propctrlr/formmetadata.hxx b/extensions/source/propctrlr/formmetadata.hxx index fdb5819b4f76..1f2340614c52 100644 --- a/extensions/source/propctrlr/formmetadata.hxx +++ b/extensions/source/propctrlr/formmetadata.hxx @@ -47,13 +47,13 @@ namespace pcr // IPropertyInfoService virtual sal_Int32 getPropertyId(const String& _rName) const; virtual String getPropertyTranslation(sal_Int32 _nId) const; - virtual rtl::OString getPropertyHelpId(sal_Int32 _nId) const; + virtual OString getPropertyHelpId(sal_Int32 _nId) const; virtual sal_Int16 getPropertyPos(sal_Int32 _nId) const; virtual sal_uInt32 getPropertyUIFlags(sal_Int32 _nId) const; - virtual ::std::vector< ::rtl::OUString > getPropertyEnumRepresentations(sal_Int32 _nId) const; + virtual ::std::vector< OUString > getPropertyEnumRepresentations(sal_Int32 _nId) const; virtual String getPropertyName( sal_Int32 _nPropId ); - virtual sal_Bool isComposeable( const ::rtl::OUString& _rPropertyName ) const; + virtual sal_Bool isComposeable( const OUString& _rPropertyName ) const; protected: static const OPropertyInfoImpl* getPropertyInfo(); @@ -91,10 +91,10 @@ namespace pcr protected: // IPropertyEnumRepresentation implementqation - virtual ::std::vector< ::rtl::OUString > + virtual ::std::vector< OUString > SAL_CALL getDescriptions() const; - virtual void SAL_CALL getValueFromDescription( const ::rtl::OUString& _rDescription, ::com::sun::star::uno::Any& _out_rValue ) const; - virtual ::rtl::OUString SAL_CALL getDescriptionForValue( const ::com::sun::star::uno::Any& _rEnumValue ) const; + virtual void SAL_CALL getValueFromDescription( const OUString& _rDescription, ::com::sun::star::uno::Any& _out_rValue ) const; + virtual OUString SAL_CALL getDescriptionForValue( const ::com::sun::star::uno::Any& _rEnumValue ) const; // IReference implementqation virtual oslInterlockedCount SAL_CALL acquire(); diff --git a/extensions/source/propctrlr/genericpropertyhandler.cxx b/extensions/source/propctrlr/genericpropertyhandler.cxx index 703c0985c9a2..cb9d4704e8c9 100644 --- a/extensions/source/propctrlr/genericpropertyhandler.cxx +++ b/extensions/source/propctrlr/genericpropertyhandler.cxx @@ -75,10 +75,10 @@ namespace pcr EnumRepresentation( const Reference< XComponentContext >& _rxContext, const Type& _rEnumType ); // IPropertyEnumRepresentation implementqation - virtual ::std::vector< ::rtl::OUString > + virtual ::std::vector< OUString > SAL_CALL getDescriptions() const; - virtual void SAL_CALL getValueFromDescription( const ::rtl::OUString& _rDescription, ::com::sun::star::uno::Any& _out_rValue ) const; - virtual ::rtl::OUString SAL_CALL getDescriptionForValue( const ::com::sun::star::uno::Any& _rEnumValue ) const; + virtual void SAL_CALL getValueFromDescription( const OUString& _rDescription, ::com::sun::star::uno::Any& _out_rValue ) const; + virtual OUString SAL_CALL getDescriptionForValue( const ::com::sun::star::uno::Any& _rEnumValue ) const; // IReference implementqation virtual oslInterlockedCount SAL_CALL acquire(); @@ -103,7 +103,7 @@ namespace pcr if ( _rxContext.is() ) { Reference< XHierarchicalNameAccess > xTypeDescProv( - _rxContext->getValueByName( ::rtl::OUString( "/singletons/com.sun.star.reflection.theTypeDescriptionManager" ) ), + _rxContext->getValueByName( OUString( "/singletons/com.sun.star.reflection.theTypeDescriptionManager" ) ), UNO_QUERY_THROW ); m_xTypeDescription = Reference< XEnumTypeDescription >( xTypeDescProv->getByHierarchicalName( m_aEnumType.getTypeName() ), UNO_QUERY_THROW ); @@ -116,9 +116,9 @@ namespace pcr } //-------------------------------------------------------------------- - ::std::vector< ::rtl::OUString > EnumRepresentation::getDescriptions() const + ::std::vector< OUString > EnumRepresentation::getDescriptions() const { - Sequence< ::rtl::OUString > aNames; + Sequence< OUString > aNames; try { if ( m_xTypeDescription.is() ) @@ -129,7 +129,7 @@ namespace pcr OSL_FAIL( "EnumRepresentation::getDescriptions: caught an exception!" ); } - return ::std::vector< ::rtl::OUString >( aNames.getConstArray(), aNames.getConstArray() + aNames.getLength() ); + return ::std::vector< OUString >( aNames.getConstArray(), aNames.getConstArray() + aNames.getLength() ); } //-------------------------------------------------------------------- @@ -148,9 +148,9 @@ namespace pcr } //-------------------------------------------------------------------- - void EnumRepresentation::getValueFromDescription( const ::rtl::OUString& _rDescription, Any& _out_rValue ) const + void EnumRepresentation::getValueFromDescription( const OUString& _rDescription, Any& _out_rValue ) const { - ::std::vector< ::rtl::OUString > aDescriptions( getDescriptions() ); + ::std::vector< OUString > aDescriptions( getDescriptions() ); sal_Int32 index = ::std::find( aDescriptions.begin(), aDescriptions.end(), _rDescription ) - aDescriptions.begin(); @@ -168,9 +168,9 @@ namespace pcr } //-------------------------------------------------------------------- - ::rtl::OUString EnumRepresentation::getDescriptionForValue( const Any& _rEnumValue ) const + OUString EnumRepresentation::getDescriptionForValue( const Any& _rEnumValue ) const { - ::rtl::OUString sDescription; + OUString sDescription; sal_Int32 nAsInt = 0; OSL_VERIFY( ::cppu::enum2int( nAsInt, _rEnumValue ) ); @@ -181,7 +181,7 @@ namespace pcr sal_Int32 index = ::std::find( aValues.getConstArray(), aValues.getConstArray() + aValues.getLength(), nAsInt ) - aValues.getConstArray(); - ::std::vector< ::rtl::OUString > aDescriptions( getDescriptions() ); + ::std::vector< OUString > aDescriptions( getDescriptions() ); if ( ( index >= 0 ) && ( index < (sal_Int32)aDescriptions.size() ) ) sDescription = aDescriptions[ index ]; else @@ -229,7 +229,7 @@ namespace pcr virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException); protected: - void impl_dispatch_throw( const ::rtl::OUString& _rURL ); + void impl_dispatch_throw( const OUString& _rURL ); }; //-------------------------------------------------------------------- @@ -263,9 +263,9 @@ namespace pcr Reference< XPropertyControl > xControl( rEvent.Source, UNO_QUERY_THROW ); Any aControlValue( xControl->getValue() ); - ::rtl::OUString sURL; + OUString sURL; if ( aControlValue.hasValue() && !( aControlValue >>= sURL ) ) - throw RuntimeException( ::rtl::OUString(), *this ); + throw RuntimeException( OUString(), *this ); if ( sURL.isEmpty() ) return; @@ -280,17 +280,17 @@ namespace pcr } //-------------------------------------------------------------------- - void UrlClickHandler::impl_dispatch_throw( const ::rtl::OUString& _rURL ) + void UrlClickHandler::impl_dispatch_throw( const OUString& _rURL ) { Reference< XURLTransformer > xTransformer( URLTransformer::create(m_aContext.getUNOContext()) ); - URL aURL; aURL.Complete = ::rtl::OUString( ".uno:OpenHyperlink" ); + URL aURL; aURL.Complete = OUString( ".uno:OpenHyperlink" ); xTransformer->parseStrict( aURL ); Reference< XDesktop2 > xDispProv = Desktop::create( m_aContext.getUNOContext() ); - Reference< XDispatch > xDispatch( xDispProv->queryDispatch( aURL, ::rtl::OUString(), 0 ), UNO_QUERY_THROW ); + Reference< XDispatch > xDispatch( xDispProv->queryDispatch( aURL, OUString(), 0 ), UNO_QUERY_THROW ); Sequence< PropertyValue > aDispatchArgs(1); - aDispatchArgs[0].Name = ::rtl::OUString("URL"); + aDispatchArgs[0].Name = OUString("URL"); aDispatchArgs[0].Value <<= _rURL; xDispatch->dispatch( aURL, aDispatchArgs ); @@ -319,35 +319,35 @@ namespace pcr } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL GenericPropertyHandler::getImplementationName( ) throw (RuntimeException) + OUString SAL_CALL GenericPropertyHandler::getImplementationName( ) throw (RuntimeException) { return getImplementationName_static(); } //-------------------------------------------------------------------- - ::sal_Bool SAL_CALL GenericPropertyHandler::supportsService( const ::rtl::OUString& ServiceName ) throw (RuntimeException) + ::sal_Bool SAL_CALL GenericPropertyHandler::supportsService( const OUString& ServiceName ) throw (RuntimeException) { - StlSyntaxSequence< ::rtl::OUString > aAllServices( getSupportedServiceNames() ); + StlSyntaxSequence< OUString > aAllServices( getSupportedServiceNames() ); return ::std::find( aAllServices.begin(), aAllServices.end(), ServiceName ) != aAllServices.end(); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL GenericPropertyHandler::getSupportedServiceNames( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL GenericPropertyHandler::getSupportedServiceNames( ) throw (RuntimeException) { return getSupportedServiceNames_static(); } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL GenericPropertyHandler::getImplementationName_static( ) throw (RuntimeException) + OUString SAL_CALL GenericPropertyHandler::getImplementationName_static( ) throw (RuntimeException) { - return ::rtl::OUString( "com.sun.star.comp.extensions.GenericPropertyHandler" ); + return OUString( "com.sun.star.comp.extensions.GenericPropertyHandler" ); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL GenericPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL GenericPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSupported( 1 ); - aSupported[0] = ::rtl::OUString( "com.sun.star.inspection.GenericPropertyHandler" ); + Sequence< OUString > aSupported( 1 ); + aSupported[0] = OUString( "com.sun.star.inspection.GenericPropertyHandler" ); return aSupported; } @@ -369,7 +369,7 @@ namespace pcr ::cppu::OInterfaceIteratorHelper iterRemove( m_aPropertyListeners ); ::cppu::OInterfaceIteratorHelper iterReAdd( m_aPropertyListeners ); // this holds a copy of the container ... while ( iterRemove.hasMoreElements() ) - m_xComponent->removePropertyChangeListener( ::rtl::OUString(), static_cast< XPropertyChangeListener* >( iterRemove.next() ) ); + m_xComponent->removePropertyChangeListener( OUString(), static_cast< XPropertyChangeListener* >( iterRemove.next() ) ); m_xComponentIntrospectionAccess.clear(); m_xComponent.clear(); @@ -380,7 +380,7 @@ namespace pcr Reference< XIntrospectionAccess > xIntrospectionAccess( xIntrospection->inspect( makeAny( _rxIntrospectee ) ) ); if ( !xIntrospectionAccess.is() ) - throw RuntimeException( ::rtl::OUString( "The introspection service could not handle the given component." ), *this ); + throw RuntimeException( OUString( "The introspection service could not handle the given component." ), *this ); m_xComponent = Reference< XPropertySet >( xIntrospectionAccess->queryAdapter( XPropertySet::static_type() ), UNO_QUERY_THROW ); // now that we survived so far, remember m_xComponentIntrospectionAccess @@ -392,11 +392,11 @@ namespace pcr // re-add the property change listeners while ( iterReAdd.hasMoreElements() ) - m_xComponent->addPropertyChangeListener( ::rtl::OUString(), static_cast< XPropertyChangeListener* >( iterReAdd.next() ) ); + m_xComponent->addPropertyChangeListener( OUString(), static_cast< XPropertyChangeListener* >( iterReAdd.next() ) ); } //-------------------------------------------------------------------- - Any SAL_CALL GenericPropertyHandler::getPropertyValue( const ::rtl::OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL GenericPropertyHandler::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_xComponent.is() ) @@ -406,7 +406,7 @@ namespace pcr } //-------------------------------------------------------------------- - void SAL_CALL GenericPropertyHandler::setPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) + void SAL_CALL GenericPropertyHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_xComponent.is() ) @@ -425,7 +425,7 @@ namespace pcr } //-------------------------------------------------------------------- - Any SAL_CALL GenericPropertyHandler::convertToPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL GenericPropertyHandler::convertToPropertyValue( const OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); const_cast< GenericPropertyHandler* >( this )->impl_ensurePropertyMap(); @@ -441,7 +441,7 @@ namespace pcr if ( pos->second.Type.getTypeClass() == TypeClass_ENUM ) { - ::rtl::OUString sControlValue; + OUString sControlValue; OSL_VERIFY( _rControlValue >>= sControlValue ); impl_getEnumConverter( pos->second.Type )->getValueFromDescription( sControlValue, aPropertyValue ); } @@ -452,7 +452,7 @@ namespace pcr } //-------------------------------------------------------------------- - Any SAL_CALL GenericPropertyHandler::convertToControlValue( const ::rtl::OUString& _rPropertyName, const Any& _rPropertyValue, const Type& _rControlValueType ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL GenericPropertyHandler::convertToControlValue( const OUString& _rPropertyName, const Any& _rPropertyValue, const Type& _rControlValueType ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); const_cast< GenericPropertyHandler* >( this )->impl_ensurePropertyMap(); @@ -476,7 +476,7 @@ namespace pcr } //-------------------------------------------------------------------- - PropertyState SAL_CALL GenericPropertyHandler::getPropertyState( const ::rtl::OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) + PropertyState SAL_CALL GenericPropertyHandler::getPropertyState( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyState eState = PropertyState_DIRECT_VALUE; @@ -497,7 +497,7 @@ namespace pcr { try { - m_xComponent->addPropertyChangeListener( ::rtl::OUString(), _rxListener ); + m_xComponent->addPropertyChangeListener( OUString(), _rxListener ); } catch( const UnknownPropertyException& ) { @@ -514,7 +514,7 @@ namespace pcr { try { - m_xComponent->removePropertyChangeListener( ::rtl::OUString(), _rxListener ); + m_xComponent->removePropertyChangeListener( OUString(), _rxListener ); } catch( const UnknownPropertyException& ) { @@ -605,24 +605,24 @@ namespace pcr } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL GenericPropertyHandler::getSupersededProperties( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL GenericPropertyHandler::getSupersededProperties( ) throw (RuntimeException) { // no superseded properties at all. This handler offers the very basic PropertyHandler // functionality, so it's much more likely that other handlers want to supersede // *our* properties .... - return Sequence< ::rtl::OUString >( ); + return Sequence< OUString >( ); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL GenericPropertyHandler::getActuatingProperties( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL GenericPropertyHandler::getActuatingProperties( ) throw (RuntimeException) { // This basic PropertyHandler implementation is too dumb^Wgeneric to know // anything about property dependencies - return Sequence< ::rtl::OUString >( ); + return Sequence< OUString >( ); } //-------------------------------------------------------------------- - LineDescriptor SAL_CALL GenericPropertyHandler::describePropertyLine( const ::rtl::OUString& _rPropertyName, + LineDescriptor SAL_CALL GenericPropertyHandler::describePropertyLine( const OUString& _rPropertyName, const Reference< XPropertyControlFactory >& _rxControlFactory ) throw (UnknownPropertyException, NullPointerException, RuntimeException) { @@ -667,25 +667,25 @@ namespace pcr if ( !aDescriptor.Control.is() ) PropertyHandlerHelper::describePropertyLine( pos->second, aDescriptor, _rxControlFactory ); - aDescriptor.Category = ::rtl::OUString( "General" ); + aDescriptor.Category = OUString( "General" ); return aDescriptor; } //-------------------------------------------------------------------- - ::sal_Bool SAL_CALL GenericPropertyHandler::isComposable( const ::rtl::OUString& /*_rPropertyName*/ ) throw (UnknownPropertyException, RuntimeException) + ::sal_Bool SAL_CALL GenericPropertyHandler::isComposable( const OUString& /*_rPropertyName*/ ) throw (UnknownPropertyException, RuntimeException) { return sal_False; } //-------------------------------------------------------------------- - InteractiveSelectionResult SAL_CALL GenericPropertyHandler::onInteractivePropertySelection( const ::rtl::OUString& /*_rPropertyName*/, sal_Bool /*_bPrimary*/, Any& /*_rData*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/ ) throw (UnknownPropertyException, NullPointerException, RuntimeException) + InteractiveSelectionResult SAL_CALL GenericPropertyHandler::onInteractivePropertySelection( const OUString& /*_rPropertyName*/, sal_Bool /*_bPrimary*/, Any& /*_rData*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/ ) throw (UnknownPropertyException, NullPointerException, RuntimeException) { 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) + void SAL_CALL GenericPropertyHandler::actuatingPropertyChanged( const OUString& /*_rActuatingPropertyName*/, const Any& /*_rNewValue*/, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/, sal_Bool /*_bFirstTimeInit*/ ) throw (NullPointerException, RuntimeException) { OSL_FAIL( "GenericPropertyHandler::actuatingPropertyChanged: no no no, I did not register for any actuating properties!" ); } diff --git a/extensions/source/propctrlr/genericpropertyhandler.hxx b/extensions/source/propctrlr/genericpropertyhandler.hxx index 3ba0cb1fcace..f054a30c1dac 100644 --- a/extensions/source/propctrlr/genericpropertyhandler.hxx +++ b/extensions/source/propctrlr/genericpropertyhandler.hxx @@ -82,8 +82,8 @@ namespace pcr public: // XServiceInfo - static versions - static ::rtl::OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); + static OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > Create( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext ); protected: @@ -96,23 +96,23 @@ namespace pcr protected: // XPropertyHandler overridables virtual void SAL_CALL inspect( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxIntrospectee ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rControlValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rPropertyValue, const ::com::sun::star::uno::Type& _rControlValueType ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rControlValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rPropertyValue, const ::com::sun::star::uno::Type& _rControlValueType ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getSupportedProperties() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupersededProperties() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getActuatingProperties() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::inspection::LineDescriptor SAL_CALL describePropertyLine( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL isComposable( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getActuatingProperties() throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::inspection::LineDescriptor SAL_CALL describePropertyLine( const OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL isComposable( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::inspection::InteractiveSelectionResult - SAL_CALL onInteractivePropertySelection( const ::rtl::OUString& _rPropertyName, sal_Bool _bPrimary, ::com::sun::star::uno::Any& _rData, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL actuatingPropertyChanged( const ::rtl::OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, ::com::sun::star::uno::Any& _rData, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL suspend( sal_Bool _bSuspend ) throw (::com::sun::star::uno::RuntimeException); // XComponent @@ -120,9 +120,9 @@ namespace pcr virtual void SAL_CALL disposing(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); private: /** ensures that ->m_aProperties is initialized diff --git a/extensions/source/propctrlr/handlerhelper.cxx b/extensions/source/propctrlr/handlerhelper.cxx index 83568ad2286a..8561f818d6d6 100644 --- a/extensions/source/propctrlr/handlerhelper.cxx +++ b/extensions/source/propctrlr/handlerhelper.cxx @@ -74,7 +74,7 @@ namespace pcr // special handling for booleans (this will become a list) if ( _rProperty.Type.getTypeClass() == TypeClass_BOOLEAN ) { - ::std::vector< ::rtl::OUString > aListEntries; + ::std::vector< OUString > aListEntries; tools::StringListResource aRes(PcrRes(RID_RSC_ENUM_YESNO),aListEntries); _out_rDescriptor.Control = createListBoxControl( _rxControlFactory, aListEntries, bReadOnlyControl, sal_False ); return; @@ -117,7 +117,7 @@ namespace pcr { Reference< XPropertyControl > lcl_implCreateListLikeControl( const Reference< XPropertyControlFactory >& _rxControlFactory, - const ::std::vector< ::rtl::OUString >& _rInitialListEntries, + const ::std::vector< OUString >& _rInitialListEntries, sal_Bool _bReadOnlyControl, sal_Bool _bSorted, sal_Bool _bTrueIfListBoxFalseIfComboBox @@ -130,11 +130,11 @@ namespace pcr UNO_QUERY_THROW ); - ::std::vector< ::rtl::OUString > aInitialEntries( _rInitialListEntries ); + ::std::vector< OUString > aInitialEntries( _rInitialListEntries ); if ( _bSorted ) ::std::sort( aInitialEntries.begin(), aInitialEntries.end() ); - for ( ::std::vector< ::rtl::OUString >::const_iterator loop = aInitialEntries.begin(); + for ( ::std::vector< OUString >::const_iterator loop = aInitialEntries.begin(); loop != aInitialEntries.end(); ++loop ) @@ -145,14 +145,14 @@ namespace pcr //-------------------------------------------------------------------- Reference< XPropertyControl > PropertyHandlerHelper::createListBoxControl( const Reference< XPropertyControlFactory >& _rxControlFactory, - const ::std::vector< ::rtl::OUString >& _rInitialListEntries, sal_Bool _bReadOnlyControl, sal_Bool _bSorted ) + const ::std::vector< OUString >& _rInitialListEntries, sal_Bool _bReadOnlyControl, sal_Bool _bSorted ) { return lcl_implCreateListLikeControl( _rxControlFactory, _rInitialListEntries, _bReadOnlyControl, _bSorted, sal_True ); } //-------------------------------------------------------------------- Reference< XPropertyControl > PropertyHandlerHelper::createComboBoxControl( const Reference< XPropertyControlFactory >& _rxControlFactory, - const ::std::vector< ::rtl::OUString >& _rInitialListEntries, sal_Bool _bReadOnlyControl, sal_Bool _bSorted ) + const ::std::vector< OUString >& _rInitialListEntries, sal_Bool _bReadOnlyControl, sal_Bool _bSorted ) { return lcl_implCreateListLikeControl( _rxControlFactory, _rInitialListEntries, _bReadOnlyControl, _bSorted, sal_False ); } @@ -188,7 +188,7 @@ namespace pcr if ( _rControlValue.getValueType().getTypeClass() == TypeClass_STRING ) { - ::rtl::OUString sControlValue; + OUString sControlValue; _rControlValue >>= sControlValue; Reference< XStringRepresentation > xConversionHelper = StringRepresentation::create( _rxContext,_rxTypeConverter ); diff --git a/extensions/source/propctrlr/handlerhelper.hxx b/extensions/source/propctrlr/handlerhelper.hxx index 3d212affa8d0..b9a1d1aff5c9 100644 --- a/extensions/source/propctrlr/handlerhelper.hxx +++ b/extensions/source/propctrlr/handlerhelper.hxx @@ -95,7 +95,7 @@ namespace pcr static ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl > createListBoxControl( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory, - const ::std::vector< ::rtl::OUString >& _rInitialListEntries, + const ::std::vector< OUString >& _rInitialListEntries, sal_Bool _bReadOnlyControl, sal_Bool _bSorted ); @@ -121,7 +121,7 @@ namespace pcr static ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl > createComboBoxControl( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory, - const ::std::vector< ::rtl::OUString >& _rInitialListEntries, + const ::std::vector< OUString >& _rInitialListEntries, sal_Bool _bReadOnlyControl, sal_Bool _bSorted ); diff --git a/extensions/source/propctrlr/inspectormodelbase.cxx b/extensions/source/propctrlr/inspectormodelbase.cxx index 671fdddd2cbe..d8ebe0780ec0 100644 --- a/extensions/source/propctrlr/inspectormodelbase.cxx +++ b/extensions/source/propctrlr/inspectormodelbase.cxx @@ -98,25 +98,25 @@ namespace pcr ,m_bIsReadOnly( sal_False ) { registerProperty( - ::rtl::OUString( "HasHelpSection" ), + OUString( "HasHelpSection" ), MODEL_PROPERTY_ID_HAS_HELP_SECTION, PropertyAttribute::READONLY, &m_bHasHelpSection, ::getCppuType( &m_bHasHelpSection ) ); registerProperty( - ::rtl::OUString( "MinHelpTextLines" ), + OUString( "MinHelpTextLines" ), MODEL_PROPERTY_ID_MIN_HELP_TEXT_LINES, PropertyAttribute::READONLY, &m_nMinHelpTextLines, ::getCppuType( &m_nMinHelpTextLines ) ); registerProperty( - ::rtl::OUString( "MaxHelpTextLines" ), + OUString( "MaxHelpTextLines" ), MODEL_PROPERTY_ID_MAX_HELP_TEXT_LINES, PropertyAttribute::READONLY, &m_nMaxHelpTextLines, ::getCppuType( &m_nMaxHelpTextLines ) ); registerProperty( - ::rtl::OUString( "IsReadOnly" ), + OUString( "IsReadOnly" ), MODEL_PROPERTY_ID_IS_READ_ONLY, PropertyAttribute::BOUND, &m_bIsReadOnly, ::getCppuType( &m_bIsReadOnly ) @@ -235,10 +235,10 @@ namespace pcr } //-------------------------------------------------------------------- - ::sal_Bool SAL_CALL ImplInspectorModel::supportsService( const ::rtl::OUString& ServiceName ) throw (RuntimeException) + ::sal_Bool SAL_CALL ImplInspectorModel::supportsService( const OUString& ServiceName ) throw (RuntimeException) { - StlSyntaxSequence< ::rtl::OUString > aSupported( getSupportedServiceNames() ); - for ( StlSyntaxSequence< ::rtl::OUString >::const_iterator check = aSupported.begin(); + StlSyntaxSequence< OUString > aSupported( getSupportedServiceNames() ); + for ( StlSyntaxSequence< OUString >::const_iterator check = aSupported.begin(); check != aSupported.end(); ++check ) diff --git a/extensions/source/propctrlr/inspectormodelbase.hxx b/extensions/source/propctrlr/inspectormodelbase.hxx index a82e64601a94..bc12d78a7069 100644 --- a/extensions/source/propctrlr/inspectormodelbase.hxx +++ b/extensions/source/propctrlr/inspectormodelbase.hxx @@ -81,7 +81,7 @@ namespace pcr virtual void SAL_CALL setIsReadOnly( ::sal_Bool _IsReadOnly ) throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XServiceInfo - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); protected: void enableHelpSectionProperties( sal_Int32 _nMinHelpTextLines, sal_Int32 _nMaxHelpTextLines ); diff --git a/extensions/source/propctrlr/linedescriptor.hxx b/extensions/source/propctrlr/linedescriptor.hxx index 578897182d73..074ce565f444 100644 --- a/extensions/source/propctrlr/linedescriptor.hxx +++ b/extensions/source/propctrlr/linedescriptor.hxx @@ -32,7 +32,7 @@ namespace pcr //======================================================================== struct OLineDescriptor : public ::com::sun::star::inspection::LineDescriptor { - ::rtl::OUString sName; // the name of the property + OUString sName; // the name of the property ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyHandler > xPropertyHandler; // the handler for this property ::com::sun::star::uno::Any aValue; // the current value of the property diff --git a/extensions/source/propctrlr/listselectiondlg.cxx b/extensions/source/propctrlr/listselectiondlg.cxx index b5b88415cb22..75b040df8d9f 100644 --- a/extensions/source/propctrlr/listselectiondlg.cxx +++ b/extensions/source/propctrlr/listselectiondlg.cxx @@ -38,7 +38,7 @@ namespace pcr //==================================================================== //-------------------------------------------------------------------- ListSelectionDialog::ListSelectionDialog( Window* _pParent, const Reference< XPropertySet >& _rxListBox, - const ::rtl::OUString& _rPropertyName, const String& _rPropertyUIName ) + const OUString& _rPropertyName, const String& _rPropertyUIName ) :ModalDialog( _pParent, PcrRes( RID_DLG_SELECTION ) ) ,m_aLabel ( this, PcrRes( FT_ENTRIES ) ) ,m_aEntries ( this, PcrRes( LB_ENTRIES ) ) @@ -85,7 +85,7 @@ namespace pcr m_aEntries.EnableMultiSelection( bMultiSelection ); // fill the list box with all entries - Sequence< ::rtl::OUString > aListEntries; + Sequence< OUString > aListEntries; OSL_VERIFY( m_xListBox->getPropertyValue( PROPERTY_STRINGITEMLIST ) >>= aListEntries ); fillEntryList( aListEntries ); @@ -120,11 +120,11 @@ namespace pcr } //-------------------------------------------------------------------- - void ListSelectionDialog::fillEntryList( const Sequence< ::rtl::OUString >& _rListEntries ) + void ListSelectionDialog::fillEntryList( const Sequence< OUString >& _rListEntries ) { m_aEntries.Clear(); - const ::rtl::OUString* _pListEntries = _rListEntries.getConstArray(); - const ::rtl::OUString* _pListEntriesEnd = _rListEntries.getConstArray() + _rListEntries.getLength(); + const OUString* _pListEntries = _rListEntries.getConstArray(); + const OUString* _pListEntriesEnd = _rListEntries.getConstArray() + _rListEntries.getLength(); for ( ; _pListEntries < _pListEntriesEnd; ++_pListEntries ) m_aEntries.InsertEntry( *_pListEntries ); } diff --git a/extensions/source/propctrlr/listselectiondlg.hxx b/extensions/source/propctrlr/listselectiondlg.hxx index 67083efed777..79c4e9c589c6 100644 --- a/extensions/source/propctrlr/listselectiondlg.hxx +++ b/extensions/source/propctrlr/listselectiondlg.hxx @@ -46,13 +46,13 @@ namespace pcr ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xListBox; - ::rtl::OUString m_sPropertyName; + OUString m_sPropertyName; public: ListSelectionDialog( Window* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxListBox, - const ::rtl::OUString& _rPropertyName, + const OUString& _rPropertyName, const String& _rPropertyUIName ); @@ -63,7 +63,7 @@ namespace pcr void initialize( ); void commitSelection(); - void fillEntryList ( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rListEntries ); + void fillEntryList ( const ::com::sun::star::uno::Sequence< OUString >& _rListEntries ); void selectEntries ( const ::com::sun::star::uno::Sequence< sal_Int16 >& /* [in ] */ _rSelection ); void collectSelection( ::com::sun::star::uno::Sequence< sal_Int16 >& /* [out] */ _rSelection ); diff --git a/extensions/source/propctrlr/newdatatype.cxx b/extensions/source/propctrlr/newdatatype.cxx index c0bc996d5bce..0da7a156f6fc 100644 --- a/extensions/source/propctrlr/newdatatype.cxx +++ b/extensions/source/propctrlr/newdatatype.cxx @@ -32,7 +32,7 @@ namespace pcr //= NewDataTypeDialog //==================================================================== //-------------------------------------------------------------------- - NewDataTypeDialog::NewDataTypeDialog( Window* _pParent, const ::rtl::OUString& _rNameBase, const ::std::vector< ::rtl::OUString >& _rProhibitedNames ) + NewDataTypeDialog::NewDataTypeDialog( Window* _pParent, const OUString& _rNameBase, const ::std::vector< OUString >& _rProhibitedNames ) :ModalDialog( _pParent, PcrRes( RID_DLG_NEW_DATA_TYPE ) ) ,m_aLabel ( this, PcrRes( FT_LABEL ) ) ,m_aName ( this, PcrRes( ED_NAME ) ) @@ -64,7 +64,7 @@ namespace pcr sal_Int32 nPostfixNumber = 1; do { - ( sInitialName = sNameBase ) += rtl::OUString::valueOf(nPostfixNumber++); + ( sInitialName = sNameBase ) += OUString::valueOf(nPostfixNumber++); } while ( m_aProhibitedNames.find( sInitialName ) != m_aProhibitedNames.end() ); diff --git a/extensions/source/propctrlr/newdatatype.hxx b/extensions/source/propctrlr/newdatatype.hxx index 57395679da52..b78fe3774e8a 100644 --- a/extensions/source/propctrlr/newdatatype.hxx +++ b/extensions/source/propctrlr/newdatatype.hxx @@ -44,11 +44,11 @@ namespace pcr OKButton m_aOK; CancelButton m_aCancel; - ::std::set< ::rtl::OUString > + ::std::set< OUString > m_aProhibitedNames; public: - NewDataTypeDialog( Window* _pParent, const ::rtl::OUString& _rNameBase, const ::std::vector< ::rtl::OUString >& _rProhibitedNames ); + NewDataTypeDialog( Window* _pParent, const OUString& _rNameBase, const ::std::vector< OUString >& _rProhibitedNames ); inline String GetName() const { return m_aName.GetText(); } diff --git a/extensions/source/propctrlr/objectinspectormodel.cxx b/extensions/source/propctrlr/objectinspectormodel.cxx index 68d22900ad86..edd9f883f3cd 100644 --- a/extensions/source/propctrlr/objectinspectormodel.cxx +++ b/extensions/source/propctrlr/objectinspectormodel.cxx @@ -64,18 +64,18 @@ namespace pcr // XObjectInspectorModel virtual Sequence< Any > SAL_CALL getHandlerFactories() throw (RuntimeException); virtual Sequence< PropertyCategoryDescriptor > SAL_CALL describeCategories( ) throw (RuntimeException); - virtual ::sal_Int32 SAL_CALL getPropertyOrderIndex( const ::rtl::OUString& PropertyName ) throw (RuntimeException); + virtual ::sal_Int32 SAL_CALL getPropertyOrderIndex( const OUString& PropertyName ) throw (RuntimeException); // XInitialization virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (RuntimeException); - virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (RuntimeException); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException); // XServiceInfo - static versions - static ::rtl::OUString getImplementationName_static( ) throw(RuntimeException); - static Sequence< ::rtl::OUString > getSupportedServiceNames_static( ) throw(RuntimeException); + static OUString getImplementationName_static( ) throw(RuntimeException); + static Sequence< OUString > getSupportedServiceNames_static( ) throw(RuntimeException); static Reference< XInterface > SAL_CALL Create(const Reference< XComponentContext >&); @@ -112,7 +112,7 @@ namespace pcr } //-------------------------------------------------------------------- - ::sal_Int32 SAL_CALL ObjectInspectorModel::getPropertyOrderIndex( const ::rtl::OUString& /*PropertyName*/ ) throw (RuntimeException) + ::sal_Int32 SAL_CALL ObjectInspectorModel::getPropertyOrderIndex( const OUString& /*PropertyName*/ ) throw (RuntimeException) { // no ordering provided by this default implementation return 0; @@ -154,28 +154,28 @@ namespace pcr } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL ObjectInspectorModel::getImplementationName( ) throw (RuntimeException) + OUString SAL_CALL ObjectInspectorModel::getImplementationName( ) throw (RuntimeException) { return getImplementationName_static(); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL ObjectInspectorModel::getSupportedServiceNames( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL ObjectInspectorModel::getSupportedServiceNames( ) throw (RuntimeException) { return getSupportedServiceNames_static(); } //-------------------------------------------------------------------- - ::rtl::OUString ObjectInspectorModel::getImplementationName_static( ) throw(RuntimeException) + OUString ObjectInspectorModel::getImplementationName_static( ) throw(RuntimeException) { - return ::rtl::OUString( "org.openoffice.comp.extensions.ObjectInspectorModel" ); + return OUString( "org.openoffice.comp.extensions.ObjectInspectorModel" ); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > ObjectInspectorModel::getSupportedServiceNames_static( ) throw(RuntimeException) + Sequence< OUString > ObjectInspectorModel::getSupportedServiceNames_static( ) throw(RuntimeException) { - ::rtl::OUString sService( "com.sun.star.inspection.ObjectInspectorModel" ); - return Sequence< ::rtl::OUString >( &sService, 1 ); + OUString sService( "com.sun.star.inspection.ObjectInspectorModel" ); + return Sequence< OUString >( &sService, 1 ); } //-------------------------------------------------------------------- @@ -188,7 +188,7 @@ namespace pcr void ObjectInspectorModel::createDefault() { m_aFactories.realloc( 1 ); - m_aFactories[0] <<= ::rtl::OUString( "com.sun.star.inspection.GenericPropertyHandler" ); + m_aFactories[0] <<= OUString( "com.sun.star.inspection.GenericPropertyHandler" ); } //-------------------------------------------------------------------- @@ -214,7 +214,7 @@ namespace pcr void ObjectInspectorModel::impl_verifyArgument_throw( bool _bCondition, sal_Int16 _nArgumentPosition ) { if ( !_bCondition ) - throw IllegalArgumentException( ::rtl::OUString(), *this, _nArgumentPosition ); + throw IllegalArgumentException( OUString(), *this, _nArgumentPosition ); } //........................................................................ diff --git a/extensions/source/propctrlr/pcrcommon.cxx b/extensions/source/propctrlr/pcrcommon.cxx index aee7ce160773..1fef1572cc1c 100644 --- a/extensions/source/propctrlr/pcrcommon.cxx +++ b/extensions/source/propctrlr/pcrcommon.cxx @@ -36,20 +36,20 @@ namespace pcr //= HelpIdUrl //======================================================================== //------------------------------------------------------------------------ - rtl::OString HelpIdUrl::getHelpId( const ::rtl::OUString& _rHelpURL ) + OString HelpIdUrl::getHelpId( const OUString& _rHelpURL ) { INetURLObject aHID( _rHelpURL ); if ( aHID.GetProtocol() == INET_PROT_HID ) - return rtl::OUStringToOString( aHID.GetURLPath(), RTL_TEXTENCODING_UTF8 ); + return OUStringToOString( aHID.GetURLPath(), RTL_TEXTENCODING_UTF8 ); else - return rtl::OUStringToOString( _rHelpURL, RTL_TEXTENCODING_UTF8 ); + return OUStringToOString( _rHelpURL, RTL_TEXTENCODING_UTF8 ); } //------------------------------------------------------------------------ - ::rtl::OUString HelpIdUrl::getHelpURL( const rtl::OString& sHelpId ) + OUString HelpIdUrl::getHelpURL( const OString& sHelpId ) { - ::rtl::OUStringBuffer aBuffer; - ::rtl::OUString aTmp( rtl::OStringToOUString(sHelpId, RTL_TEXTENCODING_UTF8) ); + OUStringBuffer aBuffer; + OUString aTmp( OStringToOUString(sHelpId, RTL_TEXTENCODING_UTF8) ); INetURLObject aHID( aTmp ); if ( aHID.GetProtocol() == INET_PROT_NOT_VALID ) aBuffer.appendAscii( INET_HID_SCHEME ); diff --git a/extensions/source/propctrlr/pcrcommon.hxx b/extensions/source/propctrlr/pcrcommon.hxx index 6412839fb0a7..e3216ad295ec 100644 --- a/extensions/source/propctrlr/pcrcommon.hxx +++ b/extensions/source/propctrlr/pcrcommon.hxx @@ -66,8 +66,8 @@ namespace pcr class HelpIdUrl { public: - static rtl::OString getHelpId( const ::rtl::OUString& _rHelpURL ); - static ::rtl::OUString getHelpURL( const rtl::OString& ); + static OString getHelpId( const OUString& _rHelpURL ); + static OUString getHelpURL( const OString& ); }; //==================================================================== diff --git a/extensions/source/propctrlr/pcrcommontypes.hxx b/extensions/source/propctrlr/pcrcommontypes.hxx index 52b476e12f9f..cb2a560de9b8 100644 --- a/extensions/source/propctrlr/pcrcommontypes.hxx +++ b/extensions/source/propctrlr/pcrcommontypes.hxx @@ -30,7 +30,7 @@ namespace pcr { //........................................................................ - typedef ::boost::unordered_map< ::rtl::OUString, ::com::sun::star::beans::Property, ::rtl::OUStringHash > + typedef ::boost::unordered_map< OUString, ::com::sun::star::beans::Property, OUStringHash > PropertyMap; //........................................................................ diff --git a/extensions/source/propctrlr/pcrcomponentcontext.cxx b/extensions/source/propctrlr/pcrcomponentcontext.cxx index b05e71b48f5e..95af777606c0 100644 --- a/extensions/source/propctrlr/pcrcomponentcontext.cxx +++ b/extensions/source/propctrlr/pcrcomponentcontext.cxx @@ -55,7 +55,7 @@ namespace pcr } //------------------------------------------------------------------------ - Any ComponentContext::getContextValueByName( const ::rtl::OUString& _rName ) const + Any ComponentContext::getContextValueByName( const OUString& _rName ) const { Any aReturn; try @@ -70,7 +70,7 @@ namespace pcr } //------------------------------------------------------------------------ - Reference< XInterface > ComponentContext::createComponent( const ::rtl::OUString& _rServiceName ) const + Reference< XInterface > ComponentContext::createComponent( const OUString& _rServiceName ) const { Reference< XInterface > xComponent( m_xORB->createInstanceWithContext( _rServiceName, m_xContext ) diff --git a/extensions/source/propctrlr/pcrcomponentcontext.hxx b/extensions/source/propctrlr/pcrcomponentcontext.hxx index 51476febdfa2..e26a675e6d1b 100644 --- a/extensions/source/propctrlr/pcrcomponentcontext.hxx +++ b/extensions/source/propctrlr/pcrcomponentcontext.hxx @@ -66,7 +66,7 @@ namespace pcr <TRUE/> if and only if the component could be successfully created */ template < class INTERFACE > - bool createComponent( const ::rtl::OUString& _rServiceName, ::com::sun::star::uno::Reference< INTERFACE >& _out_rxComponent ) const + bool createComponent( const OUString& _rServiceName, ::com::sun::star::uno::Reference< INTERFACE >& _out_rxComponent ) const { _out_rxComponent.clear(); _out_rxComponent = _out_rxComponent.query( @@ -83,7 +83,7 @@ namespace pcr template < class INTERFACE > bool createComponent( const sal_Char* _pAsciiServiceName, ::com::sun::star::uno::Reference< INTERFACE >& _out_rxComponent ) const { - return createComponent( ::rtl::OUString::createFromAscii( _pAsciiServiceName ), _out_rxComponent ); + return createComponent( OUString::createFromAscii( _pAsciiServiceName ), _out_rxComponent ); } /** creates a component using our component factory/context @@ -95,7 +95,7 @@ namespace pcr @return the newly created component. Is never <NULL/>. */ - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createComponent( const ::rtl::OUString& _rServiceName ) const; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createComponent( const OUString& _rServiceName ) const; /** creates a component using our component factory/context @@ -108,7 +108,7 @@ namespace pcr */ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createComponent( const sal_Char* _pAsciiServiceName ) const { - return createComponent( ::rtl::OUString::createFromAscii( _pAsciiServiceName ) ); + return createComponent( OUString::createFromAscii( _pAsciiServiceName ) ); } /** returns the ->XMultiServiceFactory interface of ->m_xORB, for passing to @@ -128,7 +128,7 @@ namespace pcr @seealso getContextValueByAsciiName */ ::com::sun::star::uno::Any - getContextValueByName( const ::rtl::OUString& _rName ) const; + getContextValueByName( const OUString& _rName ) const; /** retrieves a value from our component context, specified by 8-bit ASCII string @param _rName @@ -141,7 +141,7 @@ namespace pcr inline ::com::sun::star::uno::Any getContextValueByAsciiName( const sal_Char* _pAsciiName ) const { - return getContextValueByName( ::rtl::OUString::createFromAscii( _pAsciiName ) ); + return getContextValueByName( OUString::createFromAscii( _pAsciiName ) ); } /** retrieve context to create interfaces by the ctors diff --git a/extensions/source/propctrlr/pcrservices.cxx b/extensions/source/propctrlr/pcrservices.cxx index 1ba39549fc01..49caa26c0e94 100644 --- a/extensions/source/propctrlr/pcrservices.cxx +++ b/extensions/source/propctrlr/pcrservices.cxx @@ -91,7 +91,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL pcr_component_getFactory( if (pServiceManager && pImplementationName) { xRet = ::pcr::PcrModule::getInstance().getComponentFactory( - ::rtl::OUString::createFromAscii(pImplementationName)); + OUString::createFromAscii(pImplementationName)); } if (xRet.is()) diff --git a/extensions/source/propctrlr/pcrunodialogs.cxx b/extensions/source/propctrlr/pcrunodialogs.cxx index 8fa73ae40d3c..adf013ef2fc7 100644 --- a/extensions/source/propctrlr/pcrunodialogs.cxx +++ b/extensions/source/propctrlr/pcrunodialogs.cxx @@ -78,15 +78,15 @@ namespace pcr } //--------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OTabOrderDialog::getImplementationName() throw(RuntimeException) + OUString SAL_CALL OTabOrderDialog::getImplementationName() throw(RuntimeException) { return getImplementationName_static(); } //--------------------------------------------------------------------- - ::rtl::OUString OTabOrderDialog::getImplementationName_static() throw(RuntimeException) + OUString OTabOrderDialog::getImplementationName_static() throw(RuntimeException) { - return ::rtl::OUString("org.openoffice.comp.form.ui.OTabOrderDialog"); + return OUString("org.openoffice.comp.form.ui.OTabOrderDialog"); } //--------------------------------------------------------------------- @@ -99,7 +99,7 @@ namespace pcr ::comphelper::StringSequence OTabOrderDialog::getSupportedServiceNames_static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString( "com.sun.star.form.ui.TabOrderDialog" ); + aSupported.getArray()[0] = OUString( "com.sun.star.form.ui.TabOrderDialog" ); return aSupported; } diff --git a/extensions/source/propctrlr/pcrunodialogs.hxx b/extensions/source/propctrlr/pcrunodialogs.hxx index 5d51743b5755..8c10693aa711 100644 --- a/extensions/source/propctrlr/pcrunodialogs.hxx +++ b/extensions/source/propctrlr/pcrunodialogs.hxx @@ -57,12 +57,12 @@ namespace pcr virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - static methods - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static(void) throw( ::com::sun::star::uno::RuntimeException ); - static ::rtl::OUString getImplementationName_static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static(void) throw( ::com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >&); diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx index 61bcb4f020df..6c628a1c8250 100644 --- a/extensions/source/propctrlr/propcontroller.cxx +++ b/extensions/source/propctrlr/propcontroller.cxx @@ -217,11 +217,11 @@ namespace pcr // dynamically - fine with us return; - void (SAL_CALL XPropertySet::*pListenerOperation)( const ::rtl::OUString&, const Reference< XPropertyChangeListener >& ) + void (SAL_CALL XPropertySet::*pListenerOperation)( const OUString&, const Reference< XPropertyChangeListener >& ) = _bDoListen ? &XPropertySet::addPropertyChangeListener : &XPropertySet::removePropertyChangeListener; (xModelProperties.get()->*pListenerOperation)( - ::rtl::OUString( "IsReadOnly" ), + OUString( "IsReadOnly" ), const_cast< OPropertyBrowserController* >( this ) ); } @@ -287,7 +287,7 @@ namespace pcr } //-------------------------------------------------------------------- - Reference< XDispatch > SAL_CALL OPropertyBrowserController::queryDispatch( const URL& /*URL*/, const ::rtl::OUString& /*TargetFrameName*/, ::sal_Int32 /*SearchFlags*/ ) throw (RuntimeException) + Reference< XDispatch > SAL_CALL OPropertyBrowserController::queryDispatch( const URL& /*URL*/, const OUString& /*TargetFrameName*/, ::sal_Int32 /*SearchFlags*/ ) throw (RuntimeException) { // we don't have any dispatches at all, right now return Reference< XDispatch >(); @@ -327,12 +327,12 @@ namespace pcr if ( arguments.size() == 1 ) { // constructor: "createWithModel( XObjectInspectorModel )" if ( !( arguments[0] >>= xModel ) ) - throw IllegalArgumentException( ::rtl::OUString(), *this, 0 ); + throw IllegalArgumentException( OUString(), *this, 0 ); createWithModel( xModel ); return; } - throw IllegalArgumentException( ::rtl::OUString(), *this, 0 ); + throw IllegalArgumentException( OUString(), *this, 0 ); } //------------------------------------------------------------------------ @@ -360,7 +360,7 @@ namespace pcr ::osl::MutexGuard aGuard( m_aMutex ); if (_rxFrame.is() && haveView()) - throw RuntimeException(::rtl::OUString("Unable to attach to a second frame."),*this); + throw RuntimeException(OUString("Unable to attach to a second frame."),*this); // revoke as focus listener from the old container window stopContainerWindowListening(); @@ -376,7 +376,7 @@ namespace pcr VCLXWindow* pContainerWindow = VCLXWindow::GetImplementation(xContainerWindow); Window* pParentWin = pContainerWindow ? pContainerWindow->GetWindow() : NULL; if (!pParentWin) - throw RuntimeException(::rtl::OUString("The frame is invalid. Unable to extract the container window."),*this); + throw RuntimeException(OUString("The frame is invalid. Unable to extract the container window."),*this); if ( Construct( pParentWin ) ) { @@ -497,7 +497,7 @@ namespace pcr //------------------------------------------------------------------------ void SAL_CALL OPropertyBrowserController::restoreViewData( const Any& Data ) throw(RuntimeException) { - ::rtl::OUString sPageSelection; + OUString sPageSelection; if ( ( Data >>= sPageSelection ) && !sPageSelection.isEmpty() ) { m_sPageSelection = sPageSelection; @@ -557,16 +557,16 @@ namespace pcr } //------------------------------------------------------------------------ - ::rtl::OUString SAL_CALL OPropertyBrowserController::getImplementationName( ) throw(RuntimeException) + OUString SAL_CALL OPropertyBrowserController::getImplementationName( ) throw(RuntimeException) { return getImplementationName_static(); } //------------------------------------------------------------------------ - sal_Bool SAL_CALL OPropertyBrowserController::supportsService( const ::rtl::OUString& ServiceName ) throw(RuntimeException) + sal_Bool SAL_CALL OPropertyBrowserController::supportsService( const OUString& ServiceName ) throw(RuntimeException) { - Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames()); - const ::rtl::OUString* pArray = aSupported.getConstArray(); + Sequence< OUString > aSupported(getSupportedServiceNames()); + const OUString* pArray = aSupported.getConstArray(); for (sal_Int32 i = 0; i < aSupported.getLength(); ++i, ++pArray) if (pArray->equals(ServiceName)) return sal_True; @@ -574,22 +574,22 @@ namespace pcr } //------------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL OPropertyBrowserController::getSupportedServiceNames( ) throw(RuntimeException) + Sequence< OUString > SAL_CALL OPropertyBrowserController::getSupportedServiceNames( ) throw(RuntimeException) { return getSupportedServiceNames_static(); } //------------------------------------------------------------------------ - ::rtl::OUString OPropertyBrowserController::getImplementationName_static( ) throw(RuntimeException) + OUString OPropertyBrowserController::getImplementationName_static( ) throw(RuntimeException) { - return ::rtl::OUString("org.openoffice.comp.extensions.ObjectInspector"); + return OUString("org.openoffice.comp.extensions.ObjectInspector"); } //------------------------------------------------------------------------ - Sequence< ::rtl::OUString > OPropertyBrowserController::getSupportedServiceNames_static( ) throw(RuntimeException) + Sequence< OUString > OPropertyBrowserController::getSupportedServiceNames_static( ) throw(RuntimeException) { - Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString("com.sun.star.inspection.ObjectInspector"); + Sequence< OUString > aSupported(1); + aSupported[0] = OUString("com.sun.star.inspection.ObjectInspector"); return aSupported; } @@ -655,8 +655,8 @@ namespace pcr if (!haveView()) return; - ::rtl::OUString sOldSelection = m_sPageSelection; - m_sPageSelection = ::rtl::OUString(); + OUString sOldSelection = m_sPageSelection; + m_sPageSelection = OUString(); const sal_uInt16 nCurrentPage = m_pView->getActivaPage(); if ( (sal_uInt16)-1 != nCurrentPage ) @@ -681,7 +681,7 @@ namespace pcr } //------------------------------------------------------------------------ - sal_uInt16 OPropertyBrowserController::impl_getPageIdForCategory_nothrow( const ::rtl::OUString& _rCategoryName ) const + sal_uInt16 OPropertyBrowserController::impl_getPageIdForCategory_nothrow( const OUString& _rCategoryName ) const { sal_uInt16 nPageId = (sal_uInt16)-1; HashString2Int16::const_iterator pagePos = m_aPageIds.find( _rCategoryName ); @@ -832,7 +832,7 @@ namespace pcr break; default: - throw IllegalArgumentException( ::rtl::OUString(), *this, 1 ); + throw IllegalArgumentException( OUString(), *this, 1 ); } return xControl; @@ -935,14 +935,14 @@ namespace pcr } //------------------------------------------------------------------------ - bool OPropertyBrowserController::impl_hasPropertyHandlerFor_nothrow( const ::rtl::OUString& _rPropertyName ) const + bool OPropertyBrowserController::impl_hasPropertyHandlerFor_nothrow( const OUString& _rPropertyName ) const { PropertyHandlerRepository::const_iterator handlerPos = m_aPropertyHandlers.find( _rPropertyName ); return ( handlerPos != m_aPropertyHandlers.end() ); } //------------------------------------------------------------------------ - OPropertyBrowserController::PropertyHandlerRef OPropertyBrowserController::impl_getHandlerForProperty_throw( const ::rtl::OUString& _rPropertyName ) const + OPropertyBrowserController::PropertyHandlerRef OPropertyBrowserController::impl_getHandlerForProperty_throw( const OUString& _rPropertyName ) const { PropertyHandlerRepository::const_iterator handlerPos = m_aPropertyHandlers.find( _rPropertyName ); if ( handlerPos == m_aPropertyHandlers.end() ) @@ -951,7 +951,7 @@ namespace pcr } //------------------------------------------------------------------------ - Any OPropertyBrowserController::impl_getPropertyValue_throw( const ::rtl::OUString& _rPropertyName ) + Any OPropertyBrowserController::impl_getPropertyValue_throw( const OUString& _rPropertyName ) { PropertyHandlerRef handler = impl_getHandlerForProperty_throw( _rPropertyName ); return handler->getPropertyValue( _rPropertyName ); @@ -1038,8 +1038,8 @@ namespace pcr } // determine the superseded properties - StlSyntaxSequence< ::rtl::OUString > aSupersededByThisHandler = (*aHandler)->getSupersededProperties(); - for ( StlSyntaxSequence< ::rtl::OUString >::const_iterator superseded = aSupersededByThisHandler.begin(); + StlSyntaxSequence< OUString > aSupersededByThisHandler = (*aHandler)->getSupersededProperties(); + for ( StlSyntaxSequence< OUString >::const_iterator superseded = aSupersededByThisHandler.begin(); superseded != aSupersededByThisHandler.end(); ++superseded ) @@ -1071,8 +1071,8 @@ namespace pcr } // see if the handler expresses interest in any actuating properties - StlSyntaxSequence< ::rtl::OUString > aInterestingActuations = (*aHandler)->getActuatingProperties(); - for ( StlSyntaxSequence< ::rtl::OUString >::const_iterator aLoop = aInterestingActuations.begin(); + StlSyntaxSequence< OUString > aInterestingActuations = (*aHandler)->getActuatingProperties(); + for ( StlSyntaxSequence< OUString >::const_iterator aLoop = aInterestingActuations.begin(); aLoop != aInterestingActuations.end(); ++aLoop ) @@ -1156,9 +1156,9 @@ namespace pcr if ( _rDescriptor.DisplayName.isEmpty() ) { #ifdef DBG_UTIL - ::rtl::OString sMessage( "OPropertyBrowserController::describePropertyLine: handler did not provide a display name for '" ); - sMessage += ::rtl::OString( _rProperty.Name.getStr(), _rProperty.Name.getLength(), RTL_TEXTENCODING_ASCII_US ); - sMessage += ::rtl::OString( "'!" ); + OString sMessage( "OPropertyBrowserController::describePropertyLine: handler did not provide a display name for '" ); + sMessage += OString( _rProperty.Name.getStr(), _rProperty.Name.getLength(), RTL_TEXTENCODING_ASCII_US ); + sMessage += OString( "'!" ); DBG_ASSERT( !_rDescriptor.DisplayName.isEmpty(), sMessage.getStr() ); #endif _rDescriptor.DisplayName = _rProperty.Name; @@ -1221,7 +1221,7 @@ namespace pcr // when building the UI below, remember which properties are actuating, // to allow for a initial actuatinPropertyChanged call - ::std::vector< ::rtl::OUString > aActuatingProperties; + ::std::vector< OUString > aActuatingProperties; ::std::vector< Any > aActuatingPropertyValues; // ask the handlers to describe the property UI, and insert the resulting @@ -1237,8 +1237,8 @@ namespace pcr #if OSL_DEBUG_LEVEL > 0 if ( aDescriptor.Category.isEmpty() ) { - ::rtl::OString sMessage( "OPropertyBrowserController::UpdateUI: empty category provided for property '" ); - sMessage += ::rtl::OString( property->second.Name.getStr(), property->second.Name.getLength(), osl_getThreadTextEncoding() ); + OString sMessage( "OPropertyBrowserController::UpdateUI: empty category provided for property '" ); + sMessage += OString( property->second.Name.getStr(), property->second.Name.getLength(), osl_getThreadTextEncoding() ); sMessage += "'!"; OSL_FAIL( sMessage.getStr() ); } @@ -1250,7 +1250,7 @@ namespace pcr // this category does not yet exist. This is allowed, as an inspector model might be lazy, and not provide // any category information of its own. In this case, we have a fallback ... m_aPageIds[ aDescriptor.Category ] = - getPropertyBox().AppendPage( aDescriptor.Category, rtl::OString() ); + getPropertyBox().AppendPage( aDescriptor.Category, OString() ); nTargetPageId = impl_getPageIdForCategory_nothrow( aDescriptor.Category ); } @@ -1267,7 +1267,7 @@ namespace pcr // update any dependencies for the actuating properties which we encountered { - ::std::vector< ::rtl::OUString >::const_iterator aProperty = aActuatingProperties.begin(); + ::std::vector< OUString >::const_iterator aProperty = aActuatingProperties.begin(); ::std::vector< Any >::const_iterator aPropertyValue = aActuatingPropertyValues.begin(); for ( ; aProperty != aActuatingProperties.end(); ++aProperty, ++aPropertyValue ) impl_broadcastPropertyChange_nothrow( *aProperty, *aPropertyValue, *aPropertyValue, true ); @@ -1316,7 +1316,7 @@ namespace pcr } //------------------------------------------------------------------------ - void OPropertyBrowserController::Clicked( const ::rtl::OUString& _rName, sal_Bool _bPrimary ) + void OPropertyBrowserController::Clicked( const OUString& _rName, sal_Bool _bPrimary ) { try { @@ -1360,7 +1360,7 @@ namespace pcr } //------------------------------------------------------------------------ - sal_Bool SAL_CALL OPropertyBrowserController::hasPropertyByName( const ::rtl::OUString& _rName ) throw (RuntimeException) + sal_Bool SAL_CALL OPropertyBrowserController::hasPropertyByName( const OUString& _rName ) throw (RuntimeException) { for ( OrderedPropertyMap::const_iterator search = m_aProperties.begin(); search != m_aProperties.end(); @@ -1372,18 +1372,18 @@ namespace pcr } //------------------------------------------------------------------------ - void OPropertyBrowserController::Commit( const ::rtl::OUString& rName, const Any& _rValue ) + void OPropertyBrowserController::Commit( const OUString& rName, const Any& _rValue ) { try { - rtl::OUString sPlcHolder = String( PcrRes( RID_EMBED_IMAGE_PLACEHOLDER ) ); + OUString sPlcHolder = String( PcrRes( RID_EMBED_IMAGE_PLACEHOLDER ) ); bool bIsPlaceHolderValue = false; if ( rName.equals( PROPERTY_IMAGE_URL ) ) { // if the prop value is the PlaceHolder // can ignore it - rtl::OUString sVal; + OUString sVal; _rValue >>= sVal; if ( sVal.equals( sPlcHolder ) ) bIsPlaceHolderValue = true; @@ -1427,7 +1427,7 @@ namespace pcr OSL_FAIL("OPropertyBrowserController::Commit : caught an exception !"); } - m_sCommittingProperty = ::rtl::OUString(); + m_sCommittingProperty = OUString(); } //-------------------------------------------------------------------- @@ -1454,7 +1454,7 @@ namespace pcr { Reference< XPropertyHandler > xHandler; - ::rtl::OUString sServiceName; + OUString sServiceName; Reference< XSingleServiceFactory > xServiceFac; Reference< XSingleComponentFactory > xComponentFac; @@ -1486,7 +1486,7 @@ namespace pcr { ::cppu::ContextEntry_Init aHandlerContextInfo[] = { - ::cppu::ContextEntry_Init( ::rtl::OUString( "DialogParentWindow" ), makeAny( VCLUnoHelper::GetInterface( m_pView ) ) ) + ::cppu::ContextEntry_Init( OUString( "DialogParentWindow" ), makeAny( VCLUnoHelper::GetInterface( m_pView ) ) ) }; xHandlerContext = ::cppu::createComponentContext( aHandlerContextInfo, SAL_N_ELEMENTS( aHandlerContextInfo ), @@ -1544,7 +1544,7 @@ namespace pcr } //------------------------------------------------------------------------ - bool OPropertyBrowserController::impl_findObjectProperty_nothrow( const ::rtl::OUString& _rName, OrderedPropertyMap::const_iterator* _pProperty ) + bool OPropertyBrowserController::impl_findObjectProperty_nothrow( const OUString& _rName, OrderedPropertyMap::const_iterator* _pProperty ) { OrderedPropertyMap::const_iterator search = m_aProperties.begin(); for ( ; search != m_aProperties.end(); ++search ) @@ -1556,7 +1556,7 @@ namespace pcr } //------------------------------------------------------------------------ - void OPropertyBrowserController::rebuildPropertyUI( const ::rtl::OUString& _rPropertyName ) throw (RuntimeException) + void OPropertyBrowserController::rebuildPropertyUI( const OUString& _rPropertyName ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !haveView() ) @@ -1580,7 +1580,7 @@ namespace pcr } //------------------------------------------------------------------------ - void OPropertyBrowserController::enablePropertyUI( const ::rtl::OUString& _rPropertyName, sal_Bool _bEnable ) throw (RuntimeException) + void OPropertyBrowserController::enablePropertyUI( const OUString& _rPropertyName, sal_Bool _bEnable ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !haveView() ) @@ -1593,7 +1593,7 @@ namespace pcr } //------------------------------------------------------------------------ - void OPropertyBrowserController::enablePropertyUIElements( const ::rtl::OUString& _rPropertyName, sal_Int16 _nElements, sal_Bool _bEnable ) throw (RuntimeException) + void OPropertyBrowserController::enablePropertyUIElements( const OUString& _rPropertyName, sal_Int16 _nElements, sal_Bool _bEnable ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !haveView() ) @@ -1606,7 +1606,7 @@ namespace pcr } //------------------------------------------------------------------------ - void OPropertyBrowserController::showPropertyUI( const ::rtl::OUString& _rPropertyName ) throw (RuntimeException) + void OPropertyBrowserController::showPropertyUI( const OUString& _rPropertyName ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !haveView() ) @@ -1656,7 +1656,7 @@ namespace pcr } //------------------------------------------------------------------------ - void OPropertyBrowserController::hidePropertyUI( const ::rtl::OUString& _rPropertyName ) throw (RuntimeException) + void OPropertyBrowserController::hidePropertyUI( const OUString& _rPropertyName ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !haveView() ) @@ -1669,7 +1669,7 @@ namespace pcr } //------------------------------------------------------------------------ - void OPropertyBrowserController::showCategory( const ::rtl::OUString& _rCategory, sal_Bool _bShow ) throw (RuntimeException) + void OPropertyBrowserController::showCategory( const OUString& _rCategory, sal_Bool _bShow ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !haveView() ) @@ -1682,7 +1682,7 @@ namespace pcr } //------------------------------------------------------------------------ - Reference< XPropertyControl > SAL_CALL OPropertyBrowserController::getPropertyControl( const ::rtl::OUString& _rPropertyName ) throw (RuntimeException) + Reference< XPropertyControl > SAL_CALL OPropertyBrowserController::getPropertyControl( const OUString& _rPropertyName ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !haveView() ) @@ -1705,7 +1705,7 @@ namespace pcr } //------------------------------------------------------------------------ - void SAL_CALL OPropertyBrowserController::setHelpSectionText( const ::rtl::OUString& _rHelpText ) throw (NoSupportException, RuntimeException) + void SAL_CALL OPropertyBrowserController::setHelpSectionText( const OUString& _rHelpText ) throw (NoSupportException, RuntimeException) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -1720,7 +1720,7 @@ namespace pcr } //------------------------------------------------------------------------ - void OPropertyBrowserController::impl_broadcastPropertyChange_nothrow( const ::rtl::OUString& _rPropertyName, const Any& _rNewValue, const Any& _rOldValue, bool _bFirstTimeInit ) const + void OPropertyBrowserController::impl_broadcastPropertyChange_nothrow( const OUString& _rPropertyName, const Any& _rNewValue, const Any& _rOldValue, bool _bFirstTimeInit ) const { // are there one or more handlers which are interested in the actuation? ::std::pair< PropertyHandlerMultiRepository::const_iterator, PropertyHandlerMultiRepository::const_iterator > aInterestedHandlers = diff --git a/extensions/source/propctrlr/propcontroller.hxx b/extensions/source/propctrlr/propcontroller.hxx index 85407096c8b9..0aaf5356b834 100644 --- a/extensions/source/propctrlr/propcontroller.hxx +++ b/extensions/source/propctrlr/propcontroller.hxx @@ -117,15 +117,15 @@ namespace pcr // meta data about the properties OPropertyBrowserView* m_pView; - ::rtl::OUString m_sPageSelection; - ::rtl::OUString m_sLastValidPageSelection; + OUString m_sPageSelection; + OUString m_sLastValidPageSelection; typedef ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyHandler > PropertyHandlerRef; typedef ::std::vector< PropertyHandlerRef > PropertyHandlerArray; - typedef ::boost::unordered_map< ::rtl::OUString, PropertyHandlerRef, ::rtl::OUStringHash > + typedef ::boost::unordered_map< OUString, PropertyHandlerRef, OUStringHash > PropertyHandlerRepository; - typedef ::boost::unordered_multimap< ::rtl::OUString, PropertyHandlerRef, ::rtl::OUStringHash > + typedef ::boost::unordered_multimap< OUString, PropertyHandlerRef, OUStringHash > PropertyHandlerMultiRepository; PropertyHandlerRepository m_aPropertyHandlers; PropertyHandlerMultiRepository m_aDependencyHandlers; @@ -141,9 +141,9 @@ namespace pcr /// the properties of the currently inspected object(s) OrderedPropertyMap m_aProperties; /// the property we're just committing - ::rtl::OUString m_sCommittingProperty; + OUString m_sCommittingProperty; - typedef ::boost::unordered_map< ::rtl::OUString, sal_uInt16, ::rtl::OUStringHash > HashString2Int16; + typedef ::boost::unordered_map< OUString, sal_uInt16, OUStringHash > HashString2Int16; HashString2Int16 m_aPageIds; bool m_bContainerFocusListening; @@ -155,9 +155,9 @@ namespace pcr DECLARE_XINTERFACE() // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // XController virtual void SAL_CALL attachFrame( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame ) throw(::com::sun::star::uno::RuntimeException); @@ -201,34 +201,34 @@ namespace pcr public: // XServiceInfo - static versions - static ::rtl::OUString getImplementationName_static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static( ) throw(::com::sun::star::uno::RuntimeException); + static OUString getImplementationName_static( ) throw(::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static( ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); protected: // IPropertyLineListener - virtual void Clicked( const ::rtl::OUString& _rName, sal_Bool _bPrimary ); - virtual void Commit( const ::rtl::OUString& _rName, const ::com::sun::star::uno::Any& _rVal ); + virtual void Clicked( const OUString& _rName, sal_Bool _bPrimary ); + virtual void Commit( const OUString& _rName, const ::com::sun::star::uno::Any& _rVal ); // IPropertyControlObserver virtual void focusGained( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >& _Control ); virtual void valueChanged( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >& _Control ); // IPropertyExistenceCheck - virtual ::sal_Bool SAL_CALL hasPropertyByName( const ::rtl::OUString& _rName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL hasPropertyByName( const OUString& _rName ) throw (::com::sun::star::uno::RuntimeException); // XObjectInspectorUI - virtual void SAL_CALL enablePropertyUI( const ::rtl::OUString& _rPropertyName, ::sal_Bool _bEnable ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL enablePropertyUIElements( const ::rtl::OUString& _rPropertyName, ::sal_Int16 _nElements, ::sal_Bool _bEnable ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL rebuildPropertyUI( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL showPropertyUI( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL hidePropertyUI( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL showCategory( const ::rtl::OUString& _rCategory, ::sal_Bool _bShow ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl > SAL_CALL getPropertyControl( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL enablePropertyUI( const OUString& _rPropertyName, ::sal_Bool _bEnable ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL enablePropertyUIElements( const OUString& _rPropertyName, ::sal_Int16 _nElements, ::sal_Bool _bEnable ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL rebuildPropertyUI( const OUString& _rPropertyName ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL showPropertyUI( const OUString& _rPropertyName ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL hidePropertyUI( const OUString& _rPropertyName ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL showCategory( const OUString& _rCategory, ::sal_Bool _bShow ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl > SAL_CALL getPropertyControl( const OUString& _rPropertyName ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL registerControlObserver( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlObserver >& _Observer ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL revokeControlObserver( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlObserver >& _Observer ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setHelpSectionText( const ::rtl::OUString& HelpText ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setHelpSectionText( const OUString& HelpText ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); // XObjectInspector virtual ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorModel > SAL_CALL getInspectorModel() throw (::com::sun::star::uno::RuntimeException); @@ -237,7 +237,7 @@ namespace pcr virtual void SAL_CALL inspect( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > >& Objects ) throw (::com::sun::star::util::VetoException, ::com::sun::star::uno::RuntimeException); // XDispatchProvider - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& URL, const ::rtl::OUString& TargetFrameName, ::sal_Int32 SearchFlags ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& URL, const OUString& TargetFrameName, ::sal_Int32 SearchFlags ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches( const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor >& Requests ) throw (::com::sun::star::uno::RuntimeException); // XInitialization @@ -272,17 +272,17 @@ namespace pcr if set to <FALSE/>, this is a real change in the property value, not just a call for purposes of initialization. */ - void impl_broadcastPropertyChange_nothrow( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, bool _bFirstTimeInit ) const; + void impl_broadcastPropertyChange_nothrow( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, bool _bFirstTimeInit ) const; /** determines whether the given property is an actuating property, that is, at least one handler expressed interest in changes to this property's value. */ - inline bool impl_isActuatingProperty_nothrow( const ::rtl::OUString& _rPropertyName ) const + inline bool impl_isActuatingProperty_nothrow( const OUString& _rPropertyName ) const { return ( m_aDependencyHandlers.find( _rPropertyName ) != m_aDependencyHandlers.end() ); } - sal_uInt32 GetPropertyPos(const ::rtl::OUString& _rPropName); + sal_uInt32 GetPropertyPos(const OUString& _rPropName); /** retrieves the value of the given property, by asking the appropriate XPropertyHandler @param _rPropertyName @@ -294,7 +294,7 @@ namespace pcr the value of this property */ ::com::sun::star::uno::Any - impl_getPropertyValue_throw( const ::rtl::OUString& _rPropertyName ); + impl_getPropertyValue_throw( const OUString& _rPropertyName ); /// calls XPropertyHandler::suspend for all our property handlers sal_Bool suspendPropertyHandlers_nothrow( sal_Bool _bSuspend ); @@ -319,7 +319,7 @@ namespace pcr <TRUE/> if and only if the property could be found. In this case, <arg>_pProperty</arg> (if not <NULL/> contains the iterator pointing to this property. */ - bool impl_findObjectProperty_nothrow( const ::rtl::OUString& _rName, OrderedPropertyMap::const_iterator* _pProperty = NULL ); + bool impl_findObjectProperty_nothrow( const OUString& _rName, OrderedPropertyMap::const_iterator* _pProperty = NULL ); sal_Bool Construct(Window* _pParentWin); @@ -333,14 +333,14 @@ namespace pcr the handler which is responsible for the given property */ PropertyHandlerRef - impl_getHandlerForProperty_throw( const ::rtl::OUString& _rPropertyName ) const; + impl_getHandlerForProperty_throw( const OUString& _rPropertyName ) const; /** determines whether we have a handler for the given property @param _rPropertyName the name of the property for which the existence of a handler should be checked */ bool - impl_hasPropertyHandlerFor_nothrow( const ::rtl::OUString& _rPropertyName ) const; + impl_hasPropertyHandlerFor_nothrow( const OUString& _rPropertyName ) const; /** builds up m_aPageIds from InspectorModel::describeCategories, and insert all the respective tab pages into our view @@ -360,7 +360,7 @@ namespace pcr is no tab page for the given category */ sal_uInt16 - impl_getPageIdForCategory_nothrow( const ::rtl::OUString& _rCategoryName ) const; + impl_getPageIdForCategory_nothrow( const OUString& _rCategoryName ) const; /** adds or removes ourself as XEventListener to/from all our inspectees */ diff --git a/extensions/source/propctrlr/propertycomposer.cxx b/extensions/source/propctrlr/propertycomposer.cxx index c80bdf7ba104..f3706dc4a3e3 100644 --- a/extensions/source/propctrlr/propertycomposer.cxx +++ b/extensions/source/propctrlr/propertycomposer.cxx @@ -46,9 +46,9 @@ namespace pcr //---------------------------------------------------------------- struct SetPropertyValue : public ::std::unary_function< Reference< XPropertyHandler >, void > { - ::rtl::OUString sPropertyName; + OUString sPropertyName; const Any& rValue; - SetPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& _rValue ) : sPropertyName( _rPropertyName ), rValue( _rValue ) { } + SetPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) : sPropertyName( _rPropertyName ), rValue( _rValue ) { } void operator()( const Reference< XPropertyHandler >& _rHandler ) { _rHandler->setPropertyValue( sPropertyName, rValue ); @@ -122,35 +122,35 @@ namespace pcr } //-------------------------------------------------------------------- - Any SAL_CALL PropertyComposer::getPropertyValue( const ::rtl::OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL PropertyComposer::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) { MethodGuard aGuard( *this ); return m_aSlaveHandlers[0]->getPropertyValue( _rPropertyName ); } //-------------------------------------------------------------------- - void SAL_CALL PropertyComposer::setPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) + void SAL_CALL PropertyComposer::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) { MethodGuard aGuard( *this ); ::std::for_each( m_aSlaveHandlers.begin(), m_aSlaveHandlers.end(), SetPropertyValue( _rPropertyName, _rValue ) ); } //-------------------------------------------------------------------- - Any SAL_CALL PropertyComposer::convertToPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL PropertyComposer::convertToPropertyValue( const OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException) { MethodGuard aGuard( *this ); return m_aSlaveHandlers[0]->convertToPropertyValue( _rPropertyName, _rControlValue ); } //-------------------------------------------------------------------- - Any SAL_CALL PropertyComposer::convertToControlValue( const ::rtl::OUString& _rPropertyName, const Any& _rPropertyValue, const Type& _rControlValueType ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL PropertyComposer::convertToControlValue( const OUString& _rPropertyName, const Any& _rPropertyValue, const Type& _rControlValueType ) throw (UnknownPropertyException, RuntimeException) { MethodGuard aGuard( *this ); return m_aSlaveHandlers[0]->convertToControlValue( _rPropertyName, _rPropertyValue, _rControlValueType ); } //-------------------------------------------------------------------- - PropertyState SAL_CALL PropertyComposer::getPropertyState( const ::rtl::OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) + PropertyState SAL_CALL PropertyComposer::getPropertyState( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) { MethodGuard aGuard( *this ); @@ -259,12 +259,12 @@ namespace pcr } //-------------------------------------------------------------------- - void uniteStringArrays( const PropertyComposer::HandlerArray& _rHandlers, Sequence< ::rtl::OUString > (SAL_CALL XPropertyHandler::*pGetter)( void ), - Sequence< ::rtl::OUString >& /* [out] */ _rUnion ) + void uniteStringArrays( const PropertyComposer::HandlerArray& _rHandlers, Sequence< OUString > (SAL_CALL XPropertyHandler::*pGetter)( void ), + Sequence< OUString >& /* [out] */ _rUnion ) { - ::std::set< ::rtl::OUString > aUnitedBag; + ::std::set< OUString > aUnitedBag; - Sequence< ::rtl::OUString > aThisRound; + Sequence< OUString > aThisRound; for ( PropertyComposer::HandlerArray::const_iterator loop = _rHandlers.begin(); loop != _rHandlers.end(); ++loop @@ -278,29 +278,29 @@ namespace pcr } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL PropertyComposer::getSupersededProperties( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL PropertyComposer::getSupersededProperties( ) throw (RuntimeException) { MethodGuard aGuard( *this ); // we supersede those properties which are superseded by at least one of our slaves - Sequence< ::rtl::OUString > aSuperseded; + Sequence< OUString > aSuperseded; uniteStringArrays( m_aSlaveHandlers, &XPropertyHandler::getSupersededProperties, aSuperseded ); return aSuperseded; } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL PropertyComposer::getActuatingProperties( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL PropertyComposer::getActuatingProperties( ) throw (RuntimeException) { MethodGuard aGuard( *this ); // we're interested in those properties which at least one handler wants to have - Sequence< ::rtl::OUString > aActuating; + Sequence< OUString > aActuating; uniteStringArrays( m_aSlaveHandlers, &XPropertyHandler::getActuatingProperties, aActuating ); return aActuating; } //-------------------------------------------------------------------- - LineDescriptor SAL_CALL PropertyComposer::describePropertyLine( const ::rtl::OUString& _rPropertyName, + LineDescriptor SAL_CALL PropertyComposer::describePropertyLine( const OUString& _rPropertyName, const Reference< XPropertyControlFactory >& _rxControlFactory ) throw (UnknownPropertyException, NullPointerException, RuntimeException) { @@ -309,14 +309,14 @@ namespace pcr } //-------------------------------------------------------------------- - ::sal_Bool SAL_CALL PropertyComposer::isComposable( const ::rtl::OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) + ::sal_Bool SAL_CALL PropertyComposer::isComposable( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) { MethodGuard aGuard( *this ); return m_aSlaveHandlers[0]->isComposable( _rPropertyName ); } //-------------------------------------------------------------------- - InteractiveSelectionResult SAL_CALL PropertyComposer::onInteractivePropertySelection( const ::rtl::OUString& _rPropertyName, sal_Bool _bPrimary, Any& _rData, const Reference< XObjectInspectorUI >& _rxInspectorUI ) throw (UnknownPropertyException, NullPointerException, RuntimeException) + InteractiveSelectionResult SAL_CALL PropertyComposer::onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, Any& _rData, const Reference< XObjectInspectorUI >& _rxInspectorUI ) throw (UnknownPropertyException, NullPointerException, RuntimeException) { if ( !_rxInspectorUI.is() ) throw NullPointerException(); @@ -377,7 +377,7 @@ namespace pcr } //-------------------------------------------------------------------- - void SAL_CALL PropertyComposer::actuatingPropertyChanged( const ::rtl::OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& _rOldValue, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (NullPointerException, RuntimeException) + void SAL_CALL PropertyComposer::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& _rOldValue, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (NullPointerException, RuntimeException) { if ( !_rxInspectorUI.is() ) throw NullPointerException(); @@ -395,8 +395,8 @@ namespace pcr ) { // TODO: make this cheaper (cache it?) - const StlSyntaxSequence< ::rtl::OUString > aThisHandlersActuatingProps = (*loop)->getActuatingProperties(); - for ( StlSyntaxSequence< ::rtl::OUString >::const_iterator loopProps = aThisHandlersActuatingProps.begin(); + const StlSyntaxSequence< OUString > aThisHandlersActuatingProps = (*loop)->getActuatingProperties(); + for ( StlSyntaxSequence< OUString >::const_iterator loopProps = aThisHandlersActuatingProps.begin(); loopProps != aThisHandlersActuatingProps.end(); ++loopProps ) @@ -493,7 +493,7 @@ namespace pcr } //-------------------------------------------------------------------- - sal_Bool SAL_CALL PropertyComposer::hasPropertyByName( const ::rtl::OUString& _rName ) throw (RuntimeException) + sal_Bool SAL_CALL PropertyComposer::hasPropertyByName( const OUString& _rName ) throw (RuntimeException) { return impl_isSupportedProperty_nothrow( _rName ); } diff --git a/extensions/source/propctrlr/propertycomposer.hxx b/extensions/source/propctrlr/propertycomposer.hxx index 68e4cee46b14..5191239035a8 100644 --- a/extensions/source/propctrlr/propertycomposer.hxx +++ b/extensions/source/propctrlr/propertycomposer.hxx @@ -77,26 +77,26 @@ namespace pcr public: // XPropertyHandler overridables virtual void SAL_CALL inspect( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxIntrospectee ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rControlValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rPropertyValue, const ::com::sun::star::uno::Type& _rControlValueType ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rControlValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rPropertyValue, const ::com::sun::star::uno::Type& _rControlValueType ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::beans::PropertyState - SAL_CALL getPropertyState( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + SAL_CALL getPropertyState( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getSupportedProperties() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupersededProperties( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getActuatingProperties( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::inspection::LineDescriptor - SAL_CALL describePropertyLine( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL isComposable( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + SAL_CALL describePropertyLine( const OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL isComposable( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::inspection::InteractiveSelectionResult - SAL_CALL onInteractivePropertySelection( const ::rtl::OUString& _rPropertyName, sal_Bool _bPrimary, ::com::sun::star::uno::Any& _rData, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL actuatingPropertyChanged( const ::rtl::OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, ::com::sun::star::uno::Any& _rData, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL suspend( sal_Bool _bSuspend ) throw (::com::sun::star::uno::RuntimeException); // XComponent @@ -110,7 +110,7 @@ namespace pcr virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); // IPropertyExistenceCheck - virtual ::sal_Bool SAL_CALL hasPropertyByName( const ::rtl::OUString& _rName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL hasPropertyByName( const OUString& _rName ) throw (::com::sun::star::uno::RuntimeException); private: /** ensures that m_pUIRequestComposer exists @@ -119,7 +119,7 @@ namespace pcr /** checks whether a given property exists in <member>m_aSupportedProperties</member> */ - bool impl_isSupportedProperty_nothrow( const ::rtl::OUString& _rPropertyName ) + bool impl_isSupportedProperty_nothrow( const OUString& _rPropertyName ) { ::com::sun::star::beans::Property aDummy; aDummy.Name = _rPropertyName; return m_aSupportedProperties.find( aDummy ) != m_aSupportedProperties.end(); @@ -135,7 +135,7 @@ namespace pcr : ::osl::MutexGuard( _rInstance.m_aMutex ) { if ( _rInstance.m_aSlaveHandlers.empty() ) - throw ::com::sun::star::lang::DisposedException( ::rtl::OUString(), *(&_rInstance) ); + throw ::com::sun::star::lang::DisposedException( OUString(), *(&_rInstance) ); } }; }; diff --git a/extensions/source/propctrlr/propertyeditor.cxx b/extensions/source/propctrlr/propertyeditor.cxx index c4d0be1dca4c..0440de348a58 100644 --- a/extensions/source/propctrlr/propertyeditor.cxx +++ b/extensions/source/propctrlr/propertyeditor.cxx @@ -163,7 +163,7 @@ namespace pcr } //------------------------------------------------------------------ - OBrowserPage* OPropertyEditor::getPage( const ::rtl::OUString& _rPropertyName ) + OBrowserPage* OPropertyEditor::getPage( const OUString& _rPropertyName ) { OBrowserPage* pPage = NULL; MapStringToPageId::const_iterator aPropertyPageIdPos = m_aPropertyPageIds.find( _rPropertyName ); @@ -173,7 +173,7 @@ namespace pcr } //------------------------------------------------------------------ - const OBrowserPage* OPropertyEditor::getPage( const ::rtl::OUString& _rPropertyName ) const + const OBrowserPage* OPropertyEditor::getPage( const OUString& _rPropertyName ) const { return const_cast< OPropertyEditor* >( this )->getPage( _rPropertyName ); } @@ -206,7 +206,7 @@ namespace pcr } //------------------------------------------------------------------ - sal_uInt16 OPropertyEditor::AppendPage( const String & _rText, const rtl::OString& _rHelpId ) + sal_uInt16 OPropertyEditor::AppendPage( const String & _rText, const OString& _rHelpId ) { // obtain a new id sal_uInt16 nId = m_nNextId++; @@ -232,7 +232,7 @@ namespace pcr } //------------------------------------------------------------------ - void OPropertyEditor::SetHelpId( const rtl::OString& rHelpId ) + void OPropertyEditor::SetHelpId( const OString& rHelpId ) { Control::SetHelpId(""); m_aTabControl.SetHelpId(rHelpId); @@ -343,7 +343,7 @@ namespace pcr } //------------------------------------------------------------------ - void OPropertyEditor::SetHelpText( const ::rtl::OUString& _rHelpText ) + void OPropertyEditor::SetHelpText( const OUString& _rHelpText ) { forEachPage( &OPropertyEditor::setHelpSectionText, &_rHelpText ); } @@ -369,7 +369,7 @@ namespace pcr if ( !_pPointerToOUString ) return; - const ::rtl::OUString& rText( *(const ::rtl::OUString*)_pPointerToOUString ); + const OUString& rText( *(const OUString*)_pPointerToOUString ); _rPage.getListBox().SetHelpText( rText ); } @@ -398,7 +398,7 @@ namespace pcr } //------------------------------------------------------------------ - void OPropertyEditor::RemoveEntry( const ::rtl::OUString& _rName ) + void OPropertyEditor::RemoveEntry( const OUString& _rName ) { OBrowserPage* pPage = getPage( _rName ); if ( pPage ) @@ -420,7 +420,7 @@ namespace pcr } //------------------------------------------------------------------ - void OPropertyEditor::SetPropertyValue( const ::rtl::OUString& rEntryName, const Any& _rValue, bool _bUnknownValue ) + void OPropertyEditor::SetPropertyValue( const OUString& rEntryName, const Any& _rValue, bool _bUnknownValue ) { OBrowserPage* pPage = getPage( rEntryName ); if ( pPage ) @@ -428,7 +428,7 @@ namespace pcr } //------------------------------------------------------------------ - sal_uInt16 OPropertyEditor::GetPropertyPos( const ::rtl::OUString& rEntryName ) const + sal_uInt16 OPropertyEditor::GetPropertyPos( const OUString& rEntryName ) const { sal_uInt16 nVal=LISTBOX_ENTRY_NOTFOUND; const OBrowserPage* pPage = getPage( rEntryName ); @@ -465,7 +465,7 @@ namespace pcr } //------------------------------------------------------------------ - void OPropertyEditor::EnablePropertyControls( const ::rtl::OUString& _rEntryName, sal_Int16 _nControls, bool _bEnable ) + void OPropertyEditor::EnablePropertyControls( const OUString& _rEntryName, sal_Int16 _nControls, bool _bEnable ) { for ( sal_uInt16 i = 0; i < m_aTabControl.GetPageCount(); ++i ) { @@ -476,7 +476,7 @@ namespace pcr } //------------------------------------------------------------------ - void OPropertyEditor::EnablePropertyLine( const ::rtl::OUString& _rEntryName, bool _bEnable ) + void OPropertyEditor::EnablePropertyLine( const OUString& _rEntryName, bool _bEnable ) { for ( sal_uInt16 i = 0; i < m_aTabControl.GetPageCount(); ++i ) { @@ -487,7 +487,7 @@ namespace pcr } //------------------------------------------------------------------ - Reference< XPropertyControl > OPropertyEditor::GetPropertyControl(const ::rtl::OUString& rEntryName) + Reference< XPropertyControl > OPropertyEditor::GetPropertyControl(const OUString& rEntryName) { Reference< XPropertyControl > xControl; // let the current page handle this diff --git a/extensions/source/propctrlr/propertyeditor.hxx b/extensions/source/propctrlr/propertyeditor.hxx index d31ca7912d2c..d8883231554d 100644 --- a/extensions/source/propctrlr/propertyeditor.hxx +++ b/extensions/source/propctrlr/propertyeditor.hxx @@ -45,7 +45,7 @@ namespace pcr class OPropertyEditor : public Control { private: - typedef ::std::map< ::rtl::OUString, sal_uInt16 > MapStringToPageId; + typedef ::std::map< OUString, sal_uInt16 > MapStringToPageId; struct HiddenPage { sal_uInt16 nPos; @@ -84,28 +84,28 @@ namespace pcr void EnableHelpSection( bool _bEnable ); bool HasHelpSection() const; - void SetHelpText( const ::rtl::OUString& _rHelpText ); + void SetHelpText( const OUString& _rHelpText ); void SetHelpLineLimites( sal_Int32 _nMinLines, sal_Int32 _nMaxLines ); - void SetHelpId( const rtl::OString& sHelpId ); - sal_uInt16 AppendPage( const String& r, const rtl::OString& _rHelpId ); + void SetHelpId( const OString& sHelpId ); + sal_uInt16 AppendPage( const String& r, const OString& _rHelpId ); void SetPage( sal_uInt16 ); void RemovePage(sal_uInt16 nID); sal_uInt16 GetCurPage(); void ClearAll(); - void SetPropertyValue(const ::rtl::OUString& _rEntryName, const ::com::sun::star::uno::Any& _rValue, bool _bUnknownValue ); - ::com::sun::star::uno::Any GetPropertyValue(const ::rtl::OUString& rEntryName ) const; - sal_uInt16 GetPropertyPos(const ::rtl::OUString& rEntryName ) const; + void SetPropertyValue(const OUString& _rEntryName, const ::com::sun::star::uno::Any& _rValue, bool _bUnknownValue ); + ::com::sun::star::uno::Any GetPropertyValue(const OUString& rEntryName ) const; + sal_uInt16 GetPropertyPos(const OUString& rEntryName ) const; ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl > - GetPropertyControl( const ::rtl::OUString& rEntryName ); - void EnablePropertyLine( const ::rtl::OUString& _rEntryName, bool _bEnable ); - void EnablePropertyControls( const ::rtl::OUString& _rEntryName, sal_Int16 _nControls, bool _bEnable ); + GetPropertyControl( const OUString& rEntryName ); + void EnablePropertyLine( const OUString& _rEntryName, bool _bEnable ); + void EnablePropertyControls( const OUString& _rEntryName, sal_Int16 _nControls, bool _bEnable ); void ShowPropertyPage( sal_uInt16 _nPageId, bool _bShow ); sal_uInt16 InsertEntry( const OLineDescriptor&, sal_uInt16 _nPageId, sal_uInt16 nPos = EDITOR_LIST_APPEND ); - void RemoveEntry( const ::rtl::OUString& _rName ); + void RemoveEntry( const OUString& _rName ); void ChangeEntry( const OLineDescriptor& ); void setPageActivationHandler(const Link& _rHdl) { m_aPageActivationHandler = _rHdl; } @@ -125,8 +125,8 @@ namespace pcr OBrowserPage* getPage( sal_uInt16& _rPageId ); const OBrowserPage* getPage( sal_uInt16& _rPageId ) const; - OBrowserPage* getPage( const ::rtl::OUString& _rPropertyName ); - const OBrowserPage* getPage( const ::rtl::OUString& _rPropertyName ) const; + OBrowserPage* getPage( const OUString& _rPropertyName ); + const OBrowserPage* getPage( const OUString& _rPropertyName ) const; void Update(const ::std::mem_fun_t<void,OBrowserListBox>& _aUpdateFunction); diff --git a/extensions/source/propctrlr/propertyhandler.cxx b/extensions/source/propctrlr/propertyhandler.cxx index 4da3b9426245..d6c0649af8d6 100644 --- a/extensions/source/propctrlr/propertyhandler.cxx +++ b/extensions/source/propctrlr/propertyhandler.cxx @@ -129,19 +129,19 @@ namespace pcr } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL PropertyHandler::getSupersededProperties( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL PropertyHandler::getSupersededProperties( ) throw (RuntimeException) { - return Sequence< ::rtl::OUString >(); + return Sequence< OUString >(); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL PropertyHandler::getActuatingProperties( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL PropertyHandler::getActuatingProperties( ) throw (RuntimeException) { - return Sequence< ::rtl::OUString >(); + return Sequence< OUString >(); } //-------------------------------------------------------------------- - Any SAL_CALL PropertyHandler::convertToPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL PropertyHandler::convertToPropertyValue( const OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId = m_pInfoService->getPropertyId( _rPropertyName ); @@ -154,7 +154,7 @@ namespace pcr if ( ( m_pInfoService->getPropertyUIFlags( nPropId ) & PROP_FLAG_ENUM ) != 0 ) { - ::rtl::OUString sControlValue; + OUString sControlValue; OSL_VERIFY( _rControlValue >>= sControlValue ); ::rtl::Reference< IPropertyEnumRepresentation > aEnumConversion( new DefaultEnumRepresentation( *m_pInfoService, aProperty.Type, nPropId ) ); @@ -168,7 +168,7 @@ namespace pcr } //-------------------------------------------------------------------- - Any SAL_CALL PropertyHandler::convertToControlValue( const ::rtl::OUString& _rPropertyName, const Any& _rPropertyValue, const Type& _rControlValueType ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL PropertyHandler::convertToControlValue( const OUString& _rPropertyName, const Any& _rPropertyValue, const Type& _rControlValueType ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId = m_pInfoService->getPropertyId( _rPropertyName ); @@ -188,13 +188,13 @@ namespace pcr } //-------------------------------------------------------------------- - PropertyState SAL_CALL PropertyHandler::getPropertyState( const ::rtl::OUString& /*_rPropertyName*/ ) throw (UnknownPropertyException, RuntimeException) + PropertyState SAL_CALL PropertyHandler::getPropertyState( const OUString& /*_rPropertyName*/ ) throw (UnknownPropertyException, RuntimeException) { return PropertyState_DIRECT_VALUE; } //-------------------------------------------------------------------- - LineDescriptor SAL_CALL PropertyHandler::describePropertyLine( const ::rtl::OUString& _rPropertyName, + LineDescriptor SAL_CALL PropertyHandler::describePropertyLine( const OUString& _rPropertyName, const Reference< XPropertyControlFactory >& _rxControlFactory ) throw (UnknownPropertyException, NullPointerException, RuntimeException) { @@ -219,28 +219,28 @@ namespace pcr aDescriptor.DisplayName = m_pInfoService->getPropertyTranslation( nPropId ); if ( ( m_pInfoService->getPropertyUIFlags( nPropId ) & PROP_FLAG_DATA_PROPERTY ) != 0 ) - aDescriptor.Category = ::rtl::OUString( "Data" ); + aDescriptor.Category = OUString( "Data" ); else - aDescriptor.Category = ::rtl::OUString( "General" ); + aDescriptor.Category = OUString( "General" ); return aDescriptor; } //-------------------------------------------------------------------- - ::sal_Bool SAL_CALL PropertyHandler::isComposable( const ::rtl::OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) + ::sal_Bool SAL_CALL PropertyHandler::isComposable( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); return m_pInfoService->isComposeable( _rPropertyName ); } //-------------------------------------------------------------------- - InteractiveSelectionResult SAL_CALL PropertyHandler::onInteractivePropertySelection( const ::rtl::OUString& /*_rPropertyName*/, sal_Bool /*_bPrimary*/, Any& /*_rData*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/ ) throw (UnknownPropertyException, NullPointerException, RuntimeException) + InteractiveSelectionResult SAL_CALL PropertyHandler::onInteractivePropertySelection( const OUString& /*_rPropertyName*/, sal_Bool /*_bPrimary*/, Any& /*_rData*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/ ) throw (UnknownPropertyException, NullPointerException, RuntimeException) { 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) + void SAL_CALL PropertyHandler::actuatingPropertyChanged( const OUString& /*_rActuatingPropertyName*/, const Any& /*_rNewValue*/, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/, sal_Bool /*_bFirstTimeInit*/ ) throw (NullPointerException, RuntimeException) { OSL_FAIL( "PropertyHandler::actuatingPropertyChanged: not implemented!" ); } @@ -279,7 +279,7 @@ namespace pcr } //-------------------------------------------------------------------- - void PropertyHandler::firePropertyChange( const ::rtl::OUString& _rPropName, PropertyId _nPropId, const Any& _rOldValue, const Any& _rNewValue ) SAL_THROW(()) + void PropertyHandler::firePropertyChange( const OUString& _rPropName, PropertyId _nPropId, const Any& _rOldValue, const Any& _rNewValue ) SAL_THROW(()) { PropertyChangeEvent aEvent; aEvent.Source = m_xComponent; @@ -313,7 +313,7 @@ namespace pcr } //-------------------------------------------------------------------- - const Property& PropertyHandler::impl_getPropertyFromName_throw( const ::rtl::OUString& _rPropertyName ) const + const Property& PropertyHandler::impl_getPropertyFromName_throw( const OUString& _rPropertyName ) const { const_cast< PropertyHandler* >( this )->getSupportedProperties(); StlSyntaxSequence< Property >::const_iterator pFound = ::std::find_if( m_aSupportedProperties.begin(), m_aSupportedProperties.end(), @@ -326,7 +326,7 @@ namespace pcr } //-------------------------------------------------------------------- - void PropertyHandler::implAddPropertyDescription( ::std::vector< Property >& _rProperties, const ::rtl::OUString& _rPropertyName, const Type& _rType, sal_Int16 _nAttribs ) const + void PropertyHandler::implAddPropertyDescription( ::std::vector< Property >& _rProperties, const OUString& _rPropertyName, const Type& _rType, sal_Int16 _nAttribs ) const { _rProperties.push_back( Property( _rPropertyName, @@ -343,7 +343,7 @@ namespace pcr } //------------------------------------------------------------------------ - PropertyId PropertyHandler::impl_getPropertyId_throw( const ::rtl::OUString& _rPropertyName ) const + PropertyId PropertyHandler::impl_getPropertyId_throw( const OUString& _rPropertyName ) const { PropertyId nPropId = m_pInfoService->getPropertyId( _rPropertyName ); if ( nPropId == -1 ) @@ -360,7 +360,7 @@ namespace pcr } //------------------------------------------------------------------------ - bool PropertyHandler::impl_componentHasProperty_throw( const ::rtl::OUString& _rPropName ) const + bool PropertyHandler::impl_componentHasProperty_throw( const OUString& _rPropName ) const { return m_xComponentPropertyInfo.is() && m_xComponentPropertyInfo->hasPropertyByName( _rPropName ); } @@ -375,32 +375,32 @@ namespace pcr if ( xDocumentSI.is() ) { // determine the application type we live in - ::rtl::OUString sConfigurationLocation; - ::rtl::OUString sConfigurationProperty; + OUString sConfigurationLocation; + OUString sConfigurationProperty; if ( xDocumentSI->supportsService( SERVICE_WEB_DOCUMENT ) ) { // writer - sConfigurationLocation = ::rtl::OUString( "/org.openoffice.Office.WriterWeb/Layout/Other" ); - sConfigurationProperty = ::rtl::OUString( "MeasureUnit" ); + sConfigurationLocation = OUString( "/org.openoffice.Office.WriterWeb/Layout/Other" ); + sConfigurationProperty = OUString( "MeasureUnit" ); } else if ( xDocumentSI->supportsService( SERVICE_TEXT_DOCUMENT ) ) { // writer - sConfigurationLocation = ::rtl::OUString( "/org.openoffice.Office.Writer/Layout/Other" ); - sConfigurationProperty = ::rtl::OUString( "MeasureUnit" ); + sConfigurationLocation = OUString( "/org.openoffice.Office.Writer/Layout/Other" ); + sConfigurationProperty = OUString( "MeasureUnit" ); } else if ( xDocumentSI->supportsService( SERVICE_SPREADSHEET_DOCUMENT ) ) { // calc - sConfigurationLocation = ::rtl::OUString( "/org.openoffice.Office.Calc/Layout/Other/MeasureUnit" ); - sConfigurationProperty = ::rtl::OUString( "Metric" ); + sConfigurationLocation = OUString( "/org.openoffice.Office.Calc/Layout/Other/MeasureUnit" ); + sConfigurationProperty = OUString( "Metric" ); } else if ( xDocumentSI->supportsService( SERVICE_DRAWING_DOCUMENT ) ) { - sConfigurationLocation = ::rtl::OUString( "/org.openoffice.Office.Draw/Layout/Other/MeasureUnit" ); - sConfigurationProperty = ::rtl::OUString( "Metric" ); + sConfigurationLocation = OUString( "/org.openoffice.Office.Draw/Layout/Other/MeasureUnit" ); + sConfigurationProperty = OUString( "Metric" ); } else if ( xDocumentSI->supportsService( SERVICE_PRESENTATION_DOCUMENT ) ) { - sConfigurationLocation = ::rtl::OUString( "/org.openoffice.Office.Impress/Layout/Other/MeasureUnit" ); - sConfigurationProperty = ::rtl::OUString( "Metric" ); + sConfigurationLocation = OUString( "/org.openoffice.Office.Impress/Layout/Other/MeasureUnit" ); + sConfigurationProperty = OUString( "Metric" ); } // read the measurement unit from the configuration @@ -440,9 +440,9 @@ namespace pcr IMPLEMENT_FORWARD_XTYPEPROVIDER2( PropertyHandlerComponent, PropertyHandler, PropertyHandlerComponent_Base ) //-------------------------------------------------------------------- - ::sal_Bool SAL_CALL PropertyHandlerComponent::supportsService( const ::rtl::OUString& ServiceName ) throw (RuntimeException) + ::sal_Bool SAL_CALL PropertyHandlerComponent::supportsService( const OUString& ServiceName ) throw (RuntimeException) { - StlSyntaxSequence< ::rtl::OUString > aAllServices( getSupportedServiceNames() ); + StlSyntaxSequence< OUString > aAllServices( getSupportedServiceNames() ); return ::std::find( aAllServices.begin(), aAllServices.end(), ServiceName ) != aAllServices.end(); } diff --git a/extensions/source/propctrlr/propertyhandler.hxx b/extensions/source/propctrlr/propertyhandler.hxx index 56384e8db613..cfdee15f9b7a 100644 --- a/extensions/source/propctrlr/propertyhandler.hxx +++ b/extensions/source/propctrlr/propertyhandler.hxx @@ -106,15 +106,15 @@ namespace pcr // default implementations for XPropertyHandler virtual void SAL_CALL inspect( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxIntrospectee ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NullPointerException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getSupportedProperties() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupersededProperties( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getActuatingProperties( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rControlValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rPropertyValue, const ::com::sun::star::uno::Type& _rControlValueType ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::inspection::LineDescriptor SAL_CALL describePropertyLine( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL isComposable( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::inspection::InteractiveSelectionResult SAL_CALL onInteractivePropertySelection( const ::rtl::OUString& _rPropertyName, sal_Bool _bPrimary, ::com::sun::star::uno::Any& _rData, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL actuatingPropertyChanged( const ::rtl::OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupersededProperties( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getActuatingProperties( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rControlValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rPropertyValue, const ::com::sun::star::uno::Type& _rControlValueType ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::inspection::LineDescriptor SAL_CALL describePropertyLine( const OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL isComposable( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::inspection::InteractiveSelectionResult SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, ::com::sun::star::uno::Any& _rData, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL suspend( sal_Bool _bSuspend ) throw (::com::sun::star::uno::RuntimeException); @@ -134,7 +134,7 @@ namespace pcr /** fires the change in a property value to our listener (if any) @see addPropertyChangeListener */ - void firePropertyChange( const ::rtl::OUString& _rPropName, PropertyId _nPropId, + void firePropertyChange( const OUString& _rPropName, PropertyId _nPropId, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Any& _rNewValue ) SAL_THROW(()); /** retrieves a window which can be used as parent for dialogs @@ -145,7 +145,7 @@ namespace pcr @throw com::sun::star::beans::UnknownPropertyException if the property name is not known to our ->m_pInfoService */ - PropertyId impl_getPropertyId_throw( const ::rtl::OUString& _rPropertyName ) const; + PropertyId impl_getPropertyId_throw( const OUString& _rPropertyName ) const; //------------------------------------------------------------------------------- // helper for implementing doDescribeSupportedProperties @@ -154,7 +154,7 @@ namespace pcr */ inline void addStringPropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, - const ::rtl::OUString& _rPropertyName, + const OUString& _rPropertyName, sal_Int16 _nAttribs = 0 ) const; @@ -162,7 +162,7 @@ namespace pcr */ inline void addInt32PropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, - const ::rtl::OUString& _rPropertyName, + const OUString& _rPropertyName, sal_Int16 _nAttribs = 0 ) const; @@ -170,7 +170,7 @@ namespace pcr */ inline void addInt16PropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, - const ::rtl::OUString& _rPropertyName, + const OUString& _rPropertyName, sal_Int16 _nAttribs = 0 ) const; @@ -178,7 +178,7 @@ namespace pcr */ inline void addDoublePropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, - const ::rtl::OUString& _rPropertyName, + const OUString& _rPropertyName, sal_Int16 _nAttribs = 0 ) const; @@ -186,7 +186,7 @@ namespace pcr */ inline void addDatePropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, - const ::rtl::OUString& _rPropertyName, + const OUString& _rPropertyName, sal_Int16 _nAttribs = 0 ) const; @@ -194,7 +194,7 @@ namespace pcr */ inline void addTimePropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, - const ::rtl::OUString& _rPropertyName, + const OUString& _rPropertyName, sal_Int16 _nAttribs = 0 ) const; @@ -202,14 +202,14 @@ namespace pcr */ inline void addDateTimePropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, - const ::rtl::OUString& _rPropertyName, + const OUString& _rPropertyName, sal_Int16 _nAttribs = 0 ) const; /// adds a Property, given by name only, to a given vector of Properties void implAddPropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, - const ::rtl::OUString& _rPropertyName, + const OUString& _rPropertyName, const ::com::sun::star::uno::Type& _rType, sal_Int16 _nAttribs = 0 ) const; @@ -257,11 +257,11 @@ namespace pcr @seealso doDescribeSupportedProperties */ const ::com::sun::star::beans::Property& - impl_getPropertyFromName_throw( const ::rtl::OUString& _rPropertyName ) const; + impl_getPropertyFromName_throw( const OUString& _rPropertyName ) const; /** get the name of a property given by handle */ - inline ::rtl::OUString + inline OUString impl_getPropertyNameFromId_nothrow( PropertyId _nPropId ) const; /** returns the value of the ContextDocument property in the ComponentContext which was used to create @@ -281,7 +281,7 @@ namespace pcr void impl_setContextDocumentModified_nothrow() const; /// determines whether our component has a given property - bool impl_componentHasProperty_throw( const ::rtl::OUString& _rPropName ) const; + bool impl_componentHasProperty_throw( const OUString& _rPropName ) const; /** determines the default measure unit for the document in which our component lives */ @@ -294,45 +294,45 @@ namespace pcr }; //-------------------------------------------------------------------- - inline void PropertyHandler::addStringPropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, const ::rtl::OUString& _rPropertyName, sal_Int16 _nAttribs ) const + inline void PropertyHandler::addStringPropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs ) const { - implAddPropertyDescription( _rProperties, _rPropertyName, ::getCppuType( static_cast< ::rtl::OUString* >( NULL ) ), _nAttribs ); + implAddPropertyDescription( _rProperties, _rPropertyName, ::getCppuType( static_cast< OUString* >( NULL ) ), _nAttribs ); } - inline void PropertyHandler::addInt32PropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, const ::rtl::OUString& _rPropertyName, sal_Int16 _nAttribs ) const + inline void PropertyHandler::addInt32PropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs ) const { implAddPropertyDescription( _rProperties, _rPropertyName, ::getCppuType( static_cast< sal_Int32* >( NULL ) ), _nAttribs ); } - inline void PropertyHandler::addInt16PropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, const ::rtl::OUString& _rPropertyName, sal_Int16 _nAttribs ) const + inline void PropertyHandler::addInt16PropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs ) const { implAddPropertyDescription( _rProperties, _rPropertyName, ::getCppuType( static_cast< sal_Int16* >( NULL ) ), _nAttribs ); } - inline void PropertyHandler::addDoublePropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, const ::rtl::OUString& _rPropertyName, sal_Int16 _nAttribs ) const + inline void PropertyHandler::addDoublePropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs ) const { implAddPropertyDescription( _rProperties, _rPropertyName, ::getCppuType( static_cast< double* >( NULL ) ), _nAttribs ); } - inline void PropertyHandler::addDatePropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, const ::rtl::OUString& _rPropertyName, sal_Int16 _nAttribs ) const + inline void PropertyHandler::addDatePropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs ) const { implAddPropertyDescription( _rProperties, _rPropertyName, ::getCppuType( static_cast< com::sun::star::util::Date* >( NULL ) ), _nAttribs ); } - inline void PropertyHandler::addTimePropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, const ::rtl::OUString& _rPropertyName, sal_Int16 _nAttribs ) const + inline void PropertyHandler::addTimePropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs ) const { implAddPropertyDescription( _rProperties, _rPropertyName, ::getCppuType( static_cast< com::sun::star::util::Time* >( NULL ) ), _nAttribs ); } - inline void PropertyHandler::addDateTimePropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, const ::rtl::OUString& _rPropertyName, sal_Int16 _nAttribs ) const + inline void PropertyHandler::addDateTimePropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs ) const { implAddPropertyDescription( _rProperties, _rPropertyName, ::getCppuType( static_cast< com::sun::star::util::DateTime* >( NULL ) ), _nAttribs ); } - inline ::rtl::OUString PropertyHandler::impl_getPropertyNameFromId_nothrow( PropertyId _nPropId ) const + inline OUString PropertyHandler::impl_getPropertyNameFromId_nothrow( PropertyId _nPropId ) const { const ::com::sun::star::beans::Property* pProp = impl_getPropertyFromId_nothrow( _nPropId ); - return pProp ? pProp->Name : ::rtl::OUString(); + return pProp ? pProp->Name : OUString(); } //==================================================================== @@ -354,9 +354,9 @@ namespace pcr DECLARE_XTYPEPROVIDER() // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) = 0; - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException) = 0; + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) = 0; + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException) = 0; }; //==================================================================== @@ -379,8 +379,8 @@ namespace pcr { ... public: - static ::rtl::OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); + static OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); }; </pre> */ @@ -395,8 +395,8 @@ namespace pcr protected: // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext ); public: @@ -407,14 +407,14 @@ namespace pcr //-------------------------------------------------------------------- template < class HANDLER > - ::rtl::OUString SAL_CALL HandlerComponentBase< HANDLER >::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) + OUString SAL_CALL HandlerComponentBase< HANDLER >::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) { return HANDLER::getImplementationName_static(); } //-------------------------------------------------------------------- template < class HANDLER > - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL HandlerComponentBase< HANDLER >::getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::Sequence< OUString > SAL_CALL HandlerComponentBase< HANDLER >::getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException) { return HANDLER::getSupportedServiceNames_static(); } diff --git a/extensions/source/propctrlr/propertyinfo.hxx b/extensions/source/propctrlr/propertyinfo.hxx index 01ecdf312399..45bcbaed6986 100644 --- a/extensions/source/propctrlr/propertyinfo.hxx +++ b/extensions/source/propctrlr/propertyinfo.hxx @@ -39,10 +39,10 @@ namespace pcr public: virtual sal_Int32 getPropertyId(const String& _rName) const = 0; virtual String getPropertyTranslation(sal_Int32 _nId) const = 0; - virtual rtl::OString getPropertyHelpId(sal_Int32 _nId) const = 0; + virtual OString getPropertyHelpId(sal_Int32 _nId) const = 0; virtual sal_Int16 getPropertyPos(sal_Int32 _nId) const = 0; virtual sal_uInt32 getPropertyUIFlags(sal_Int32 _nId) const = 0; - virtual ::std::vector< ::rtl::OUString > getPropertyEnumRepresentations(sal_Int32 _nId) const = 0; + virtual ::std::vector< OUString > getPropertyEnumRepresentations(sal_Int32 _nId) const = 0; // this is only temporary, until the UNOization of the property browser is completed virtual String getPropertyName( sal_Int32 _nPropId ) = 0; diff --git a/extensions/source/propctrlr/proplinelistener.hxx b/extensions/source/propctrlr/proplinelistener.hxx index 6f2a58c8c454..1315548da4ab 100644 --- a/extensions/source/propctrlr/proplinelistener.hxx +++ b/extensions/source/propctrlr/proplinelistener.hxx @@ -31,8 +31,8 @@ namespace pcr class IPropertyLineListener { public: - virtual void Clicked( const ::rtl::OUString& _rName, sal_Bool _bPrimary ) = 0; - virtual void Commit( const ::rtl::OUString& _rName, const ::com::sun::star::uno::Any& _rVal ) = 0; + virtual void Clicked( const OUString& _rName, sal_Bool _bPrimary ) = 0; + virtual void Commit( const OUString& _rName, const ::com::sun::star::uno::Any& _rVal ) = 0; protected: ~IPropertyLineListener() {} diff --git a/extensions/source/propctrlr/pushbuttonnavigation.cxx b/extensions/source/propctrlr/pushbuttonnavigation.cxx index 20a085d9922a..8d65391b9cc9 100644 --- a/extensions/source/propctrlr/pushbuttonnavigation.cxx +++ b/extensions/source/propctrlr/pushbuttonnavigation.cxx @@ -54,7 +54,7 @@ namespace pcr NULL }; - static sal_Int32 lcl_getNavigationURLIndex( const ::rtl::OUString& _rNavURL ) + static sal_Int32 lcl_getNavigationURLIndex( const OUString& _rNavURL ) { const sal_Char** pLookup = pNavigationURLs; while ( *pLookup ) @@ -108,7 +108,7 @@ namespace pcr { // there's a chance that this is a "virtual" button type // (which are realized by special URLs) - ::rtl::OUString sTargetURL; + OUString sTargetURL; m_xControlModel->getPropertyValue( PROPERTY_TARGET_URL ) >>= sTargetURL; sal_Int32 nNavigationURLIndex = lcl_getNavigationURLIndex( sTargetURL ); @@ -147,13 +147,13 @@ namespace pcr { sal_Int32 nButtonType = FormButtonType_PUSH; OSL_VERIFY( ::cppu::enum2int( nButtonType, _rValue ) ); - ::rtl::OUString sTargetURL; + OUString sTargetURL; bool bIsVirtualButtonType = nButtonType >= s_nFirstVirtualButtonType; if ( bIsVirtualButtonType ) { const sal_Char* pURL = lcl_getNavigationURL( nButtonType - s_nFirstVirtualButtonType ); - sTargetURL = ::rtl::OUString::createFromAscii( pURL ); + sTargetURL = OUString::createFromAscii( pURL ); nButtonType = FormButtonType_URL; } @@ -220,7 +220,7 @@ namespace pcr // pretend (to the user) that there's no URL set - since // virtual button types imply a special (technical) URL which // the user should not see - aReturn <<= ::rtl::OUString(); + aReturn <<= OUString(); } } } @@ -286,7 +286,7 @@ namespace pcr //------------------------------------------------------------------------ bool PushButtonNavigation::hasNonEmptyCurrentTargetURL() const { - ::rtl::OUString sTargetURL; + OUString sTargetURL; OSL_VERIFY( getCurrentTargetURL() >>= sTargetURL ); return !sTargetURL.isEmpty(); } diff --git a/extensions/source/propctrlr/selectlabeldialog.cxx b/extensions/source/propctrlr/selectlabeldialog.cxx index 365382743c3a..ace03a37d1d0 100644 --- a/extensions/source/propctrlr/selectlabeldialog.cxx +++ b/extensions/source/propctrlr/selectlabeldialog.cxx @@ -75,15 +75,15 @@ namespace pcr m_aControlTree.SetDeselectHdl(LINK(this, OSelectLabelDialog, OnEntrySelected)); // fill the description - rtl::OUString sDescription = m_aMainDesc.GetText(); + OUString sDescription = m_aMainDesc.GetText(); sal_Int16 nClassID = FormComponentType::CONTROL; if (::comphelper::hasProperty(PROPERTY_CLASSID, m_xControlModel)) nClassID = ::comphelper::getINT16(m_xControlModel->getPropertyValue(PROPERTY_CLASSID)); - sDescription = sDescription.replaceAll(rtl::OUString("$control_class$"), + sDescription = sDescription.replaceAll(OUString("$control_class$"), GetUIHeadlineName(nClassID, makeAny(m_xControlModel))); - rtl::OUString sName = ::comphelper::getString(m_xControlModel->getPropertyValue(PROPERTY_NAME)); - sDescription = sDescription.replaceAll(rtl::OUString("$control_name$"), sName); + OUString sName = ::comphelper::getString(m_xControlModel->getPropertyValue(PROPERTY_NAME)); + sDescription = sDescription.replaceAll(OUString("$control_name$"), sName); m_aMainDesc.SetText(sDescription); // search for the root of the form hierarchy @@ -174,7 +174,7 @@ namespace pcr return 0; sal_Int32 nChildren = 0; - rtl::OUString sName; + OUString sName; Reference< XPropertySet > xAsSet; for (sal_Int32 i=0; i<xContainer->getCount(); ++i) { @@ -222,7 +222,7 @@ namespace pcr if (!::comphelper::hasProperty(PROPERTY_LABEL, xAsSet)) continue; - rtl::OUString sDisplayName = rtl::OUStringBuffer( + OUString sDisplayName = OUStringBuffer( ::comphelper::getString(xAsSet->getPropertyValue(PROPERTY_LABEL))). appendAscii(RTL_CONSTASCII_STRINGPARAM(" (")).append(sName).append(')'). makeStringAndClear(); diff --git a/extensions/source/propctrlr/selectlabeldialog.hxx b/extensions/source/propctrlr/selectlabeldialog.hxx index 9b193d645178..83053a94adb4 100644 --- a/extensions/source/propctrlr/selectlabeldialog.hxx +++ b/extensions/source/propctrlr/selectlabeldialog.hxx @@ -49,7 +49,7 @@ namespace pcr ImageList m_aModelImages; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xControlModel; - ::rtl::OUString m_sRequiredService; + OUString m_sRequiredService; Image m_aRequiredControlImage; SvTreeListEntry* m_pInitialSelection; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xInitialLabelControl; diff --git a/extensions/source/propctrlr/sqlcommanddesign.cxx b/extensions/source/propctrlr/sqlcommanddesign.cxx index df6e1261b84b..d4d6bb7429c8 100644 --- a/extensions/source/propctrlr/sqlcommanddesign.cxx +++ b/extensions/source/propctrlr/sqlcommanddesign.cxx @@ -130,7 +130,7 @@ namespace pcr { if ( PROPERTY_ACTIVECOMMAND == Event.PropertyName ) { - ::rtl::OUString sCommand; + OUString sCommand; OSL_VERIFY( Event.NewValue >>= sCommand ); m_xObjectAdapter->setSQLCommand( sCommand ); } @@ -243,12 +243,12 @@ namespace pcr aArgs[3].Name = PROPERTY_ESCAPE_PROCESSING; aArgs[3].Value <<= m_xObjectAdapter->getEscapeProcessing(); - aArgs[4].Name = ::rtl::OUString( "GraphicalDesign" ); + aArgs[4].Name = OUString( "GraphicalDesign" ); aArgs[4].Value <<= m_xObjectAdapter->getEscapeProcessing(); Reference< XComponent > xQueryDesign = xLoader->loadComponentFromURL( - ::rtl::OUString( ".component:DB/QueryDesign" ), - ::rtl::OUString( "_self" ), + OUString( ".component:DB/QueryDesign" ), + OUString( "_self" ), FrameSearchFlag::TASKS | FrameSearchFlag::CREATE, aArgs ); @@ -272,7 +272,7 @@ namespace pcr if ( xTitle.is() ) { ::svt::OLocalResourceAccess aEnumStrings( PcrRes( RID_RSC_ENUM_COMMAND_TYPE ), RSC_RESOURCE ); - ::rtl::OUString sDisplayName = String( PcrRes( CommandType::COMMAND + 1 ) ); + OUString sDisplayName = String( PcrRes( CommandType::COMMAND + 1 ) ); xTitle->setTitle( sDisplayName ); } } @@ -295,7 +295,7 @@ namespace pcr Reference< XDesktop2 > xDesktop = Desktop::create(m_xContext); Reference< XFrames > xDesktopFramesCollection( xDesktop->getFrames(), UNO_QUERY_THROW ); - xFrame = xDesktop->findFrame( ::rtl::OUString( "_blank" ), FrameSearchFlag::CREATE ); + xFrame = xDesktop->findFrame( OUString( "_blank" ), FrameSearchFlag::CREATE ); OSL_ENSURE( xFrame.is(), "SQLCommandDesigner::impl_createEmptyParentlessTask_nothrow: could not create an empty frame!" ); xDesktopFramesCollection->remove( xFrame ); } @@ -329,11 +329,11 @@ namespace pcr // instead of calling XCloseable::close directly. The latter method would also close // the frame, but not care for things like shutting down the office when the last // frame is gone ... - const UnoURL aCloseURL( ::rtl::OUString( ".uno:CloseDoc" ), + const UnoURL aCloseURL( OUString( ".uno:CloseDoc" ), Reference< XMultiServiceFactory >( m_xORB, UNO_QUERY ) ); Reference< XDispatchProvider > xProvider( m_xDesigner->getFrame(), UNO_QUERY_THROW ); - Reference< XDispatch > xDispatch( xProvider->queryDispatch( aCloseURL, ::rtl::OUString( "_top" ), FrameSearchFlag::SELF ) ); + Reference< XDispatch > xDispatch( xProvider->queryDispatch( aCloseURL, OUString( "_top" ), FrameSearchFlag::SELF ) ); OSL_ENSURE( xDispatch.is(), "SQLCommandDesigner::impl_closeDesigner_nothrow: no dispatcher for the CloseDoc command!" ); if ( xDispatch.is() ) { diff --git a/extensions/source/propctrlr/sqlcommanddesign.hxx b/extensions/source/propctrlr/sqlcommanddesign.hxx index c3bf797e58c4..be140a3543f5 100644 --- a/extensions/source/propctrlr/sqlcommanddesign.hxx +++ b/extensions/source/propctrlr/sqlcommanddesign.hxx @@ -171,12 +171,12 @@ namespace pcr /** gets the current value of the command property */ - ::rtl::OUString + OUString impl_getCommandPropertyValue_nothrow(); /** sets anew value for the command property */ - void impl_setCommandPropertyValue_nothrow( const ::rtl::OUString& _rCommand ) const; + void impl_setCommandPropertyValue_nothrow( const OUString& _rCommand ) const; private: SQLCommandDesigner(); // never implemented @@ -193,12 +193,12 @@ namespace pcr { public: /// retrieves the current SQL command of the component - virtual ::rtl::OUString getSQLCommand() const = 0; + virtual OUString getSQLCommand() const = 0; /// retrieves the current value of the EscapeProcessing property of the component virtual sal_Bool getEscapeProcessing() const = 0; /// sets a new SQL command - virtual void setSQLCommand( const ::rtl::OUString& _rCommand ) const = 0; + virtual void setSQLCommand( const OUString& _rCommand ) const = 0; /// sets a new EscapeProcessing property value virtual void setEscapeProcessing( const sal_Bool _bEscapeProcessing ) const = 0; diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx index fcaa26b30224..f9caaae10131 100644 --- a/extensions/source/propctrlr/standardcontrol.cxx +++ b/extensions/source/propctrlr/standardcontrol.cxx @@ -181,14 +181,14 @@ namespace pcr //------------------------------------------------------------------ void SAL_CALL OEditControl::setValue( const Any& _rValue ) throw (IllegalTypeException, RuntimeException) { - ::rtl::OUString sText; + OUString sText; if ( m_bIsPassword ) { sal_Int16 nValue = 0; _rValue >>= nValue; if ( nValue ) { - sText = rtl::OUString(static_cast<sal_Unicode>(nValue)); + sText = OUString(static_cast<sal_Unicode>(nValue)); } } else @@ -202,7 +202,7 @@ namespace pcr { Any aPropValue; - ::rtl::OUString sText( getTypedControlWindow()->GetText() ); + OUString sText( getTypedControlWindow()->GetText() ); if ( m_bIsPassword ) { if ( !sText.isEmpty() ) @@ -217,7 +217,7 @@ namespace pcr //------------------------------------------------------------------ Type SAL_CALL OEditControl::getValueType() throw (RuntimeException) { - return m_bIsPassword ? ::getCppuType( static_cast< sal_Int16* >( NULL ) ) : ::getCppuType( static_cast< ::rtl::OUString* >( NULL ) ); + return m_bIsPassword ? ::getCppuType( static_cast< sal_Int16* >( NULL ) ) : ::getCppuType( static_cast< OUString* >( NULL ) ); } //------------------------------------------------------------------ @@ -423,14 +423,14 @@ namespace pcr //-------------------------------------------------------------------- Any SAL_CALL OHyperlinkControl::getValue() throw (RuntimeException) { - ::rtl::OUString sText = getTypedControlWindow()->GetText(); + OUString sText = getTypedControlWindow()->GetText(); return makeAny( sText ); } //-------------------------------------------------------------------- void SAL_CALL OHyperlinkControl::setValue( const Any& _value ) throw (IllegalTypeException, RuntimeException) { - ::rtl::OUString sText; + OUString sText; _value >>= sText; getTypedControlWindow()->SetText( sText ); } @@ -438,7 +438,7 @@ namespace pcr //-------------------------------------------------------------------- Type SAL_CALL OHyperlinkControl::getValueType() throw (RuntimeException) { - return ::getCppuType( static_cast< ::rtl::OUString* >( NULL ) ); + return ::getCppuType( static_cast< OUString* >( NULL ) ); } //-------------------------------------------------------------------- @@ -466,7 +466,7 @@ namespace pcr //------------------------------------------------------------------ IMPL_LINK( OHyperlinkControl, OnHyperlinkClicked, void*, /*_NotInterestedIn*/ ) { - ActionEvent aEvent( *this, ::rtl::OUString( "clicked" ) ); + ActionEvent aEvent( *this, OUString( "clicked" ) ); m_aActionListeners.forEach< XActionListener >( boost::bind( &XActionListener::actionPerformed, @@ -715,7 +715,7 @@ namespace pcr getTypedControlWindow()->SelectEntry( aRgbCol ); if ( !getTypedControlWindow()->IsEntrySelected( aRgbCol ) ) { // the given color is not part of the list -> insert a new entry with the hex code of the color - String aStr = rtl::OUString("0x"); + String aStr = OUString("0x"); aStr += MakeHexStr(nColor,8); getTypedControlWindow()->InsertEntry( aRgbCol, aStr ); getTypedControlWindow()->SelectEntry( aRgbCol ); @@ -723,7 +723,7 @@ namespace pcr } else { - ::rtl::OUString sNonColorValue; + OUString sNonColorValue; if ( !( _rValue >>= sNonColorValue ) ) throw IllegalTypeException(); getTypedControlWindow()->SelectEntry( sNonColorValue ); @@ -741,7 +741,7 @@ namespace pcr Any aPropValue; if ( getTypedControlWindow()->GetSelectEntryCount() > 0 ) { - ::rtl::OUString sSelectedEntry = getTypedControlWindow()->GetSelectEntry(); + OUString sSelectedEntry = getTypedControlWindow()->GetSelectEntry(); if ( m_aNonColorEntries.find( sSelectedEntry ) != m_aNonColorEntries.end() ) aPropValue <<= sSelectedEntry; else @@ -766,24 +766,24 @@ namespace pcr } //------------------------------------------------------------------ - void SAL_CALL OColorControl::prependListEntry( const ::rtl::OUString& NewEntry ) throw (RuntimeException) + void SAL_CALL OColorControl::prependListEntry( const OUString& NewEntry ) throw (RuntimeException) { getTypedControlWindow()->InsertEntry( NewEntry, 0 ); m_aNonColorEntries.insert( NewEntry ); } //------------------------------------------------------------------ - void SAL_CALL OColorControl::appendListEntry( const ::rtl::OUString& NewEntry ) throw (RuntimeException) + void SAL_CALL OColorControl::appendListEntry( const OUString& NewEntry ) throw (RuntimeException) { getTypedControlWindow()->InsertEntry( NewEntry ); m_aNonColorEntries.insert( NewEntry ); } //------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL OColorControl::getListEntries( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL OColorControl::getListEntries( ) throw (RuntimeException) { if ( !m_aNonColorEntries.empty() ) - return Sequence< ::rtl::OUString >(&(*m_aNonColorEntries.begin()),m_aNonColorEntries.size()); - return Sequence< ::rtl::OUString >(); + return Sequence< OUString >(&(*m_aNonColorEntries.begin()),m_aNonColorEntries.size()); + return Sequence< OUString >(); } //------------------------------------------------------------------ @@ -814,7 +814,7 @@ namespace pcr //------------------------------------------------------------------ Any SAL_CALL OListboxControl::getValue() throw (RuntimeException) { - ::rtl::OUString sControlValue( getTypedControlWindow()->GetSelectEntry() ); + OUString sControlValue( getTypedControlWindow()->GetSelectEntry() ); Any aPropValue; if ( !sControlValue.isEmpty() ) @@ -825,7 +825,7 @@ namespace pcr //------------------------------------------------------------------ Type SAL_CALL OListboxControl::getValueType() throw (RuntimeException) { - return ::getCppuType( static_cast< ::rtl::OUString* >( NULL ) ); + return ::getCppuType( static_cast< OUString* >( NULL ) ); } //------------------------------------------------------------------ @@ -835,7 +835,7 @@ namespace pcr getTypedControlWindow()->SetNoSelection(); else { - ::rtl::OUString sSelection; + OUString sSelection; _rValue >>= sSelection; if ( !sSelection.equals( getTypedControlWindow()->GetSelectEntry() ) ) @@ -856,22 +856,22 @@ namespace pcr } //------------------------------------------------------------------ - void SAL_CALL OListboxControl::prependListEntry( const ::rtl::OUString& NewEntry ) throw (RuntimeException) + void SAL_CALL OListboxControl::prependListEntry( const OUString& NewEntry ) throw (RuntimeException) { getTypedControlWindow()->InsertEntry( NewEntry, 0 ); } //------------------------------------------------------------------ - void SAL_CALL OListboxControl::appendListEntry( const ::rtl::OUString& NewEntry ) throw (RuntimeException) + void SAL_CALL OListboxControl::appendListEntry( const OUString& NewEntry ) throw (RuntimeException) { getTypedControlWindow()->InsertEntry( NewEntry ); } //------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL OListboxControl::getListEntries( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL OListboxControl::getListEntries( ) throw (RuntimeException) { const sal_uInt16 nCount = getTypedControlWindow()->GetEntryCount(); - Sequence< ::rtl::OUString > aRet(nCount); - ::rtl::OUString* pIter = aRet.getArray(); + Sequence< OUString > aRet(nCount); + OUString* pIter = aRet.getArray(); for (sal_uInt16 i = 0; i < nCount ; ++i,++pIter) *pIter = getTypedControlWindow()->GetEntry(i); @@ -902,7 +902,7 @@ namespace pcr //------------------------------------------------------------------ void SAL_CALL OComboboxControl::setValue( const Any& _rValue ) throw (IllegalTypeException, RuntimeException) { - ::rtl::OUString sText; + OUString sText; _rValue >>= sText; getTypedControlWindow()->SetText( sText ); } @@ -910,13 +910,13 @@ namespace pcr //------------------------------------------------------------------ Any SAL_CALL OComboboxControl::getValue() throw (RuntimeException) { - return makeAny( ::rtl::OUString( getTypedControlWindow()->GetText() ) ); + return makeAny( OUString( getTypedControlWindow()->GetText() ) ); } //------------------------------------------------------------------ Type SAL_CALL OComboboxControl::getValueType() throw (RuntimeException) { - return ::getCppuType( static_cast< ::rtl::OUString* >( NULL ) ); + return ::getCppuType( static_cast< OUString* >( NULL ) ); } //------------------------------------------------------------------ @@ -926,22 +926,22 @@ namespace pcr } //------------------------------------------------------------------ - void SAL_CALL OComboboxControl::prependListEntry( const ::rtl::OUString& NewEntry ) throw (RuntimeException) + void SAL_CALL OComboboxControl::prependListEntry( const OUString& NewEntry ) throw (RuntimeException) { getTypedControlWindow()->InsertEntry( NewEntry, 0 ); } //------------------------------------------------------------------ - void SAL_CALL OComboboxControl::appendListEntry( const ::rtl::OUString& NewEntry ) throw (RuntimeException) + void SAL_CALL OComboboxControl::appendListEntry( const OUString& NewEntry ) throw (RuntimeException) { getTypedControlWindow()->InsertEntry( NewEntry ); } //------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL OComboboxControl::getListEntries( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL OComboboxControl::getListEntries( ) throw (RuntimeException) { const sal_uInt16 nCount = getTypedControlWindow()->GetEntryCount(); - Sequence< ::rtl::OUString > aRet(nCount); - ::rtl::OUString* pIter = aRet.getArray(); + Sequence< OUString > aRet(nCount); + OUString* pIter = aRet.getArray(); for (sal_uInt16 i = 0; i < nCount ; ++i,++pIter) *pIter = getTypedControlWindow()->GetEntry(i); @@ -1158,20 +1158,20 @@ namespace pcr namespace { //.............................................................. - StlSyntaxSequence< ::rtl::OUString > lcl_convertMultiLineToList( const String& _rCompsedTextWithLineBreaks ) + StlSyntaxSequence< OUString > lcl_convertMultiLineToList( const String& _rCompsedTextWithLineBreaks ) { xub_StrLen nLines( comphelper::string::getTokenCount(_rCompsedTextWithLineBreaks, '\n') ); - StlSyntaxSequence< ::rtl::OUString > aStrings( nLines ); - StlSyntaxSequence< ::rtl::OUString >::iterator stringItem = aStrings.begin(); + StlSyntaxSequence< OUString > aStrings( nLines ); + StlSyntaxSequence< OUString >::iterator stringItem = aStrings.begin(); for ( xub_StrLen token = 0; token < nLines; ++token, ++stringItem ) *stringItem = _rCompsedTextWithLineBreaks.GetToken( token, '\n' ); return aStrings; } - String lcl_convertListToMultiLine( const StlSyntaxSequence< ::rtl::OUString >& _rStrings ) + String lcl_convertListToMultiLine( const StlSyntaxSequence< OUString >& _rStrings ) { String sMultiLineText; - for ( StlSyntaxSequence< ::rtl::OUString >::const_iterator item = _rStrings.begin(); + for ( StlSyntaxSequence< OUString >::const_iterator item = _rStrings.begin(); item != _rStrings.end(); ) { @@ -1183,10 +1183,10 @@ namespace pcr } //.............................................................. - String lcl_convertListToDisplayText( const StlSyntaxSequence< ::rtl::OUString >& _rStrings ) + String lcl_convertListToDisplayText( const StlSyntaxSequence< OUString >& _rStrings ) { - ::rtl::OUStringBuffer aComposed; - for ( StlSyntaxSequence< ::rtl::OUString >::const_iterator strings = _rStrings.begin(); + OUStringBuffer aComposed; + for ( StlSyntaxSequence< OUString >::const_iterator strings = _rStrings.begin(); strings != _rStrings.end(); ++strings ) @@ -1325,20 +1325,20 @@ namespace pcr } //------------------------------------------------------------------ - void DropDownEditControl::SetStringListValue( const StlSyntaxSequence< ::rtl::OUString >& _rStrings ) + void DropDownEditControl::SetStringListValue( const StlSyntaxSequence< OUString >& _rStrings ) { SetText( lcl_convertListToDisplayText( _rStrings ) ); m_pFloatingEdit->getEdit()->SetText( lcl_convertListToMultiLine( _rStrings ) ); } //------------------------------------------------------------------ - StlSyntaxSequence< ::rtl::OUString > DropDownEditControl::GetStringListValue() const + StlSyntaxSequence< OUString > DropDownEditControl::GetStringListValue() const { return lcl_convertMultiLineToList( m_pFloatingEdit->getEdit()->GetText() ); } //------------------------------------------------------------------ - void DropDownEditControl::SetTextValue( const ::rtl::OUString& _rText ) + void DropDownEditControl::SetTextValue( const OUString& _rText ) { OSL_PRECOND( m_nOperationMode == eMultiLineText, "DropDownEditControl::SetTextValue: illegal call!" ); @@ -1347,7 +1347,7 @@ namespace pcr } //------------------------------------------------------------------ - ::rtl::OUString DropDownEditControl::GetTextValue() const + OUString DropDownEditControl::GetTextValue() const { OSL_PRECOND( m_nOperationMode == eMultiLineText, "DropDownEditControl::GetTextValue: illegal call!" ); return GetText(); @@ -1375,7 +1375,7 @@ namespace pcr { case eMultiLineText: { - ::rtl::OUString sText; + OUString sText; if ( !( _rValue >>= sText ) && _rValue.hasValue() ) throw IllegalTypeException(); getTypedControlWindow()->SetTextValue( sText ); @@ -1383,7 +1383,7 @@ namespace pcr break; case eStringList: { - Sequence< ::rtl::OUString > aStringLines; + Sequence< OUString > aStringLines; if ( !( _rValue >>= aStringLines ) && _rValue.hasValue() ) throw IllegalTypeException(); getTypedControlWindow()->SetStringListValue( aStringLines ); @@ -1414,8 +1414,8 @@ namespace pcr Type SAL_CALL OMultilineEditControl::getValueType() throw (RuntimeException) { if ( getTypedControlWindow()->getOperationMode() == eMultiLineText ) - return ::getCppuType( static_cast< ::rtl::OUString* >( NULL ) ); - return ::getCppuType( static_cast< Sequence< ::rtl::OUString >* >( NULL ) ); + return ::getCppuType( static_cast< OUString* >( NULL ) ); + return ::getCppuType( static_cast< Sequence< OUString >* >( NULL ) ); } //............................................................................ diff --git a/extensions/source/propctrlr/standardcontrol.hxx b/extensions/source/propctrlr/standardcontrol.hxx index 91bf8a097897..b7cd14efb3c7 100644 --- a/extensions/source/propctrlr/standardcontrol.hxx +++ b/extensions/source/propctrlr/standardcontrol.hxx @@ -286,7 +286,7 @@ namespace pcr class OColorControl : public OColorControl_Base { private: - ::std::set< ::rtl::OUString > m_aNonColorEntries; + ::std::set< OUString > m_aNonColorEntries; public: OColorControl( Window* pParent, WinBits nWinStyle ); @@ -298,9 +298,9 @@ namespace pcr // XStringListControl virtual void SAL_CALL clearList( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL prependListEntry( const ::rtl::OUString& NewEntry ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL appendListEntry( const ::rtl::OUString& NewEntry ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getListEntries( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL prependListEntry( const OUString& NewEntry ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL appendListEntry( const OUString& NewEntry ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getListEntries( ) throw (::com::sun::star::uno::RuntimeException); protected: virtual void modified(); @@ -324,9 +324,9 @@ namespace pcr // XStringListControl virtual void SAL_CALL clearList( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL prependListEntry( const ::rtl::OUString& NewEntry ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL appendListEntry( const ::rtl::OUString& NewEntry ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getListEntries( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL prependListEntry( const OUString& NewEntry ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL appendListEntry( const OUString& NewEntry ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getListEntries( ) throw (::com::sun::star::uno::RuntimeException); protected: virtual void modified(); @@ -348,9 +348,9 @@ namespace pcr // XStringListControl virtual void SAL_CALL clearList( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL prependListEntry( const ::rtl::OUString& NewEntry ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL appendListEntry( const ::rtl::OUString& NewEntry ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getListEntries( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL prependListEntry( const OUString& NewEntry ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL appendListEntry( const OUString& NewEntry ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getListEntries( ) throw (::com::sun::star::uno::RuntimeException); protected: DECL_LINK( OnEntrySelected, void* ); @@ -387,11 +387,11 @@ namespace pcr void setOperationMode( MultiLineOperationMode _eMode ) { m_nOperationMode = _eMode; } MultiLineOperationMode getOperationMode() const { return m_nOperationMode; } - void SetTextValue( const ::rtl::OUString& _rText ); - ::rtl::OUString GetTextValue() const; + void SetTextValue( const OUString& _rText ); + OUString GetTextValue() const; - void SetStringListValue( const StlSyntaxSequence< ::rtl::OUString >& _rStrings ); - StlSyntaxSequence< ::rtl::OUString > + void SetStringListValue( const StlSyntaxSequence< OUString >& _rStrings ); + StlSyntaxSequence< OUString > GetStringListValue() const; // ControlWindow overridables diff --git a/extensions/source/propctrlr/stringrepresentation.cxx b/extensions/source/propctrlr/stringrepresentation.cxx index 394ad17454c7..a68c8d0489d4 100644 --- a/extensions/source/propctrlr/stringrepresentation.cxx +++ b/extensions/source/propctrlr/stringrepresentation.cxx @@ -49,8 +49,8 @@ namespace comp_StringRepresentation { using namespace ::com::sun::star; // component and service helper functions: -::rtl::OUString SAL_CALL _getImplementationName(); -uno::Sequence< ::rtl::OUString > SAL_CALL _getSupportedServiceNames(); +OUString SAL_CALL _getImplementationName(); +uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames(); uno::Reference< uno::XInterface > SAL_CALL _create( uno::Reference< uno::XComponentContext > const & context ); } // closing component helper namespace @@ -71,13 +71,13 @@ public: explicit StringRepresentation(uno::Reference< uno::XComponentContext > const & context); // lang::XServiceInfo: - virtual ::rtl::OUString SAL_CALL getImplementationName() throw (uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService(const ::rtl::OUString & ServiceName) throw (uno::RuntimeException); - virtual uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService(const OUString & ServiceName) throw (uno::RuntimeException); + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (uno::RuntimeException); // inspection::XStringRepresentation: - virtual ::rtl::OUString SAL_CALL convertToControlValue(const uno::Any & PropertyValue) throw (uno::RuntimeException, uno::Exception); - virtual uno::Any SAL_CALL convertToPropertyValue(const ::rtl::OUString & ControlValue, const uno::Type & ControlValueType) throw (uno::RuntimeException, uno::Exception); + virtual OUString SAL_CALL convertToControlValue(const uno::Any & PropertyValue) throw (uno::RuntimeException, uno::Exception); + virtual uno::Any SAL_CALL convertToPropertyValue(const OUString & ControlValue, const uno::Type & ControlValueType) throw (uno::RuntimeException, uno::Exception); // lang::XInitialization: virtual void SAL_CALL initialize(const uno::Sequence< uno::Any > & aArguments) throw (uno::RuntimeException, uno::Exception); @@ -98,7 +98,7 @@ private: */ bool convertGenericValueToString( const uno::Any& _rValue, - ::rtl::OUString& _rStringRep + OUString& _rStringRep ); /** converts string representation into generic value @@ -110,7 +110,7 @@ private: if and only if the value could be converted */ bool convertStringToGenericValue( - const ::rtl::OUString& _rStringRep, + const OUString& _rStringRep, uno::Any& _rValue, const uno::Type& _rTargetType ); @@ -120,19 +120,19 @@ private: * \param _rValue the value to be converted * \return the converted string. */ - ::rtl::OUString convertSimpleToString( const uno::Any& _rValue ); + OUString convertSimpleToString( const uno::Any& _rValue ); /** converts a string into his constant value if it exists, otherwise the type converter is used. * \param _rValue the value to be converted * \param _ePropertyType the type of the propery to be converted into * \return the converted value */ - uno::Any convertStringToSimple( const ::rtl::OUString& _rValue,const uno::TypeClass& _ePropertyType ); + uno::Any convertStringToSimple( const OUString& _rValue,const uno::TypeClass& _ePropertyType ); uno::Reference< uno::XComponentContext > m_xContext; uno::Reference< script::XTypeConverter > m_xTypeConverter; uno::Reference< reflection::XConstantsTypeDescription > m_xTypeDescription; - uno::Sequence< ::rtl::OUString > m_aValues; + uno::Sequence< OUString > m_aValues; uno::Sequence< uno::Reference< reflection::XConstantTypeDescription> > m_aConstants; }; @@ -142,34 +142,34 @@ StringRepresentation::StringRepresentation(uno::Reference< uno::XComponentContex {} // com.sun.star.uno.XServiceInfo: -::rtl::OUString SAL_CALL StringRepresentation::getImplementationName() throw (uno::RuntimeException) +OUString SAL_CALL StringRepresentation::getImplementationName() throw (uno::RuntimeException) { return comp_StringRepresentation::_getImplementationName(); } -::sal_Bool SAL_CALL StringRepresentation::supportsService(::rtl::OUString const & serviceName) throw (uno::RuntimeException) +::sal_Bool SAL_CALL StringRepresentation::supportsService(OUString const & serviceName) throw (uno::RuntimeException) { return ::comphelper::existsValue(serviceName,comp_StringRepresentation::_getSupportedServiceNames()); } -uno::Sequence< ::rtl::OUString > SAL_CALL StringRepresentation::getSupportedServiceNames() throw (uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL StringRepresentation::getSupportedServiceNames() throw (uno::RuntimeException) { return comp_StringRepresentation::_getSupportedServiceNames(); } // inspection::XStringRepresentation: -::rtl::OUString SAL_CALL StringRepresentation::convertToControlValue(const uno::Any & PropertyValue) throw (uno::RuntimeException, uno::Exception) +OUString SAL_CALL StringRepresentation::convertToControlValue(const uno::Any & PropertyValue) throw (uno::RuntimeException, uno::Exception) { - ::rtl::OUString sReturn; + OUString sReturn; if ( !convertGenericValueToString( PropertyValue, sReturn ) ) { sReturn = convertSimpleToString( PropertyValue ); #ifdef DBG_UTIL if ( sReturn.isEmpty() && PropertyValue.hasValue() ) { - ::rtl::OString sMessage( "StringRepresentation::convertPropertyValueToStringRepresentation: cannot convert values of type '" ); - sMessage += ::rtl::OString( PropertyValue.getValueType().getTypeName().getStr(), PropertyValue.getValueType().getTypeName().getLength(), RTL_TEXTENCODING_ASCII_US ); - sMessage += ::rtl::OString( "'!" ); + OString sMessage( "StringRepresentation::convertPropertyValueToStringRepresentation: cannot convert values of type '" ); + sMessage += OString( PropertyValue.getValueType().getTypeName().getStr(), PropertyValue.getValueType().getTypeName().getLength(), RTL_TEXTENCODING_ASCII_US ); + sMessage += OString( "'!" ); OSL_FAIL( sMessage.getStr() ); } #endif @@ -178,7 +178,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL StringRepresentation::getSupportedSer return sReturn; } -uno::Any SAL_CALL StringRepresentation::convertToPropertyValue(const ::rtl::OUString & ControlValue, const uno::Type & ControlValueType) throw (uno::RuntimeException, uno::Exception) +uno::Any SAL_CALL StringRepresentation::convertToPropertyValue(const OUString & ControlValue, const uno::Type & ControlValueType) throw (uno::RuntimeException, uno::Exception) { uno::Any aReturn; @@ -212,9 +212,9 @@ uno::Any SAL_CALL StringRepresentation::convertToPropertyValue(const ::rtl::OUSt // could not convert ... if ( !bCanConvert && !ControlValue.isEmpty() ) { - ::rtl::OString sMessage( "StringRepresentation::convertStringRepresentationToPropertyValue: cannot convert into values of type '" ); - sMessage += ::rtl::OString( ControlValueType.getTypeName().getStr(), ControlValueType.getTypeName().getLength(), RTL_TEXTENCODING_ASCII_US ); - sMessage += ::rtl::OString( "'!" ); + OString sMessage( "StringRepresentation::convertStringRepresentationToPropertyValue: cannot convert into values of type '" ); + sMessage += OString( ControlValueType.getTypeName().getStr(), ControlValueType.getTypeName().getLength(), RTL_TEXTENCODING_ASCII_US ); + sMessage += OString( "'!" ); OSL_FAIL( sMessage.getStr() ); } #endif @@ -233,14 +233,14 @@ void SAL_CALL StringRepresentation::initialize(const uno::Sequence< uno::Any > & m_xTypeConverter.set(*pIter++,uno::UNO_QUERY); if ( nLength == 3 ) { - ::rtl::OUString sConstantName; + OUString sConstantName; *pIter++ >>= sConstantName; *pIter >>= m_aValues; if ( m_xContext.is() ) { uno::Reference< container::XHierarchicalNameAccess > xTypeDescProv( - m_xContext->getValueByName( ::rtl::OUString( "/singletons/com.sun.star.reflection.theTypeDescriptionManager" ) ), + m_xContext->getValueByName( OUString( "/singletons/com.sun.star.reflection.theTypeDescriptionManager" ) ), uno::UNO_QUERY_THROW ); m_xTypeDescription.set( xTypeDescProv->getByHierarchicalName( sConstantName ), uno::UNO_QUERY_THROW ); @@ -250,9 +250,9 @@ void SAL_CALL StringRepresentation::initialize(const uno::Sequence< uno::Any > & } } //------------------------------------------------------------------------ -::rtl::OUString StringRepresentation::convertSimpleToString( const uno::Any& _rValue ) +OUString StringRepresentation::convertSimpleToString( const uno::Any& _rValue ) { - ::rtl::OUString sReturn; + OUString sReturn; if ( m_xTypeConverter.is() && _rValue.hasValue() ) { try @@ -290,11 +290,11 @@ namespace { struct ConvertIntegerFromAndToString { - ::rtl::OUString operator()( sal_Int32 _rIntValue ) const + OUString operator()( sal_Int32 _rIntValue ) const { - return ::rtl::OUString::valueOf( (sal_Int32)_rIntValue ); + return OUString::valueOf( (sal_Int32)_rIntValue ); } - sal_Int32 operator()( const ::rtl::OUString& _rStringValue ) const + sal_Int32 operator()( const OUString& _rStringValue ) const { return _rStringValue.toInt32(); } @@ -302,14 +302,14 @@ namespace struct StringIdentity { - ::rtl::OUString operator()( const ::rtl::OUString& _rValue ) const + OUString operator()( const OUString& _rValue ) const { return _rValue; } }; template < class ElementType, class Transformer > - ::rtl::OUString composeSequenceElements( const Sequence< ElementType >& _rElements, const Transformer& _rTransformer ) + OUString composeSequenceElements( const Sequence< ElementType >& _rElements, const Transformer& _rTransformer ) { String sCompose; @@ -328,7 +328,7 @@ namespace } template < class ElementType, class Transformer > - void splitComposedStringToSequence( const ::rtl::OUString& _rComposed, Sequence< ElementType >& _out_SplitUp, const Transformer& _rTransformer ) + void splitComposedStringToSequence( const OUString& _rComposed, Sequence< ElementType >& _out_SplitUp, const Transformer& _rTransformer ) { _out_SplitUp.realloc( 0 ); if ( _rComposed.isEmpty() ) @@ -344,7 +344,7 @@ namespace } //-------------------------------------------------------------------- -bool StringRepresentation::convertGenericValueToString( const uno::Any& _rValue, ::rtl::OUString& _rStringRep ) +bool StringRepresentation::convertGenericValueToString( const uno::Any& _rValue, OUString& _rStringRep ) { bool bCanConvert = true; @@ -356,7 +356,7 @@ bool StringRepresentation::convertGenericValueToString( const uno::Any& _rValue, case uno::TypeClass_BOOLEAN: { - ::std::vector< ::rtl::OUString > aListEntries; + ::std::vector< OUString > aListEntries; tools::StringListResource aRes(PcrRes(RID_RSC_ENUM_YESNO),aListEntries); sal_Bool bValue = sal_False; _rValue >>= bValue; @@ -367,7 +367,7 @@ bool StringRepresentation::convertGenericValueToString( const uno::Any& _rValue, // some sequence types case uno::TypeClass_SEQUENCE: { - Sequence< ::rtl::OUString > aStringValues; + Sequence< OUString > aStringValues; Sequence< sal_Int8 > aInt8Values; Sequence< sal_uInt16 > aUInt16Values; Sequence< sal_Int16 > aInt16Values; @@ -452,7 +452,7 @@ bool StringRepresentation::convertGenericValueToString( const uno::Any& _rValue, return bCanConvert; } //------------------------------------------------------------------------ -uno::Any StringRepresentation::convertStringToSimple( const ::rtl::OUString& _rValue,const uno::TypeClass& _ePropertyType ) +uno::Any StringRepresentation::convertStringToSimple( const OUString& _rValue,const uno::TypeClass& _ePropertyType ) { uno::Any aReturn; if ( m_xTypeConverter.is() && !_rValue.isEmpty() ) @@ -461,8 +461,8 @@ uno::Any StringRepresentation::convertStringToSimple( const ::rtl::OUString& _rV { if ( m_aConstants.getLength() && m_aValues.getLength() ) { - const ::rtl::OUString* pIter = m_aValues.getConstArray(); - const ::rtl::OUString* pEnd = pIter + m_aValues.getLength(); + const OUString* pIter = m_aValues.getConstArray(); + const OUString* pEnd = pIter + m_aValues.getLength(); for(sal_Int32 i = 0;pIter != pEnd;++pIter,++i) { if ( *pIter == _rValue ) @@ -483,7 +483,7 @@ uno::Any StringRepresentation::convertStringToSimple( const ::rtl::OUString& _rV return aReturn; } //-------------------------------------------------------------------- -bool StringRepresentation::convertStringToGenericValue( const ::rtl::OUString& _rStringRep, uno::Any& _rValue, const uno::Type& _rTargetType ) +bool StringRepresentation::convertStringToGenericValue( const OUString& _rStringRep, uno::Any& _rValue, const uno::Type& _rTargetType ) { bool bCanConvert = true; @@ -495,7 +495,7 @@ bool StringRepresentation::convertStringToGenericValue( const ::rtl::OUString& _ case uno::TypeClass_BOOLEAN: { - ::std::vector< ::rtl::OUString > aListEntries; + ::std::vector< OUString > aListEntries; tools::StringListResource aRes(PcrRes(RID_RSC_ENUM_YESNO),aListEntries); if ( aListEntries[0] == _rStringRep ) _rValue <<= (sal_Bool)sal_False; @@ -513,7 +513,7 @@ bool StringRepresentation::convertStringToGenericValue( const ::rtl::OUString& _ { case uno::TypeClass_STRING: { - Sequence< ::rtl::OUString > aElements; + Sequence< OUString > aElements; splitComposedStringToSequence( aStr, aElements, StringIdentity() ); _rValue <<= aElements; } @@ -599,15 +599,15 @@ bool StringRepresentation::convertStringToGenericValue( const ::rtl::OUString& _ // component helper namespace namespace comp_StringRepresentation { -::rtl::OUString SAL_CALL _getImplementationName() { - return ::rtl::OUString( +OUString SAL_CALL _getImplementationName() { + return OUString( "StringRepresentation"); } -uno::Sequence< ::rtl::OUString > SAL_CALL _getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames() { - uno::Sequence< ::rtl::OUString > s(1); - s[0] = ::rtl::OUString( + uno::Sequence< OUString > s(1); + s[0] = OUString( "com.sun.star.inspection.StringRepresentation"); return s; } diff --git a/extensions/source/propctrlr/submissionhandler.cxx b/extensions/source/propctrlr/submissionhandler.cxx index 1dd05f7b962b..495db591461d 100644 --- a/extensions/source/propctrlr/submissionhandler.cxx +++ b/extensions/source/propctrlr/submissionhandler.cxx @@ -104,21 +104,21 @@ namespace pcr } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL SubmissionPropertyHandler::getImplementationName_static( ) throw (RuntimeException) + OUString SAL_CALL SubmissionPropertyHandler::getImplementationName_static( ) throw (RuntimeException) { - return ::rtl::OUString( "com.sun.star.comp.extensions.SubmissionPropertyHandler" ); + return OUString( "com.sun.star.comp.extensions.SubmissionPropertyHandler" ); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL SubmissionPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL SubmissionPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSupported( 1 ); - aSupported[0] = ::rtl::OUString( "com.sun.star.form.inspection.SubmissionPropertyHandler" ); + Sequence< OUString > aSupported( 1 ); + aSupported[0] = OUString( "com.sun.star.form.inspection.SubmissionPropertyHandler" ); return aSupported; } //-------------------------------------------------------------------- - Any SAL_CALL SubmissionPropertyHandler::getPropertyValue( const ::rtl::OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL SubmissionPropertyHandler::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throw( _rPropertyName ) ); @@ -167,7 +167,7 @@ namespace pcr } //-------------------------------------------------------------------- - void SAL_CALL SubmissionPropertyHandler::setPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) + void SAL_CALL SubmissionPropertyHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throw( _rPropertyName ) ); @@ -210,25 +210,25 @@ namespace pcr } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL SubmissionPropertyHandler::getActuatingProperties( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL SubmissionPropertyHandler::getActuatingProperties( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_pHelper.get() ) - return Sequence< ::rtl::OUString >(); + return Sequence< OUString >(); - Sequence< ::rtl::OUString > aReturn( 1 ); + Sequence< OUString > aReturn( 1 ); aReturn[ 0 ] = PROPERTY_XFORMS_BUTTONTYPE; return aReturn; } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL SubmissionPropertyHandler::getSupersededProperties( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL SubmissionPropertyHandler::getSupersededProperties( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_pHelper.get() ) - return Sequence< ::rtl::OUString >(); + return Sequence< OUString >(); - Sequence< ::rtl::OUString > aReturn( 3 ); + Sequence< OUString > aReturn( 3 ); aReturn[ 0 ] = PROPERTY_TARGET_URL; aReturn[ 1 ] = PROPERTY_TARGET_FRAME; aReturn[ 2 ] = PROPERTY_BUTTONTYPE; @@ -277,7 +277,7 @@ namespace pcr } //-------------------------------------------------------------------- - LineDescriptor SAL_CALL SubmissionPropertyHandler::describePropertyLine( const ::rtl::OUString& _rPropertyName, + LineDescriptor SAL_CALL SubmissionPropertyHandler::describePropertyLine( const OUString& _rPropertyName, const Reference< XPropertyControlFactory >& _rxControlFactory ) throw (UnknownPropertyException, NullPointerException, RuntimeException) { @@ -287,7 +287,7 @@ namespace pcr if ( !m_pHelper.get() ) RuntimeException(); - ::std::vector< ::rtl::OUString > aListEntries; + ::std::vector< OUString > aListEntries; PropertyId nPropId( impl_getPropertyId_throw( _rPropertyName ) ); switch ( nPropId ) { @@ -312,13 +312,13 @@ namespace pcr LineDescriptor aDescriptor; aDescriptor.Control = PropertyHandlerHelper::createListBoxControl( _rxControlFactory, aListEntries, sal_False, sal_True ); aDescriptor.DisplayName = m_pInfoService->getPropertyTranslation( nPropId ); - aDescriptor.Category = ::rtl::OUString( "General" ); + aDescriptor.Category = OUString( "General" ); aDescriptor.HelpURL = HelpIdUrl::getHelpURL( m_pInfoService->getPropertyHelpId( nPropId ) ); return aDescriptor; } //-------------------------------------------------------------------- - void SAL_CALL SubmissionPropertyHandler::actuatingPropertyChanged( const ::rtl::OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (NullPointerException, RuntimeException) + void SAL_CALL SubmissionPropertyHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (NullPointerException, RuntimeException) { if ( !_rxInspectorUI.is() ) throw NullPointerException(); @@ -344,7 +344,7 @@ namespace pcr } //-------------------------------------------------------------------- - Any SAL_CALL SubmissionPropertyHandler::convertToPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL SubmissionPropertyHandler::convertToPropertyValue( const OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); Any aPropertyValue; @@ -353,7 +353,7 @@ namespace pcr if ( !m_pHelper.get() ) return aPropertyValue; - ::rtl::OUString sControlValue; + OUString sControlValue; OSL_VERIFY( _rControlValue >>= sControlValue ); PropertyId nPropId( m_pInfoService->getPropertyId( _rPropertyName ) ); @@ -383,7 +383,7 @@ namespace pcr } //-------------------------------------------------------------------- - Any SAL_CALL SubmissionPropertyHandler::convertToControlValue( const ::rtl::OUString& _rPropertyName, const Any& _rPropertyValue, const Type& _rControlValueType ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL SubmissionPropertyHandler::convertToControlValue( const OUString& _rPropertyName, const Any& _rPropertyValue, const Type& _rControlValueType ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); Any aControlValue; diff --git a/extensions/source/propctrlr/submissionhandler.hxx b/extensions/source/propctrlr/submissionhandler.hxx index f62011ac53e5..e5f35d400996 100644 --- a/extensions/source/propctrlr/submissionhandler.hxx +++ b/extensions/source/propctrlr/submissionhandler.hxx @@ -78,24 +78,24 @@ namespace pcr const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext ); - static ::rtl::OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); + static OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); ~SubmissionPropertyHandler(); protected: // XPropertyHandler overriables - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getActuatingProperties( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupersededProperties( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::inspection::LineDescriptor - SAL_CALL describePropertyLine( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL actuatingPropertyChanged( const ::rtl::OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rControlValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rPropertyValue, const ::com::sun::star::uno::Type& _rControlValueType ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + SAL_CALL describePropertyLine( const OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rControlValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rPropertyValue, const ::com::sun::star::uno::Type& _rControlValueType ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); // PropertyHandler overridables virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx index 6fe43eb26cf6..bbb0f6fcde8b 100644 --- a/extensions/source/propctrlr/taborder.cxx +++ b/extensions/source/propctrlr/taborder.cxx @@ -59,10 +59,10 @@ namespace pcr // XTabControllerModel virtual void SAL_CALL setControlModels(const Sequence< Reference< XControlModel > >& rModels) throw( RuntimeException ) {m_aModels = rModels;} virtual Sequence< Reference< XControlModel > > SAL_CALL getControlModels(void) throw( RuntimeException ) {return m_aModels;} - virtual void SAL_CALL setGroup(const Sequence< Reference< XControlModel > >& /*Group*/, const ::rtl::OUString& /*GroupName*/) throw( RuntimeException ) {} + virtual void SAL_CALL setGroup(const Sequence< Reference< XControlModel > >& /*Group*/, const OUString& /*GroupName*/) throw( RuntimeException ) {} virtual sal_Int32 SAL_CALL getGroupCount(void) throw( RuntimeException ) {return 0;} - virtual void SAL_CALL getGroup(sal_Int32 /*nGroup*/, Sequence< Reference< XControlModel > >& /*Group*/, ::rtl::OUString& /*Name*/) throw( RuntimeException ) {} - virtual void SAL_CALL getGroupByName(const ::rtl::OUString& /*Name*/, Sequence< Reference< XControlModel > >& /*Group*/) throw( RuntimeException ) {} + virtual void SAL_CALL getGroup(sal_Int32 /*nGroup*/, Sequence< Reference< XControlModel > >& /*Group*/, OUString& /*Name*/) throw( RuntimeException ) {} + virtual void SAL_CALL getGroupByName(const OUString& /*Name*/, Sequence< Reference< XControlModel > >& /*Group*/) throw( RuntimeException ) {} virtual sal_Bool SAL_CALL getGroupControl(void) throw( RuntimeException ){return sal_False;} ; virtual void SAL_CALL setGroupControl(sal_Bool /*GroupControl*/) throw( RuntimeException ){}; }; @@ -182,7 +182,7 @@ namespace pcr Sequence< Reference< XControlModel > > aControlModels( m_xTempModel->getControlModels() ); const Reference< XControlModel >* pControlModels = aControlModels.getConstArray(); - ::rtl::OUString aName; + OUString aName; Image aImage; for ( sal_Int32 i=0; i < aControlModels.getLength(); ++i, ++pControlModels ) @@ -323,7 +323,7 @@ namespace pcr //------------------------------------------------------------------------ void TabOrderListBox::MoveSelection( long nRelPos ) { - rtl::OUString aSelEntryPrevText, aSelEntryNextText; + OUString aSelEntryPrevText, aSelEntryNextText; Image aImage; for (long i=0; i<labs(nRelPos); i++) { diff --git a/extensions/source/propctrlr/unourl.cxx b/extensions/source/propctrlr/unourl.cxx index 1b4df6e0b344..2c66b83e52b3 100644 --- a/extensions/source/propctrlr/unourl.cxx +++ b/extensions/source/propctrlr/unourl.cxx @@ -34,7 +34,7 @@ namespace pcr //==================================================================== //= UnoURL //==================================================================== - UnoURL::UnoURL( const ::rtl::OUString& _rCompleteURL, const Reference< XMultiServiceFactory >& _rxORB ) + UnoURL::UnoURL( const OUString& _rCompleteURL, const Reference< XMultiServiceFactory >& _rxORB ) { m_aURL.Complete = _rCompleteURL; diff --git a/extensions/source/propctrlr/unourl.hxx b/extensions/source/propctrlr/unourl.hxx index a7b509735571..474924776963 100644 --- a/extensions/source/propctrlr/unourl.hxx +++ b/extensions/source/propctrlr/unourl.hxx @@ -38,11 +38,11 @@ namespace pcr public: UnoURL( - const ::rtl::OUString& _rCompleteURL, + const OUString& _rCompleteURL, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB ); - inline operator const ::rtl::OUString& () const { return m_aURL.Complete; } + inline operator const OUString& () const { return m_aURL.Complete; } inline operator const ::com::sun::star::util::URL& () const { return m_aURL; } private: diff --git a/extensions/source/propctrlr/usercontrol.cxx b/extensions/source/propctrlr/usercontrol.cxx index 05cee8f40825..16a4e75bca40 100644 --- a/extensions/source/propctrlr/usercontrol.cxx +++ b/extensions/source/propctrlr/usercontrol.cxx @@ -280,7 +280,7 @@ namespace pcr //------------------------------------------------------------------ void SAL_CALL OFileUrlControl::setValue( const Any& _rValue ) throw (IllegalTypeException, RuntimeException) { - ::rtl::OUString sURL; + OUString sURL; if ( ( _rValue >>= sURL ) ) { if ( sURL.indexOf( "vnd.sun.star.GraphicObject:" ) == 0 ) @@ -297,14 +297,14 @@ namespace pcr { Any aPropValue; if ( !getTypedControlWindow()->GetText().isEmpty() ) - aPropValue <<= (::rtl::OUString)getTypedControlWindow()->GetURL(); + aPropValue <<= (OUString)getTypedControlWindow()->GetURL(); return aPropValue; } //------------------------------------------------------------------ Type SAL_CALL OFileUrlControl::getValueType() throw (RuntimeException) { - return ::getCppuType( static_cast< ::rtl::OUString* >( NULL ) ); + return ::getCppuType( static_cast< OUString* >( NULL ) ); } //======================================================================== @@ -315,7 +315,7 @@ namespace pcr :ONumericControl( pParent, nWinStyle ) { getTypedControlWindow()->SetUnit( FUNIT_CUSTOM ); - getTypedControlWindow()->SetCustomUnitText(rtl::OUString(" ms")); + getTypedControlWindow()->SetCustomUnitText(OUString(" ms")); getTypedControlWindow()->SetCustomConvertHdl( LINK( this, OTimeDurationControl, OnCustomConvert ) ); } diff --git a/extensions/source/propctrlr/xsddatatypes.cxx b/extensions/source/propctrlr/xsddatatypes.cxx index 7ee0c46c7c2e..76a1796a038b 100644 --- a/extensions/source/propctrlr/xsddatatypes.cxx +++ b/extensions/source/propctrlr/xsddatatypes.cxx @@ -68,7 +68,7 @@ namespace pcr } template< typename FACETTYPE > - FACETTYPE getFacet( const Reference< XPropertySet >& _rxFacets, const ::rtl::OUString& _rFacetName ) SAL_THROW(()) + FACETTYPE getFacet( const Reference< XPropertySet >& _rxFacets, const OUString& _rFacetName ) SAL_THROW(()) { FACETTYPE aReturn; try @@ -140,13 +140,13 @@ namespace pcr } //-------------------------------------------------------------------- - ::rtl::OUString XSDDataType::getName() const SAL_THROW(()) + OUString XSDDataType::getName() const SAL_THROW(()) { return getSave( m_xDataType.get(), &XDataType::getName ); } //-------------------------------------------------------------------- - void XSDDataType::setFacet( const ::rtl::OUString& _rFacetName, const Any& _rValue ) SAL_THROW(()) + void XSDDataType::setFacet( const OUString& _rFacetName, const Any& _rValue ) SAL_THROW(()) { try { @@ -159,7 +159,7 @@ namespace pcr } //-------------------------------------------------------------------- - bool XSDDataType::hasFacet( const ::rtl::OUString& _rFacetName ) const SAL_THROW(()) + bool XSDDataType::hasFacet( const OUString& _rFacetName ) const SAL_THROW(()) { bool bReturn = false; try @@ -173,7 +173,7 @@ namespace pcr return bReturn; } //-------------------------------------------------------------------- - Any XSDDataType::getFacet( const ::rtl::OUString& _rFacetName ) SAL_THROW(()) + Any XSDDataType::getFacet( const OUString& _rFacetName ) SAL_THROW(()) { Any aReturn; try diff --git a/extensions/source/propctrlr/xsddatatypes.hxx b/extensions/source/propctrlr/xsddatatypes.hxx index 743ea3490842..dfa5cebb52f8 100644 --- a/extensions/source/propctrlr/xsddatatypes.hxx +++ b/extensions/source/propctrlr/xsddatatypes.hxx @@ -71,16 +71,16 @@ namespace pcr sal_Int16 classify() const SAL_THROW(()); // attribute access - ::rtl::OUString getName() const SAL_THROW(()); + OUString getName() const SAL_THROW(()); bool isBasicType() const SAL_THROW(()); /// determines whether a given facet exists at the type - bool hasFacet( const ::rtl::OUString& _rFacetName ) const SAL_THROW(()); + bool hasFacet( const OUString& _rFacetName ) const SAL_THROW(()); /// retrieves a facet value ::com::sun::star::uno::Any - getFacet( const ::rtl::OUString& _rFacetName ) SAL_THROW(()); + getFacet( const OUString& _rFacetName ) SAL_THROW(()); /// sets a facet value - void setFacet( const ::rtl::OUString& _rFacetName, const ::com::sun::star::uno::Any& _rFacetValue ) SAL_THROW(()); + void setFacet( const OUString& _rFacetName, const ::com::sun::star::uno::Any& _rFacetValue ) SAL_THROW(()); /** copies as much facets (values, respectively) from a give data type instance */ diff --git a/extensions/source/propctrlr/xsdvalidationhelper.cxx b/extensions/source/propctrlr/xsdvalidationhelper.cxx index bca2aee38bb4..4a6f1eada469 100644 --- a/extensions/source/propctrlr/xsdvalidationhelper.cxx +++ b/extensions/source/propctrlr/xsdvalidationhelper.cxx @@ -74,14 +74,14 @@ namespace pcr } //-------------------------------------------------------------------- - void XSDValidationHelper::getAvailableDataTypeNames( ::std::vector< ::rtl::OUString >& /* [out] */ _rNames ) const SAL_THROW(()) + void XSDValidationHelper::getAvailableDataTypeNames( ::std::vector< OUString >& /* [out] */ _rNames ) const SAL_THROW(()) { _rNames.resize( 0 ); try { Reference< XDataTypeRepository > xRepository = getDataTypeRepository(); - Sequence< ::rtl::OUString > aElements; + Sequence< OUString > aElements; if ( xRepository.is() ) aElements = xRepository->getElementNames(); @@ -107,7 +107,7 @@ namespace pcr } //-------------------------------------------------------------------- - Reference< XDataTypeRepository > XSDValidationHelper::getDataTypeRepository( const ::rtl::OUString& _rModelName ) const SAL_THROW((Exception)) + Reference< XDataTypeRepository > XSDValidationHelper::getDataTypeRepository( const OUString& _rModelName ) const SAL_THROW((Exception)) { Reference< XDataTypeRepository > xRepository; @@ -119,7 +119,7 @@ namespace pcr } //-------------------------------------------------------------------- - Reference< XDataType > XSDValidationHelper::getDataType( const ::rtl::OUString& _rName ) const SAL_THROW((Exception)) + Reference< XDataType > XSDValidationHelper::getDataType( const OUString& _rName ) const SAL_THROW((Exception)) { Reference< XDataType > xDataType; @@ -133,9 +133,9 @@ namespace pcr } //-------------------------------------------------------------------- - ::rtl::OUString XSDValidationHelper::getValidatingDataTypeName( ) const SAL_THROW(()) + OUString XSDValidationHelper::getValidatingDataTypeName( ) const SAL_THROW(()) { - ::rtl::OUString sDataTypeName; + OUString sDataTypeName; try { Reference< XPropertySet > xBinding( getCurrentBinding() ); @@ -153,7 +153,7 @@ namespace pcr } //-------------------------------------------------------------------- - ::rtl::Reference< XSDDataType > XSDValidationHelper::getDataTypeByName( const ::rtl::OUString& _rName ) const SAL_THROW(()) + ::rtl::Reference< XSDDataType > XSDValidationHelper::getDataTypeByName( const OUString& _rName ) const SAL_THROW(()) { ::rtl::Reference< XSDDataType > pReturn; @@ -182,7 +182,7 @@ namespace pcr } //-------------------------------------------------------------------- - bool XSDValidationHelper::cloneDataType( const ::rtl::Reference< XSDDataType >& _pDataType, const ::rtl::OUString& _rNewName ) const SAL_THROW(()) + bool XSDValidationHelper::cloneDataType( const ::rtl::Reference< XSDDataType >& _pDataType, const OUString& _rNewName ) const SAL_THROW(()) { OSL_ENSURE( _pDataType.is(), "XSDValidationHelper::removeDataTypeFromRepository: invalid data type!" ); if ( !_pDataType.is() ) @@ -210,7 +210,7 @@ namespace pcr } //-------------------------------------------------------------------- - bool XSDValidationHelper::removeDataTypeFromRepository( const ::rtl::OUString& _rName ) const SAL_THROW(()) + bool XSDValidationHelper::removeDataTypeFromRepository( const OUString& _rName ) const SAL_THROW(()) { try { @@ -236,7 +236,7 @@ namespace pcr } //-------------------------------------------------------------------- - void XSDValidationHelper::setValidatingDataTypeByName( const ::rtl::OUString& _rName ) const SAL_THROW(()) + void XSDValidationHelper::setValidatingDataTypeByName( const OUString& _rName ) const SAL_THROW(()) { try { @@ -246,7 +246,7 @@ namespace pcr if ( xBinding.is() ) { // get the old data type - this is necessary for notifying property changes - ::rtl::OUString sOldDataTypeName; + OUString sOldDataTypeName; OSL_VERIFY( xBinding->getPropertyValue( PROPERTY_XSD_DATA_TYPE ) >>= sOldDataTypeName ); Reference< XPropertySet > xOldType; try { xOldType = xOldType.query( getDataType( sOldDataTypeName ) ); } catch( const Exception& ) { } @@ -258,11 +258,11 @@ namespace pcr Reference< XPropertySet > xNewType( getDataType( _rName ), UNO_QUERY ); // fire any changes in the properties which result from this new type - std::set< ::rtl::OUString > aFilter; aFilter.insert( static_cast<const rtl::OUString&>(PROPERTY_NAME) ); + std::set< OUString > aFilter; aFilter.insert( static_cast<const OUString&>(PROPERTY_NAME) ); firePropertyChanges( xOldType, xNewType, aFilter ); // fire the change in the Data Type property - ::rtl::OUString sNewDataTypeName; + OUString sNewDataTypeName; OSL_VERIFY( xBinding->getPropertyValue( PROPERTY_XSD_DATA_TYPE ) >>= sNewDataTypeName ); firePropertyChange( PROPERTY_XSD_DATA_TYPE, makeAny( sOldDataTypeName ), makeAny( sNewDataTypeName ) ); } @@ -274,8 +274,8 @@ namespace pcr } //-------------------------------------------------------------------- - void XSDValidationHelper::copyDataType( const ::rtl::OUString& _rFromModel, const ::rtl::OUString& _rToModel, - const ::rtl::OUString& _rDataTypeName ) const SAL_THROW(()) + void XSDValidationHelper::copyDataType( const OUString& _rFromModel, const OUString& _rToModel, + const OUString& _rDataTypeName ) const SAL_THROW(()) { if ( _rFromModel == _rToModel ) // nothing to do (me thinks) @@ -298,7 +298,7 @@ namespace pcr // determine the built-in type belonging to the source type ::rtl::Reference< XSDDataType > pSourceType = new XSDDataType( xFromRepository->getDataType( _rDataTypeName ) ); - ::rtl::OUString sTargetBaseType = getBasicTypeNameForClass( pSourceType->classify(), xToRepository ); + OUString sTargetBaseType = getBasicTypeNameForClass( pSourceType->classify(), xToRepository ); // create the target type Reference< XDataType > xTargetType = xToRepository->cloneDataType( sTargetBaseType, _rDataTypeName ); @@ -366,15 +366,15 @@ namespace pcr } //-------------------------------------------------------------------- - ::rtl::OUString XSDValidationHelper::getBasicTypeNameForClass( sal_Int16 _nClass ) const SAL_THROW(()) + OUString XSDValidationHelper::getBasicTypeNameForClass( sal_Int16 _nClass ) const SAL_THROW(()) { return getBasicTypeNameForClass( _nClass, getDataTypeRepository() ); } //-------------------------------------------------------------------- - ::rtl::OUString XSDValidationHelper::getBasicTypeNameForClass( sal_Int16 _nClass, Reference< XDataTypeRepository > _rxRepository ) const SAL_THROW(()) + OUString XSDValidationHelper::getBasicTypeNameForClass( sal_Int16 _nClass, Reference< XDataTypeRepository > _rxRepository ) const SAL_THROW(()) { - ::rtl::OUString sReturn; + OUString sReturn; OSL_ENSURE( _rxRepository.is(), "XSDValidationHelper::getBasicTypeNameForClass: invalid repository!" ); if ( !_rxRepository.is() ) return sReturn; diff --git a/extensions/source/propctrlr/xsdvalidationhelper.hxx b/extensions/source/propctrlr/xsdvalidationhelper.hxx index 3311d7f1c93a..c4d96868357b 100644 --- a/extensions/source/propctrlr/xsdvalidationhelper.hxx +++ b/extensions/source/propctrlr/xsdvalidationhelper.hxx @@ -52,12 +52,12 @@ namespace pcr /** retrieves the names of all XForms models in the document the control lives in */ - void getAvailableDataTypeNames( ::std::vector< ::rtl::OUString >& /* [out] */ _rNames ) const SAL_THROW(()); + void getAvailableDataTypeNames( ::std::vector< OUString >& /* [out] */ _rNames ) const SAL_THROW(()); /** retrieves a particular data type given by name */ ::rtl::Reference< XSDDataType > - getDataTypeByName( const ::rtl::OUString& _rName ) const SAL_THROW(()); + getDataTypeByName( const OUString& _rName ) const SAL_THROW(()); /** retrieves the DataType instance which the control model is currently validated against @@ -71,26 +71,26 @@ namespace pcr @seealso getValidatingDataType */ - ::rtl::OUString + OUString getValidatingDataTypeName( ) const SAL_THROW(()); /** binds the validator to a new data type To be called with an active binding only. */ - void setValidatingDataTypeByName( const ::rtl::OUString& _rName ) const SAL_THROW(()); + void setValidatingDataTypeByName( const OUString& _rName ) const SAL_THROW(()); /** removes the data type given by name from the data type repository */ - bool removeDataTypeFromRepository( const ::rtl::OUString& _rName ) const SAL_THROW(()); + bool removeDataTypeFromRepository( const OUString& _rName ) const SAL_THROW(()); /** creates a new data type, which is a clone of an existing data type */ - bool cloneDataType( const ::rtl::Reference< XSDDataType >& _pDataType, const ::rtl::OUString& _rNewName ) const SAL_THROW(()); + bool cloneDataType( const ::rtl::Reference< XSDDataType >& _pDataType, const OUString& _rNewName ) const SAL_THROW(()); /** retrieves the name of the basic data type which has the given class */ - ::rtl::OUString + OUString getBasicTypeNameForClass( sal_Int16 _eClass ) const SAL_THROW(()); /** copy a data type from one model to another @@ -98,8 +98,8 @@ namespace pcr If a data type with the given name already exists in the target model, then nothing happens. In particular, the facets of the data type are not copied. */ - void copyDataType( const ::rtl::OUString& _rFromModel, const ::rtl::OUString& _rToModel, - const ::rtl::OUString& _rDataTypeName ) const SAL_THROW(()); + void copyDataType( const OUString& _rFromModel, const OUString& _rToModel, + const OUString& _rDataTypeName ) const SAL_THROW(()); /** finds (and sets) a default format for the formatted field we're inspecting, according to the current data type the control value is evaluated against @@ -115,17 +115,17 @@ namespace pcr /** retrieves the data type repository associated with any model */ ::com::sun::star::uno::Reference< ::com::sun::star::xforms::XDataTypeRepository > - getDataTypeRepository( const ::rtl::OUString& _rModelName ) const SAL_THROW((::com::sun::star::uno::Exception)); + getDataTypeRepository( const OUString& _rModelName ) const SAL_THROW((::com::sun::star::uno::Exception)); /** retrieves the data type object for the given name */ ::com::sun::star::uno::Reference< ::com::sun::star::xsd::XDataType > - getDataType( const ::rtl::OUString& _rName ) const + getDataType( const OUString& _rName ) const SAL_THROW((::com::sun::star::uno::Exception)); /** retrieves the name of the basic data type which has the given class, in the given repository */ - ::rtl::OUString + OUString getBasicTypeNameForClass( sal_Int16 _nClass, ::com::sun::star::uno::Reference< ::com::sun::star::xforms::XDataTypeRepository > _rxRepository diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx index be9ec1e83fff..3f97f953f293 100644 --- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx +++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx @@ -86,21 +86,21 @@ namespace pcr } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL XSDValidationPropertyHandler::getImplementationName_static( ) throw (RuntimeException) + OUString SAL_CALL XSDValidationPropertyHandler::getImplementationName_static( ) throw (RuntimeException) { - return ::rtl::OUString( "com.sun.star.comp.extensions.XSDValidationPropertyHandler" ); + return OUString( "com.sun.star.comp.extensions.XSDValidationPropertyHandler" ); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL XSDValidationPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL XSDValidationPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSupported( 1 ); - aSupported[0] = ::rtl::OUString( "com.sun.star.form.inspection.XSDValidationPropertyHandler" ); + Sequence< OUString > aSupported( 1 ); + aSupported[0] = OUString( "com.sun.star.form.inspection.XSDValidationPropertyHandler" ); return aSupported; } //-------------------------------------------------------------------- - Any SAL_CALL XSDValidationPropertyHandler::getPropertyValue( const ::rtl::OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL XSDValidationPropertyHandler::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throw( _rPropertyName ) ); @@ -113,9 +113,9 @@ namespace pcr switch ( nPropId ) { // common facets - case PROPERTY_ID_XSD_DATA_TYPE: aReturn = pType.is() ? pType->getFacet( PROPERTY_NAME ) : makeAny( ::rtl::OUString() ); break; + case PROPERTY_ID_XSD_DATA_TYPE: aReturn = pType.is() ? pType->getFacet( PROPERTY_NAME ) : makeAny( OUString() ); break; case PROPERTY_ID_XSD_WHITESPACES:aReturn = pType.is() ? pType->getFacet( PROPERTY_XSD_WHITESPACES ) : makeAny( WhiteSpaceTreatment::Preserve ); break; - case PROPERTY_ID_XSD_PATTERN: aReturn = pType.is() ? pType->getFacet( PROPERTY_XSD_PATTERN ) : makeAny( ::rtl::OUString() ); break; + case PROPERTY_ID_XSD_PATTERN: aReturn = pType.is() ? pType->getFacet( PROPERTY_XSD_PATTERN ) : makeAny( OUString() ); break; // all other properties are simply forwarded, if they exist at the given type default: @@ -130,7 +130,7 @@ namespace pcr } //-------------------------------------------------------------------- - void SAL_CALL XSDValidationPropertyHandler::setPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) + void SAL_CALL XSDValidationPropertyHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throw( _rPropertyName ) ); @@ -140,7 +140,7 @@ namespace pcr if ( PROPERTY_ID_XSD_DATA_TYPE == nPropId ) { - ::rtl::OUString sTypeName; + OUString sTypeName; OSL_VERIFY( _rValue >>= sTypeName ); m_pHelper->setValidatingDataTypeByName( sTypeName ); impl_setContextDocumentModified_nothrow(); @@ -227,61 +227,61 @@ namespace pcr } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL XSDValidationPropertyHandler::getSupersededProperties( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL XSDValidationPropertyHandler::getSupersededProperties( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - ::std::vector< ::rtl::OUString > aSuperfluous; + ::std::vector< OUString > aSuperfluous; if ( m_pHelper.get() ) { - aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_CONTROLSOURCE) ); - aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_EMPTY_IS_NULL) ); - aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_FILTERPROPOSAL) ); - aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_LISTSOURCETYPE) ); - aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_LISTSOURCE) ); - aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_BOUNDCOLUMN) ); + aSuperfluous.push_back( static_cast<const OUString&>(PROPERTY_CONTROLSOURCE) ); + aSuperfluous.push_back( static_cast<const OUString&>(PROPERTY_EMPTY_IS_NULL) ); + aSuperfluous.push_back( static_cast<const OUString&>(PROPERTY_FILTERPROPOSAL) ); + aSuperfluous.push_back( static_cast<const OUString&>(PROPERTY_LISTSOURCETYPE) ); + aSuperfluous.push_back( static_cast<const OUString&>(PROPERTY_LISTSOURCE) ); + aSuperfluous.push_back( static_cast<const OUString&>(PROPERTY_BOUNDCOLUMN) ); bool bAllowBinding = m_pHelper->canBindToAnyDataType(); if ( bAllowBinding ) { - aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_MAXTEXTLEN) ); - aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_VALUEMIN) ); - aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_VALUEMAX) ); - aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_DECIMAL_ACCURACY) ); - aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_TIMEMIN) ); - aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_TIMEMAX) ); - aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_DATEMIN) ); - aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_DATEMAX) ); - aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_EFFECTIVE_MIN) ); - aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_EFFECTIVE_MAX) ); + aSuperfluous.push_back( static_cast<const OUString&>(PROPERTY_MAXTEXTLEN) ); + aSuperfluous.push_back( static_cast<const OUString&>(PROPERTY_VALUEMIN) ); + aSuperfluous.push_back( static_cast<const OUString&>(PROPERTY_VALUEMAX) ); + aSuperfluous.push_back( static_cast<const OUString&>(PROPERTY_DECIMAL_ACCURACY) ); + aSuperfluous.push_back( static_cast<const OUString&>(PROPERTY_TIMEMIN) ); + aSuperfluous.push_back( static_cast<const OUString&>(PROPERTY_TIMEMAX) ); + aSuperfluous.push_back( static_cast<const OUString&>(PROPERTY_DATEMIN) ); + aSuperfluous.push_back( static_cast<const OUString&>(PROPERTY_DATEMAX) ); + aSuperfluous.push_back( static_cast<const OUString&>(PROPERTY_EFFECTIVE_MIN) ); + aSuperfluous.push_back( static_cast<const OUString&>(PROPERTY_EFFECTIVE_MAX) ); } } if ( aSuperfluous.empty() ) - return Sequence< ::rtl::OUString >(); - return Sequence< ::rtl::OUString >( &(*aSuperfluous.begin()), aSuperfluous.size() ); + return Sequence< OUString >(); + return Sequence< OUString >( &(*aSuperfluous.begin()), aSuperfluous.size() ); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL XSDValidationPropertyHandler::getActuatingProperties( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL XSDValidationPropertyHandler::getActuatingProperties( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - ::std::vector< ::rtl::OUString > aInterestedInActuations( 2 ); + ::std::vector< OUString > aInterestedInActuations( 2 ); if ( m_pHelper.get() ) { - aInterestedInActuations.push_back( static_cast<const rtl::OUString&>(PROPERTY_XSD_DATA_TYPE) ); - aInterestedInActuations.push_back( static_cast<const rtl::OUString&>(PROPERTY_XML_DATA_MODEL) ); + aInterestedInActuations.push_back( static_cast<const OUString&>(PROPERTY_XSD_DATA_TYPE) ); + aInterestedInActuations.push_back( static_cast<const OUString&>(PROPERTY_XML_DATA_MODEL) ); } if ( aInterestedInActuations.empty() ) - return Sequence< ::rtl::OUString >(); - return Sequence< ::rtl::OUString >( &(*aInterestedInActuations.begin()), aInterestedInActuations.size() ); + return Sequence< OUString >(); + return Sequence< OUString >( &(*aInterestedInActuations.begin()), aInterestedInActuations.size() ); } //-------------------------------------------------------------------- namespace { - void showPropertyUI( const Reference< XObjectInspectorUI >& _rxInspectorUI, const ::rtl::OUString& _rPropertyName, bool _bShow ) + void showPropertyUI( const Reference< XObjectInspectorUI >& _rxInspectorUI, const OUString& _rPropertyName, bool _bShow ) { if ( _bShow ) _rxInspectorUI->showPropertyUI( _rPropertyName ); @@ -291,7 +291,7 @@ namespace pcr } //-------------------------------------------------------------------- - LineDescriptor SAL_CALL XSDValidationPropertyHandler::describePropertyLine( const ::rtl::OUString& _rPropertyName, + LineDescriptor SAL_CALL XSDValidationPropertyHandler::describePropertyLine( const OUString& _rPropertyName, const Reference< XPropertyControlFactory >& _rxControlFactory ) throw (UnknownPropertyException, NullPointerException, RuntimeException) { @@ -309,7 +309,7 @@ namespace pcr // collect some information about the to-be-created control sal_Int16 nControlType = PropertyControlType::TextField; - ::std::vector< ::rtl::OUString > aListEntries; + ::std::vector< OUString > aListEntries; Optional< double > aMinValue( sal_False, 0 ); Optional< double > aMaxValue( sal_False, 0 ); @@ -320,11 +320,11 @@ namespace pcr implGetAvailableDataTypeNames( aListEntries ); - aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_ADD_DATA_TYPE); - aDescriptor.SecondaryButtonId = rtl::OUString::createFromAscii(UID_PROP_REMOVE_DATA_TYPE);; + aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_ADD_DATA_TYPE); + aDescriptor.SecondaryButtonId = OUString::createFromAscii(UID_PROP_REMOVE_DATA_TYPE);; aDescriptor.HasPrimaryButton = aDescriptor.HasSecondaryButton = sal_True; - aDescriptor.PrimaryButtonImageURL = ::rtl::OUString( "private:graphicrepository/extensions/res/buttonplus.png" ); - aDescriptor.SecondaryButtonImageURL = ::rtl::OUString( "private:graphicrepository/extensions/res/buttonminus.png" ); + aDescriptor.PrimaryButtonImageURL = OUString( "private:graphicrepository/extensions/res/buttonplus.png" ); + aDescriptor.SecondaryButtonImageURL = OUString( "private:graphicrepository/extensions/res/buttonminus.png" ); break; case PROPERTY_ID_XSD_WHITESPACES: @@ -419,7 +419,7 @@ namespace pcr break; } - aDescriptor.Category = ::rtl::OUString( "Data" ); + aDescriptor.Category = OUString( "Data" ); aDescriptor.DisplayName = m_pInfoService->getPropertyTranslation( nPropId ); aDescriptor.HelpURL = HelpIdUrl::getHelpURL( m_pInfoService->getPropertyHelpId( nPropId ) ); @@ -427,7 +427,7 @@ namespace pcr } //-------------------------------------------------------------------- - InteractiveSelectionResult SAL_CALL XSDValidationPropertyHandler::onInteractivePropertySelection( const ::rtl::OUString& _rPropertyName, sal_Bool _bPrimary, Any& /*_rData*/, const Reference< XObjectInspectorUI >& _rxInspectorUI ) throw (UnknownPropertyException, NullPointerException, RuntimeException) + InteractiveSelectionResult SAL_CALL XSDValidationPropertyHandler::onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, Any& /*_rData*/, const Reference< XObjectInspectorUI >& _rxInspectorUI ) throw (UnknownPropertyException, NullPointerException, RuntimeException) { if ( !_rxInspectorUI.is() ) throw NullPointerException(); @@ -445,7 +445,7 @@ namespace pcr { if ( _bPrimary ) { - ::rtl::OUString sNewDataTypeName; + OUString sNewDataTypeName; if ( implPrepareCloneDataCurrentType( sNewDataTypeName ) ) { implDoCloneCurrentDataType( sNewDataTypeName ); @@ -483,7 +483,7 @@ namespace pcr } //-------------------------------------------------------------------- - bool XSDValidationPropertyHandler::implPrepareCloneDataCurrentType( ::rtl::OUString& _rNewName ) SAL_THROW(()) + bool XSDValidationPropertyHandler::implPrepareCloneDataCurrentType( OUString& _rNewName ) SAL_THROW(()) { OSL_PRECOND( m_pHelper.get(), "XSDValidationPropertyHandler::implPrepareCloneDataCurrentType: this will crash!" ); @@ -494,7 +494,7 @@ namespace pcr return false; } - ::std::vector< ::rtl::OUString > aExistentNames; + ::std::vector< OUString > aExistentNames; m_pHelper->getAvailableDataTypeNames( aExistentNames ); NewDataTypeDialog aDialog( NULL, pType->getName(), aExistentNames ); // TODO/eForms: proper parent @@ -506,7 +506,7 @@ namespace pcr } //-------------------------------------------------------------------- - bool XSDValidationPropertyHandler::implDoCloneCurrentDataType( const ::rtl::OUString& _rNewName ) SAL_THROW(()) + bool XSDValidationPropertyHandler::implDoCloneCurrentDataType( const OUString& _rNewName ) SAL_THROW(()) { OSL_PRECOND( m_pHelper.get(), "XSDValidationPropertyHandler::implDoCloneCurrentDataType: this will crash!" ); @@ -564,7 +564,7 @@ namespace pcr } //-------------------------------------------------------------------- - void SAL_CALL XSDValidationPropertyHandler::actuatingPropertyChanged( const ::rtl::OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& _rOldValue, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (NullPointerException, RuntimeException) + void SAL_CALL XSDValidationPropertyHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& _rOldValue, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (NullPointerException, RuntimeException) { if ( !_rxInspectorUI.is() ) throw NullPointerException(); @@ -588,7 +588,7 @@ namespace pcr //------------------------------------------------------------ // show the facets which are available at the data type - ::rtl::OUString aFacets[] = { + OUString aFacets[] = { OUString(PROPERTY_XSD_WHITESPACES), OUString(PROPERTY_XSD_PATTERN), OUString(PROPERTY_XSD_LENGTH), OUString(PROPERTY_XSD_MIN_LENGTH), OUString(PROPERTY_XSD_MAX_LENGTH), OUString(PROPERTY_XSD_TOTAL_DIGITS), OUString(PROPERTY_XSD_FRACTION_DIGITS), @@ -615,7 +615,7 @@ namespace pcr }; size_t i=0; - const ::rtl::OUString* pLoop = NULL; + const OUString* pLoop = NULL; for ( i = 0, pLoop = aFacets; i < SAL_N_ELEMENTS( aFacets ); ++i, ++pLoop @@ -631,9 +631,9 @@ namespace pcr { // The data type which the current binding works with may not be present in the // new model. Thus, transfer it. - ::rtl::OUString sOldModelName; _rOldValue >>= sOldModelName; - ::rtl::OUString sNewModelName; _rNewValue >>= sNewModelName; - ::rtl::OUString sDataType = m_pHelper->getValidatingDataTypeName(); + OUString sOldModelName; _rOldValue >>= sOldModelName; + OUString sNewModelName; _rNewValue >>= sNewModelName; + OUString sDataType = m_pHelper->getValidatingDataTypeName(); m_pHelper->copyDataType( sOldModelName, sNewModelName, sDataType ); // the list of available data types depends on the chosen model, so update this @@ -654,17 +654,17 @@ namespace pcr } //-------------------------------------------------------------------- - void XSDValidationPropertyHandler::implGetAvailableDataTypeNames( ::std::vector< ::rtl::OUString >& /* [out] */ _rNames ) const SAL_THROW(()) + void XSDValidationPropertyHandler::implGetAvailableDataTypeNames( ::std::vector< OUString >& /* [out] */ _rNames ) const SAL_THROW(()) { OSL_PRECOND( m_pHelper.get(), "XSDValidationPropertyHandler::implGetAvailableDataTypeNames: this will crash!" ); // start with *all* types which are available at the model - ::std::vector< ::rtl::OUString > aAllTypes; + ::std::vector< OUString > aAllTypes; m_pHelper->getAvailableDataTypeNames( aAllTypes ); _rNames.clear(); _rNames.reserve( aAllTypes.size() ); // then allow only those which are "compatible" with our control - for ( ::std::vector< ::rtl::OUString >::const_iterator dataType = aAllTypes.begin(); + for ( ::std::vector< OUString >::const_iterator dataType = aAllTypes.begin(); dataType != aAllTypes.end(); ++dataType ) diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx index 0c9c40245f29..0145b8026cb2 100644 --- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx +++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx @@ -45,25 +45,25 @@ namespace pcr const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext ); - static ::rtl::OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); + static OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); protected: ~XSDValidationPropertyHandler(); protected: // XPropertyHandler overriables - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupersededProperties( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getActuatingProperties( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::inspection::LineDescriptor - SAL_CALL describePropertyLine( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + SAL_CALL describePropertyLine( const OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::inspection::InteractiveSelectionResult - SAL_CALL onInteractivePropertySelection( const ::rtl::OUString& _rPropertyName, sal_Bool _bPrimary, ::com::sun::star::uno::Any& _rData, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL actuatingPropertyChanged( const ::rtl::OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, ::com::sun::star::uno::Any& _rData, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException); @@ -76,12 +76,12 @@ namespace pcr bool implPrepareRemoveCurrentDataType() SAL_THROW(()); bool implDoRemoveCurrentDataType() SAL_THROW(()); - bool implPrepareCloneDataCurrentType( ::rtl::OUString& _rNewName ) SAL_THROW(()); - bool implDoCloneCurrentDataType( const ::rtl::OUString& _rNewName ) SAL_THROW(()); + bool implPrepareCloneDataCurrentType( OUString& _rNewName ) SAL_THROW(()); + bool implDoCloneCurrentDataType( const OUString& _rNewName ) SAL_THROW(()); /** retrieves the names of the data types which our introspectee can be validated against */ - void implGetAvailableDataTypeNames( ::std::vector< ::rtl::OUString >& /* [out] */ _rNames ) const SAL_THROW(()); + void implGetAvailableDataTypeNames( ::std::vector< OUString >& /* [out] */ _rNames ) const SAL_THROW(()); }; //........................................................................ |