diff options
author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-06-02 11:53:41 -0500 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-06-02 12:58:04 -0500 |
commit | 343bd286c9693c7411bb7e622b4d487b8205fc10 (patch) | |
tree | a5f99f7366bb00d8a5bc7776f30f7f4f9657114f /odk/examples/cpp | |
parent | 8c525962030bb5b26a8ee84ba49b4bfd557fe3d4 (diff) |
targeted string re-work
Change-Id: Icdf89cd23f34b9d599512414b14907c9ac67cffb
Diffstat (limited to 'odk/examples/cpp')
5 files changed, 65 insertions, 66 deletions
diff --git a/odk/examples/cpp/DocumentLoader/DocumentLoader.cxx b/odk/examples/cpp/DocumentLoader/DocumentLoader.cxx index 47daa7559af0..a41008172fc8 100644 --- a/odk/examples/cpp/DocumentLoader/DocumentLoader.cxx +++ b/odk/examples/cpp/DocumentLoader/DocumentLoader.cxx @@ -72,7 +72,7 @@ using ::rtl::OUStringToOString; //============================================================================ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) { - OUString sConnectionString(RTL_CONSTASCII_USTRINGPARAM("uno:socket,host=localhost,port=2083;urp;StarOffice.ServiceManager")); + OUString sConnectionString("uno:socket,host=localhost,port=2083;urp;StarOffice.ServiceManager"); sal_Int32 nCount = (sal_Int32)rtl_getAppCommandArgCount(); @@ -101,7 +101,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) */ Reference< XInterface > xInterface = xMultiComponentFactoryClient->createInstanceWithContext( - OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.UnoUrlResolver")), + OUString("com.sun.star.bridge.UnoUrlResolver"), xComponentContext ); Reference< XUnoUrlResolver > resolver( xInterface, UNO_QUERY ); @@ -122,7 +122,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) // gets the server component context as property of the office component factory Reference< XPropertySet > xPropSet( xInterface, UNO_QUERY ); - xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xComponentContext; + xPropSet->getPropertyValue( OUString("DefaultContext") ) >>= xComponentContext; // gets the service manager from the office Reference< XMultiComponentFactory > xMultiComponentFactoryServer( @@ -133,7 +133,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) */ Reference < XComponentLoader > xComponentLoader( xMultiComponentFactoryServer->createInstanceWithContext( - OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop" ) ), + OUString( "com.sun.star.frame.Desktop" ), xComponentContext ), UNO_QUERY ); /* Loads a component specified by an URL into the specified new or existing @@ -147,7 +147,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) osl::FileBase::getAbsoluteFileURL( sWorkingDir, sDocPathUrl, sAbsoluteDocUrl); Reference< XComponent > xComponent = xComponentLoader->loadComponentFromURL( - sAbsoluteDocUrl, OUString( RTL_CONSTASCII_USTRINGPARAM("_blank") ), 0, + sAbsoluteDocUrl, OUString( "_blank" ), 0, Sequence < ::com::sun::star::beans::PropertyValue >() ); // dispose the local service manager diff --git a/odk/examples/cpp/complextoolbarcontrols/MyJob.cxx b/odk/examples/cpp/complextoolbarcontrols/MyJob.cxx index 1c944c1dd9dd..ad7f95a5f4aa 100644 --- a/odk/examples/cpp/complextoolbarcontrols/MyJob.cxx +++ b/odk/examples/cpp/complextoolbarcontrols/MyJob.cxx @@ -49,9 +49,9 @@ using com::sun::star::document::XEventBroadcaster; Any SAL_CALL MyJob::execute( const Sequence< NamedValue >& aArguments ) throw ( IllegalArgumentException, Exception, RuntimeException ) { - Reference < XEventBroadcaster > xBrd( mxMSF->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.GlobalEventBroadcaster")) ), UNO_QUERY ); + Reference < XEventBroadcaster > xBrd( mxMSF->createInstance(::rtl::OUString("com.sun.star.frame.GlobalEventBroadcaster") ), UNO_QUERY ); Reference < com::sun::star::document::XEventListener > xLstner( mxMSF->createInstance( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Office.MyListener")) ), UNO_QUERY ); + ::rtl::OUString("com.sun.star.comp.Office.MyListener") ), UNO_QUERY ); if ( xBrd.is() ) xBrd->addEventListener( xLstner ); return Any(); diff --git a/odk/examples/cpp/complextoolbarcontrols/MyListener.cxx b/odk/examples/cpp/complextoolbarcontrols/MyListener.cxx index 94d15d80f8b6..cdcda6b30691 100644 --- a/odk/examples/cpp/complextoolbarcontrols/MyListener.cxx +++ b/odk/examples/cpp/complextoolbarcontrols/MyListener.cxx @@ -92,11 +92,11 @@ css::uno::Any SAL_CALL MyListener::execute(const css::uno::Sequence< css::beans: return css::uno::Any(); css::uno::Reference< css::lang::XServiceInfo > xInfo(xModel, css::uno::UNO_QUERY); - sal_Bool bCalc = xInfo->supportsService(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SpreadsheetDocument"))); + sal_Bool bCalc = xInfo->supportsService(::rtl::OUString("com.sun.star.sheet.SpreadsheetDocument")); sal_Bool bWriter = ( - xInfo->supportsService(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextDocument"))) && - !xInfo->supportsService(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.WebDocument"))) && - !xInfo->supportsService(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.GlobalDocument"))) + xInfo->supportsService(::rtl::OUString("com.sun.star.text.TextDocument")) && + !xInfo->supportsService(::rtl::OUString("com.sun.star.text.WebDocument")) && + !xInfo->supportsService(::rtl::OUString("com.sun.star.text.GlobalDocument")) ); // We are interested only in Writer and Calc. However, here we are @@ -123,7 +123,7 @@ css::uno::Any SAL_CALL MyListener::execute(const css::uno::Sequence< css::beans: ::rtl::OUString SAL_CALL MyListener::getImplementationName() throw (css::uno::RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(MYLISTENER_IMPLEMENTATIONNAME)); + return ::rtl::OUString(MYLISTENER_IMPLEMENTATIONNAME); } @@ -131,7 +131,7 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL MyListener::getSupportedServiceNa throw (css::uno::RuntimeException) { css::uno::Sequence< ::rtl::OUString > lNames(1); - lNames[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(MYLISTENER_SERVICENAME)); + lNames[0] = ::rtl::OUString(MYLISTENER_SERVICENAME); return lNames; } diff --git a/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx b/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx index 7602b129f86b..98a897acc22d 100644 --- a/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx +++ b/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx @@ -78,14 +78,13 @@ void BaseDispatch::ShowMessageBox( const Reference< XFrame >& rFrame, const ::rt { if ( !mxToolkit.is() ) mxToolkit = Reference< XToolkit > ( mxMSF->createInstance( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.awt.Toolkit" ))), UNO_QUERY ); + ::rtl::OUString( "com.sun.star.awt.Toolkit" )), UNO_QUERY ); if ( rFrame.is() && mxToolkit.is() ) { // describe window properties. WindowDescriptor aDescriptor; aDescriptor.Type = WindowClass_MODALTOP; - aDescriptor.WindowServiceName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "infobox" )); + aDescriptor.WindowServiceName = ::rtl::OUString( "infobox" ); aDescriptor.ParentIndex = -1; aDescriptor.Parent = Reference< XWindowPeer >( rFrame->getContainerWindow(), UNO_QUERY ); aDescriptor.Bounds = Rectangle(0,0,300,200); @@ -201,7 +200,7 @@ Sequence < Reference< XDispatch > > SAL_CALL MyProtocolHandler::queryDispatches( ::rtl::OUString MyProtocolHandler_getImplementationName () throw (RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(MYPROTOCOLHANDLER_IMPLEMENTATIONNAME)); + return ::rtl::OUString(MYPROTOCOLHANDLER_IMPLEMENTATIONNAME); } sal_Bool SAL_CALL MyProtocolHandler_supportsService( const ::rtl::OUString& ServiceName ) @@ -214,7 +213,7 @@ Sequence< ::rtl::OUString > SAL_CALL MyProtocolHandler_getSupportedServiceNames( throw (RuntimeException) { Sequence < ::rtl::OUString > aRet(1); - aRet[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(MYPROTOCOLHANDLER_SERVICENAME)); + aRet[0] = ::rtl::OUString(MYPROTOCOLHANDLER_SERVICENAME); return aRet; } @@ -261,9 +260,9 @@ void SAL_CALL BaseDispatch::dispatch( const URL& aURL, const Sequence < Property if ( !aURL.Path.compareToAscii("Command1" ) ) { // open the OpenOffice.org web page - ::rtl::OUString sURL(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("http://www.openoffice.org"))); + ::rtl::OUString sURL(::rtl::OUString("http://www.openoffice.org")); Reference< XSystemShellExecute > xSystemShellExecute( mxMSF->createInstance( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.system.SystemShellExecute"))), UNO_QUERY ); + ::rtl::OUString("com.sun.star.system.SystemShellExecute")), UNO_QUERY ); if ( xSystemShellExecute.is() ) { try @@ -281,17 +280,17 @@ void SAL_CALL BaseDispatch::dispatch( const URL& aURL, const Sequence < Property { // remove the text if it's in our list Sequence< NamedValue > aRemoveArgs( 1 ); - aRemoveArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Text" )); + aRemoveArgs[0].Name = rtl::OUString( "Text" ); aRemoveArgs[0].Value <<= maComboBoxText; - SendCommand( aURL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RemoveEntryText")), aRemoveArgs, sal_True ); + SendCommand( aURL, ::rtl::OUString("RemoveEntryText"), aRemoveArgs, sal_True ); // add the new text to the start of the list Sequence< NamedValue > aInsertArgs( 2 ); - aInsertArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Pos" )); + aInsertArgs[0].Name = rtl::OUString( "Pos" ); aInsertArgs[0].Value <<= sal_Int32( 0 ); - aInsertArgs[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Text" )); + aInsertArgs[1].Name = rtl::OUString( "Text" ); aInsertArgs[1].Value <<= maComboBoxText; - SendCommand( aURL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("InsertEntry")), aInsertArgs, sal_True ); + SendCommand( aURL, ::rtl::OUString("InsertEntry"), aInsertArgs, sal_True ); } else if ( !aURL.Path.compareToAscii("Command3" ) ) { @@ -308,15 +307,15 @@ void SAL_CALL BaseDispatch::dispatch( const URL& aURL, const Sequence < Property // create new URL to address the combox box URL aCmdURL; - aCmdURL.Path = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Command2")); - aCmdURL.Protocol = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.demo.complextoolbarcontrols.demoaddon:")); + aCmdURL.Path = rtl::OUString("Command2"); + aCmdURL.Protocol = rtl::OUString("vnd.demo.complextoolbarcontrols.demoaddon:"); aCmdURL.Complete = aCmdURL.Path + aCmdURL.Protocol; // set the selected item as text into the combobox Sequence< NamedValue > aArgs( 1 ); - aArgs[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Text")); + aArgs[0].Name = rtl::OUString("Text"); aArgs[0].Value <<= aText; - SendCommand( aCmdURL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SetText")), aArgs, sal_True ); + SendCommand( aCmdURL, ::rtl::OUString("SetText"), aArgs, sal_True ); } else if ( !aURL.Path.compareToAscii("Command4" ) ) { @@ -341,8 +340,8 @@ void SAL_CALL BaseDispatch::dispatch( const URL& aURL, const Sequence < Property // create new URL to address the image button URL aCmdURL; - aCmdURL.Path = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Command1")); - aCmdURL.Protocol = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.demo.complextoolbarcontrols.demoaddon:")); + aCmdURL.Path = rtl::OUString("Command1"); + aCmdURL.Protocol = rtl::OUString("vnd.demo.complextoolbarcontrols.demoaddon:"); aCmdURL.Complete = aCmdURL.Path + aCmdURL.Protocol; // create and initialize FeatureStateEvent with IsEnabled @@ -398,18 +397,18 @@ void SAL_CALL BaseDispatch::addStatusListener( const Reference< XStatusListener // send command to set context menu content Sequence< rtl::OUString > aContextMenu( 3 ); - aContextMenu[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Command 1")); - aContextMenu[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Command 2")); - aContextMenu[2] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Command 3")); + aContextMenu[0] = rtl::OUString("Command 1"); + aContextMenu[1] = rtl::OUString("Command 2"); + aContextMenu[2] = rtl::OUString("Command 3"); - aArgs[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("List")); + aArgs[0].Name = rtl::OUString("List"); aArgs[0].Value <<= aContextMenu; - SendCommandTo( xControl, aURL, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SetList")), aArgs, sal_True ); + SendCommandTo( xControl, aURL, rtl::OUString("SetList"), aArgs, sal_True ); // send command to check item on pos=0 - aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Pos" )); + aArgs[0].Name = rtl::OUString( "Pos" ); aArgs[0].Value <<= sal_Int32( 0 ); - SendCommandTo( xControl, aURL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CheckItemPos")), aArgs, sal_True ); + SendCommandTo( xControl, aURL, ::rtl::OUString("CheckItemPos"), aArgs, sal_True ); } else if ( aURL.Path == "Command4" ) { @@ -420,20 +419,20 @@ void SAL_CALL BaseDispatch::addStatusListener( const Reference< XStatusListener // send command to set context menu content Sequence< rtl::OUString > aContextMenu( 2 ); - aContextMenu[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Button Enabled")); - aContextMenu[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Button Disabled")); + aContextMenu[0] = rtl::OUString("Button Enabled"); + aContextMenu[1] = rtl::OUString("Button Disabled"); - aArgs[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("List")); + aArgs[0].Name = rtl::OUString("List"); aArgs[0].Value <<= aContextMenu; - SendCommandTo( xControl, aURL, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SetList")), aArgs, sal_True ); + SendCommandTo( xControl, aURL, rtl::OUString("SetList"), aArgs, sal_True ); // set position according to enable/disable state of button sal_Int32 nPos( mbButtonEnabled ? 0 : 1 ); // send command to check item on pos=0 - aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Pos" )); + aArgs[0].Name = rtl::OUString( "Pos" ); aArgs[0].Value <<= nPos; - SendCommandTo( xControl, aURL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CheckItemPos")), aArgs, sal_True ); + SendCommandTo( xControl, aURL, ::rtl::OUString("CheckItemPos"), aArgs, sal_True ); } else if ( aURL.Path == "Command5" ) { @@ -441,18 +440,18 @@ void SAL_CALL BaseDispatch::addStatusListener( const Reference< XStatusListener Sequence< NamedValue > aArgs( 5 ); // send command to initialize spin button - aArgs[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Value")); + aArgs[0].Name = rtl::OUString("Value"); aArgs[0].Value <<= double( 0.0 ); - aArgs[1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UpperLimit")); + aArgs[1].Name = rtl::OUString("UpperLimit"); aArgs[1].Value <<= double( 10.0 ); - aArgs[2].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LowerLimit")); + aArgs[2].Name = rtl::OUString("LowerLimit"); aArgs[2].Value <<= double( 0.0 ); - aArgs[3].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Step")); + aArgs[3].Name = rtl::OUString("Step"); aArgs[3].Value <<= double( 0.1 ); - aArgs[4].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OutputFormat")); - aArgs[4].Value <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%.2f cm")); + aArgs[4].Name = rtl::OUString("OutputFormat"); + aArgs[4].Value <<= rtl::OUString("%.2f cm"); - SendCommandTo( xControl, aURL, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SetValues")), aArgs, sal_True ); + SendCommandTo( xControl, aURL, rtl::OUString("SetValues"), aArgs, sal_True ); } else if ( aURL.Path == "Command7" ) { @@ -462,20 +461,20 @@ void SAL_CALL BaseDispatch::addStatusListener( const Reference< XStatusListener // send command to set context menu content Sequence< rtl::OUString > aList( 10 ); - aList[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("White")); - aList[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Black")); - aList[2] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Red")); - aList[3] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Blue")); - aList[4] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Green")); - aList[5] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Grey")); - aList[6] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Yellow")); - aList[7] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Orange")); - aList[8] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Brown")); - aList[9] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Pink")); - - aArgs[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("List")); + aList[0] = rtl::OUString("White"); + aList[1] = rtl::OUString("Black"); + aList[2] = rtl::OUString("Red"); + aList[3] = rtl::OUString("Blue"); + aList[4] = rtl::OUString("Green"); + aList[5] = rtl::OUString("Grey"); + aList[6] = rtl::OUString("Yellow"); + aList[7] = rtl::OUString("Orange"); + aList[8] = rtl::OUString("Brown"); + aList[9] = rtl::OUString("Pink"); + + aArgs[0].Name = rtl::OUString("List"); aArgs[0].Value <<= aList; - SendCommandTo( xControl, aURL, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SetList")), aArgs, sal_True ); + SendCommandTo( xControl, aURL, rtl::OUString("SetList"), aArgs, sal_True ); } aListenerHelper.AddListener( mxFrame, xControl, aURL.Path ); diff --git a/odk/examples/cpp/remoteclient/remoteclient.cxx b/odk/examples/cpp/remoteclient/remoteclient.cxx index 0c598a0e7252..017b0da43c7d 100644 --- a/odk/examples/cpp/remoteclient/remoteclient.cxx +++ b/odk/examples/cpp/remoteclient/remoteclient.cxx @@ -148,7 +148,7 @@ sal_Int32 PipeClientMain::run( const Sequence< OUString > & aArguments ) throw ( { try { Reference < XInterface > r = - m_xSMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.UnoUrlResolver")) ); + m_xSMgr->createInstance( OUString("com.sun.star.bridge.UnoUrlResolver") ); Reference < XUnoUrlResolver > rResolver( r , UNO_QUERY ); // connect to the remote process and retrieve the initial object @@ -212,7 +212,7 @@ Sequence< OUString > getSupportedServiceNames() if( !pNames ) { static Sequence< OUString > seqNames(1); - seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.example.RemoteClientSample")); + seqNames.getArray()[0] = OUString("com.sun.star.bridge.example.RemoteClientSample"); pNames = &seqNames; } } |