summaryrefslogtreecommitdiff
path: root/framework/source/services/frame.cxx
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2013-09-09 00:58:15 +0300
committerTor Lillqvist <tml@collabora.com>2013-09-09 00:58:15 +0300
commit2b3e2258530b8214229f2c6a8dab385b508eb9bf (patch)
treeac9eeed88f75bca64737b8abced45c983a3f9d14 /framework/source/services/frame.cxx
parent84e981865871ea75d8a2493a8be349b3b93d2e7a (diff)
Bin some uses of the stupid DECLARE_ASCII macro
Change-Id: I076eef8069e848ec3cf9c69f1b489ad44586324e
Diffstat (limited to 'framework/source/services/frame.cxx')
-rw-r--r--framework/source/services/frame.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index 15a809bf5286..6c06d503a84e 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -1600,11 +1600,11 @@ void SAL_CALL Frame::close( sal_Bool bDeliverOwnership ) throw( css::util::Close
/* SAFE */
}
- throw css::util::CloseVetoException(DECLARE_ASCII("Frame in use for loading document ..."),static_cast< ::cppu::OWeakObject*>(this));
+ throw css::util::CloseVetoException("Frame in use for loading document ...",static_cast< ::cppu::OWeakObject*>(this));
}
if ( ! setComponent(NULL,NULL) )
- throw css::util::CloseVetoException(DECLARE_ASCII("Component couldn't be deattached ..."),static_cast< ::cppu::OWeakObject*>(this));
+ throw css::util::CloseVetoException("Component couldn't be deattached ...",static_cast< ::cppu::OWeakObject*>(this));
// If closing is allowed ... inform all istener and dispose this frame!
pContainer = m_aListenerContainer.getContainer( ::getCppuType( ( const css::uno::Reference< css::util::XCloseListener >*) NULL ) );
@@ -2329,7 +2329,7 @@ void SAL_CALL Frame::windowClosing( const css::lang::EventObject& ) throw( css::
/* SAFE */
css::util::URL aURL;
- aURL.Complete = DECLARE_ASCII(".uno:CloseFrame");
+ aURL.Complete = ".uno:CloseFrame";
css::uno::Reference< css::util::XURLTransformer > xParser(css::util::URLTransformer::create(xContext));
xParser->parseStrict(aURL);
@@ -2391,7 +2391,7 @@ void SAL_CALL Frame::windowShown( const css::lang::EventObject& ) throw(css::uno
{
css::uno::Reference< css::task::XJobExecutor > xExecutor
= css::task::JobExecutor::create( xContext );
- xExecutor->trigger( DECLARE_ASCII("onFirstVisibleTask") );
+ xExecutor->trigger( "onFirstVisibleTask" );
}
}
}