Kaydet (Commit) 96f9300a authored tarafından Olivier Hallot's avatar Olivier Hallot

More RTL_CONSTASCII_USTRINGPARAM removals

üst 120786ae
...@@ -820,7 +820,7 @@ void SAL_CALL SlideShow::end() throw(RuntimeException) ...@@ -820,7 +820,7 @@ void SAL_CALL SlideShow::end() throw(RuntimeException)
if( xProvider.is() ) if( xProvider.is() )
{ {
util::URL aURL; util::URL aURL;
aURL.Complete = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:CloseFrame")); aURL.Complete = ".uno:CloseFrame";
uno::Reference< frame::XDispatch > xDispatch( uno::Reference< frame::XDispatch > xDispatch(
xProvider->queryDispatch( xProvider->queryDispatch(
...@@ -1296,11 +1296,9 @@ sal_Int32 SlideShow::GetDisplay() ...@@ -1296,11 +1296,9 @@ sal_Int32 SlideShow::GetDisplay()
Reference<XMultiServiceFactory > xFactory( Reference<XMultiServiceFactory > xFactory(
::comphelper::getProcessServiceFactory(), UNO_QUERY_THROW); ::comphelper::getProcessServiceFactory(), UNO_QUERY_THROW);
Reference<XPropertySet> xMonitorProperties( Reference<XPropertySet> xMonitorProperties(
xFactory->createInstance( xFactory->createInstance( "com.sun.star.awt.DisplayAccess" ),
OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.DisplayAccess"))),
UNO_QUERY_THROW); UNO_QUERY_THROW);
const OUString sPropertyName (RTL_CONSTASCII_USTRINGPARAM("DefaultDisplay")); xMonitorProperties->getPropertyValue("DefaultDisplay") >>= nDisplay;
xMonitorProperties->getPropertyValue(sPropertyName) >>= nDisplay;
} }
catch( Exception& ) catch( Exception& )
{ {
......
...@@ -669,7 +669,7 @@ void SlideShowView::init() ...@@ -669,7 +669,7 @@ void SlideShowView::init()
uno::UNO_QUERY_THROW ); uno::UNO_QUERY_THROW );
if( xFactory.is() ) if( xFactory.is() )
mxPointer.set( xFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.Pointer")) ), mxPointer.set( xFactory->createInstance( "com.sun.star.awt.Pointer" ),
uno::UNO_QUERY ); uno::UNO_QUERY );
getTransformation(); getTransformation();
...@@ -683,8 +683,7 @@ void SlideShowView::init() ...@@ -683,8 +683,7 @@ void SlideShowView::init()
{ {
Reference< beans::XPropertySet > xCanvasProps( getCanvas(), Reference< beans::XPropertySet > xCanvasProps( getCanvas(),
uno::UNO_QUERY_THROW ); uno::UNO_QUERY_THROW );
xCanvasProps->setPropertyValue( xCanvasProps->setPropertyValue("UnsafeScrolling",
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UnsafeScrolling")),
uno::makeAny( true ) ); uno::makeAny( true ) );
} }
catch( uno::Exception& ) catch( uno::Exception& )
......
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