diff options
Diffstat (limited to 'desktop/source/deployment/gui')
18 files changed, 147 insertions, 154 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx b/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx index 571bd2806bfb..33a71c6b2275 100644 --- a/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx @@ -37,7 +37,7 @@ class Window; using dp_gui::DependencyDialog; DependencyDialog::DependencyDialog( - Window * parent, std::vector< rtl::OUString > const & dependencies): + Window * parent, std::vector< OUString > const & dependencies): ModalDialog(parent, DpGuiResId(RID_DLG_DEPENDENCIES) ), m_text(this, DpGuiResId(RID_DLG_DEPENDENCIES_TEXT)), m_list(this, DpGuiResId(RID_DLG_DEPENDENCIES_LIST)), @@ -49,7 +49,7 @@ DependencyDialog::DependencyDialog( FreeResource(); SetMinOutputSizePixel(GetOutputSizePixel()); m_list.SetReadOnly(); - for (std::vector< rtl::OUString >::const_iterator i(dependencies.begin()); + for (std::vector< OUString >::const_iterator i(dependencies.begin()); i != dependencies.end(); ++i) { m_list.InsertEntry(*i); diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx b/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx index fe38515272d3..c0d8172a8aa3 100644 --- a/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx +++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx @@ -37,7 +37,7 @@ namespace dp_gui { class DependencyDialog: public ModalDialog { public: DependencyDialog( - Window * parent, std::vector< rtl::OUString > const & dependencies); + Window * parent, std::vector< OUString > const & dependencies); ~DependencyDialog(); diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index 63154e7931f1..2a439da9900d 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -76,7 +76,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::system; -using ::rtl::OUString; namespace dp_gui { @@ -494,7 +493,7 @@ IMPL_LINK_NOARG(ExtBoxWithBtns_Impl, HandleOptionsBtn) if ( pFact ) { OUString sExtensionId = GetEntryData( nActive )->m_xPackage->getIdentifier().Value; - VclAbstractDialog* pDlg = pFact->CreateOptionsDialog( this, sExtensionId, rtl::OUString() ); + VclAbstractDialog* pDlg = pFact->CreateOptionsDialog( this, sExtensionId, OUString() ); pDlg->Execute(); @@ -749,7 +748,7 @@ ExtMgrDialog::~ExtMgrDialog() } //------------------------------------------------------------------------------ -void ExtMgrDialog::setGetExtensionsURL( const ::rtl::OUString &rURL ) +void ExtMgrDialog::setGetExtensionsURL( const OUString &rURL ) { m_pGetExtensions->SetURL( rURL ); } @@ -914,7 +913,7 @@ uno::Sequence< OUString > ExtMgrDialog::raiseAddPicker() title2filter.insert( t_string2string::value_type( title, filter ) ) ); if ( ! insertion.second ) { // already existing, append extensions: - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; buf.append( insertion.first->second ); buf.append( static_cast<sal_Unicode>(';') ); buf.append( filter ); @@ -935,7 +934,7 @@ uno::Sequence< OUString > ExtMgrDialog::raiseAddPicker() xFilePicker->appendFilter( iPos->first, iPos->second ); } catch (const lang::IllegalArgumentException & exc) { - OSL_FAIL( ::rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( exc.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); (void) exc; } @@ -1550,7 +1549,7 @@ void UpdateRequiredDialog::Resize() Rectangle aControlRegion( Point( 0, 0 ), m_aProgressBar.GetSizePixel() ); Rectangle aNativeControlRegion, aNativeContentRegion; if( GetNativeControlRegion( CTRL_PROGRESS, PART_ENTIRE_CONTROL, aControlRegion, - CTRL_STATE_ENABLED, aValue, rtl::OUString(), + CTRL_STATE_ENABLED, aValue, OUString(), aNativeControlRegion, aNativeContentRegion ) != sal_False ) { nProgressHeight = aNativeControlRegion.GetHeight(); @@ -1636,7 +1635,7 @@ bool UpdateRequiredDialog::isEnabled( const uno::Reference< deployment::XPackage catch ( const uno::RuntimeException & ) { throw; } catch (const uno::Exception & exc) { (void) exc; - OSL_FAIL( ::rtl::OUStringToOString( exc.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_FAIL( OUStringToOString( exc.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); bRegistered = false; } diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx index 490ac061153f..b5a5aa430483 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx @@ -63,13 +63,13 @@ public: Dialog *pWindow ); virtual ~DialogHelper(); - void openWebBrowser( const ::rtl::OUString & sURL, const ::rtl::OUString & sTitle ) const; + void openWebBrowser( const OUString & sURL, const OUString & sTitle ) const; Dialog* getWindow() const { return m_pVCLWindow; }; void PostUserEvent( const Link& rLink, void* pCaller ); void clearEventID() { m_nEventID = 0; } virtual void showProgress( bool bStart ) = 0; - virtual void updateProgress( const ::rtl::OUString &rText, + virtual void updateProgress( const OUString &rText, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XAbortChannel > &xAbortChannel) = 0; virtual void updateProgress( const long nProgress ) = 0; @@ -90,7 +90,7 @@ public: void setBusy( const bool bBusy ) { m_bIsBusy = bBusy; } bool isBusy() const { return m_bIsBusy; } - bool installExtensionWarn( const ::rtl::OUString &rExtensionURL ) const; + bool installExtensionWarn( const OUString &rExtensionURL ) const; bool installForAllUsers( bool &bInstallForAll ) const; }; @@ -126,7 +126,7 @@ class ExtMgrDialog : public ModelessDialog, ::com::sun::star::uno::Reference< ::com::sun::star::task::XAbortChannel > m_xAbortChannel; - bool removeExtensionWarn( const ::rtl::OUString &rExtensionTitle ) const; + bool removeExtensionWarn( const OUString &rExtensionTitle ) const; DECL_DLLPRIVATE_LINK( HandleAddBtn, void * ); DECL_DLLPRIVATE_LINK( HandleUpdateBtn, void * ); @@ -145,13 +145,13 @@ public: virtual sal_Bool Close(); virtual void showProgress( bool bStart ); - virtual void updateProgress( const ::rtl::OUString &rText, + virtual void updateProgress( const OUString &rText, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XAbortChannel > &xAbortChannel); virtual void updateProgress( const long nProgress ); virtual void updatePackageInfo( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &xPackage ); - void setGetExtensionsURL( const ::rtl::OUString &rURL ); + void setGetExtensionsURL( const OUString &rURL ); virtual long addPackageToList( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &, bool bLicenseMissing = false ); bool enablePackage(const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &xPackage, @@ -165,7 +165,7 @@ public: virtual void prepareChecking(); virtual void checkEntries(); - ::com::sun::star::uno::Sequence< ::rtl::OUString > raiseAddPicker(); + ::com::sun::star::uno::Sequence< OUString > raiseAddPicker(); }; //============================================================================== @@ -219,7 +219,7 @@ public: virtual sal_Bool Close(); virtual void showProgress( bool bStart ); - virtual void updateProgress( const ::rtl::OUString &rText, + virtual void updateProgress( const OUString &rText, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XAbortChannel > &xAbortChannel); virtual void updateProgress( const long nProgress ); @@ -233,10 +233,10 @@ public: virtual void prepareChecking(); virtual void checkEntries(); - ::com::sun::star::uno::Sequence< ::rtl::OUString > raiseAddPicker(); + ::com::sun::star::uno::Sequence< OUString > raiseAddPicker(); bool installForAllUsers( bool &bInstallForAll ) const; - bool installExtensionWarn( const ::rtl::OUString &rExtensionURL ) const; + bool installExtensionWarn( const OUString &rExtensionURL ) const; }; //============================================================================== @@ -258,14 +258,14 @@ class UpdateRequiredDialogService : public ::cppu::WeakImplHelper1< ::com::sun:: { ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const m_xComponentContext; ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xParent; - ::rtl::OUString m_sInitialTitle; + OUString m_sInitialTitle; public: UpdateRequiredDialogService( ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > const & args, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> const & xComponentContext ); // XExecutableDialog - virtual void SAL_CALL setTitle( rtl::OUString const & title ) throw ( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setTitle( OUString const & title ) throw ( ::com::sun::star::uno::RuntimeException ); virtual sal_Int16 SAL_CALL execute() throw ( ::com::sun::star::uno::RuntimeException ); }; diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx index 9b4ba5b39095..df0e4175813e 100644 --- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx +++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx @@ -100,7 +100,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; namespace { @@ -405,7 +404,7 @@ void ProgressCmdEnv::handle( uno::Reference< task::XInteractionRequest > const & } else if (request >>= depExc) { - std::vector< rtl::OUString > deps; + std::vector< OUString > deps; for (sal_Int32 i = 0; i < depExc.UnsatisfiedDependencies.getLength(); ++i) { @@ -620,8 +619,8 @@ ExtensionCmdQueue::Thread::Thread( DialogHelper *pDialogHelper, } //------------------------------------------------------------------------------ -void ExtensionCmdQueue::Thread::addExtension( const ::rtl::OUString &rExtensionURL, - const ::rtl::OUString &rRepository, +void ExtensionCmdQueue::Thread::addExtension( const OUString &rExtensionURL, + const OUString &rRepository, const bool bWarnUser ) { if ( !rExtensionURL.isEmpty() ) @@ -921,7 +920,7 @@ void ExtensionCmdQueue::Thread::_removeExtension( ::rtl::Reference< ProgressCmdE {} // Check, if there are still updates to be notified via menu bar icon - uno::Sequence< uno::Sequence< rtl::OUString > > aItemList; + uno::Sequence< uno::Sequence< OUString > > aItemList; UpdateDialog::createNotifyJob( false, aItemList ); } @@ -1077,8 +1076,8 @@ ExtensionCmdQueue::~ExtensionCmdQueue() { stop(); } -void ExtensionCmdQueue::addExtension( const ::rtl::OUString & extensionURL, - const ::rtl::OUString & repository, +void ExtensionCmdQueue::addExtension( const OUString & extensionURL, + const OUString & repository, const bool bWarnUser ) { m_thread->addExtension( extensionURL, repository, bWarnUser ); diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx index 955c66888136..69a109caa237 100644 --- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx +++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx @@ -69,8 +69,8 @@ public: /** */ - void addExtension( const ::rtl::OUString &rExtensionURL, - const ::rtl::OUString &rRepository, + void addExtension( const OUString &rExtensionURL, + const OUString &rRepository, const bool bWarnUser ); void removeExtension( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &rPackage ); void enableExtension( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &rPackage, diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx index 7b61ac925f36..19d274956ca8 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx @@ -141,7 +141,7 @@ void Entry_Impl::checkDependencies() deployment::DependencyException depExc; if ( e.Cause >>= depExc ) { - rtl::OUString aMissingDep( DialogHelper::getResourceString( RID_STR_ERROR_MISSING_DEPENDENCIES ) ); + OUString aMissingDep( DialogHelper::getResourceString( RID_STR_ERROR_MISSING_DEPENDENCIES ) ); for ( sal_Int32 i = 0; i < depExc.UnsatisfiedDependencies.getLength(); ++i ) { aMissingDep += "\n"; @@ -316,7 +316,7 @@ void ExtensionBox_Impl::checkIndex( sal_Int32 nIndex ) const } //------------------------------------------------------------------------------ -rtl::OUString ExtensionBox_Impl::getItemName( sal_Int32 nIndex ) const +OUString ExtensionBox_Impl::getItemName( sal_Int32 nIndex ) const { const ::osl::MutexGuard aGuard( m_entriesMutex ); checkIndex( nIndex ); @@ -324,7 +324,7 @@ rtl::OUString ExtensionBox_Impl::getItemName( sal_Int32 nIndex ) const } //------------------------------------------------------------------------------ -rtl::OUString ExtensionBox_Impl::getItemVersion( sal_Int32 nIndex ) const +OUString ExtensionBox_Impl::getItemVersion( sal_Int32 nIndex ) const { const ::osl::MutexGuard aGuard( m_entriesMutex ); checkIndex( nIndex ); @@ -332,7 +332,7 @@ rtl::OUString ExtensionBox_Impl::getItemVersion( sal_Int32 nIndex ) const } //------------------------------------------------------------------------------ -rtl::OUString ExtensionBox_Impl::getItemDescription( sal_Int32 nIndex ) const +OUString ExtensionBox_Impl::getItemDescription( sal_Int32 nIndex ) const { const ::osl::MutexGuard aGuard( m_entriesMutex ); checkIndex( nIndex ); @@ -340,7 +340,7 @@ rtl::OUString ExtensionBox_Impl::getItemDescription( sal_Int32 nIndex ) const } //------------------------------------------------------------------------------ -rtl::OUString ExtensionBox_Impl::getItemPublisher( sal_Int32 nIndex ) const +OUString ExtensionBox_Impl::getItemPublisher( sal_Int32 nIndex ) const { const ::osl::MutexGuard aGuard( m_entriesMutex ); checkIndex( nIndex ); @@ -348,7 +348,7 @@ rtl::OUString ExtensionBox_Impl::getItemPublisher( sal_Int32 nIndex ) const } //------------------------------------------------------------------------------ -rtl::OUString ExtensionBox_Impl::getItemPublisherLink( sal_Int32 nIndex ) const +OUString ExtensionBox_Impl::getItemPublisherLink( sal_Int32 nIndex ) const { const ::osl::MutexGuard aGuard( m_entriesMutex ); checkIndex( nIndex ); @@ -364,7 +364,7 @@ void ExtensionBox_Impl::select( sal_Int32 nIndex ) } //------------------------------------------------------------------------------ -void ExtensionBox_Impl::select( const rtl::OUString & sName ) +void ExtensionBox_Impl::select( const OUString & sName ) { const ::osl::MutexGuard aGuard( m_entriesMutex ); typedef ::std::vector< TEntry_Impl >::const_iterator It; @@ -403,7 +403,7 @@ void ExtensionBox_Impl::CalcActiveHeight( const long nPos ) aSize.Width() -= ICON_OFFSET; aSize.Height() = 10000; - rtl::OUString aText( m_vEntries[ nPos ]->m_sErrorText ); + OUString aText( m_vEntries[ nPos ]->m_sErrorText ); if ( !aText.isEmpty() ) aText += "\n"; aText += m_vEntries[ nPos ]->m_sDescription; @@ -621,7 +621,7 @@ void ExtensionBox_Impl::DrawRow( const Rectangle& rRect, const TEntry_Impl pEntr aTextHeight = nIconHeight; // draw description - ::rtl::OUString sDescription; + OUString sDescription; if ( pEntry->m_sErrorText.Len() ) { if ( pEntry->m_bActive ) diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx index b0fda41add21..12cae91a0f0b 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx @@ -228,27 +228,27 @@ public: /** @return The item name of the entry with the given index The index starts with 0. Throws an com::sun::star::lang::IllegalArgumentException, when the position is invalid. */ - virtual ::rtl::OUString getItemName( sal_Int32 index ) const; + virtual OUString getItemName( sal_Int32 index ) const; /** @return The version string of the entry with the given index The index starts with 0. Throws an com::sun::star::lang::IllegalArgumentException, when the position is invalid. */ - virtual ::rtl::OUString getItemVersion( sal_Int32 index ) const; + virtual OUString getItemVersion( sal_Int32 index ) const; /** @return The description string of the entry with the given index The index starts with 0. Throws an com::sun::star::lang::IllegalArgumentException, when the position is invalid. */ - virtual ::rtl::OUString getItemDescription( sal_Int32 index ) const; + virtual OUString getItemDescription( sal_Int32 index ) const; /** @return The publisher string of the entry with the given index The index starts with 0. Throws an com::sun::star::lang::IllegalArgumentException, when the position is invalid. */ - virtual ::rtl::OUString getItemPublisher( sal_Int32 index ) const; + virtual OUString getItemPublisher( sal_Int32 index ) const; /** @return The link behind the publisher text of the entry with the given index The index starts with 0. Throws an com::sun::star::lang::IllegalArgumentException, when the position is invalid. */ - virtual ::rtl::OUString getItemPublisherLink( sal_Int32 index ) const; + virtual OUString getItemPublisherLink( sal_Int32 index ) const; /** The entry at the given position will be selected Index starts with 0. @@ -262,7 +262,7 @@ public: 1. the name is not unique 2. one extension can be installed as user and shared extension. */ - virtual void select( const ::rtl::OUString & sName ); + virtual void select( const OUString & sName ); }; } diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx index 38abdb675e65..39cc7ae24e66 100644 --- a/desktop/source/deployment/gui/dp_gui_service.cxx +++ b/desktop/source/deployment/gui/dp_gui_service.cxx @@ -44,7 +44,6 @@ using namespace ::dp_misc; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; namespace dp_gui { @@ -102,17 +101,17 @@ namespace : public rtl::Static< String, Extension > {}; } -rtl::OUString ReplaceProductNameHookProc( const rtl::OUString& rStr ) +OUString ReplaceProductNameHookProc( const OUString& rStr ) { if (rStr.indexOf( "%PRODUCT" ) == -1) return rStr; - rtl::OUString sProductName = ProductName::get(); - rtl::OUString sVersion = Version::get(); - rtl::OUString sAboutBoxVersion = AboutBoxVersion::get(); - rtl::OUString sAboutBoxVersionSuffix = AboutBoxVersionSuffix::get(); - rtl::OUString sExtension = Extension::get(); - rtl::OUString sOOOVendor = OOOVendor::get(); + OUString sProductName = ProductName::get(); + OUString sVersion = Version::get(); + OUString sAboutBoxVersion = AboutBoxVersion::get(); + OUString sAboutBoxVersionSuffix = AboutBoxVersionSuffix::get(); + OUString sExtension = Extension::get(); + OUString sOOOVendor = OOOVendor::get(); if ( sProductName.isEmpty() ) { @@ -127,7 +126,7 @@ rtl::OUString ReplaceProductNameHookProc( const rtl::OUString& rStr ) } } - rtl::OUString sRet = rStr.replaceAll( "%PRODUCTNAME", sProductName ); + OUString sRet = rStr.replaceAll( "%PRODUCTNAME", sProductName ); sRet = sRet.replaceAll( "%PRODUCTVERSION", sVersion ); sRet = sRet.replaceAll( "%ABOUTBOXPRODUCTVERSIONSUFFIX", sAboutBoxVersionSuffix ); sRet = sRet.replaceAll( "%ABOUTBOXPRODUCTVERSION", sAboutBoxVersion ); @@ -242,7 +241,7 @@ void ServiceImpl::startExecuteModal( app->SetSettings( as ); app->SetDisplayName( utl::ConfigManager::getProductName() + - rtl::OUString(" ") + + OUString(" ") + utl::ConfigManager::getProductVersion()); ExtensionCmdQueue::syncRepositories( m_xComponentContext ); } diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx index b0d1350955eb..af1576460532 100644 --- a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx +++ b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx @@ -38,7 +38,6 @@ #define SHARED_PACKAGE_MANAGER OUString("shared") using namespace ::com::sun::star; -using ::rtl::OUString; namespace dp_gui { @@ -138,7 +137,7 @@ void TheExtensionManager::Show() } //------------------------------------------------------------------------------ -void TheExtensionManager::SetText( const ::rtl::OUString &rTitle ) +void TheExtensionManager::SetText( const OUString &rTitle ) { const SolarMutexGuard guard; @@ -341,7 +340,7 @@ PackageState TheExtensionManager::getPackageState( const uno::Reference< deploym } catch (const uno::Exception & exc) { (void) exc; - OSL_FAIL( ::rtl::OUStringToOString( exc.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_FAIL( OUStringToOString( exc.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); return NOT_AVAILABLE; } } diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx index ec2734e80cee..df90ac4553d5 100644 --- a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx +++ b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx @@ -58,7 +58,7 @@ private: UpdateRequiredDialog *m_pUpdReqDialog; ExtensionCmdQueue *m_pExecuteCmdQueue; - ::rtl::OUString m_sGetExtensionsURL; + OUString m_sGetExtensionsURL; public: static ::rtl::Reference<TheExtensionManager> s_ExtMgr; @@ -74,7 +74,7 @@ public: DialogHelper* getDialogHelper() { return m_pExtMgrDialog ? (DialogHelper*) m_pExtMgrDialog : (DialogHelper*) m_pUpdReqDialog; } ExtensionCmdQueue* getCmdQueue() const { return m_pExecuteCmdQueue; } - void SetText( const ::rtl::OUString &rTitle ); + void SetText( const OUString &rTitle ); void Show(); void ToTop( sal_uInt16 nFlags ); bool Close(); @@ -82,7 +82,7 @@ public: //----------------- bool checkUpdates( bool showUpdateOnly, bool parentVisible ); - bool installPackage( const ::rtl::OUString &rPackageURL, bool bWarnUser = false ); + bool installPackage( const OUString &rPackageURL, bool bWarnUser = false ); void createPackageList(); bool queryTermination(); @@ -99,7 +99,7 @@ public: static ::rtl::Reference<TheExtensionManager> get( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> const & xContext, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow> const & xParent = 0, - ::rtl::OUString const & view = ::rtl::OUString() ); + OUString const & view = OUString() ); // XEventListener virtual void SAL_CALL disposing( ::com::sun::star::lang::EventObject const & evt ) diff --git a/desktop/source/deployment/gui/dp_gui_updatedata.hxx b/desktop/source/deployment/gui/dp_gui_updatedata.hxx index d61194751f9f..fa688960573b 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedata.hxx +++ b/desktop/source/deployment/gui/dp_gui_updatedata.hxx @@ -52,7 +52,7 @@ struct UpdateData ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > aInstalledPackage; //The version of the update - ::rtl::OUString updateVersion; + OUString updateVersion; //For online update // ====================== @@ -62,9 +62,9 @@ struct UpdateData ::com::sun::star::uno::Reference< ::com::sun::star::xml::dom::XNode > aUpdateInfo; //The URL of the locally downloaded extension. It will only be set if there were no errors //during the download - ::rtl::OUString sLocalURL; + OUString sLocalURL; //The URL of the website wher the download can be obtained. - ::rtl::OUString sWebsiteURL; + OUString sWebsiteURL; //For local update //===================== diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx index cc9da4d783a4..84fccdf0bffe 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx @@ -138,7 +138,7 @@ static const sal_uInt16 CMD_IGNORE_ALL_UPDATES = 3; enum Kind { ENABLED_UPDATE, DISABLED_UPDATE, SPECIFIC_ERROR }; -rtl::OUString confineToParagraph(rtl::OUString const & text) { +OUString confineToParagraph(OUString const & text) { // Confine arbitrary text to a single paragraph in a dp_gui::AutoScrollEdit. // This assumes that U+000A and U+000D are the only paragraph separators in // a dp_gui::AutoScrollEdit, and that replacing them with a single space @@ -148,30 +148,30 @@ rtl::OUString confineToParagraph(rtl::OUString const & text) { } struct UpdateDialog::DisabledUpdate { - rtl::OUString name; - uno::Sequence< rtl::OUString > unsatisfiedDependencies; + OUString name; + uno::Sequence< OUString > unsatisfiedDependencies; // We also want to show release notes and publisher for disabled updates ::com::sun::star::uno::Reference< ::com::sun::star::xml::dom::XNode > aUpdateInfo; sal_uInt16 m_nID; }; struct UpdateDialog::SpecificError { - rtl::OUString name; - rtl::OUString message; + OUString name; + OUString message; sal_uInt16 m_nID; }; //------------------------------------------------------------------------------ struct UpdateDialog::IgnoredUpdate { - rtl::OUString sExtensionID; - rtl::OUString sVersion; + OUString sExtensionID; + OUString sVersion; bool bRemoved; - IgnoredUpdate( const rtl::OUString &rExtensionID, const rtl::OUString &rVersion ); + IgnoredUpdate( const OUString &rExtensionID, const OUString &rVersion ); }; //------------------------------------------------------------------------------ -UpdateDialog::IgnoredUpdate::IgnoredUpdate( const rtl::OUString &rExtensionID, const rtl::OUString &rVersion ): +UpdateDialog::IgnoredUpdate::IgnoredUpdate( const OUString &rExtensionID, const OUString &rVersion ): sExtensionID( rExtensionID ), sVersion( rVersion ), bRemoved( false ) @@ -184,13 +184,13 @@ struct UpdateDialog::Index bool m_bIgnored; sal_uInt16 m_nID; sal_uInt16 m_nIndex; - rtl::OUString m_aName; + OUString m_aName; - Index( Kind theKind, sal_uInt16 nID, sal_uInt16 nIndex, const rtl::OUString &rName ); + Index( Kind theKind, sal_uInt16 nID, sal_uInt16 nIndex, const OUString &rName ); }; //------------------------------------------------------------------------------ -UpdateDialog::Index::Index( Kind theKind, sal_uInt16 nID, sal_uInt16 nIndex, const rtl::OUString &rName ): +UpdateDialog::Index::Index( Kind theKind, sal_uInt16 nID, sal_uInt16 nIndex, const OUString &rName ): m_eKind( theKind ), m_bIgnored( false ), m_nID( nID ), @@ -222,11 +222,11 @@ private: uno::Sequence< uno::Reference< xml::dom::XElement > > getUpdateInformation( uno::Reference< deployment::XPackage > const & package, - uno::Sequence< rtl::OUString > const & urls, - rtl::OUString const & identifier) const; + uno::Sequence< OUString > const & urls, + OUString const & identifier) const; - ::rtl::OUString getUpdateDisplayString( - dp_gui::UpdateData const & data, ::rtl::OUString const & version = ::rtl::OUString()) const; + OUString getUpdateDisplayString( + dp_gui::UpdateData const & data, OUString const & version = OUString()) const; void prepareUpdateData( ::com::sun::star::uno::Reference< ::com::sun::star::xml::dom::XNode > const & updateInfo, @@ -318,12 +318,12 @@ void UpdateDialog::Thread::execute() prepareUpdateData(info.info, disableUpdate, updateData); //determine if the update is installed in the user or shared repository - rtl::OUString sOnlineVersion; + OUString sOnlineVersion; if (info.info.is()) sOnlineVersion = info.version; - rtl::OUString sVersionUser; - rtl::OUString sVersionShared; - rtl::OUString sVersionBundled; + OUString sVersionUser; + OUString sVersionShared; + OUString sVersionBundled; uno::Sequence< uno::Reference< deployment::XPackage> > extensions; try { extensions = extMgr->getExtensionsWithSameIdentifier( @@ -406,11 +406,11 @@ void UpdateDialog::Thread::handleSpecificError( } } -::rtl::OUString UpdateDialog::Thread::getUpdateDisplayString( - dp_gui::UpdateData const & data, ::rtl::OUString const & version) const +OUString UpdateDialog::Thread::getUpdateDisplayString( + dp_gui::UpdateData const & data, OUString const & version) const { OSL_ASSERT(data.aInstalledPackage.is()); - rtl::OUStringBuffer b(data.aInstalledPackage->getDisplayName()); + OUStringBuffer b(data.aInstalledPackage->getDisplayName()); b.append(static_cast< sal_Unicode >(' ')); { SolarMutexGuard g; @@ -455,7 +455,7 @@ void UpdateDialog::Thread::prepareUpdateData( out_du.unsatisfiedDependencies[i] = dp_misc::Dependencies::getErrorText(ds[i]); } - const ::boost::optional< ::rtl::OUString> updateWebsiteURL(infoset.getLocalizedUpdateWebsiteURL()); + const ::boost::optional< OUString> updateWebsiteURL(infoset.getLocalizedUpdateWebsiteURL()); out_du.name = getUpdateDisplayString(out_data, infoset.getVersion()); @@ -724,7 +724,7 @@ void UpdateDialog::addAdditional( UpdateDialog::Index * index, SvLBoxButtonKind } //------------------------------------------------------------------------------ -void UpdateDialog::addEnabledUpdate( rtl::OUString const & name, +void UpdateDialog::addEnabledUpdate( OUString const & name, dp_gui::UpdateData & data ) { sal_uInt16 nIndex = sal::static_int_cast< sal_uInt16 >( m_enabledUpdates.size() ); @@ -808,7 +808,7 @@ void UpdateDialog::enableOk() { // ********************************************************************************* void UpdateDialog::createNotifyJob( bool bPrepareOnly, - uno::Sequence< uno::Sequence< rtl::OUString > > &rItemList ) + uno::Sequence< uno::Sequence< OUString > > &rItemList ) { if ( !dp_misc::office_is_running() ) return; @@ -843,7 +843,7 @@ void UpdateDialog::createNotifyJob( bool bPrepareOnly, uno::Reference < frame::XDesktop2 > xDesktop = frame::Desktop::create( xContext ); uno::Reference< frame::XDispatchProvider > xDispatchProvider( xDesktop->getCurrentFrame(), uno::UNO_QUERY_THROW ); - uno::Reference< frame::XDispatch > xDispatch = xDispatchProvider->queryDispatch(aURL, rtl::OUString(), 0); + uno::Reference< frame::XDispatch > xDispatch = xDispatchProvider->queryDispatch(aURL, OUString(), 0); if( xDispatch.is() ) { @@ -871,14 +871,14 @@ void UpdateDialog::notifyMenubar( bool bPrepareOnly, bool bRecheckOnly ) if ( !dp_misc::office_is_running() ) return; - uno::Sequence< uno::Sequence< rtl::OUString > > aItemList; + uno::Sequence< uno::Sequence< OUString > > aItemList; if ( ! bRecheckOnly ) { sal_Int32 nCount = 0; for ( sal_Int16 i = 0; i < m_updates.getItemCount(); ++i ) { - uno::Sequence< rtl::OUString > aItem(2); + uno::Sequence< OUString > aItem(2); UpdateDialog::Index const * p = static_cast< UpdateDialog::Index const * >(m_updates.GetEntryData(i)); @@ -988,11 +988,11 @@ bool UpdateDialog::showDescription(uno::Reference< deployment::XPackage > const ""); } -bool UpdateDialog::showDescription(std::pair< rtl::OUString, rtl::OUString > const & pairPublisher, - rtl::OUString const & sReleaseNotes) +bool UpdateDialog::showDescription(std::pair< OUString, OUString > const & pairPublisher, + OUString const & sReleaseNotes) { - rtl::OUString sPub = pairPublisher.first; - rtl::OUString sURL = pairPublisher.second; + OUString sPub = pairPublisher.first; + OUString sURL = pairPublisher.second; if ( sPub.isEmpty() && sURL.isEmpty() && sReleaseNotes.isEmpty() ) // nothing to show @@ -1056,12 +1056,12 @@ void UpdateDialog::getIgnoredUpdates() args[0] <<= aValue; uno::Reference< container::XNameAccess > xNameAccess( xConfig->createInstanceWithArguments( "com.sun.star.configuration.ConfigurationAccess", args), uno::UNO_QUERY_THROW ); - uno::Sequence< rtl::OUString > aElementNames = xNameAccess->getElementNames(); + uno::Sequence< OUString > aElementNames = xNameAccess->getElementNames(); for ( sal_Int32 i = 0; i < aElementNames.getLength(); i++ ) { - ::rtl::OUString aIdentifier = aElementNames[i]; - ::rtl::OUString aVersion; + OUString aIdentifier = aElementNames[i]; + OUString aVersion; uno::Any aPropValue( uno::Reference< beans::XPropertySet >( xNameAccess->getByName( aIdentifier ), uno::UNO_QUERY_THROW )->getPropertyValue( PROPERTY_VERSION ) ); aPropValue >>= aVersion; @@ -1116,8 +1116,8 @@ bool UpdateDialog::isIgnoredUpdate( UpdateDialog::Index * index ) if (! m_ignoredUpdates.empty() ) { - rtl::OUString aExtensionID; - rtl::OUString aVersion; + OUString aExtensionID; + OUString aVersion; if ( index->m_eKind == ENABLED_UPDATE ) { @@ -1129,7 +1129,7 @@ bool UpdateDialog::isIgnoredUpdate( UpdateDialog::Index * index ) { DisabledUpdate &rData = m_disabledUpdates[ index->m_nIndex ]; dp_misc::DescriptionInfoset aInfoset( m_context, rData.aUpdateInfo ); - ::boost::optional< ::rtl::OUString > aID( aInfoset.getIdentifier() ); + ::boost::optional< OUString > aID( aInfoset.getIdentifier() ); if ( aID ) aExtensionID = *aID; aVersion = aInfoset.getVersion(); @@ -1157,8 +1157,8 @@ bool UpdateDialog::isIgnoredUpdate( UpdateDialog::Index * index ) //------------------------------------------------------------------------------ void UpdateDialog::setIgnoredUpdate( UpdateDialog::Index *pIndex, bool bIgnore, bool bIgnoreAll ) { - rtl::OUString aExtensionID; - rtl::OUString aVersion; + OUString aExtensionID; + OUString aVersion; m_bModified = true; @@ -1173,7 +1173,7 @@ void UpdateDialog::setIgnoredUpdate( UpdateDialog::Index *pIndex, bool bIgnore, { DisabledUpdate &rData = m_disabledUpdates[ pIndex->m_nIndex ]; dp_misc::DescriptionInfoset aInfoset( m_context, rData.aUpdateInfo ); - ::boost::optional< ::rtl::OUString > aID( aInfoset.getIdentifier() ); + ::boost::optional< OUString > aID( aInfoset.getIdentifier() ); if ( aID ) aExtensionID = *aID; if ( !bIgnoreAll ) @@ -1205,7 +1205,7 @@ void UpdateDialog::setIgnoredUpdate( UpdateDialog::Index *pIndex, bool bIgnore, IMPL_LINK_NOARG(UpdateDialog, selectionHandler) { - rtl::OUStringBuffer b; + OUStringBuffer b; bool bInserted = false; UpdateDialog::Index const * p = static_cast< UpdateDialog::Index const * >( m_updates.GetEntryData(m_updates.GetSelectEntryPos())); @@ -1244,8 +1244,8 @@ IMPL_LINK_NOARG(UpdateDialog, selectionHandler) if (data.unsatisfiedDependencies.getLength() != 0) { // create error string for version mismatch - ::rtl::OUString sVersion( "%VERSION" ); - ::rtl::OUString sProductName( "%PRODUCTNAME" ); + OUString sVersion( "%VERSION" ); + OUString sProductName( "%PRODUCTNAME" ); sal_Int32 nPos = m_noDependencyCurVer.indexOf( sVersion ); if ( nPos >= 0 ) { @@ -1380,9 +1380,9 @@ IMPL_LINK_NOARG(UpdateDialog, closeHandler) { IMPL_LINK( UpdateDialog, hyperlink_clicked, FixedHyperlink*, pHyperlink ) { - ::rtl::OUString sURL; + OUString sURL; if ( pHyperlink ) - sURL = ::rtl::OUString( pHyperlink->GetURL() ); + sURL = OUString( pHyperlink->GetURL() ); if ( sURL.isEmpty() ) return 0; @@ -1391,7 +1391,7 @@ IMPL_LINK( UpdateDialog, hyperlink_clicked, FixedHyperlink*, pHyperlink ) uno::Reference< com::sun::star::system::XSystemShellExecute > xSystemShellExecute( com::sun::star::system::SystemShellExecute::create(m_context) ); //throws lang::IllegalArgumentException, system::SystemShellExecuteException - xSystemShellExecute->execute( sURL, ::rtl::OUString(), com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY); + xSystemShellExecute->execute( sURL, OUString(), com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY); } catch ( const uno::Exception& ) { diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx index ca6ffa53fddb..e83df3cba7b1 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx @@ -94,7 +94,7 @@ public: void notifyMenubar( bool bPrepareOnly, bool bRecheckOnly ); static void createNotifyJob( bool bPrepareOnly, - com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< rtl::OUString > > &rItemList ); + com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< OUString > > &rItemList ); private: UpdateDialog(UpdateDialog &); // not defined @@ -128,9 +128,9 @@ private: void handlePopupMenu( const Point &rPos ); - rtl::OUString m_ignoreUpdate; - rtl::OUString m_ignoreAllUpdates; - rtl::OUString m_enableUpdate; + OUString m_ignoreUpdate; + OUString m_ignoreAllUpdates; + OUString m_enableUpdate; UpdateDialog & m_dialog; }; @@ -142,7 +142,7 @@ private: bool isIgnoredUpdate( UpdateDialog::Index *pIndex ); void setIgnoredUpdate( UpdateDialog::Index *pIndex, bool bIgnore, bool bIgnoreAll ); - void addEnabledUpdate( rtl::OUString const & name, dp_gui::UpdateData & data ); + void addEnabledUpdate( OUString const & name, dp_gui::UpdateData & data ); void addDisabledUpdate( UpdateDialog::DisabledUpdate & data ); void addSpecificError( UpdateDialog::SpecificError & data ); @@ -157,8 +157,8 @@ private: void clearDescription(); bool showDescription(::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > const & aExtension); - bool showDescription(std::pair< rtl::OUString, rtl::OUString > const & pairPublisher, - rtl::OUString const & sReleaseNotes); + bool showDescription(std::pair< OUString, OUString > const & pairPublisher, + OUString const & sReleaseNotes); bool showDescription( ::com::sun::star::uno::Reference< ::com::sun::star::xml::dom::XNode > const & aUpdateInfo); bool showDescription( const String& rDescription, bool bWithPublisher ); @@ -187,18 +187,18 @@ private: HelpButton m_help; PushButton m_ok; PushButton m_close; - rtl::OUString m_error; - rtl::OUString m_none; - rtl::OUString m_noInstallable; - rtl::OUString m_failure; - rtl::OUString m_unknownError; - rtl::OUString m_noDescription; - rtl::OUString m_noInstall; - rtl::OUString m_noDependency; - rtl::OUString m_noDependencyCurVer; - rtl::OUString m_browserbased; - rtl::OUString m_version; - rtl::OUString m_ignoredUpdate; + OUString m_error; + OUString m_none; + OUString m_noInstallable; + OUString m_failure; + OUString m_unknownError; + OUString m_noDescription; + OUString m_noInstall; + OUString m_noDependency; + OUString m_noDependencyCurVer; + OUString m_browserbased; + OUString m_version; + OUString m_ignoredUpdate; std::vector< dp_gui::UpdateData > m_enabledUpdates; std::vector< UpdateDialog::DisabledUpdate > m_disabledUpdates; std::vector< UpdateDialog::SpecificError > m_specificErrors; diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx index b464af532774..774f302972ab 100644 --- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx @@ -77,7 +77,6 @@ class Window; namespace cssu = ::com::sun::star::uno; using dp_misc::StrTitle; -using ::rtl::OUString; namespace dp_gui { @@ -96,7 +95,7 @@ private: virtual void execute(); void downloadExtensions(); - void download(::rtl::OUString const & aUrls, UpdateData & aUpdatData); + void download(OUString const & aUrls, UpdateData & aUpdatData); void installExtensions(); void removeTempDownloads(); @@ -111,7 +110,7 @@ private: ::rtl::Reference<UpdateCommandEnv> m_updateCmdEnv; //A folder which is created in the temp directory in which then the updates are downloaded - ::rtl::OUString m_sDownloadFolder; + OUString m_sDownloadFolder; bool m_stop; @@ -272,7 +271,7 @@ void UpdateInstallDialog::updateDone() } // make sure the solar mutex is locked before calling //sets an error message in the text area -void UpdateInstallDialog::setError(INSTALL_ERROR err, ::rtl::OUString const & sExtension, +void UpdateInstallDialog::setError(INSTALL_ERROR err, OUString const & sExtension, OUString const & exceptionMessage) { String sError; @@ -409,7 +408,7 @@ void UpdateInstallDialog::Thread::downloadExtensions() if (curData.sLocalURL.isEmpty()) { //Construct a string of all messages contained in the exceptions plus the respective download URLs - ::rtl::OUStringBuffer buf(256); + OUStringBuffer buf(256); typedef ::std::vector< ::std::pair<OUString, cssu::Exception > >::const_iterator CIT; for (CIT j = vecExceptions.begin(); j != vecExceptions.end(); ++j) { diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx index c0d24b22b791..4ff60064b5af 100644 --- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx +++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx @@ -84,8 +84,8 @@ private: ERROR_INSTALLATION, ERROR_LICENSE_DECLINED }; - void setError(INSTALL_ERROR err, ::rtl::OUString const & sExtension, ::rtl::OUString const & exceptionMessage); - void setError(::rtl::OUString const & exceptionMessage); + void setError(INSTALL_ERROR err, OUString const & sExtension, OUString const & exceptionMessage); + void setError(OUString const & exceptionMessage); ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XExtensionManager > getExtensionManager() const { return m_xExtensionManager; } @@ -97,14 +97,14 @@ private: bool m_bNoEntry; bool m_bActivated; - ::rtl::OUString m_sInstalling; - ::rtl::OUString m_sFinished; - ::rtl::OUString m_sNoErrors; - ::rtl::OUString m_sErrorDownload; - ::rtl::OUString m_sErrorInstallation; - ::rtl::OUString m_sErrorLicenseDeclined; - ::rtl::OUString m_sNoInstall; - ::rtl::OUString m_sThisErrorOccurred; + OUString m_sInstalling; + OUString m_sFinished; + OUString m_sNoErrors; + OUString m_sErrorDownload; + OUString m_sErrorInstallation; + OUString m_sErrorLicenseDeclined; + OUString m_sNoInstall; + OUString m_sThisErrorOccurred; FixedText m_ft_action; ProgressBar m_statusbar; diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx index ccd57d20e1d5..46c653bc2bb7 100644 --- a/desktop/source/deployment/gui/license_dialog.cxx +++ b/desktop/source/deployment/gui/license_dialog.cxx @@ -46,7 +46,6 @@ using namespace ::dp_misc; namespace cssu = ::com::sun::star::uno; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; namespace dp_gui { @@ -106,8 +105,8 @@ struct LicenseDialogImpl : public ModalDialog LicenseDialogImpl( Window * pParent, css::uno::Reference< css::uno::XComponentContext > const & xContext, - const ::rtl::OUString & sExtensionName, - const ::rtl::OUString & sLicenseText); + const OUString & sExtensionName, + const OUString & sLicenseText); virtual void Activate(); @@ -184,8 +183,8 @@ void LicenseView::Notify( SfxBroadcaster&, const SfxHint& rHint ) LicenseDialogImpl::LicenseDialogImpl( Window * pParent, cssu::Reference< cssu::XComponentContext > const & xContext, - const ::rtl::OUString & sExtensionName, - const ::rtl::OUString & sLicenseText): + const OUString & sExtensionName, + const OUString & sLicenseText): ModalDialog(pParent, DpGuiResId(RID_DLG_LICENSE)) ,m_xComponentContext(xContext) ,m_ftHead(this, DpGuiResId(FT_LICENSE_HEADER)) diff --git a/desktop/source/deployment/gui/license_dialog.hxx b/desktop/source/deployment/gui/license_dialog.hxx index 7fb26c46b66e..8dc0f2c908bc 100644 --- a/desktop/source/deployment/gui/license_dialog.hxx +++ b/desktop/source/deployment/gui/license_dialog.hxx @@ -30,7 +30,6 @@ using namespace ::dp_misc; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; namespace dp_gui { |