summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sfx2/source/appl/helpinterceptor.cxx2
-rw-r--r--sfx2/source/bastyp/helper.cxx18
-rw-r--r--sfx2/source/doc/graphhelp.cxx8
-rw-r--r--sfx2/source/doc/iframe.cxx13
-rw-r--r--sfx2/source/view/ipclient.cxx20
5 files changed, 29 insertions, 32 deletions
diff --git a/sfx2/source/appl/helpinterceptor.cxx b/sfx2/source/appl/helpinterceptor.cxx
index 601c315c06a8..85fd84ca6533 100644
--- a/sfx2/source/appl/helpinterceptor.cxx
+++ b/sfx2/source/appl/helpinterceptor.cxx
@@ -152,7 +152,7 @@ Reference< XDispatch > SAL_CALL HelpInterceptor_Impl::queryDispatch(
if ( m_xSlaveDispatcher.is() )
xResult = m_xSlaveDispatcher->queryDispatch( aURL, aTargetFrameName, nSearchFlags );
- sal_Bool bHelpURL = aURL.Complete.toAsciiLowerCase().match(rtl::OUString("vnd.sun.star.help"),0);
+ sal_Bool bHelpURL = aURL.Complete.toAsciiLowerCase().match("vnd.sun.star.help",0);
if ( bHelpURL )
{
diff --git a/sfx2/source/bastyp/helper.cxx b/sfx2/source/bastyp/helper.cxx
index 5739aa6fc74b..50b9196950c2 100644
--- a/sfx2/source/bastyp/helper.cxx
+++ b/sfx2/source/bastyp/helper.cxx
@@ -96,9 +96,9 @@ uno::Sequence < OUString > SfxContentHelper::GetResultSet( const String& rURL )
uno::Reference< ucb::XDynamicResultSet > xDynResultSet;
uno::Sequence< OUString > aProps(3);
OUString* pProps = aProps.getArray();
- pProps[0] = OUString("Title");
- pProps[1] = OUString("ContentType");
- pProps[2] = OUString("IsFolder");
+ pProps[0] = "Title";
+ pProps[1] = "ContentType";
+ pProps[2] = "IsFolder";
try
{
@@ -180,14 +180,14 @@ uno::Sequence< OUString > SfxContentHelper::GetHelpTreeViewContents( const Strin
{
uno::Reference< lang::XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory();
uno::Reference< task::XInteractionHandler > xInteractionHandler = uno::Reference< task::XInteractionHandler > (
- xFactory->createInstance( ::rtl::OUString( "com.sun.star.task.InteractionHandler" ) ), uno::UNO_QUERY );
+ xFactory->createInstance( "com.sun.star.task.InteractionHandler" ), uno::UNO_QUERY );
::ucbhelper::Content aCnt( rURL, new ::ucbhelper::CommandEnvironment( xInteractionHandler, uno::Reference< ucb::XProgressHandler >() ) );
uno::Reference< sdbc::XResultSet > xResultSet;
uno::Sequence< OUString > aProps(2);
OUString* pProps = aProps.getArray();
- pProps[0] = OUString("Title");
- pProps[1] = OUString("IsFolder");
+ pProps[0] = "Title";
+ pProps[1] = "IsFolder";
try
{
@@ -264,7 +264,7 @@ String SfxContentHelper::GetActiveHelpString( const String& rURL )
{
uno::Reference< lang::XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory();
uno::Reference< task::XInteractionHandler > xInteractionHandler = uno::Reference< task::XInteractionHandler > (
- xFactory->createInstance( ::rtl::OUString( "com.sun.star.task.InteractionHandler" ) ), uno::UNO_QUERY );
+ xFactory->createInstance( "com.sun.star.task.InteractionHandler" ), uno::UNO_QUERY );
::ucbhelper::Content aCnt( rURL, new ::ucbhelper::CommandEnvironment( xInteractionHandler, uno::Reference< ucb::XProgressHandler >() ) );
// open the "active help" stream
uno::Reference< io::XInputStream > xStream = aCnt.openStream();
@@ -298,7 +298,7 @@ sal_Bool SfxContentHelper::IsHelpErrorDocument( const String& rURL )
{
::ucbhelper::Content aCnt( INetURLObject( rURL ).GetMainURL( INetURLObject::NO_DECODE ),
uno::Reference< ucb::XCommandEnvironment > () );
- if ( !( aCnt.getPropertyValue( OUString("IsErrorDocument") ) >>= bRet ) )
+ if ( !( aCnt.getPropertyValue( "IsErrorDocument" ) >>= bRet ) )
{
SAL_WARN( "sfx2.bastyp", "Property 'IsErrorDocument' is missing" );
}
@@ -321,7 +321,7 @@ sal_uIntPtr SfxContentHelper::GetSize( const String& rContent )
try
{
::ucbhelper::Content aCnt( aObj.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< ucb::XCommandEnvironment > () );
- aCnt.getPropertyValue( OUString("Size") ) >>= nTemp;
+ aCnt.getPropertyValue( "Size" ) >>= nTemp;
}
catch( const ucb::CommandAbortedException& )
{
diff --git a/sfx2/source/doc/graphhelp.cxx b/sfx2/source/doc/graphhelp.cxx
index 8ed8bd8e9a1a..11acd56c6c10 100644
--- a/sfx2/source/doc/graphhelp.cxx
+++ b/sfx2/source/doc/graphhelp.cxx
@@ -462,7 +462,7 @@ sal_Bool GraphicHelper::getThumbnailReplacement_Impl( sal_Int32 nResID, const un
{
uno::Reference< graphic::XGraphicProvider > xGraphProvider(
xServiceManager->createInstance(
- ::rtl::OUString("com.sun.star.graphic.GraphicProvider") ),
+ "com.sun.star.graphic.GraphicProvider") ,
uno::UNO_QUERY );
if ( xGraphProvider.is() )
{
@@ -470,16 +470,16 @@ sal_Bool GraphicHelper::getThumbnailReplacement_Impl( sal_Int32 nResID, const un
aURL += ::rtl::OUString::valueOf( nResID );
uno::Sequence< beans::PropertyValue > aMediaProps( 1 );
- aMediaProps[0].Name = ::rtl::OUString("URL");
+ aMediaProps[0].Name = "URL";
aMediaProps[0].Value <<= aURL;
uno::Reference< graphic::XGraphic > xGraphic = xGraphProvider->queryGraphic( aMediaProps );
if ( xGraphic.is() )
{
uno::Sequence< beans::PropertyValue > aStoreProps( 2 );
- aStoreProps[0].Name = ::rtl::OUString("OutputStream");
+ aStoreProps[0].Name = "OutputStream";
aStoreProps[0].Value <<= xStream;
- aStoreProps[1].Name = ::rtl::OUString("MimeType");
+ aStoreProps[1].Name = "MimeType";
aStoreProps[1].Value <<= ::rtl::OUString("image/png");
xGraphProvider->storeGraphic( xGraphic, aStoreProps );
diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx
index 096902da7eaf..9d60fb6a8168 100644
--- a/sfx2/source/doc/iframe.cxx
+++ b/sfx2/source/doc/iframe.cxx
@@ -141,8 +141,7 @@ throw( uno::RuntimeException )
// we must destroy the IFrame before the parent is destroyed
xWindow->addEventListener( this );
- mxFrame = uno::Reference< frame::XFrame >( mxFact->createInstance( ::rtl::OUString("com.sun.star.frame.Frame") ),
- uno::UNO_QUERY );
+ mxFrame = uno::Reference< frame::XFrame >( mxFact->createInstance( "com.sun.star.frame.Frame" ),uno::UNO_QUERY );
uno::Reference < awt::XWindow > xWin( pWin->GetComponentInterface(), uno::UNO_QUERY );
mxFrame->initialize( xWin );
mxFrame->setName( maFrmDescr.GetName() );
@@ -155,15 +154,15 @@ throw( uno::RuntimeException )
util::URL aTargetURL;
aTargetURL.Complete = ::rtl::OUString( maFrmDescr.GetURL().GetMainURL( INetURLObject::NO_DECODE ) );
- uno::Reference < util::XURLTransformer > xTrans( mxFact->createInstance( rtl::OUString("com.sun.star.util.URLTransformer")), uno::UNO_QUERY );
+ uno::Reference < util::XURLTransformer > xTrans( mxFact->createInstance( "com.sun.star.util.URLTransformer"), uno::UNO_QUERY );
xTrans->parseStrict( aTargetURL );
uno::Sequence < beans::PropertyValue > aProps(2);
- aProps[0].Name = ::rtl::OUString("PluginMode");
+ aProps[0].Name = "PluginMode";
aProps[0].Value <<= (sal_Int16) 2;
- aProps[1].Name = ::rtl::OUString("ReadOnly");
+ aProps[1].Name = "ReadOnly";
aProps[1].Value <<= (sal_Bool) sal_True;
- uno::Reference < frame::XDispatch > xDisp = xProv->queryDispatch( aTargetURL, ::rtl::OUString("_self"), 0 );
+ uno::Reference < frame::XDispatch > xDisp = xProv->queryDispatch( aTargetURL, "_self", 0 );
if ( xDisp.is() )
xDisp->dispatch( aTargetURL, aProps );
@@ -367,7 +366,7 @@ void SAL_CALL IFrameObject::removeVetoableChangeListener(const ::rtl::OUString&,
::sal_Int16 SAL_CALL IFrameObject::execute() throw (::com::sun::star::uno::RuntimeException)
{
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
- VclAbstractDialog* pDlg = pFact->CreateEditObjectDialog( NULL, rtl::OUString(".uno:InsertObjectFloatingFrame"), mxObj );
+ VclAbstractDialog* pDlg = pFact->CreateEditObjectDialog( NULL, ".uno:InsertObjectFloatingFrame", mxObj );
if ( pDlg )
pDlg->Execute();
return 0;
diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx
index 2892be7bfc23..3bdae69e426f 100644
--- a/sfx2/source/view/ipclient.cxx
+++ b/sfx2/source/view/ipclient.cxx
@@ -255,15 +255,13 @@ void SAL_CALL SfxInPlaceClient_Impl::saveObject()
// set non-reschedule progress to prevent problems when asynchronous calls are made
// during storing of the embedded object
uno::Reference< lang::XInitialization > xInit(
- xSrvMgr->createInstance(
- rtl::OUString( "com.sun.star.comp.framework.StatusIndicatorFactory" )),
- uno::UNO_QUERY_THROW );
+ xSrvMgr->createInstance( "com.sun.star.comp.framework.StatusIndicatorFactory" ), uno::UNO_QUERY_THROW );
beans::PropertyValue aProperty;
uno::Sequence< uno::Any > aArgs( 2 );
- aProperty.Name = rtl::OUString( "DisableReschedule" );
+ aProperty.Name = "DisableReschedule";
aProperty.Value = uno::makeAny( sal_True );
aArgs[0] = uno::makeAny( aProperty );
- aProperty.Name = rtl::OUString( "Frame" );
+ aProperty.Name = "Frame";
aProperty.Value = uno::makeAny( xFrame );
aArgs[1] = uno::makeAny( aProperty );
@@ -276,7 +274,7 @@ void SAL_CALL SfxInPlaceClient_Impl::saveObject()
{
uno::Reference< task::XStatusIndicatorFactory > xStatusIndicatorFactory( xInit, uno::UNO_QUERY_THROW );
xStatusIndicator = xStatusIndicatorFactory->createStatusIndicator();
- xPropSet->setPropertyValue( rtl::OUString( "IndicatorInterception" ), uno::makeAny( xStatusIndicator ));
+ xPropSet->setPropertyValue( "IndicatorInterception" , uno::makeAny( xStatusIndicator ));
}
catch ( const uno::RuntimeException& )
{
@@ -305,7 +303,7 @@ void SAL_CALL SfxInPlaceClient_Impl::saveObject()
if ( xPropSet.is() )
{
xStatusIndicator.clear();
- xPropSet->setPropertyValue( rtl::OUString( "IndicatorInterception" ), uno::makeAny( xStatusIndicator ));
+ xPropSet->setPropertyValue( "IndicatorInterception" , uno::makeAny( xStatusIndicator ));
}
}
catch ( const uno::RuntimeException& )
@@ -420,7 +418,7 @@ uno::Reference< ::com::sun::star::frame::XLayoutManager > SAL_CALL SfxInPlaceCli
uno::Reference< ::com::sun::star::frame::XLayoutManager > xMan;
try
{
- uno::Any aAny = xFrame->getPropertyValue( ::rtl::OUString("LayoutManager") );
+ uno::Any aAny = xFrame->getPropertyValue( "LayoutManager" );
aAny >>= xMan;
}
catch ( uno::Exception& )
@@ -917,14 +915,14 @@ ErrCode SfxInPlaceClient::DoVerb( long nVerb )
uno::Reference< lang::XMultiServiceFactory > xEmptyFactory;
SfxStoringHelper aHelper( xEmptyFactory );
uno::Sequence< beans::PropertyValue > aDispatchArgs( 1 );
- aDispatchArgs[0].Name = ::rtl::OUString( "SaveTo" );
+ aDispatchArgs[0].Name = "SaveTo";
aDispatchArgs[0].Value <<= (sal_Bool)sal_True;
aHelper.GUIStoreModel( xEmbModel,
- ::rtl::OUString( "SaveAs" ),
+ "SaveAs",
aDispatchArgs,
sal_False,
- ::rtl::OUString() );
+ "" );
}
catch( const task::ErrorCodeIOException& aErrorEx )
{