diff options
| author | Noel Grandin <noel@peralex.com> | 2015-10-28 15:38:06 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-10-29 06:26:47 +0000 |
| commit | 913a2d3692f0dc36c41bfeca2cad7e936b189a30 (patch) | |
| tree | 9143f8a8e7d2e89ed4a18a21edab1f348039c3f4 | |
| parent | Updated core (diff) | |
| download | core-913a2d3692f0dc36c41bfeca2cad7e936b189a30.tar.gz core-913a2d3692f0dc36c41bfeca2cad7e936b189a30.zip | |
com::sun::star->css in sfx2
Change-Id: I20d9b45e4b28c2a4a511774d3154aceb0471d197
Reviewed-on: https://gerrit.libreoffice.org/19643
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
121 files changed, 1269 insertions, 1303 deletions
diff --git a/sfx2/inc/bluthsndapi.hxx b/sfx2/inc/bluthsndapi.hxx index 4869173c3e84..8c6ccc185d7e 100644 --- a/sfx2/inc/bluthsndapi.hxx +++ b/sfx2/inc/bluthsndapi.hxx @@ -23,9 +23,9 @@ class SFX2_DLLPUBLIC SfxBluetoothModel:public SfxMailModel { public: - SendMailResult SaveAndSend( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, + SendMailResult SaveAndSend( const css::uno::Reference< css::frame::XFrame >& xFrame, const OUString& rType ); - SendMailResult Send( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame ); + SendMailResult Send( const css::uno::Reference< css::frame::XFrame >& xFrame ); }; #endif diff --git a/sfx2/inc/fwkhelper.hxx b/sfx2/inc/fwkhelper.hxx index b29dfdf71cb5..ab1b7ff77097 100644 --- a/sfx2/inc/fwkhelper.hxx +++ b/sfx2/inc/fwkhelper.hxx @@ -28,7 +28,7 @@ #include <rtl/ustring.hxx> SFX2_DLLPUBLIC void SAL_CALL RefreshToolbars( - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame + css::uno::Reference< css::frame::XFrame >& rFrame ); #endif diff --git a/sfx2/inc/guisaveas.hxx b/sfx2/inc/guisaveas.hxx index c409f150c232..729f067c86e1 100644 --- a/sfx2/inc/guisaveas.hxx +++ b/sfx2/inc/guisaveas.hxx @@ -46,45 +46,44 @@ class SfxStoringHelper friend class ModelData_Impl; private: - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xFilterCFG; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerQuery > m_xFilterQuery; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModuleManager2 > m_xModuleManager; + css::uno::Reference< css::container::XNameAccess > m_xFilterCFG; + css::uno::Reference< css::container::XContainerQuery > m_xFilterQuery; + css::uno::Reference< css::frame::XModuleManager2 > m_xModuleManager; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > GetFilterConfiguration(); - ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerQuery > GetFilterQuery(); - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModuleManager2 > GetModuleManager(); + css::uno::Reference< css::container::XNameAccess > GetFilterConfiguration(); + css::uno::Reference< css::container::XContainerQuery > GetFilterQuery(); + css::uno::Reference< css::frame::XModuleManager2 > GetModuleManager(); public: SfxStoringHelper(); bool GUIStoreModel( - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > xModel, + css::uno::Reference< css::frame::XModel > xModel, const OUString& aSlotName, - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgsSequence, + css::uno::Sequence< css::beans::PropertyValue >& aArgsSequence, bool bPreselectPassword, const OUString& aUserSelectedName, SignatureState nDocumentSignatureState = SignatureState::NOSIGNATURES ); static bool CheckFilterOptionsAppearence( - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& xFilterCFG, + const css::uno::Reference< css::container::XNameAccess >& xFilterCFG, const OUString& aFilterName ); static void SetDocInfoState( - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel, - const ::com::sun::star::uno::Reference< - ::com::sun::star::document::XDocumentProperties>& i_xOldDocInfo, + const css::uno::Reference< css::frame::XModel >& xModel, + const css::uno::Reference< css::document::XDocumentProperties>& i_xOldDocInfo, bool bNoModify ); static bool WarnUnacceptableFormat( - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel, + const css::uno::Reference< css::frame::XModel >& xModel, const OUString& aOldUIName, const OUString& aDefUIName, const OUString& aDefExtension, bool bCanProceedFurther, bool rDefaultIsAlien ); - static vcl::Window* GetModelWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel ); + static vcl::Window* GetModelWindow( const css::uno::Reference< css::frame::XModel >& xModel ); }; diff --git a/sfx2/inc/inettbc.hxx b/sfx2/inc/inettbc.hxx index 0802a97d358a..322f744f119a 100644 --- a/sfx2/inc/inettbc.hxx +++ b/sfx2/inc/inettbc.hxx @@ -39,9 +39,9 @@ private: struct ExecuteInfo { - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDispatch; - ::com::sun::star::util::URL aTargetURL; - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs; + css::uno::Reference< css::frame::XDispatch > xDispatch; + css::util::URL aTargetURL; + css::uno::Sequence< css::beans::PropertyValue > aArgs; }; DECL_STATIC_LINK_TYPED( SfxURLToolBoxControl_Impl, ExecuteHdl_Impl, void*, void ); diff --git a/sfx2/inc/sorgitm.hxx b/sfx2/inc/sorgitm.hxx index 52f1b42bc9f0..ad13cea6af8e 100644 --- a/sfx2/inc/sorgitm.hxx +++ b/sfx2/inc/sorgitm.hxx @@ -36,8 +36,8 @@ public: virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const override; virtual bool operator==( const SfxPoolItem& ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; OUString getLanguage() const { return aLanguage; }; }; diff --git a/sfx2/qa/cppunit/test_metadatable.cxx b/sfx2/qa/cppunit/test_metadatable.cxx index 2034642d64bc..46360d851aab 100644 --- a/sfx2/qa/cppunit/test_metadatable.cxx +++ b/sfx2/qa/cppunit/test_metadatable.cxx @@ -83,8 +83,7 @@ public: virtual bool IsInUndo() const override { return m_bInUndo; } virtual bool IsInContent() const override { return m_bInContent; } virtual ::sfx2::IXmlIdRegistry& GetRegistry() override { return m_rRegistry; } - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::rdf::XMetadatable > MakeUnoObject() override { return 0; } + virtual css::uno::Reference< css::rdf::XMetadatable > MakeUnoObject() override { return 0; } }; static bool operator==(beans::StringPair p1, beans::StringPair p2) diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index 055eaa369545..6126a193983e 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -521,27 +521,23 @@ bool SfxApplication::IsXScriptURL( const OUString& rScriptURL ) #if !HAVE_FEATURE_SCRIPTING (void) rScriptURL; #else - ::com::sun::star::uno::Reference - < ::com::sun::star::uno::XComponentContext > xContext = + css::uno::Reference< css::uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); - ::com::sun::star::uno::Reference - < ::com::sun::star::uri::XUriReferenceFactory > - xFactory = ::com::sun::star::uri::UriReferenceFactory::create( xContext ); + css::uno::Reference< css::uri::XUriReferenceFactory > + xFactory = css::uri::UriReferenceFactory::create( xContext ); try { - ::com::sun::star::uno::Reference - < ::com::sun::star::uri::XVndSunStarScriptUrl > - xUrl( xFactory->parse( rScriptURL ), - ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::uri::XVndSunStarScriptUrl > + xUrl( xFactory->parse( rScriptURL ), css::uno::UNO_QUERY ); if ( xUrl.is() ) { result = true; } } - catch (const ::com::sun::star::uno::RuntimeException&) + catch (const css::uno::RuntimeException&) { // ignore, will just return FALSE } diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx index bd2b6d81dfdd..de657b3493b9 100644 --- a/sfx2/source/appl/appcfg.cxx +++ b/sfx2/source/appl/appcfg.cxx @@ -364,7 +364,7 @@ bool SfxApplication::GetOptions( SfxItemSet& rSet ) bRet = true; if (!aSecurityOptions.IsReadOnly(SvtSecurityOptions::E_SECUREURLS)) { - ::com::sun::star::uno::Sequence< OUString > seqURLs = aSecurityOptions.GetSecureURLs(); + css::uno::Sequence< OUString > seqURLs = aSecurityOptions.GetSecureURLs(); std::vector<OUString> aList; sal_uInt32 nCount = seqURLs.getLength(); for( sal_uInt32 nURL=0; nURL<nCount; ++nURL ) @@ -750,7 +750,7 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet ) if ( SfxItemState::SET == rSet.GetItemState(SID_SECURE_URL, true, &pItem)) { DBG_ASSERT(dynamic_cast< const SfxStringListItem *>( pItem ) != nullptr, "StringListItem expected"); - ::com::sun::star::uno::Sequence< OUString > seqURLs; + css::uno::Sequence< OUString > seqURLs; static_cast<const SfxStringListItem*>(pItem)->GetStringList(seqURLs); aSecurityOptions.SetSecureURLs( seqURLs ); } diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx index c4571035f240..ae1e1abe2491 100644 --- a/sfx2/source/appl/appdde.cxx +++ b/sfx2/source/appl/appdde.cxx @@ -213,7 +213,7 @@ class SfxDdeDocTopic_Impl : public DdeTopic public: SfxObjectShell* pSh; DdeData aData; - ::com::sun::star::uno::Sequence< sal_Int8 > aSeq; + css::uno::Sequence< sal_Int8 > aSeq; explicit SfxDdeDocTopic_Impl( SfxObjectShell* pShell ) : DdeTopic( pShell->GetTitle(SFX_TITLE_FULLNAME) ), pSh( pShell ) @@ -370,7 +370,7 @@ long SfxObjectShell::DdeExecute( const OUString& rCmd ) // Expressed in our B */ bool SfxObjectShell::DdeGetData( const OUString&, // the Item to be addressed const OUString&, // in: Format - ::com::sun::star::uno::Any& )// out: requested data + css::uno::Any& )// out: requested data { return false; } @@ -386,7 +386,7 @@ bool SfxObjectShell::DdeGetData( const OUString&, // the Item to be */ bool SfxObjectShell::DdeSetData( const OUString&, // the Item to be addressed const OUString&, // in: Format - const ::com::sun::star::uno::Any& )// out: requested data + const css::uno::Any& )// out: requested data { return false; } @@ -530,7 +530,7 @@ DdeService* SfxApplication::GetDdeService() DdeData* SfxDdeDocTopic_Impl::Get(SotClipboardFormatId nFormat) { OUString sMimeType( SotExchange::GetFormatMimeType( nFormat )); - ::com::sun::star::uno::Any aValue; + css::uno::Any aValue; bool bRet = pSh->DdeGetData( GetCurItem(), sMimeType, aValue ); if( bRet && aValue.hasValue() && ( aValue >>= aSeq ) ) { @@ -543,12 +543,12 @@ DdeData* SfxDdeDocTopic_Impl::Get(SotClipboardFormatId nFormat) bool SfxDdeDocTopic_Impl::Put( const DdeData* pData ) { - aSeq = ::com::sun::star::uno::Sequence< sal_Int8 >( + aSeq = css::uno::Sequence< sal_Int8 >( (sal_Int8*)(const void*)*pData, (long)*pData ); bool bRet; if( aSeq.getLength() ) { - ::com::sun::star::uno::Any aValue; + css::uno::Any aValue; aValue <<= aSeq; OUString sMimeType( SotExchange::GetFormatMimeType( pData->GetFormat() )); bRet = pSh->DdeSetData( GetCurItem(), sMimeType, aValue ); diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx index 50ef158ba6dc..4a038b5e4982 100644 --- a/sfx2/source/appl/appinit.cxx +++ b/sfx2/source/appl/appinit.cxx @@ -88,7 +88,7 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw (RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw (RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (RuntimeException, std::exception) override; }; void SAL_CALL SfxTerminateListener_Impl::disposing( const EventObject& ) throw( RuntimeException, std::exception ) diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index ca7cc1f7ca8a..0bbe797de1a7 100644 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -227,7 +227,7 @@ sal_uInt32 CheckPasswd_Impl SfxItemSet *pSet = pFile->GetItemSet(); if( pSet ) { - Reference< ::com::sun::star::task::XInteractionHandler > xInteractionHandler = pFile->GetInteractionHandler(); + Reference< css::task::XInteractionHandler > xInteractionHandler = pFile->GetInteractionHandler(); if( xInteractionHandler.is() ) { // use the comphelper password helper to request a password @@ -388,13 +388,13 @@ sal_uIntPtr SfxApplication::LoadTemplate( SfxObjectShellLock& xDoc, const OUStri xDoc->SetModified(false); xDoc->ResetError(); - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > xModel ( xDoc->GetModel(), ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::frame::XModel > xModel ( xDoc->GetModel(), css::uno::UNO_QUERY ); if ( xModel.is() ) { SfxItemSet* pNew = xDoc->GetMedium()->GetItemSet()->Clone(); pNew->ClearItem( SID_PROGRESS_STATUSBAR_CONTROL ); pNew->ClearItem( SID_FILTER_NAME ); - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs; + css::uno::Sequence< css::beans::PropertyValue > aArgs; TransformItems( SID_OPENDOC, *pNew, aArgs ); sal_Int32 nLength = aArgs.getLength(); aArgs.realloc( nLength + 1 ); @@ -631,7 +631,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) if ( pStandardDirItem ) sStandardDir = pStandardDirItem->GetValue(); - ::com::sun::star::uno::Sequence< OUString > aBlackList; + css::uno::Sequence< OUString > aBlackList; const SfxStringListItem* pBlackListItem = rReq.GetArg<SfxStringListItem>(SID_BLACK_LIST); if ( pBlackListItem ) @@ -680,7 +680,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) pHandler->setHandler(xWrappedHandler); else pHandler->useDefaultUUIHandler(); - rReq.AppendItem( SfxUnoAnyItem(SID_INTERACTIONHANDLER,::com::sun::star::uno::makeAny(xHandler)) ); + rReq.AppendItem( SfxUnoAnyItem(SID_INTERACTIONHANDLER,css::uno::makeAny(xHandler)) ); // define rules for this handler css::uno::Type aInteraction = ::cppu::UnoType<css::task::ErrorCodeRequest>::get(); @@ -808,10 +808,9 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) // Mark without URL cannot be handled by hyperlink code if ( bHyperlinkUsed && !aFileName.isEmpty() && aFileName[0] != '#' ) { - Reference< ::com::sun::star::document::XTypeDetection > xTypeDetection( - ::comphelper::getProcessServiceFactory()->createInstance( - OUString("com.sun.star.document.TypeDetection")), - UNO_QUERY ); + Reference< css::document::XTypeDetection > xTypeDetection( ::comphelper::getProcessServiceFactory()->createInstance( + OUString("com.sun.star.document.TypeDetection")), + UNO_QUERY ); if ( xTypeDetection.is() ) { URL aURL; @@ -904,7 +903,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) sfx2::openUriExternally( aURL.Complete, pFilter == 0); } - catch ( ::com::sun::star::system::SystemShellExecuteException& ) + catch ( css::system::SystemShellExecuteException& ) { rReq.RemoveItem( SID_TARGETNAME ); rReq.AppendItem( SfxStringItem( SID_TARGETNAME, OUString("_default") ) ); @@ -976,12 +975,12 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) if (!pInteractionItem) { Reference < task::XInteractionHandler2 > xHdl = task::InteractionHandler::createWithParent( ::comphelper::getProcessComponentContext(), 0 ); - rReq.AppendItem( SfxUnoAnyItem(SID_INTERACTIONHANDLER,::com::sun::star::uno::makeAny(xHdl)) ); + rReq.AppendItem( SfxUnoAnyItem(SID_INTERACTIONHANDLER,css::uno::makeAny(xHdl)) ); } if (!pMacroExecItem) - rReq.AppendItem( SfxUInt16Item(SID_MACROEXECMODE,::com::sun::star::document::MacroExecMode::USE_CONFIG) ); + rReq.AppendItem( SfxUInt16Item(SID_MACROEXECMODE,css::document::MacroExecMode::USE_CONFIG) ); if (!pDocTemplateItem) - rReq.AppendItem( SfxUInt16Item(SID_UPDATEDOCMODE,::com::sun::star::document::UpdateDocMode::ACCORDING_TO_CONFIG) ); + rReq.AppendItem( SfxUInt16Item(SID_UPDATEDOCMODE,css::document::UpdateDocMode::ACCORDING_TO_CONFIG) ); } // extract target name @@ -1062,7 +1061,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) { throw; } - catch(const ::com::sun::star::uno::Exception&) + catch(const css::uno::Exception&) { } diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index c684399b2c89..356d9282db1d 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -141,9 +141,9 @@ namespace { try { - // if we get com::sun::star::sdbc::DriverManager, libsdbc2 is there + // if we get css::sdbc::DriverManager, libsdbc2 is there // and the bibliography is assumed to work - return com::sun::star::sdbc::DriverManager::create(comphelper::getProcessComponentContext()).is(); + return css::sdbc::DriverManager::create(comphelper::getProcessComponentContext()).is(); } catch (Exception & e) { @@ -233,7 +233,7 @@ static void showDocument( const char* pBaseName ) checkURL ( pBaseName, "", aURL ) ) { xDesktop->loadComponentFromURL( aURL, OUString("_blank"), 0, args ); } - } catch (const ::com::sun::star::uno::Exception &) { + } catch (const css::uno::Exception &) { } } @@ -442,9 +442,9 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) "&LOlocale=" + utl::ConfigManager::getLocale() + "&LOmodule=" + module.copy(module.lastIndexOf('.') + 1 ) ); try { - uno::Reference< com::sun::star::system::XSystemShellExecute > xSystemShellExecute( - com::sun::star::system::SystemShellExecute::create(::comphelper::getProcessComponentContext()) ); - xSystemShellExecute->execute( sURL, OUString(), com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY ); + uno::Reference< css::system::XSystemShellExecute > xSystemShellExecute( + css::system::SystemShellExecute::create(::comphelper::getProcessComponentContext()) ); + xSystemShellExecute->execute( sURL, OUString(), css::system::SystemShellExecuteFlags::URIS_ONLY ); } catch ( uno::Exception& ) { @@ -639,8 +639,8 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) Reference < XDesktop2 > xDesktop = Desktop::create ( ::comphelper::getProcessComponentContext() ); Reference< XFrame > xFrame = xDesktop->getActiveFrame(); - Reference< com::sun::star::beans::XPropertySet > xPropSet( xFrame, UNO_QUERY ); - Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager; + Reference< css::beans::XPropertySet > xPropSet( xFrame, UNO_QUERY ); + Reference< css::frame::XLayoutManager > xLayoutManager; if ( xPropSet.is() ) { try @@ -648,11 +648,11 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) Any aValue = xPropSet->getPropertyValue("LayoutManager"); aValue >>= xLayoutManager; } - catch ( const ::com::sun::star::uno::RuntimeException& ) + catch ( const css::uno::RuntimeException& ) { throw; } - catch ( ::com::sun::star::uno::Exception& ) + catch ( css::uno::Exception& ) { } } @@ -1022,7 +1022,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq ) css::system::SystemShellExecuteFlags::URIS_ONLY ); } } - catch( const ::com::sun::star::uno::Exception& ) + catch( const css::uno::Exception& ) { SAL_WARN( "sfx.appl", "SfxApplication::OfaExec_Impl(SID_MORE_DICTIONARIES): caught an exception!" ); } @@ -1305,7 +1305,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq ) xDialog = ui::dialogs::AddressBookSourcePilot::createWithParent(xORB, 0); xDialog->execute(); } - catch(const ::com::sun::star::uno::Exception&) + catch(const css::uno::Exception&) { DBG_UNHANDLED_EXCEPTION(); } diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx index 0055cead77c9..94a3e4c5bb7e 100644 --- a/sfx2/source/appl/appuno.cxx +++ b/sfx2/source/appl/appuno.cxx @@ -1538,7 +1538,7 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, uno::Sequence<b { pValue[nActProp].Name = sBlackList; - com::sun::star::uno::Sequence< OUString > aList; + css::uno::Sequence< OUString > aList; static_cast<const SfxStringListItem*>(pItem)->GetStringList( aList ); pValue[nActProp++].Value <<= aList ; } @@ -1772,9 +1772,9 @@ bool RequestPackageReparation::isApproved() return pImp->isApproved(); } -com::sun::star::uno::Reference < task::XInteractionRequest > RequestPackageReparation::GetRequest() +css::uno::Reference < task::XInteractionRequest > RequestPackageReparation::GetRequest() { - return com::sun::star::uno::Reference < task::XInteractionRequest >(pImp); + return css::uno::Reference < task::XInteractionRequest >(pImp); } @@ -1828,9 +1828,9 @@ NotifyBrokenPackage::~NotifyBrokenPackage() pImp->release(); } -com::sun::star::uno::Reference < task::XInteractionRequest > NotifyBrokenPackage::GetRequest() +css::uno::Reference < task::XInteractionRequest > NotifyBrokenPackage::GetRequest() { - return com::sun::star::uno::Reference < task::XInteractionRequest >(pImp); + return css::uno::Reference < task::XInteractionRequest >(pImp); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx index e678f4e8bebb..7c5d308b14c7 100644 --- a/sfx2/source/appl/childwin.cxx +++ b/sfx2/source/appl/childwin.cxx @@ -56,8 +56,8 @@ SfxChildWinFactory::~SfxChildWinFactory() struct SfxChildWindow_Impl { - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > xListener; + css::uno::Reference< css::frame::XFrame > xFrame; + css::uno::Reference< css::lang::XEventListener > xListener; SfxChildWinFactory* pFact; bool bHideNotDelete; bool bVisible; @@ -69,7 +69,7 @@ struct SfxChildWindow_Impl -class DisposeListener : public ::cppu::WeakImplHelper< ::com::sun::star::lang::XEventListener > +class DisposeListener : public ::cppu::WeakImplHelper< css::lang::XEventListener > { public: DisposeListener( SfxChildWindow* pOwner , @@ -78,22 +78,22 @@ class DisposeListener : public ::cppu::WeakImplHelper< ::com::sun::star::lang::X , m_pData ( pData ) {} - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aSource ) throw (::com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL disposing( const css::lang::EventObject& aSource ) throw (css::uno::RuntimeException, std::exception) override { - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > xSelfHold( this ); + css::uno::Reference< css::lang::XEventListener > xSelfHold( this ); - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > xComp( aSource.Source, ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::lang::XComponent > xComp( aSource.Source, css::uno::UNO_QUERY ); if( xComp.is() ) xComp->removeEventListener( this ); if( m_pOwner && m_pData ) { - m_pData->xListener = ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >(); + m_pData->xListener = css::uno::Reference< css::lang::XEventListener >(); if ( m_pData->pWorkWin ) { // m_pOwner and m_pData will be killed - m_pData->xFrame = ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >(); + m_pData->xFrame = css::uno::Reference< css::frame::XFrame >(); m_pData->pWorkWin->GetBindings().Execute( m_pOwner->GetType() ); } else @@ -180,13 +180,13 @@ void SfxChildWindow::Destroy() ClearWorkwin(); try { - ::com::sun::star::uno::Reference < ::com::sun::star::util::XCloseable > xClose( GetFrame(), ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference < css::util::XCloseable > xClose( GetFrame(), css::uno::UNO_QUERY ); if ( xClose.is() ) xClose->close( sal_True ); else GetFrame()->dispose(); } - catch (const com::sun::star::uno::Exception&) + catch (const css::uno::Exception&) { } } @@ -319,7 +319,7 @@ void SfxChildWindow::SaveStatus(const SfxChildWinInfo& rInfo) SvtViewOptions aWinOpt(E_WINDOW, sName); aWinOpt.SetWindowState(OStringToOUString(rInfo.aWinState, RTL_TEXTENCODING_UTF8)); - ::com::sun::star::uno::Sequence < ::com::sun::star::beans::NamedValue > aSeq(1); + css::uno::Sequence < css::beans::NamedValue > aSeq(1); aSeq[0].Name = "Data"; aSeq[0].Value <<= aWinData.makeStringAndClear(); aWinOpt.SetUserData( aSeq ); @@ -389,7 +389,7 @@ void SfxChildWindow::InitializeChildWinFactory_Impl(sal_uInt16 nId, SfxChildWinI if (xWinOpt->Exists() && xWinOpt->HasVisible() ) rInfo.bVisible = xWinOpt->IsVisible(); // set state from configuration. Can be overwritten by UserData, see below - ::com::sun::star::uno::Sequence < ::com::sun::star::beans::NamedValue > aSeq = xWinOpt->GetUserData(); + css::uno::Sequence < css::beans::NamedValue > aSeq = xWinOpt->GetUserData(); OUString aTmp; if ( aSeq.getLength() ) @@ -719,7 +719,7 @@ bool SfxChildWindow::QueryClose() if ( pImp->xFrame.is() ) { - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > xCtrl = pImp->xFrame->getController(); + css::uno::Reference< css::frame::XController > xCtrl = pImp->xFrame->getController(); if ( xCtrl.is() ) bAllow = xCtrl->suspend( sal_True ); } @@ -730,12 +730,12 @@ bool SfxChildWindow::QueryClose() return bAllow; } -::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SfxChildWindow::GetFrame() +css::uno::Reference< css::frame::XFrame > SfxChildWindow::GetFrame() { return pImp->xFrame; } -void SfxChildWindow::SetFrame( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > & rFrame ) +void SfxChildWindow::SetFrame( const css::uno::Reference< css::frame::XFrame > & rFrame ) { // Do nothing if nothing will be changed ... if( pImp->xFrame != rFrame ) @@ -748,7 +748,7 @@ void SfxChildWindow::SetFrame( const ::com::sun::star::uno::Reference< ::com::su // Use already existing or create new one. if( rFrame.is() ) if( !pImp->xListener.is() ) - pImp->xListener = ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >( new DisposeListener( this, pImp ) ); + pImp->xListener = css::uno::Reference< css::lang::XEventListener >( new DisposeListener( this, pImp ) ); // Set new frame in data container // and build new listener connection, if necessary. diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx index e3ff4da09153..1c41d4235dc4 100644 --- a/sfx2/source/appl/fileobj.cxx +++ b/sfx2/source/appl/fileobj.cxx @@ -75,7 +75,7 @@ SvFileObject::~SvFileObject() Application::RemoveUserEvent(nPostUserEventId); } -bool SvFileObject::GetData( ::com::sun::star::uno::Any & rData, +bool SvFileObject::GetData( css::uno::Any & rData, const OUString & rMimeType, bool bGetSynchron ) { @@ -345,7 +345,7 @@ OUString impl_getFilter( const OUString& _rURL ) try { - css::uno::Reference< ::com::sun::star::document::XTypeDetection > xTypeDetection( + css::uno::Reference< css::document::XTypeDetection > xTypeDetection( ::comphelper::getProcessServiceFactory()->createInstance( OUString("com.sun.star.document.TypeDetection") ), css::uno::UNO_QUERY ); diff --git a/sfx2/source/appl/fileobj.hxx b/sfx2/source/appl/fileobj.hxx index 6ba78b2d8071..cc32b9477200 100644 --- a/sfx2/source/appl/fileobj.hxx +++ b/sfx2/source/appl/fileobj.hxx @@ -64,7 +64,7 @@ protected: public: SvFileObject(); - virtual bool GetData( ::com::sun::star::uno::Any & rData /*out param*/, + virtual bool GetData( css::uno::Any & rData /*out param*/, const OUString & rMimeType, bool bSynchron = false ) override; diff --git a/sfx2/source/appl/fwkhelper.cxx b/sfx2/source/appl/fwkhelper.cxx index af88e5519e58..562ec966b8c6 100644 --- a/sfx2/source/appl/fwkhelper.cxx +++ b/sfx2/source/appl/fwkhelper.cxx @@ -30,7 +30,7 @@ #include "workwin.hxx" #include <sfx2/frame.hxx> -void SAL_CALL RefreshToolbars( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame ) +void SAL_CALL RefreshToolbars( css::uno::Reference< css::frame::XFrame >& xFrame ) { SolarMutexGuard aGuard; if ( xFrame.is() ) diff --git a/sfx2/source/appl/helpdispatch.cxx b/sfx2/source/appl/helpdispatch.cxx index 8ae6135e24a7..25ac27d7497d 100644 --- a/sfx2/source/appl/helpdispatch.cxx +++ b/sfx2/source/appl/helpdispatch.cxx @@ -32,8 +32,7 @@ using namespace ::com::sun::star::util; // class HelpInterceptor_Impl -------------------------------------------- HelpDispatch_Impl::HelpDispatch_Impl( HelpInterceptor_Impl& _rInterceptor, - const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XDispatch >& _xDisp ) : + const css::uno::Reference< css::frame::XDispatch >& _xDisp ) : m_rInterceptor ( _rInterceptor ), m_xRealDispatch ( _xDisp ) diff --git a/sfx2/source/appl/helpdispatch.hxx b/sfx2/source/appl/helpdispatch.hxx index 2830a021c62f..55b970e3e2e9 100644 --- a/sfx2/source/appl/helpdispatch.hxx +++ b/sfx2/source/appl/helpdispatch.hxx @@ -24,22 +24,22 @@ #include "helpinterceptor.hxx" -class HelpDispatch_Impl : public ::cppu::WeakImplHelper< ::com::sun::star::frame::XDispatch > +class HelpDispatch_Impl : public ::cppu::WeakImplHelper< css::frame::XDispatch > { private: HelpInterceptor_Impl& m_rInterceptor; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > + css::uno::Reference< css::frame::XDispatch > m_xRealDispatch; public: HelpDispatch_Impl( HelpInterceptor_Impl& _rInterceptor, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& _xDisp ); + const css::uno::Reference< css::frame::XDispatch >& _xDisp ); virtual ~HelpDispatch_Impl(); // XDispatch - virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xControl, const ::com::sun::star::util::URL& aURL ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xControl, const ::com::sun::star::util::URL& aURL ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispatch( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xControl, const css::util::URL& aURL ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xControl, const css::util::URL& aURL ) throw(css::uno::RuntimeException, std::exception) override; }; #endif // INCLUDED_SFX2_SOURCE_APPL_HELPDISPATCH_HXX diff --git a/sfx2/source/appl/helpinterceptor.cxx b/sfx2/source/appl/helpinterceptor.cxx index 4840f575319d..070a3a96e47d 100644 --- a/sfx2/source/appl/helpinterceptor.cxx +++ b/sfx2/source/appl/helpinterceptor.cxx @@ -91,11 +91,11 @@ void HelpInterceptor_Impl::addURL( const OUString& rURL ) // TODO ? if ( m_xListener.is() ) { - ::com::sun::star::frame::FeatureStateEvent aEvent; + css::frame::FeatureStateEvent aEvent; URL aURL; aURL.Complete = rURL; aEvent.FeatureURL = aURL; - aEvent.Source = static_cast<com::sun::star::frame::XDispatch*>(this); + aEvent.Source = static_cast<css::frame::XDispatch*>(this); m_xListener->statusChanged( aEvent ); } @@ -228,7 +228,7 @@ Sequence< OUString > SAL_CALL HelpInterceptor_Impl::getInterceptedURLs() // XDispatch void SAL_CALL HelpInterceptor_Impl::dispatch( - const URL& aURL, const Sequence< ::com::sun::star::beans::PropertyValue >& ) throw( RuntimeException, std::exception ) + const URL& aURL, const Sequence< css::beans::PropertyValue >& ) throw( RuntimeException, std::exception ) { bool bBack = aURL.Complete == ".uno:Backward"; if ( bBack || aURL.Complete == ".uno:Forward" ) @@ -286,13 +286,13 @@ void SAL_CALL HelpInterceptor_Impl::removeStatusListener( HelpListener_Impl::HelpListener_Impl( HelpInterceptor_Impl* pInter ) { pInterceptor = pInter; - pInterceptor->addStatusListener( this, ::com::sun::star::util::URL() ); + pInterceptor->addStatusListener( this, css::util::URL() ); } -void SAL_CALL HelpListener_Impl::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) +void SAL_CALL HelpListener_Impl::statusChanged( const css::frame::FeatureStateEvent& Event ) + throw( css::uno::RuntimeException, std::exception ) { INetURLObject aObj( Event.FeatureURL.Complete ); aFactory = aObj.GetHost(); @@ -301,10 +301,10 @@ void SAL_CALL HelpListener_Impl::statusChanged( const ::com::sun::star::frame::F -void SAL_CALL HelpListener_Impl::disposing( const ::com::sun::star::lang::EventObject& ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) +void SAL_CALL HelpListener_Impl::disposing( const css::lang::EventObject& ) + throw( css::uno::RuntimeException, std::exception ) { - pInterceptor->removeStatusListener( this, ::com::sun::star::util::URL() ); + pInterceptor->removeStatusListener( this, css::util::URL() ); pInterceptor = NULL; } @@ -317,7 +317,7 @@ HelpStatusListener_Impl::HelpStatusListener_Impl( HelpStatusListener_Impl::~HelpStatusListener_Impl() { if(xDispatch.is()) - xDispatch->removeStatusListener(this, com::sun::star::util::URL()); + xDispatch->removeStatusListener(this, css::util::URL()); } void HelpStatusListener_Impl::statusChanged( @@ -328,7 +328,7 @@ void HelpStatusListener_Impl::statusChanged( void HelpStatusListener_Impl::disposing( const EventObject& ) throw( RuntimeException, std::exception ) { - xDispatch->removeStatusListener(this, com::sun::star::util::URL()); + xDispatch->removeStatusListener(this, css::util::URL()); xDispatch = 0; } diff --git a/sfx2/source/appl/helpinterceptor.hxx b/sfx2/source/appl/helpinterceptor.hxx index aabb95cdb89d..442b5fb4d3ca 100644 --- a/sfx2/source/appl/helpinterceptor.hxx +++ b/sfx2/source/appl/helpinterceptor.hxx @@ -33,9 +33,9 @@ struct HelpHistoryEntry_Impl { OUString aURL; - com::sun::star::uno::Any aViewData; + css::uno::Any aViewData; - HelpHistoryEntry_Impl( const OUString& rURL, const com::sun::star::uno::Any& rViewData ) : + HelpHistoryEntry_Impl( const OUString& rURL, const css::uno::Any& rViewData ) : aURL( rURL ), aViewData(rViewData) {} }; @@ -43,10 +43,9 @@ typedef ::std::vector< HelpHistoryEntry_Impl* > HelpHistoryList_Impl; class SfxHelpWindow_Impl; class HelpInterceptor_Impl : public ::cppu::WeakImplHelper< - - ::com::sun::star::frame::XDispatchProviderInterceptor, - ::com::sun::star::frame::XInterceptorInfo, - ::com::sun::star::frame::XDispatch > + css::frame::XDispatchProviderInterceptor, + css::frame::XInterceptorInfo, + css::frame::XDispatch > { private: @@ -54,19 +53,19 @@ friend class HelpDispatch_Impl; friend class SfxHelpWindow_Impl; // the component which's dispatches we're intercepting - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterception > m_xIntercepted; + css::uno::Reference< css::frame::XDispatchProviderInterception > m_xIntercepted; // chaining - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > m_xSlaveDispatcher; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > m_xMasterDispatcher; + css::uno::Reference< css::frame::XDispatchProvider > m_xSlaveDispatcher; + css::uno::Reference< css::frame::XDispatchProvider > m_xMasterDispatcher; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > m_xListener; + css::uno::Reference< css::frame::XStatusListener > m_xListener; HelpHistoryList_Impl* m_pHistory; VclPtr<SfxHelpWindow_Impl> m_pWindow; sal_uIntPtr m_nCurPos; OUString m_aCurrentURL; - com::sun::star::uno::Any m_aViewData; + css::uno::Any m_aViewData; void addURL( const OUString& rURL ); @@ -74,38 +73,38 @@ public: HelpInterceptor_Impl(); virtual ~HelpInterceptor_Impl(); - void setInterception( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame ); + void setInterception( css::uno::Reference< css::frame::XFrame > xFrame ); OUString GetCurrentURL() const { return m_aCurrentURL; } - const com::sun::star::uno::Any& GetViewData()const {return m_aViewData;} + const css::uno::Any& GetViewData()const {return m_aViewData;} bool HasHistoryPred() const; // is there a predecessor for the current in the history bool HasHistorySucc() const; // is there a successor for the current in the history // XDispatchProvider - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL - queryDispatch( const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - 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 >& aDescripts ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL + queryDispatch( const css::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL + queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& aDescripts ) throw(css::uno::RuntimeException, std::exception) override; // XDispatchProviderInterceptor - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL - getSlaveDispatchProvider( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSlaveDispatchProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xNewSlave ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL - getMasterDispatchProvider( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMasterDispatchProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xNewMaster ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::frame::XDispatchProvider > SAL_CALL + getSlaveDispatchProvider( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setSlaveDispatchProvider( const css::uno::Reference< css::frame::XDispatchProvider >& xNewSlave ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::frame::XDispatchProvider > SAL_CALL + getMasterDispatchProvider( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setMasterDispatchProvider( const css::uno::Reference< css::frame::XDispatchProvider >& xNewMaster ) throw(css::uno::RuntimeException, std::exception) override; // XInterceptorInfo - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL - getInterceptedURLs( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL + getInterceptedURLs( ) throw(css::uno::RuntimeException, std::exception) override; // XDispatch - virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xControl, const ::com::sun::star::util::URL& aURL ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xControl, const ::com::sun::star::util::URL& aURL ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispatch( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xControl, const css::util::URL& aURL ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xControl, const css::util::URL& aURL ) throw(css::uno::RuntimeException, std::exception) override; // extras void InitWaiter( SfxHelpWindow_Impl* pWindow ) @@ -115,7 +114,7 @@ public: // HelpListener_Impl ----------------------------------------------------- -class HelpListener_Impl : public ::cppu::WeakImplHelper< ::com::sun::star::frame::XStatusListener > +class HelpListener_Impl : public ::cppu::WeakImplHelper< css::frame::XStatusListener > { private: HelpInterceptor_Impl* pInterceptor; @@ -125,34 +124,33 @@ private: public: explicit HelpListener_Impl( HelpInterceptor_Impl* pInter ); - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& obj ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) + throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& obj ) + throw( css::uno::RuntimeException, std::exception ) override; void SetChangeHdl( const Link<HelpListener_Impl&,void>& rLink ) { aChangeLink = rLink; } OUString GetFactory() const { return aFactory; } }; // HelpStatusListener_Impl ----------------------------------------------------- -class HelpStatusListener_Impl : public -::cppu::WeakImplHelper< ::com::sun::star::frame::XStatusListener > +class HelpStatusListener_Impl : public cppu::WeakImplHelper< css::frame::XStatusListener > { private: - ::com::sun::star::uno::Reference < ::com::sun::star::frame::XDispatch > xDispatch; - ::com::sun::star::frame::FeatureStateEvent aStateEvent; + css::uno::Reference < css::frame::XDispatch > xDispatch; + css::frame::FeatureStateEvent aStateEvent; public: HelpStatusListener_Impl( - ::com::sun::star::uno::Reference < ::com::sun::star::frame::XDispatch > xDispatch, - com::sun::star::util::URL& rURL); + css::uno::Reference < css::frame::XDispatch > xDispatch, + css::util::URL& rURL); virtual ~HelpStatusListener_Impl(); - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& obj ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - const ::com::sun::star::frame::FeatureStateEvent& + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) + throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& obj ) + throw( css::uno::RuntimeException, std::exception ) override; + const css::frame::FeatureStateEvent& GetStateEvent() const {return aStateEvent;} }; diff --git a/sfx2/source/appl/imagemgr.cxx b/sfx2/source/appl/imagemgr.cxx index 08a945328d45..ca42f41b29df 100644 --- a/sfx2/source/appl/imagemgr.cxx +++ b/sfx2/source/appl/imagemgr.cxx @@ -56,7 +56,7 @@ typedef std::unordered_map< OUString, Image SAL_CALL GetImage( - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, + const css::uno::Reference< css::frame::XFrame >& rFrame, const OUString& aURL, bool bBig ) @@ -115,21 +115,20 @@ Image SAL_CALL GetImage( } } - sal_Int16 nImageType( ::com::sun::star::ui::ImageType::COLOR_NORMAL| - ::com::sun::star::ui::ImageType::SIZE_DEFAULT ); + sal_Int16 nImageType( css::ui::ImageType::COLOR_NORMAL| css::ui::ImageType::SIZE_DEFAULT ); if ( bBig ) - nImageType |= ::com::sun::star::ui::ImageType::SIZE_LARGE; + nImageType |= css::ui::ImageType::SIZE_LARGE; if ( xDocImgMgr.is() ) { - Sequence< Reference< ::com::sun::star::graphic::XGraphic > > aGraphicSeq; + Sequence< Reference< css::graphic::XGraphic > > aGraphicSeq; Sequence< OUString > aImageCmdSeq( 1 ); aImageCmdSeq[0] = aCommandURL; try { aGraphicSeq = xDocImgMgr->getImages( nImageType, aImageCmdSeq ); - Reference< ::com::sun::star::graphic::XGraphic > xGraphic = aGraphicSeq[0]; + Reference< css::graphic::XGraphic > xGraphic = aGraphicSeq[0]; Image aImage( xGraphic ); if ( !!aImage ) @@ -181,13 +180,13 @@ Image SAL_CALL GetImage( m_aModuleIdToImageMgrMap.insert( ModuleIdToImagegMgr::value_type( aModuleId, xModuleImageManager )); } - Sequence< Reference< ::com::sun::star::graphic::XGraphic > > aGraphicSeq; + Sequence< Reference< css::graphic::XGraphic > > aGraphicSeq; Sequence< OUString > aImageCmdSeq( 1 ); aImageCmdSeq[0] = aCommandURL; aGraphicSeq = xModuleImageManager->getImages( nImageType, aImageCmdSeq ); - Reference< ::com::sun::star::graphic::XGraphic > xGraphic = aGraphicSeq[0]; + Reference< css::graphic::XGraphic > xGraphic = aGraphicSeq[0]; Image aImage( xGraphic ); if ( !!aImage ) diff --git a/sfx2/source/appl/imestatuswindow.cxx b/sfx2/source/appl/imestatuswindow.cxx index c774029c83f1..8b49136c90c7 100644 --- a/sfx2/source/appl/imestatuswindow.cxx +++ b/sfx2/source/appl/imestatuswindow.cxx @@ -44,13 +44,13 @@ #include <cppuhelper/implbase.hxx> //TO-Do, merge into framework/inc/helpers/mischelpers.hxx and deliver -class WeakPropertyChangeListener : public ::cppu::WeakImplHelper<com::sun::star::beans::XPropertyChangeListener> +class WeakPropertyChangeListener : public ::cppu::WeakImplHelper<css::beans::XPropertyChangeListener> { private: - com::sun::star::uno::WeakReference<com::sun::star::beans::XPropertyChangeListener> mxOwner; + css::uno::WeakReference<css::beans::XPropertyChangeListener> mxOwner; public: - explicit WeakPropertyChangeListener(com::sun::star::uno::Reference<com::sun::star::beans::XPropertyChangeListener> xOwner) + explicit WeakPropertyChangeListener(css::uno::Reference<css::beans::XPropertyChangeListener> xOwner) : mxOwner(xOwner) { } @@ -59,22 +59,22 @@ class WeakPropertyChangeListener : public ::cppu::WeakImplHelper<com::sun::star: { } - virtual void SAL_CALL propertyChange(const com::sun::star::beans::PropertyChangeEvent &rEvent ) - throw(com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent &rEvent ) + throw(css::uno::RuntimeException, std::exception) override { - com::sun::star::uno::Reference<com::sun::star::beans::XPropertyChangeListener> xOwner(mxOwner.get(), - com::sun::star::uno::UNO_QUERY); + css::uno::Reference<css::beans::XPropertyChangeListener> xOwner(mxOwner.get(), + css::uno::UNO_QUERY); if (xOwner.is()) xOwner->propertyChange(rEvent); } // lang.XEventListener - virtual void SAL_CALL disposing(const com::sun::star::lang::EventObject& rEvent) - throw(com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL disposing(const css::lang::EventObject& rEvent) + throw(css::uno::RuntimeException, std::exception) override { - com::sun::star::uno::Reference<com::sun::star::beans::XPropertyChangeListener> xOwner(mxOwner.get(), - com::sun::star::uno::UNO_QUERY); + css::uno::Reference<css::beans::XPropertyChangeListener> xOwner(mxOwner.get(), + css::uno::UNO_QUERY); if (xOwner.is()) xOwner->disposing(rEvent); diff --git a/sfx2/source/appl/imestatuswindow.hxx b/sfx2/source/appl/imestatuswindow.hxx index 0d9e8099c983..eb2b374e44d9 100644 --- a/sfx2/source/appl/imestatuswindow.hxx +++ b/sfx2/source/appl/imestatuswindow.hxx @@ -35,8 +35,7 @@ namespace sfx2 { namespace appl { // The MS compiler needs this typedef work-around to accept the using // declarations within ImeStatusWindow: -typedef cppu::WeakImplHelper< com::sun::star::beans::XPropertyChangeListener > -ImeStatusWindow_Impl; +typedef cppu::WeakImplHelper< css::beans::XPropertyChangeListener > ImeStatusWindow_Impl; /** Control the behavior of any (platform-dependent) IME status windows. @@ -48,7 +47,7 @@ ImeStatusWindow_Impl; class ImeStatusWindow: private ImeStatusWindow_Impl { public: - explicit ImeStatusWindow( com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const& rxContext ); + explicit ImeStatusWindow( css::uno::Reference< css::uno::XComponentContext > const& rxContext ); /** Set up VCL according to the configuration. @@ -94,23 +93,23 @@ private: virtual ~ImeStatusWindow(); virtual void SAL_CALL - disposing(com::sun::star::lang::EventObject const & rSource) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + disposing(css::lang::EventObject const & rSource) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL - propertyChange(com::sun::star::beans::PropertyChangeEvent const & rEvent) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + propertyChange(css::beans::PropertyChangeEvent const & rEvent) + throw (css::uno::RuntimeException, std::exception) override; - com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > + css::uno::Reference< css::beans::XPropertySet > getConfig(); - com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > + css::uno::Reference< css::uno::XComponentContext > m_xContext; osl::Mutex m_aMutex; - com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > + css::uno::Reference< css::beans::XPropertySet > m_xConfig; - com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener > + css::uno::Reference< css::beans::XPropertyChangeListener > m_xConfigListener; bool m_bDisposed; }; diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx index 494b730855c7..cafabcd29e19 100644 --- a/sfx2/source/appl/impldde.cxx +++ b/sfx2/source/appl/impldde.cxx @@ -134,7 +134,7 @@ SvDDEObject::~SvDDEObject() delete pConnection; } -bool SvDDEObject::GetData( ::com::sun::star::uno::Any & rData /*out param*/, +bool SvDDEObject::GetData( css::uno::Any & rData /*out param*/, const OUString & rMimeType, bool bSynchron ) { diff --git a/sfx2/source/appl/impldde.hxx b/sfx2/source/appl/impldde.hxx index e1c1881b4fad..7e67adb8b0a5 100644 --- a/sfx2/source/appl/impldde.hxx +++ b/sfx2/source/appl/impldde.hxx @@ -38,7 +38,7 @@ class SvDDEObject : public SvLinkSource DdeConnection* pConnection; DdeLink* pLink; DdeRequest* pRequest; - ::com::sun::star::uno::Any * pGetData; + css::uno::Any * pGetData; sal_uInt8 bWaitForData : 1; // waiting for data? sal_uInt8 nError : 7; // Error code for dialogue @@ -54,7 +54,7 @@ protected: public: SvDDEObject(); - virtual bool GetData( ::com::sun::star::uno::Any & rData /*out param*/, + virtual bool GetData( css::uno::Any & rData /*out param*/, const OUString & aMimeType, bool bSynchron = false ) override; diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx index 12a04bd02d6f..dfabbf430485 100644 --- a/sfx2/source/appl/linkmgr2.cxx +++ b/sfx2/source/appl/linkmgr2.cxx @@ -445,7 +445,7 @@ void LinkManager::LinkServerShell(const OUString& rPath, SfxObjectShell& rServer ::sfx2::SvLinkSource* pSrvSrc = rServer.DdeCreateLinkSource(rPath); if (pSrvSrc) { - ::com::sun::star::datatransfer::DataFlavor aFl; + css::datatransfer::DataFlavor aFl; SotExchange::GetFormatDataFlavor(rLink.GetContentType(), aFl); rLink.SetObj(pSrvSrc); pSrvSrc->AddDataAdvise( @@ -512,11 +512,11 @@ SotClipboardFormatId LinkManager::RegisterStatusInfoId() bool LinkManager::GetGraphicFromAny( const OUString& rMimeType, - const ::com::sun::star::uno::Any & rValue, + const css::uno::Any & rValue, Graphic& rGrf ) { bool bRet = false; - ::com::sun::star::uno::Sequence< sal_Int8 > aSeq; + css::uno::Sequence< sal_Int8 > aSeq; if( rValue.hasValue() && ( rValue >>= aSeq ) ) { SvMemoryStream aMemStm( const_cast<sal_Int8 *>(aSeq.getConstArray()), aSeq.getLength(), @@ -569,7 +569,7 @@ OUString lcl_DDE_RelToAbs( const OUString& rTopic, const OUString& rBaseURL ) bool SvxInternalLink::Connect( sfx2::SvBaseLink* pLink ) { SfxObjectShell* pFndShell = 0; - sal_uInt16 nUpdateMode = com::sun::star::document::UpdateDocMode::NO_UPDATE; + sal_uInt16 nUpdateMode = css::document::UpdateDocMode::NO_UPDATE; OUString sTopic, sItem, sReferer; LinkManager* pLinkMgr = pLink->GetLinkManager(); if (pLinkMgr && sfx2::LinkManager::GetDisplayNames(pLink, 0, &sTopic, &sItem) && !sTopic.isEmpty()) @@ -634,7 +634,7 @@ bool SvxInternalLink::Connect( sfx2::SvBaseLink* pLink ) sfx2::SvLinkSource* pNewSrc = pFndShell->DdeCreateLinkSource( sItem ); if( pNewSrc ) { - ::com::sun::star::datatransfer::DataFlavor aFl; + css::datatransfer::DataFlavor aFl; SotExchange::GetFormatDataFlavor( pLink->GetContentType(), aFl ); pLink->SetObj( pNewSrc ); diff --git a/sfx2/source/appl/linksrc.cxx b/sfx2/source/appl/linksrc.cxx index 7b1359f5246f..4bcabbe78b17 100644 --- a/sfx2/source/appl/linksrc.cxx +++ b/sfx2/source/appl/linksrc.cxx @@ -222,7 +222,7 @@ SvLinkSource::StreamToLoadFrom SvLinkSource::getStreamToLoadFrom() pImpl->m_bIsReadOnly); } -void SvLinkSource::setStreamToLoadFrom(const com::sun::star::uno::Reference<com::sun::star::io::XInputStream>& xInputStream, bool bIsReadOnly ) +void SvLinkSource::setStreamToLoadFrom(const css::uno::Reference<css::io::XInputStream>& xInputStream, bool bIsReadOnly ) { pImpl->m_xInputStreamToLoadFrom = xInputStream; pImpl->m_bIsReadOnly = bIsReadOnly; @@ -327,7 +327,7 @@ void SvLinkSource::NotifyDataChanged() // notify the sink, the mime type is not // a selection criterion void SvLinkSource::DataChanged( const OUString & rMimeType, - const ::com::sun::star::uno::Any & rVal ) + const css::uno::Any & rVal ) { if( pImpl->nTimeout && !rVal.hasValue() ) { // only when no data was included @@ -430,7 +430,7 @@ bool SvLinkSource::Connect( SvBaseLink* ) return true; } -bool SvLinkSource::GetData( ::com::sun::star::uno::Any &, const OUString &, bool ) +bool SvLinkSource::GetData( css::uno::Any &, const OUString &, bool ) { return false; } diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx index a613da9d0aaa..0282b7b6ac3a 100644 --- a/sfx2/source/appl/lnkbase2.cxx +++ b/sfx2/source/appl/lnkbase2.cxx @@ -459,7 +459,7 @@ void SvBaseLink::Disconnect() } } -SvBaseLink::UpdateResult SvBaseLink::DataChanged( const OUString &, const ::com::sun::star::uno::Any & ) +SvBaseLink::UpdateResult SvBaseLink::DataChanged( const OUString &, const css::uno::Any & ) { switch( nObjType ) { diff --git a/sfx2/source/appl/macroloader.cxx b/sfx2/source/appl/macroloader.cxx index c18accc6f11d..05130baef28a 100644 --- a/sfx2/source/appl/macroloader.cxx +++ b/sfx2/source/appl/macroloader.cxx @@ -188,7 +188,7 @@ void SAL_CALL SfxMacroLoader::removeStatusListener( { } -ErrCode SfxMacroLoader::loadMacro( const OUString& rURL, com::sun::star::uno::Any& rRetval, SfxObjectShell* pSh ) +ErrCode SfxMacroLoader::loadMacro( const OUString& rURL, css::uno::Any& rRetval, SfxObjectShell* pSh ) throw ( ucb::ContentCreationException, uno::RuntimeException, std::exception ) { #if !HAVE_FEATURE_SCRIPTING diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx index b551fb4cbb90..b0fbd49f777e 100644 --- a/sfx2/source/appl/module.cxx +++ b/sfx2/source/appl/module.cxx @@ -385,7 +385,7 @@ SfxModule* SfxModule::GetActiveModule( SfxViewFrame* pFrame ) return pSh ? pSh->GetModule() : 0; } -FieldUnit SfxModule::GetModuleFieldUnit( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > const & i_frame ) +FieldUnit SfxModule::GetModuleFieldUnit( css::uno::Reference< css::frame::XFrame > const & i_frame ) { ENSURE_OR_RETURN( i_frame.is(), "SfxModule::GetModuleFieldUnit: invalid frame!", FUNIT_100TH_MM ); diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index aac1f46724fc..e515a0a67615 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -628,24 +628,24 @@ void IndexTabPage_Impl::InitializeIndex() aURL.append(sFactory); AppendConfigToken(aURL, true); - Content aCnt( aURL.makeStringAndClear(), Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > xInfo = aCnt.getProperties(); + Content aCnt( aURL.makeStringAndClear(), Reference< css::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); + css::uno::Reference< css::beans::XPropertySetInfo > xInfo = aCnt.getProperties(); if ( xInfo->hasPropertyByName( PROPERTY_ANCHORREF ) ) { - ::com::sun::star::uno::Sequence< OUString > aPropSeq( 4 ); + css::uno::Sequence< OUString > aPropSeq( 4 ); aPropSeq[0] = PROPERTY_KEYWORDLIST; aPropSeq[1] = PROPERTY_KEYWORDREF; aPropSeq[2] = PROPERTY_ANCHORREF; aPropSeq[3] = PROPERTY_TITLEREF; // abi: use one possibly remote call only - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > aAnySeq = + css::uno::Sequence< css::uno::Any > aAnySeq = aCnt.getPropertyValues( aPropSeq ); - ::com::sun::star::uno::Sequence< OUString > aKeywordList; - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > > aKeywordRefList; - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > > aAnchorRefList; - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > > aTitleRefList; + css::uno::Sequence< OUString > aKeywordList; + css::uno::Sequence< css::uno::Sequence< OUString > > aKeywordRefList; + css::uno::Sequence< css::uno::Sequence< OUString > > aAnchorRefList; + css::uno::Sequence< css::uno::Sequence< OUString > > aTitleRefList; if ( ( aAnySeq[0] >>= aKeywordList ) && ( aAnySeq[1] >>= aKeywordRefList ) && ( aAnySeq[2] >>= aAnchorRefList ) && ( aAnySeq[3] >>= aTitleRefList ) ) @@ -661,9 +661,9 @@ void IndexTabPage_Impl::InitializeIndex() // abi: Do not copy, but use references const OUString& aKeywordPair = aKeywordList[i]; DBG_ASSERT( !aKeywordPair.isEmpty(), "invalid help index" ); - const ::com::sun::star::uno::Sequence< OUString >& aRefList = aKeywordRefList[i]; - const ::com::sun::star::uno::Sequence< OUString >& aAnchorList = aAnchorRefList[i]; - const ::com::sun::star::uno::Sequence< OUString >& aTitleList = aTitleRefList[i]; + const css::uno::Sequence< OUString >& aRefList = aKeywordRefList[i]; + const css::uno::Sequence< OUString >& aAnchorList = aAnchorRefList[i]; + const css::uno::Sequence< OUString >& aTitleList = aTitleRefList[i]; DBG_ASSERT( aRefList.getLength() == aAnchorList.getLength(),"reference list and title list of different length" ); @@ -2516,7 +2516,7 @@ void SfxHelpTextWindow_Impl::GetFocus() { if( xFrame.is() ) { - Reference< ::com::sun::star::awt::XWindow > xWindow = xFrame->getComponentWindow(); + Reference< css::awt::XWindow > xWindow = xFrame->getComponentWindow(); if( xWindow.is() ) xWindow->setFocus(); } @@ -2637,11 +2637,11 @@ void SfxHelpTextWindow_Impl::CloseFrame() bIsInClose = true; try { - ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseable > xCloseable ( xFrame, ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::util::XCloseable > xCloseable ( xFrame, css::uno::UNO_QUERY ); if (xCloseable.is()) xCloseable->close(sal_True); } - catch( ::com::sun::star::util::CloseVetoException& ) + catch( css::util::CloseVetoException& ) { } } @@ -2738,10 +2738,10 @@ void SfxHelpWindow_Impl::MakeLayout() Some VCL-patches could not solve this problem so I've established the workaround: resize the help window if it's visible .-) */ - ::com::sun::star::awt::Rectangle aRect = xWindow->getPosSize(); + css::awt::Rectangle aRect = xWindow->getPosSize(); sal_Int32 nOldWidth = bIndex ? nCollapseWidth : nExpandWidth; sal_Int32 nWidth = bIndex ? nExpandWidth : nCollapseWidth; - xWindow->setPosSize( aRect.X, aRect.Y, nWidth, nHeight, ::com::sun::star::awt::PosSize::SIZE ); + xWindow->setPosSize( aRect.X, aRect.Y, nWidth, nHeight, css::awt::PosSize::SIZE ); if ( aRect.Width > 0 && aRect.Height > 0 ) { @@ -2778,7 +2778,7 @@ void SfxHelpWindow_Impl::InitSizes() { if ( xWindow.is() ) { - ::com::sun::star::awt::Rectangle aRect = xWindow->getPosSize(); + css::awt::Rectangle aRect = xWindow->getPosSize(); nHeight = aRect.Height; if ( bIndex ) @@ -2841,7 +2841,7 @@ void SfxHelpWindow_Impl::SaveConfig() if ( xWindow.is() ) { - ::com::sun::star::awt::Rectangle aRect = xWindow->getPosSize(); + css::awt::Rectangle aRect = xWindow->getPosSize(); nW = aRect.Width; nH = aRect.Height; } @@ -3010,7 +3010,7 @@ void SfxHelpWindow_Impl::openDone(const OUString& sURL , SfxHelpWindow_Impl::SfxHelpWindow_Impl( - const ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame2 >& rFrame, + const css::uno::Reference < css::frame::XFrame2 >& rFrame, vcl::Window* pParent, WinBits ) : SplitWindow( pParent, WB_3DLOOK | WB_NOSPLITDRAW ), @@ -3089,7 +3089,7 @@ bool SfxHelpWindow_Impl::PreNotify( NotifyEvent& rNEvt ) return bHandled || Window::PreNotify( rNEvt ); } -void SfxHelpWindow_Impl::setContainerWindow( Reference < ::com::sun::star::awt::XWindow > xWin ) +void SfxHelpWindow_Impl::setContainerWindow( Reference < css::awt::XWindow > xWin ) { xWindow = xWin; MakeLayout(); @@ -3181,11 +3181,11 @@ void SfxHelpWindow_Impl::DoAction( sal_uInt16 nActionId ) { try { - Content aCnt( aURL, Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > xInfo = aCnt.getProperties(); + Content aCnt( aURL, Reference< css::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); + css::uno::Reference< css::beans::XPropertySetInfo > xInfo = aCnt.getProperties(); if ( xInfo->hasPropertyByName( PROPERTY_TITLE ) ) { - ::com::sun::star::uno::Any aAny = aCnt.getPropertyValue( PROPERTY_TITLE ); + css::uno::Any aAny = aCnt.getPropertyValue( PROPERTY_TITLE ); OUString aValue; if ( aAny >>= aValue ) { diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx index 660470631c04..a6dcb73e5c18 100644 --- a/sfx2/source/appl/newhelp.hxx +++ b/sfx2/source/appl/newhelp.hxx @@ -206,10 +206,10 @@ private: VclPtr<SearchResultsBox_Impl> m_pResultsLB; VclPtr<PushButton> m_pOpenBtn; - OUString aFactory; + OUString aFactory; - ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator > - xBreakIterator; + css::uno::Reference< css::i18n::XBreakIterator > + xBreakIterator; void ClearSearchResults(); void RememberSearchText( const OUString& rSearchText ); @@ -430,11 +430,11 @@ private: VclPtr<SfxHelpWindow_Impl> pHelpWin; VclPtr<vcl::Window> pTextWin; VclPtr<sfx2::SearchDialog> pSrchDlg; - ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame2 > + css::uno::Reference < css::frame::XFrame2 > xFrame; - ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator > + css::uno::Reference< css::i18n::XBreakIterator > xBreakIterator; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > + css::uno::Reference< css::uno::XInterface > xConfiguration; long nMinPos; bool bIsDebug; @@ -447,9 +447,9 @@ private: void InitOnStartupBox( bool bOnlyText ); void SetOnStartupBoxPosition(); - ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator > + css::uno::Reference< css::i18n::XBreakIterator > GetBreakIterator(); - ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > + css::uno::Reference< css::text::XTextRange > getCursor() const; bool isHandledKey( const vcl::KeyCode& _rKeyCode ); @@ -470,7 +470,7 @@ public: virtual void GetFocus() override; virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; - inline ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame2 > + inline css::uno::Reference < css::frame::XFrame2 > getFrame() const { return xFrame; } inline void SetSelectHdl( const Link<ToolBox *, void>& rLink ) { aToolBox->SetSelectHdl( rLink ); } @@ -491,11 +491,11 @@ class SfxHelpWindow_Impl : public SplitWindow private: friend class SfxHelpIndexWindow_Impl; - ::com::sun::star::uno::Reference < ::com::sun::star::awt::XWindow > + css::uno::Reference < css::awt::XWindow > xWindow; - ::com::sun::star::uno::Reference < ::com::sun::star::frame::XDispatchResultListener > + css::uno::Reference < css::frame::XDispatchResultListener > xOpenListener; - ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame2 > + css::uno::Reference < css::frame::XFrame2 > xFrame; VclPtr<SfxHelpIndexWindow_Impl> pIndexWin; @@ -508,8 +508,8 @@ friend class SfxHelpIndexWindow_Impl; sal_Int32 nHeight; long nIndexSize; long nTextSize; - bool bIndex; - bool bGrabFocusToToolBox; + bool bIndex; + bool bGrabFocusToToolBox; Point aWinPos; OUString sTitle; @@ -529,16 +529,15 @@ friend class SfxHelpIndexWindow_Impl; DECL_LINK_TYPED( ChangeHdl, HelpListener_Impl&, void ); public: - SfxHelpWindow_Impl( const ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame2 >& rFrame, + SfxHelpWindow_Impl( const css::uno::Reference < css::frame::XFrame2 >& rFrame, vcl::Window* pParent, WinBits nBits ); virtual ~SfxHelpWindow_Impl(); virtual void dispose() override; virtual bool PreNotify( NotifyEvent& rNEvt ) override; - void setContainerWindow( - ::com::sun::star::uno::Reference < ::com::sun::star::awt::XWindow > xWin ); - inline ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame2 > + void setContainerWindow( css::uno::Reference < css::awt::XWindow > xWin ); + inline css::uno::Reference < css::frame::XFrame2 > getTextFrame() const { return pTextWin->getFrame(); } void SetFactory( const OUString& rFactory ); diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index b80f5a5c467f..1032d950dc0e 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -173,7 +173,7 @@ bool GetHelpAnchor_Impl( const OUString& _rURL, OUString& _rAnchor ) try { ::ucbhelper::Content aCnt( INetURLObject( _rURL ).GetMainURL( INetURLObject::NO_DECODE ), - Reference< ::com::sun::star::ucb::XCommandEnvironment >(), + Reference< css::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); if ( ( aCnt.getPropertyValue("AnchorName") >>= sAnchor ) ) { @@ -189,7 +189,7 @@ bool GetHelpAnchor_Impl( const OUString& _rURL, OUString& _rAnchor ) SAL_WARN( "sfx.appl", "Property 'AnchorName' is missing" ); } } - catch (const ::com::sun::star::uno::Exception&) + catch (const css::uno::Exception&) { } @@ -277,7 +277,7 @@ OUString getCurrentModuleIdentifier_Impl() { sIdentifier = xModuleManager->identify( xCurrentFrame ); } - catch (const ::com::sun::star::frame::UnknownModuleException&) + catch (const css::frame::UnknownModuleException&) { SAL_INFO( "sfx2.appl", "SfxHelp::getCurrentModuleIdentifier_Impl(): unknown module (help in help?)" ); } @@ -401,10 +401,10 @@ SfxHelpWindow_Impl* impl_createHelp(Reference< XFrame2 >& rHelpTask , return 0; // create all internal windows and sub frames ... - Reference< ::com::sun::star::awt::XWindow > xParentWindow = xHelpTask->getContainerWindow(); - vcl::Window* pParentWindow = VCLUnoHelper::GetWindow( xParentWindow ); - VclPtrInstance<SfxHelpWindow_Impl> pHelpWindow( xHelpTask, pParentWindow, WB_DOCKBORDER ); - Reference< ::com::sun::star::awt::XWindow > xHelpWindow = VCLUnoHelper::GetInterface( pHelpWindow ); + Reference< css::awt::XWindow > xParentWindow = xHelpTask->getContainerWindow(); + vcl::Window* pParentWindow = VCLUnoHelper::GetWindow( xParentWindow ); + VclPtrInstance<SfxHelpWindow_Impl> pHelpWindow( xHelpTask, pParentWindow, WB_DOCKBORDER ); + Reference< css::awt::XWindow > xHelpWindow = VCLUnoHelper::GetInterface( pHelpWindow ); Reference< XFrame > xHelpContent; if (xHelpTask->setComponent( xHelpWindow, Reference< XController >() )) @@ -637,7 +637,7 @@ bool SfxHelp::Start_Impl(const OUString& rURL, const vcl::Window* pWindow, const if (!rKeyword.isEmpty()) pHelpWindow->OpenKeyword( rKeyword ); - Reference < ::com::sun::star::awt::XTopWindow > xTopWindow( xHelp->getContainerWindow(), UNO_QUERY ); + Reference < css::awt::XTopWindow > xTopWindow( xHelp->getContainerWindow(), UNO_QUERY ); if ( xTopWindow.is() ) xTopWindow->toFront(); diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx index b8969a1b5bbf..412ae047ab49 100644 --- a/sfx2/source/appl/sfxpicklist.cxx +++ b/sfx2/source/appl/sfxpicklist.cxx @@ -72,7 +72,7 @@ class StringLength : public ::cppu::WeakImplHelper< XStringWidth > // XStringWidth sal_Int32 SAL_CALL queryStringWidth( const OUString& aString ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override + throw (css::uno::RuntimeException, std::exception) override { return aString.getLength(); } diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx index c20ba2b5adbc..5fe8763bd350 100644 --- a/sfx2/source/appl/shutdownicon.cxx +++ b/sfx2/source/appl/shutdownicon.cxx @@ -212,7 +212,7 @@ void ShutdownIcon::deInitSystray() } -ShutdownIcon::ShutdownIcon( const ::com::sun::star::uno::Reference< XComponentContext > & rxContext ) : +ShutdownIcon::ShutdownIcon( const css::uno::Reference< XComponentContext > & rxContext ) : ShutdownIconServiceBase( m_aMutex ), m_bVeto ( false ), m_bListenForTermination ( false ), @@ -236,27 +236,27 @@ void ShutdownIcon::OpenURL( const OUString& aURL, const OUString& rTarget, const { if ( getInstance() && getInstance()->m_xDesktop.is() ) { - ::com::sun::star::uno::Reference < XDispatchProvider > xDispatchProvider( getInstance()->m_xDesktop, UNO_QUERY ); + css::uno::Reference < XDispatchProvider > xDispatchProvider( getInstance()->m_xDesktop, UNO_QUERY ); if ( xDispatchProvider.is() ) { - com::sun::star::util::URL aDispatchURL; + css::util::URL aDispatchURL; aDispatchURL.Complete = aURL; - ::com::sun::star::uno::Reference< util::XURLTransformer > xURLTransformer( util::URLTransformer::create( ::comphelper::getProcessComponentContext() ) ); + css::uno::Reference< util::XURLTransformer > xURLTransformer( util::URLTransformer::create( ::comphelper::getProcessComponentContext() ) ); try { - ::com::sun::star::uno::Reference< com::sun::star::frame::XDispatch > xDispatch; + css::uno::Reference< css::frame::XDispatch > xDispatch; xURLTransformer->parseStrict( aDispatchURL ); xDispatch = xDispatchProvider->queryDispatch( aDispatchURL, rTarget, 0 ); if ( xDispatch.is() ) xDispatch->dispatch( aDispatchURL, aArgs ); } - catch ( com::sun::star::uno::RuntimeException& ) + catch ( css::uno::RuntimeException& ) { throw; } - catch ( com::sun::star::uno::Exception& ) + catch ( css::uno::Exception& ) { } } @@ -281,18 +281,18 @@ void ShutdownIcon::FromTemplate() { if ( getInstance() && getInstance()->m_xDesktop.is() ) { - ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFramesSupplier > xDesktop ( getInstance()->m_xDesktop, UNO_QUERY); - ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame > xFrame( xDesktop->getActiveFrame() ); + css::uno::Reference < css::frame::XFramesSupplier > xDesktop ( getInstance()->m_xDesktop, UNO_QUERY); + css::uno::Reference < css::frame::XFrame > xFrame( xDesktop->getActiveFrame() ); if ( !xFrame.is() ) - xFrame = ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame >( xDesktop, UNO_QUERY ); + xFrame = css::uno::Reference < css::frame::XFrame >( xDesktop, UNO_QUERY ); URL aTargetURL; aTargetURL.Complete = ".uno:NewDoc"; - ::com::sun::star::uno::Reference< util::XURLTransformer > xTrans( util::URLTransformer::create( ::comphelper::getProcessComponentContext() ) ); + css::uno::Reference< util::XURLTransformer > xTrans( util::URLTransformer::create( ::comphelper::getProcessComponentContext() ) ); xTrans->parseStrict( aTargetURL ); - ::com::sun::star::uno::Reference < ::com::sun::star::frame::XDispatchProvider > xProv( xFrame, UNO_QUERY ); - ::com::sun::star::uno::Reference < ::com::sun::star::frame::XDispatch > xDisp; + css::uno::Reference < css::frame::XDispatchProvider > xProv( xFrame, UNO_QUERY ); + css::uno::Reference < css::frame::XDispatch > xDisp; if ( xProv.is() ) { xDisp = xProv->queryDispatch( aTargetURL, OUString("_self"), 0 ); @@ -303,7 +303,7 @@ void ShutdownIcon::FromTemplate() PropertyValue* pArg = aArgs.getArray(); pArg[0].Name = "Referer"; pArg[0].Value <<= OUString("private:user"); - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XNotifyingDispatch > xNotifyer( xDisp, UNO_QUERY ); + css::uno::Reference< css::frame::XNotifyingDispatch > xNotifyer( xDisp, UNO_QUERY ); if ( xNotifyer.is() ) { EnterModalMode(); @@ -372,7 +372,7 @@ IMPL_LINK_TYPED( ShutdownIcon, DialogClosedHdl_Impl, FileDialogHelper*, /*unused // use constructor for filling up filters automatically! if ( ERRCODE_NONE == m_pFileDlg->GetError() ) { - ::com::sun::star::uno::Reference< XFilePicker2 > xPicker = m_pFileDlg->GetFilePicker(); + css::uno::Reference< XFilePicker2 > xPicker = m_pFileDlg->GetFilePicker(); try { @@ -380,8 +380,8 @@ IMPL_LINK_TYPED( ShutdownIcon, DialogClosedHdl_Impl, FileDialogHelper*, /*unused if ( xPicker.is() ) { - ::com::sun::star::uno::Reference < XFilePickerControlAccess > xPickerControls ( xPicker, UNO_QUERY ); - ::com::sun::star::uno::Reference < XFilterManager > xFilterManager ( xPicker, UNO_QUERY ); + css::uno::Reference < XFilePickerControlAccess > xPickerControls ( xPicker, UNO_QUERY ); + css::uno::Reference < XFilterManager > xFilterManager ( xPicker, UNO_QUERY ); Sequence< OUString > sFiles = xPicker->getSelectedFiles(); int nFiles = sFiles.getLength(); @@ -389,17 +389,17 @@ IMPL_LINK_TYPED( ShutdownIcon, DialogClosedHdl_Impl, FileDialogHelper*, /*unused int nArgs=3; Sequence< PropertyValue > aArgs(3); - ::com::sun::star::uno::Reference < com::sun::star::task::XInteractionHandler2 > xInteraction( + css::uno::Reference < css::task::XInteractionHandler2 > xInteraction( task::InteractionHandler::createWithParent(::comphelper::getProcessComponentContext(), 0) ); aArgs[0].Name = "InteractionHandler"; aArgs[0].Value <<= xInteraction; - sal_Int16 nMacroExecMode = ::com::sun::star::document::MacroExecMode::USE_CONFIG; + sal_Int16 nMacroExecMode = css::document::MacroExecMode::USE_CONFIG; aArgs[1].Name = "MacroExecutionMode"; aArgs[1].Value <<= nMacroExecMode; - sal_Int16 nUpdateDoc = ::com::sun::star::document::UpdateDocMode::ACCORDING_TO_CONFIG; + sal_Int16 nUpdateDoc = css::document::UpdateDocMode::ACCORDING_TO_CONFIG; aArgs[2].Name = "UpdateDocMode"; aArgs[2].Value <<= nUpdateDoc; @@ -517,7 +517,7 @@ void ShutdownIcon::addTerminateListener() if (pInst->m_bListenForTermination) return; - ::com::sun::star::uno::Reference< XDesktop2 > xDesktop = pInst->m_xDesktop; + css::uno::Reference< XDesktop2 > xDesktop = pInst->m_xDesktop; if ( ! xDesktop.is()) return; @@ -533,7 +533,7 @@ void ShutdownIcon::terminateDesktop() if ( ! pInst) return; - ::com::sun::star::uno::Reference< XDesktop2 > xDesktop = pInst->m_xDesktop; + css::uno::Reference< XDesktop2 > xDesktop = pInst->m_xDesktop; if ( ! xDesktop.is()) return; @@ -542,7 +542,7 @@ void ShutdownIcon::terminateDesktop() xDesktop->removeTerminateListener( pInst ); // terminate desktop only if no tasks exist - ::com::sun::star::uno::Reference< XIndexAccess > xTasks ( xDesktop->getFrames(), UNO_QUERY ); + css::uno::Reference< XIndexAccess > xTasks ( xDesktop->getFrames(), UNO_QUERY ); if( xTasks.is() && xTasks->getCount() < 1 ) Application::Quit(); @@ -577,7 +577,7 @@ ShutdownIcon* ShutdownIcon::createInstance() return pShutdownIcon; } -void ShutdownIcon::init() throw( ::com::sun::star::uno::Exception, std::exception ) +void ShutdownIcon::init() throw( css::uno::Exception, std::exception ) { // access resource system and sfx only protected by solarmutex ::SolarMutexGuard aSolarGuard; @@ -586,7 +586,7 @@ void ShutdownIcon::init() throw( ::com::sun::star::uno::Exception, std::exceptio ::osl::ResettableMutexGuard aGuard( m_aMutex ); m_pResMgr = pResMgr; aGuard.clear(); - ::com::sun::star::uno::Reference < XDesktop2 > xDesktop = Desktop::create( m_xContext ); + css::uno::Reference < XDesktop2 > xDesktop = Desktop::create( m_xContext ); aGuard.reset(); m_xDesktop = xDesktop; } @@ -604,37 +604,37 @@ void SAL_CALL ShutdownIcon::disposing() // XEventListener -void SAL_CALL ShutdownIcon::disposing( const ::com::sun::star::lang::EventObject& ) - throw(::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL ShutdownIcon::disposing( const css::lang::EventObject& ) + throw(css::uno::RuntimeException, std::exception) { } // XTerminateListener -void SAL_CALL ShutdownIcon::queryTermination( const ::com::sun::star::lang::EventObject& ) -throw(::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL ShutdownIcon::queryTermination( const css::lang::EventObject& ) +throw(css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception) { SAL_INFO("sfx.appl", "ShutdownIcon::queryTermination: veto is " << m_bVeto); ::osl::ClearableMutexGuard aGuard( m_aMutex ); if ( m_bVeto ) - throw ::com::sun::star::frame::TerminationVetoException(); + throw css::frame::TerminationVetoException(); } -void SAL_CALL ShutdownIcon::notifyTermination( const ::com::sun::star::lang::EventObject& ) -throw(::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL ShutdownIcon::notifyTermination( const css::lang::EventObject& ) +throw(css::uno::RuntimeException, std::exception) { } -void SAL_CALL ShutdownIcon::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any>& aArguments ) - throw( ::com::sun::star::uno::Exception, std::exception ) +void SAL_CALL ShutdownIcon::initialize( const css::uno::Sequence< css::uno::Any>& aArguments ) + throw( css::uno::Exception, std::exception ) { ::osl::ResettableMutexGuard aGuard( m_aMutex ); @@ -665,7 +665,7 @@ void SAL_CALL ShutdownIcon::initialize( const ::com::sun::star::uno::Sequence< : ShutdownIcon::pShutdownIcon = this; initSystray(); } - catch(const ::com::sun::star::lang::IllegalArgumentException&) + catch(const css::lang::IllegalArgumentException&) { } } @@ -852,12 +852,12 @@ static const ::sal_Int32 PROPHANDLE_TERMINATEVETOSTATE = 0; // XFastPropertySet void SAL_CALL ShutdownIcon::setFastPropertyValue( ::sal_Int32 nHandle, - const ::com::sun::star::uno::Any& aValue ) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) + const css::uno::Any& aValue ) + throw (css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) { switch(nHandle) { @@ -875,17 +875,17 @@ void SAL_CALL ShutdownIcon::setFastPropertyValue( ::sal_Int32 break; default : - throw ::com::sun::star::beans::UnknownPropertyException(); + throw css::beans::UnknownPropertyException(); } } // XFastPropertySet -::com::sun::star::uno::Any SAL_CALL ShutdownIcon::getFastPropertyValue( ::sal_Int32 nHandle ) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Any SAL_CALL ShutdownIcon::getFastPropertyValue( ::sal_Int32 nHandle ) + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) { - ::com::sun::star::uno::Any aValue; + css::uno::Any aValue; switch(nHandle) { case PROPHANDLE_TERMINATEVETOSTATE : @@ -896,7 +896,7 @@ void SAL_CALL ShutdownIcon::setFastPropertyValue( ::sal_Int32 break; default : - throw ::com::sun::star::beans::UnknownPropertyException(); + throw css::beans::UnknownPropertyException(); } return aValue; diff --git a/sfx2/source/appl/shutdownicon.hxx b/sfx2/source/appl/shutdownicon.hxx index c2b27b3a0a79..7a8f46281d3b 100644 --- a/sfx2/source/appl/shutdownicon.hxx +++ b/sfx2/source/appl/shutdownicon.hxx @@ -41,10 +41,10 @@ namespace sfx2 } typedef ::cppu::WeakComponentImplHelper< - ::com::sun::star::lang::XInitialization, - ::com::sun::star::frame::XTerminateListener, - ::com::sun::star::lang::XServiceInfo, - ::com::sun::star::beans::XFastPropertySet > ShutdownIconServiceBase; + css::lang::XInitialization, + css::frame::XTerminateListener, + css::lang::XServiceInfo, + css::beans::XFastPropertySet > ShutdownIconServiceBase; #if defined(USE_APP_SHORTCUTS) #define WRITER_URL "private:factory/swriter" @@ -65,7 +65,7 @@ class SFX2_DLLPUBLIC ShutdownIcon : public ShutdownIconServiceBase bool m_bSystemDialogs; ResMgr* m_pResMgr; sfx2::FileDialogHelper* m_pFileDlg; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; + css::uno::Reference< css::uno::XComponentContext > m_xContext; static ShutdownIcon *pShutdownIcon; // one instance @@ -80,7 +80,7 @@ class SFX2_DLLPUBLIC ShutdownIcon : public ShutdownIconServiceBase friend class SfxNotificationListener_Impl; public: - explicit ShutdownIcon( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & rxContext ); + explicit ShutdownIcon( const css::uno::Reference< css::uno::XComponentContext > & rxContext ); virtual ~ShutdownIcon(); @@ -100,15 +100,15 @@ class SFX2_DLLPUBLIC ShutdownIcon : public ShutdownIconServiceBase static void addTerminateListener(); static void FileOpen(); - static void OpenURL( const OUString& aURL, const OUString& rTarget, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& = - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >( 0 ) ); + static void OpenURL( const OUString& aURL, const OUString& rTarget, const css::uno::Sequence< css::beans::PropertyValue >& = + css::uno::Sequence< css::beans::PropertyValue >( 0 ) ); static void FromTemplate(); static void SetAutostart( bool bActivate ); static bool GetAutostart(); static bool bModalMode; - void init() throw( ::com::sun::star::uno::Exception, std::exception ); + void init() throw( css::uno::Exception, std::exception ); OUString GetResString( int id ); static OUString GetUrlDescription( const OUString& aUrl ); @@ -124,33 +124,33 @@ class SFX2_DLLPUBLIC ShutdownIcon : public ShutdownIconServiceBase virtual void SAL_CALL disposing() override; // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) + throw(css::uno::RuntimeException, std::exception) override; // XTerminateListener - virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& aEvent ) - throw(::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& aEvent ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL queryTermination( const css::lang::EventObject& aEvent ) + throw(css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL notifyTermination( const css::lang::EventObject& aEvent ) + throw(css::uno::RuntimeException, std::exception) override; // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) - throw( ::com::sun::star::uno::Exception, std::exception ) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) + throw( css::uno::Exception, std::exception ) override; // XFastPropertySet virtual void SAL_CALL setFastPropertyValue( ::sal_Int32 nHandle, - const ::com::sun::star::uno::Any& aValue ) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getFastPropertyValue( ::sal_Int32 nHandle ) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDesktop2 > m_xDesktop; + const css::uno::Any& aValue ) + throw (css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getFastPropertyValue( ::sal_Int32 nHandle ) + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + + css::uno::Reference< css::frame::XDesktop2 > m_xDesktop; #ifdef WNT static void EnableAutostartW32( const OUString &aShortcutName ); diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx index d77c181936af..d157fa909080 100644 --- a/sfx2/source/appl/workwin.cxx +++ b/sfx2/source/appl/workwin.cxx @@ -215,14 +215,14 @@ void LayoutManagerListener::setFrame( const css::uno::Reference< css::frame::XFr void SAL_CALL LayoutManagerListener::addEventListener( const css::uno::Reference< css::lang::XEventListener >& ) -throw (::com::sun::star::uno::RuntimeException, std::exception) +throw (css::uno::RuntimeException, std::exception) { // do nothing, only internal class } void SAL_CALL LayoutManagerListener::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& ) -throw (::com::sun::star::uno::RuntimeException, std::exception) +throw (css::uno::RuntimeException, std::exception) { // do nothing, only internal class } @@ -553,7 +553,7 @@ SfxWorkWindow::SfxWorkWindow( vcl::Window *pWin, SfxBindings& rB, SfxWorkWindow* aChildren.insert( aChildren.begin(), SFX_OBJECTBAR_MAX, nullptr ); // create and initialize layout manager listener - Reference< com::sun::star::frame::XFrame > xFrame = GetFrameInterface(); + Reference< css::frame::XFrame > xFrame = GetFrameInterface(); LayoutManagerListener* pLayoutManagerListener = new LayoutManagerListener( this ); m_xLayoutManagerListener = css::uno::Reference< css::lang::XComponent >( static_cast< cppu::OWeakObject* >( pLayoutManagerListener ), @@ -648,9 +648,9 @@ void SfxWorkWindow::DeleteControllers_Impl() // 8-bit displays (WM_QUERYPALETTECHANGED message due to focus change)!! } - Reference< com::sun::star::frame::XFrame > xFrame = GetFrameInterface(); - Reference< com::sun::star::beans::XPropertySet > xPropSet( xFrame, UNO_QUERY ); - Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager; + Reference< css::frame::XFrame > xFrame = GetFrameInterface(); + Reference< css::beans::XPropertySet > xPropSet( xFrame, UNO_QUERY ); + Reference< css::frame::XLayoutManager > xLayoutManager; if ( xPropSet.is() ) { try @@ -1179,11 +1179,11 @@ void SfxFrameWorkWin_Impl::UpdateObjectBars_Impl() ShowChildren_Impl(); } -Reference< ::com::sun::star::task::XStatusIndicator > SfxWorkWindow::GetStatusIndicator() +Reference< css::task::XStatusIndicator > SfxWorkWindow::GetStatusIndicator() { - Reference< com::sun::star::beans::XPropertySet > xPropSet( GetFrameInterface(), UNO_QUERY ); - Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager; - Reference< com::sun::star::task::XStatusIndicator > xStatusIndicator; + Reference< css::beans::XPropertySet > xPropSet( GetFrameInterface(), UNO_QUERY ); + Reference< css::frame::XLayoutManager > xLayoutManager; + Reference< css::task::XStatusIndicator > xStatusIndicator; if ( xPropSet.is() ) { @@ -1194,11 +1194,11 @@ Reference< ::com::sun::star::task::XStatusIndicator > SfxWorkWindow::GetStatusIn xLayoutManager->createElement( m_aProgressBarResName ); xLayoutManager->showElement( m_aProgressBarResName ); - Reference< ::com::sun::star::ui::XUIElement > xProgressBar = + Reference< css::ui::XUIElement > xProgressBar = xLayoutManager->getElement( m_aProgressBarResName ); if ( xProgressBar.is() ) { - xStatusIndicator = Reference< ::com::sun::star::task::XStatusIndicator >( + xStatusIndicator = Reference< css::task::XStatusIndicator >( xProgressBar->getRealInterface(), UNO_QUERY ); } } @@ -1223,9 +1223,9 @@ bool SfxWorkWindow::IsPluginMode( SfxObjectShell* pObjShell ) -::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SfxWorkWindow::GetFrameInterface() +css::uno::Reference< css::frame::XFrame > SfxWorkWindow::GetFrameInterface() { - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame; + css::uno::Reference< css::frame::XFrame > xFrame; SfxDispatcher* pDispatcher( GetBindings().GetDispatcher() ); if ( pDispatcher ) @@ -1255,8 +1255,8 @@ void SfxWorkWindow::UpdateObjectBars_Impl() // you realize what is needed often (saves Code and execution time) SfxGetpApp(); - Reference< com::sun::star::beans::XPropertySet > xPropSet( GetFrameInterface(), UNO_QUERY ); - Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager; + Reference< css::beans::XPropertySet > xPropSet( GetFrameInterface(), UNO_QUERY ); + Reference< css::frame::XLayoutManager > xLayoutManager; if ( xPropSet.is() ) { @@ -1551,8 +1551,8 @@ void SfxWorkWindow::SetStatusBar_Impl( sal_uInt32 nResId, SfxShell*, SfxBindings void SfxWorkWindow::UpdateStatusBar_Impl() { - Reference< ::com::sun::star::beans::XPropertySet > xPropSet( GetFrameInterface(), UNO_QUERY ); - Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager; + Reference< css::beans::XPropertySet > xPropSet( GetFrameInterface(), UNO_QUERY ); + Reference< css::frame::XLayoutManager > xLayoutManager; Any aValue = xPropSet->getPropertyValue( m_aLayoutManagerPropName ); aValue >>= xLayoutManager; diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx index 12b8197f4c3a..7ed2c6e2f2cd 100644 --- a/sfx2/source/bastyp/fltfnc.cxx +++ b/sfx2/source/bastyp/fltfnc.cxx @@ -636,16 +636,16 @@ sal_uInt32 SfxFilterMatcher::DetectFilter( SfxMedium& rMedium, const SfxFilter** return nErr; } -const SfxFilter* SfxFilterMatcher::GetFilterForProps( const com::sun::star::uno::Sequence < beans::NamedValue >& aSeq, SfxFilterFlags nMust, SfxFilterFlags nDont ) const +const SfxFilter* SfxFilterMatcher::GetFilterForProps( const css::uno::Sequence < beans::NamedValue >& aSeq, SfxFilterFlags nMust, SfxFilterFlags nDont ) const { uno::Reference< lang::XMultiServiceFactory > xServiceManager = ::comphelper::getProcessServiceFactory(); uno::Reference< container::XContainerQuery > xTypeCFG; if( xServiceManager.is() ) - xTypeCFG = uno::Reference < com::sun::star::container::XContainerQuery >( xServiceManager->createInstance( "com.sun.star.document.TypeDetection" ), uno::UNO_QUERY ); + xTypeCFG = uno::Reference < css::container::XContainerQuery >( xServiceManager->createInstance( "com.sun.star.document.TypeDetection" ), uno::UNO_QUERY ); if ( xTypeCFG.is() ) { // make query for all types matching the properties - uno::Reference < com::sun::star::container::XEnumeration > xEnum = xTypeCFG->createSubSetEnumerationByProperties( aSeq ); + uno::Reference < css::container::XEnumeration > xEnum = xTypeCFG->createSubSetEnumerationByProperties( aSeq ); while ( xEnum->hasMoreElements() ) { ::comphelper::SequenceAsHashMap aProps( xEnum->nextElement() ); @@ -699,7 +699,7 @@ const SfxFilter* SfxFilterMatcher::GetFilter4Mime( const OUString& rMediaType, S return 0; } - com::sun::star::uno::Sequence < com::sun::star::beans::NamedValue > aSeq(1); + css::uno::Sequence < css::beans::NamedValue > aSeq(1); aSeq[0].Name = "MediaType"; aSeq[0].Value <<= rMediaType; return GetFilterForProps( aSeq, nMust, nDont ); @@ -728,7 +728,7 @@ const SfxFilter* SfxFilterMatcher::GetFilter4EA( const OUString& rType, SfxFilte return 0; } - com::sun::star::uno::Sequence < com::sun::star::beans::NamedValue > aSeq(1); + css::uno::Sequence < css::beans::NamedValue > aSeq(1); aSeq[0].Name = "Name"; aSeq[0].Value <<= OUString( rType ); return GetFilterForProps( aSeq, nMust, nDont ); @@ -767,7 +767,7 @@ const SfxFilter* SfxFilterMatcher::GetFilter4Extension( const OUString& rExt, Sf if ( sExt.startsWith(".") ) sExt = sExt.copy(1); - com::sun::star::uno::Sequence < com::sun::star::beans::NamedValue > aSeq(1); + css::uno::Sequence < css::beans::NamedValue > aSeq(1); aSeq[0].Name = "Extensions"; uno::Sequence < OUString > aExts(1); aExts[0] = sExt; @@ -780,7 +780,7 @@ const SfxFilter* SfxFilterMatcher::GetFilter4ClipBoardId( SotClipboardFormatId n if (nId == SotClipboardFormatId::NONE) return 0; - com::sun::star::uno::Sequence < com::sun::star::beans::NamedValue > aSeq(1); + css::uno::Sequence < css::beans::NamedValue > aSeq(1); OUString aName = SotExchange::GetFormatName( nId ); aSeq[0].Name = "ClipboardFormat"; aSeq[0].Value <<= aName; diff --git a/sfx2/source/bastyp/fltlst.cxx b/sfx2/source/bastyp/fltlst.cxx index 8a1d5f515333..6a3da70264cd 100644 --- a/sfx2/source/bastyp/fltlst.cxx +++ b/sfx2/source/bastyp/fltlst.cxx @@ -38,7 +38,7 @@ using namespace ::com::sun::star; -class SfxRefreshListener : public ::cppu::WeakImplHelper<com::sun::star::util::XRefreshListener> +class SfxRefreshListener : public ::cppu::WeakImplHelper<css::util::XRefreshListener> { private: SfxFilterListener *m_pOwner; @@ -54,15 +54,15 @@ class SfxRefreshListener : public ::cppu::WeakImplHelper<com::sun::star::util::X } // util.XRefreshListener - virtual void SAL_CALL refreshed( const ::com::sun::star::lang::EventObject& rEvent ) - throw(com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL refreshed( const css::lang::EventObject& rEvent ) + throw(css::uno::RuntimeException, std::exception) override { m_pOwner->refreshed(rEvent); } // lang.XEventListener - virtual void SAL_CALL disposing(const com::sun::star::lang::EventObject& rEvent) - throw(com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL disposing(const css::lang::EventObject& rEvent) + throw(css::uno::RuntimeException, std::exception) override { m_pOwner->disposing(rEvent); } diff --git a/sfx2/source/bastyp/fltlst.hxx b/sfx2/source/bastyp/fltlst.hxx index 446b671d2bac..8bb2affd6eae 100644 --- a/sfx2/source/bastyp/fltlst.hxx +++ b/sfx2/source/bastyp/fltlst.hxx @@ -32,8 +32,8 @@ class SfxFilterListener { private: - ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshable > m_xFilterCache; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener > m_xFilterCacheListener; + css::uno::Reference< css::util::XRefreshable > m_xFilterCache; + css::uno::Reference< css::util::XRefreshListener > m_xFilterCacheListener; public: SfxFilterListener(); @@ -41,9 +41,9 @@ class SfxFilterListener public: // XRefreshListener - void SAL_CALL refreshed( const ::com::sun::star::lang::EventObject& aSource ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + void SAL_CALL refreshed( const css::lang::EventObject& aSource ) throw( css::uno::RuntimeException, std::exception ); // XEventListener - void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aSource ) throw( ::com::sun::star::uno::RuntimeException ); + void SAL_CALL disposing( const css::lang::EventObject& aSource ) throw( css::uno::RuntimeException ); }; diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx index 04388e7c406f..9df4ad094384 100644 --- a/sfx2/source/config/evntconf.cxx +++ b/sfx2/source/config/evntconf.cxx @@ -245,11 +245,11 @@ void PropagateEvent_Impl( SfxObjectShell *pDoc, const OUString& aEventName, cons { xEvents->replaceByName( aEventName, aEventData ); } - catch( const ::com::sun::star::lang::IllegalArgumentException& ) + catch( const css::lang::IllegalArgumentException& ) { SAL_WARN( "sfx.config", "PropagateEvents_Impl: caught IllegalArgumentException" ); } - catch( const ::com::sun::star::container::NoSuchElementException& ) + catch( const css::container::NoSuchElementException& ) { SAL_WARN( "sfx.config", "PropagateEvents_Impl: caught NoSuchElementException" ); } @@ -270,7 +270,7 @@ void SfxEventConfiguration::ConfigureEvent( const OUString& aName, const SvxMacr } -SvxMacro* SfxEventConfiguration::ConvertToMacro( const com::sun::star::uno::Any& rElement, SfxObjectShell* pDoc, bool bBlowUp ) +SvxMacro* SfxEventConfiguration::ConvertToMacro( const css::uno::Any& rElement, SfxObjectShell* pDoc, bool bBlowUp ) { return SfxEvents_Impl::ConvertToMacro( rElement, pDoc, bBlowUp ); } diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx index 58eeb662a4b1..fd539fe899e2 100644 --- a/sfx2/source/control/bindings.cxx +++ b/sfx2/source/control/bindings.cxx @@ -163,13 +163,13 @@ public: class SfxAsyncExec_Impl { - ::com::sun::star::util::URL aCommand; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDisp; + css::util::URL aCommand; + css::uno::Reference< css::frame::XDispatch > xDisp; Timer aTimer; public: - SfxAsyncExec_Impl( const ::com::sun::star::util::URL& rCmd, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& rDisp ) + SfxAsyncExec_Impl( const css::util::URL& rCmd, const css::uno::Reference< css::frame::XDispatch >& rDisp ) : aCommand( rCmd ) , xDisp( rDisp ) { @@ -203,8 +203,8 @@ enum class SfxPopupAction class SfxBindings_Impl { public: - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchRecorder > xRecorder; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > xProv; + css::uno::Reference< css::frame::XDispatchRecorder > xRecorder; + css::uno::Reference< css::frame::XDispatchProvider > xProv; SfxUnoControllerArr_Impl* pUnoCtrlArr; SfxWorkWindow* pWorkWin; @@ -321,7 +321,7 @@ void SfxBindings::DeleteControllers_Impl() // Delete all Caches for ( nCache = pImp->pCaches->size(); nCache > 0; --nCache ) { - // Get Cache via ::com::sun::star::sdbcx::Index + // Get Cache via css::sdbcx::Index SfxStateCache *pCache = (*pImp->pCaches)[ nCache-1 ]; // unbind all controllers in the cache @@ -1295,7 +1295,7 @@ void SfxBindings::UpdateSlotServer_Impl() { if ( !nRegLevel ) { - ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame > xFrame + css::uno::Reference < css::frame::XFrame > xFrame ( pDispatcher->GetFrame()->GetFrame().GetFrameInterface(), UNO_QUERY ); pImp->bContextChanged = false; } @@ -1758,7 +1758,7 @@ void SfxBindings::LeaveRegistrations( sal_uInt16 nLevel, const char *pFile, int { for ( sal_uInt16 nCache = pImp->pCaches->size(); nCache > 0; --nCache ) { - // Get Cache via ::com::sun::star::sdbcx::Index + // Get Cache via css::sdbcx::Index SfxStateCache *pCache = (*pImp->pCaches)[nCache-1]; // No interested Controller present @@ -1811,9 +1811,9 @@ void SfxBindings::SetDispatcher( SfxDispatcher *pDisp ) pDispatcher = pDisp; - ::com::sun::star::uno::Reference < ::com::sun::star::frame::XDispatchProvider > xProv; + css::uno::Reference < css::frame::XDispatchProvider > xProv; if ( pDisp ) - xProv = ::com::sun::star::uno::Reference < ::com::sun::star::frame::XDispatchProvider > + xProv = css::uno::Reference < css::frame::XDispatchProvider > ( pDisp->GetFrame()->GetFrame().GetFrameInterface(), UNO_QUERY ); SetDispatchProvider_Impl( xProv ); @@ -1886,7 +1886,7 @@ void SfxBindings::StartUpdate_Impl( bool bComplete ) SfxItemState SfxBindings::QueryState( sal_uInt16 nSlot, SfxPoolItem* &rpState ) { - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDisp; + css::uno::Reference< css::frame::XDispatch > xDisp; SfxStateCache *pCache = GetStateCache( nSlot ); if ( pCache ) xDisp = pCache->GetDispatch(); @@ -1896,7 +1896,7 @@ SfxItemState SfxBindings::QueryState( sal_uInt16 nSlot, SfxPoolItem* &rpState ) if ( !pSlot || !pSlot->pUnoName ) return SfxItemState::DISABLED; - ::com::sun::star::util::URL aURL; + css::util::URL aURL; OUString aCmd( ".uno:" ); aURL.Protocol = aCmd; aURL.Path = OUString::createFromAscii(pSlot->GetUnoName()); @@ -1909,7 +1909,7 @@ SfxItemState SfxBindings::QueryState( sal_uInt16 nSlot, SfxPoolItem* &rpState ) if ( xDisp.is() ) { - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XUnoTunnel > xTunnel( xDisp, ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::lang::XUnoTunnel > xTunnel( xDisp, css::uno::UNO_QUERY ); SfxOfficeDispatch* pDisp = NULL; if ( xTunnel.is() ) { @@ -1938,8 +1938,8 @@ SfxItemState SfxBindings::QueryState( sal_uInt16 nSlot, SfxPoolItem* &rpState ) } else { - ::com::sun::star::uno::Any aAny = pBind->GetStatus().State; - ::com::sun::star::uno::Type pType = aAny.getValueType(); + css::uno::Any aAny = pBind->GetStatus().State; + css::uno::Type pType = aAny.getValueType(); if ( pType == cppu::UnoType<bool>::get() ) { @@ -2002,7 +2002,7 @@ void SfxBindings::SetSubBindings_Impl( SfxBindings *pSub ) { if ( pImp->pSubBindings ) { - pImp->pSubBindings->SetDispatchProvider_Impl( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > () ); + pImp->pSubBindings->SetDispatchProvider_Impl( css::uno::Reference< css::frame::XDispatchProvider > () ); pImp->pSubBindings->pImp->pSuperBindings = NULL; } @@ -2069,7 +2069,7 @@ void SfxBindings::InvalidateUnoControllers_Impl() for ( sal_uInt16 n=nCount; n>0; n-- ) { SfxUnoControllerItem *pCtrl = (*pImp->pUnoCtrlArr)[n-1]; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > xRef( static_cast<cppu::OWeakObject*>(pCtrl), ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::frame::XStatusListener > xRef( static_cast<cppu::OWeakObject*>(pCtrl), css::uno::UNO_QUERY ); pCtrl->ReleaseDispatch(); pCtrl->GetNewDispatch(); } @@ -2089,31 +2089,31 @@ bool SfxBindings::IsInUpdate() const void SfxBindings::SetVisibleState( sal_uInt16 nId, bool bShow ) { - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDisp; + css::uno::Reference< css::frame::XDispatch > xDisp; SfxStateCache *pCache = GetStateCache( nId ); if ( pCache ) pCache->SetVisibleState( bShow ); } -void SfxBindings::SetActiveFrame( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > & rFrame ) +void SfxBindings::SetActiveFrame( const css::uno::Reference< css::frame::XFrame > & rFrame ) { if ( rFrame.is() || !pDispatcher ) - SetDispatchProvider_Impl( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > ( rFrame, ::com::sun::star::uno::UNO_QUERY ) ); + SetDispatchProvider_Impl( css::uno::Reference< css::frame::XDispatchProvider > ( rFrame, css::uno::UNO_QUERY ) ); else - SetDispatchProvider_Impl( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > ( - pDispatcher->GetFrame()->GetFrame().GetFrameInterface(), ::com::sun::star::uno::UNO_QUERY ) ); + SetDispatchProvider_Impl( css::uno::Reference< css::frame::XDispatchProvider > ( + pDispatcher->GetFrame()->GetFrame().GetFrameInterface(), css::uno::UNO_QUERY ) ); } -const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SfxBindings::GetActiveFrame() const +const css::uno::Reference< css::frame::XFrame > SfxBindings::GetActiveFrame() const { - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame( pImp->xProv, ::com::sun::star::uno::UNO_QUERY ); + const css::uno::Reference< css::frame::XFrame > xFrame( pImp->xProv, css::uno::UNO_QUERY ); if ( xFrame.is() || !pDispatcher ) return xFrame; else return pDispatcher->GetFrame()->GetFrame().GetFrameInterface(); } -void SfxBindings::SetDispatchProvider_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > & rProv ) +void SfxBindings::SetDispatchProvider_Impl( const css::uno::Reference< css::frame::XDispatchProvider > & rProv ) { bool bInvalidate = ( rProv != pImp->xProv ); if ( bInvalidate ) @@ -2129,11 +2129,11 @@ void SfxBindings::SetDispatchProvider_Impl( const ::com::sun::star::uno::Referen bool SfxBindings::ExecuteCommand_Impl( const OUString& rCommand ) { - ::com::sun::star::util::URL aURL; + css::util::URL aURL; aURL.Complete = rCommand; Reference< util::XURLTransformer > xTrans( util::URLTransformer::create( ::comphelper::getProcessComponentContext() ) ); xTrans->parseStrict( aURL ); - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDisp = pImp->xProv->queryDispatch( aURL, OUString(), 0 ); + css::uno::Reference< css::frame::XDispatch > xDisp = pImp->xProv->queryDispatch( aURL, OUString(), 0 ); if ( xDisp.is() ) { new SfxAsyncExec_Impl( aURL, xDisp ); @@ -2143,12 +2143,12 @@ bool SfxBindings::ExecuteCommand_Impl( const OUString& rCommand ) return false; } -com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > SfxBindings::GetRecorder() const +css::uno::Reference< css::frame::XDispatchRecorder > SfxBindings::GetRecorder() const { return pImp->xRecorder; } -void SfxBindings::SetRecorder_Impl( com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder >& rRecorder ) +void SfxBindings::SetRecorder_Impl( css::uno::Reference< css::frame::XDispatchRecorder >& rRecorder ) { pImp->xRecorder = rRecorder; } diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index 31c44cdef44e..5490e7429fe4 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -223,19 +223,19 @@ void SfxDispatcher::Call_Impl(SfxShell& rShell, const SfxSlot &rSlot, SfxRequest if ( GetFrame() ) { // Recording may start - com::sun::star::uno::Reference< com::sun::star::frame::XFrame > xFrame( + css::uno::Reference< css::frame::XFrame > xFrame( GetFrame()->GetFrame().GetFrameInterface(), - com::sun::star::uno::UNO_QUERY); + css::uno::UNO_QUERY); - com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > xSet( + css::uno::Reference< css::beans::XPropertySet > xSet( xFrame, - com::sun::star::uno::UNO_QUERY); + css::uno::UNO_QUERY); if ( xSet.is() ) { - com::sun::star::uno::Any aProp = xSet->getPropertyValue("DispatchRecorderSupplier"); - com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorderSupplier > xSupplier; - com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > xRecorder; + css::uno::Any aProp = xSet->getPropertyValue("DispatchRecorderSupplier"); + css::uno::Reference< css::frame::XDispatchRecorderSupplier > xSupplier; + css::uno::Reference< css::frame::XDispatchRecorder > xRecorder; aProp >>= xSupplier; if(xSupplier.is()) xRecorder = xSupplier->getDispatchRecorder(); @@ -739,11 +739,11 @@ void SfxDispatcher::DoDeactivate_Impl(bool bMDI, SfxViewFrame* pNew) bool bHidePopups = bMDI && xImp->pFrame; if ( pNew && xImp->pFrame ) { - com::sun::star::uno::Reference< com::sun::star::frame::XFrame > xOldFrame( - pNew->GetFrame().GetFrameInterface()->getCreator(), com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::frame::XFrame > xOldFrame( + pNew->GetFrame().GetFrameInterface()->getCreator(), css::uno::UNO_QUERY ); - com::sun::star::uno::Reference< com::sun::star::frame::XFrame > xMyFrame( - GetFrame()->GetFrame().GetFrameInterface(), com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::frame::XFrame > xMyFrame( + GetFrame()->GetFrame().GetFrameInterface(), css::uno::UNO_QUERY ); if ( xOldFrame == xMyFrame ) bHidePopups = false; @@ -1118,11 +1118,11 @@ void SfxDispatcher::SetMenu_Impl() SfxFrame& rFrame = pTop->GetFrame(); if ( rFrame.IsMenuBarOn_Impl() ) { - com::sun::star::uno::Reference < com::sun::star::beans::XPropertySet > xPropSet( rFrame.GetFrameInterface(), com::sun::star::uno::UNO_QUERY ); + css::uno::Reference < css::beans::XPropertySet > xPropSet( rFrame.GetFrameInterface(), css::uno::UNO_QUERY ); if ( xPropSet.is() ) { - com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager; - com::sun::star::uno::Any aValue = xPropSet->getPropertyValue("LayoutManager"); + css::uno::Reference< css::frame::XLayoutManager > xLayoutManager; + css::uno::Any aValue = xPropSet->getPropertyValue("LayoutManager"); aValue >>= xLayoutManager; if ( xLayoutManager.is() ) { @@ -1175,23 +1175,23 @@ void SfxDispatcher::Update_Impl( bool bForce ) // keep own tools internally for collecting GetBindings()->GetDispatcher()->xImp->bUpdated = false; - com::sun::star::uno::Reference< com::sun::star::frame::XFrame > xFrame; + css::uno::Reference< css::frame::XFrame > xFrame; SfxBindings* pBindings = GetBindings(); if (pBindings) { pBindings->DENTERREGISTRATIONS(); xFrame = pBindings->GetActiveFrame(); } - com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > xPropSet( xFrame, com::sun::star::uno::UNO_QUERY ); - com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager; + css::uno::Reference< css::beans::XPropertySet > xPropSet( xFrame, css::uno::UNO_QUERY ); + css::uno::Reference< css::frame::XLayoutManager > xLayoutManager; if ( xPropSet.is() ) { try { - com::sun::star::uno::Any aValue = xPropSet->getPropertyValue("LayoutManager"); + css::uno::Any aValue = xPropSet->getPropertyValue("LayoutManager"); aValue >>= xLayoutManager; } - catch (const com::sun::star::uno::Exception&) + catch (const css::uno::Exception&) { } } @@ -1940,11 +1940,11 @@ void SfxDispatcher::HideUI( bool bHide ) SfxFrame& rFrame = pTop->GetFrame(); if ( rFrame.IsMenuBarOn_Impl() ) { - com::sun::star::uno::Reference < com::sun::star::beans::XPropertySet > xPropSet( rFrame.GetFrameInterface(), com::sun::star::uno::UNO_QUERY ); + css::uno::Reference < css::beans::XPropertySet > xPropSet( rFrame.GetFrameInterface(), css::uno::UNO_QUERY ); if ( xPropSet.is() ) { - com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager; - com::sun::star::uno::Any aValue = xPropSet->getPropertyValue("LayoutManager"); + css::uno::Reference< css::frame::XLayoutManager > xLayoutManager; + css::uno::Any aValue = xPropSet->getPropertyValue("LayoutManager"); aValue >>= xLayoutManager; if ( xLayoutManager.is() ) xLayoutManager->setVisible( !bHide ); @@ -1994,7 +1994,7 @@ SfxItemState SfxDispatcher::QueryState( sal_uInt16 nSlot, const SfxPoolItem* &rp return SfxItemState::DISABLED; } -SfxItemState SfxDispatcher::QueryState( sal_uInt16 nSID, ::com::sun::star::uno::Any& rAny ) +SfxItemState SfxDispatcher::QueryState( sal_uInt16 nSID, css::uno::Any& rAny ) { SfxShell *pShell = 0; const SfxSlot *pSlot = 0; @@ -2007,7 +2007,7 @@ SfxItemState SfxDispatcher::QueryState( sal_uInt16 nSID, ::com::sun::star::uno:: return SfxItemState::DISABLED; else { - ::com::sun::star::uno::Any aState; + css::uno::Any aState; if ( dynamic_cast< const SfxVoidItem *>( pItem ) == nullptr ) { sal_uInt16 nSubId( 0 ); diff --git a/sfx2/source/control/querystatus.cxx b/sfx2/source/control/querystatus.cxx index 7169467ee5bd..8c5127c5e158 100644 --- a/sfx2/source/control/querystatus.cxx +++ b/sfx2/source/control/querystatus.cxx @@ -51,26 +51,26 @@ class SfxQueryStatus_Impl: { public: - SfxQueryStatus_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider, sal_uInt16 nSlotId, const OUString& aCommand ); + SfxQueryStatus_Impl( const css::uno::Reference< css::frame::XDispatchProvider >& rDispatchProvider, sal_uInt16 nSlotId, const OUString& aCommand ); virtual ~SfxQueryStatus_Impl(); // Query method SfxItemState QueryState( SfxPoolItem*& pPoolItem ); // XEventListener - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw( css::uno::RuntimeException, std::exception ) override; // XStatusListener - virtual void SAL_CALL statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL statusChanged(const css::frame::FeatureStateEvent& Event) throw( css::uno::RuntimeException, std::exception ) override; private: - bool m_bQueryInProgress; - SfxItemState m_eState; - SfxPoolItem* m_pItem; - sal_uInt16 m_nSlotID; - osl::Condition m_aCondition; - ::com::sun::star::util::URL m_aCommand; - com::sun::star::uno::Reference< com::sun::star::frame::XDispatch > m_xDispatch; + bool m_bQueryInProgress; + SfxItemState m_eState; + SfxPoolItem* m_pItem; + sal_uInt16 m_nSlotID; + osl::Condition m_aCondition; + css::util::URL m_aCommand; + css::uno::Reference< css::frame::XDispatch > m_xDispatch; }; SfxQueryStatus_Impl::SfxQueryStatus_Impl( const Reference< XDispatchProvider >& rDispatchProvider, sal_uInt16 nSlotId, const OUString& rCommand ) : @@ -109,7 +109,7 @@ throw( RuntimeException, std::exception ) if ( rEvent.IsEnabled ) { m_eState = SfxItemState::DEFAULT; - ::com::sun::star::uno::Type pType = rEvent.State.getValueType(); + css::uno::Type pType = rEvent.State.getValueType(); if ( pType == cppu::UnoType<bool>::get() ) { @@ -135,14 +135,14 @@ throw( RuntimeException, std::exception ) rEvent.State >>= sTemp ; m_pItem = new SfxStringItem( m_nSlotID, sTemp ); } - else if ( pType == cppu::UnoType< ::com::sun::star::frame::status::ItemStatus>::get() ) + else if ( pType == cppu::UnoType< css::frame::status::ItemStatus>::get() ) { ItemStatus aItemStatus; rEvent.State >>= aItemStatus; m_eState = (SfxItemState) aItemStatus.State; m_pItem = new SfxVoidItem( m_nSlotID ); } - else if ( pType == cppu::UnoType< ::com::sun::star::frame::status::Visibility>::get() ) + else if ( pType == cppu::UnoType< css::frame::status::Visibility>::get() ) { Visibility aVisibilityStatus; rEvent.State >>= aVisibilityStatus; diff --git a/sfx2/source/control/request.cxx b/sfx2/source/control/request.cxx index 15a87507c2ec..d97676de3ea8 100644 --- a/sfx2/source/control/request.cxx +++ b/sfx2/source/control/request.cxx @@ -68,7 +68,7 @@ struct SfxRequest_Impl: public SfxListener SfxAllItemSet* pInternalArgs; SfxViewFrame* pViewFrame; - com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > xRecorder; + css::uno::Reference< css::frame::XDispatchRecorder > xRecorder; explicit SfxRequest_Impl( SfxRequest *pOwner ) : pAnti( pOwner) @@ -237,7 +237,7 @@ SfxRequest::SfxRequest SfxRequest::SfxRequest ( const SfxSlot* pSlot, // executed <Slot-Id> - const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& rArgs, + const css::uno::Sequence < css::beans::PropertyValue >& rArgs, SfxCallMode nMode, // Synch/API/... SfxItemPool& rPool // necessary for the SfxItemSet for parameters ) @@ -360,7 +360,7 @@ void SfxRequest_Impl::Record uno::Reference< util::XURLTransformer > xTransform = util::URLTransformer::create( xContext ); - com::sun::star::util::URL aURL; + css::util::URL aURL; aURL.Complete = aCmd; xTransform->parseStrict(aURL); @@ -377,7 +377,7 @@ void SfxRequest::Record_Impl ( SfxShell& rSh, // the <SfxShell>, which has executed the Request const SfxSlot& rSlot, // the <SfxSlot>, which has executed the Request - com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > xRecorder, + css::uno::Reference< css::frame::XDispatchRecorder > xRecorder, SfxViewFrame* pViewFrame ) @@ -706,7 +706,7 @@ bool SfxRequest::IsDone() const -com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > SfxRequest::GetMacroRecorder( SfxViewFrame* pView ) +css::uno::Reference< css::frame::XDispatchRecorder > SfxRequest::GetMacroRecorder( SfxViewFrame* pView ) /* [Description] @@ -718,16 +718,16 @@ com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > SfxRe */ { - com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > xRecorder; + css::uno::Reference< css::frame::XDispatchRecorder > xRecorder; - com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > xSet( + css::uno::Reference< css::beans::XPropertySet > xSet( (pView ? pView : SfxViewFrame::Current())->GetFrame().GetFrameInterface(), - com::sun::star::uno::UNO_QUERY); + css::uno::UNO_QUERY); if(xSet.is()) { - com::sun::star::uno::Any aProp = xSet->getPropertyValue("DispatchRecorderSupplier"); - com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorderSupplier > xSupplier; + css::uno::Any aProp = xSet->getPropertyValue("DispatchRecorderSupplier"); + css::uno::Reference< css::frame::XDispatchRecorderSupplier > xSupplier; aProp >>= xSupplier; if(xSupplier.is()) xRecorder = xSupplier->getDispatchRecorder(); diff --git a/sfx2/source/control/sfxstatuslistener.cxx b/sfx2/source/control/sfxstatuslistener.cxx index 8b1237256708..591ccc04d7dc 100644 --- a/sfx2/source/control/sfxstatuslistener.cxx +++ b/sfx2/source/control/sfxstatuslistener.cxx @@ -99,7 +99,7 @@ void SfxStatusListener::ReBind() } // new UNO API -void SAL_CALL SfxStatusListener::dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ) +void SAL_CALL SfxStatusListener::dispose() throw( css::uno::RuntimeException, std::exception ) { if ( m_xDispatch.is() && !m_aCommand.Complete.isEmpty() ) { @@ -168,7 +168,7 @@ throw( RuntimeException, std::exception ) if ( rEvent.IsEnabled ) { eState = SfxItemState::DEFAULT; - ::com::sun::star::uno::Type pType = rEvent.State.getValueType(); + css::uno::Type pType = rEvent.State.getValueType(); if ( pType == ::cppu::UnoType<void>::get() ) { @@ -199,14 +199,14 @@ throw( RuntimeException, std::exception ) rEvent.State >>= sTemp ; pItem = new SfxStringItem( m_nSlotID, sTemp ); } - else if ( pType == cppu::UnoType< ::com::sun::star::frame::status::ItemStatus >::get() ) + else if ( pType == cppu::UnoType< css::frame::status::ItemStatus >::get() ) { ItemStatus aItemStatus; rEvent.State >>= aItemStatus; eState = (SfxItemState) aItemStatus.State; pItem = new SfxVoidItem( m_nSlotID ); } - else if ( pType == cppu::UnoType< ::com::sun::star::frame::status::Visibility >::get() ) + else if ( pType == cppu::UnoType< css::frame::status::Visibility >::get() ) { Visibility aVisibilityStatus; rEvent.State >>= aVisibilityStatus; diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx index 37623d2411ce..29b4fab69d99 100644 --- a/sfx2/source/control/shell.cxx +++ b/sfx2/source/control/shell.cxx @@ -70,7 +70,7 @@ struct SfxShell_Impl: public SfxBroadcaster svtools::AsynchronLink* pUpdater; boost::ptr_vector<SfxSlot> aSlotArr; - com::sun::star::uno::Sequence < com::sun::star::embed::VerbDescriptor > aVerbList; + css::uno::Sequence < css::embed::VerbDescriptor > aVerbList; ::sfx2::sidebar::ContextChangeBroadcaster maContextChangeBroadcaster; SfxShell_Impl() @@ -525,7 +525,7 @@ void SfxStubSfxShellVerbState(SfxShell *, SfxItemSet& rSet) SfxShell::VerbState( rSet ); } -void SfxShell::SetVerbs(const com::sun::star::uno::Sequence < com::sun::star::embed::VerbDescriptor >& aVerbs) +void SfxShell::SetVerbs(const css::uno::Sequence < css::embed::VerbDescriptor >& aVerbs) { SfxViewShell *pViewSh = dynamic_cast<SfxViewShell*>( this ); @@ -595,7 +595,7 @@ void SfxShell::SetVerbs(const com::sun::star::uno::Sequence < com::sun::star::em } } -const com::sun::star::uno::Sequence < com::sun::star::embed::VerbDescriptor >& SfxShell::GetVerbs() const +const css::uno::Sequence < css::embed::VerbDescriptor >& SfxShell::GetVerbs() const { return pImp->aVerbList; } @@ -607,7 +607,7 @@ void SfxShell::VerbExec(SfxRequest& rReq) if ( pViewShell ) { bool bReadOnly = pViewShell->GetObjectShell()->IsReadOnly(); - com::sun::star::uno::Sequence < com::sun::star::embed::VerbDescriptor > aList = pViewShell->GetVerbs(); + css::uno::Sequence < css::embed::VerbDescriptor > aList = pViewShell->GetVerbs(); for (sal_Int32 n=0, nVerb=0; n<aList.getLength(); n++) { // check for ReadOnly verbs @@ -634,7 +634,7 @@ void SfxShell::VerbState(SfxItemSet& ) const SfxSlot* SfxShell::GetVerbSlot_Impl(sal_uInt16 nId) const { - com::sun::star::uno::Sequence < com::sun::star::embed::VerbDescriptor > rList = pImp->aVerbList; + css::uno::Sequence < css::embed::VerbDescriptor > rList = pImp->aVerbList; DBG_ASSERT(nId >= SID_VERB_START && nId <= SID_VERB_END,"Wrong VerbId!"); sal_uInt16 nIndex = nId - SID_VERB_START; diff --git a/sfx2/source/control/sorgitm.cxx b/sfx2/source/control/sorgitm.cxx index 8e084c15fc96..16e7bdccd463 100644 --- a/sfx2/source/control/sorgitm.cxx +++ b/sfx2/source/control/sorgitm.cxx @@ -69,7 +69,7 @@ bool SfxScriptOrganizerItem::operator==( const SfxPoolItem& rItem) const } -bool SfxScriptOrganizerItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const +bool SfxScriptOrganizerItem::QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId ) const { OUString aValue; nMemberId &= ~CONVERT_TWIPS; @@ -89,7 +89,7 @@ bool SfxScriptOrganizerItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uIn return true; } -bool SfxScriptOrganizerItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) +bool SfxScriptOrganizerItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) { OUString aValue; bool bRet = false; diff --git a/sfx2/source/control/statcach.cxx b/sfx2/source/control/statcach.cxx index c96527a4f711..6ad13ccb01d1 100644 --- a/sfx2/source/control/statcach.cxx +++ b/sfx2/source/control/statcach.cxx @@ -53,7 +53,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; -BindDispatch_Impl::BindDispatch_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > & rDisp, const ::com::sun::star::util::URL& rURL, SfxStateCache *pStateCache, const SfxSlot* pS ) +BindDispatch_Impl::BindDispatch_Impl( const css::uno::Reference< css::frame::XDispatch > & rDisp, const css::util::URL& rURL, SfxStateCache *pStateCache, const SfxSlot* pS ) : xDisp( rDisp ) , aURL( rURL ) , pCache( pStateCache ) @@ -63,22 +63,22 @@ BindDispatch_Impl::BindDispatch_Impl( const ::com::sun::star::uno::Reference< :: aStatus.IsEnabled = sal_True; } -void SAL_CALL BindDispatch_Impl::disposing( const ::com::sun::star::lang::EventObject& ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) +void SAL_CALL BindDispatch_Impl::disposing( const css::lang::EventObject& ) throw( css::uno::RuntimeException, std::exception ) { if ( xDisp.is() ) { - xDisp->removeStatusListener( static_cast<com::sun::star::frame::XStatusListener*>(this), aURL ); - xDisp = ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > (); + xDisp->removeStatusListener( static_cast<css::frame::XStatusListener*>(this), aURL ); + xDisp = css::uno::Reference< css::frame::XDispatch > (); } } -void SAL_CALL BindDispatch_Impl::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& rEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) +void SAL_CALL BindDispatch_Impl::statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw( css::uno::RuntimeException, std::exception ) { aStatus = rEvent; if ( !pCache ) return; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > xRef( static_cast<cppu::OWeakObject*>(this), ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::frame::XStatusListener > xRef( static_cast<cppu::OWeakObject*>(this), css::uno::UNO_QUERY ); if ( aStatus.Requery ) pCache->Invalidate( true ); else @@ -93,9 +93,9 @@ void SAL_CALL BindDispatch_Impl::statusChanged( const ::com::sun::star::frame:: else if (aStatus.State.hasValue()) { eState = SfxItemState::DEFAULT; - ::com::sun::star::uno::Any aAny = aStatus.State; + css::uno::Any aAny = aStatus.State; - ::com::sun::star::uno::Type pType = aAny.getValueType(); + css::uno::Type pType = aAny.getValueType(); if ( pType == cppu::UnoType< bool >::get() ) { bool bTemp = false; @@ -153,8 +153,8 @@ void BindDispatch_Impl::Release() { if ( xDisp.is() ) { - xDisp->removeStatusListener( static_cast<com::sun::star::frame::XStatusListener*>(this), aURL ); - xDisp = ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > (); + xDisp->removeStatusListener( static_cast<css::frame::XStatusListener*>(this), aURL ); + xDisp = css::uno::Reference< css::frame::XDispatch > (); } pCache = NULL; @@ -227,7 +227,7 @@ void SfxStateCache::Invalidate( bool bWithMsg ) // gets the corresponding function from the dispatcher or the cache -const SfxSlotServer* SfxStateCache::GetSlotServer( SfxDispatcher &rDispat , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > & xProv ) +const SfxSlotServer* SfxStateCache::GetSlotServer( SfxDispatcher &rDispat , const css::uno::Reference< css::frame::XDispatchProvider > & xProv ) { if ( bSlotDirty ) @@ -253,7 +253,7 @@ const SfxSlotServer* SfxStateCache::GetSlotServer( SfxDispatcher &rDispat , cons } // create the dispatch URL from the slot data - ::com::sun::star::util::URL aURL; + css::util::URL aURL; OUString aCmd = ".uno:"; aURL.Protocol = aCmd; aURL.Path = OUString::createFromAscii( pSlot->GetUnoName() ); @@ -262,11 +262,11 @@ const SfxSlotServer* SfxStateCache::GetSlotServer( SfxDispatcher &rDispat , cons aURL.Main = aCmd; // try to get a dispatch object for this command - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDisp = xProv->queryDispatch( aURL, OUString(), 0 ); + css::uno::Reference< css::frame::XDispatch > xDisp = xProv->queryDispatch( aURL, OUString(), 0 ); if ( xDisp.is() ) { // test the dispatch object if it is just a wrapper for a SfxDispatcher - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XUnoTunnel > xTunnel( xDisp, ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::lang::XUnoTunnel > xTunnel( xDisp, css::uno::UNO_QUERY ); SfxOfficeDispatch* pDisp = NULL; if ( xTunnel.is() ) { @@ -300,8 +300,8 @@ const SfxSlotServer* SfxStateCache::GetSlotServer( SfxDispatcher &rDispat , cons } else if ( rDispat.GetFrame() ) { - ::com::sun::star::uno::Reference < ::com::sun::star::frame::XDispatchProvider > xFrameProv( - rDispat.GetFrame()->GetFrame().GetFrameInterface(), ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference < css::frame::XDispatchProvider > xFrameProv( + rDispat.GetFrame()->GetFrame().GetFrameInterface(), css::uno::UNO_QUERY ); if ( xFrameProv != xProv ) return GetSlotServer( rDispat, xFrameProv ); } @@ -478,17 +478,17 @@ void SfxStateCache::SetCachedState( bool bAlways ) -::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SfxStateCache::GetDispatch() const +css::uno::Reference< css::frame::XDispatch > SfxStateCache::GetDispatch() const { if ( pDispatch ) return pDispatch->xDisp; - return ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > (); + return css::uno::Reference< css::frame::XDispatch > (); } void SfxStateCache::Dispatch( const SfxItemSet* pSet, bool bForceSynchron ) { // protect pDispatch against destruction in the call - ::com::sun::star::uno::Reference < ::com::sun::star::frame::XStatusListener > xKeepAlive( pDispatch ); + css::uno::Reference < css::frame::XStatusListener > xKeepAlive( pDispatch ); if ( pDispatch ) { uno::Sequence < beans::PropertyValue > aArgs; diff --git a/sfx2/source/control/templatelocalview.cxx b/sfx2/source/control/templatelocalview.cxx index ab8e0b9c6da4..1ce73203a2ff 100644 --- a/sfx2/source/control/templatelocalview.cxx +++ b/sfx2/source/control/templatelocalview.cxx @@ -722,7 +722,7 @@ bool TemplateLocalView::exportTo(const sal_uInt16 nItemId, const sal_uInt16 nReg } bool TemplateLocalView::saveTemplateAs (sal_uInt16 nItemId, - com::sun::star::uno::Reference<com::sun::star::frame::XModel> &rModel, + css::uno::Reference<css::frame::XModel> &rModel, const OUString &rName) { @@ -769,7 +769,7 @@ bool TemplateLocalView::saveTemplateAs (sal_uInt16 nItemId, } bool TemplateLocalView::saveTemplateAs(TemplateContainerItem *pDstItem, - com::sun::star::uno::Reference<com::sun::star::frame::XModel> &rModel, + css::uno::Reference<css::frame::XModel> &rModel, const OUString &rName) { uno::Reference< frame::XStorable > xStorable(rModel, uno::UNO_QUERY_THROW ); diff --git a/sfx2/source/control/templateviewitem.cxx b/sfx2/source/control/templateviewitem.cxx index 59a87120c691..950c32612895 100644 --- a/sfx2/source/control/templateviewitem.cxx +++ b/sfx2/source/control/templateviewitem.cxx @@ -52,7 +52,7 @@ void TemplateViewItem::calculateItemsPosition(const long nThumbnailHeight, const drawinglayer::primitive2d::TextLayouterDevice aTextDev; aTextDev.setFontAttribute(pAttrs->aFontAttr, pAttrs->aFontSize.getX(), pAttrs->aFontSize.getY(), - com::sun::star::lang::Locale() ); + css::lang::Locale() ); long nSpace = (nDisplayHeight + nPadding - 2*aTextDev.getTextHeight()) / 3; diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx index a5ed52a02986..a675734307c4 100644 --- a/sfx2/source/control/thumbnailview.cxx +++ b/sfx2/source/control/thumbnailview.cxx @@ -72,9 +72,7 @@ ThumbnailView::~ThumbnailView() void ThumbnailView::dispose() { - com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent> - xComponent(GetAccessible(false), - com::sun::star::uno::UNO_QUERY); + css::uno::Reference< css::lang::XComponent> xComponent(GetAccessible(false), css::uno::UNO_QUERY); if (xComponent.is()) xComponent->dispose (); @@ -180,10 +178,10 @@ void ThumbnailView::ImplDeleteItems() if ( pItem->isVisible() && ImplHasAccessibleListeners() ) { - ::com::sun::star::uno::Any aOldAny, aNewAny; + css::uno::Any aOldAny, aNewAny; aOldAny <<= pItem->GetAccessible( mbIsTransientChildrenDisabled ); - ImplFireAccessibleEvent( ::com::sun::star::accessibility::AccessibleEventId::CHILD, aOldAny, aNewAny ); + ImplFireAccessibleEvent( css::accessibility::AccessibleEventId::CHILD, aOldAny, aNewAny ); } delete pItem; @@ -246,7 +244,7 @@ void ThumbnailView::OnItemDblClicked (ThumbnailViewItem*) { } -::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > ThumbnailView::CreateAccessible() +css::uno::Reference< css::accessibility::XAccessible > ThumbnailView::CreateAccessible() { return new ThumbnailViewAcc( this, mbIsTransientChildrenDisabled ); } @@ -355,10 +353,10 @@ void ThumbnailView::CalculateItemPositions (bool bScrollBarUsed) { if ( ImplHasAccessibleListeners() ) { - ::com::sun::star::uno::Any aOldAny, aNewAny; + css::uno::Any aOldAny, aNewAny; aNewAny <<= pItem->GetAccessible( mbIsTransientChildrenDisabled ); - ImplFireAccessibleEvent( ::com::sun::star::accessibility::AccessibleEventId::CHILD, aOldAny, aNewAny ); + ImplFireAccessibleEvent( css::accessibility::AccessibleEventId::CHILD, aOldAny, aNewAny ); } pItem->show(true); @@ -383,10 +381,10 @@ void ThumbnailView::CalculateItemPositions (bool bScrollBarUsed) { if ( ImplHasAccessibleListeners() ) { - ::com::sun::star::uno::Any aOldAny, aNewAny; + css::uno::Any aOldAny, aNewAny; aOldAny <<= pItem->GetAccessible( mbIsTransientChildrenDisabled ); - ImplFireAccessibleEvent( ::com::sun::star::accessibility::AccessibleEventId::CHILD, aOldAny, aNewAny ); + ImplFireAccessibleEvent( css::accessibility::AccessibleEventId::CHILD, aOldAny, aNewAny ); } pItem->show(false); @@ -477,7 +475,7 @@ ThumbnailViewItem* ThumbnailView::ImplGetVisibleItem( sal_uInt16 nVisiblePos ) return NULL; } -void ThumbnailView::ImplFireAccessibleEvent( short nEventId, const ::com::sun::star::uno::Any& rOldValue, const ::com::sun::star::uno::Any& rNewValue ) +void ThumbnailView::ImplFireAccessibleEvent( short nEventId, const css::uno::Any& rOldValue, const css::uno::Any& rNewValue ) { ThumbnailViewAcc* pAcc = ThumbnailViewAcc::getImplementation( GetAccessible( false ) ); @@ -1111,23 +1109,23 @@ void ThumbnailView::SelectItem( sal_uInt16 nItemId ) if( pItemAcc ) { - ::com::sun::star::uno::Any aOldAny, aNewAny; + css::uno::Any aOldAny, aNewAny; if( !mbIsTransientChildrenDisabled ) { - aNewAny <<= ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >( + aNewAny <<= css::uno::Reference< css::uno::XInterface >( static_cast< ::cppu::OWeakObject* >( pItemAcc )); - ImplFireAccessibleEvent( ::com::sun::star::accessibility::AccessibleEventId::ACTIVE_DESCENDANT_CHANGED, aOldAny, aNewAny ); + ImplFireAccessibleEvent( css::accessibility::AccessibleEventId::ACTIVE_DESCENDANT_CHANGED, aOldAny, aNewAny ); } else { - aNewAny <<= ::com::sun::star::accessibility::AccessibleStateType::FOCUSED; - pItemAcc->FireAccessibleEvent( ::com::sun::star::accessibility::AccessibleEventId::STATE_CHANGED, aOldAny, aNewAny ); + aNewAny <<= css::accessibility::AccessibleStateType::FOCUSED; + pItemAcc->FireAccessibleEvent( css::accessibility::AccessibleEventId::STATE_CHANGED, aOldAny, aNewAny ); } } // selection event - ::com::sun::star::uno::Any aOldAny, aNewAny; - ImplFireAccessibleEvent( ::com::sun::star::accessibility::AccessibleEventId::SELECTION_CHANGED, aOldAny, aNewAny ); + css::uno::Any aOldAny, aNewAny; + ImplFireAccessibleEvent( css::accessibility::AccessibleEventId::SELECTION_CHANGED, aOldAny, aNewAny ); } } } @@ -1195,10 +1193,10 @@ void ThumbnailView::filterItems(const std::function<bool (const ThumbnailViewIte { if ( ImplHasAccessibleListeners() ) { - ::com::sun::star::uno::Any aOldAny, aNewAny; + css::uno::Any aOldAny, aNewAny; aOldAny <<= pItem->GetAccessible( mbIsTransientChildrenDisabled ); - ImplFireAccessibleEvent( ::com::sun::star::accessibility::AccessibleEventId::CHILD, aOldAny, aNewAny ); + ImplFireAccessibleEvent( css::accessibility::AccessibleEventId::CHILD, aOldAny, aNewAny ); } pItem->show(false); diff --git a/sfx2/source/control/thumbnailviewacc.cxx b/sfx2/source/control/thumbnailviewacc.cxx index 30ee8bf6d013..9a7dd556f478 100644 --- a/sfx2/source/control/thumbnailviewacc.cxx +++ b/sfx2/source/control/thumbnailviewacc.cxx @@ -88,7 +88,7 @@ ThumbnailViewAcc* ThumbnailViewAcc::getImplementation( const uno::Reference< uno uno::Reference< lang::XUnoTunnel > xUnoTunnel( rxData, uno::UNO_QUERY ); return( xUnoTunnel.is() ? reinterpret_cast<ThumbnailViewAcc*>(sal::static_int_cast<sal_IntPtr>(xUnoTunnel->getSomething( ThumbnailViewAcc::getUnoTunnelId() ))) : NULL ); } - catch(const ::com::sun::star::uno::Exception&) + catch(const css::uno::Exception&) { return NULL; } @@ -99,10 +99,10 @@ void ThumbnailViewAcc::GetFocus() mbIsFocused = true; // Broadcast the state change. - ::com::sun::star::uno::Any aOldState, aNewState; - aNewState <<= ::com::sun::star::accessibility::AccessibleStateType::FOCUSED; + css::uno::Any aOldState, aNewState; + aNewState <<= css::accessibility::AccessibleStateType::FOCUSED; FireAccessibleEvent( - ::com::sun::star::accessibility::AccessibleEventId::STATE_CHANGED, + css::accessibility::AccessibleEventId::STATE_CHANGED, aOldState, aNewState); } @@ -111,10 +111,10 @@ void ThumbnailViewAcc::LoseFocus() mbIsFocused = false; // Broadcast the state change. - ::com::sun::star::uno::Any aOldState, aNewState; - aOldState <<= ::com::sun::star::accessibility::AccessibleStateType::FOCUSED; + css::uno::Any aOldState, aNewState; + aOldState <<= css::accessibility::AccessibleStateType::FOCUSED; FireAccessibleEvent( - ::com::sun::star::accessibility::AccessibleEventId::STATE_CHANGED, + css::accessibility::AccessibleEventId::STATE_CHANGED, aOldState, aNewState); } @@ -581,7 +581,7 @@ ThumbnailViewItem* ThumbnailViewAcc::getItem (sal_uInt16 nIndex) const } void ThumbnailViewAcc::ThrowIfDisposed() - throw (::com::sun::star::lang::DisposedException) + throw (css::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) { @@ -659,7 +659,7 @@ ThumbnailViewItemAcc* ThumbnailViewItemAcc::getImplementation( const uno::Refere xUnoTunnel->getSomething( ThumbnailViewItemAcc::getUnoTunnelId() ))) : NULL ); } - catch(const ::com::sun::star::uno::Exception&) + catch(const css::uno::Exception&) { return NULL; } diff --git a/sfx2/source/control/thumbnailviewacc.hxx b/sfx2/source/control/thumbnailviewacc.hxx index ab413a03f7c3..c891bc757c3b 100644 --- a/sfx2/source/control/thumbnailviewacc.hxx +++ b/sfx2/source/control/thumbnailviewacc.hxx @@ -40,12 +40,12 @@ class ThumbnailView; class ThumbnailViewItem; typedef ::cppu::WeakComponentImplHelper< - ::com::sun::star::accessibility::XAccessible, - ::com::sun::star::accessibility::XAccessibleEventBroadcaster, - ::com::sun::star::accessibility::XAccessibleContext, - ::com::sun::star::accessibility::XAccessibleComponent, - ::com::sun::star::accessibility::XAccessibleSelection, - ::com::sun::star::lang::XUnoTunnel > + css::accessibility::XAccessible, + css::accessibility::XAccessibleEventBroadcaster, + css::accessibility::XAccessibleContext, + css::accessibility::XAccessibleComponent, + css::accessibility::XAccessibleSelection, + css::lang::XUnoTunnel > ValueSetAccComponentBase; class ThumbnailViewAcc : @@ -58,12 +58,12 @@ public: virtual ~ThumbnailViewAcc(); void FireAccessibleEvent( short nEventId, - const ::com::sun::star::uno::Any& rOldValue, - const ::com::sun::star::uno::Any& rNewValue ); + const css::uno::Any& rOldValue, + const css::uno::Any& rNewValue ); bool HasAccessibleListeners() const { return( mxEventListeners.size() > 0 ); } - static ThumbnailViewAcc* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxData ) throw(); + static ThumbnailViewAcc* getImplementation( const css::uno::Reference< css::uno::XInterface >& rxData ) throw(); public: @@ -78,56 +78,56 @@ public: void LoseFocus(); // XAccessible - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (css::uno::RuntimeException, std::exception) override; // XAccessibleEventBroadcaster - virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getAccessibleDescription( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getAccessibleName( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::lang::Locale SAL_CALL getLocale( ) throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override; // XAccessibleComponent - virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Point SAL_CALL getLocation( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Rectangle SAL_CALL getBounds( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getLocation( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getLocationOnScreen( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Size SAL_CALL getSize( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL grabFocus( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getForeground( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getBackground( ) throw (css::uno::RuntimeException, std::exception) override; // XAccessibleSelection - virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clearAccessibleSelection( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL selectAllAccessibleChildren( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL clearAccessibleSelection( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL selectAllAccessibleChildren( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw( css::uno::RuntimeException, std::exception ) override; private: - ::std::vector< ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleEventListener > > mxEventListeners; + ::std::vector< css::uno::Reference< + css::accessibility::XAccessibleEventListener > > mxEventListeners; VclPtr<ThumbnailView> mpParent; bool mbIsTransientChildrenDisabled; /// The current FOCUSED state. bool mbIsFocused; - static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId(); + static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId(); /** Tell all listeners that the object is dying. This callback is usually called from the WeakComponentImplHelper class. @@ -155,24 +155,24 @@ private: foul deed. */ void ThrowIfDisposed() - throw (::com::sun::star::lang::DisposedException); + throw (css::lang::DisposedException); }; -class ThumbnailViewItemAcc : public ::cppu::WeakImplHelper< ::com::sun::star::accessibility::XAccessible, - ::com::sun::star::accessibility::XAccessibleEventBroadcaster, - ::com::sun::star::accessibility::XAccessibleContext, - ::com::sun::star::accessibility::XAccessibleComponent, - ::com::sun::star::lang::XUnoTunnel > +class ThumbnailViewItemAcc : public ::cppu::WeakImplHelper< css::accessibility::XAccessible, + css::accessibility::XAccessibleEventBroadcaster, + css::accessibility::XAccessibleContext, + css::accessibility::XAccessibleComponent, + css::lang::XUnoTunnel > { private: - ::std::vector< ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleEventListener > > mxEventListeners; + ::std::vector< css::uno::Reference< css::accessibility::XAccessibleEventListener > > + mxEventListeners; ::osl::Mutex maMutex; - ThumbnailViewItem* mpParent; + ThumbnailViewItem* mpParent; bool mbIsTransientChildrenDisabled; - static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId(); + static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId(); public: @@ -180,47 +180,47 @@ public: virtual ~ThumbnailViewItemAcc(); void FireAccessibleEvent( short nEventId, - const ::com::sun::star::uno::Any& rOldValue, - const ::com::sun::star::uno::Any& rNewValue ); + const css::uno::Any& rOldValue, + const css::uno::Any& rNewValue ); void ParentDestroyed(); - static ThumbnailViewItemAcc* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxData ) throw(); + static ThumbnailViewItemAcc* getImplementation( const css::uno::Reference< css::uno::XInterface >& rxData ) throw(); public: // XAccessible - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (css::uno::RuntimeException, std::exception) override; // XAccessibleEventBroadcaster - virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getAccessibleDescription( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getAccessibleName( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::lang::Locale SAL_CALL getLocale( ) throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override; // XAccessibleComponent - virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Point SAL_CALL getLocation( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Rectangle SAL_CALL getBounds( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getLocation( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getLocationOnScreen( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Size SAL_CALL getSize( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL grabFocus( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getForeground( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getBackground( ) throw (css::uno::RuntimeException, std::exception) override; // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw( css::uno::RuntimeException, std::exception ) override; }; #endif // INCLUDED_SFX2_SOURCE_CONTROL_THUMBNAILVIEWACC_HXX diff --git a/sfx2/source/control/thumbnailviewitem.cxx b/sfx2/source/control/thumbnailviewitem.cxx index db75ab60cc01..8b90e505f171 100644 --- a/sfx2/source/control/thumbnailviewitem.cxx +++ b/sfx2/source/control/thumbnailviewitem.cxx @@ -235,7 +235,7 @@ void ThumbnailViewItem::calculateItemsPosition (const long nThumbnailHeight, con drawinglayer::primitive2d::TextLayouterDevice aTextDev; aTextDev.setFontAttribute(pAttrs->aFontAttr, pAttrs->aFontSize.getX(), pAttrs->aFontSize.getY(), - com::sun::star::lang::Locale() ); + css::lang::Locale() ); Size aRectSize = maDrawArea.GetSize(); Size aImageSize = maPreview1.GetSizePixel(); @@ -369,7 +369,7 @@ void ThumbnailViewItem::addTextPrimitives (const OUString& rText, const Thumbnai aText, nLineStart, nLineLength, std::vector<double>(), pAttrs->aFontAttr, - com::sun::star::lang::Locale(), + css::lang::Locale(), aTextColor)); nLineStart += nLineLength; aPos.setY(aPos.getY() + aTextEngine.GetCharHeight()); diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx index 4a243ca24d10..f6658be9378f 100644 --- a/sfx2/source/control/unoctitm.cxx +++ b/sfx2/source/control/unoctitm.cxx @@ -125,11 +125,11 @@ void SfxUnoControllerItem::UnBind() { // connection to SfxControllerItem is lost pCtrlItem = NULL; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > aRef( static_cast<cppu::OWeakObject*>(this), ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::frame::XStatusListener > aRef( static_cast<cppu::OWeakObject*>(this), css::uno::UNO_QUERY ); ReleaseDispatch(); } -void SAL_CALL SfxUnoControllerItem::statusChanged(const ::com::sun::star::frame::FeatureStateEvent& rEvent) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) +void SAL_CALL SfxUnoControllerItem::statusChanged(const css::frame::FeatureStateEvent& rEvent) throw ( css::uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; DBG_ASSERT( pCtrlItem, "dispatch implementation didn't respect our previous removeStatusListener call!" ); @@ -139,7 +139,7 @@ void SAL_CALL SfxUnoControllerItem::statusChanged(const ::com::sun::star::frame: // Error can only happen if the old Dispatch is implemented incorrectly // i.e. removeStatusListener did not work. But such things can happen... // So protect before ReleaseDispatch from release! - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > aRef( static_cast<cppu::OWeakObject*>(this), ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::frame::XStatusListener > aRef( static_cast<cppu::OWeakObject*>(this), css::uno::UNO_QUERY ); ReleaseDispatch(); if ( pCtrlItem ) GetNewDispatch(); // asynchronous ?? @@ -151,7 +151,7 @@ void SAL_CALL SfxUnoControllerItem::statusChanged(const ::com::sun::star::frame: if ( rEvent.IsEnabled ) { eState = SfxItemState::DEFAULT; - ::com::sun::star::uno::Type pType = rEvent.State.getValueType(); + css::uno::Type pType = rEvent.State.getValueType(); if ( pType == cppu::UnoType< bool >::get() ) { @@ -186,9 +186,9 @@ void SAL_CALL SfxUnoControllerItem::statusChanged(const ::com::sun::star::frame: } } -void SAL_CALL SfxUnoControllerItem::disposing( const ::com::sun::star::lang::EventObject& ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) +void SAL_CALL SfxUnoControllerItem::disposing( const css::lang::EventObject& ) throw ( css::uno::RuntimeException, std::exception ) { - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > aRef( static_cast<cppu::OWeakObject*>(this), ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::frame::XStatusListener > aRef( static_cast<cppu::OWeakObject*>(this), css::uno::UNO_QUERY ); ReleaseDispatch(); } @@ -196,8 +196,8 @@ void SfxUnoControllerItem::ReleaseDispatch() { if ( xDispatch.is() ) { - xDispatch->removeStatusListener( static_cast<com::sun::star::frame::XStatusListener*>(this), aCommand ); - xDispatch = ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > (); + xDispatch->removeStatusListener( static_cast<css::frame::XStatusListener*>(this), aCommand ); + xDispatch = css::uno::Reference< css::frame::XDispatch > (); } } @@ -211,7 +211,7 @@ void SfxUnoControllerItem::GetNewDispatch() } // forget old dispatch - xDispatch = ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > (); + xDispatch = css::uno::Reference< css::frame::XDispatch > (); // no arms, no cookies ! if ( !pBindings->GetDispatcher_Impl() || !pBindings->GetDispatcher_Impl()->GetFrame() ) @@ -226,21 +226,21 @@ void SfxUnoControllerItem::GetNewDispatch() if ( !xDispatch.is() ) { // no interception - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame = rFrame.GetFrameInterface(); - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > xProv( xFrame, ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::frame::XFrame > xFrame = rFrame.GetFrameInterface(); + css::uno::Reference< css::frame::XDispatchProvider > xProv( xFrame, css::uno::UNO_QUERY ); if ( xProv.is() ) xDispatch = xProv->queryDispatch( aCommand, OUString(), 0 ); } if ( xDispatch.is() ) - xDispatch->addStatusListener( static_cast<com::sun::star::frame::XStatusListener*>(this), aCommand ); + xDispatch->addStatusListener( static_cast<css::frame::XStatusListener*>(this), aCommand ); else if ( pCtrlItem ) pCtrlItem->StateChanged( pCtrlItem->GetId(), SfxItemState::DISABLED, NULL ); } -::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SfxUnoControllerItem::TryGetDispatch( SfxFrame *pFrame ) +css::uno::Reference< css::frame::XDispatch > SfxUnoControllerItem::TryGetDispatch( SfxFrame *pFrame ) { - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDisp; + css::uno::Reference< css::frame::XDispatch > xDisp; SfxFrame *pParent = pFrame->GetParentFrame(); if ( pParent ) // parent may intercept @@ -252,7 +252,7 @@ void SfxUnoControllerItem::GetNewDispatch() void SfxUnoControllerItem::ReleaseBindings() { // connection to binding is lost; so forget the binding and the dispatch - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > aRef( static_cast<cppu::OWeakObject*>(this), ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::frame::XStatusListener > aRef( static_cast<cppu::OWeakObject*>(this), css::uno::UNO_QUERY ); ReleaseDispatch(); if ( pBindings ) pBindings->ReleaseUnoController_Impl( this ); @@ -261,19 +261,19 @@ void SfxUnoControllerItem::ReleaseBindings() void SfxStatusDispatcher::ReleaseAll() { - ::com::sun::star::lang::EventObject aObject; + css::lang::EventObject aObject; aObject.Source = static_cast<cppu::OWeakObject*>(this); aListeners.disposeAndClear( aObject ); } -void SAL_CALL SfxStatusDispatcher::dispatch( const ::com::sun::star::util::URL&, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) +void SAL_CALL SfxStatusDispatcher::dispatch( const css::util::URL&, const css::uno::Sequence< css::beans::PropertyValue >& ) throw ( css::uno::RuntimeException, std::exception ) { } void SAL_CALL SfxStatusDispatcher::dispatchWithNotification( - const ::com::sun::star::util::URL&, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >&, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchResultListener >& ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) + const css::util::URL&, + const css::uno::Sequence< css::beans::PropertyValue >&, + const css::uno::Reference< css::frame::XDispatchResultListener >& ) throw( css::uno::RuntimeException, std::exception ) { } @@ -282,28 +282,28 @@ SfxStatusDispatcher::SfxStatusDispatcher() { } -void SAL_CALL SfxStatusDispatcher::addStatusListener(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & aListener, const ::com::sun::star::util::URL& aURL) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) +void SAL_CALL SfxStatusDispatcher::addStatusListener(const css::uno::Reference< css::frame::XStatusListener > & aListener, const css::util::URL& aURL) throw ( css::uno::RuntimeException, std::exception ) { aListeners.addInterface( aURL.Complete, aListener ); if ( aURL.Complete == ".uno:LifeTime" ) { - ::com::sun::star::frame::FeatureStateEvent aEvent; + css::frame::FeatureStateEvent aEvent; aEvent.FeatureURL = aURL; - aEvent.Source = static_cast<com::sun::star::frame::XDispatch*>(this); + aEvent.Source = static_cast<css::frame::XDispatch*>(this); aEvent.IsEnabled = sal_True; aEvent.Requery = sal_False; aListener->statusChanged( aEvent ); } } -void SAL_CALL SfxStatusDispatcher::removeStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & aListener, const ::com::sun::star::util::URL& aURL ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) +void SAL_CALL SfxStatusDispatcher::removeStatusListener( const css::uno::Reference< css::frame::XStatusListener > & aListener, const css::util::URL& aURL ) throw ( css::uno::RuntimeException, std::exception ) { aListeners.removeInterface( aURL.Complete, aListener ); } // XUnoTunnel -sal_Int64 SAL_CALL SfxOfficeDispatch::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Int64 SAL_CALL SfxOfficeDispatch::getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) { if ( aIdentifier == impl_getStaticIdentifier() ) return sal::static_int_cast< sal_Int64 >( reinterpret_cast< sal_IntPtr >( this )); @@ -311,15 +311,15 @@ sal_Int64 SAL_CALL SfxOfficeDispatch::getSomething( const ::com::sun::star::uno: return 0; } -SfxOfficeDispatch::SfxOfficeDispatch( SfxBindings& rBindings, SfxDispatcher* pDispat, const SfxSlot* pSlot, const ::com::sun::star::util::URL& rURL ) +SfxOfficeDispatch::SfxOfficeDispatch( SfxBindings& rBindings, SfxDispatcher* pDispat, const SfxSlot* pSlot, const css::util::URL& rURL ) { - // this object is an adapter that shows a ::com::sun::star::frame::XDispatch-Interface to the outside and uses a SfxControllerItem to monitor a state + // this object is an adapter that shows a css::frame::XDispatch-Interface to the outside and uses a SfxControllerItem to monitor a state pControllerItem = new SfxDispatchController_Impl( this, &rBindings, pDispat, pSlot, rURL ); } -SfxOfficeDispatch::SfxOfficeDispatch( SfxDispatcher* pDispat, const SfxSlot* pSlot, const ::com::sun::star::util::URL& rURL ) +SfxOfficeDispatch::SfxOfficeDispatch( SfxDispatcher* pDispat, const SfxSlot* pSlot, const css::util::URL& rURL ) { - // this object is an adapter that shows a ::com::sun::star::frame::XDispatch-Interface to the outside and uses a SfxControllerItem to monitor a state + // this object is an adapter that shows a css::frame::XDispatch-Interface to the outside and uses a SfxControllerItem to monitor a state pControllerItem = new SfxDispatchController_Impl( this, NULL, pDispat, pSlot, rURL ); } @@ -333,16 +333,16 @@ SfxOfficeDispatch::~SfxOfficeDispatch() } } -const ::com::sun::star::uno::Sequence< sal_Int8 >& SfxOfficeDispatch::impl_getStaticIdentifier() +const css::uno::Sequence< sal_Int8 >& SfxOfficeDispatch::impl_getStaticIdentifier() { // {38 57 CA 80 09 36 11 d4 83 FE 00 50 04 52 6B 21} static const sal_uInt8 pGUID[16] = { 0x38, 0x57, 0xCA, 0x80, 0x09, 0x36, 0x11, 0xd4, 0x83, 0xFE, 0x00, 0x50, 0x04, 0x52, 0x6B, 0x21 }; - static ::com::sun::star::uno::Sequence< sal_Int8 > seqID(reinterpret_cast<const sal_Int8*>(pGUID), 16) ; + static css::uno::Sequence< sal_Int8 > seqID(reinterpret_cast<const sal_Int8*>(pGUID), 16) ; return seqID ; } -void SAL_CALL SfxOfficeDispatch::dispatch( const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) +void SAL_CALL SfxOfficeDispatch::dispatch( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) throw ( css::uno::RuntimeException, std::exception ) { // ControllerItem is the Impl class if ( pControllerItem ) @@ -354,32 +354,30 @@ void SAL_CALL SfxOfficeDispatch::dispatch( const ::com::sun::star::util::URL& aU // even if the same error (interaction) reoccurs. The effect is, that if a // user selects a menu entry than they may get only one notification that // a JRE is not selected. - com::sun::star::uno::ContextLayer layer( - new svt::JavaContext( com::sun::star::uno::getCurrentContext(), + css::uno::ContextLayer layer( + new svt::JavaContext( css::uno::getCurrentContext(), true) ); #endif - pControllerItem->dispatch( aURL, aArgs, ::com::sun::star::uno::Reference < ::com::sun::star::frame::XDispatchResultListener >() ); + pControllerItem->dispatch( aURL, aArgs, css::uno::Reference < css::frame::XDispatchResultListener >() ); } } -void SAL_CALL SfxOfficeDispatch::dispatchWithNotification( const ::com::sun::star::util::URL& aURL, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchResultListener >& rListener ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) +void SAL_CALL SfxOfficeDispatch::dispatchWithNotification( const css::util::URL& aURL, + const css::uno::Sequence< css::beans::PropertyValue >& aArgs, + const css::uno::Reference< css::frame::XDispatchResultListener >& rListener ) throw( css::uno::RuntimeException, std::exception ) { // ControllerItem is the Impl class if ( pControllerItem ) { #if HAVE_FEATURE_JAVA // see comment for SfxOfficeDispatch::dispatch - com::sun::star::uno::ContextLayer layer( - new svt::JavaContext( com::sun::star::uno::getCurrentContext(), - true) ); + css::uno::ContextLayer layer( new svt::JavaContext( css::uno::getCurrentContext(), true) ); #endif pControllerItem->dispatch( aURL, aArgs, rListener ); } } -void SAL_CALL SfxOfficeDispatch::addStatusListener(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & aListener, const ::com::sun::star::util::URL& aURL) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) +void SAL_CALL SfxOfficeDispatch::addStatusListener(const css::uno::Reference< css::frame::XStatusListener > & aListener, const css::util::URL& aURL) throw ( css::uno::RuntimeException, std::exception ) { GetListeners().addInterface( aURL.Complete, aListener ); if ( pControllerItem ) @@ -394,7 +392,7 @@ SfxDispatcher* SfxOfficeDispatch::GetDispatcher_Impl() return pControllerItem->GetDispatcher(); } -void SfxOfficeDispatch::SetFrame(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame) +void SfxOfficeDispatch::SetFrame(const css::uno::Reference< css::frame::XFrame >& xFrame) { if ( pControllerItem ) pControllerItem->SetFrame( xFrame ); @@ -407,12 +405,12 @@ void SfxOfficeDispatch::SetMasterUnoCommand( bool bSet ) } // Determine if URL contains a master/slave command which must be handled a little bit different -bool SfxOfficeDispatch::IsMasterUnoCommand( const ::com::sun::star::util::URL& aURL ) +bool SfxOfficeDispatch::IsMasterUnoCommand( const css::util::URL& aURL ) { return aURL.Protocol == ".uno:" && ( aURL.Path.indexOf( '.' ) > 0 ); } -OUString SfxOfficeDispatch::GetMasterUnoCommand( const ::com::sun::star::util::URL& aURL ) +OUString SfxOfficeDispatch::GetMasterUnoCommand( const css::util::URL& aURL ) { OUString aMasterCommand; if ( IsMasterUnoCommand( aURL )) @@ -430,7 +428,7 @@ SfxDispatchController_Impl::SfxDispatchController_Impl( SfxBindings* pBind, SfxDispatcher* pDispat, const SfxSlot* pSlot, - const ::com::sun::star::util::URL& rURL ) + const css::util::URL& rURL ) : aDispatchURL( rURL ) , pDispatcher( pDispat ) , pBindings( pBind ) @@ -472,13 +470,13 @@ SfxDispatchController_Impl::~SfxDispatchController_Impl() pDispatch->pControllerItem = NULL; // force all listeners to release the dispatch object - ::com::sun::star::lang::EventObject aObject; + css::lang::EventObject aObject; aObject.Source = static_cast<cppu::OWeakObject*>(pDispatch); pDispatch->GetListeners().disposeAndClear( aObject ); } } -void SfxDispatchController_Impl::SetFrame(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _xFrame) +void SfxDispatchController_Impl::SetFrame(const css::uno::Reference< css::frame::XFrame >& _xFrame) { xFrame = _xFrame; } @@ -499,7 +497,7 @@ void SfxDispatchController_Impl::UnBindController() } } -void SfxDispatchController_Impl::addParametersToArgs( const com::sun::star::util::URL& aURL, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rArgs ) +void SfxDispatchController_Impl::addParametersToArgs( const css::util::URL& aURL, css::uno::Sequence< css::beans::PropertyValue >& rArgs ) { // Extract the parameter from the URL and put them into the property value sequence sal_Int32 nQueryIndex = aURL.Complete.indexOf( '?' ); @@ -584,7 +582,7 @@ SfxMapUnit SfxDispatchController_Impl::GetCoreMetric( SfxItemPool& rPool, sal_uI return rPool.GetMetric( nWhich ); } -OUString SfxDispatchController_Impl::getSlaveCommand( const ::com::sun::star::util::URL& rURL ) +OUString SfxDispatchController_Impl::getSlaveCommand( const css::util::URL& rURL ) { OUString aSlaveCommand; sal_Int32 nIndex = rURL.Path.indexOf( '.' ); @@ -687,7 +685,7 @@ void collectUsageInformation(const util::URL& rURL, const uno::Sequence<beans::P aBuffer.append('('); for (sal_Int32 n = 0; n < nCount; n++) { - const ::com::sun::star::beans::PropertyValue& rProp = rArgs[n]; + const css::beans::PropertyValue& rProp = rArgs[n]; if (n > 0) aBuffer.append(','); aBuffer.append(rProp.Name); @@ -703,9 +701,9 @@ void collectUsageInformation(const util::URL& rURL, const uno::Sequence<beans::P } -void SAL_CALL SfxDispatchController_Impl::dispatch( const ::com::sun::star::util::URL& aURL, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchResultListener >& rListener ) +void SAL_CALL SfxDispatchController_Impl::dispatch( const css::util::URL& aURL, + const css::uno::Sequence< css::beans::PropertyValue >& aArgs, + const css::uno::Reference< css::frame::XDispatchResultListener >& rListener ) throw (css::uno::RuntimeException, std::exception) { collectUsageInformation(aURL, aArgs); @@ -722,7 +720,7 @@ void SAL_CALL SfxDispatchController_Impl::dispatch( const ::com::sun::star::util if ( !pDispatcher && pBindings ) pDispatcher = GetBindings().GetDispatcher_Impl(); - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > lNewArgs; + css::uno::Sequence< css::beans::PropertyValue > lNewArgs; sal_Int32 nCount = aArgs.getLength(); // Support for URL based arguments @@ -736,10 +734,10 @@ void SAL_CALL SfxDispatchController_Impl::dispatch( const ::com::sun::star::util // Filter arguments which shouldn't be part of the sequence property value sal_uInt16 nModifier(0); - std::vector< ::com::sun::star::beans::PropertyValue > aAddArgs; + std::vector< css::beans::PropertyValue > aAddArgs; for( sal_Int32 n=0; n<nCount; n++ ) { - const ::com::sun::star::beans::PropertyValue& rProp = aArgs[n]; + const css::beans::PropertyValue& rProp = aArgs[n]; if( rProp.Name == "SynchronMode" ) { bool bTemp; @@ -885,13 +883,13 @@ void SAL_CALL SfxDispatchController_Impl::dispatch( const ::com::sun::star::util if ( rListener.is() ) { - ::com::sun::star::frame::DispatchResultEvent aEvent; + css::frame::DispatchResultEvent aEvent; if ( bSuccess ) - aEvent.State = com::sun::star::frame::DispatchResultState::SUCCESS; + aEvent.State = css::frame::DispatchResultState::SUCCESS; else - aEvent.State = com::sun::star::frame::DispatchResultState::FAILURE; + aEvent.State = css::frame::DispatchResultState::FAILURE; - aEvent.Source = static_cast<com::sun::star::frame::XDispatch*>(pDispatch); + aEvent.Source = static_cast<css::frame::XDispatch*>(pDispatch); if ( bSuccess && pItem && dynamic_cast< const SfxVoidItem *>( pItem ) == nullptr ) { sal_uInt16 nSubId( 0 ); @@ -912,14 +910,14 @@ SfxDispatcher* SfxDispatchController_Impl::GetDispatcher() return pDispatcher; } -void SAL_CALL SfxDispatchController_Impl::addStatusListener(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & aListener, const ::com::sun::star::util::URL& aURL) throw ( ::com::sun::star::uno::RuntimeException ) +void SAL_CALL SfxDispatchController_Impl::addStatusListener(const css::uno::Reference< css::frame::XStatusListener > & aListener, const css::util::URL& aURL) throw ( css::uno::RuntimeException ) { SolarMutexGuard aGuard; if ( !pDispatch ) return; // Use alternative QueryState call to have a valid UNO representation of the state. - ::com::sun::star::uno::Any aState; + css::uno::Any aState; if ( !pDispatcher && pBindings ) pDispatcher = GetBindings().GetDispatcher_Impl(); SfxItemState eState = pDispatcher ? pDispatcher->QueryState( GetId(), aState ) : SfxItemState::DONTCARE; @@ -927,14 +925,14 @@ void SAL_CALL SfxDispatchController_Impl::addStatusListener(const ::com::sun::st if ( eState == SfxItemState::DONTCARE ) { // Use special uno struct to transport don't care state - ::com::sun::star::frame::status::ItemStatus aItemStatus; - aItemStatus.State = ::com::sun::star::frame::status::ItemState::DONT_CARE; + css::frame::status::ItemStatus aItemStatus; + aItemStatus.State = css::frame::status::ItemState::DONT_CARE; aState = makeAny( aItemStatus ); } - ::com::sun::star::frame::FeatureStateEvent aEvent; + css::frame::FeatureStateEvent aEvent; aEvent.FeatureURL = aURL; - aEvent.Source = static_cast<com::sun::star::frame::XDispatch*>(pDispatch); + aEvent.Source = static_cast<css::frame::XDispatch*>(pDispatch); aEvent.Requery = sal_False; if ( bVisible ) { @@ -943,7 +941,7 @@ void SAL_CALL SfxDispatchController_Impl::addStatusListener(const ::com::sun::st } else { - ::com::sun::star::frame::status::Visibility aVisibilityStatus; + css::frame::status::Visibility aVisibilityStatus; aVisibilityStatus.bVisible = sal_False; // MBA: we might decide to *not* disable "invisible" slots, but this would be @@ -988,7 +986,7 @@ void SfxDispatchController_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eSt if (bNotify) { - ::com::sun::star::uno::Any aState; + css::uno::Any aState; if ( ( eState >= SfxItemState::DEFAULT ) && pState && !IsInvalidItem( pState ) && dynamic_cast< const SfxVoidItem *>( pState ) == nullptr ) { // Retrieve metric from pool to have correct sub ID when calling QueryValue @@ -1015,14 +1013,14 @@ void SfxDispatchController_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eSt else if ( eState == SfxItemState::DONTCARE ) { // Use special uno struct to transport don't care state - ::com::sun::star::frame::status::ItemStatus aItemStatus; - aItemStatus.State = ::com::sun::star::frame::status::ItemState::DONT_CARE; + css::frame::status::ItemStatus aItemStatus; + aItemStatus.State = css::frame::status::ItemState::DONT_CARE; aState = makeAny( aItemStatus ); } - ::com::sun::star::frame::FeatureStateEvent aEvent; + css::frame::FeatureStateEvent aEvent; aEvent.FeatureURL = aDispatchURL; - aEvent.Source = static_cast<com::sun::star::frame::XDispatch*>(pDispatch); + aEvent.Source = static_cast<css::frame::XDispatch*>(pDispatch); aEvent.IsEnabled = eState != SfxItemState::DISABLED; aEvent.Requery = sal_False; aEvent.State = aState; @@ -1040,9 +1038,9 @@ void SfxDispatchController_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eSt { try { - static_cast< ::com::sun::star::frame::XStatusListener *>(aIt.next())->statusChanged( aEvent ); + static_cast< css::frame::XStatusListener *>(aIt.next())->statusChanged( aEvent ); } - catch (const ::com::sun::star::uno::RuntimeException&) + catch (const css::uno::RuntimeException&) { aIt.remove(); } @@ -1056,7 +1054,7 @@ void SfxDispatchController_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eSt StateChanged( nSID, eState, pState, 0 ); } -void SfxDispatchController_Impl::InterceptLOKStateChangeEvent(const SfxObjectShell* objSh, const ::com::sun::star::frame::FeatureStateEvent& aEvent) +void SfxDispatchController_Impl::InterceptLOKStateChangeEvent(const SfxObjectShell* objSh, const css::frame::FeatureStateEvent& aEvent) { if (!objSh || !objSh->isTiledRendering()) return; @@ -1083,19 +1081,19 @@ void SfxDispatchController_Impl::InterceptLOKStateChangeEvent(const SfxObjectShe } else if (aEvent.FeatureURL.Path == "CharFontName") { - ::com::sun::star::awt::FontDescriptor aFontDesc; + css::awt::FontDescriptor aFontDesc; aEvent.State >>= aFontDesc; aBuffer.append(aFontDesc.Name); } else if (aEvent.FeatureURL.Path == "FontHeight") { - ::com::sun::star::frame::status::FontHeight aFontHeight; + css::frame::status::FontHeight aFontHeight; aEvent.State >>= aFontHeight; aBuffer.append(aFontHeight.Height); } else if (aEvent.FeatureURL.Path == "StyleApply") { - ::com::sun::star::frame::status::Template aTemplate; + css::frame::status::Template aTemplate; aEvent.State >>= aTemplate; aBuffer.append(aTemplate.StyleName); } diff --git a/sfx2/source/dialog/backingcomp.cxx b/sfx2/source/dialog/backingcomp.cxx index e01fa1dafd89..6bc43e1def13 100644 --- a/sfx2/source/dialog/backingcomp.cxx +++ b/sfx2/source/dialog/backingcomp.cxx @@ -371,7 +371,7 @@ css::uno::Sequence< OUString > SAL_CALL BackingComp::getSupportedServiceNames() @param xFrame reference to our new target frame - @throw com::sun::star::uno::RuntimeException + @throw css::uno::RuntimeException if the given frame reference is wrong or component window couldn't be created successfully. We throw it too, if we already attached to a frame. Because we don't support @@ -564,7 +564,7 @@ sal_Bool SAL_CALL BackingComp::suspend( /*IN*/ sal_Bool ) @param aEvent describe the broadcaster of this callback - @throw ::com::sun::star::uno::RuntimeException + @throw css::uno::RuntimeException if the broadcaster doesn't represent the expected window reference. */ @@ -646,7 +646,7 @@ void SAL_CALL BackingComp::dispose() @param xListener not used. - @throw ::com::sun::star::uno::RuntimeException + @throw css::uno::RuntimeException because the listener expect to be holded alive by this container. We must inform it about this unsupported feature. */ @@ -689,7 +689,7 @@ void SAL_CALL BackingComp::removeEventListener( /*IN*/ const css::uno::Reference @param lArgs currently not used - @throw com::sun::star::uno::RuntimeException + @throw css::uno::RuntimeException if some resources are missing Means if may be attachedFrame() wasn't called before. */ diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx index a0d3c1c01ef5..3f88321b06d5 100644 --- a/sfx2/source/dialog/backingwindow.cxx +++ b/sfx2/source/dialog/backingwindow.cxx @@ -481,7 +481,7 @@ void BackingWindow::GetFocus() Window::GetFocus(); } -void BackingWindow::setOwningFrame( const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& xFrame ) +void BackingWindow::setOwningFrame( const css::uno::Reference< css::frame::XFrame >& xFrame ) { mxFrame = xFrame; if( ! mbInitControls ) @@ -573,7 +573,7 @@ IMPL_LINK_TYPED( BackingWindow, ClickHdl, Button*, pButton, void ) { Reference< XDispatchProvider > xFrame( mxFrame, UNO_QUERY ); - Sequence< com::sun::star::beans::PropertyValue > aArgs(1); + Sequence< css::beans::PropertyValue > aArgs(1); PropertyValue* pArg = aArgs.getArray(); pArg[0].Name = "Referer"; pArg[0].Value <<= OUString("private:user"); @@ -584,7 +584,7 @@ IMPL_LINK_TYPED( BackingWindow, ClickHdl, Button*, pButton, void ) { Reference< XDispatchProvider > xFrame( mxFrame, UNO_QUERY ); - Sequence< com::sun::star::beans::PropertyValue > aArgs(0); + Sequence< css::beans::PropertyValue > aArgs(0); dispatchURL( REMOTE_URL, OUString(), xFrame, aArgs ); } @@ -631,7 +631,7 @@ IMPL_LINK_TYPED( BackingWindow, MenuSelectHdl, MenuButton*, pButton, void ) { Reference< XDispatchProvider > xFrame( mxFrame, UNO_QUERY ); - Sequence< com::sun::star::beans::PropertyValue > aArgs(1); + Sequence< css::beans::PropertyValue > aArgs(1); PropertyValue* pArg = aArgs.getArray(); pArg[0].Name = "Referer"; pArg[0].Value <<= OUString("private:user"); @@ -684,11 +684,11 @@ IMPL_LINK_TYPED(BackingWindow, OpenTemplateHdl, ThumbnailViewItem*, pItem, void) struct ImplDelayedDispatch { Reference< XDispatch > xDispatch; - com::sun::star::util::URL aDispatchURL; + css::util::URL aDispatchURL; Sequence< PropertyValue > aArgs; ImplDelayedDispatch( const Reference< XDispatch >& i_xDispatch, - const com::sun::star::util::URL& i_rURL, + const css::util::URL& i_rURL, const Sequence< PropertyValue >& i_rArgs ) : xDispatch( i_xDispatch ), aDispatchURL( i_rURL ), @@ -726,11 +726,11 @@ void BackingWindow::dispatchURL( const OUString& i_rURL, return; // get an URL transformer to clean up the URL - com::sun::star::util::URL aDispatchURL; + css::util::URL aDispatchURL; aDispatchURL.Complete = i_rURL; - Reference < com::sun::star::util::XURLTransformer > xURLTransformer( - com::sun::star::util::URLTransformer::create( comphelper::getProcessComponentContext() ) ); + Reference < css::util::XURLTransformer > xURLTransformer( + css::util::URLTransformer::create( comphelper::getProcessComponentContext() ) ); try { // clean up the URL @@ -747,11 +747,11 @@ void BackingWindow::dispatchURL( const OUString& i_rURL, delete pDisp; // event could not be posted for unknown reason, at least don't leak } } - catch (const com::sun::star::uno::RuntimeException&) + catch (const css::uno::RuntimeException&) { throw; } - catch (const com::sun::star::uno::Exception&) + catch (const css::uno::Exception&) { } } diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx index 00d256c373eb..ef1e058952ec 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -344,7 +344,7 @@ bool SfxModelessDialog::Notify( NotifyEvent& rEvt ) } else if ( rEvt.GetType() == MouseNotifyEvent::LOSEFOCUS && !HasChildPathFocus() ) { - pBindings->SetActiveFrame( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > () ); + pBindings->SetActiveFrame( css::uno::Reference< css::frame::XFrame > () ); pImp->pMgr->Deactivate_Impl(); } else if( rEvt.GetType() == MouseNotifyEvent::KEYINPUT ) diff --git a/sfx2/source/dialog/bluthsnd.cxx b/sfx2/source/dialog/bluthsnd.cxx index fb538526ab38..b617e816f0c4 100644 --- a/sfx2/source/dialog/bluthsnd.cxx +++ b/sfx2/source/dialog/bluthsnd.cxx @@ -17,7 +17,7 @@ #include "bluthsndapi.hxx" -SfxBluetoothModel::SendMailResult SfxBluetoothModel::SaveAndSend( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, +SfxBluetoothModel::SendMailResult SfxBluetoothModel::SaveAndSend( const css::uno::Reference< css::frame::XFrame >& xFrame, const OUString& rType ) { SaveResult eSaveResult; @@ -36,7 +36,7 @@ SfxBluetoothModel::SendMailResult SfxBluetoothModel::SaveAndSend( const ::com::s return eResult; } -SfxBluetoothModel::SendMailResult SfxBluetoothModel::Send( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& /*xFrame*/ ) +SfxBluetoothModel::SendMailResult SfxBluetoothModel::Send( const css::uno::Reference< css::frame::XFrame >& /*xFrame*/ ) { char bthsend[300]; SendMailResult eResult = SEND_MAIL_OK; diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index aca083a01051..2127eb406f85 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -83,11 +83,10 @@ const sal_uInt16 FONT_PAGE_ID = 99; struct CustomProperty { - OUString m_sName; - com::sun::star::uno::Any m_aValue; + OUString m_sName; + css::uno::Any m_aValue; - CustomProperty( const OUString& sName, - const com::sun::star::uno::Any& rValue ) : + CustomProperty( const OUString& sName, const css::uno::Any& rValue ) : m_sName( sName ), m_aValue( rValue ) {} }; @@ -257,8 +256,7 @@ SfxDocumentInfoItem::SfxDocumentInfoItem( const OUString& rFile, for ( sal_Int32 i = 0; i < nCount; ++i ) { // "fix" property? => not a custom property => ignore it! - if (!(pProps[i].Attributes & - ::com::sun::star::beans::PropertyAttribute::REMOVABLE)) + if (!(pProps[i].Attributes & css::beans::PropertyAttribute::REMOVABLE)) { DBG_ASSERT(false, "non-removable user-defined property?"); continue; @@ -413,8 +411,7 @@ void SfxDocumentInfoItem::UpdateDocumentInfo( sal_Int32 nCount = lProps.getLength(); for ( sal_Int32 j = 0; j < nCount; ++j ) { - if ((pProps[j].Attributes & - ::com::sun::star::beans::PropertyAttribute::REMOVABLE)) + if (pProps[j].Attributes & css::beans::PropertyAttribute::REMOVABLE) { xContainer->removeProperty( pProps[j].Name ); } diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index ba26dfb0272a..47fe7096b55a 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -852,7 +852,7 @@ FileDialogHelper_Impl::FileDialogHelper_Impl( sal_Int16 nDialog, vcl::Window* _pPreferredParentWindow, const OUString& sStandardDir, - const ::com::sun::star::uno::Sequence< OUString >& rBlackList + const css::uno::Sequence< OUString >& rBlackList ) :m_nDialogType ( nDialogType ) ,meContext ( FileDialogHelper::UNKNOWN_CONTEXT ) @@ -1084,7 +1084,7 @@ FileDialogHelper_Impl::FileDialogHelper_Impl( { mxFileDlg->setTitle( SfxResId( STR_SFX_EXPLORERFILE_EXPORT ).toString() ); try { - com::sun::star::uno::Reference < XFilePickerControlAccess > xCtrlAccess( mxFileDlg, UNO_QUERY_THROW ); + css::uno::Reference < XFilePickerControlAccess > xCtrlAccess( mxFileDlg, UNO_QUERY_THROW ); xCtrlAccess->enableControl( ExtendedFilePickerElementIds::LISTBOX_FILTER_SELECTOR, sal_True ); } catch( const Exception & ) { } @@ -2233,7 +2233,7 @@ FileDialogHelper::FileDialogHelper( SfxFilterFlags nMust, SfxFilterFlags nDont, const OUString& rStandardDir, - const ::com::sun::star::uno::Sequence< OUString >& rBlackList) + const css::uno::Sequence< OUString >& rBlackList) : m_nError(0) { mpImp = new FileDialogHelper_Impl( this, nDialogType, nFlags, nDialog, NULL, rStandardDir, rBlackList ); @@ -2260,7 +2260,7 @@ FileDialogHelper::FileDialogHelper( const OUString& aFilterUIName, const OUString& aExtName, const OUString& rStandardDir, - const ::com::sun::star::uno::Sequence< OUString >& rBlackList, + const css::uno::Sequence< OUString >& rBlackList, vcl::Window* _pPreferredParent ) : m_nError(0) { @@ -2584,7 +2584,7 @@ ErrCode FileOpenDialog_Impl( sal_Int16 nDialogType, const OUString* pPath, sal_Int16 nDialog, const OUString& rStandardDir, - const ::com::sun::star::uno::Sequence< OUString >& rBlackList ) + const css::uno::Sequence< OUString >& rBlackList ) { ErrCode nRet; FileDialogHelper aDialog( nDialogType, nFlags, @@ -2610,9 +2610,9 @@ ErrCode RequestPassword(const SfxFilter* pCurrentFilter, OUString& aURL, SfxItem ::comphelper::DocPasswordRequestType_MS : ::comphelper::DocPasswordRequestType_STANDARD; - ::rtl::Reference< ::comphelper::DocPasswordRequest > pPasswordRequest( new ::comphelper::DocPasswordRequest( eType, ::com::sun::star::task::PasswordRequestMode_PASSWORD_CREATE, aURL, bool( pCurrentFilter->GetFilterFlags() & SfxFilterFlags::PASSWORDTOMODIFY ) ) ); + ::rtl::Reference< ::comphelper::DocPasswordRequest > pPasswordRequest( new ::comphelper::DocPasswordRequest( eType, css::task::PasswordRequestMode_PASSWORD_CREATE, aURL, bool( pCurrentFilter->GetFilterFlags() & SfxFilterFlags::PASSWORDTOMODIFY ) ) ); - uno::Reference< com::sun::star::task::XInteractionRequest > rRequest( pPasswordRequest.get() ); + uno::Reference< css::task::XInteractionRequest > rRequest( pPasswordRequest.get() ); xInteractionHandler->handle( rRequest ); if ( pPasswordRequest->isPassword() ) { diff --git a/sfx2/source/dialog/filedlgimpl.hxx b/sfx2/source/dialog/filedlgimpl.hxx index 75bbf4423fa8..9d50903d51da 100644 --- a/sfx2/source/dialog/filedlgimpl.hxx +++ b/sfx2/source/dialog/filedlgimpl.hxx @@ -39,13 +39,13 @@ namespace sfx2 { class FileDialogHelper_Impl : public ::cppu::WeakImplHelper< - ::com::sun::star::ui::dialogs::XFilePickerListener, - ::com::sun::star::ui::dialogs::XDialogClosedListener > + css::ui::dialogs::XFilePickerListener, + css::ui::dialogs::XDialogClosedListener > { friend class FileDialogHelper; - ::com::sun::star::uno::Reference < ::com::sun::star::ui::dialogs::XFilePicker2 > mxFileDlg; - ::com::sun::star::uno::Reference < ::com::sun::star::container::XNameAccess > mxFilterCFG; + css::uno::Reference < css::ui::dialogs::XFilePicker2 > mxFileDlg; + css::uno::Reference < css::container::XNameAccess > mxFilterCFG; std::vector< css::beans::StringPair > maFilters; @@ -141,7 +141,7 @@ namespace sfx2 void verifyPath( ); - void implGetAndCacheFiles( const ::com::sun::star::uno::Reference< XInterface >& xPicker , + void implGetAndCacheFiles( const css::uno::Reference< XInterface >& xPicker , std::vector<OUString>& rpURLList, const SfxFilter* pFilter ); @@ -150,23 +150,23 @@ namespace sfx2 public: // XFilePickerListener methods - virtual void SAL_CALL fileSelectionChanged( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL directoryChanged( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual OUString SAL_CALL helpRequested( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL controlStateChanged( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL dialogSizeChanged() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL fileSelectionChanged( const css::ui::dialogs::FilePickerEvent& aEvent ) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL directoryChanged( const css::ui::dialogs::FilePickerEvent& aEvent ) throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL helpRequested( const css::ui::dialogs::FilePickerEvent& aEvent ) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL controlStateChanged( const css::ui::dialogs::FilePickerEvent& aEvent ) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL dialogSizeChanged() throw( css::uno::RuntimeException, std::exception ) override; // XDialogClosedListener methods - virtual void SAL_CALL dialogClosed( const ::com::sun::star::ui::dialogs::DialogClosedEvent& _rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dialogClosed( const css::ui::dialogs::DialogClosedEvent& _rEvent ) throw (css::uno::RuntimeException, std::exception) override; // XEventListener methods - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw( css::uno::RuntimeException, std::exception ) override; // handle XFilePickerListener events - void handleFileSelectionChanged( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent ); - void handleDirectoryChanged( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent ); - static OUString handleHelpRequested( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent ); - void handleControlStateChanged( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent ); + void handleFileSelectionChanged( const css::ui::dialogs::FilePickerEvent& aEvent ); + void handleDirectoryChanged( const css::ui::dialogs::FilePickerEvent& aEvent ); + static OUString handleHelpRequested( const css::ui::dialogs::FilePickerEvent& aEvent ); + void handleControlStateChanged( const css::ui::dialogs::FilePickerEvent& aEvent ); void handleDialogSizeChanged(); // Own methods @@ -177,7 +177,7 @@ namespace sfx2 sal_Int16 nDialog = SFX2_IMPL_DIALOG_CONFIG, vcl::Window* _pPreferredParentWindow = NULL, const OUString& sStandardDir = OUString(), - const ::com::sun::star::uno::Sequence< OUString >& rBlackList = ::com::sun::star::uno::Sequence< OUString >() + const css::uno::Sequence< OUString >& rBlackList = css::uno::Sequence< OUString >() ); virtual ~FileDialogHelper_Impl(); @@ -203,16 +203,16 @@ namespace sfx2 ErrCode getGraphic( Graphic& rGraphic ) const; void createMatcher( const OUString& rFactory ); - bool isShowFilterExtensionEnabled() const; + bool isShowFilterExtensionEnabled() const; void addFilterPair( const OUString& rFilter, const OUString& rFilterWithExtension ); - OUString getFilterName( const OUString& rFilterWithExtension ) const; - OUString getFilterWithExtension( const OUString& rFilter ) const; + OUString getFilterName( const OUString& rFilterWithExtension ) const; + OUString getFilterWithExtension( const OUString& rFilter ) const; void SetContext( FileDialogHelper::Context _eNewContext ); - inline bool isSystemFilePicker() const { return mbSystemPicker; } - inline bool isPasswordEnabled() const { return mbIsPwdEnabled; } + inline bool isSystemFilePicker() const { return mbSystemPicker; } + inline bool isPasswordEnabled() const { return mbIsPwdEnabled; } }; } // end of namespace sfx2 diff --git a/sfx2/source/dialog/filtergrouping.cxx b/sfx2/source/dialog/filtergrouping.cxx index 5600b3283821..f0cb2cac0d8b 100644 --- a/sfx2/source/dialog/filtergrouping.cxx +++ b/sfx2/source/dialog/filtergrouping.cxx @@ -863,7 +863,7 @@ namespace sfx2 }; - TSortedFilterList::TSortedFilterList(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration >& xFilterList) + TSortedFilterList::TSortedFilterList(const css::uno::Reference< css::container::XEnumeration >& xFilterList) : m_nIterator(0) { if (!xFilterList.is()) diff --git a/sfx2/source/dialog/filtergrouping.hxx b/sfx2/source/dialog/filtergrouping.hxx index ea5317302374..87635c11b443 100644 --- a/sfx2/source/dialog/filtergrouping.hxx +++ b/sfx2/source/dialog/filtergrouping.hxx @@ -36,7 +36,7 @@ namespace sfx2 sal_Int32 m_nIterator; public: - explicit TSortedFilterList(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration >& xFilterList); + explicit TSortedFilterList(const css::uno::Reference< css::container::XEnumeration >& xFilterList); const SfxFilter* First(); const SfxFilter* Next(); @@ -50,7 +50,7 @@ namespace sfx2 */ void appendFiltersForSave( TSortedFilterList& _rFilterMatcher, - const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilterManager >& _rFilterManager, + const css::uno::Reference< css::ui::dialogs::XFilterManager >& _rFilterManager, OUString& /* [out] */ _rFirstNonEmpty, FileDialogHelper_Impl& _rFileDlgImpl, const OUString& _rFactory @@ -58,7 +58,7 @@ namespace sfx2 void appendExportFilters( TSortedFilterList& _rFilterMatcher, - const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilterManager >& _rFilterManager, + const css::uno::Reference< css::ui::dialogs::XFilterManager >& _rFilterManager, OUString& /* [out] */ _rFirstNonEmpty, FileDialogHelper_Impl& _rFileDlgImpl ); @@ -69,7 +69,7 @@ namespace sfx2 */ void appendFiltersForOpen( TSortedFilterList& _rFilterMatcher, - const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilterManager >& _rFilterManager, + const css::uno::Reference< css::ui::dialogs::XFilterManager >& _rFilterManager, OUString& /* [out] */ _rFirstNonEmpty, FileDialogHelper_Impl& _rFileDlgImpl ); diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx index 5486d1298333..fd309faf2e62 100644 --- a/sfx2/source/dialog/mailmodel.cxx +++ b/sfx2/source/dialog/mailmodel.cxx @@ -135,15 +135,14 @@ SfxMailModel::SaveResult SfxMailModel::ShowFilterOptionsDialog( const OUString& rType, bool bModified, sal_Int32& rNumArgs, - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rArgs ) + css::uno::Sequence< css::beans::PropertyValue >& rArgs ) { SaveResult eRet( SAVE_ERROR ); try { uno::Sequence < beans::PropertyValue > aProps; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > xFilterCFG = - uno::Reference< container::XNameAccess >( + css::uno::Reference< css::container::XNameAccess > xFilterCFG( xSMGR->createInstance( OUString("com.sun.star.document.FilterFactory") ), uno::UNO_QUERY ); css::uno::Reference< css::util::XModifiable > xModifiable( xModel, css::uno::UNO_QUERY ); @@ -226,7 +225,7 @@ SfxMailModel::SaveResult SfxMailModel::ShowFilterOptionsDialog( { xModifiable->setModified( sal_False ); } - catch( com::sun::star::beans::PropertyVetoException& ) + catch( css::beans::PropertyVetoException& ) { } } @@ -619,12 +618,12 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( { xModifiable->setModified( sal_False ); } - catch( com::sun::star::beans::PropertyVetoException& ) + catch( css::beans::PropertyVetoException& ) { } } } - catch ( com::sun::star::io::IOException& ) + catch ( css::io::IOException& ) { eRet = SAVE_ERROR; } @@ -642,7 +641,7 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( rFileNamePath = aFileURL; eRet = SAVE_SUCCESSFULL; } - catch ( com::sun::star::io::IOException& ) + catch ( css::io::IOException& ) { eRet = SAVE_ERROR; } diff --git a/sfx2/source/dialog/partwnd.cxx b/sfx2/source/dialog/partwnd.cxx index 35b895e3c862..d5f738f2b131 100644 --- a/sfx2/source/dialog/partwnd.cxx +++ b/sfx2/source/dialog/partwnd.cxx @@ -74,7 +74,7 @@ SfxPartChildWnd_Impl::SfxPartChildWnd_Impl SfxPartChildWnd_Impl::~SfxPartChildWnd_Impl() { - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame = GetFrame(); + css::uno::Reference< css::frame::XFrame > xFrame = GetFrame(); // If xFrame=NULL release pMgr! Because this window lives longer then the manager! // In these case we got a xFrame->dispose() call from outside ... and has release our @@ -159,10 +159,10 @@ bool SfxPartDockWnd_Impl::QueryClose() SfxChildWindow* pChild = GetChildWindow_Impl(); if( pChild ) { - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame = pChild->GetFrame(); + css::uno::Reference< css::frame::XFrame > xFrame = pChild->GetFrame(); if( xFrame.is() ) { - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > xCtrl = xFrame->getController(); + css::uno::Reference< css::frame::XController > xCtrl = xFrame->getController(); if( xCtrl.is() ) bClose = xCtrl->suspend( sal_True ); } @@ -180,7 +180,7 @@ bool SfxPartDockWnd_Impl::Notify( NotifyEvent& rEvt ) SfxChildWindow* pChild = GetChildWindow_Impl(); if( pChild ) { - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame = pChild->GetFrame(); + css::uno::Reference< css::frame::XFrame > xFrame = pChild->GetFrame(); if( xFrame.is() ) xFrame->activate(); } diff --git a/sfx2/source/dialog/recfloat.cxx b/sfx2/source/dialog/recfloat.cxx index 4d719059c110..8b68474cda65 100644 --- a/sfx2/source/dialog/recfloat.cxx +++ b/sfx2/source/dialog/recfloat.cxx @@ -47,11 +47,11 @@ static OUString GetLabelFromCommandURL( const OUString& rCommandURL, const uno:: uno::Reference< container::XNameAccess > xUICommandLabels; uno::Reference< uno::XComponentContext > xContext; uno::Reference< container::XNameAccess > xUICommandDescription; - uno::Reference< ::com::sun::star::frame::XModuleManager2 > xModuleManager; + uno::Reference< css::frame::XModuleManager2 > xModuleManager; static uno::WeakReference< uno::XComponentContext > xTmpContext; static uno::WeakReference< container::XNameAccess > xTmpNameAccess; - static uno::WeakReference< ::com::sun::star::frame::XModuleManager2 > xTmpModuleMgr; + static uno::WeakReference< css::frame::XModuleManager2 > xTmpModuleMgr; xContext = xTmpContext; if ( !xContext.is() ) @@ -139,7 +139,7 @@ SfxRecordingFloatWrapper_Impl::SfxRecordingFloatWrapper_Impl( vcl::Window* pPare SfxRecordingFloatWrapper_Impl::~SfxRecordingFloatWrapper_Impl() { SfxBoolItem aItem( FN_PARAM_1, true ); - com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > xRecorder = pBindings->GetRecorder(); + css::uno::Reference< css::frame::XDispatchRecorder > xRecorder = pBindings->GetRecorder(); if ( xRecorder.is() ) pBindings->GetDispatcher()->Execute( SID_STOP_RECORDING, SfxCallMode::SYNCHRON, &aItem, 0L ); } @@ -148,7 +148,7 @@ bool SfxRecordingFloatWrapper_Impl::QueryClose() { // asking for recorded macro should be replaced if index access is available! bool bRet = true; - com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > xRecorder = pBindings->GetRecorder(); + css::uno::Reference< css::frame::XDispatchRecorder > xRecorder = pBindings->GetRecorder(); if ( xRecorder.is() && !xRecorder->getRecordedMacro().isEmpty() ) { ScopedVclPtrInstance< QueryBox > aBox(GetWindow(), WB_YES_NO | WB_DEF_NO , SfxResId(STR_MACRO_LOSS).toString()); diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index 285dabc82caf..253b943508e3 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -50,7 +50,7 @@ struct TabPageImpl { bool mbStandard; sfx::ItemConnectionArray maItemConn; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > mxFrame; + css::uno::Reference< css::frame::XFrame > mxFrame; TabPageImpl() : mbStandard( false ) {} }; @@ -149,17 +149,17 @@ static Data_Impl* Find( const SfxTabDlgData_Impl& rArr, sal_uInt16 nId, sal_uInt return 0; } -void SfxTabPage::SetFrame(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame) +void SfxTabPage::SetFrame(const css::uno::Reference< css::frame::XFrame >& xFrame) { if (pImpl) pImpl->mxFrame = xFrame; } -::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SfxTabPage::GetFrame() +css::uno::Reference< css::frame::XFrame > SfxTabPage::GetFrame() { if (pImpl) return pImpl->mxFrame; - return ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >(); + return css::uno::Reference< css::frame::XFrame >(); } SfxTabPage::SfxTabPage(vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet *rAttrSet) diff --git a/sfx2/source/dialog/taskpane.cxx b/sfx2/source/dialog/taskpane.cxx index 0614fd65c331..e73b79c9e18f 100644 --- a/sfx2/source/dialog/taskpane.cxx +++ b/sfx2/source/dialog/taskpane.cxx @@ -182,7 +182,7 @@ namespace sfx2 // otherwise, delegate to the GraphicProvider const Reference< XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); - const Reference< XGraphicProvider > xGraphicProvider( com::sun::star::graphic::GraphicProvider::create(xContext) ); + const Reference< XGraphicProvider > xGraphicProvider( css::graphic::GraphicProvider::create(xContext) ); const Reference< XGraphic > xGraphic( xGraphicProvider->queryGraphic( aMediaProperties.getPropertyValues() ), UNO_SET_THROW ); return Image( xGraphic ); diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 745151638126..2f26a82a0c8b 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -1812,7 +1812,7 @@ static OUString getModuleIdentifier( const Reference< XModuleManager2 >& i_xModM { sIdentifier = i_xModMgr->identify( i_pObjSh->GetModel() ); } - catch ( ::com::sun::star::frame::UnknownModuleException& ) + catch ( css::frame::UnknownModuleException& ) { OSL_TRACE( "getModuleIdentifier(): unknown module" ); } diff --git a/sfx2/source/dialog/tplpitem.cxx b/sfx2/source/dialog/tplpitem.cxx index c31ac82b117b..c53998c197a6 100644 --- a/sfx2/source/dialog/tplpitem.cxx +++ b/sfx2/source/dialog/tplpitem.cxx @@ -71,9 +71,9 @@ SfxPoolItem* SfxTemplateItem::Clone( SfxItemPool *) const } -bool SfxTemplateItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const +bool SfxTemplateItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { - ::com::sun::star::frame::status::Template aTemplate; + css::frame::status::Template aTemplate; aTemplate.Value = GetValue(); aTemplate.StyleName = aStyle; @@ -83,9 +83,9 @@ bool SfxTemplateItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nM } -bool SfxTemplateItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) +bool SfxTemplateItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) { - ::com::sun::star::frame::status::Template aTemplate; + css::frame::status::Template aTemplate; if ( rVal >>= aTemplate ) { diff --git a/sfx2/source/doc/DocumentMetadataAccess.cxx b/sfx2/source/doc/DocumentMetadataAccess.cxx index ad6156cb169f..1122f8084329 100644 --- a/sfx2/source/doc/DocumentMetadataAccess.cxx +++ b/sfx2/source/doc/DocumentMetadataAccess.cxx @@ -805,7 +805,7 @@ DocumentMetadataAccess::~DocumentMetadataAccess() { } -// ::com::sun::star::rdf::XRepositorySupplier: +// css::rdf::XRepositorySupplier: uno::Reference< rdf::XRepository > SAL_CALL DocumentMetadataAccess::getRDFRepository() throw (uno::RuntimeException, std::exception) { @@ -813,14 +813,14 @@ DocumentMetadataAccess::getRDFRepository() throw (uno::RuntimeException, std::ex return m_pImpl->m_xRepository; } -// ::com::sun::star::rdf::XNode: +// css::rdf::XNode: OUString SAL_CALL DocumentMetadataAccess::getStringValue() throw (uno::RuntimeException, std::exception) { return m_pImpl->m_xBaseURI->getStringValue(); } -// ::com::sun::star::rdf::XURI: +// css::rdf::XURI: OUString SAL_CALL DocumentMetadataAccess::getNamespace() throw (uno::RuntimeException, std::exception) { @@ -833,10 +833,10 @@ DocumentMetadataAccess::getLocalName() throw (uno::RuntimeException, std::except return m_pImpl->m_xBaseURI->getLocalName(); } -// ::com::sun::star::rdf::XDocumentMetadataAccess: +// css::rdf::XDocumentMetadataAccess: uno::Reference< rdf::XMetadatable > SAL_CALL DocumentMetadataAccess::getElementByMetadataReference( - const ::com::sun::star::beans::StringPair & i_rReference) + const css::beans::StringPair & i_rReference) throw (uno::RuntimeException, std::exception) { const IXmlIdRegistry * pReg( diff --git a/sfx2/source/doc/Metadatable.cxx b/sfx2/source/doc/Metadatable.cxx index 4a8c355cc7ce..b5929b4d258c 100644 --- a/sfx2/source/doc/Metadatable.cxx +++ b/sfx2/source/doc/Metadatable.cxx @@ -147,10 +147,9 @@ public: virtual ~XmlIdRegistry(); /** get the ODF element with the given metadata reference. */ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::rdf::XMetadatable > + virtual css::uno::Reference< css::rdf::XMetadatable > GetElementByMetadataReference( - const ::com::sun::star::beans::StringPair & i_rReference) const + const css::beans::StringPair & i_rReference) const override; /** register an ODF element at a newly generated, unique metadata reference. @@ -192,7 +191,7 @@ public: virtual void UnregisterMetadatable(Metadatable const&) = 0; /** get the metadata reference for the given element. */ - ::com::sun::star::beans::StringPair + css::beans::StringPair GetXmlIdForElement(Metadatable const&) const; /** remove the metadata reference for the given element. */ @@ -272,8 +271,7 @@ public: virtual bool IsInClipboard() const override { return false; } virtual bool IsInUndo() const override { return true; } virtual bool IsInContent() const override { return m_isInContent; } - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::rdf::XMetadatable > MakeUnoObject() override + virtual css::uno::Reference< css::rdf::XMetadatable > MakeUnoObject() override { OSL_FAIL("MetadatableUndo::MakeUnoObject"); throw; } }; @@ -297,8 +295,7 @@ public: virtual bool IsInClipboard() const override { return true; } virtual bool IsInUndo() const override { return false; } virtual bool IsInContent() const override { return m_isInContent; } - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::rdf::XMetadatable > MakeUnoObject() override + virtual css::uno::Reference< css::rdf::XMetadatable > MakeUnoObject() override { OSL_FAIL("MetadatableClipboard::MakeUnoObject"); throw; } void OriginNoLongerInBusinessAnymore() { m_pReg = 0; } }; @@ -363,7 +360,7 @@ XmlIdRegistry::~XmlIdRegistry() { } -::com::sun::star::uno::Reference< ::com::sun::star::rdf::XMetadatable > +css::uno::Reference< css::rdf::XMetadatable > XmlIdRegistry::GetElementByMetadataReference( const beans::StringPair & i_rReference) const { @@ -1309,7 +1306,7 @@ void Metadatable::RemoveMetadataReference() } } -// ::com::sun::star::rdf::XMetadatable: +// css::rdf::XMetadatable: beans::StringPair Metadatable::GetMetadataReference() const { @@ -1320,9 +1317,7 @@ Metadatable::GetMetadataReference() const return beans::StringPair(); } -void -Metadatable::SetMetadataReference( - const ::com::sun::star::beans::StringPair & i_rReference) +void Metadatable::SetMetadataReference( const css::beans::StringPair & i_rReference) { if (i_rReference.Second.isEmpty()) { @@ -1568,16 +1563,16 @@ Metadatable::JoinMetadatable(Metadatable const & i_rOther, // XMetadatable mixin -// ::com::sun::star::rdf::XNode: +// css::rdf::XNode: OUString SAL_CALL MetadatableMixin::getStringValue() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { return getNamespace() + getLocalName(); } -// ::com::sun::star::rdf::XURI: +// css::rdf::XURI: OUString SAL_CALL MetadatableMixin::getLocalName() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; beans::StringPair mdref( getMetadataReference() ); @@ -1594,7 +1589,7 @@ OUString SAL_CALL MetadatableMixin::getLocalName() } OUString SAL_CALL MetadatableMixin::getNamespace() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; const uno::Reference< frame::XModel > xModel( GetModel() ); @@ -1602,7 +1597,7 @@ OUString SAL_CALL MetadatableMixin::getNamespace() return xDMA->getStringValue(); } -// ::com::sun::star::rdf::XMetadatable: +// css::rdf::XMetadatable: beans::StringPair SAL_CALL MetadatableMixin::getMetadataReference() throw (uno::RuntimeException, std::exception) diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx index 8e5d3600afbc..bfb31ee21cad 100644 --- a/sfx2/source/doc/SfxDocumentMetaData.cxx +++ b/sfx2/source/doc/SfxDocumentMetaData.cxx @@ -133,7 +133,7 @@ public: explicit SfxDocumentMetaData( css::uno::Reference< css::uno::XComponentContext > const & context); - // ::com::sun::star::lang::XServiceInfo: + // css::lang::XServiceInfo: virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( @@ -141,10 +141,10 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::lang::XComponent: + // css::lang::XComponent: virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::document::XDocumentProperties: + // css::document::XDocumentProperties: virtual OUString SAL_CALL getAuthor() throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setAuthor(const OUString & the_value) @@ -257,22 +257,22 @@ public: throw (css::uno::RuntimeException, css::lang::WrappedTargetException, css::io::IOException, std::exception) override; - // ::com::sun::star::lang::XInitialization: + // css::lang::XInitialization: virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any > & aArguments) throw (css::uno::RuntimeException, css::uno::Exception, std::exception) override; - // ::com::sun::star::util::XCloneable: + // css::util::XCloneable: virtual css::uno::Reference<css::util::XCloneable> SAL_CALL createClone() throw (css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::util::XModifiable: + // css::util::XModifiable: virtual sal_Bool SAL_CALL isModified( ) throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setModified( sal_Bool bModified ) throw (css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::util::XModifyBroadcaster: + // css::util::XModifyBroadcaster: virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener > & xListener) throw (css::uno::RuntimeException, std::exception) override; @@ -280,7 +280,7 @@ public: const css::uno::Reference< css::util::XModifyListener > & xListener) throw (css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::xml::sax::XSAXSerializable + // css::xml::sax::XSAXSerializable virtual void SAL_CALL serialize( const css::uno::Reference<css::xml::sax::XDocumentHandler>& i_xHandler, const css::uno::Sequence< css::beans::StringPair >& i_rNamespaces) @@ -366,25 +366,25 @@ public: explicit CompatWriterDocPropsImpl( css::uno::Reference< css::uno::XComponentContext > const & context) : CompatWriterDocPropsImpl_BASE( context ) {} // XCompatWriterDocPropsImpl - virtual OUString SAL_CALL getManager() throw (::com::sun::star::uno::RuntimeException, std::exception) override { return msManager; } - virtual void SAL_CALL setManager( const OUString& _manager ) throw (::com::sun::star::uno::RuntimeException, std::exception) override { msManager = _manager; } - virtual OUString SAL_CALL getCategory() throw (::com::sun::star::uno::RuntimeException, std::exception) override { return msCategory; } - virtual void SAL_CALL setCategory( const OUString& _category ) throw (::com::sun::star::uno::RuntimeException, std::exception) override { msCategory = _category; } - virtual OUString SAL_CALL getCompany() throw (::com::sun::star::uno::RuntimeException, std::exception) override { return msCompany; } - virtual void SAL_CALL setCompany( const OUString& _company ) throw (::com::sun::star::uno::RuntimeException, std::exception) override { msCompany = _company; } + virtual OUString SAL_CALL getManager() throw (css::uno::RuntimeException, std::exception) override { return msManager; } + virtual void SAL_CALL setManager( const OUString& _manager ) throw (css::uno::RuntimeException, std::exception) override { msManager = _manager; } + virtual OUString SAL_CALL getCategory() throw (css::uno::RuntimeException, std::exception) override { return msCategory; } + virtual void SAL_CALL setCategory( const OUString& _category ) throw (css::uno::RuntimeException, std::exception) override { msCategory = _category; } + virtual OUString SAL_CALL getCompany() throw (css::uno::RuntimeException, std::exception) override { return msCompany; } + virtual void SAL_CALL setCompany( const OUString& _company ) throw (css::uno::RuntimeException, std::exception) override { msCompany = _company; } // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override { return OUString("CompatWriterDocPropsImpl"); } - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override { return cppu::supportsService(this, ServiceName); } - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override { css::uno::Sequence< OUString > aServiceNames(1); aServiceNames[ 0 ] = "com.sun.star.writer.DocumentProperties"; @@ -1162,7 +1162,7 @@ void SAL_CALL SfxDocumentMetaData::init( m_xParent.clear(); try { m_xParent = xPath->selectSingleNode(xDocNode, prefix); - } catch (const com::sun::star::uno::Exception &) { + } catch (const css::uno::Exception &) { } if (!m_xParent.is()) { @@ -1393,7 +1393,7 @@ SfxDocumentMetaData::getSupportedServiceNames() } -// ::com::sun::star::lang::XComponent: +// css::lang::XComponent: void SAL_CALL SfxDocumentMetaData::dispose() throw (css::uno::RuntimeException, std::exception) { ::osl::MutexGuard g(m_aMutex); @@ -1412,7 +1412,7 @@ void SAL_CALL SfxDocumentMetaData::dispose() throw (css::uno::RuntimeException, } -// ::com::sun::star::document::XDocumentProperties: +// css::document::XDocumentProperties: OUString SAL_CALL SfxDocumentMetaData::getAuthor() throw (css::uno::RuntimeException, std::exception) { @@ -2093,10 +2093,8 @@ SfxDocumentMetaData::storeToMedium(const OUString & URL, } } -// ::com::sun::star::lang::XInitialization: -void SAL_CALL -SfxDocumentMetaData::initialize( - const css::uno::Sequence< ::com::sun::star::uno::Any > & aArguments) +// css::lang::XInitialization: +void SAL_CALL SfxDocumentMetaData::initialize( const css::uno::Sequence< css::uno::Any > & aArguments) throw (css::uno::RuntimeException, css::uno::Exception, std::exception) { // possible arguments: @@ -2132,7 +2130,7 @@ SfxDocumentMetaData::initialize( init(xDoc); } -// ::com::sun::star::util::XCloneable: +// css::util::XCloneable: css::uno::Reference<css::util::XCloneable> SAL_CALL SfxDocumentMetaData::createClone() throw (css::uno::RuntimeException, std::exception) @@ -2164,7 +2162,7 @@ SfxDocumentMetaData::createClone() return css::uno::Reference<css::util::XCloneable> (pNew); } -// ::com::sun::star::util::XModifiable: +// css::util::XModifiable: sal_Bool SAL_CALL SfxDocumentMetaData::isModified( ) throw (css::uno::RuntimeException, std::exception) { @@ -2209,7 +2207,7 @@ void SAL_CALL SfxDocumentMetaData::setModified( sal_Bool bModified ) } } -// ::com::sun::star::util::XModifyBroadcaster: +// css::util::XModifyBroadcaster: void SAL_CALL SfxDocumentMetaData::addModifyListener( const css::uno::Reference< css::util::XModifyListener > & xListener) throw (css::uno::RuntimeException, std::exception) @@ -2238,7 +2236,7 @@ void SAL_CALL SfxDocumentMetaData::removeModifyListener( } } -// ::com::sun::star::xml::sax::XSAXSerializable +// css::xml::sax::XSAXSerializable void SAL_CALL SfxDocumentMetaData::serialize( const css::uno::Reference<css::xml::sax::XDocumentHandler>& i_xHandler, const css::uno::Sequence< css::beans::StringPair >& i_rNamespaces) diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index dee6a7d43fe5..051e5feb34b9 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -396,13 +396,13 @@ util::DateTime SfxMedium::GetInitFileDate( bool bIgnoreOldValue ) { try { - uno::Reference< ::com::sun::star::ucb::XCommandEnvironment > xDummyEnv; + uno::Reference< css::ucb::XCommandEnvironment > xDummyEnv; ::ucbhelper::Content aContent( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ), xDummyEnv, comphelper::getProcessComponentContext() ); aContent.getPropertyValue("DateModified") >>= pImp->m_aDateTime; pImp->m_bGotDateTime = true; } - catch ( const ::com::sun::star::uno::Exception& ) + catch ( const css::uno::Exception& ) { } } @@ -415,8 +415,8 @@ Reference < XContent > SfxMedium::GetContent() const { if ( !pImp->aContent.get().is() ) { - Reference < ::com::sun::star::ucb::XContent > xContent; - Reference < ::com::sun::star::ucb::XCommandEnvironment > xEnv; + Reference < css::ucb::XContent > xContent; + Reference < css::ucb::XCommandEnvironment > xEnv; const SfxUnoAnyItem* pItem = SfxItemSet::GetItem<SfxUnoAnyItem>(pImp->m_pSet, SID_CONTENT, false); if ( pItem ) @@ -461,7 +461,7 @@ OUString SfxMedium::GetBaseURL( bool bForSaving ) Any aAny = pImp->aContent.getPropertyValue("BaseURI"); aAny >>= aBaseURL; } - catch ( const ::com::sun::star::uno::Exception& ) + catch ( const css::uno::Exception& ) { } @@ -734,7 +734,7 @@ bool SfxMedium::IsPreview_Impl() void SfxMedium::StorageBackup_Impl() { ::ucbhelper::Content aOriginalContent; - Reference< ::com::sun::star::ucb::XCommandEnvironment > xDummyEnv; + Reference< css::ucb::XCommandEnvironment > xDummyEnv; bool bBasedOnOriginalFile = ( !pImp->pTempFile && !( !pImp->m_aLogicName.isEmpty() && pImp->m_bSalvageMode ) && !GetURLObject().GetMainURL( INetURLObject::NO_DECODE ).isEmpty() @@ -972,10 +972,9 @@ void SfxMedium::LockOrigFileOnDemand( bool bLoading, bool bNoUI ) { if( !bResult ) { - Reference< ::com::sun::star::ucb::XCommandEnvironment > xComEnv; uno::Reference< task::XInteractionHandler > xCHandler = GetInteractionHandler( true ); - xComEnv = new ::ucbhelper::CommandEnvironment( - xCHandler, Reference< ::com::sun::star::ucb::XProgressHandler >() ); + Reference< css::ucb::XCommandEnvironment > xComEnv = new ::ucbhelper::CommandEnvironment( + xCHandler, Reference< css::ucb::XProgressHandler >() ); ucbhelper::Content aContentToLock( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ), @@ -996,11 +995,11 @@ void SfxMedium::LockOrigFileOnDemand( bool bLoading, bool bNoUI ) LockFileEntry aLockData; aLockData[LockFileComponent::OOOUSERNAME] = "Unknown user"; - uno::Sequence< ::com::sun::star::ucb::Lock > aLocks; + uno::Sequence< css::ucb::Lock > aLocks; if( aContentToLock.getPropertyValue( "DAV:lockdiscovery" ) >>= aLocks ) { // got at least a lock, show the owner of the first lock returned - ::com::sun::star::ucb::Lock aLock = aLocks[0]; + css::ucb::Lock aLock = aLocks[0]; OUString aOwner; if(aLock.Owner >>= aOwner) aLockData[LockFileComponent::OOOUSERNAME] = aOwner; @@ -1095,7 +1094,7 @@ void SfxMedium::LockOrigFileOnDemand( bool bLoading, bool bNoUI ) try { // MediaDescriptor does this check also, the duplication should be avoided in future - Reference< ::com::sun::star::ucb::XCommandEnvironment > xDummyEnv; + Reference< css::ucb::XCommandEnvironment > xDummyEnv; ::ucbhelper::Content aContent( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ), xDummyEnv, comphelper::getProcessComponentContext() ); aContent.getPropertyValue("IsReadOnly") >>= bContentReadonly; } @@ -1316,12 +1315,12 @@ uno::Reference < embed::XStorage > SfxMedium::GetStorage( bool bCreateTempIfNo ) CreateTempFile( false ); GetMedium_Impl(); - Reference< ::com::sun::star::ucb::XProgressHandler > xProgressHandler; - Reference< ::com::sun::star::task::XStatusIndicator > xStatusIndicator; + Reference< css::ucb::XProgressHandler > xProgressHandler; + Reference< css::task::XStatusIndicator > xStatusIndicator; const SfxUnoAnyItem* pxProgressItem = SfxItemSet::GetItem<SfxUnoAnyItem>(GetItemSet(), SID_PROGRESS_STATUSBAR_CONTROL, false); if( pxProgressItem && ( pxProgressItem->GetValue() >>= xStatusIndicator ) ) - xProgressHandler = Reference< ::com::sun::star::ucb::XProgressHandler >( + xProgressHandler = Reference< css::ucb::XProgressHandler >( new utl::ProgressHandlerWrap( xStatusIndicator ) ); uno::Sequence< beans::PropertyValue > aAddProps( 2 ); @@ -1560,7 +1559,7 @@ void SfxMedium::SetOpenMode( StreamMode nStorOpen, bool SfxMedium::UseBackupToRestore_Impl( ::ucbhelper::Content& aOriginalContent, - const Reference< ::com::sun::star::ucb::XCommandEnvironment >& xComEnv ) + const Reference< css::ucb::XCommandEnvironment >& xComEnv ) { try { @@ -1586,7 +1585,7 @@ bool SfxMedium::UseBackupToRestore_Impl( ::ucbhelper::Content& aOriginalContent, bool SfxMedium::StorageCommit_Impl() { bool bResult = false; - Reference< ::com::sun::star::ucb::XCommandEnvironment > xDummyEnv; + Reference< css::ucb::XCommandEnvironment > xDummyEnv; ::ucbhelper::Content aOriginalContent; if ( pImp->xStorage.is() ) @@ -1644,10 +1643,10 @@ bool SfxMedium::StorageCommit_Impl() bool SfxMedium::TransactedTransferForFS_Impl( const INetURLObject& aSource, const INetURLObject& aDest, - const Reference< ::com::sun::star::ucb::XCommandEnvironment >& xComEnv ) + const Reference< css::ucb::XCommandEnvironment >& xComEnv ) { bool bResult = false; - Reference< ::com::sun::star::ucb::XCommandEnvironment > xDummyEnv; + Reference< css::ucb::XCommandEnvironment > xDummyEnv; Reference< XOutputStream > aDestStream; ::ucbhelper::Content aOriginalContent; @@ -1655,26 +1654,26 @@ bool SfxMedium::TransactedTransferForFS_Impl( const INetURLObject& aSource, { aOriginalContent = ::ucbhelper::Content( aDest.GetMainURL( INetURLObject::NO_DECODE ), xComEnv, comphelper::getProcessComponentContext() ); } - catch ( const ::com::sun::star::ucb::CommandAbortedException& ) + catch ( const css::ucb::CommandAbortedException& ) { pImp->m_eError = ERRCODE_ABORT; } - catch ( const ::com::sun::star::ucb::CommandFailedException& ) + catch ( const css::ucb::CommandFailedException& ) { pImp->m_eError = ERRCODE_ABORT; } - catch (const ::com::sun::star::ucb::ContentCreationException& ex) + catch (const css::ucb::ContentCreationException& ex) { pImp->m_eError = ERRCODE_IO_GENERAL; if ( - (ex.eError == ::com::sun::star::ucb::ContentCreationError_NO_CONTENT_PROVIDER ) || - (ex.eError == ::com::sun::star::ucb::ContentCreationError_CONTENT_CREATION_FAILED) + (ex.eError == css::ucb::ContentCreationError_NO_CONTENT_PROVIDER ) || + (ex.eError == css::ucb::ContentCreationError_CONTENT_CREATION_FAILED) ) { pImp->m_eError = ERRCODE_IO_NOTEXISTSPATH; } } - catch (const ::com::sun::star::uno::Exception&) + catch (const css::uno::Exception&) { pImp->m_eError = ERRCODE_IO_GENERAL; } @@ -1722,15 +1721,15 @@ bool SfxMedium::TransactedTransferForFS_Impl( const INetURLObject& aSource, bResult = true; } } - catch ( const ::com::sun::star::ucb::CommandAbortedException& ) + catch ( const css::ucb::CommandAbortedException& ) { pImp->m_eError = ERRCODE_ABORT; } - catch ( const ::com::sun::star::ucb::CommandFailedException& ) + catch ( const css::ucb::CommandFailedException& ) { pImp->m_eError = ERRCODE_ABORT; } - catch ( const ::com::sun::star::ucb::InteractiveIOException& r ) + catch ( const css::ucb::InteractiveIOException& r ) { if ( r.Code == IOErrorCode_ACCESS_DENIED ) pImp->m_eError = ERRCODE_IO_ACCESSDENIED; @@ -1741,7 +1740,7 @@ bool SfxMedium::TransactedTransferForFS_Impl( const INetURLObject& aSource, else pImp->m_eError = ERRCODE_IO_GENERAL; } - catch ( const ::com::sun::star::uno::Exception& ) + catch ( const css::uno::Exception& ) { pImp->m_eError = ERRCODE_IO_GENERAL; } @@ -1803,7 +1802,7 @@ bool SfxMedium::TryDirectTransfer( const OUString& aURL, SfxItemSet& aTargetSet xSeek->seek( 0 ); } - uno::Reference < ::com::sun::star::ucb::XCommandEnvironment > xEnv; + uno::Reference < css::ucb::XCommandEnvironment > xEnv; ::ucbhelper::Content aTargetContent( aURL, xEnv, comphelper::getProcessComponentContext() ); InsertCommandArgument aInsertArg; @@ -1854,7 +1853,7 @@ void SfxMedium::Transfer_Impl() { SAL_INFO( "sfx.doc", "SfxMedium::Transfer_Impl, copying to target" ); - Reference < ::com::sun::star::ucb::XCommandEnvironment > xEnv; + Reference < css::ucb::XCommandEnvironment > xEnv; Reference< XOutputStream > rOutStream; // in case an output stream is provided from outside and the URL is correct @@ -1937,7 +1936,7 @@ void SfxMedium::Transfer_Impl() // set segment size property; package will automatically be divided in pieces fitting // into this size - ::com::sun::star::uno::Any aAny; + css::uno::Any aAny; aAny <<= pSegmentSize->GetValue(); uno::Reference < beans::XPropertySet > xSet( pImp->xStorage, uno::UNO_QUERY ); @@ -1964,11 +1963,11 @@ void SfxMedium::Transfer_Impl() // a special case, an interaction handler should be used for // authentication in case it is available - Reference< ::com::sun::star::ucb::XCommandEnvironment > xComEnv; - Reference< ::com::sun::star::task::XInteractionHandler > xInteractionHandler = GetInteractionHandler(); + Reference< css::ucb::XCommandEnvironment > xComEnv; + Reference< css::task::XInteractionHandler > xInteractionHandler = GetInteractionHandler(); if (xInteractionHandler.is()) xComEnv = new ::ucbhelper::CommandEnvironment( xInteractionHandler, - Reference< ::com::sun::star::ucb::XProgressHandler >() ); + Reference< css::ucb::XProgressHandler >() ); OUString aDestURL( aDest.GetMainURL( INetURLObject::NO_DECODE ) ); @@ -1999,11 +1998,11 @@ void SfxMedium::Transfer_Impl() { // Get the parent URL from the XChild if possible: why would the URL necessarily have // a hierarchical path? It's not always the case for CMIS. - Reference< ::com::sun::star::container::XChild> xChild( aDestContent.get(), uno::UNO_QUERY ); + Reference< css::container::XChild> xChild( aDestContent.get(), uno::UNO_QUERY ); OUString sParentUrl; if ( xChild.is( ) ) { - Reference< ::com::sun::star::ucb::XContent > xParent( xChild->getParent( ), uno::UNO_QUERY ); + Reference< css::ucb::XContent > xParent( xChild->getParent( ), uno::UNO_QUERY ); if ( xParent.is( ) ) { sParentUrl = xParent->getIdentifier( )->getContentIdentifier(); @@ -2032,18 +2031,18 @@ void SfxMedium::Transfer_Impl() { aTransferContent = ::ucbhelper::Content( aDestURL, xComEnv, comphelper::getProcessComponentContext() ); } - catch (const ::com::sun::star::ucb::ContentCreationException& ex) + catch (const css::ucb::ContentCreationException& ex) { pImp->m_eError = ERRCODE_IO_GENERAL; if ( - (ex.eError == ::com::sun::star::ucb::ContentCreationError_NO_CONTENT_PROVIDER ) || - (ex.eError == ::com::sun::star::ucb::ContentCreationError_CONTENT_CREATION_FAILED) + (ex.eError == css::ucb::ContentCreationError_NO_CONTENT_PROVIDER ) || + (ex.eError == css::ucb::ContentCreationError_CONTENT_CREATION_FAILED) ) { pImp->m_eError = ERRCODE_IO_NOTEXISTSPATH; } } - catch (const ::com::sun::star::uno::Exception&) + catch (const css::uno::Exception&) { pImp->m_eError = ERRCODE_IO_GENERAL; } @@ -2094,15 +2093,15 @@ void SfxMedium::Transfer_Impl() else if ( !sResultURL.isEmpty( ) ) // Likely to happen only for checkin SwitchDocumentToFile( sResultURL ); } - catch ( const ::com::sun::star::ucb::CommandAbortedException& ) + catch ( const css::ucb::CommandAbortedException& ) { pImp->m_eError = ERRCODE_ABORT; } - catch ( const ::com::sun::star::ucb::CommandFailedException& ) + catch ( const css::ucb::CommandFailedException& ) { pImp->m_eError = ERRCODE_ABORT; } - catch ( const ::com::sun::star::ucb::InteractiveIOException& r ) + catch ( const css::ucb::InteractiveIOException& r ) { if ( r.Code == IOErrorCode_ACCESS_DENIED ) pImp->m_eError = ERRCODE_IO_ACCESSDENIED; @@ -2113,7 +2112,7 @@ void SfxMedium::Transfer_Impl() else pImp->m_eError = ERRCODE_IO_GENERAL; } - catch ( const ::com::sun::star::uno::Exception& ) + catch ( const css::uno::Exception& ) { pImp->m_eError = ERRCODE_IO_GENERAL; } @@ -2150,7 +2149,7 @@ void SfxMedium::DoInternalBackup_Impl( const ::ucbhelper::Content& aOriginalCont INetURLObject aBackObj( aTransactTemp.GetURL() ); OUString aBackupName = aBackObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); - Reference < ::com::sun::star::ucb::XCommandEnvironment > xDummyEnv; + Reference < css::ucb::XCommandEnvironment > xDummyEnv; ::ucbhelper::Content aBackupCont; if( ::ucbhelper::Content::create( aDestDir, xDummyEnv, comphelper::getProcessComponentContext(), aBackupCont ) ) { @@ -2192,7 +2191,7 @@ void SfxMedium::DoInternalBackup_Impl( const ::ucbhelper::Content& aOriginalCont // create content for the parent folder ( = backup folder ) ::ucbhelper::Content aContent; - Reference < ::com::sun::star::ucb::XCommandEnvironment > xEnv; + Reference < css::ucb::XCommandEnvironment > xEnv; if( ::utl::UCBContentHelper::ensureFolder(comphelper::getProcessComponentContext(), xEnv, aBakDir, aContent) ) DoInternalBackup_Impl( aOriginalContent, aPrefix, aExtension, aBakDir ); @@ -2230,7 +2229,7 @@ void SfxMedium::DoBackup_Impl() { // create content for the parent folder ( = backup folder ) ::ucbhelper::Content aContent; - Reference < ::com::sun::star::ucb::XCommandEnvironment > xEnv; + Reference < css::ucb::XCommandEnvironment > xEnv; if( ::utl::UCBContentHelper::ensureFolder(comphelper::getProcessComponentContext(), xEnv, aBakDir, aContent) ) { // save as ".bak" file @@ -2258,7 +2257,7 @@ void SfxMedium::DoBackup_Impl() pImp->m_bRemoveBackup = false; } } - catch ( const ::com::sun::star::uno::Exception& ) + catch ( const css::uno::Exception& ) { } } @@ -2341,7 +2340,7 @@ void SfxMedium::GetMedium_Impl() if ( !pImp->m_pInStream ) { pImp->bDownloadDone = false; - Reference< ::com::sun::star::task::XInteractionHandler > xInteractionHandler = GetInteractionHandler(); + Reference< css::task::XInteractionHandler > xInteractionHandler = GetInteractionHandler(); //TODO/MBA: need support for SID_STREAM const SfxUnoAnyItem* pWriteStreamItem = SfxItemSet::GetItem<SfxUnoAnyItem>(pImp->m_pSet, SID_STREAM, false); @@ -2619,17 +2618,17 @@ void SfxMedium::UseInteractionHandler( bool bUse ) -::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler > +css::uno::Reference< css::task::XInteractionHandler > SfxMedium::GetInteractionHandler( bool bGetAlways ) { // if interaction isn't allowed explicitly ... return empty reference! if ( !bGetAlways && !pImp->bUseInteractionHandler ) - return ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >(); + return css::uno::Reference< css::task::XInteractionHandler >(); // search a possible existing handler inside cached item set if ( pImp->m_pSet ) { - ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler > xHandler; + css::uno::Reference< css::task::XInteractionHandler > xHandler; const SfxUnoAnyItem* pHandler = SfxItemSet::GetItem<SfxUnoAnyItem>(pImp->m_pSet, SID_INTERACTIONHANDLER, false); if ( pHandler && (pHandler->GetValue() >>= xHandler) && xHandler.is() ) return xHandler; @@ -2637,7 +2636,7 @@ SfxMedium::GetInteractionHandler( bool bGetAlways ) // if default interaction isn't allowed explicitly ... return empty reference! if ( !bGetAlways && !pImp->bAllowDefaultIntHdl ) - return ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >(); + return css::uno::Reference< css::task::XInteractionHandler >(); // otherwise return cached default handler ... if it exist. if ( pImp->xInteraction.is() ) @@ -2734,10 +2733,9 @@ void SfxMedium::UnlockFile( bool bReleaseLockStream ) { // an interaction handler should be used for authentication, if needed try { - uno::Reference< ::com::sun::star::task::XInteractionHandler > xHandler = GetInteractionHandler( true ); - uno::Reference< ::com::sun::star::ucb::XCommandEnvironment > xComEnv; - xComEnv = new ::ucbhelper::CommandEnvironment( xHandler, - Reference< ::com::sun::star::ucb::XProgressHandler >() ); + uno::Reference< css::task::XInteractionHandler > xHandler = GetInteractionHandler( true ); + uno::Reference< css::ucb::XCommandEnvironment > xComEnv = new ::ucbhelper::CommandEnvironment( xHandler, + Reference< css::ucb::XProgressHandler >() ); ucbhelper::Content aContentToUnlock( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ), xComEnv, comphelper::getProcessComponentContext()); pImp->m_bLocked = false; //check if WebDAV unlock was explicitly disabled @@ -3146,7 +3144,7 @@ SfxFrame* SfxMedium::GetLoadTargetFrame() const return pImp->wLoadTargetFrame; } -void SfxMedium::setStreamToLoadFrom(const com::sun::star::uno::Reference<com::sun::star::io::XInputStream>& xInputStream, bool bIsReadOnly ) +void SfxMedium::setStreamToLoadFrom(const css::uno::Reference<css::io::XInputStream>& xInputStream, bool bIsReadOnly ) { pImp->m_xInputStreamToLoadFrom = xInputStream; pImp->m_bInputStreamIsReadOnly = bIsReadOnly; @@ -3189,7 +3187,7 @@ SvKeyValueIterator* SfxMedium::GetHeaderAttributes_Impl() pImp->xAttributes->Append( SvKeyValue( OUString("content-type"), aContentType ) ); } - catch ( const ::com::sun::star::uno::Exception& ) + catch ( const css::uno::Exception& ) { } } @@ -3198,7 +3196,7 @@ SvKeyValueIterator* SfxMedium::GetHeaderAttributes_Impl() return pImp->xAttributes; } -::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SfxMedium::GetInputStream() +css::uno::Reference< css::io::XInputStream > SfxMedium::GetInputStream() { if ( !pImp->xInputStream.is() ) GetMedium_Impl(); @@ -3418,7 +3416,7 @@ void SfxMedium::CreateTempFile( bool bReplace ) // if it is a file system use OS copy process try { - uno::Reference< ::com::sun::star::ucb::XCommandEnvironment > xComEnv; + uno::Reference< css::ucb::XCommandEnvironment > xComEnv; INetURLObject aTmpURLObj( aTmpURL ); OUString aFileName = aTmpURLObj.getName( INetURLObject::LAST_SEGMENT, true, @@ -3660,7 +3658,7 @@ OUString SfxMedium::CreateTempCopyWithExt( const OUString& aURL ) { try { - uno::Reference< ::com::sun::star::ucb::XCommandEnvironment > xComEnv; + uno::Reference< css::ucb::XCommandEnvironment > xComEnv; ::ucbhelper::Content aTargetContent( aDest.GetMainURL( INetURLObject::NO_DECODE ), xComEnv, comphelper::getProcessComponentContext() ); ::ucbhelper::Content aSourceContent( aSource.GetMainURL( INetURLObject::NO_DECODE ), xComEnv, comphelper::getProcessComponentContext() ); if ( aTargetContent.transferContent( aSourceContent, diff --git a/sfx2/source/doc/docfilt.cxx b/sfx2/source/doc/docfilt.cxx index bbb278d0e8da..4af1663eb2b2 100644 --- a/sfx2/source/doc/docfilt.cxx +++ b/sfx2/source/doc/docfilt.cxx @@ -191,14 +191,14 @@ OUString SfxFilter::GetTypeFromStorage( pFilterName->clear(); } - com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > xProps( xStorage, com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::beans::XPropertySet > xProps( xStorage, css::uno::UNO_QUERY ); if ( xProps.is() ) { OUString aMediaType; xProps->getPropertyValue("MediaType") >>= aMediaType; if ( !aMediaType.isEmpty() ) { - ::com::sun::star::datatransfer::DataFlavor aDataFlavor; + css::datatransfer::DataFlavor aDataFlavor; aDataFlavor.MimeType = aMediaType; SotClipboardFormatId nClipId = SotExchange::GetFormat( aDataFlavor ); if ( nClipId != SotClipboardFormatId::NONE ) diff --git a/sfx2/source/doc/doctemplateslocal.hxx b/sfx2/source/doc/doctemplateslocal.hxx index 75ee5ed1df23..a0a0748caafd 100644 --- a/sfx2/source/doc/doctemplateslocal.hxx +++ b/sfx2/source/doc/doctemplateslocal.hxx @@ -27,7 +27,7 @@ #include <cppuhelper/implbase.hxx> -class DocTemplLocaleHelper : public cppu::WeakImplHelper < com::sun::star::xml::sax::XDocumentHandler > +class DocTemplLocaleHelper : public cppu::WeakImplHelper < css::xml::sax::XDocumentHandler > { // Relations info related strings OUString m_aGroupListElement; @@ -35,43 +35,43 @@ class DocTemplLocaleHelper : public cppu::WeakImplHelper < com::sun::star::xml:: OUString m_aNameAttr; OUString m_aUINameAttr; - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > m_aResultSeq; - ::com::sun::star::uno::Sequence< OUString > m_aElementsSeq; // stack of elements being parsed + css::uno::Sequence< css::beans::StringPair > m_aResultSeq; + css::uno::Sequence< OUString > m_aElementsSeq; // stack of elements being parsed DocTemplLocaleHelper(); - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > GetParsingResult(); + css::uno::Sequence< css::beans::StringPair > GetParsingResult(); - static ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > SAL_CALL ReadLocalizationSequence_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInStream, const OUString& aStringID, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext ) - throw( ::com::sun::star::uno::Exception ); + static css::uno::Sequence< css::beans::StringPair > SAL_CALL ReadLocalizationSequence_Impl( const css::uno::Reference< css::io::XInputStream >& xInStream, const OUString& aStringID, const css::uno::Reference< css::uno::XComponentContext > xContext ) + throw( css::uno::Exception ); public: virtual ~DocTemplLocaleHelper(); // returns sequence of pairs ( GroupName, GroupUIName ) static - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > + css::uno::Sequence< css::beans::StringPair > ReadGroupLocalizationSequence( - const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInStream, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext ) - throw( ::com::sun::star::uno::Exception ); + const css::uno::Reference< css::io::XInputStream >& xInStream, + const css::uno::Reference< css::uno::XComponentContext > xContext ) + throw( css::uno::Exception ); // writes sequence of elements ( GroupName, GroupUIName ) static void SAL_CALL WriteGroupLocalizationSequence( - const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& xOutStream, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair >& aSequence, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext ) - throw( ::com::sun::star::uno::Exception ); + const css::uno::Reference< css::io::XOutputStream >& xOutStream, + const css::uno::Sequence< css::beans::StringPair >& aSequence, + const css::uno::Reference< css::uno::XComponentContext > xContext ) + throw( css::uno::Exception ); // XDocumentHandler - virtual void SAL_CALL startDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL endDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL startElement( const OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL endElement( const OUString& aName ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL characters( const OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >& xLocator ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL startDocument() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL endDocument() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL startElement( const OUString& aName, const css::uno::Reference< css::xml::sax::XAttributeList >& xAttribs ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL endElement( const OUString& aName ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL characters( const OUString& aChars ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& xLocator ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sfx2/source/doc/graphhelp.hxx b/sfx2/source/doc/graphhelp.hxx index 8893bfc714ec..d022870e2202 100644 --- a/sfx2/source/doc/graphhelp.hxx +++ b/sfx2/source/doc/graphhelp.hxx @@ -50,14 +50,14 @@ public: static bool getThumbnailFormatFromGDI_Impl( GDIMetaFile* pMetaFile, - const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xStream ); + const css::uno::Reference< css::io::XStream >& xStream ); static sal_uInt16 getThumbnailReplacementIDByFactoryName_Impl( const OUString& aFactoryShortName, bool bIsTemplate ); static bool getThumbnailReplacement_Impl( sal_Int32 nResID, - const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xStream ); + const css::uno::Reference< css::io::XStream >& xStream ); }; diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx index 6e272bc62342..c85cbabbc255 100644 --- a/sfx2/source/doc/guisaveas.cxx +++ b/sfx2/source/doc/guisaveas.cxx @@ -317,7 +317,7 @@ public: OUString& aSuggestedDir, sal_Int16 nDialog, const OUString& rStandardDir, - const ::com::sun::star::uno::Sequence< OUString >& rBlackList + const css::uno::Sequence< OUString >& rBlackList ); bool ShowDocumentInfoDialog(); @@ -835,7 +835,7 @@ bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode, OUString& aSuggestedDir, sal_Int16 nDialog, const OUString& rStandardDir, - const ::com::sun::star::uno::Sequence< OUString >& rBlackList) + const css::uno::Sequence< OUString >& rBlackList) { if ( nStoreMode == SAVEASREMOTE_REQUESTED ) nStoreMode = SAVEAS_REQUESTED; @@ -865,19 +865,19 @@ bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode, // get the filename by dialog ... // create the file dialog sal_Int16 aDialogMode = bAllowOptions - ? (com::sun::star::ui::dialogs::TemplateDescription:: + ? (css::ui::dialogs::TemplateDescription:: FILESAVE_AUTOEXTENSION_PASSWORD_FILTEROPTIONS) - : (com::sun::star::ui::dialogs::TemplateDescription:: + : (css::ui::dialogs::TemplateDescription:: FILESAVE_AUTOEXTENSION_PASSWORD); sal_Int64 aDialogFlags = 0; if( ( nStoreMode & EXPORT_REQUESTED ) && !( nStoreMode & WIDEEXPORT_REQUESTED ) ) { if ( nStoreMode & PDFEXPORT_REQUESTED ) - aDialogMode = com::sun::star::ui::dialogs::TemplateDescription:: + aDialogMode = css::ui::dialogs::TemplateDescription:: FILESAVE_AUTOEXTENSION; else - aDialogMode = com::sun::star::ui::dialogs::TemplateDescription:: + aDialogMode = css::ui::dialogs::TemplateDescription:: FILESAVE_AUTOEXTENSION_SELECTION; aDialogFlags = SFXWB_EXPORT; } @@ -1324,7 +1324,7 @@ uno::Reference< container::XContainerQuery > SfxStoringHelper::GetFilterQuery() } -uno::Reference< ::com::sun::star::frame::XModuleManager2 > SfxStoringHelper::GetModuleManager() +uno::Reference< css::frame::XModuleManager2 > SfxStoringHelper::GetModuleManager() { if ( !m_xModuleManager.is() ) { @@ -1556,7 +1556,7 @@ bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel, if ( aStdDirIter != aModelData.GetMediaDescr().end() ) aStdDirIter->second >>= sStandardDir; - ::com::sun::star::uno::Sequence< OUString > aBlackList; + css::uno::Sequence< OUString > aBlackList; ::comphelper::SequenceAsHashMap::const_iterator aBlackListIter = aModelData.GetMediaDescr().find( OUString("BlackList") ); @@ -1797,7 +1797,7 @@ void SfxStoringHelper::SetDocInfoState( for (i=0; i<c; ++i) { uno::Any aValue = xPropSet->getPropertyValue( pProps[i].Name ); - if ( pProps[i].Attributes & ::com::sun::star::beans::PropertyAttribute::REMOVABLE ) + if ( pProps[i].Attributes & css::beans::PropertyAttribute::REMOVABLE ) { try { diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx index 91b0466da86c..320ec3449a8c 100644 --- a/sfx2/source/doc/iframe.cxx +++ b/sfx2/source/doc/iframe.cxx @@ -166,7 +166,7 @@ IFrameObject::~IFrameObject() } sal_Bool SAL_CALL IFrameObject::load( - const uno::Sequence < com::sun::star::beans::PropertyValue >& /*lDescriptor*/, + const uno::Sequence < css::beans::PropertyValue >& /*lDescriptor*/, const uno::Reference < frame::XFrame >& xFrame ) throw( uno::RuntimeException, std::exception ) { @@ -214,7 +214,7 @@ throw( uno::RuntimeException, std::exception ) return sal_False; } -void SAL_CALL IFrameObject::cancel() throw( com::sun::star::uno::RuntimeException, std::exception ) +void SAL_CALL IFrameObject::cancel() throw( css::uno::RuntimeException, std::exception ) { try { @@ -228,24 +228,24 @@ void SAL_CALL IFrameObject::cancel() throw( com::sun::star::uno::RuntimeExceptio } } -void SAL_CALL IFrameObject::close( sal_Bool /*bDeliverOwnership*/ ) throw( com::sun::star::util::CloseVetoException, com::sun::star::uno::RuntimeException, std::exception ) +void SAL_CALL IFrameObject::close( sal_Bool /*bDeliverOwnership*/ ) throw( css::util::CloseVetoException, css::uno::RuntimeException, std::exception ) { } -void SAL_CALL IFrameObject::addCloseListener( const com::sun::star::uno::Reference < com::sun::star::util::XCloseListener >& ) throw( com::sun::star::uno::RuntimeException, std::exception ) +void SAL_CALL IFrameObject::addCloseListener( const css::uno::Reference < css::util::XCloseListener >& ) throw( css::uno::RuntimeException, std::exception ) { } -void SAL_CALL IFrameObject::removeCloseListener( const com::sun::star::uno::Reference < com::sun::star::util::XCloseListener >& ) throw( com::sun::star::uno::RuntimeException, std::exception ) +void SAL_CALL IFrameObject::removeCloseListener( const css::uno::Reference < css::util::XCloseListener >& ) throw( css::uno::RuntimeException, std::exception ) { } -void SAL_CALL IFrameObject::disposing( const com::sun::star::lang::EventObject& ) throw (com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL IFrameObject::disposing( const css::lang::EventObject& ) throw (css::uno::RuntimeException, std::exception) { cancel(); } -uno::Reference< beans::XPropertySetInfo > SAL_CALL IFrameObject::getPropertySetInfo() throw( ::com::sun::star::uno::RuntimeException, std::exception ) +uno::Reference< beans::XPropertySetInfo > SAL_CALL IFrameObject::getPropertySetInfo() throw( css::uno::RuntimeException, std::exception ) { static uno::Reference< beans::XPropertySetInfo > xInfo = new SfxItemPropertySetInfo( maPropMap ); return xInfo; @@ -389,23 +389,23 @@ uno::Any SAL_CALL IFrameObject::getPropertyValue(const OUString& aPropertyName) return aAny; } -void SAL_CALL IFrameObject::addPropertyChangeListener(const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) +void SAL_CALL IFrameObject::addPropertyChangeListener(const OUString&, const css::uno::Reference< css::beans::XPropertyChangeListener > & ) throw( css::uno::RuntimeException, std::exception ) { } -void SAL_CALL IFrameObject::removePropertyChangeListener(const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) +void SAL_CALL IFrameObject::removePropertyChangeListener(const OUString&, const css::uno::Reference< css::beans::XPropertyChangeListener > & ) throw( css::uno::RuntimeException, std::exception ) { } -void SAL_CALL IFrameObject::addVetoableChangeListener(const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) +void SAL_CALL IFrameObject::addVetoableChangeListener(const OUString&, const css::uno::Reference< css::beans::XVetoableChangeListener > & ) throw( css::uno::RuntimeException, std::exception ) { } -void SAL_CALL IFrameObject::removeVetoableChangeListener(const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) +void SAL_CALL IFrameObject::removeVetoableChangeListener(const OUString&, const css::uno::Reference< css::beans::XVetoableChangeListener > & ) throw( css::uno::RuntimeException, std::exception ) { } -::sal_Int16 SAL_CALL IFrameObject::execute() throw (::com::sun::star::uno::RuntimeException, std::exception) +::sal_Int16 SAL_CALL IFrameObject::execute() throw (css::uno::RuntimeException, std::exception) { SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); VclAbstractDialog* pDlg = pFact->CreateEditObjectDialog( NULL, ".uno:InsertObjectFloatingFrame", mxObj ); @@ -414,7 +414,7 @@ void SAL_CALL IFrameObject::removeVetoableChangeListener(const OUString&, const return 0; } -void SAL_CALL IFrameObject::setTitle( const OUString& ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL IFrameObject::setTitle( const OUString& ) throw (css::uno::RuntimeException, std::exception) { } diff --git a/sfx2/source/doc/objitem.cxx b/sfx2/source/doc/objitem.cxx index 20192a9c16e8..f3ba9cae2a56 100644 --- a/sfx2/source/doc/objitem.cxx +++ b/sfx2/source/doc/objitem.cxx @@ -35,7 +35,7 @@ SfxPoolItem* SfxObjectShellItem::Clone( SfxItemPool *) const return new SfxObjectShellItem( Which(), pObjSh ); } -bool SfxObjectShellItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const +bool SfxObjectShellItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { if ( pObjSh ) { @@ -45,26 +45,25 @@ bool SfxObjectShellItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 / } else { - rVal <<= ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >(); + rVal <<= css::uno::Reference< css::frame::XModel >(); } return true; } -bool SfxObjectShellItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) +bool SfxObjectShellItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) { // This item MUST have a model. Please don't change this, there are UNO-based // implementations which need it!! - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > xModel; + css::uno::Reference< css::frame::XModel > xModel; if ( rVal >>= xModel ) { if ( xModel.is() ) { - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XUnoTunnel > xTunnel( - xModel, ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::lang::XUnoTunnel > xTunnel( xModel, css::uno::UNO_QUERY ); if ( xTunnel.is() ) { - ::com::sun::star::uno::Sequence < sal_Int8 > aSeq = SvGlobalName( SFX_GLOBAL_CLASSID ).GetByteSequence(); + css::uno::Sequence < sal_Int8 > aSeq = SvGlobalName( SFX_GLOBAL_CLASSID ).GetByteSequence(); sal_Int64 nHandle = xTunnel->getSomething( aSeq ); if ( nHandle ) { diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index 1b12c33ac9bc..96f23e61d0c9 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -803,7 +803,7 @@ OUString SfxObjectShell::GetTitle 10 bis USHRT_MAX provides the 'nMaxLength' of the logical file name including the path - (remote => ::com::sun::star::util::URL) + (remote => css::util::URL) */ ) const @@ -1111,7 +1111,7 @@ void SfxObjectShell::CheckEncryption_Impl( const uno::Reference< task::XInteract if ( !pImp->m_bIncomplEncrWarnShown ) { // this is an encrypted document with nonencrypted streams inside, show the warning - ::com::sun::star::task::ErrorCodeRequest aErrorCode; + css::task::ErrorCodeRequest aErrorCode; aErrorCode.ErrCode = ERRCODE_SFX_INCOMPLETE_ENCRYPTION; SfxMedium::CallApproveHandler( xHandler, uno::makeAny( aErrorCode ), false ); @@ -1513,7 +1513,7 @@ namespace } ErrCode SfxObjectShell::CallXScript( const Reference< XInterface >& _rxScriptContext, const OUString& _rScriptURL, - const Sequence< Any >& aParams, Any& aRet, Sequence< sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam, bool bRaiseError, const ::com::sun::star::uno::Any* pCaller ) + const Sequence< Any >& aParams, Any& aRet, Sequence< sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam, bool bRaiseError, const css::uno::Any* pCaller ) { OSL_TRACE( "in CallXScript" ); ErrCode nErr = ERRCODE_NONE; diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index 8aecba13a9ed..53a318d1830d 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -123,7 +123,7 @@ void SfxObjectShell::InitInterface_Impl() { } -class SfxClosePreventer_Impl : public ::cppu::WeakImplHelper< ::com::sun::star::util::XCloseListener > +class SfxClosePreventer_Impl : public ::cppu::WeakImplHelper< css::util::XCloseListener > { bool m_bGotOwnership; bool m_bPreventClose; @@ -1346,7 +1346,7 @@ uno::Sequence< security::DocumentSignatureInformation > SfxObjectShell::ImplAnal aResult = xLocSigner->verifyDocumentContentSignatures( GetMedium()->GetZipStorageToSign_Impl(), uno::Reference< io::XInputStream >() ); } - catch( com::sun::star::uno::Exception& ) + catch( css::uno::Exception& ) { } } diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index d9c733e5d018..778f51bbaf36 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -796,8 +796,8 @@ bool SfxObjectShell::DoLoad( SfxMedium *pMed ) try { - ::ucbhelper::Content aContent( pMedium->GetName(), com::sun::star::uno::Reference < XCommandEnvironment >(), comphelper::getProcessComponentContext() ); - com::sun::star::uno::Reference < XPropertySetInfo > xProps = aContent.getProperties(); + ::ucbhelper::Content aContent( pMedium->GetName(), css::uno::Reference < XCommandEnvironment >(), comphelper::getProcessComponentContext() ); + css::uno::Reference < XPropertySetInfo > xProps = aContent.getProperties(); if ( xProps.is() ) { OUString aAuthor( "Author" ); @@ -888,11 +888,11 @@ sal_uInt32 SfxObjectShell::HandleFilter( SfxMedium* pMedium, SfxObjectShell* pDo const SfxUnoAnyItem* pData = SfxItemSet::GetItem<SfxUnoAnyItem>(pSet, SID_FILTER_DATA, false); if ( !pData && !pOptions ) { - com::sun::star::uno::Reference< XMultiServiceFactory > xServiceManager = ::comphelper::getProcessServiceFactory(); - com::sun::star::uno::Reference< XNameAccess > xFilterCFG; + css::uno::Reference< XMultiServiceFactory > xServiceManager = ::comphelper::getProcessServiceFactory(); + css::uno::Reference< XNameAccess > xFilterCFG; if( xServiceManager.is() ) { - xFilterCFG = com::sun::star::uno::Reference< XNameAccess >( + xFilterCFG = css::uno::Reference< XNameAccess >( xServiceManager->createInstance("com.sun.star.document.FilterFactory"), UNO_QUERY ); } @@ -914,7 +914,7 @@ sal_uInt32 SfxObjectShell::HandleFilter( SfxMedium* pMedium, SfxObjectShell* pDo aProps[nProperty].Value >>= aServiceName; if( !aServiceName.isEmpty() ) { - com::sun::star::uno::Reference< XInteractionHandler > rHandler = pMedium->GetInteractionHandler(); + css::uno::Reference< XInteractionHandler > rHandler = pMedium->GetInteractionHandler(); if( rHandler.is() ) { // we need some properties in the media descriptor, so we have to make sure that they are in @@ -931,7 +931,7 @@ sal_uInt32 SfxObjectShell::HandleFilter( SfxMedium* pMedium, SfxObjectShell* pDo TransformItems( SID_OPENDOC, *pSet, rProperties ); RequestFilterOptions* pFORequest = new RequestFilterOptions( pDoc->GetModel(), rProperties ); - com::sun::star::uno::Reference< XInteractionRequest > rRequest( pFORequest ); + css::uno::Reference< XInteractionRequest > rRequest( pFORequest ); rHandler->handle( rRequest ); if ( !pFORequest->isAbort() ) @@ -1715,8 +1715,8 @@ bool SfxObjectShell::SaveTo_Impl { try { - ::ucbhelper::Content aContent( rMedium.GetName(), com::sun::star::uno::Reference < XCommandEnvironment >(), comphelper::getProcessComponentContext() ); - com::sun::star::uno::Reference < XPropertySetInfo > xProps = aContent.getProperties(); + ::ucbhelper::Content aContent( rMedium.GetName(), css::uno::Reference < XCommandEnvironment >(), comphelper::getProcessComponentContext() ); + css::uno::Reference < XPropertySetInfo > xProps = aContent.getProperties(); if ( xProps.is() ) { OUString aAuthor( "Author" ); @@ -2222,9 +2222,9 @@ bool SfxObjectShell::ImportFrom(SfxMedium& rMedium, rMedium.GetItemSet()->Put( SfxStringItem( SID_FILE_NAME, rMedium.GetName() ) ); TransformItems( SID_OPENDOC, *rMedium.GetItemSet(), lDescriptor ); - com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue > aArgs ( lDescriptor.getLength() ); - com::sun::star::beans::PropertyValue * pNewValue = aArgs.getArray(); - const com::sun::star::beans::PropertyValue * pOldValue = lDescriptor.getConstArray(); + css::uno::Sequence < css::beans::PropertyValue > aArgs ( lDescriptor.getLength() ); + css::beans::PropertyValue * pNewValue = aArgs.getArray(); + const css::beans::PropertyValue * pOldValue = lDescriptor.getConstArray(); const OUString sInputStream ( "InputStream" ); bool bHasInputStream = false; @@ -2245,7 +2245,7 @@ bool SfxObjectShell::ImportFrom(SfxMedium& rMedium, { aArgs.realloc ( ++nEnd ); aArgs[nEnd-1].Name = sInputStream; - aArgs[nEnd-1].Value <<= com::sun::star::uno::Reference < com::sun::star::io::XInputStream > ( new utl::OSeekableInputStreamWrapper ( *rMedium.GetInStream() ) ); + aArgs[nEnd-1].Value <<= css::uno::Reference < css::io::XInputStream > ( new utl::OSeekableInputStreamWrapper ( *rMedium.GetInStream() ) ); } if ( !bHasBaseURL ) @@ -2350,13 +2350,13 @@ bool SfxObjectShell::ExportTo( SfxMedium& rMedium ) uno::Reference< document::XFilter > xFilter( xExporter, uno::UNO_QUERY_THROW ); xExporter->setSourceDocument( xComp ); - com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue > aOldArgs; + css::uno::Sequence < css::beans::PropertyValue > aOldArgs; SfxItemSet* pItems = rMedium.GetItemSet(); TransformItems( SID_SAVEASDOC, *pItems, aOldArgs ); - const com::sun::star::beans::PropertyValue * pOldValue = aOldArgs.getConstArray(); - com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue > aArgs ( aOldArgs.getLength() ); - com::sun::star::beans::PropertyValue * pNewValue = aArgs.getArray(); + const css::beans::PropertyValue * pOldValue = aOldArgs.getConstArray(); + css::uno::Sequence < css::beans::PropertyValue > aArgs ( aOldArgs.getLength() ); + css::beans::PropertyValue * pNewValue = aArgs.getArray(); // put in the REAL file name, and copy all PropertyValues const OUString sOutputStream ( "OutputStream" ); @@ -2387,7 +2387,7 @@ bool SfxObjectShell::ExportTo( SfxMedium& rMedium ) { aArgs.realloc ( ++nEnd ); aArgs[nEnd-1].Name = sOutputStream; - aArgs[nEnd-1].Value <<= com::sun::star::uno::Reference < com::sun::star::io::XOutputStream > ( new utl::OOutputStreamWrapper ( *rMedium.GetOutStream() ) ); + aArgs[nEnd-1].Value <<= css::uno::Reference < css::io::XOutputStream > ( new utl::OOutputStreamWrapper ( *rMedium.GetOutStream() ) ); } // add stream as well, for OOX export and maybe others @@ -2395,7 +2395,7 @@ bool SfxObjectShell::ExportTo( SfxMedium& rMedium ) { aArgs.realloc ( ++nEnd ); aArgs[nEnd-1].Name = sStream; - aArgs[nEnd-1].Value <<= com::sun::star::uno::Reference < com::sun::star::io::XStream > ( new utl::OStreamWrapper ( *rMedium.GetOutStream() ) ); + aArgs[nEnd-1].Value <<= css::uno::Reference < css::io::XStream > ( new utl::OStreamWrapper ( *rMedium.GetOutStream() ) ); } if ( !bHasBaseURL ) @@ -2520,7 +2520,7 @@ bool SfxObjectShell::DoSave_Impl( const SfxItemSet* pArgs ) // an interaction handler here can acquire only in case of GUI Saving // and should be removed after the saving is done - com::sun::star::uno::Reference< XInteractionHandler > xInteract; + css::uno::Reference< XInteractionHandler > xInteract; const SfxUnoAnyItem* pxInteractionItem = SfxItemSet::GetItem<SfxUnoAnyItem>(pArgs, SID_INTERACTIONHANDLER, false); if ( pxInteractionItem && ( pxInteractionItem->GetValue() >>= xInteract ) && xInteract.is() ) pMediumTmp->GetItemSet()->Put( SfxUnoAnyItem( SID_INTERACTIONHANDLER, makeAny( xInteract ) ) ); @@ -3300,7 +3300,7 @@ bool StoragesOfUnknownMediaTypeAreCopied_Impl( const uno::Reference< embed::XSto if ( !aMediaType.isEmpty() && aMediaType != "application/vnd.sun.star.oleobject" ) { - ::com::sun::star::datatransfer::DataFlavor aDataFlavor; + css::datatransfer::DataFlavor aDataFlavor; aDataFlavor.MimeType = aMediaType; SotClipboardFormatId nFormat = SotExchange::GetFormat( aDataFlavor ); @@ -3435,7 +3435,7 @@ bool SfxObjectShell::CopyStoragesOfUnknownMediaType( const uno::Reference< embed if ( !aMediaType.isEmpty() && aMediaType != "application/vnd.sun.star.oleobject" ) { - ::com::sun::star::datatransfer::DataFlavor aDataFlavor; + css::datatransfer::DataFlavor aDataFlavor; aDataFlavor.MimeType = aMediaType; SotClipboardFormatId nFormat = SotExchange::GetFormat( aDataFlavor ); diff --git a/sfx2/source/doc/objstor.hxx b/sfx2/source/doc/objstor.hxx index a32e95867fc6..ea689f018675 100644 --- a/sfx2/source/doc/objstor.hxx +++ b/sfx2/source/doc/objstor.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_SFX2_SOURCE_DOC_OBJSTOR_HXX #define INCLUDED_SFX2_SOURCE_DOC_OBJSTOR_HXX -void impl_addToModelCollection(const com::sun::star::uno::Reference< com::sun::star::frame::XModel >& xModel); +void impl_addToModelCollection(const css::uno::Reference< css::frame::XModel >& xModel); #endif // INCLUDED_SFX2_SOURCE_DOC_OBJSTOR_HXX diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index 6cc3b31ea68b..f2dc2e57468c 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/sfx2/source/doc/objxtor.cxx @@ -148,30 +148,30 @@ OString lclGetVBAGlobalConstName( const Reference< XInterface >& rxComponent ) -class SfxModelListener_Impl : public ::cppu::WeakImplHelper< ::com::sun::star::util::XCloseListener > +class SfxModelListener_Impl : public ::cppu::WeakImplHelper< css::util::XCloseListener > { SfxObjectShell* mpDoc; public: explicit SfxModelListener_Impl( SfxObjectShell* pDoc ) : mpDoc(pDoc) {}; - virtual void SAL_CALL queryClosing( const com::sun::star::lang::EventObject& aEvent, sal_Bool bDeliverOwnership ) - throw ( com::sun::star::uno::RuntimeException, com::sun::star::util::CloseVetoException, std::exception) override ; - virtual void SAL_CALL notifyClosing( const com::sun::star::lang::EventObject& aEvent ) throw ( com::sun::star::uno::RuntimeException, std::exception ) override ; - virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& aEvent ) throw ( com::sun::star::uno::RuntimeException, std::exception ) override ; + virtual void SAL_CALL queryClosing( const css::lang::EventObject& aEvent, sal_Bool bDeliverOwnership ) + throw ( css::uno::RuntimeException, css::util::CloseVetoException, std::exception) override ; + virtual void SAL_CALL notifyClosing( const css::lang::EventObject& aEvent ) throw ( css::uno::RuntimeException, std::exception ) override ; + virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw ( css::uno::RuntimeException, std::exception ) override ; }; -void SAL_CALL SfxModelListener_Impl::queryClosing( const com::sun::star::lang::EventObject& , sal_Bool ) - throw ( com::sun::star::uno::RuntimeException, com::sun::star::util::CloseVetoException, std::exception) +void SAL_CALL SfxModelListener_Impl::queryClosing( const css::lang::EventObject& , sal_Bool ) + throw ( css::uno::RuntimeException, css::util::CloseVetoException, std::exception) { } -void SAL_CALL SfxModelListener_Impl::notifyClosing( const com::sun::star::lang::EventObject& ) throw ( com::sun::star::uno::RuntimeException, std::exception ) +void SAL_CALL SfxModelListener_Impl::notifyClosing( const css::lang::EventObject& ) throw ( css::uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; mpDoc->Broadcast( SfxSimpleHint(SFX_HINT_DEINITIALIZING) ); } -void SAL_CALL SfxModelListener_Impl::disposing( const com::sun::star::lang::EventObject& _rEvent ) throw ( com::sun::star::uno::RuntimeException, std::exception ) +void SAL_CALL SfxModelListener_Impl::disposing( const css::lang::EventObject& _rEvent ) throw ( css::uno::RuntimeException, std::exception ) { // am I ThisComponent in AppBasic? SolarMutexGuard aSolarGuard; @@ -894,7 +894,7 @@ uno::Sequence< OUString > SfxObjectShell::GetEventNames() -::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > SfxObjectShell::GetModel() const +css::uno::Reference< css::frame::XModel > SfxObjectShell::GetModel() const { return GetBaseModel(); } @@ -911,7 +911,7 @@ void SfxObjectShell::SetBaseModel( SfxBaseModel* pModel ) -::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > SfxObjectShell::GetBaseModel() const +css::uno::Reference< css::frame::XModel > SfxObjectShell::GetBaseModel() const { return pImp->pBaseModel.get(); } @@ -1178,7 +1178,7 @@ bool SfxObjectShell::SetProtectionPassword( const OUString & /*rPassword*/ ) } -bool SfxObjectShell::GetProtectionHash( /*out*/ ::com::sun::star::uno::Sequence< sal_Int8 > & /*rPasswordHash*/ ) +bool SfxObjectShell::GetProtectionHash( /*out*/ css::uno::Sequence< sal_Int8 > & /*rPasswordHash*/ ) { // currently this function needs to be overwritten by Writer and Calc only DBG_ASSERT( false, "function not implemented" ); diff --git a/sfx2/source/doc/oleprops.cxx b/sfx2/source/doc/oleprops.cxx index e3469bde596d..d3c2156458c4 100644 --- a/sfx2/source/doc/oleprops.cxx +++ b/sfx2/source/doc/oleprops.cxx @@ -923,8 +923,8 @@ Any SfxOleSection::GetAnyValue( sal_Int32 nPropId ) const double fDouble = 0.0; bool bBool = false; OUString aString; - ::com::sun::star::util::DateTime aApiDateTime; - ::com::sun::star::util::Date aApiDate; + css::util::DateTime aApiDateTime; + css::util::Date aApiDate; if( GetInt32Value( nInt32, nPropId ) ) aValue <<= nInt32; @@ -951,8 +951,8 @@ bool SfxOleSection::SetAnyValue( sal_Int32 nPropId, const Any& rValue ) sal_Int32 nInt32 = 0; double fDouble = 0.0; OUString aString; - ::com::sun::star::util::DateTime aApiDateTime; - ::com::sun::star::util::Date aApiDate; + css::util::DateTime aApiDateTime; + css::util::Date aApiDate; if( rValue.getValueType() == cppu::UnoType<bool>::get() ) SetBoolValue( nPropId, ::comphelper::getBOOL( rValue ) ); diff --git a/sfx2/source/doc/oleprops.hxx b/sfx2/source/doc/oleprops.hxx index 5f84563d309d..3d1fa0c9f798 100644 --- a/sfx2/source/doc/oleprops.hxx +++ b/sfx2/source/doc/oleprops.hxx @@ -294,10 +294,10 @@ public: bool GetStringValue( OUString& rValue, sal_Int32 nPropId ) const; /** Returns the value of a time stamp property with the passed ID in rValue. @return true = Property found, rValue is valid; false = Property not found. */ - bool GetFileTimeValue( ::com::sun::star::util::DateTime& rValue, sal_Int32 nPropId ) const; + bool GetFileTimeValue( css::util::DateTime& rValue, sal_Int32 nPropId ) const; /** Returns the value of a date property with the passed ID in rValue. @return true = Property found, rValue is valid; false = Property not found. */ - bool GetDateValue( ::com::sun::star::util::Date& rValue, sal_Int32 nPropId ) const; + bool GetDateValue( css::util::Date& rValue, sal_Int32 nPropId ) const; /** Adds the passed property to the property set. Drops an existing old property. */ void SetProperty( SfxOlePropertyRef xProp ); @@ -311,21 +311,21 @@ public: @return true = Property inserted; false = String was empty, property not inserted. */ bool SetStringValue( sal_Int32 nPropId, const OUString& rValue, bool bSkipEmpty = false ); /** Inserts a time stamp property with the passed value. */ - void SetFileTimeValue( sal_Int32 nPropId, const ::com::sun::star::util::DateTime& rValue ); + void SetFileTimeValue( sal_Int32 nPropId, const css::util::DateTime& rValue ); /** Inserts a date property with the passed value. */ - void SetDateValue( sal_Int32 nPropId, const ::com::sun::star::util::Date& rValue ); + void SetDateValue( sal_Int32 nPropId, const css::util::Date& rValue ); /** Inserts a thumbnail property from the passed meta file. */ void SetThumbnailValue( sal_Int32 nPropId, - const ::com::sun::star::uno::Sequence<sal_uInt8> & i_rData); + const css::uno::Sequence<sal_uInt8> & i_rData); /** Inserts a BLOB property with the passed data. */ void SetBlobValue( sal_Int32 nPropId, - const ::com::sun::star::uno::Sequence<sal_uInt8> & i_rData); + const css::uno::Sequence<sal_uInt8> & i_rData); /** Returns the value of the property with the passed ID in a UNO any. */ - com::sun::star::uno::Any GetAnyValue( sal_Int32 nPropId ) const; + css::uno::Any GetAnyValue( sal_Int32 nPropId ) const; /** Inserts a property created from the passed any. @return true = Property converted and inserted; false = Property type not supported. */ - bool SetAnyValue( sal_Int32 nPropId, const com::sun::star::uno::Any& rValue ); + bool SetAnyValue( sal_Int32 nPropId, const css::uno::Any& rValue ); /** Returns the custom name for the passed property ID, or an empty string, if name not found. */ OUString GetPropertyName( sal_Int32 nPropId ) const; diff --git a/sfx2/source/doc/ownsubfilterservice.cxx b/sfx2/source/doc/ownsubfilterservice.cxx index 5b609ce31c30..5a787d84fb24 100644 --- a/sfx2/source/doc/ownsubfilterservice.cxx +++ b/sfx2/source/doc/ownsubfilterservice.cxx @@ -41,7 +41,7 @@ class OwnSubFilterService : public cppu::WeakImplHelper < document::XFilter SfxObjectShell* m_pObjectShell; public: - explicit OwnSubFilterService(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments) + explicit OwnSubFilterService(const css::uno::Sequence< css::uno::Any >& aArguments) throw (uno::Exception, uno::RuntimeException); virtual ~OwnSubFilterService(); @@ -69,8 +69,8 @@ OwnSubFilterService::OwnSubFilterService(const css::uno::Sequence< css::uno::Any if ( ( aArguments[1] >>= m_xStream ) && m_xStream.is() && ( aArguments[0] >>= m_xModel ) && m_xModel.is() ) { - ::com::sun::star::uno::Reference < ::com::sun::star::lang::XUnoTunnel > xObj( m_xModel, uno::UNO_QUERY_THROW ); - ::com::sun::star::uno::Sequence < sal_Int8 > aSeq( SvGlobalName( SFX_GLOBAL_CLASSID ).GetByteSequence() ); + css::uno::Reference < css::lang::XUnoTunnel > xObj( m_xModel, uno::UNO_QUERY_THROW ); + css::uno::Sequence < sal_Int8 > aSeq( SvGlobalName( SFX_GLOBAL_CLASSID ).GetByteSequence() ); sal_Int64 nHandle = xObj->getSomething( aSeq ); if ( nHandle ) m_pObjectShell = reinterpret_cast< SfxObjectShell* >( sal::static_int_cast< sal_IntPtr >( nHandle )); diff --git a/sfx2/source/doc/plugin.cxx b/sfx2/source/doc/plugin.cxx index 70deef7df899..fd8c866fd0ca 100644 --- a/sfx2/source/doc/plugin.cxx +++ b/sfx2/source/doc/plugin.cxx @@ -73,7 +73,7 @@ const SfxItemPropertyMapEntry* lcl_GetPluginPropertyMap_Impl() { static const SfxItemPropertyMapEntry aPluginPropertyMap_Impl[] = { - { OUString("PluginCommands"), WID_COMMANDS, cppu::UnoType<css::uno::Sequence< ::com::sun::star::beans::PropertyValue >>::get(), PROPERTY_UNBOUND, 0}, + { OUString("PluginCommands"), WID_COMMANDS, cppu::UnoType<css::uno::Sequence< css::beans::PropertyValue >>::get(), PROPERTY_UNBOUND, 0}, { OUString("PluginMimeType"), WID_MIMETYPE, cppu::UnoType<OUString>::get(), PROPERTY_UNBOUND, 0 }, { OUString("PluginURL"), WID_URL , cppu::UnoType<OUString>::get(), PROPERTY_UNBOUND, 0 }, { OUString(), 0, css::uno::Type(), 0, 0 } @@ -144,7 +144,7 @@ PluginObject::~PluginObject() } sal_Bool SAL_CALL PluginObject::load( - const uno::Sequence < com::sun::star::beans::PropertyValue >& /*lDescriptor*/, + const uno::Sequence < css::beans::PropertyValue >& /*lDescriptor*/, const uno::Reference < frame::XFrame >& xFrame ) throw( uno::RuntimeException, std::exception ) { @@ -213,7 +213,7 @@ throw( uno::RuntimeException, std::exception ) return sal_False; } -void SAL_CALL PluginObject::cancel() throw( com::sun::star::uno::RuntimeException, std::exception ) +void SAL_CALL PluginObject::cancel() throw( css::uno::RuntimeException, std::exception ) { uno::Reference< lang::XComponent > xComp( mxPlugin, uno::UNO_QUERY ); if (xComp.is()) @@ -221,24 +221,24 @@ void SAL_CALL PluginObject::cancel() throw( com::sun::star::uno::RuntimeExceptio mxPlugin = 0; } -void SAL_CALL PluginObject::close( sal_Bool /*bDeliverOwnership*/ ) throw( com::sun::star::util::CloseVetoException, com::sun::star::uno::RuntimeException, std::exception ) +void SAL_CALL PluginObject::close( sal_Bool /*bDeliverOwnership*/ ) throw( css::util::CloseVetoException, css::uno::RuntimeException, std::exception ) { } -void SAL_CALL PluginObject::addCloseListener( const com::sun::star::uno::Reference < com::sun::star::util::XCloseListener >& ) throw( com::sun::star::uno::RuntimeException, std::exception ) +void SAL_CALL PluginObject::addCloseListener( const css::uno::Reference < css::util::XCloseListener >& ) throw( css::uno::RuntimeException, std::exception ) { } -void SAL_CALL PluginObject::removeCloseListener( const com::sun::star::uno::Reference < com::sun::star::util::XCloseListener >& ) throw( com::sun::star::uno::RuntimeException, std::exception ) +void SAL_CALL PluginObject::removeCloseListener( const css::uno::Reference < css::util::XCloseListener >& ) throw( css::uno::RuntimeException, std::exception ) { } -void SAL_CALL PluginObject::disposing( const com::sun::star::lang::EventObject& ) throw (com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL PluginObject::disposing( const css::lang::EventObject& ) throw (css::uno::RuntimeException, std::exception) { cancel(); } -uno::Reference< beans::XPropertySetInfo > SAL_CALL PluginObject::getPropertySetInfo() throw( ::com::sun::star::uno::RuntimeException, std::exception ) +uno::Reference< beans::XPropertySetInfo > SAL_CALL PluginObject::getPropertySetInfo() throw( css::uno::RuntimeException, std::exception ) { static uno::Reference< beans::XPropertySetInfo > xInfo = new SfxItemPropertySetInfo( maPropMap ); return xInfo; @@ -289,19 +289,19 @@ uno::Any SAL_CALL PluginObject::getPropertyValue(const OUString& aPropertyName) return aAny; } -void SAL_CALL PluginObject::addPropertyChangeListener(const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) +void SAL_CALL PluginObject::addPropertyChangeListener(const OUString&, const css::uno::Reference< css::beans::XPropertyChangeListener > & ) throw( css::uno::RuntimeException, std::exception ) { } -void SAL_CALL PluginObject::removePropertyChangeListener(const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) +void SAL_CALL PluginObject::removePropertyChangeListener(const OUString&, const css::uno::Reference< css::beans::XPropertyChangeListener > & ) throw( css::uno::RuntimeException, std::exception ) { } -void SAL_CALL PluginObject::addVetoableChangeListener(const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) +void SAL_CALL PluginObject::addVetoableChangeListener(const OUString&, const css::uno::Reference< css::beans::XVetoableChangeListener > & ) throw( css::uno::RuntimeException, std::exception ) { } -void SAL_CALL PluginObject::removeVetoableChangeListener(const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) +void SAL_CALL PluginObject::removeVetoableChangeListener(const OUString&, const css::uno::Reference< css::beans::XVetoableChangeListener > & ) throw( css::uno::RuntimeException, std::exception ) { } diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx index 6dbee8fb3edd..aef48becf548 100644 --- a/sfx2/source/doc/printhelper.cxx +++ b/sfx2/source/doc/printhelper.cxx @@ -63,8 +63,8 @@ struct IMPL_PrintListener_DataContainer : public SfxListener { SfxObjectShellRef m_pObjectShell; ::cppu::OMultiTypeInterfaceContainerHelper m_aInterfaceContainer; - uno::Reference< com::sun::star::view::XPrintJob> m_xPrintJob; - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_aPrintOptions; + uno::Reference< css::view::XPrintJob> m_xPrintJob; + css::uno::Sequence< css::beans::PropertyValue > m_aPrintOptions; explicit IMPL_PrintListener_DataContainer( ::osl::Mutex& aMutex) : m_pObjectShell ( 0 ) @@ -95,16 +95,16 @@ Size impl_Size_Struct2Object( const awt::Size& aSize ) class SfxPrintJob_Impl : public cppu::WeakImplHelper < - com::sun::star::view::XPrintJob + css::view::XPrintJob > { IMPL_PrintListener_DataContainer* m_pData; public: explicit SfxPrintJob_Impl( IMPL_PrintListener_DataContainer* pData ); - virtual Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPrintOptions( ) throw (RuntimeException, std::exception) override; - virtual Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPrinter( ) throw (RuntimeException, std::exception) override; - virtual Reference< ::com::sun::star::view::XPrintable > SAL_CALL getPrintable( ) throw (RuntimeException, std::exception) override; + virtual Sequence< css::beans::PropertyValue > SAL_CALL getPrintOptions( ) throw (RuntimeException, std::exception) override; + virtual Sequence< css::beans::PropertyValue > SAL_CALL getPrinter( ) throw (RuntimeException, std::exception) override; + virtual Reference< css::view::XPrintable > SAL_CALL getPrintable( ) throw (RuntimeException, std::exception) override; virtual void SAL_CALL cancelJob() throw (RuntimeException, std::exception) override; }; @@ -113,12 +113,12 @@ SfxPrintJob_Impl::SfxPrintJob_Impl( IMPL_PrintListener_DataContainer* pData ) { } -Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL SfxPrintJob_Impl::getPrintOptions() throw (RuntimeException, std::exception) +Sequence< css::beans::PropertyValue > SAL_CALL SfxPrintJob_Impl::getPrintOptions() throw (RuntimeException, std::exception) { return m_pData->m_aPrintOptions; } -Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL SfxPrintJob_Impl::getPrinter() throw (RuntimeException, std::exception) +Sequence< css::beans::PropertyValue > SAL_CALL SfxPrintJob_Impl::getPrinter() throw (RuntimeException, std::exception) { if( m_pData->m_pObjectShell.Is() ) { @@ -126,10 +126,10 @@ Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL SfxPrintJob_Impl::ge if ( xPrintable.is() ) return xPrintable->getPrinter(); } - return Sequence< ::com::sun::star::beans::PropertyValue >(); + return Sequence< css::beans::PropertyValue >(); } -Reference< ::com::sun::star::view::XPrintable > SAL_CALL SfxPrintJob_Impl::getPrintable() throw (RuntimeException, std::exception) +Reference< css::view::XPrintable > SAL_CALL SfxPrintJob_Impl::getPrintable() throw (RuntimeException, std::exception) { Reference < view::XPrintable > xPrintable( m_pData->m_pObjectShell.Is() ? m_pData->m_pObjectShell->GetModel() : NULL, UNO_QUERY ); return xPrintable; @@ -147,11 +147,11 @@ SfxPrintHelper::SfxPrintHelper() m_pData = new IMPL_PrintListener_DataContainer(m_aMutex); } -void SAL_CALL SfxPrintHelper::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL SfxPrintHelper::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { if ( aArguments.getLength() ) { - com::sun::star::uno::Reference < com::sun::star::frame::XModel > xModel; + css::uno::Reference < css::frame::XModel > xModel; aArguments[0] >>= xModel; uno::Reference < lang::XUnoTunnel > xObj( xModel, uno::UNO_QUERY ); uno::Sequence < sal_Int8 > aSeq( SvGlobalName( SFX_GLOBAL_CLASSID ).GetByteSequence() ); @@ -252,7 +252,7 @@ namespace // XPrintable -uno::Sequence< beans::PropertyValue > SAL_CALL SfxPrintHelper::getPrinter() throw(::com::sun::star::uno::RuntimeException, std::exception) +uno::Sequence< beans::PropertyValue > SAL_CALL SfxPrintHelper::getPrinter() throw(css::uno::RuntimeException, std::exception) { // object already disposed? SolarMutexGuard aGuard; @@ -341,7 +341,7 @@ void SfxPrintHelper::impl_setPrinter(const uno::Sequence< beans::PropertyValue > { OUString aPrinterName; if ( ! ( rProp.Value >>= aPrinterName ) ) - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); if ( aPrinterName != pPrinter->GetName() ) { @@ -368,7 +368,7 @@ void SfxPrintHelper::impl_setPrinter(const uno::Sequence< beans::PropertyValue > if ( !( rProp.Value >>= eOrient ) ) { if ( !( rProp.Value >>= lDummy ) ) - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); eOrient = ( view::PaperOrientation) lDummy; } @@ -385,7 +385,7 @@ void SfxPrintHelper::impl_setPrinter(const uno::Sequence< beans::PropertyValue > if ( !( rProp.Value >>= nPaperFormat ) ) { if ( !( rProp.Value >>= lDummy ) ) - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); nPaperFormat = ( view::PaperFormat ) lDummy; } @@ -402,7 +402,7 @@ void SfxPrintHelper::impl_setPrinter(const uno::Sequence< beans::PropertyValue > awt::Size aTempSize ; if ( !( rProp.Value >>= aTempSize ) ) { - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); } else { @@ -415,7 +415,7 @@ void SfxPrintHelper::impl_setPrinter(const uno::Sequence< beans::PropertyValue > { OUString aTmp; if ( !( rProp.Value >>= aTmp ) ) - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); sal_uInt16 nCount = pPrinter->GetPaperBinCount(); for (sal_uInt16 nBin=0; nBin<nCount; nBin++) { @@ -450,7 +450,7 @@ void SfxPrintHelper::impl_setPrinter(const uno::Sequence< beans::PropertyValue > } void SAL_CALL SfxPrintHelper::setPrinter(const uno::Sequence< beans::PropertyValue >& rPrinter) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { // object already disposed? SolarMutexGuard aGuard; @@ -541,34 +541,34 @@ class ImplUCBPrintWatcher : public ::osl::Thread { ::ucbhelper::Content aSource( OUString((*ppTempFile)->GetURL()), - ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), + css::uno::Reference< css::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext()); ::ucbhelper::Content aTarget( OUString(aSplitter.GetMainURL(INetURLObject::NO_DECODE)), - ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), + css::uno::Reference< css::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext()); aTarget.transferContent( aSource, ::ucbhelper::InsertOperation_COPY, OUString(sFileName), - ::com::sun::star::ucb::NameClash::OVERWRITE); + css::ucb::NameClash::OVERWRITE); } } - catch (const ::com::sun::star::ucb::ContentCreationException&) + catch (const css::ucb::ContentCreationException&) { OSL_FAIL("content create exception"); } - catch (const ::com::sun::star::ucb::CommandAbortedException&) + catch (const css::ucb::CommandAbortedException&) { OSL_FAIL("command abort exception"); } - catch (const ::com::sun::star::uno::RuntimeException&) + catch (const css::uno::RuntimeException&) { OSL_FAIL("runtime exception"); } - catch (const ::com::sun::star::uno::Exception&) + catch (const css::uno::Exception&) { OSL_FAIL("unknown exception"); } @@ -585,7 +585,7 @@ class ImplUCBPrintWatcher : public ::osl::Thread // XPrintable void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >& rOptions) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { if( Application::GetSettings().GetMiscSettings().GetDisablePrinting() ) return; @@ -615,7 +615,7 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >& uno::Sequence < beans::PropertyValue > aCheckedArgs( rOptions.getLength() ); sal_Int32 nProps = 0; bool bWaitUntilEnd = false; - sal_Int16 nDuplexMode = ::com::sun::star::view::DuplexMode::UNKNOWN; + sal_Int16 nDuplexMode = css::view::DuplexMode::UNKNOWN; for ( int n = 0; n < rOptions.getLength(); ++n ) { // get Property-Value from options @@ -631,7 +631,7 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >& (!(rProp.Value>>=sTemp)) ) { - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); } OUString sPath; @@ -650,7 +650,7 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >& OUString sSystemPath(sTemp); OUString sFileURL; if (::osl::FileBase::getFileURLFromSystemPath(sSystemPath,sFileURL)!=::osl::FileBase::E_None) - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); aCheckedArgs[nProps].Name = rProp.Name; aCheckedArgs[nProps++].Value <<= sFileURL; // and append the local filename @@ -701,7 +701,7 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >& { sal_Int32 nCopies = 0; if ( !( rProp.Value >>= nCopies ) ) - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); aCheckedArgs[nProps].Name = rProp.Name; aCheckedArgs[nProps++].Value <<= nCopies; @@ -718,7 +718,7 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >& aCheckedArgs[nProps++].Value <<= bTemp; } else - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); } // Pages-Property @@ -731,14 +731,14 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >& aCheckedArgs[nProps++].Value <<= sTemp; } else - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); } // MonitorVisible else if ( rProp.Name == "MonitorVisible" ) { if( !(rProp.Value >>= bMonitor) ) - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); aCheckedArgs[nProps].Name = rProp.Name; aCheckedArgs[nProps++].Value <<= bMonitor; } @@ -747,7 +747,7 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >& else if ( rProp.Name == "Wait" ) { if ( !(rProp.Value >>= bWaitUntilEnd) ) - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); aCheckedArgs[nProps].Name = rProp.Name; aCheckedArgs[nProps++].Value <<= bWaitUntilEnd; } @@ -755,7 +755,7 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >& else if ( rProp.Name == "DuplexMode" ) { if ( !(rProp.Value >>= nDuplexMode ) ) - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); aCheckedArgs[nProps].Name = rProp.Name; aCheckedArgs[nProps++].Value <<= nDuplexMode; } @@ -802,7 +802,7 @@ void IMPL_PrintListener_DataContainer::Notify( SfxBroadcaster& rBC, const SfxHin || pPrintHint->GetWhich() == SFX_PRINTABLESTATE_CANCELJOB ) return; - if ( pPrintHint->GetWhich() == com::sun::star::view::PrintableState_JOB_STARTED ) + if ( pPrintHint->GetWhich() == css::view::PrintableState_JOB_STARTED ) { if ( !m_xPrintJob.is() ) m_xPrintJob = new SfxPrintJob_Impl( this ); @@ -816,20 +816,20 @@ void IMPL_PrintListener_DataContainer::Notify( SfxBroadcaster& rBC, const SfxHin view::PrintJobEvent aEvent; aEvent.Source = m_xPrintJob; - aEvent.State = (com::sun::star::view::PrintableState) pPrintHint->GetWhich(); + aEvent.State = (css::view::PrintableState) pPrintHint->GetWhich(); ::cppu::OInterfaceIteratorHelper pIterator(*pContainer); while (pIterator.hasMoreElements()) static_cast<view::XPrintJobListener*>(pIterator.next())->printJobEvent( aEvent ); } -void SAL_CALL SfxPrintHelper::addPrintJobListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XPrintJobListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL SfxPrintHelper::addPrintJobListener( const css::uno::Reference< css::view::XPrintJobListener >& xListener ) throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; m_pData->m_aInterfaceContainer.addInterface( cppu::UnoType<view::XPrintJobListener>::get(), xListener ); } -void SAL_CALL SfxPrintHelper::removePrintJobListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XPrintJobListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL SfxPrintHelper::removePrintJobListener( const css::uno::Reference< css::view::XPrintJobListener >& xListener ) throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; m_pData->m_aInterfaceContainer.removeInterface( cppu::UnoType<view::XPrintJobListener>::get(), xListener ); diff --git a/sfx2/source/doc/printhelper.hxx b/sfx2/source/doc/printhelper.hxx index f7383d318ac8..a75549edf0e0 100644 --- a/sfx2/source/doc/printhelper.hxx +++ b/sfx2/source/doc/printhelper.hxx @@ -39,29 +39,29 @@ class SfxViewShell; class SfxPrinter; class SfxPrintHelper : public cppu::WeakImplHelper - < com::sun::star::view::XPrintable - , com::sun::star::view::XPrintJobBroadcaster - , com::sun::star::lang::XInitialization > + < css::view::XPrintable + , css::view::XPrintJobBroadcaster + , css::lang::XInitialization > { public: SfxPrintHelper() ; virtual ~SfxPrintHelper() ; - 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, std::exception) override; - virtual void SAL_CALL addPrintJobListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XPrintJobListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePrintJobListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XPrintJobListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > SAL_CALL getPrinter() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPrinter( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& seqPrinter ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL print( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& seqOptions ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; + void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPrintJobListener( const css::uno::Reference< css::view::XPrintJobListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removePrintJobListener( const css::uno::Reference< css::view::XPrintJobListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPrinter() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPrinter( const css::uno::Sequence< css::beans::PropertyValue >& seqPrinter ) + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL print( const css::uno::Sequence< css::beans::PropertyValue >& seqOptions ) + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; private: osl::Mutex m_aMutex; IMPL_PrintListener_DataContainer* m_pData ; - void impl_setPrinter(const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rPrinter, + void impl_setPrinter(const css::uno::Sequence< css::beans::PropertyValue >& rPrinter, SfxPrinter*& pPrinter, SfxPrinterChangeFlags& nChangeFlags, SfxViewShell*& pViewSh); diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index 5263318367d5..1d0717aefb98 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -3453,7 +3453,7 @@ bool SfxBaseModel::hasValidSignatures() const return false; } -void SfxBaseModel::getGrabBagItem(com::sun::star::uno::Any& rVal) const +void SfxBaseModel::getGrabBagItem(css::uno::Any& rVal) const { if (m_pData->m_xGrabBagItem.get()) m_pData->m_xGrabBagItem->QueryValue(rVal); @@ -3463,7 +3463,7 @@ void SfxBaseModel::getGrabBagItem(com::sun::star::uno::Any& rVal) const } } -void SfxBaseModel::setGrabBagItem(const com::sun::star::uno::Any& rVal) +void SfxBaseModel::setGrabBagItem(const css::uno::Any& rVal) { if (!m_pData->m_xGrabBagItem.get()) m_pData->m_xGrabBagItem.reset(new SfxGrabBagItem); diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index dd6c04590bab..731e3a8a4a06 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -847,7 +847,7 @@ void SfxTemplateManagerDlg::OnTemplateState (const ThumbnailViewItem *pItem) void SfxTemplateManagerDlg::OnTemplateImport () { sal_Int16 nDialogType = - com::sun::star::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE; + css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE; sfx2::FileDialogHelper aFileDlg(nDialogType, SFXWB_MULTISELECTION); @@ -904,7 +904,7 @@ void SfxTemplateManagerDlg::OnTemplateImport () if ( nCode == ERRCODE_NONE ) { - com::sun::star::uno::Sequence<OUString> aFiles = aFileDlg.GetSelectedFiles(); + css::uno::Sequence<OUString> aFiles = aFileDlg.GetSelectedFiles(); if (aFiles.hasElements()) { @@ -1096,10 +1096,9 @@ void SfxTemplateManagerDlg::OnTemplateLink () sURL = value.get<OUString> (); localizeWebserviceURI(sURL); - Reference< com::sun::star::system::XSystemShellExecute > xSystemShellExecute( - com::sun::star::system::SystemShellExecute::create(comphelper::getProcessComponentContext())); - //throws css::lang::IllegalArgumentException, css::system::SystemShellExecuteException - xSystemShellExecute->execute( sURL, OUString(), com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY); + Reference< css::system::XSystemShellExecute > xSystemShellExecute( + css::system::SystemShellExecute::create(comphelper::getProcessComponentContext())); + xSystemShellExecute->execute( sURL, OUString(), css::system::SystemShellExecuteFlags::URIS_ONLY); } } catch (const Exception&) @@ -1595,10 +1594,10 @@ void SfxTemplateManagerDlg::loadRepositories() uno::Reference < uno::XComponentContext > m_context(comphelper::getProcessComponentContext()); // Load from user settings - com::sun::star::uno::Sequence<OUString> aUrls = + css::uno::Sequence<OUString> aUrls = officecfg::Office::Common::Misc::TemplateRepositoryUrls::get(m_context); - com::sun::star::uno::Sequence<OUString> aNames = + css::uno::Sequence<OUString> aNames = officecfg::Office::Common::Misc::TemplateRepositoryNames::get(m_context); for (sal_Int32 i = 0; i < aUrls.getLength() && i < aNames.getLength(); ++i) @@ -1708,7 +1707,7 @@ static std::vector<OUString> lcl_getAllFactoryURLs () { SvtModuleOptions aModOpt; std::vector<OUString> aList; - const ::com::sun::star::uno::Sequence<OUString> &aServiceNames = aModOpt.GetAllServiceNames(); + const css::uno::Sequence<OUString> &aServiceNames = aModOpt.GetAllServiceNames(); for( sal_Int32 i=0, nCount = aServiceNames.getLength(); i < nCount; ++i ) { diff --git a/sfx2/source/doc/zoomitem.cxx b/sfx2/source/doc/zoomitem.cxx index 69a24f376b00..9b1e95068deb 100644 --- a/sfx2/source/doc/zoomitem.cxx +++ b/sfx2/source/doc/zoomitem.cxx @@ -106,14 +106,14 @@ bool SvxZoomItem::operator==( const SfxPoolItem& rAttr ) const eType == rItem.GetType() ); } -bool SvxZoomItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const +bool SvxZoomItem::QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId ) const { nMemberId &= ~CONVERT_TWIPS; switch( nMemberId ) { case 0: { - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aSeq( ZOOM_PARAMS ); + css::uno::Sequence< css::beans::PropertyValue > aSeq( ZOOM_PARAMS ); aSeq[0].Name = ZOOM_PARAM_VALUE; aSeq[0].Value <<= sal_Int32( GetValue() ); aSeq[1].Name = ZOOM_PARAM_VALUESET; @@ -135,14 +135,14 @@ bool SvxZoomItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberI return true; } -bool SvxZoomItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) +bool SvxZoomItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) { nMemberId &= ~CONVERT_TWIPS; switch( nMemberId ) { case 0: { - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aSeq; + css::uno::Sequence< css::beans::PropertyValue > aSeq; if (( rVal >>= aSeq ) && ( aSeq.getLength() == ZOOM_PARAMS )) { sal_Int32 nValueTmp( 0 ); diff --git a/sfx2/source/inc/appbaslib.hxx b/sfx2/source/inc/appbaslib.hxx index aae45d539eed..6338b8744c4f 100644 --- a/sfx2/source/inc/appbaslib.hxx +++ b/sfx2/source/inc/appbaslib.hxx @@ -35,9 +35,9 @@ class SfxBasicManagerHolder { private: BasicManager* mpBasicManager; - ::com::sun::star::uno::Reference< ::com::sun::star::script::XStorageBasedLibraryContainer > + css::uno::Reference< css::script::XStorageBasedLibraryContainer > mxBasicContainer; - ::com::sun::star::uno::Reference< ::com::sun::star::script::XStorageBasedLibraryContainer > + css::uno::Reference< css::script::XStorageBasedLibraryContainer > mxDialogContainer; public: @@ -62,7 +62,7 @@ public: */ void reset( BasicManager* _pBasicManager ); - ::com::sun::star::script::XLibraryContainer * + css::script::XLibraryContainer * getLibraryContainer( ContainerType _eType ); /** calls the storeLibraries at both our script and basic library container @@ -72,20 +72,20 @@ public: /** calls the setStorage at all our XStorageBasedLibraryContainer. */ void setStorage( - const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& _rxStorage + const css::uno::Reference< css::embed::XStorage >& _rxStorage ); /** calls the storeLibrariesToStorage at all our XStorageBasedLibraryContainer. */ void storeLibrariesToStorage( - const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& _rxStorage + const css::uno::Reference< css::embed::XStorage >& _rxStorage ); /** checks if any modules in the SfxLibraryContainer exceed the binary limits. */ - bool LegacyPsswdBinaryLimitExceeded( ::com::sun::star::uno::Sequence< OUString >& sModules ); + bool LegacyPsswdBinaryLimitExceeded( css::uno::Sequence< OUString >& sModules ); virtual void Notify(SfxBroadcaster& rBC, SfxHint const& rHint) override; diff --git a/sfx2/source/inc/docundomanager.hxx b/sfx2/source/inc/docundomanager.hxx index 20d1f6cecea2..084e0915a7a9 100644 --- a/sfx2/source/inc/docundomanager.hxx +++ b/sfx2/source/inc/docundomanager.hxx @@ -126,32 +126,32 @@ namespace sfx2 virtual void SAL_CALL release( ) throw () override; // XUndoManager - virtual void SAL_CALL enterUndoContext( const OUString& i_title ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL enterHiddenUndoContext( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL leaveUndoContext( ) throw (::com::sun::star::util::InvalidStateException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addUndoAction( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoAction >& i_action ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL undo( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL redo( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isUndoPossible( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isRedoPossible( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getCurrentUndoActionTitle( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getCurrentRedoActionTitle( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAllUndoActionTitles( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAllRedoActionTitles( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clear( ) throw (::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clearRedo( ) throw (::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL reset( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addUndoManagerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManagerListener >& i_listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeUndoManagerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManagerListener >& i_listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL enterUndoContext( const OUString& i_title ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL enterHiddenUndoContext( ) throw (css::document::EmptyUndoStackException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL leaveUndoContext( ) throw (css::util::InvalidStateException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addUndoAction( const css::uno::Reference< css::document::XUndoAction >& i_action ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL undo( ) throw (css::document::EmptyUndoStackException, css::document::UndoContextNotClosedException, css::document::UndoFailedException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL redo( ) throw (css::document::EmptyUndoStackException, css::document::UndoContextNotClosedException, css::document::UndoFailedException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isUndoPossible( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isRedoPossible( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getCurrentUndoActionTitle( ) throw (css::document::EmptyUndoStackException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getCurrentRedoActionTitle( ) throw (css::document::EmptyUndoStackException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getAllUndoActionTitles( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getAllRedoActionTitles( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL clear( ) throw (css::document::UndoContextNotClosedException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL clearRedo( ) throw (css::document::UndoContextNotClosedException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL reset( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addUndoManagerListener( const css::uno::Reference< css::document::XUndoManagerListener >& i_listener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeUndoManagerListener( const css::uno::Reference< css::document::XUndoManagerListener >& i_listener ) throw (css::uno::RuntimeException, std::exception) override; // XLockable, base of XUndoManager - virtual void SAL_CALL lock( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL unlock( ) throw (::com::sun::star::util::NotLockedException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isLocked( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL lock( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL unlock( ) throw (css::util::NotLockedException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isLocked( ) throw (css::uno::RuntimeException, std::exception) override; // XChild, base of XUndoManager - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; private: std::unique_ptr< DocumentUndoManager_Impl > m_pImpl; diff --git a/sfx2/source/inc/fltoptint.hxx b/sfx2/source/inc/fltoptint.hxx index b03b641fe19f..6762f35cba3f 100644 --- a/sfx2/source/inc/fltoptint.hxx +++ b/sfx2/source/inc/fltoptint.hxx @@ -24,45 +24,43 @@ #include <comphelper/interaction.hxx> #include <cppuhelper/implbase.hxx> -class FilterOptionsContinuation : public comphelper::OInteraction< ::com::sun::star::document::XInteractionFilterOptions > +class FilterOptionsContinuation : public comphelper::OInteraction< css::document::XInteractionFilterOptions > { - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > rProperties; + css::uno::Sequence< css::beans::PropertyValue > rProperties; public: - virtual void SAL_CALL setFilterOptions( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rProp ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getFilterOptions( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setFilterOptions( const css::uno::Sequence< css::beans::PropertyValue >& rProp ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getFilterOptions( ) throw (css::uno::RuntimeException, std::exception) override; }; -class RequestFilterOptions : public ::cppu::WeakImplHelper< ::com::sun::star::task::XInteractionRequest > +class RequestFilterOptions : public ::cppu::WeakImplHelper< css::task::XInteractionRequest > { - ::com::sun::star::uno::Any m_aRequest; + css::uno::Any m_aRequest; - ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > - > m_lContinuations; + css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > + m_lContinuations; comphelper::OInteractionAbort* m_pAbort; FilterOptionsContinuation* m_pOptions; public: - RequestFilterOptions( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > rModel, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rProperties ); + RequestFilterOptions( css::uno::Reference< css::frame::XModel > rModel, + const css::uno::Sequence< css::beans::PropertyValue >& rProperties ); bool isAbort() { return m_pAbort->wasSelected(); } - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > getFilterOptions() + css::uno::Sequence< css::beans::PropertyValue > getFilterOptions() { return m_pOptions->getFilterOptions(); } - virtual ::com::sun::star::uno::Any SAL_CALL getRequest() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL getRequest() + throw( css::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > + virtual css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > SAL_CALL getContinuations() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; }; #endif diff --git a/sfx2/source/inc/macroloader.hxx b/sfx2/source/inc/macroloader.hxx index c2fb8b44e8d2..e81c8285da38 100644 --- a/sfx2/source/inc/macroloader.hxx +++ b/sfx2/source/inc/macroloader.hxx @@ -51,7 +51,7 @@ class SfxMacroLoader : public cppu::WeakImplHelper< SfxObjectShell* GetObjectShell_Impl(); public: - SfxMacroLoader(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments) + SfxMacroLoader(const css::uno::Sequence< css::uno::Any >& aArguments) throw (css::uno::Exception, css::uno::RuntimeException); virtual OUString SAL_CALL getImplementationName() diff --git a/sfx2/source/inc/objshimp.hxx b/sfx2/source/inc/objshimp.hxx index c8c26ebee7e2..f09730c0c622 100644 --- a/sfx2/source/inc/objshimp.hxx +++ b/sfx2/source/inc/objshimp.hxx @@ -50,11 +50,11 @@ struct SfxObjectShell_Impl : public ::sfx2::IMacroDocumentAccess ::comphelper::EmbeddedObjectContainer* mpObjectContainer; SfxBasicManagerHolder aBasicManager; SfxObjectShell& rDocShell; - ::com::sun::star::uno::Reference< ::com::sun::star::script::XLibraryContainer > + css::uno::Reference< css::script::XLibraryContainer > xBasicLibraries; - ::com::sun::star::uno::Reference< ::com::sun::star::script::XLibraryContainer > + css::uno::Reference< css::script::XLibraryContainer > xDialogLibraries; - com::sun::star::uno::Sequence < OUString > xEventNames; + css::uno::Sequence < OUString > xEventNames; ::sfx2::DocumentMacroMode aMacroMode; SfxProgress* pProgress; @@ -64,7 +64,7 @@ struct SfxObjectShell_Impl : public ::sfx2::IMacroDocumentAccess sal_uInt16 nVisualDocumentNumber; SignatureState nDocumentSignatureState; SignatureState nScriptingSignatureState; - bool bInList:1, // if reachable by First/Next + bool bInList:1, // if reachable by First/Next bClosing:1, // sal_True while Close(), to prevent recurrences Notification bIsSaving:1, bPasswd:1, @@ -122,19 +122,19 @@ struct SfxObjectShell_Impl : public ::sfx2::IMacroDocumentAccess MapUnit m_nMapUnit; bool m_bCreateTempStor; - ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > m_xDocStorage; + css::uno::Reference< css::embed::XStorage > m_xDocStorage; bool m_bIsInit; - OUString m_aSharedFileURL; + OUString m_aSharedFileURL; - ::com::sun::star::uno::Reference< ::com::sun::star::logging::XSimpleLogRing > m_xLogRing; + css::uno::Reference< css::logging::XSimpleLogRing > m_xLogRing; bool m_bIncomplEncrWarnShown; // TODO/LATER: m_aModifyPasswordInfo should completely replace m_nModifyPasswordHash in future - sal_uInt32 m_nModifyPasswordHash; - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_aModifyPasswordInfo; + sal_uInt32 m_nModifyPasswordHash; + css::uno::Sequence< css::beans::PropertyValue > m_aModifyPasswordInfo; bool m_bModifyPasswordEntered; SfxObjectShell_Impl( SfxObjectShell& _rDocShell ); @@ -145,11 +145,11 @@ struct SfxObjectShell_Impl : public ::sfx2::IMacroDocumentAccess virtual bool setCurrentMacroExecMode( sal_uInt16 nMacroMode ) override; virtual OUString getDocumentLocation() const override; virtual bool documentStorageHasMacros() const override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::document::XEmbeddedScripts > getEmbeddedDocumentScripts() const override; + virtual css::uno::Reference< css::document::XEmbeddedScripts > getEmbeddedDocumentScripts() const override; virtual SignatureState getScriptingSignatureState() override; virtual bool hasTrustedScriptingSignature( bool bAllowUIToAddAuthor ) override; - virtual void showBrokenSignatureWarning( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& _rxInteraction ) const override; + virtual void showBrokenSignatureWarning( const css::uno::Reference< css::task::XInteractionHandler >& _rxInteraction ) const override; }; #endif diff --git a/sfx2/source/inc/recfloat.hxx b/sfx2/source/inc/recfloat.hxx index 422e97ba90fe..7238e2aac3ee 100644 --- a/sfx2/source/inc/recfloat.hxx +++ b/sfx2/source/inc/recfloat.hxx @@ -40,7 +40,7 @@ public: class SfxRecordingFloat_Impl : public SfxFloatingWindow { VclPtr<ToolBox> m_pTbx; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XToolbarController > xStopRecTbxCtrl; + css::uno::Reference< css::frame::XToolbarController > xStopRecTbxCtrl; public: SfxRecordingFloat_Impl( SfxBindings* pBindings , SfxChildWindow* pChildWin , diff --git a/sfx2/source/inc/sfxpicklist.hxx b/sfx2/source/inc/sfxpicklist.hxx index 5252a61e8112..9a870745ea18 100644 --- a/sfx2/source/inc/sfxpicklist.hxx +++ b/sfx2/source/inc/sfxpicklist.hxx @@ -44,7 +44,7 @@ class SfxPickList : public SfxListener std::vector< PickListEntry* > m_aPicklistVector; sal_uInt32 m_nAllowedMenuSize; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XStringWidth > m_xStringLength; + css::uno::Reference< css::util::XStringWidth > m_xStringLength; SfxPickList( sal_uInt32 nMenuSize ); virtual ~SfxPickList(); diff --git a/sfx2/source/inc/sfxurlrelocator.hxx b/sfx2/source/inc/sfxurlrelocator.hxx index e6803baaea39..0a7476d85633 100644 --- a/sfx2/source/inc/sfxurlrelocator.hxx +++ b/sfx2/source/inc/sfxurlrelocator.hxx @@ -29,9 +29,9 @@ class SfxURLRelocator_Impl { ::osl::Mutex maMutex; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxContext; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XOfficeInstallationDirectories > mxOfficeInstDirs; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XMacroExpander > mxMacroExpander; + css::uno::Reference< css::uno::XComponentContext > mxContext; + css::uno::Reference< css::util::XOfficeInstallationDirectories > mxOfficeInstDirs; + css::uno::Reference< css::util::XMacroExpander > mxMacroExpander; public: static bool propertyCanContainOfficeDir( const OUString & rPropName ); @@ -39,7 +39,7 @@ public: void makeRelocatableURL( OUString & rURL ); void makeAbsoluteURL( OUString & rURL ); - SfxURLRelocator_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext ); + SfxURLRelocator_Impl( const css::uno::Reference< css::uno::XComponentContext > & xContext ); ~SfxURLRelocator_Impl(); private: diff --git a/sfx2/source/inc/statcach.hxx b/sfx2/source/inc/statcach.hxx index 712f2177f75e..7a0006a25136 100644 --- a/sfx2/source/inc/statcach.hxx +++ b/sfx2/source/inc/statcach.hxx @@ -39,24 +39,24 @@ class SfxDispatcher; class BindDispatch_Impl : public ::cppu::WeakImplHelper< css::frame::XStatusListener > { friend class SfxStateCache; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDisp; - ::com::sun::star::util::URL aURL; - ::com::sun::star::frame::FeatureStateEvent aStatus; + css::uno::Reference< css::frame::XDispatch > xDisp; + css::util::URL aURL; + css::frame::FeatureStateEvent aStatus; SfxStateCache* pCache; const SfxSlot* pSlot; public: BindDispatch_Impl( - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > & rDisp, - const ::com::sun::star::util::URL& rURL, + const css::uno::Reference< css::frame::XDispatch > & rDisp, + const css::util::URL& rURL, SfxStateCache* pStateCache, const SfxSlot* pSlot ); - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw ( css::uno::RuntimeException, std::exception ) override; void Release(); - const ::com::sun::star::frame::FeatureStateEvent& GetStatus() const { return aStatus;} - void Dispatch( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& aProps, bool bForceSynchron = false ); + const css::frame::FeatureStateEvent& GetStatus() const { return aStatus;} + void Dispatch( const css::uno::Sequence < css::beans::PropertyValue >& aProps, bool bForceSynchron = false ); }; class SfxStateCache @@ -65,15 +65,15 @@ friend class BindDispatch_Impl; BindDispatch_Impl* pDispatch; sal_uInt16 nId; // Slot-Id SfxControllerItem* pInternalController; - com::sun::star::uno::Reference < com::sun::star::frame::XDispatch > xMyDispatch; + css::uno::Reference < css::frame::XDispatch > xMyDispatch; SfxControllerItem* pController; // Pointer to first bound Controller (interlinked with each other) SfxSlotServer aSlotServ; // SlotServer, SlotPtr = 0 -> not on Stack SfxPoolItem* pLastItem; // Last sent Item, never -1 SfxItemState eLastState; // Last sent State - bool bCtrlDirty:1; // Update Controller? - bool bSlotDirty:1; // Present Funktion, must be updated - bool bItemVisible:1; // item visibility - bool bItemDirty; // Validity of pLastItem + bool bCtrlDirty:1; // Update Controller? + bool bSlotDirty:1; // Present Funktion, must be updated + bool bItemVisible:1; // item visibility + bool bItemDirty; // Validity of pLastItem private: SfxStateCache( const SfxStateCache& rOrig ) = delete; @@ -85,10 +85,10 @@ public: sal_uInt16 GetId() const; - const SfxSlotServer* GetSlotServer( SfxDispatcher &rDispat, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > & xProv ); + const SfxSlotServer* GetSlotServer( SfxDispatcher &rDispat, const css::uno::Reference< css::frame::XDispatchProvider > & xProv ); const SfxSlotServer* GetSlotServer( SfxDispatcher &rDispat ) - { return GetSlotServer( rDispat, ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > () ); } - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > GetDispatch() const; + { return GetSlotServer( rDispat, css::uno::Reference< css::frame::XDispatchProvider > () ); } + css::uno::Reference< css::frame::XDispatch > GetDispatch() const; void Dispatch( const SfxItemSet* pSet, bool bForceSynchron = false ); bool IsControllerDirty() const { return bCtrlDirty; } @@ -105,10 +105,10 @@ public: { DBG_ASSERT( !pInternalController, "Only one internal controller allowed!" ); pInternalController = pCtrl; } void ReleaseInternalController() { pInternalController = 0; } SfxControllerItem* GetInternalController() const { return pInternalController; } - com::sun::star::uno::Reference < com::sun::star::frame::XDispatch > + css::uno::Reference < css::frame::XDispatch > GetInternalDispatch() const { return xMyDispatch; } - void SetInternalDispatch( const com::sun::star::uno::Reference < com::sun::star::frame::XDispatch >& rDisp ) + void SetInternalDispatch( const css::uno::Reference < css::frame::XDispatch >& rDisp ) { xMyDispatch = rDisp; } }; diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx index 71dd9f8aece0..a02dfc30d136 100644 --- a/sfx2/source/inc/workwin.hxx +++ b/sfx2/source/inc/workwin.hxx @@ -180,30 +180,30 @@ class LayoutManagerListener : public ::cppu::WeakImplHelper< LayoutManagerListener( SfxWorkWindow* pWrkWin ); virtual ~LayoutManagerListener(); - void setFrame( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame ); + void setFrame( const css::uno::Reference< css::frame::XFrame >& rFrame ); // XComponent - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) override; // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ) override; // XLayoutManagerEventListener - virtual void SAL_CALL layoutEvent( const ::com::sun::star::lang::EventObject& aSource, ::sal_Int16 eLayoutEvent, const ::com::sun::star::uno::Any& aInfo ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL layoutEvent( const css::lang::EventObject& aSource, ::sal_Int16 eLayoutEvent, const css::uno::Any& aInfo ) throw (css::uno::RuntimeException, std::exception) override; private: - bool m_bHasFrame; - SfxWorkWindow* m_pWrkWin; - ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XFrame > m_xFrame; - OUString m_aLayoutManagerPropName; + bool m_bHasFrame; + SfxWorkWindow* m_pWrkWin; + css::uno::WeakReference< css::frame::XFrame > m_xFrame; + OUString m_aLayoutManagerPropName; }; class SfxWorkWindow @@ -240,7 +240,7 @@ protected: OUString m_aLayoutManagerPropName; OUString m_aTbxTypeName; OUString m_aProgressBarResName; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > m_xLayoutManagerListener; + css::uno::Reference< css::lang::XComponent > m_xLayoutManagerListener; protected: void CreateChildWin_Impl(SfxChildWin_Impl*,bool); @@ -323,8 +323,8 @@ public: void ResetStatusBar_Impl(); void SetStatusBar_Impl(sal_uInt32 nResId, SfxShell *pShell, SfxBindings& ); void UpdateStatusBar_Impl(); - ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator > GetStatusIndicator(); - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > GetFrameInterface(); + css::uno::Reference< css::task::XStatusIndicator > GetStatusIndicator(); + css::uno::Reference< css::frame::XFrame > GetFrameInterface(); }; class SfxFrameWorkWin_Impl : public SfxWorkWindow diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx index b2aabc5337cf..8b028396fa74 100644 --- a/sfx2/source/inet/inettbc.cxx +++ b/sfx2/source/inet/inettbc.cxx @@ -213,10 +213,10 @@ void SfxURLToolBoxControl_Impl::StateChanged SvtURLBox* pURLBox = GetURLBox(); pURLBox->Clear(); - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > > lList = SvtHistoryOptions().GetList(ePICKLIST); + css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > lList = SvtHistoryOptions().GetList(ePICKLIST); for (sal_Int32 i=0; i<lList.getLength(); ++i) { - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > lProps = lList[i]; + css::uno::Sequence< css::beans::PropertyValue > lProps = lList[i]; for (sal_Int32 p=0; p<lProps.getLength(); ++p) { if (lProps[p].Name != HISTORY_PROPERTYNAME_URL) diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx index 33d69e54b077..c91b6dc67f63 100644 --- a/sfx2/source/menu/mnumgr.cxx +++ b/sfx2/source/menu/mnumgr.cxx @@ -100,7 +100,7 @@ void SfxMenuManager::Construct( SfxVirtualMenu& rMenu ) } -void InsertVerbs_Impl( SfxBindings* pBindings, const com::sun::star::uno::Sequence < com::sun::star::embed::VerbDescriptor >& aVerbs, Menu* pMenu ) +void InsertVerbs_Impl( SfxBindings* pBindings, const css::uno::Sequence < css::embed::VerbDescriptor >& aVerbs, Menu* pMenu ) { SfxViewShell *pView = pBindings->GetDispatcher()->GetFrame()->GetViewShell(); if ( pView && aVerbs.getLength() ) @@ -306,7 +306,7 @@ SfxPopupMenuManager* SfxPopupMenuManager::Popup( const ResId& rResId, SfxViewFra InsertVerbs_Impl( &pFrame->GetBindings(), pFrame->GetViewShell()->GetVerbs(), pSVMenu ); Menu* pMenu = NULL; - ::com::sun::star::ui::ContextMenuExecuteEvent aEvent; + css::ui::ContextMenuExecuteEvent aEvent; aEvent.SourceWindow = VCLUnoHelper::GetInterface( pWindow ); aEvent.ExecutePosition.X = rPoint.X(); aEvent.ExecutePosition.Y = rPoint.Y(); @@ -356,7 +356,7 @@ void SfxPopupMenuManager::ExecutePopup( const ResId& rResId, SfxViewFrame* pFram InsertVerbs_Impl( &pFrame->GetBindings(), pFrame->GetViewShell()->GetVerbs(), pSVMenu ); Menu* pMenu = NULL; - ::com::sun::star::ui::ContextMenuExecuteEvent aEvent; + css::ui::ContextMenuExecuteEvent aEvent; aEvent.SourceWindow = VCLUnoHelper::GetInterface( pWindow ); aEvent.ExecutePosition.X = rPoint.X(); aEvent.ExecutePosition.Y = rPoint.Y(); diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx index 68bbca3e9f2c..55155f2bb22a 100644 --- a/sfx2/source/menu/virtmenu.cxx +++ b/sfx2/source/menu/virtmenu.cxx @@ -109,7 +109,7 @@ void SfxMenuImageControl_Impl::Update() -static Image RetrieveAddOnImage( Reference< com::sun::star::frame::XFrame >& rFrame, +static Image RetrieveAddOnImage( Reference< css::frame::XFrame >& rFrame, const OUString& aImageId, const OUString& aURL, bool bBigImage @@ -285,7 +285,7 @@ void SfxVirtualMenu::CreateFromSVMenu() // Merge Addon popup menus into the SV Menu SfxViewFrame* pViewFrame = pBindings->GetDispatcher()->GetFrame(); - Reference< com::sun::star::frame::XFrame > xFrame( pViewFrame->GetFrame().GetFrameInterface() ); + Reference< css::frame::XFrame > xFrame( pViewFrame->GetFrame().GetFrameInterface() ); if ( pSVMenu->IsMenuBar() ) { @@ -495,7 +495,7 @@ IMPL_LINK_NOARG_TYPED(SfxVirtualMenu, SettingsChanged, LinkParamNone*, void) sal_uInt16 nItemCount = pSVMenu->GetItemCount(); SfxViewFrame *pViewFrame = pBindings->GetDispatcher()->GetFrame(); bool bIcons = Application::GetSettings().GetStyleSettings().GetUseImagesInMenus(); - Reference<com::sun::star::frame::XFrame> xFrame( pViewFrame->GetFrame().GetFrameInterface() ); + Reference<css::frame::XFrame> xFrame( pViewFrame->GetFrame().GetFrameInterface() ); if ( !bIsAddonPopupMenu ) { @@ -567,7 +567,7 @@ void SfxVirtualMenu::UpdateImages( Menu* pMenu ) if ( bIcons ) { sal_uInt16 nItemCount = pMenu->GetItemCount(); - Reference<com::sun::star::frame::XFrame> aXFrame( pBindings->GetDispatcher_Impl()->GetFrame()->GetFrame().GetFrameInterface() ); + Reference<css::frame::XFrame> aXFrame( pBindings->GetDispatcher_Impl()->GetFrame()->GetFrame().GetFrameInterface() ); for ( sal_uInt16 nPos=0; nPos < nItemCount; ++nPos ) { @@ -735,7 +735,7 @@ void SfxVirtualMenu::InsertAddOnsMenuItem( Menu* pMenu ) { // Create special popup menu that is filled with the 3rd party components popup menu items ::framework::MenuConfiguration aConf( ::comphelper::getProcessComponentContext() ); - Reference<com::sun::star::frame::XFrame> xFrame( pBindings->GetDispatcher_Impl()->GetFrame()->GetFrame().GetFrameInterface() ); + Reference<css::frame::XFrame> xFrame( pBindings->GetDispatcher_Impl()->GetFrame()->GetFrame().GetFrameInterface() ); PopupMenu* pAddonMenu = NULL; try @@ -743,7 +743,7 @@ void SfxVirtualMenu::InsertAddOnsMenuItem( Menu* pMenu ) Reference< css::uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); pAddonMenu = framework::AddonMenuManager::CreateAddonMenu(xFrame, xContext); } - catch ( const ::com::sun::star::lang::WrappedTargetException& ) + catch ( const css::lang::WrappedTargetException& ) { } diff --git a/sfx2/source/sidebar/UnoDecks.cxx b/sfx2/source/sidebar/UnoDecks.cxx index 42965dae73ed..a26568f3b6ab 100644 --- a/sfx2/source/sidebar/UnoDecks.cxx +++ b/sfx2/source/sidebar/UnoDecks.cxx @@ -150,14 +150,14 @@ uno::Any SAL_CALL SfxUnoDecks::getByIndex( sal_Int32 Index ) // XElementAccess uno::Type SAL_CALL SfxUnoDecks::getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) + throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return uno::Type(); } -sal_Bool SAL_CALL SfxUnoDecks::hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SfxUnoDecks::hasElements() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; diff --git a/sfx2/source/sidebar/UnoPanels.cxx b/sfx2/source/sidebar/UnoPanels.cxx index 0e712d9623a0..22cc780e56b6 100644 --- a/sfx2/source/sidebar/UnoPanels.cxx +++ b/sfx2/source/sidebar/UnoPanels.cxx @@ -162,14 +162,14 @@ uno::Any SAL_CALL SfxUnoPanels::getByIndex( sal_Int32 Index ) // XElementAccess uno::Type SAL_CALL SfxUnoPanels::getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) + throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return uno::Type(); } -sal_Bool SAL_CALL SfxUnoPanels::hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SfxUnoPanels::hasElements() throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx index b2eca349ff7a..a441b8e68b5d 100644 --- a/sfx2/source/statbar/stbitem.cxx +++ b/sfx2/source/statbar/stbitem.cxx @@ -94,8 +94,8 @@ svt::StatusbarController* SAL_CALL SfxStatusBarControllerFactory( if ( xModel.is() ) { // Get tunnel from model to retrieve the SfxObjectShell pointer from it - ::com::sun::star::uno::Reference < ::com::sun::star::lang::XUnoTunnel > xObj( xModel, uno::UNO_QUERY ); - ::com::sun::star::uno::Sequence < sal_Int8 > aSeq = SvGlobalName( SFX_GLOBAL_CLASSID ).GetByteSequence(); + css::uno::Reference < css::lang::XUnoTunnel > xObj( xModel, uno::UNO_QUERY ); + css::uno::Sequence < sal_Int8 > aSeq = SvGlobalName( SFX_GLOBAL_CLASSID ).GetByteSequence(); if ( xObj.is() ) { sal_Int64 nHandle = xObj->getSomething( aSeq ); @@ -210,7 +210,7 @@ throw (uno::RuntimeException, std::exception) // XStatusListener void SAL_CALL SfxStatusBarControl::statusChanged( const frame::FeatureStateEvent& rEvent ) -throw ( ::com::sun::star::uno::RuntimeException, std::exception ) +throw ( css::uno::RuntimeException, std::exception ) { SfxViewFrame* pViewFrame = NULL; uno::Reference < frame::XController > xController; @@ -286,7 +286,7 @@ throw ( ::com::sun::star::uno::RuntimeException, std::exception ) rEvent.State >>= sTemp ; pItem = new SfxStringItem( nSlotID, sTemp ); } - else if ( pType == cppu::UnoType< ::com::sun::star::frame::status::ItemStatus>::get() ) + else if ( pType == cppu::UnoType< css::frame::status::ItemStatus>::get() ) { frame::status::ItemStatus aItemStatus; rEvent.State >>= aItemStatus; @@ -372,8 +372,8 @@ void SAL_CALL SfxStatusBarControl::command( const awt::Point& rPos, ::sal_Int32 nCommand, sal_Bool /*bMouseEvent*/, - const ::com::sun::star::uno::Any& /*aData*/ ) -throw (::com::sun::star::uno::RuntimeException, std::exception) + const css::uno::Any& /*aData*/ ) +throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ::Point aPos( rPos.X, rPos.Y ); @@ -561,7 +561,7 @@ void SfxStatusBarControl::Click() */ { - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs; + css::uno::Sequence< css::beans::PropertyValue > aArgs; execute( aArgs ); } diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index c8b899cc6e45..fb794e636e34 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -155,10 +155,10 @@ svt::ToolboxController* SAL_CALL SfxToolBoxControllerFactory( const Reference< X if ( xModel.is() ) { // Get tunnel from model to retrieve the SfxObjectShell pointer from it - ::com::sun::star::uno::Reference < ::com::sun::star::lang::XUnoTunnel > xObj( xModel, UNO_QUERY ); + css::uno::Reference < css::lang::XUnoTunnel > xObj( xModel, UNO_QUERY ); if ( xObj.is() ) { - ::com::sun::star::uno::Sequence < sal_Int8 > aSeq = SvGlobalName( SFX_GLOBAL_CLASSID ).GetByteSequence(); + css::uno::Sequence < sal_Int8 > aSeq = SvGlobalName( SFX_GLOBAL_CLASSID ).GetByteSequence(); sal_Int64 nHandle = xObj->getSomething( aSeq ); if ( nHandle ) pObjShell = reinterpret_cast< SfxObjectShell* >( sal::static_int_cast< sal_IntPtr >( nHandle )); @@ -253,7 +253,7 @@ unsigned short SfxToolBoxControl::GetSlotId() const -void SAL_CALL SfxToolBoxControl::dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL SfxToolBoxControl::dispose() throw (css::uno::RuntimeException, std::exception) { if ( m_bDisposed ) return; @@ -398,7 +398,7 @@ void SfxToolBoxControl::Dispatch( { if ( rProvider.is() ) { - ::com::sun::star::util::URL aTargetURL; + css::util::URL aTargetURL; aTargetURL.Complete = rCommand; Reference < XURLTransformer > xTrans( URLTransformer::create( ::comphelper::getProcessComponentContext() ) ); xTrans->parseStrict( aTargetURL ); @@ -409,7 +409,7 @@ void SfxToolBoxControl::Dispatch( } } -void SfxToolBoxControl::Dispatch( const OUString& aCommand, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ) +void SfxToolBoxControl::Dispatch( const OUString& aCommand, css::uno::Sequence< css::beans::PropertyValue >& aArgs ) { Reference < XController > xController; @@ -420,7 +420,7 @@ void SfxToolBoxControl::Dispatch( const OUString& aCommand, ::com::sun::star::un Reference < XDispatchProvider > xProvider( xController, UNO_QUERY ); if ( xProvider.is() ) { - ::com::sun::star::util::URL aTargetURL; + css::util::URL aTargetURL; aTargetURL.Complete = aCommand; getURLTransformer()->parseStrict( aTargetURL ); @@ -430,15 +430,15 @@ void SfxToolBoxControl::Dispatch( const OUString& aCommand, ::com::sun::star::un } } -void SAL_CALL SfxToolBoxControl::disposing( const ::com::sun::star::lang::EventObject& aEvent ) -throw( ::com::sun::star::uno::RuntimeException, std::exception ) +void SAL_CALL SfxToolBoxControl::disposing( const css::lang::EventObject& aEvent ) +throw( css::uno::RuntimeException, std::exception ) { svt::ToolboxController::disposing( aEvent ); } // XStatusListener void SAL_CALL SfxToolBoxControl::statusChanged( const FeatureStateEvent& rEvent ) -throw ( ::com::sun::star::uno::RuntimeException, std::exception ) +throw ( css::uno::RuntimeException, std::exception ) { SfxViewFrame* pViewFrame = NULL; Reference < XController > xController; @@ -485,7 +485,7 @@ throw ( ::com::sun::star::uno::RuntimeException, std::exception ) if ( rEvent.IsEnabled ) { eState = SfxItemState::DEFAULT; - ::com::sun::star::uno::Type pType = rEvent.State.getValueType(); + css::uno::Type pType = rEvent.State.getValueType(); if ( pType == cppu::UnoType<void>::get() ) { @@ -516,7 +516,7 @@ throw ( ::com::sun::star::uno::RuntimeException, std::exception ) rEvent.State >>= sTemp ; pItem = new SfxStringItem( nSlotId, sTemp ); } - else if ( pType == cppu::UnoType< ::com::sun::star::frame::status::ItemStatus>::get() ) + else if ( pType == cppu::UnoType< css::frame::status::ItemStatus>::get() ) { ItemStatus aItemStatus; rEvent.State >>= aItemStatus; @@ -525,11 +525,11 @@ throw ( ::com::sun::star::uno::RuntimeException, std::exception ) if (tmpState != SfxItemState::UNKNOWN && tmpState != SfxItemState::DISABLED && tmpState != SfxItemState::READONLY && tmpState != SfxItemState::DONTCARE && tmpState != SfxItemState::DEFAULT && tmpState != SfxItemState::SET) - throw ::com::sun::star::uno::RuntimeException("unknown status"); + throw css::uno::RuntimeException("unknown status"); eState = tmpState; pItem = new SfxVoidItem( nSlotId ); } - else if ( pType == cppu::UnoType< ::com::sun::star::frame::status::Visibility>::get() ) + else if ( pType == cppu::UnoType< css::frame::status::Visibility>::get() ) { Visibility aVisibilityStatus; rEvent.State >>= aVisibilityStatus; @@ -556,56 +556,56 @@ throw ( ::com::sun::star::uno::RuntimeException, std::exception ) } // XSubToolbarController -sal_Bool SAL_CALL SfxToolBoxControl::opensSubToolbar() throw (::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SfxToolBoxControl::opensSubToolbar() throw (css::uno::RuntimeException, std::exception) { return sal_False; } -OUString SAL_CALL SfxToolBoxControl::getSubToolbarName() throw (::com::sun::star::uno::RuntimeException, std::exception) +OUString SAL_CALL SfxToolBoxControl::getSubToolbarName() throw (css::uno::RuntimeException, std::exception) { return OUString(); } -void SAL_CALL SfxToolBoxControl::functionSelected( const OUString& /*aCommand*/ ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL SfxToolBoxControl::functionSelected( const OUString& /*aCommand*/ ) throw (css::uno::RuntimeException, std::exception) { // must be implemented by sub-class } -void SAL_CALL SfxToolBoxControl::updateImage() throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL SfxToolBoxControl::updateImage() throw (css::uno::RuntimeException, std::exception) { // must be implemented by sub-class } // XToolbarController -void SAL_CALL SfxToolBoxControl::execute( sal_Int16 KeyModifier ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL SfxToolBoxControl::execute( sal_Int16 KeyModifier ) throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; Select( (sal_uInt16)KeyModifier ); } -void SAL_CALL SfxToolBoxControl::click() throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL SfxToolBoxControl::click() throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; Click(); } -void SAL_CALL SfxToolBoxControl::doubleClick() throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL SfxToolBoxControl::doubleClick() throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; DoubleClick(); } -Reference< ::com::sun::star::awt::XWindow > SAL_CALL SfxToolBoxControl::createPopupWindow() throw (::com::sun::star::uno::RuntimeException, std::exception) +Reference< css::awt::XWindow > SAL_CALL SfxToolBoxControl::createPopupWindow() throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; VclPtr<vcl::Window> pWindow = CreatePopupWindow(); if ( pWindow ) return VCLUnoHelper::GetInterface( pWindow ); else - return Reference< ::com::sun::star::awt::XWindow >(); + return Reference< css::awt::XWindow >(); } -Reference< ::com::sun::star::awt::XWindow > SAL_CALL SfxToolBoxControl::createItemWindow( const Reference< ::com::sun::star::awt::XWindow >& rParent ) throw (::com::sun::star::uno::RuntimeException, std::exception) +Reference< css::awt::XWindow > SAL_CALL SfxToolBoxControl::createItemWindow( const Reference< css::awt::XWindow >& rParent ) throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return VCLUnoHelper::GetInterface( CreateItemWindow( VCLUnoHelper::GetWindow( rParent ))); @@ -748,14 +748,14 @@ VclPtr<vcl::Window> SfxToolBoxControl::CreateItemWindow( vcl::Window * ) class SfxFrameStatusListener : public svt::FrameStatusListener { public: - SfxFrameStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, + SfxFrameStatusListener( const css::uno::Reference< css::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::frame::XFrame >& xFrame, SfxPopupWindow* pCallee ); virtual ~SfxFrameStatusListener(); // XStatusListener - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) + throw ( css::uno::RuntimeException, std::exception ) override; private: VclPtr<SfxPopupWindow> m_pCallee; @@ -778,8 +778,8 @@ SfxFrameStatusListener::~SfxFrameStatusListener() // XStatusListener -void SAL_CALL SfxFrameStatusListener::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& rEvent ) -throw ( ::com::sun::star::uno::RuntimeException, std::exception ) +void SAL_CALL SfxFrameStatusListener::statusChanged( const css::frame::FeatureStateEvent& rEvent ) +throw ( css::uno::RuntimeException, std::exception ) { SfxViewFrame* pViewFrame = NULL; Reference < XController > xController; @@ -827,7 +827,7 @@ throw ( ::com::sun::star::uno::RuntimeException, std::exception ) if ( rEvent.IsEnabled ) { eState = SfxItemState::DEFAULT; - ::com::sun::star::uno::Type pType = rEvent.State.getValueType(); + css::uno::Type pType = rEvent.State.getValueType(); if ( pType == cppu::UnoType<void>::get() ) { @@ -858,7 +858,7 @@ throw ( ::com::sun::star::uno::RuntimeException, std::exception ) rEvent.State >>= sTemp ; pItem = new SfxStringItem( nSlotId, sTemp ); } - else if ( pType == cppu::UnoType< ::com::sun::star::frame::status::ItemStatus>::get() ) + else if ( pType == cppu::UnoType< css::frame::status::ItemStatus>::get() ) { ItemStatus aItemStatus; rEvent.State >>= aItemStatus; @@ -867,11 +867,11 @@ throw ( ::com::sun::star::uno::RuntimeException, std::exception ) if (tmpState != SfxItemState::UNKNOWN && tmpState != SfxItemState::DISABLED && tmpState != SfxItemState::READONLY && tmpState != SfxItemState::DONTCARE && tmpState != SfxItemState::DEFAULT && tmpState != SfxItemState::SET) - throw ::com::sun::star::uno::RuntimeException("unknown status"); + throw css::uno::RuntimeException("unknown status"); eState = tmpState; pItem = new SfxVoidItem( nSlotId ); } - else if ( pType == cppu::UnoType< ::com::sun::star::frame::status::Visibility>::get() ) + else if ( pType == cppu::UnoType< css::frame::status::Visibility>::get() ) { Visibility aVisibilityStatus; rEvent.State >>= aVisibilityStatus; diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx index 021afd104601..b3e8015c880a 100644 --- a/sfx2/source/view/frame.cxx +++ b/sfx2/source/view/frame.cxx @@ -134,18 +134,18 @@ bool SfxFrame::DoClose() else if ( pImp->xFrame.is() ) { Reference < XFrame > xFrame = pImp->xFrame; - xFrame->setComponent( Reference < com::sun::star::awt::XWindow >(), Reference < XController >() ); + xFrame->setComponent( Reference < css::awt::XWindow >(), Reference < XController >() ); xFrame->dispose(); } else bRet = DoClose_Impl(); } - catch( ::com::sun::star::util::CloseVetoException& ) + catch( css::util::CloseVetoException& ) { pImp->bClosing = false; bRet = false; } - catch( ::com::sun::star::lang::DisposedException& ) + catch( css::lang::DisposedException& ) { } } @@ -376,7 +376,7 @@ void SfxFrame::GetViewData_Impl() bool bGetViewData = false; if ( GetController().is() && pSet->GetItemState( SID_VIEW_DATA ) != SfxItemState::SET ) { - ::com::sun::star::uno::Any aData = GetController()->getViewData(); + css::uno::Any aData = GetController()->getViewData(); pSet->Put( SfxUsrAnyItem( SID_VIEW_DATA, aData ) ); bGetViewData = true; } @@ -555,7 +555,7 @@ SfxPoolItem* SfxFrameItem::Clone( SfxItemPool *) const return pNew; } -bool SfxFrameItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 ) const +bool SfxFrameItem::QueryValue( css::uno::Any& rVal, sal_uInt8 ) const { if ( wFrame ) { @@ -566,7 +566,7 @@ bool SfxFrameItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 ) const return false; } -bool SfxFrameItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 ) +bool SfxFrameItem::PutValue( const css::uno::Any& rVal, sal_uInt8 ) { Reference < XFrame > xFrame; if ( (rVal >>= xFrame) && xFrame.is() ) @@ -589,7 +589,7 @@ bool SfxFrameItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 ) } -SfxUsrAnyItem::SfxUsrAnyItem( sal_uInt16 nWhichId, const ::com::sun::star::uno::Any& rAny ) +SfxUsrAnyItem::SfxUsrAnyItem( sal_uInt16 nWhichId, const css::uno::Any& rAny ) : SfxPoolItem( nWhichId ) { aValue = rAny; @@ -605,13 +605,13 @@ SfxPoolItem* SfxUsrAnyItem::Clone( SfxItemPool *) const return new SfxUsrAnyItem( Which(), aValue ); } -bool SfxUsrAnyItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const +bool SfxUsrAnyItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { rVal = aValue; return true; } -bool SfxUsrAnyItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) +bool SfxUsrAnyItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) { aValue = rVal; return true; @@ -623,7 +623,7 @@ SfxUnoFrameItem::SfxUnoFrameItem() { } -SfxUnoFrameItem::SfxUnoFrameItem( sal_uInt16 nWhichId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame ) +SfxUnoFrameItem::SfxUnoFrameItem( sal_uInt16 nWhichId, const css::uno::Reference< css::frame::XFrame >& i_rFrame ) : SfxPoolItem( nWhichId ) , m_xFrame( i_rFrame ) { @@ -639,13 +639,13 @@ SfxPoolItem* SfxUnoFrameItem::Clone( SfxItemPool* ) const return new SfxUnoFrameItem( Which(), m_xFrame ); } -bool SfxUnoFrameItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const +bool SfxUnoFrameItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { rVal <<= m_xFrame; return true; } -bool SfxUnoFrameItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) +bool SfxUnoFrameItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) { return ( rVal >>= m_xFrame ); } @@ -694,23 +694,23 @@ SfxFrame* SfxFrameIterator::NextSibling_Impl( SfxFrame& rPrev ) return pRet; } -::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > SfxFrame::GetController() const +css::uno::Reference< css::frame::XController > SfxFrame::GetController() const { if ( pImp->pCurrentViewFrame && pImp->pCurrentViewFrame->GetViewShell() ) return pImp->pCurrentViewFrame->GetViewShell()->GetController(); else - return ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > (); + return css::uno::Reference< css::frame::XController > (); } -::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SfxFrame::GetFrameInterface() const +css::uno::Reference< css::frame::XFrame > SfxFrame::GetFrameInterface() const { return pImp->xFrame; } -void SfxFrame::SetFrameInterface_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame ) +void SfxFrame::SetFrameInterface_Impl( const css::uno::Reference< css::frame::XFrame >& rFrame ) { pImp->xFrame = rFrame; - com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > xRecorder; + css::uno::Reference< css::frame::XDispatchRecorder > xRecorder; if ( !rFrame.is() && GetCurrentViewFrame() ) GetCurrentViewFrame()->GetBindings().SetRecorder_Impl( xRecorder ); } @@ -724,7 +724,7 @@ void SfxFrame::Appear() pImp->xFrame->getContainerWindow()->setVisible( sal_True ); if ( pParentFrame ) pParentFrame->Appear(); - Reference < ::com::sun::star::awt::XTopWindow > xTopWindow( pImp->xFrame->getContainerWindow(), UNO_QUERY ); + Reference < css::awt::XTopWindow > xTopWindow( pImp->xFrame->getContainerWindow(), UNO_QUERY ); if ( xTopWindow.is() ) xTopWindow->toFront(); } diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx index 7f3a46772e81..afb839e74d4c 100644 --- a/sfx2/source/view/frame2.cxx +++ b/sfx2/source/view/frame2.cxx @@ -318,8 +318,8 @@ void SfxFrame::SetPresentationMode( bool bSet ) if ( GetCurrentViewFrame() ) GetCurrentViewFrame()->GetWindow().SetBorderStyle( bSet ? WindowBorderStyle::NOBORDER : WindowBorderStyle::NORMAL ); - Reference< com::sun::star::beans::XPropertySet > xPropSet( GetFrameInterface(), UNO_QUERY ); - Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager; + Reference< css::beans::XPropertySet > xPropSet( GetFrameInterface(), UNO_QUERY ); + Reference< css::frame::XLayoutManager > xLayoutManager; if ( xPropSet.is() ) { @@ -366,8 +366,8 @@ void SfxFrame::SetMenuBarOn_Impl( bool bOn ) { pImp->bMenuBarOn = bOn; - Reference< com::sun::star::beans::XPropertySet > xPropSet( GetFrameInterface(), UNO_QUERY ); - Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager; + Reference< css::beans::XPropertySet > xPropSet( GetFrameInterface(), UNO_QUERY ); + Reference< css::frame::XLayoutManager > xLayoutManager; if ( xPropSet.is() ) { diff --git a/sfx2/source/view/impframe.hxx b/sfx2/source/view/impframe.hxx index c3e72283471e..b3a15d2cab3f 100644 --- a/sfx2/source/view/impframe.hxx +++ b/sfx2/source/view/impframe.hxx @@ -36,7 +36,7 @@ class SfxViewFrame; class SfxFrame_Impl : public SfxBroadcaster { public: - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame; + css::uno::Reference< css::frame::XFrame > xFrame; sal_uInt32 nType; SfxViewFrame* pCurrentViewFrame; SfxFrameDescriptor* pDescr; diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx index 4f4c3165bb30..e940f507ec95 100644 --- a/sfx2/source/view/ipclient.cxx +++ b/sfx2/source/view/ipclient.cxx @@ -136,7 +136,7 @@ public: virtual void SAL_CALL activatingUI() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) override; virtual void SAL_CALL deactivatedInplace() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) override; virtual void SAL_CALL deactivatedUI() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) override; - virtual uno::Reference< ::com::sun::star::frame::XLayoutManager > SAL_CALL getLayoutManager() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) override; + virtual uno::Reference< css::frame::XLayoutManager > SAL_CALL getLayoutManager() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) override; virtual uno::Reference< frame::XDispatchProvider > SAL_CALL getInplaceDispatchProvider() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) override; virtual awt::Rectangle SAL_CALL getPlacement() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) override; virtual awt::Rectangle SAL_CALL getClipRectangle() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) override; @@ -154,9 +154,9 @@ public: virtual void SAL_CALL notifyEvent( const document::EventObject& aEvent ) throw( uno::RuntimeException, std::exception ) override; // XStateChangeListener - virtual void SAL_CALL changingState( const ::com::sun::star::lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (::com::sun::star::embed::WrongStateException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL stateChanged( const ::com::sun::star::lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL changingState( const css::lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (css::embed::WrongStateException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL stateChanged( const css::lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override; }; SfxInPlaceClient_Impl::~SfxInPlaceClient_Impl() @@ -164,18 +164,18 @@ SfxInPlaceClient_Impl::~SfxInPlaceClient_Impl() } void SAL_CALL SfxInPlaceClient_Impl::changingState( - const ::com::sun::star::lang::EventObject& /*aEvent*/, + const css::lang::EventObject& /*aEvent*/, ::sal_Int32 /*nOldState*/, ::sal_Int32 /*nNewState*/ ) -throw (::com::sun::star::embed::WrongStateException, ::com::sun::star::uno::RuntimeException, std::exception) +throw (css::embed::WrongStateException, css::uno::RuntimeException, std::exception) { } void SAL_CALL SfxInPlaceClient_Impl::stateChanged( - const ::com::sun::star::lang::EventObject& /*aEvent*/, + const css::lang::EventObject& /*aEvent*/, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) -throw (::com::sun::star::uno::RuntimeException, std::exception) +throw (css::uno::RuntimeException, std::exception) { if ( m_pClient && nOldState != embed::EmbedStates::LOADED && nNewState == embed::EmbedStates::RUNNING ) { @@ -199,8 +199,8 @@ void SAL_CALL SfxInPlaceClient_Impl::notifyEvent( const document::EventObject& a } } -void SAL_CALL SfxInPlaceClient_Impl::disposing( const ::com::sun::star::lang::EventObject& /*aEvent*/ ) -throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL SfxInPlaceClient_Impl::disposing( const css::lang::EventObject& /*aEvent*/ ) +throw (css::uno::RuntimeException, std::exception) { DELETEZ( m_pClient ); } @@ -383,7 +383,7 @@ void SAL_CALL SfxInPlaceClient_Impl::deactivatedUI() } -uno::Reference< ::com::sun::star::frame::XLayoutManager > SAL_CALL SfxInPlaceClient_Impl::getLayoutManager() +uno::Reference< css::frame::XLayoutManager > SAL_CALL SfxInPlaceClient_Impl::getLayoutManager() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) { @@ -391,7 +391,7 @@ uno::Reference< ::com::sun::star::frame::XLayoutManager > SAL_CALL SfxInPlaceCli if ( !xFrame.is() ) throw uno::RuntimeException(); - uno::Reference< ::com::sun::star::frame::XLayoutManager > xMan; + uno::Reference< css::frame::XLayoutManager > xMan; try { uno::Any aAny = xFrame->getPropertyValue( "LayoutManager" ); @@ -848,7 +848,7 @@ bool SfxInPlaceClient::IsObjectInPlaceActive() const } -SfxInPlaceClient* SfxInPlaceClient::GetClient( SfxObjectShell* pDoc, const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& xObject ) +SfxInPlaceClient* SfxInPlaceClient::GetClient( SfxObjectShell* pDoc, const css::uno::Reference < css::embed::XEmbeddedObject >& xObject ) { for ( SfxViewFrame* pFrame = SfxViewFrame::GetFirst(pDoc); pFrame; pFrame=SfxViewFrame::GetNext(*pFrame,pDoc) ) { @@ -1060,7 +1060,7 @@ void SfxInPlaceClient::DeactivateObject() pFrame->GetTopFrame().LockResize_Impl(false); pFrame->GetTopFrame().Resize(); } - catch (com::sun::star::uno::Exception& ) + catch (css::uno::Exception& ) {} } } @@ -1085,7 +1085,7 @@ void SfxInPlaceClient::ResetObject() m_pImp->m_xObject->changeState( embed::EmbedStates::RUNNING ); } } - catch (com::sun::star::uno::Exception& ) + catch (css::uno::Exception& ) {} } } diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index c23bfea02504..7743481c0609 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -189,11 +189,11 @@ static bool AskPasswordToModify_Impl( const uno::Reference< task::XInteractionHa ::rtl::Reference< ::comphelper::DocPasswordRequest > pPasswordRequest( new ::comphelper::DocPasswordRequest( bMSType ? ::comphelper::DocPasswordRequestType_MS : ::comphelper::DocPasswordRequestType_STANDARD, - bFirstTime ? ::com::sun::star::task::PasswordRequestMode_PASSWORD_ENTER : ::com::sun::star::task::PasswordRequestMode_PASSWORD_REENTER, + bFirstTime ? css::task::PasswordRequestMode_PASSWORD_ENTER : css::task::PasswordRequestMode_PASSWORD_REENTER, aPath, true ) ); - uno::Reference< com::sun::star::task::XInteractionRequest > rRequest( pPasswordRequest.get() ); + uno::Reference< css::task::XInteractionRequest > rRequest( pPasswordRequest.get() ); xHandler->handle( rRequest ); if ( pPasswordRequest->isPassword() ) @@ -502,7 +502,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) if ( nOpenMode == SFX_STREAM_READWRITE && !rReq.IsAPI() ) { - // ::com::sun::star::sdbcx::User offering to open it as a template + // css::sdbcx::User offering to open it as a template ScopedVclPtrInstance<MessageDialog> aBox(&GetWindow(), SfxResId(STR_QUERY_OPENASTEMPLATE), VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO); if ( RET_YES == aBox->Execute() ) @@ -697,13 +697,13 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) { Reference < task::XInteractionHandler2 > xHdl = task::InteractionHandler::createWithParent( ::comphelper::getProcessComponentContext(), 0 ); if (xHdl.is()) - pNewSet->Put( SfxUnoAnyItem(SID_INTERACTIONHANDLER,::com::sun::star::uno::makeAny(xHdl)) ); + pNewSet->Put( SfxUnoAnyItem(SID_INTERACTIONHANDLER,css::uno::makeAny(xHdl)) ); } if (!pMacroExecItem) - pNewSet->Put( SfxUInt16Item(SID_MACROEXECMODE,::com::sun::star::document::MacroExecMode::USE_CONFIG) ); + pNewSet->Put( SfxUInt16Item(SID_MACROEXECMODE,css::document::MacroExecMode::USE_CONFIG) ); if (!pDocTemplateItem) - pNewSet->Put( SfxUInt16Item(SID_UPDATEDOCMODE,::com::sun::star::document::UpdateDocMode::ACCORDING_TO_CONFIG) ); + pNewSet->Put( SfxUInt16Item(SID_UPDATEDOCMODE,css::document::UpdateDocMode::ACCORDING_TO_CONFIG) ); xOldObj->SetModified( false ); // Do not chache the old Document! Is invalid when loading @@ -1776,7 +1776,7 @@ void SfxViewFrame::MakeActive_Impl( bool bGrabFocus ) else { GetBindings().SetDispatcher( GetDispatcher() ); - GetBindings().SetActiveFrame( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > () ); + GetBindings().SetActiveFrame( css::uno::Reference< css::frame::XFrame > () ); GetDispatcher()->Update_Impl(); } } @@ -2127,7 +2127,7 @@ bool SfxViewFrame::SwitchToViewShell_Impl GetBindings().LEAVEREGISTRATIONS(); delete pOldSh; } - catch ( const com::sun::star::uno::Exception& ) + catch ( const css::uno::Exception& ) { // the SfxCode is not able to cope with exceptions thrown while creating views // the code will crash in the stack unwinding procedure, so we shouldn't let exceptions go through here @@ -2530,9 +2530,9 @@ void SfxViewFrame::AddDispatchMacroToBasic_Impl( const OUString& sMacro ) OUString aMacroName; OUString aLocation; Reference< XComponentContext > xContext = ::comphelper::getProcessComponentContext(); - Reference< com::sun::star::uri::XUriReferenceFactory > xFactory = - com::sun::star::uri::UriReferenceFactory::create( xContext ); - Reference< com::sun::star::uri::XVndSunStarScriptUrl > xUrl( xFactory->parse( aScriptURL ), UNO_QUERY ); + Reference< css::uri::XUriReferenceFactory > xFactory = + css::uri::UriReferenceFactory::create( xContext ); + Reference< css::uri::XVndSunStarScriptUrl > xUrl( xFactory->parse( aScriptURL ), UNO_QUERY ); if ( xUrl.is() ) { // get name @@ -2583,7 +2583,7 @@ void SfxViewFrame::AddDispatchMacroToBasic_Impl( const OUString& sMacro ) } // open lib container and break operation if it couldn't be opened - com::sun::star::uno::Reference< com::sun::star::script::XLibraryContainer > xLibCont; + css::uno::Reference< css::script::XLibraryContainer > xLibCont; if ( aLocation.equalsIgnoreAsciiCase( "application" ) ) { xLibCont = SfxGetpApp()->GetBasicContainer(); @@ -2600,13 +2600,13 @@ void SfxViewFrame::AddDispatchMacroToBasic_Impl( const OUString& sMacro ) } // get LibraryContainer - com::sun::star::uno::Any aTemp; - com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > xRoot( + css::uno::Any aTemp; + css::uno::Reference< css::container::XNameAccess > xRoot( xLibCont, - com::sun::star::uno::UNO_QUERY); + css::uno::UNO_QUERY); OUString sLib( aLibName ); - com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > xLib; + css::uno::Reference< css::container::XNameAccess > xLib; if(xRoot->hasByName(sLib)) { // library must be loaded @@ -2616,9 +2616,9 @@ void SfxViewFrame::AddDispatchMacroToBasic_Impl( const OUString& sMacro ) } else { - xLib = com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >( + xLib = css::uno::Reference< css::container::XNameAccess >( xLibCont->createLibrary(sLib), - com::sun::star::uno::UNO_QUERY); + css::uno::UNO_QUERY); } // pack the macro as direct usable "sub" routine @@ -2656,16 +2656,16 @@ void SfxViewFrame::AddDispatchMacroToBasic_Impl( const OUString& sMacro ) aTemp <<= sRoutine.makeStringAndClear(); if ( bReplace ) { - com::sun::star::uno::Reference< com::sun::star::container::XNameContainer > xModulCont( + css::uno::Reference< css::container::XNameContainer > xModulCont( xLib, - com::sun::star::uno::UNO_QUERY); + css::uno::UNO_QUERY); xModulCont->replaceByName(sModule,aTemp); } else { - com::sun::star::uno::Reference< com::sun::star::container::XNameContainer > xModulCont( + css::uno::Reference< css::container::XNameContainer > xModulCont( xLib, - com::sun::star::uno::UNO_QUERY); + css::uno::UNO_QUERY); xModulCont->insertByName(sModule,aTemp); } @@ -2700,15 +2700,15 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq ) { // try to find any active recorder on this frame OUString sProperty("DispatchRecorderSupplier"); - com::sun::star::uno::Reference< com::sun::star::frame::XFrame > xFrame( + css::uno::Reference< css::frame::XFrame > xFrame( GetFrame().GetFrameInterface(), - com::sun::star::uno::UNO_QUERY); + css::uno::UNO_QUERY); - com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > xSet(xFrame,com::sun::star::uno::UNO_QUERY); - com::sun::star::uno::Any aProp = xSet->getPropertyValue(sProperty); - com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorderSupplier > xSupplier; + css::uno::Reference< css::beans::XPropertySet > xSet(xFrame,css::uno::UNO_QUERY); + css::uno::Any aProp = xSet->getPropertyValue(sProperty); + css::uno::Reference< css::frame::XDispatchRecorderSupplier > xSupplier; aProp >>= xSupplier; - com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > xRecorder; + css::uno::Reference< css::frame::XDispatchRecorder > xRecorder; if (xSupplier.is()) xRecorder = xSupplier->getDispatchRecorder(); @@ -2720,7 +2720,7 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq ) if ( xRecorder.is() ) { // disable active recording - aProp <<= com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorderSupplier >(); + aProp <<= css::uno::Reference< css::frame::XDispatchRecorderSupplier >(); xSet->setPropertyValue(sProperty,aProp); const SfxBoolItem* pRecordItem = rReq.GetArg<SfxBoolItem>(FN_PARAM_1); @@ -2739,12 +2739,12 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq ) else if ( rReq.GetSlot() == SID_RECORDMACRO ) { // enable recording - com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > xContext( + css::uno::Reference< css::uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext()); - xRecorder = com::sun::star::frame::DispatchRecorder::create( xContext ); + xRecorder = css::frame::DispatchRecorder::create( xContext ); - xSupplier = com::sun::star::frame::DispatchRecorderSupplier::create( xContext ); + xSupplier = css::frame::DispatchRecorderSupplier::create( xContext ); xSupplier->setDispatchRecorder(xRecorder); xRecorder->startRecording(xFrame); @@ -2760,12 +2760,12 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq ) case SID_TOGGLESTATUSBAR: { - com::sun::star::uno::Reference< com::sun::star::frame::XFrame > xFrame( + css::uno::Reference< css::frame::XFrame > xFrame( GetFrame().GetFrameInterface(), - com::sun::star::uno::UNO_QUERY); + css::uno::UNO_QUERY); - Reference< com::sun::star::beans::XPropertySet > xPropSet( xFrame, UNO_QUERY ); - Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager; + Reference< css::beans::XPropertySet > xPropSet( xFrame, UNO_QUERY ); + Reference< css::frame::XLayoutManager > xLayoutManager; if ( xPropSet.is() ) { try @@ -2814,12 +2814,12 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq ) WorkWindow* pWork = static_cast<WorkWindow*>( pTop->GetFrame().GetTopWindow_Impl() ); if ( pWork ) { - com::sun::star::uno::Reference< com::sun::star::frame::XFrame > xFrame( + css::uno::Reference< css::frame::XFrame > xFrame( GetFrame().GetFrameInterface(), - com::sun::star::uno::UNO_QUERY); + css::uno::UNO_QUERY); - Reference< ::com::sun::star::beans::XPropertySet > xPropSet( xFrame, UNO_QUERY ); - Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager; + Reference< css::beans::XPropertySet > xPropSet( xFrame, UNO_QUERY ); + Reference< css::frame::XLayoutManager > xLayoutManager; if ( xPropSet.is() ) { try @@ -2835,7 +2835,7 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq ) bool bNewFullScreenMode = pItem ? pItem->GetValue() : !pWork->IsFullScreenMode(); if ( bNewFullScreenMode != pWork->IsFullScreenMode() ) { - Reference< ::com::sun::star::beans::XPropertySet > xLMPropSet( xLayoutManager, UNO_QUERY ); + Reference< css::beans::XPropertySet > xLMPropSet( xLayoutManager, UNO_QUERY ); if ( xLMPropSet.is() ) { try @@ -2844,7 +2844,7 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq ) OUString( "HideCurrentUI" ), makeAny( bNewFullScreenMode )); } - catch ( ::com::sun::star::beans::UnknownPropertyException& ) + catch ( css::beans::UnknownPropertyException& ) { } } @@ -2901,12 +2901,12 @@ void SfxViewFrame::MiscState_Impl(SfxItemSet &rSet) } OUString sProperty("DispatchRecorderSupplier"); - com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > xSet( + css::uno::Reference< css::beans::XPropertySet > xSet( GetFrame().GetFrameInterface(), - com::sun::star::uno::UNO_QUERY); + css::uno::UNO_QUERY); - com::sun::star::uno::Any aProp = xSet->getPropertyValue(sProperty); - com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorderSupplier > xSupplier; + css::uno::Any aProp = xSet->getPropertyValue(sProperty); + css::uno::Reference< css::frame::XDispatchRecorderSupplier > xSupplier; if ( aProp >>= xSupplier ) rSet.Put( SfxBoolItem( nWhich, xSupplier.is() ) ); else @@ -2926,12 +2926,12 @@ void SfxViewFrame::MiscState_Impl(SfxItemSet &rSet) } OUString sProperty("DispatchRecorderSupplier"); - com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > xSet( + css::uno::Reference< css::beans::XPropertySet > xSet( GetFrame().GetFrameInterface(), - com::sun::star::uno::UNO_QUERY); + css::uno::UNO_QUERY); - com::sun::star::uno::Any aProp = xSet->getPropertyValue(sProperty); - com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorderSupplier > xSupplier; + css::uno::Any aProp = xSet->getPropertyValue(sProperty); + css::uno::Reference< css::frame::XDispatchRecorderSupplier > xSupplier; if ( !(aProp >>= xSupplier) || !xSupplier.is() ) rSet.DisableItem( nWhich ); break; @@ -2939,11 +2939,11 @@ void SfxViewFrame::MiscState_Impl(SfxItemSet &rSet) case SID_TOGGLESTATUSBAR: { - com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager; - com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > xSet( + css::uno::Reference< css::frame::XLayoutManager > xLayoutManager; + css::uno::Reference< css::beans::XPropertySet > xSet( GetFrame().GetFrameInterface(), - com::sun::star::uno::UNO_QUERY); - com::sun::star::uno::Any aProp = xSet->getPropertyValue( + css::uno::UNO_QUERY); + css::uno::Any aProp = xSet->getPropertyValue( OUString( "LayoutManager" ) ); if ( !( aProp >>= xLayoutManager )) @@ -3025,21 +3025,21 @@ void SfxViewFrame::ChildWindowExecute( SfxRequest &rReq ) } else { - ::com::sun::star::util::URL aTargetURL; + css::util::URL aTargetURL; aTargetURL.Complete = ".component:DB/DataSourceBrowser"; - Reference < ::com::sun::star::util::XURLTransformer > xTrans( - ::com::sun::star::util::URLTransformer::create( + Reference < css::util::XURLTransformer > xTrans( + css::util::URLTransformer::create( ::comphelper::getProcessComponentContext() ) ); xTrans->parseStrict( aTargetURL ); Reference < XDispatchProvider > xProv( xFrame, UNO_QUERY ); - Reference < ::com::sun::star::frame::XDispatch > xDisp; + Reference < css::frame::XDispatch > xDisp; if ( xProv.is() ) xDisp = xProv->queryDispatch( aTargetURL, OUString("_beamer"), 31 ); if ( xDisp.is() ) { - Sequence < ::com::sun::star::beans::PropertyValue > aArgs(1); - ::com::sun::star::beans::PropertyValue* pArg = aArgs.getArray(); + Sequence < css::beans::PropertyValue > aArgs(1); + css::beans::PropertyValue* pArg = aArgs.getArray(); pArg[0].Name = "Referer"; pArg[0].Value <<= OUString("private:user"); xDisp->dispatch( aTargetURL, aArgs ); @@ -3219,7 +3219,7 @@ void SfxViewFrame::SetViewFrame( SfxViewFrame* pFrame ) SfxGetpApp()->SetViewFrame_Impl( pFrame ); } -void SfxViewFrame::ActivateToolPanel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame, const OUString& i_rPanelURL ) +void SfxViewFrame::ActivateToolPanel( const css::uno::Reference< css::frame::XFrame >& i_rFrame, const OUString& i_rPanelURL ) { SolarMutexGuard aGuard; diff --git a/sfx2/source/view/viewimp.hxx b/sfx2/source/view/viewimp.hxx index b832b15ed4b6..de11afeaffd2 100644 --- a/sfx2/source/view/viewimp.hxx +++ b/sfx2/source/view/viewimp.hxx @@ -58,7 +58,7 @@ struct SfxViewShell_Impl sal_uInt16 m_nFamily; ::rtl::Reference<SfxBaseController> m_pController; std::unique_ptr< ::svt::AcceleratorExecute > m_xAccExec; - com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue > aPrintOpts; + css::uno::Sequence < css::beans::PropertyValue > aPrintOpts; ::rtl::Reference< SfxClipboardChangeListener > xClipboardListener; std::shared_ptr< vcl::PrinterController > m_xPrinterController; diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx index 6beda04894a7..0d7c8cde155e 100644 --- a/sfx2/source/view/viewprn.cxx +++ b/sfx2/source/view/viewprn.cxx @@ -90,7 +90,7 @@ public: virtual Sequence< beans::PropertyValue > getPageParameters( int i_nPage ) const override; virtual void printPage( int i_nPage ) const override; virtual void jobStarted() override; - virtual void jobFinished( com::sun::star::view::PrintableState ) override; + virtual void jobFinished( css::view::PrintableState ) override; }; SfxPrinterController::SfxPrinterController( const VclPtr<Printer>& i_rPrinter, @@ -328,7 +328,7 @@ void SfxPrinterController::jobStarted() } } -void SfxPrinterController::jobFinished( com::sun::star::view::PrintableState nState ) +void SfxPrinterController::jobFinished( css::view::PrintableState nState ) { if ( mpObjectShell ) { |