Skip to content

C
core
Kaydet (Commit) 988e70bc authored tarafından yangzhang's avatar yangzhang Kaydeden (comit) Markus Mohrhard
Dosyalara gözat
Seçenekler

Fix the error of shutdownicon.cxx. 

Change-Id: I91d62edd72e884a0139d3aca46aff0db88b202be
Signed-off-by: 's avatarshaochunfang <shaochun@multicorewareinc.com>
üst 8aad6d47
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 21 deletions
sfx2/source/appl/shutdownicon.cxx
Dosyayı görüntüle @ 988e70bc
......@@ -228,9 +228,9 @@ public:
class IdleTerminate : Timer
{
Reference< XDesktop2 > m_xDesktop;
::com::sun::star::uno::Reference< XDesktop2 > m_xDesktop;
public:
IdleTerminate (Reference< XDesktop2 > xDesktop)
IdleTerminate (::com::sun::star::uno::Reference< XDesktop2 > xDesktop)
{
m_xDesktop = xDesktop;
Start();
......@@ -272,7 +272,7 @@ void ShutdownIcon::deInitSystray()
}
ShutdownIcon::ShutdownIcon( const Reference< XComponentContext > & rxContext ) :
ShutdownIcon::ShutdownIcon( const ::com::sun::star::uno::Reference< XComponentContext > & rxContext ) :
ShutdownIconServiceBase( m_aMutex ),
m_bVeto ( false ),
m_bListenForTermination ( false ),
......@@ -300,16 +300,16 @@ void ShutdownIcon::OpenURL( const OUString& aURL, const OUString& rTarget, const
{
if ( getInstance() && getInstance()->m_xDesktop.is() )
{
Reference < XDispatchProvider > xDispatchProvider( getInstance()->m_xDesktop, UNO_QUERY );
::com::sun::star::uno::Reference < XDispatchProvider > xDispatchProvider( getInstance()->m_xDesktop, UNO_QUERY );
if ( xDispatchProvider.is() )
{
com::sun::star::util::URL aDispatchURL;
aDispatchURL.Complete = aURL;
Reference< util::XURLTransformer > xURLTransformer( util::URLTransformer::create( ::comphelper::getProcessComponentContext() ) );
::com::sun::star::uno::Reference< util::XURLTransformer > xURLTransformer( util::URLTransformer::create( ::comphelper::getProcessComponentContext() ) );
try
{
Reference< com::sun::star::frame::XDispatch > xDispatch;
::com::sun::star::uno::Reference< com::sun::star::frame::XDispatch > xDispatch;
xURLTransformer->parseStrict( aDispatchURL );
xDispatch = xDispatchProvider->queryDispatch( aDispatchURL, rTarget, 0 );
......@@ -345,18 +345,18 @@ void ShutdownIcon::FromTemplate()
{
if ( getInstance() && getInstance()->m_xDesktop.is() )
{
Reference < ::com::sun::star::frame::XFramesSupplier > xDesktop ( getInstance()->m_xDesktop, UNO_QUERY);
Reference < ::com::sun::star::frame::XFrame > xFrame( xDesktop->getActiveFrame() );
::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() );
if ( !xFrame.is() )
xFrame = Reference < ::com::sun::star::frame::XFrame >( xDesktop, UNO_QUERY );
xFrame = ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame >( xDesktop, UNO_QUERY );
URL aTargetURL;
aTargetURL.Complete = "slot:5500";
Reference< util::XURLTransformer > xTrans( util::URLTransformer::create( ::comphelper::getProcessComponentContext() ) );
::com::sun::star::uno::Reference< util::XURLTransformer > xTrans( util::URLTransformer::create( ::comphelper::getProcessComponentContext() ) );
xTrans->parseStrict( aTargetURL );
Reference < ::com::sun::star::frame::XDispatchProvider > xProv( xFrame, UNO_QUERY );
Reference < ::com::sun::star::frame::XDispatch > xDisp;
::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;
if ( xProv.is() )
{
if (aTargetURL.Protocol == "slot:")
......@@ -370,7 +370,7 @@ void ShutdownIcon::FromTemplate()
PropertyValue* pArg = aArgs.getArray();
pArg[0].Name = "Referer";
pArg[0].Value <<= OUString("private:user");
Reference< ::com::sun::star::frame::XNotifyingDispatch > xNotifyer( xDisp, UNO_QUERY );
::com::sun::star::uno::Reference< ::com::sun::star::frame::XNotifyingDispatch > xNotifyer( xDisp, UNO_QUERY );
if ( xNotifyer.is() )
{
EnterModalMode();
......@@ -439,7 +439,7 @@ IMPL_STATIC_LINK( ShutdownIcon, DialogClosedHdl_Impl, FileDialogHelper*, EMPTYAR
// use constructor for filling up filters automatically!
if ( ERRCODE_NONE == pThis->m_pFileDlg->GetError() )
{
Reference< XFilePicker > xPicker = pThis->m_pFileDlg->GetFilePicker();
::com::sun::star::uno::Reference< XFilePicker > xPicker = pThis->m_pFileDlg->GetFilePicker();
try
{
......@@ -447,8 +447,8 @@ IMPL_STATIC_LINK( ShutdownIcon, DialogClosedHdl_Impl, FileDialogHelper*, EMPTYAR
if ( xPicker.is() )
{
Reference < XFilePickerControlAccess > xPickerControls ( xPicker, UNO_QUERY );
Reference < XFilterManager > xFilterManager ( xPicker, UNO_QUERY );
::com::sun::star::uno::Reference < XFilePickerControlAccess > xPickerControls ( xPicker, UNO_QUERY );
::com::sun::star::uno::Reference < XFilterManager > xFilterManager ( xPicker, UNO_QUERY );
Sequence< OUString > sFiles = xPicker->getFiles();
int nFiles = sFiles.getLength();
......@@ -456,7 +456,7 @@ IMPL_STATIC_LINK( ShutdownIcon, DialogClosedHdl_Impl, FileDialogHelper*, EMPTYAR
int nArgs=3;
Sequence< PropertyValue > aArgs(3);
Reference < com::sun::star::task::XInteractionHandler2 > xInteraction(
::com::sun::star::uno::Reference < com::sun::star::task::XInteractionHandler2 > xInteraction(
task::InteractionHandler::createWithParent(::comphelper::getProcessComponentContext(), 0) );
aArgs[0].Name = "InteractionHandler";
......@@ -585,7 +585,7 @@ void ShutdownIcon::addTerminateListener()
if (pInst->m_bListenForTermination)
return;
Reference< XDesktop2 > xDesktop = pInst->m_xDesktop;
::com::sun::star::uno::Reference< XDesktop2 > xDesktop = pInst->m_xDesktop;
if ( ! xDesktop.is())
return;
......@@ -601,7 +601,7 @@ void ShutdownIcon::terminateDesktop()
if ( ! pInst)
return;
Reference< XDesktop2 > xDesktop = pInst->m_xDesktop;
::com::sun::star::uno::Reference< XDesktop2 > xDesktop = pInst->m_xDesktop;
if ( ! xDesktop.is())
return;
......@@ -610,7 +610,7 @@ void ShutdownIcon::terminateDesktop()
xDesktop->removeTerminateListener( pInst );
// terminate desktop only if no tasks exist
Reference< XIndexAccess > xTasks ( xDesktop->getFrames(), UNO_QUERY );
::com::sun::star::uno::Reference< XIndexAccess > xTasks ( xDesktop->getFrames(), UNO_QUERY );
if( xTasks.is() && xTasks->getCount() < 1 )
new IdleTerminate( xDesktop );
......@@ -654,7 +654,7 @@ void ShutdownIcon::init() throw( ::com::sun::star::uno::Exception )
::osl::ResettableMutexGuard aGuard( m_aMutex );
m_pResMgr = pResMgr;
aGuard.clear();
Reference < XDesktop2 > xDesktop = Desktop::create( m_xContext );
::com::sun::star::uno::Reference < XDesktop2 > xDesktop = Desktop::create( m_xContext );
aGuard.reset();
m_xDesktop = xDesktop;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment