Skip to content

C
core
Kaydet (Commit) e912c601 authored tarafından Olivier Hallot's avatar Olivier Hallot
Dosyalara gözat
Seçenekler

More RTL_CONSTASCII_USTRINGPARAM cleanup 

More RTL_CONSTASCII_USTRINGPARAM in module sd
üst 8981d1d0
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 26 deletions
sd/source/ui/view/Outliner.cxx
Dosyayı görüntüle @ e912c601
...@@ -212,7 +212,7 @@ Outliner::Outliner( SdDrawDocument* pDoc, sal_uInt16 nMode ) ...@@ -212,7 +212,7 @@ Outliner::Outliner( SdDrawDocument* pDoc, sal_uInt16 nMode )
Any aAny; Any aAny;
aAny = aLinguConfig.GetProperty( aAny = aLinguConfig.GetProperty(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UPN_IS_SPELL_AUTO )) ); rtl::OUString( UPN_IS_SPELL_AUTO ) );
aAny >>= bOnlineSpell; aAny >>= bOnlineSpell;
} }
catch( ... ) catch( ... )
......
sd/source/ui/view/PresentationViewShellBase.cxx
Dosyayı görüntüle @ e912c601
...@@ -86,12 +86,12 @@ PresentationViewShellBase::PresentationViewShellBase ( ...@@ -86,12 +86,12 @@ PresentationViewShellBase::PresentationViewShellBase (
if (xFrameSet.is()) if (xFrameSet.is())
{ {
Reference<beans::XPropertySet> xLayouterSet ( Reference<beans::XPropertySet> xLayouterSet (
xFrameSet->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LayoutManager"))), xFrameSet->getPropertyValue(::rtl::OUString("LayoutManager")),
UNO_QUERY); UNO_QUERY);
if (xLayouterSet.is()) if (xLayouterSet.is())
{ {
xLayouterSet->setPropertyValue( xLayouterSet->setPropertyValue(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AutomaticToolbars")), ::rtl::OUString("AutomaticToolbars"),
makeAny(sal_False)); makeAny(sal_False));
} }
} }
......
sd/source/ui/view/ToolBarManager.cxx
Dosyayı görüntüle @ e912c601
...@@ -59,7 +59,7 @@ using namespace ::com::sun::star; ...@@ -59,7 +59,7 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno; using namespace ::com::sun::star::uno;
#undef OUSTRING // Remove definition made in the SFX #undef OUSTRING // Remove definition made in the SFX
#define OUSTRING(s) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(s))) #define OUSTRING(s) (::rtl::OUString(s))
namespace { namespace {
......
sd/source/ui/view/ViewShellBase.cxx
Dosyayı görüntüle @ e912c601
...@@ -1142,14 +1142,14 @@ void ViewShellBase::SetViewTabBar (const ::rtl::Reference<ViewTabBar>& rViewTabB ...@@ -1142,14 +1142,14 @@ void ViewShellBase::SetViewTabBar (const ::rtl::Reference<ViewTabBar>& rViewTabB
{ {
Reference< XMultiServiceFactory > xServiceManager( ::comphelper::getProcessServiceFactory(), UNO_QUERY_THROW ); Reference< XMultiServiceFactory > xServiceManager( ::comphelper::getProcessServiceFactory(), UNO_QUERY_THROW );
Reference< XModuleManager > xModuleManager( xServiceManager->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ModuleManager") ) ), UNO_QUERY_THROW ); Reference< XModuleManager > xModuleManager( xServiceManager->createInstance( OUString( "com.sun.star.frame.ModuleManager") ), UNO_QUERY_THROW );
Reference< XInterface > xIfac( xFrame, UNO_QUERY_THROW ); Reference< XInterface > xIfac( xFrame, UNO_QUERY_THROW );
::rtl::OUString aModuleIdentifier( xModuleManager->identify( xIfac ) ); ::rtl::OUString aModuleIdentifier( xModuleManager->identify( xIfac ) );
if( !aModuleIdentifier.isEmpty() ) if( !aModuleIdentifier.isEmpty() )
{ {
Reference< XNameAccess > xNameAccess( xServiceManager->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.UICommandDescription" ) ) ), UNO_QUERY ); Reference< XNameAccess > xNameAccess( xServiceManager->createInstance( rtl::OUString( "com.sun.star.frame.UICommandDescription" ) ), UNO_QUERY );
if( xNameAccess.is() ) if( xNameAccess.is() )
{ {
Reference< ::com::sun::star::container::XNameAccess > m_xUICommandLabels( xNameAccess->getByName( aModuleIdentifier ), UNO_QUERY_THROW ); Reference< ::com::sun::star::container::XNameAccess > m_xUICommandLabels( xNameAccess->getByName( aModuleIdentifier ), UNO_QUERY_THROW );
...@@ -1241,7 +1241,7 @@ void ViewShellBase::Implementation::ProcessRestoreEditingViewSlot (void) ...@@ -1241,7 +1241,7 @@ void ViewShellBase::Implementation::ProcessRestoreEditingViewSlot (void)
pHelper->GetViewURL(pFrameView->GetViewShellTypeOnLoad()), pHelper->GetViewURL(pFrameView->GetViewShellTypeOnLoad()),
FrameworkHelper::msCenterPaneURL); FrameworkHelper::msCenterPaneURL);
pHelper->RunOnConfigurationEvent( pHelper->RunOnConfigurationEvent(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ConfigurationUpdateEnd")), ::rtl::OUString("ConfigurationUpdateEnd"),
CurrentPageSetter(mrBase)); CurrentPageSetter(mrBase));
} }
} }
......
sd/source/ui/view/drviews5.cxx
Dosyayı görüntüle @ e912c601
...@@ -551,7 +551,7 @@ void DrawViewShell::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < :: ...@@ -551,7 +551,7 @@ void DrawViewShell::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::
const sal_Int32 nIndex = rSequence.getLength(); const sal_Int32 nIndex = rSequence.getLength();
rSequence.realloc( nIndex + 1 ); rSequence.realloc( nIndex + 1 );
rSequence[nIndex].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_ZoomOnPage ) ); rSequence[nIndex].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_ZoomOnPage ));
rSequence[nIndex].Value <<= (sal_Bool)mbZoomOnPage; rSequence[nIndex].Value <<= (sal_Bool)mbZoomOnPage;
} }
......
sd/source/ui/view/drviews7.cxx
Dosyayı görüntüle @ e912c601
...@@ -1504,7 +1504,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) ...@@ -1504,7 +1504,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
{ {
uno::Reference< beans::XPropertySetInfo > xPropInfo( xPropSet->getPropertySetInfo() ); uno::Reference< beans::XPropertySetInfo > xPropInfo( xPropSet->getPropertySetInfo() );
if( xPropInfo.is() && xPropInfo->hasPropertyByName( if( xPropInfo.is() && xPropInfo->hasPropertyByName(
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TargetURL")))) rtl::OUString( "TargetURL")))
{ {
bDisableEditHyperlink = sal_False; bDisableEditHyperlink = sal_False;
} }
......
sd/source/ui/view/drviewsa.cxx
Dosyayı görüntüle @ e912c601
...@@ -84,7 +84,7 @@ using namespace ::com::sun::star::uno; ...@@ -84,7 +84,7 @@ using namespace ::com::sun::star::uno;
namespace { namespace {
static const ::rtl::OUString MASTER_VIEW_TOOL_BAR_NAME( static const ::rtl::OUString MASTER_VIEW_TOOL_BAR_NAME(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("masterviewtoolbar"))); ::rtl::OUString("masterviewtoolbar"));
} }
namespace sd { namespace sd {
...@@ -389,7 +389,7 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind) ...@@ -389,7 +389,7 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind)
if( xMgr.is() ) if( xMgr.is() )
{ {
mxScannerManager = ::com::sun::star::uno::Reference< ::com::sun::star::scanner::XScannerManager2 >( mxScannerManager = ::com::sun::star::uno::Reference< ::com::sun::star::scanner::XScannerManager2 >(
xMgr->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.scanner.ScannerManager" )) ), xMgr->createInstance( ::rtl::OUString("com.sun.star.scanner.ScannerManager" ) ),
::com::sun::star::uno::UNO_QUERY ); ::com::sun::star::uno::UNO_QUERY );
if( mxScannerManager.is() ) if( mxScannerManager.is() )
......
sd/source/ui/view/drviewsb.cxx
Dosyayı görüntüle @ e912c601
...@@ -692,7 +692,7 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq) ...@@ -692,7 +692,7 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq)
{ {
try try
{ {
com::sun::star::uno::Reference < ::com::sun::star::ui::dialogs::XExecutableDialog > xDialog(::comphelper::getProcessServiceFactory()->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.ui.XSLTFilterDialog"))), com::sun::star::uno::UNO_QUERY); com::sun::star::uno::Reference < ::com::sun::star::ui::dialogs::XExecutableDialog > xDialog(::comphelper::getProcessServiceFactory()->createInstance(rtl::OUString("com.sun.star.comp.ui.XSLTFilterDialog")), com::sun::star::uno::UNO_QUERY);
if( xDialog.is() ) if( xDialog.is() )
{ {
xDialog->execute(); xDialog->execute();
......
sd/source/ui/view/drviewse.cxx
Dosyayı görüntüle @ e912c601
...@@ -1593,16 +1593,16 @@ void DrawViewShell::InsertURLButton(const String& rURL, const String& rText, ...@@ -1593,16 +1593,16 @@ void DrawViewShell::InsertURLButton(const String& rURL, const String& rText,
Reference< awt::XControlModel > xControlModel( pUnoCtrl->GetUnoControlModel(), UNO_QUERY_THROW ); Reference< awt::XControlModel > xControlModel( pUnoCtrl->GetUnoControlModel(), UNO_QUERY_THROW );
Reference< beans::XPropertySet > xPropSet( xControlModel, UNO_QUERY_THROW ); Reference< beans::XPropertySet > xPropSet( xControlModel, UNO_QUERY_THROW );
xPropSet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Label" )), Any( OUString( rText ) ) ); xPropSet->setPropertyValue( OUString( "Label" ), Any( OUString( rText ) ) );
xPropSet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "TargetURL" )), Any( sTargetURL ) ); xPropSet->setPropertyValue( OUString( "TargetURL" ), Any( sTargetURL ) );
if( rTarget.Len() ) if( rTarget.Len() )
xPropSet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "TargetFrame" )), Any( OUString( rTarget ) ) ); xPropSet->setPropertyValue( OUString( "TargetFrame" ), Any( OUString( rTarget ) ) );
xPropSet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "ButtonType" )), Any( form::FormButtonType_URL ) ); xPropSet->setPropertyValue( OUString( "ButtonType" ), Any( form::FormButtonType_URL ) );
if ( ::avmedia::MediaWindow::isMediaURL( rURL ) ) if ( ::avmedia::MediaWindow::isMediaURL( rURL ) )
{ {
xPropSet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "DispatchURLInternal" )), Any( sal_True ) ); xPropSet->setPropertyValue( OUString( "DispatchURLInternal" ), Any( sal_True ) );
} }
} }
else else
...@@ -1628,15 +1628,15 @@ void DrawViewShell::InsertURLButton(const String& rURL, const String& rText, ...@@ -1628,15 +1628,15 @@ void DrawViewShell::InsertURLButton(const String& rURL, const String& rText,
Reference< awt::XControlModel > xControlModel( pUnoCtrl->GetUnoControlModel(), uno::UNO_QUERY_THROW ); Reference< awt::XControlModel > xControlModel( pUnoCtrl->GetUnoControlModel(), uno::UNO_QUERY_THROW );
Reference< beans::XPropertySet > xPropSet( xControlModel, uno::UNO_QUERY_THROW ); Reference< beans::XPropertySet > xPropSet( xControlModel, uno::UNO_QUERY_THROW );
xPropSet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Label" )), Any( OUString( rText ) ) ); xPropSet->setPropertyValue( OUString( "Label" ), Any( OUString( rText ) ) );
xPropSet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "TargetURL" )), Any( sTargetURL ) ); xPropSet->setPropertyValue( OUString( "TargetURL" ), Any( sTargetURL ) );
if( rTarget.Len() ) if( rTarget.Len() )
xPropSet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "TargetFrame" )), Any( OUString( rTarget ) ) ); xPropSet->setPropertyValue( OUString( "TargetFrame" ), Any( OUString( rTarget ) ) );
xPropSet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "ButtonType" )), Any( form::FormButtonType_URL ) ); xPropSet->setPropertyValue( OUString( "ButtonType" ), Any( form::FormButtonType_URL ) );
if ( ::avmedia::MediaWindow::isMediaURL( rURL ) ) if ( ::avmedia::MediaWindow::isMediaURL( rURL ) )
xPropSet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "DispatchURLInternal" )), Any( sal_True ) ); xPropSet->setPropertyValue( OUString( "DispatchURLInternal" ), Any( sal_True ) );
Point aPos; Point aPos;
......
sd/source/ui/view/drviewsf.cxx
Dosyayı görüntüle @ e912c601
...@@ -138,13 +138,13 @@ void DrawViewShell::GetCtrlState(SfxItemSet &rSet) ...@@ -138,13 +138,13 @@ void DrawViewShell::GetCtrlState(SfxItemSet &rSet)
uno::Reference< beans::XPropertySetInfo > xPropInfo( xPropSet->getPropertySetInfo(), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySetInfo > xPropInfo( xPropSet->getPropertySetInfo(), uno::UNO_QUERY_THROW );
form::FormButtonType eButtonType = form::FormButtonType_URL; form::FormButtonType eButtonType = form::FormButtonType_URL;
const OUString sButtonType( RTL_CONSTASCII_USTRINGPARAM( "ButtonType" ) ); const OUString sButtonType( "ButtonType" );
if(xPropInfo->hasPropertyByName( sButtonType ) && (xPropSet->getPropertyValue( sButtonType ) >>= eButtonType ) ) if(xPropInfo->hasPropertyByName( sButtonType ) && (xPropSet->getPropertyValue( sButtonType ) >>= eButtonType ) )
{ {
OUString aString; OUString aString;
// Label // Label
const OUString sLabel( RTL_CONSTASCII_USTRINGPARAM( "Label" ) ); const OUString sLabel( "Label" );
if(xPropInfo->hasPropertyByName(sLabel)) if(xPropInfo->hasPropertyByName(sLabel))
{ {
if( xPropSet->getPropertyValue(sLabel) >>= aString ) if( xPropSet->getPropertyValue(sLabel) >>= aString )
...@@ -152,7 +152,7 @@ void DrawViewShell::GetCtrlState(SfxItemSet &rSet) ...@@ -152,7 +152,7 @@ void DrawViewShell::GetCtrlState(SfxItemSet &rSet)
} }
// URL // URL
const OUString sTargetURL(RTL_CONSTASCII_USTRINGPARAM( "TargetURL" )); const OUString sTargetURL( "TargetURL" );
if(xPropInfo->hasPropertyByName(sTargetURL)) if(xPropInfo->hasPropertyByName(sTargetURL))
{ {
if( xPropSet->getPropertyValue(sTargetURL) >>= aString ) if( xPropSet->getPropertyValue(sTargetURL) >>= aString )
...@@ -160,7 +160,7 @@ void DrawViewShell::GetCtrlState(SfxItemSet &rSet) ...@@ -160,7 +160,7 @@ void DrawViewShell::GetCtrlState(SfxItemSet &rSet)
} }
// Target // Target
const OUString sTargetFrame( RTL_CONSTASCII_USTRINGPARAM( "TargetFrame" ) ); const OUString sTargetFrame( "TargetFrame" );
if(xPropInfo->hasPropertyByName(sTargetFrame) ) if(xPropInfo->hasPropertyByName(sTargetFrame) )
{ {
if( xPropSet->getPropertyValue(sTargetFrame) >>= aString ) if( xPropSet->getPropertyValue(sTargetFrame) >>= aString )
......
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