[Libreoffice-commits] .: sd/source
Olivier Hallot
ohallot at kemper.freedesktop.org
Thu Apr 5 14:42:34 PDT 2012
sd/source/ui/view/Outliner.cxx | 2 +-
sd/source/ui/view/PresentationViewShellBase.cxx | 4 ++--
sd/source/ui/view/ToolBarManager.cxx | 2 +-
sd/source/ui/view/ViewShellBase.cxx | 6 +++---
sd/source/ui/view/drviews5.cxx | 2 +-
sd/source/ui/view/drviews7.cxx | 2 +-
sd/source/ui/view/drviewsa.cxx | 4 ++--
sd/source/ui/view/drviewsb.cxx | 2 +-
sd/source/ui/view/drviewse.cxx | 20 ++++++++++----------
sd/source/ui/view/drviewsf.cxx | 8 ++++----
10 files changed, 26 insertions(+), 26 deletions(-)
New commits:
commit e912c601843d505de9c92ea04fd54f11016d37c8
Author: Olivier Hallot <olivier.hallot at alta.org.br>
Date: Thu Apr 5 18:39:50 2012 -0300
More RTL_CONSTASCII_USTRINGPARAM cleanup
More RTL_CONSTASCII_USTRINGPARAM in module sd
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index d4a427f..d9858b1 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -212,7 +212,7 @@ Outliner::Outliner( SdDrawDocument* pDoc, sal_uInt16 nMode )
Any aAny;
aAny = aLinguConfig.GetProperty(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UPN_IS_SPELL_AUTO )) );
+ rtl::OUString( UPN_IS_SPELL_AUTO ) );
aAny >>= bOnlineSpell;
}
catch( ... )
diff --git a/sd/source/ui/view/PresentationViewShellBase.cxx b/sd/source/ui/view/PresentationViewShellBase.cxx
index 424b7ed..8c7315f 100644
--- a/sd/source/ui/view/PresentationViewShellBase.cxx
+++ b/sd/source/ui/view/PresentationViewShellBase.cxx
@@ -86,12 +86,12 @@ PresentationViewShellBase::PresentationViewShellBase (
if (xFrameSet.is())
{
Reference<beans::XPropertySet> xLayouterSet (
- xFrameSet->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LayoutManager"))),
+ xFrameSet->getPropertyValue(::rtl::OUString("LayoutManager")),
UNO_QUERY);
if (xLayouterSet.is())
{
xLayouterSet->setPropertyValue(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AutomaticToolbars")),
+ ::rtl::OUString("AutomaticToolbars"),
makeAny(sal_False));
}
}
diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx
index be97fd9..4d1ef89 100644
--- a/sd/source/ui/view/ToolBarManager.cxx
+++ b/sd/source/ui/view/ToolBarManager.cxx
@@ -59,7 +59,7 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
#undef OUSTRING // Remove definition made in the SFX
-#define OUSTRING(s) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(s)))
+#define OUSTRING(s) (::rtl::OUString(s))
namespace {
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index 7948b94..340881b 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -1142,14 +1142,14 @@ void ViewShellBase::SetViewTabBar (const ::rtl::Reference<ViewTabBar>& rViewTabB
{
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 );
::rtl::OUString aModuleIdentifier( xModuleManager->identify( xIfac ) );
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() )
{
Reference< ::com::sun::star::container::XNameAccess > m_xUICommandLabels( xNameAccess->getByName( aModuleIdentifier ), UNO_QUERY_THROW );
@@ -1241,7 +1241,7 @@ void ViewShellBase::Implementation::ProcessRestoreEditingViewSlot (void)
pHelper->GetViewURL(pFrameView->GetViewShellTypeOnLoad()),
FrameworkHelper::msCenterPaneURL);
pHelper->RunOnConfigurationEvent(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ConfigurationUpdateEnd")),
+ ::rtl::OUString("ConfigurationUpdateEnd"),
CurrentPageSetter(mrBase));
}
}
diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx
index 9f1c3b7..0af7f39 100644
--- a/sd/source/ui/view/drviews5.cxx
+++ b/sd/source/ui/view/drviews5.cxx
@@ -551,7 +551,7 @@ void DrawViewShell::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::
const sal_Int32 nIndex = rSequence.getLength();
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;
}
diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx
index 266119a..574895e 100644
--- a/sd/source/ui/view/drviews7.cxx
+++ b/sd/source/ui/view/drviews7.cxx
@@ -1504,7 +1504,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
{
uno::Reference< beans::XPropertySetInfo > xPropInfo( xPropSet->getPropertySetInfo() );
if( xPropInfo.is() && xPropInfo->hasPropertyByName(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TargetURL"))))
+ rtl::OUString( "TargetURL")))
{
bDisableEditHyperlink = sal_False;
}
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index 7a6e6aa..3d63a09 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -84,7 +84,7 @@ using namespace ::com::sun::star::uno;
namespace {
static const ::rtl::OUString MASTER_VIEW_TOOL_BAR_NAME(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("masterviewtoolbar")));
+ ::rtl::OUString("masterviewtoolbar"));
}
namespace sd {
@@ -389,7 +389,7 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind)
if( xMgr.is() )
{
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 );
if( mxScannerManager.is() )
diff --git a/sd/source/ui/view/drviewsb.cxx b/sd/source/ui/view/drviewsb.cxx
index 516e7b8..a2741a4 100644
--- a/sd/source/ui/view/drviewsb.cxx
+++ b/sd/source/ui/view/drviewsb.cxx
@@ -692,7 +692,7 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq)
{
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() )
{
xDialog->execute();
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index 433118b..749d3c7 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -1593,16 +1593,16 @@ void DrawViewShell::InsertURLButton(const String& rURL, const String& rText,
Reference< awt::XControlModel > xControlModel( pUnoCtrl->GetUnoControlModel(), UNO_QUERY_THROW );
Reference< beans::XPropertySet > xPropSet( xControlModel, UNO_QUERY_THROW );
- xPropSet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Label" )), Any( OUString( rText ) ) );
- xPropSet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "TargetURL" )), Any( sTargetURL ) );
+ xPropSet->setPropertyValue( OUString( "Label" ), Any( OUString( rText ) ) );
+ xPropSet->setPropertyValue( OUString( "TargetURL" ), Any( sTargetURL ) );
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 ) )
{
- xPropSet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "DispatchURLInternal" )), Any( sal_True ) );
+ xPropSet->setPropertyValue( OUString( "DispatchURLInternal" ), Any( sal_True ) );
}
}
else
@@ -1628,15 +1628,15 @@ void DrawViewShell::InsertURLButton(const String& rURL, const String& rText,
Reference< awt::XControlModel > xControlModel( pUnoCtrl->GetUnoControlModel(), 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( RTL_CONSTASCII_USTRINGPARAM( "TargetURL" )), Any( sTargetURL ) );
+ xPropSet->setPropertyValue( OUString( "Label" ), Any( OUString( rText ) ) );
+ xPropSet->setPropertyValue( OUString( "TargetURL" ), Any( sTargetURL ) );
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 ) )
- xPropSet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "DispatchURLInternal" )), Any( sal_True ) );
+ xPropSet->setPropertyValue( OUString( "DispatchURLInternal" ), Any( sal_True ) );
Point aPos;
diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx
index 6c7af31..df0ddd9 100644
--- a/sd/source/ui/view/drviewsf.cxx
+++ b/sd/source/ui/view/drviewsf.cxx
@@ -138,13 +138,13 @@ void DrawViewShell::GetCtrlState(SfxItemSet &rSet)
uno::Reference< beans::XPropertySetInfo > xPropInfo( xPropSet->getPropertySetInfo(), uno::UNO_QUERY_THROW );
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 ) )
{
OUString aString;
// Label
- const OUString sLabel( RTL_CONSTASCII_USTRINGPARAM( "Label" ) );
+ const OUString sLabel( "Label" );
if(xPropInfo->hasPropertyByName(sLabel))
{
if( xPropSet->getPropertyValue(sLabel) >>= aString )
@@ -152,7 +152,7 @@ void DrawViewShell::GetCtrlState(SfxItemSet &rSet)
}
// URL
- const OUString sTargetURL(RTL_CONSTASCII_USTRINGPARAM( "TargetURL" ));
+ const OUString sTargetURL( "TargetURL" );
if(xPropInfo->hasPropertyByName(sTargetURL))
{
if( xPropSet->getPropertyValue(sTargetURL) >>= aString )
@@ -160,7 +160,7 @@ void DrawViewShell::GetCtrlState(SfxItemSet &rSet)
}
// Target
- const OUString sTargetFrame( RTL_CONSTASCII_USTRINGPARAM( "TargetFrame" ) );
+ const OUString sTargetFrame( "TargetFrame" );
if(xPropInfo->hasPropertyByName(sTargetFrame) )
{
if( xPropSet->getPropertyValue(sTargetFrame) >>= aString )
More information about the Libreoffice-commits
mailing list