diff options
31 files changed, 204 insertions, 227 deletions
diff --git a/mysqlc/source/mysqlc_connection.cxx b/mysqlc/source/mysqlc_connection.cxx index 9d9f1cc0d7a3..5a54eb6f1b6b 100644 --- a/mysqlc/source/mysqlc_connection.cxx +++ b/mysqlc/source/mysqlc_connection.cxx @@ -120,7 +120,7 @@ void OConnection::construct(const OUString& url, const Sequence< PropertyValue > sal_Int32 nIndex; sal_Bool bEmbedded = sal_False; OUString token; - OUString aHostName(RTL_CONSTASCII_USTRINGPARAM("localhost")); + OUString aHostName("localhost"); sal_Int32 nPort = 3306; OUString aDbName; @@ -130,7 +130,7 @@ void OConnection::construct(const OUString& url, const Sequence< PropertyValue > // parse url. Url has the following format: // external server: sdbc:mysqlc:[hostname]:[port]/[dbname] - if (!url.compareTo(OUString(RTL_CONSTASCII_USTRINGPARAM(MYSQLC_URI_PREFIX)), sizeof(MYSQLC_URI_PREFIX)-1)) { + if (!url.compareTo(OUString(MYSQLC_URI_PREFIX), sizeof(MYSQLC_URI_PREFIX)-1)) { nIndex = 12; } else { bEmbedded = sal_True; @@ -202,7 +202,7 @@ void OConnection::construct(const OUString& url, const Sequence< PropertyValue > } #ifndef SYSTEM_MYSQL - ::rtl::OUString sMySQLClientLib( RTL_CONSTASCII_USTRINGPARAM( MYSQL_LIB ) ); + ::rtl::OUString sMySQLClientLib( MYSQL_LIB ); ::rtl::OUString moduleBase; OSL_VERIFY( ::osl::Module::getUrlFromAddress( &thisModule, moduleBase ) ); @@ -250,7 +250,7 @@ void OConnection::construct(const OUString& url, const Sequence< PropertyValue > // Check if the server is 4.1 or above if (this->getMysqlVersion() < 40100) { throw SQLException( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MySQL Connector/OO.org requires MySQL Server 4.1 or above" ) ), + ::rtl::OUString( "MySQL Connector/OO.org requires MySQL Server 4.1 or above" ), *this, ::rtl::OUString(), 0, @@ -764,9 +764,9 @@ sal_Int32 OConnection::getMysqlVersion() try { Sequence< Any > aArgs(1); Reference< XConnection> xCon = this; - aArgs[0] <<= NamedValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ActiveConnection")), makeAny(xCon)); + aArgs[0] <<= NamedValue(::rtl::OUString("ActiveConnection"), makeAny(xCon)); - m_xParameterSubstitution.set(m_rDriver.getFactory()->createInstanceWithArguments(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.ParameterSubstitution")),aArgs),UNO_QUERY); + m_xParameterSubstitution.set(m_rDriver.getFactory()->createInstanceWithArguments(::rtl::OUString("org.openoffice.comp.helper.ParameterSubstitution"),aArgs),UNO_QUERY); } catch(const Exception&) {} } if ( m_xParameterSubstitution.is() ) { diff --git a/mysqlc/source/mysqlc_driver.cxx b/mysqlc/source/mysqlc_driver.cxx index 289b4c873880..676c6c65aa59 100644 --- a/mysqlc/source/mysqlc_driver.cxx +++ b/mysqlc/source/mysqlc_driver.cxx @@ -83,7 +83,7 @@ OUString MysqlCDriver::getImplementationName_Static() throw(RuntimeException) { OSL_TRACE("MysqlCDriver::getImplementationName_Static"); - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.sdbc.mysqlc.MysqlCDriver" ) ); + return ::rtl::OUString( "com.sun.star.comp.sdbc.mysqlc.MysqlCDriver" ); } /* }}} */ @@ -96,7 +96,7 @@ Sequence< OUString > MysqlCDriver::getSupportedServiceNames_Static() // which service is supported // for more information @see com.sun.star.sdbc.Driver Sequence< OUString > aSNS(1); - aSNS[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.Driver")); + aSNS[0] = OUString("com.sun.star.sdbc.Driver"); return aSNS; } /* }}} */ @@ -146,7 +146,7 @@ void MysqlCDriver::impl_initCppConn_lck_throw() #else if ( !m_bAttemptedLoadCppConn ) { - const ::rtl::OUString sModuleName(RTL_CONSTASCII_USTRINGPARAM( CPPCONN_LIB )); + const ::rtl::OUString sModuleName(CPPCONN_LIB ); m_hCppConnModule = osl_loadModuleRelative( &thisModule, sModuleName.pData, 0 ); m_bAttemptedLoadCppConn = true; } @@ -156,16 +156,16 @@ void MysqlCDriver::impl_initCppConn_lck_throw() { OSL_FAIL( "MysqlCDriver::impl_initCppConn_lck_throw: could not load the " CPPCONN_LIB " library!"); throw SQLException( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Unable to load the " CPPCONN_LIB " library." ) ), + ::rtl::OUString( "Unable to load the " CPPCONN_LIB " library." ), *this, - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "08001" ) ), // "unable to connect" + ::rtl::OUString( "08001" ), // "unable to connect" 0, Any() ); } // find the factory symbol - const ::rtl::OUString sSymbolName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "sql_mysql_get_driver_instance" ) ); + const ::rtl::OUString sSymbolName = ::rtl::OUString( "sql_mysql_get_driver_instance" ); typedef void* (* FGetMySQLDriver)(); const FGetMySQLDriver pFactoryFunction = (FGetMySQLDriver)( osl_getFunctionSymbol( m_hCppConnModule, sSymbolName.pData ) ); @@ -173,9 +173,9 @@ void MysqlCDriver::impl_initCppConn_lck_throw() { OSL_FAIL( "MysqlCDriver::impl_initCppConn_lck_throw: could not find the factory symbol in " CPPCONN_LIB "!"); throw SQLException( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CPPCONN_LIB " is invalid: missing the driver factory function." ) ), + ::rtl::OUString( CPPCONN_LIB " is invalid: missing the driver factory function." ), *this, - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "08001" ) ), // "unable to connect" + ::rtl::OUString( "08001" ), // "unable to connect" 0, Any() ); @@ -186,9 +186,9 @@ void MysqlCDriver::impl_initCppConn_lck_throw() if ( !cppDriver ) { throw SQLException( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Unable to obtain the MySQL_Driver instance from Connector/C++." ) ), + ::rtl::OUString( "Unable to obtain the MySQL_Driver instance from Connector/C++." ), *this, - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "08001" ) ), // "unable to connect" + ::rtl::OUString( "08001" ), // "unable to connect" 0, Any() ); @@ -211,7 +211,7 @@ Reference< XConnection > SAL_CALL MysqlCDriver::connect(const OUString& url, con impl_initCppConn_lck_throw(); OSL_POSTCOND( cppDriver, "MySQLCDriver::connect: internal error." ); if ( !cppDriver ) - throw RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MySQLCDriver::connect: internal error." ) ), *this ); + throw RuntimeException( ::rtl::OUString( "MySQLCDriver::connect: internal error." ), *this ); } Reference< XConnection > xConn; @@ -237,7 +237,7 @@ sal_Bool SAL_CALL MysqlCDriver::acceptsURL(const OUString& url) throw(SQLException, RuntimeException) { OSL_TRACE("MysqlCDriver::acceptsURL"); - return (!url.compareTo(OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:mysqlc:")), sizeof("sdbc:mysqlc:")-1)); + return (!url.compareTo(OUString("sdbc:mysqlc:"), sizeof("sdbc:mysqlc:")-1)); } /* }}} */ @@ -251,17 +251,17 @@ Sequence< DriverPropertyInfo > SAL_CALL MysqlCDriver::getPropertyInfo(const OUSt ::std::vector< DriverPropertyInfo > aDriverInfo; aDriverInfo.push_back(DriverPropertyInfo( - OUString(RTL_CONSTASCII_USTRINGPARAM("Hostname")) - ,OUString(RTL_CONSTASCII_USTRINGPARAM("Name of host")) + OUString("Hostname") + ,OUString("Name of host") ,sal_True - ,OUString(RTL_CONSTASCII_USTRINGPARAM("localhost")) + ,OUString("localhost") ,Sequence< OUString >()) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString(RTL_CONSTASCII_USTRINGPARAM("Port")) - ,OUString(RTL_CONSTASCII_USTRINGPARAM("Port")) + OUString("Port") + ,OUString("Port") ,sal_True - ,OUString(RTL_CONSTASCII_USTRINGPARAM("3306")) + ,OUString("3306") ,Sequence< OUString >()) ); return Sequence< DriverPropertyInfo >(&(aDriverInfo[0]),aDriverInfo.size()); diff --git a/sdext/source/minimizer/graphiccollector.cxx b/sdext/source/minimizer/graphiccollector.cxx index 58a73d45a60b..0c9f75ae1936 100644 --- a/sdext/source/minimizer/graphiccollector.cxx +++ b/sdext/source/minimizer/graphiccollector.cxx @@ -56,7 +56,7 @@ const DeviceInfo& GraphicCollector::GetDeviceInfo( const Reference< XComponentCo try { Reference< XFramesSupplier > xDesktop( rxFact->getServiceManager()->createInstanceWithContext( - OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" ) ), rxFact ), UNO_QUERY_THROW ); + OUString( "com.sun.star.frame.Desktop" ), rxFact ), UNO_QUERY_THROW ); Reference< XFrame > xFrame( xDesktop->getActiveFrame() ); Reference< XWindow > xWindow( xFrame->getContainerWindow() ); Reference< XDevice > xDevice( xWindow, UNO_QUERY_THROW ); @@ -72,7 +72,7 @@ const DeviceInfo& GraphicCollector::GetDeviceInfo( const Reference< XComponentCo void ImpAddEntity( std::vector< GraphicCollector::GraphicEntity >& rGraphicEntities, const GraphicSettings& rGraphicSettings, const GraphicCollector::GraphicUser& rUser ) { const rtl::OUString aGraphicURL( rUser.maGraphicURL ); - const rtl::OUString sPackageURL( RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.GraphicObject:") ); + const rtl::OUString sPackageURL( "vnd.sun.star.GraphicObject:" ); if ( rGraphicSettings.mbEmbedLinkedGraphics || (aGraphicURL.isEmpty() || aGraphicURL.match( sPackageURL, 0 ) ) ) { @@ -231,8 +231,8 @@ void ImpCollectGraphicObjects( const Reference< XComponentContext >& rxMSF, cons { try { - const OUString sGraphicObjectShape( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.GraphicObjectShape" ) ); - const OUString sGroupShape( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.GroupShape" ) ); + const OUString sGraphicObjectShape( "com.sun.star.drawing.GraphicObjectShape" ); + const OUString sGroupShape( "com.sun.star.drawing.GroupShape" ); Reference< XShape > xShape( rxShapes->getByIndex( i ), UNO_QUERY_THROW ); const OUString sShapeType( xShape->getShapeType() ); if ( sShapeType == sGroupShape ) @@ -356,8 +356,8 @@ void ImpCountGraphicObjects( const Reference< XComponentContext >& rxMSF, const { try { - const OUString sGraphicObjectShape( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.GraphicObjectShape" ) ); - const OUString sGroupShape( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.GroupShape" ) ); + const OUString sGraphicObjectShape( "com.sun.star.drawing.GraphicObjectShape" ); + const OUString sGroupShape( "com.sun.star.drawing.GroupShape" ); Reference< XShape > xShape( rxShapes->getByIndex( i ), UNO_QUERY_THROW ); const OUString sShapeType( xShape->getShapeType() ); if ( sShapeType == sGroupShape ) diff --git a/sdext/source/minimizer/impoptimizer.cxx b/sdext/source/minimizer/impoptimizer.cxx index 7de6afb2e8e2..befea53dc819 100644 --- a/sdext/source/minimizer/impoptimizer.cxx +++ b/sdext/source/minimizer/impoptimizer.cxx @@ -132,7 +132,7 @@ void ImpDeleteHiddenSlides( const Reference< XModel >& rxModel ) Reference< XPropertySet > xPropSet( xDrawPage, UNO_QUERY_THROW ); sal_Bool bVisible = sal_True; - const OUString sVisible( RTL_CONSTASCII_USTRINGPARAM( "Visible" ) ); + const OUString sVisible( "Visible" ); if ( xPropSet->getPropertyValue( sVisible ) >>= bVisible ) { if (!bVisible ) @@ -163,7 +163,7 @@ void ImpDeleteNotesPages( const Reference< XModel >& rxModel ) while( xShapes->getCount() ) xShapes->remove( Reference< XShape >( xShapes->getByIndex( xShapes->getCount() - 1 ), UNO_QUERY_THROW ) ); - const OUString sLayout( RTL_CONSTASCII_USTRINGPARAM( "Layout" ) ); + const OUString sLayout( "Layout" ); xPropSet->setPropertyValue( sLayout, Any( (sal_Int16)21 ) ); } } @@ -183,7 +183,7 @@ void ImpConvertOLE( const Reference< XModel >& rxModel, sal_Int32 nOLEOptimizati Reference< XShapes > xShapes( xDrawPages->getByIndex( i ), UNO_QUERY_THROW ); for ( sal_Int32 j = 0; j < xShapes->getCount(); j++ ) { - const OUString sOLE2Shape( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.OLE2Shape" ) ); + const OUString sOLE2Shape( "com.sun.star.drawing.OLE2Shape" ); Reference< XShape > xShape( xShapes->getByIndex( j ), UNO_QUERY_THROW ); if ( xShape->getShapeType() == sOLE2Shape ) { @@ -201,7 +201,7 @@ void ImpConvertOLE( const Reference< XModel >& rxModel, sal_Int32 nOLEOptimizati Reference< XGraphic > xGraphic; if ( xPropSet->getPropertyValue( TKGet( TK_Graphic ) ) >>= xGraphic ) { - const OUString sGraphicShape( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.GraphicObjectShape" ) ); + const OUString sGraphicShape( "com.sun.star.drawing.GraphicObjectShape" ); Reference< XMultiServiceFactory > xFact( rxModel, UNO_QUERY_THROW ); Reference< XShape > xShape2( xFact->createInstance( sGraphicShape ), UNO_QUERY_THROW ); xShapes->add( xShape2 ); @@ -321,10 +321,10 @@ Reference< XGraphic > ImpCompressGraphic( const Reference< XComponentContext >& } if ( ( aSourceSizePixel.Width > 0 ) && ( aSourceSizePixel.Height > 0 ) ) { - OUString aDestMimeType( RTL_CONSTASCII_USTRINGPARAM( "image/png" ) ); + OUString aDestMimeType( "image/png" ); if ( rGraphicSettings.mbJPEGCompression && !bTransparent && !bAlpha && !bAnimated ) { - aDestMimeType = OUString( RTL_CONSTASCII_USTRINGPARAM( "image/jpeg" ) ); + aDestMimeType = OUString( "image/jpeg" ); // if( aSourceMimeType != aDestMimeType ) bNeedsOptimizing = sal_True; } @@ -347,9 +347,9 @@ Reference< XGraphic > ImpCompressGraphic( const Reference< XComponentContext >& } if ( bNeedsOptimizing && aDestSizePixel.Width && aDestSizePixel.Height ) { - Reference< XStream > xTempFile( rxMSF->getServiceManager()->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.TempFile")), rxMSF ), UNO_QUERY_THROW ); + Reference< XStream > xTempFile( rxMSF->getServiceManager()->createInstanceWithContext( OUString("com.sun.star.io.TempFile"), rxMSF ), UNO_QUERY_THROW ); Reference< XOutputStream > xOutputStream( xTempFile->getOutputStream() ); - Reference< XGraphicProvider > xGraphicProvider( rxMSF->getServiceManager()->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.graphic.GraphicProvider")), rxMSF ), UNO_QUERY_THROW ); + Reference< XGraphicProvider > xGraphicProvider( rxMSF->getServiceManager()->createInstanceWithContext( OUString("com.sun.star.graphic.GraphicProvider"), rxMSF ), UNO_QUERY_THROW ); ImpCompressGraphic( xGraphicProvider, xGraphic, xOutputStream, aDestMimeType, aLogicalSize, rGraphicSettings.mnJPEGQuality, rGraphicSettings.mnImageResolution, bRemoveCropArea, aGraphicCropLogic ); Reference< XInputStream > xInputStream( xTempFile->getInputStream() ); @@ -367,9 +367,9 @@ Reference< XGraphic > ImpCompressGraphic( const Reference< XComponentContext >& else // this is a metafile { rtl::OUString aDestMimeType( aSourceMimeType ); - Reference< XStream > xTempFile( rxMSF->getServiceManager()->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.TempFile")), rxMSF ), UNO_QUERY_THROW ); + Reference< XStream > xTempFile( rxMSF->getServiceManager()->createInstanceWithContext( OUString("com.sun.star.io.TempFile"), rxMSF ), UNO_QUERY_THROW ); Reference< XOutputStream > xOutputStream( xTempFile->getOutputStream() ); - Reference< XGraphicProvider > xGraphicProvider( rxMSF->getServiceManager()->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.graphic.GraphicProvider")), rxMSF ), UNO_QUERY_THROW ); + Reference< XGraphicProvider > xGraphicProvider( rxMSF->getServiceManager()->createInstanceWithContext( OUString("com.sun.star.graphic.GraphicProvider"), rxMSF ), UNO_QUERY_THROW ); ImpCompressGraphic( xGraphicProvider, xGraphic, xOutputStream, aDestMimeType, aLogicalSize, rGraphicSettings.mnJPEGQuality, rGraphicSettings.mnImageResolution, sal_False, aGraphicCropLogic ); Reference< XInputStream > xInputStream( xTempFile->getInputStream() ); Reference< XSeekable > xSeekable( xInputStream, UNO_QUERY_THROW ); @@ -524,8 +524,8 @@ void ImpOptimizer::DispatchStatus() if ( mxStatusDispatcher.is() ) { URL aURL; - aURL.Protocol = OUString( RTL_CONSTASCII_USTRINGPARAM( "vnd.com.sun.star.comp.SunPresentationMinimizer:" ) ); - aURL.Path = OUString( RTL_CONSTASCII_USTRINGPARAM( "statusupdate" ) ); + aURL.Protocol = OUString( "vnd.com.sun.star.comp.SunPresentationMinimizer:" ); + aURL.Path = OUString( "statusupdate" ); mxStatusDispatcher->dispatch( aURL, GetStatusSequence() ); } } @@ -590,7 +590,7 @@ static void DispatchURL( Reference< XComponentContext > xMSF, OUString sURL, Ref try { Reference< XURLTransformer > xURLTransformer( xMSF->getServiceManager()->createInstanceWithContext( - OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ) ), xMSF ), UNO_QUERY_THROW ); + OUString( "com.sun.star.util.URLTransformer" ), xMSF ), UNO_QUERY_THROW ); util::URL aUrl; aUrl.Complete = sURL; xURLTransformer->parseStrict( aUrl ); @@ -691,7 +691,7 @@ sal_Bool ImpOptimizer::Optimize( const Sequence< PropertyValue >& rArguments ) DispatchStatus(); Reference< XDesktop > xDesktop( mxMSF->getServiceManager()->createInstanceWithContext( - OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" ) ), mxMSF ), UNO_QUERY ); + OUString( "com.sun.star.frame.Desktop" ), mxMSF ), UNO_QUERY ); Reference< XFrame > xFrame( xDesktop, UNO_QUERY ); xSelf = xFrame->findFrame( TKGet( TK__blank ), FrameSearchFlag::CREATE ); Reference< XComponentLoader > xComponentLoader( xSelf, UNO_QUERY ); @@ -716,7 +716,7 @@ sal_Bool ImpOptimizer::Optimize( const Sequence< PropertyValue >& rArguments ) Reference< XFrame > xFrame( xSelf.is() ? xSelf : mxInformationDialog ); if ( xFrame.is() ) { - const OUString sSlot( RTL_CONSTASCII_USTRINGPARAM( "slot:27115" ) ); + const OUString sSlot( "slot:27115" ); DispatchURL( mxMSF, sSlot, xFrame ); } } diff --git a/sdext/source/minimizer/optimizerdialog.cxx b/sdext/source/minimizer/optimizerdialog.cxx index 78afa98352c7..ce3a42a3578d 100644 --- a/sdext/source/minimizer/optimizerdialog.cxx +++ b/sdext/source/minimizer/optimizerdialog.cxx @@ -114,7 +114,7 @@ void OptimizerDialog::InitRoadmap() Sequence< rtl::OUString > aNames( pNames, nCount ); Sequence< Any > aValues( pValues, nCount ); - mxRoadmapControlModel = insertControlModel( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlRoadmapModel" ) ), + mxRoadmapControlModel = insertControlModel( OUString( "com.sun.star.awt.UnoControlRoadmapModel" ), TKGet( TK_rdmNavi ), aNames, aValues ); Reference< XPropertySet > xPropertySet( mxRoadmapControlModel, UNO_QUERY_THROW ); @@ -127,7 +127,7 @@ void OptimizerDialog::InitRoadmap() InsertRoadmapItem( 4, sal_True, getString( STR_SUMMARY ), ITEM_ID_SUMMARY ); rtl::OUString sBitmapPath( getPath( TK_BitmapPath ) ); - rtl::OUString sBitmap( RTL_CONSTASCII_USTRINGPARAM("/minimizepresi_80.png") ); + rtl::OUString sBitmap( "/minimizepresi_80.png" ); rtl::OUString sURL( sBitmapPath += sBitmap ); xPropertySet->setPropertyValue( TKGet( TK_ImageURL ), Any( sURL ) ); @@ -553,7 +553,7 @@ void ActionListener::actionPerformed( const ActionEvent& rEvent ) aLocation = aLocation.copy( 0, nIndex ); // adding .mini - aLocation = aLocation.concat( OUString(RTL_CONSTASCII_USTRINGPARAM(".mini")) ); + aLocation = aLocation.concat( OUString(".mini") ); aFileOpenDialog.setDefaultName( aLocation ); } } @@ -603,11 +603,11 @@ void ActionListener::actionPerformed( const ActionEvent& rEvent ) aArgs[ 0 ] <<= mrOptimizerDialog.GetFrame(); Reference < XDispatch > xDispatch( mrOptimizerDialog.GetComponentContext()->getServiceManager()->createInstanceWithArgumentsAndContext( - OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.PPPOptimizer")), aArgs, mrOptimizerDialog.GetComponentContext() ), UNO_QUERY ); + OUString("com.sun.star.comp.PPPOptimizer"), aArgs, mrOptimizerDialog.GetComponentContext() ), UNO_QUERY ); URL aURL; - aURL.Protocol = OUString( RTL_CONSTASCII_USTRINGPARAM( "vnd.com.sun.star.comp.PPPOptimizer:" ) ); - aURL.Path = OUString( RTL_CONSTASCII_USTRINGPARAM( "optimize" ) ); + aURL.Protocol = OUString( "vnd.com.sun.star.comp.PPPOptimizer:" ); + aURL.Path = OUString( "optimize" ); Sequence< PropertyValue > lArguments( 3 ); lArguments[ 0 ].Name = TKGet( TK_Settings ); diff --git a/sdext/source/minimizer/optimizerdialogcontrols.cxx b/sdext/source/minimizer/optimizerdialogcontrols.cxx index b71ca83bb403..f412dc1c641a 100644 --- a/sdext/source/minimizer/optimizerdialogcontrols.cxx +++ b/sdext/source/minimizer/optimizerdialogcontrols.cxx @@ -93,7 +93,7 @@ rtl::OUString InsertSeparator( OptimizerDialog& rOptimizerDialog, const OUString Sequence< rtl::OUString > aNames( pNames, nCount ); Sequence< Any > aValues( pValues, nCount ); - rOptimizerDialog.insertControlModel( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlFixedLineModel" ) ), + rOptimizerDialog.insertControlModel( OUString( "com.sun.star.awt.UnoControlFixedLineModel" ), rControlName, aNames, aValues ); return rControlName; } @@ -574,7 +574,7 @@ void OptimizerDialog::InitPage3() Reference< XShapes > xShapes( xDrawPages->getByIndex( i ), UNO_QUERY_THROW ); for ( sal_Int32 j = 0; j < xShapes->getCount(); j++ ) { - const OUString sOLE2Shape( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.OLE2Shape" ) ); + const OUString sOLE2Shape( "com.sun.star.drawing.OLE2Shape" ); Reference< XShape > xShape( xShapes->getByIndex( j ), UNO_QUERY_THROW ); if ( xShape->getShapeType() == sOLE2Shape ) nOLECount++; @@ -606,7 +606,7 @@ static OUString ImpValueOfInMB( const sal_Int64& rVal, sal_Unicode nSeparator = aVal.setLength( nX + 2 ); aVal[nX] = nSeparator; } - aVal.append( OUString(RTL_CONSTASCII_USTRINGPARAM(" MB")) ); + aVal.append( OUString(" MB") ); return aVal.makeStringAndClear(); } @@ -698,7 +698,7 @@ void OptimizerDialog::UpdateControlStatesPage4() { Reference< XPropertySet > xPropSet( *aIter, UNO_QUERY_THROW ); sal_Bool bVisible = sal_True; - const OUString sVisible( RTL_CONSTASCII_USTRINGPARAM( "Visible" ) ); + const OUString sVisible( "Visible" ); if ( xPropSet->getPropertyValue( sVisible ) >>= bVisible ) { if (!bVisible ) @@ -717,7 +717,7 @@ void OptimizerDialog::UpdateControlStatesPage4() Reference< XPropertySet > xPropSet( xDrawPage, UNO_QUERY_THROW ); sal_Bool bVisible = sal_True; - const OUString sVisible( RTL_CONSTASCII_USTRINGPARAM( "Visible" ) ); + const OUString sVisible( "Visible" ); if ( xPropSet->getPropertyValue( sVisible ) >>= bVisible ) { if (!bVisible ) @@ -743,7 +743,7 @@ void OptimizerDialog::UpdateControlStatesPage4() if ( nDeletedSlides > 1 ) { OUString aStr( getString( STR_DELETE_SLIDES ) ); - OUString aPlaceholder( RTL_CONSTASCII_USTRINGPARAM( "%SLIDES" ) ); + OUString aPlaceholder( "%SLIDES" ); sal_Int32 i = aStr.indexOf( aPlaceholder, 0 ); if ( i >= 0 ) aStr = aStr.replaceAt( i, aPlaceholder.getLength(), OUString::valueOf( nDeletedSlides ) ); @@ -761,9 +761,9 @@ void OptimizerDialog::UpdateControlStatesPage4() if ( nGraphics > 1 ) { OUString aStr( getString( STR_OPTIMIZE_IMAGES ) ); - OUString aImagePlaceholder( RTL_CONSTASCII_USTRINGPARAM( "%IMAGES" ) ); - OUString aQualityPlaceholder( RTL_CONSTASCII_USTRINGPARAM( "%QUALITY" ) ); - OUString aResolutionPlaceholder( RTL_CONSTASCII_USTRINGPARAM( "%RESOLUTION" ) ); + OUString aImagePlaceholder( "%IMAGES" ); + OUString aQualityPlaceholder( "%QUALITY" ); + OUString aResolutionPlaceholder( "%RESOLUTION" ); sal_Int32 i = aStr.indexOf( aImagePlaceholder, 0 ); if ( i >= 0 ) aStr = aStr.replaceAt( i, aImagePlaceholder.getLength(), OUString::valueOf( nGraphics ) ); @@ -789,7 +789,7 @@ void OptimizerDialog::UpdateControlStatesPage4() Reference< XShapes > xShapes( xDrawPages->getByIndex( i ), UNO_QUERY_THROW ); for ( sal_Int32 j = 0; j < xShapes->getCount(); j++ ) { - const OUString sOLE2Shape( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.OLE2Shape" ) ); + const OUString sOLE2Shape( "com.sun.star.drawing.OLE2Shape" ); Reference< XShape > xShape( xShapes->getByIndex( j ), UNO_QUERY_THROW ); if ( xShape->getShapeType() == sOLE2Shape ) nOLEReplacements++; @@ -798,7 +798,7 @@ void OptimizerDialog::UpdateControlStatesPage4() if ( nOLEReplacements > 1 ) { OUString aStr( getString( STR_CREATE_REPLACEMENT ) ); - OUString aPlaceholder( RTL_CONSTASCII_USTRINGPARAM( "%OLE" ) ); + OUString aPlaceholder( "%OLE" ); sal_Int32 i = aStr.indexOf( aPlaceholder, 0 ); if ( i >= 0 ) aStr = aStr.replaceAt( i, aPlaceholder.getLength(), OUString::valueOf( nOLEReplacements ) ); @@ -870,7 +870,7 @@ void OptimizerDialog::InitPage4() Sequence< rtl::OUString > aNames( pNames, nCount ); Sequence< Any > aValues( pValues, nCount ); - Reference< XMultiPropertySet > xMultiPropertySet( insertControlModel( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlProgressBarModel" ) ), + Reference< XMultiPropertySet > xMultiPropertySet( insertControlModel( OUString( "com.sun.star.awt.UnoControlProgressBarModel" ), TKGet( TK_Progress ), aNames, aValues ), UNO_QUERY ); } Reference< XTextListener > xTextListener; diff --git a/sdext/source/minimizer/pppoptimizerdialog.cxx b/sdext/source/minimizer/pppoptimizerdialog.cxx index b074647334a5..31d10ba65b7a 100644 --- a/sdext/source/minimizer/pppoptimizerdialog.cxx +++ b/sdext/source/minimizer/pppoptimizerdialog.cxx @@ -151,11 +151,11 @@ void SAL_CALL PPPOptimizerDialog::dispatch( const URL& rURL, if ( nFileSizeSource && nFileSizeDest ) { - rtl::OUStringBuffer sBuf( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Your Presentation has been minimized from:")) ); + rtl::OUStringBuffer sBuf( rtl::OUString("Your Presentation has been minimized from:") ); sBuf.append( rtl::OUString::valueOf( nFileSizeSource >> 10 ) ); - sBuf.append( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("KB to ")) ); + sBuf.append( rtl::OUString("KB to ") ); sBuf.append( rtl::OUString::valueOf( nFileSizeDest >> 10 ) ); - sBuf.append( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("KB.")) ); + sBuf.append( rtl::OUString("KB.") ); OUString sResult( sBuf.makeStringAndClear() ); // mpOptimizerDialog->showMessageBox( sResult, sResult, sal_False ); } @@ -201,7 +201,7 @@ Sequence< OUString > PPPOptimizerDialog_getSupportedServiceNames() { Sequence < OUString > aRet(1); OUString* pArray = aRet.getArray(); - pArray[0] = OUString ( RTL_CONSTASCII_USTRINGPARAM( SERVICE_NAME ) ); + pArray[0] = OUString ( SERVICE_NAME ); return aRet; } diff --git a/sdext/source/pdfimport/test/tests.cxx b/sdext/source/pdfimport/test/tests.cxx index 11af7d33dbaa..c00d72e6fdc2 100644 --- a/sdext/source/pdfimport/test/tests.cxx +++ b/sdext/source/pdfimport/test/tests.cxx @@ -130,7 +130,7 @@ namespace rtl::math::approxEqual(m_aHyperlinkBounds.Y1,386.0) && rtl::math::approxEqual(m_aHyperlinkBounds.X2,166.7) && rtl::math::approxEqual(m_aHyperlinkBounds.Y2,406.2) ); - CPPUNIT_ASSERT_EQUAL_MESSAGE( "Correct hyperlink URI", m_aURI, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("http://download.openoffice.org/")) ); + CPPUNIT_ASSERT_EQUAL_MESSAGE( "Correct hyperlink URI", m_aURI, ::rtl::OUString("http://download.openoffice.org/") ); const char* sText = " \n \nThis is a testtext\nNew paragraph,\nnew line\n" "Hyperlink, this is\n?\nThis is more text\noutline mode\n?\nNew paragraph\n"; @@ -388,7 +388,7 @@ namespace virtual void endText() { - m_aTextOut.append( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n")) ); + m_aTextOut.append( ::rtl::OUString("\n") ); } virtual void drawMask(const uno::Sequence<beans::PropertyValue>& xBitmap, @@ -511,7 +511,7 @@ namespace virtual rtl::OUString SAL_CALL getPackageLocation(rtl::OUString const&) throw() { - rtl::OUString const aLocation(RTL_CONSTASCII_USTRINGPARAM(PDFIMPORT_EXECUTABLE_LOCATION)); + rtl::OUString const aLocation(PDFIMPORT_EXECUTABLE_LOCATION); return aLocation; } diff --git a/sdext/source/pdfimport/tree/drawtreevisiting.cxx b/sdext/source/pdfimport/tree/drawtreevisiting.cxx index 29138785ee60..45e40c31b8b5 100644 --- a/sdext/source/pdfimport/tree/drawtreevisiting.cxx +++ b/sdext/source/pdfimport/tree/drawtreevisiting.cxx @@ -61,7 +61,7 @@ const ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator > { Reference< XComponentContext > xContext( this->m_rProcessor.m_xContext, uno::UNO_SET_THROW ); Reference< XMultiComponentFactory > xMSF( xContext->getServiceManager(), uno::UNO_SET_THROW ); - Reference < XInterface > xInterface = xMSF->createInstanceWithContext(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.BreakIterator")), xContext); + Reference < XInterface > xInterface = xMSF->createInstanceWithContext(::rtl::OUString("com.sun.star.i18n.BreakIterator"), xContext); mxBreakIter = uno::Reference< i18n::XBreakIterator >( xInterface, uno::UNO_QUERY ); } @@ -74,7 +74,7 @@ const ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XCharacterClassi { Reference< XComponentContext > xContext( m_rEmitContext.m_xContext, uno::UNO_SET_THROW ); Reference< XMultiComponentFactory > xMSF( xContext->getServiceManager(), uno::UNO_SET_THROW ); - Reference < XInterface > xInterface = xMSF->createInstanceWithContext(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.CharacterClassification")), xContext); + Reference < XInterface > xInterface = xMSF->createInstanceWithContext(::rtl::OUString("com.sun.star.i18n.CharacterClassification"), xContext); mxCharClass = uno::Reference< i18n::XCharacterClassification >( xInterface, uno::UNO_QUERY ); } return mxCharClass; @@ -114,7 +114,7 @@ void DrawXmlEmitter::visit( TextElement& elem, const std::list< Element* >::cons PropertyMap aProps; if( elem.StyleId != -1 ) { - aProps[ rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "text:style-name" ) ) ] = + aProps[ rtl::OUString( "text:style-name" ) ] = m_rEmitContext.rStyles.getStyleName( elem.StyleId ); } diff --git a/sdext/source/pdfimport/tree/imagecontainer.cxx b/sdext/source/pdfimport/tree/imagecontainer.cxx index d6ab30407512..b2666e9dfcba 100644 --- a/sdext/source/pdfimport/tree/imagecontainer.cxx +++ b/sdext/source/pdfimport/tree/imagecontainer.cxx @@ -138,7 +138,7 @@ void ImageContainer::writeBase64EncodedStream( ImageId nId, EmitContext& rContex std::find_if(pAry,pAry+nLen, boost::bind(comphelper::TPropertyValueEqualFunctor(), _1, - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("InputSequence"))))); + rtl::OUString("InputSequence")))); OSL_ENSURE( pValue != pAry+nLen, "InputSequence not found" ); diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx b/sdext/source/pdfimport/wrapper/wrapper.cxx index 71c05384763e..772dac337c68 100644 --- a/sdext/source/pdfimport/wrapper/wrapper.cxx +++ b/sdext/source/pdfimport/wrapper/wrapper.cxx @@ -594,7 +594,7 @@ void Parser::readFont() { uno::Reference< beans::XMaterialHolder > xMat( m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.FontIdentificator" ) ), + rtl::OUString( "com.sun.star.awt.FontIdentificator" ), aArgs, m_xContext ), uno::UNO_QUERY ); @@ -620,7 +620,7 @@ void Parser::readFont() if( aResult.familyName.isEmpty() ) { // last fallback - aResult.familyName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Arial" ) ); + aResult.familyName = ::rtl::OUString( "Arial" ); aResult.isUnderline = false; } @@ -634,17 +634,13 @@ void Parser::readFont() uno::Sequence<beans::PropertyValue> Parser::readImageImpl() { static const rtl::OString aJpegMarker( "JPEG" ); - static const rtl::OString aPbmMarker( "PBM" ); - static const rtl::OString aPpmMarker( "PPM" ); - static const rtl::OString aPngMarker( "PNG" ); - static const rtl::OUString aJpegFile( - RTL_CONSTASCII_USTRINGPARAM( "DUMMY.JPEG" )); - static const rtl::OUString aPbmFile( - RTL_CONSTASCII_USTRINGPARAM( "DUMMY.PBM" )); - static const rtl::OUString aPpmFile( - RTL_CONSTASCII_USTRINGPARAM( "DUMMY.PPM" )); - static const rtl::OUString aPngFile( - RTL_CONSTASCII_USTRINGPARAM( "DUMMY.PNG" )); + static const rtl::OString aPbmMarker( "PBM" ); + static const rtl::OString aPpmMarker( "PPM" ); + static const rtl::OString aPngMarker( "PNG" ); + static const rtl::OUString aJpegFile( "DUMMY.JPEG" ); + static const rtl::OUString aPbmFile( "DUMMY.PBM" ); + static const rtl::OUString aPpmFile( "DUMMY.PPM" ); + static const rtl::OUString aPngFile( "DUMMY.PNG" ); rtl::OString aToken = readNextToken(); const sal_Int32 nImageSize( readInt32() ); @@ -672,19 +668,19 @@ uno::Sequence<beans::PropertyValue> Parser::readImageImpl() uno::Reference< uno::XComponentContext > xContext( m_xContext, uno::UNO_SET_THROW ); uno::Reference< lang::XMultiComponentFactory > xFactory( xContext->getServiceManager(), uno::UNO_SET_THROW ); uno::Reference< io::XInputStream > xDataStream( xFactory->createInstanceWithArgumentsAndContext( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.io.SequenceInputStream" ) ), + ::rtl::OUString( "com.sun.star.io.SequenceInputStream" ), aStreamCreationArgs, m_xContext ), uno::UNO_QUERY_THROW ); uno::Sequence<beans::PropertyValue> aSequence(3); - aSequence[0] = beans::PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL")), + aSequence[0] = beans::PropertyValue( ::rtl::OUString("URL"), 0, uno::makeAny(aFileName), beans::PropertyState_DIRECT_VALUE ); - aSequence[1] = beans::PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("InputStream")), + aSequence[1] = beans::PropertyValue( ::rtl::OUString("InputStream"), 0, uno::makeAny( xDataStream ), beans::PropertyState_DIRECT_VALUE ); - aSequence[2] = beans::PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("InputSequence")), + aSequence[2] = beans::PropertyValue( ::rtl::OUString("InputSequence"), 0, uno::makeAny(aDataSequence), beans::PropertyState_DIRECT_VALUE ); @@ -997,19 +993,19 @@ bool xpdf_ImportFromFile( const ::rtl::OUString& rUR if( checkEncryption( aSysUPath, xIHdl, aPwd, bIsEncrypted, aDocName ) == false ) return false; - rtl::OUStringBuffer converterURL = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("xpdfimport")); + rtl::OUStringBuffer converterURL = rtl::OUString("xpdfimport"); // retrieve package location url (xpdfimport executable is located there) // --------------------------------------------------- uno::Reference<deployment::XPackageInformationProvider> xProvider( xContext->getValueByName( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/singletons/com.sun.star.deployment.PackageInformationProvider"))), + rtl::OUString("/singletons/com.sun.star.deployment.PackageInformationProvider")), uno::UNO_QUERY); if( xProvider.is() ) { converterURL.insert( 0, - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"))); + rtl::OUString("/")); converterURL.insert( 0, xProvider->getPackageLocation( @@ -1022,7 +1018,7 @@ bool xpdf_ImportFromFile( const ::rtl::OUString& rUR sal_uInt32 nEnv = 0; #if defined UNX && ! defined MACOSX - rtl::OUString aStr( RTL_CONSTASCII_USTRINGPARAM( "$URE_LIB_DIR" ) ); + rtl::OUString aStr( "$URE_LIB_DIR" ); rtl_bootstrap_expandMacros( &aStr.pData ); rtl::OUString aSysPath; osl_getSystemPathFromFileURL( aStr.pData, &aSysPath.pData ); diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx index 522e4b899bad..b48dbe7b4acd 100644 --- a/sdext/source/presenter/PresenterAccessibility.cxx +++ b/sdext/source/presenter/PresenterAccessibility.cxx @@ -57,7 +57,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; using ::rtl::OUString; -#define A2S(s) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(s))) +#define A2S(s) (::rtl::OUString(s)) //===== PresenterAccessibleObject ============================================= @@ -444,7 +444,7 @@ public: OUString sName (A2S("Presenter Console")); PresenterConfigurationAccess aConfiguration ( rxContext, - OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.extension.PresenterScreen/")), + OUString("/org.openoffice.Office.extension.PresenterScreen/"), PresenterConfigurationAccess::READ_ONLY); aConfiguration.GetConfigurationNode(A2S("Presenter/Accessibility/Console/String")) >>= sName; @@ -474,7 +474,7 @@ public: { PresenterConfigurationAccess aConfiguration ( rxContext, - OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.extension.PresenterScreen/")), + OUString("/org.openoffice.Office.extension.PresenterScreen/"), PresenterConfigurationAccess::READ_ONLY); aConfiguration.GetConfigurationNode(A2S("Presenter/Accessibility/Preview/String")) >>= sName; @@ -1895,7 +1895,7 @@ rtl::Reference<PresenterAccessible::AccessibleObject> AccessibleNotes::Create ( { PresenterConfigurationAccess aConfiguration ( rxContext, - OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.extension.PresenterScreen/")), + OUString("/org.openoffice.Office.extension.PresenterScreen/"), PresenterConfigurationAccess::READ_ONLY); aConfiguration.GetConfigurationNode(A2S("Presenter/Accessibility/Notes/String")) >>= sName; diff --git a/sdext/source/presenter/PresenterButton.cxx b/sdext/source/presenter/PresenterButton.cxx index 64649b45db15..cfe1d6a1591e 100644 --- a/sdext/source/presenter/PresenterButton.cxx +++ b/sdext/source/presenter/PresenterButton.cxx @@ -43,7 +43,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using ::rtl::OUString; -#define A2S(pString) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(pString))) +#define A2S(pString) (::rtl::OUString(pString)) namespace sdext { namespace presenter { @@ -126,7 +126,7 @@ PresenterButton::PresenterButton ( mxPresenterHelper = Reference<drawing::XPresenterHelper>( xFactory->createInstanceWithContext( - OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.PresenterHelper")), + OUString("com.sun.star.comp.Draw.PresenterHelper"), rxComponentContext), UNO_QUERY_THROW); @@ -521,8 +521,7 @@ void PresenterButton::ThrowIfDisposed (void) const if (rBHelper.bDisposed || rBHelper.bInDispose) { throw lang::DisposedException ( - OUString(RTL_CONSTASCII_USTRINGPARAM( - "PresenterButton object has already been disposed")), + OUString( "PresenterButton object has already been disposed"), const_cast<uno::XWeak*>(static_cast<const uno::XWeak*>(this))); } } diff --git a/sdext/source/presenter/PresenterController.cxx b/sdext/source/presenter/PresenterController.cxx index 76d0ea43359f..2b1c3e46ac0e 100644 --- a/sdext/source/presenter/PresenterController.cxx +++ b/sdext/source/presenter/PresenterController.cxx @@ -77,7 +77,7 @@ namespace { const sal_Int32 ConfigurationUpdateEndEventType = 2; } -#define A2S(pString) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(pString))) +#define A2S(pString) (::rtl::OUString(pString)) namespace sdext { namespace presenter { @@ -1121,8 +1121,8 @@ double PresenterController::GetSlideAspectRatio (void) const Reference<beans::XPropertySet> xProperties(xSlides->getByIndex(0),UNO_QUERY_THROW); sal_Int32 nWidth (28000); sal_Int32 nHeight (21000); - if ((xProperties->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("Width"))) >>= nWidth) - && (xProperties->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("Height"))) >>= nHeight) + if ((xProperties->getPropertyValue(OUString("Width")) >>= nWidth) + && (xProperties->getPropertyValue(OUString("Height")) >>= nHeight) && nHeight > 0) { nSlideAspectRatio = double(nWidth) / double(nHeight); @@ -1172,8 +1172,7 @@ void PresenterController::ThrowIfDisposed (void) const if (rBHelper.bDisposed || rBHelper.bInDispose) { throw lang::DisposedException ( - OUString(RTL_CONSTASCII_USTRINGPARAM( - "PresenterController object has already been disposed")), + OUString( "PresenterController object has already been disposed"), const_cast<uno::XWeak*>(static_cast<const uno::XWeak*>(this))); } } diff --git a/sdext/source/presenter/PresenterHelpView.cxx b/sdext/source/presenter/PresenterHelpView.cxx index 21f67326f362..5e461a940964 100644 --- a/sdext/source/presenter/PresenterHelpView.cxx +++ b/sdext/source/presenter/PresenterHelpView.cxx @@ -49,7 +49,7 @@ using namespace ::com::sun::star::drawing::framework; using ::rtl::OUString; using ::std::vector; -#define A2S(pString) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(pString))) +#define A2S(pString) (::rtl::OUString(pString)) namespace sdext { namespace presenter { @@ -355,7 +355,7 @@ void PresenterHelpView::ReadHelpStrings (void) mpTextContainer.reset(new TextContainer()); PresenterConfigurationAccess aConfiguration ( mxComponentContext, - OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.extension.PresenterScreen/")), + OUString("/org.openoffice.Office.extension.PresenterScreen/"), PresenterConfigurationAccess::READ_ONLY); Reference<container::XNameAccess> xStrings ( aConfiguration.GetConfigurationNode(A2S("PresenterScreenSettings/HelpView/HelpStrings")), @@ -502,8 +502,7 @@ void PresenterHelpView::ThrowIfDisposed (void) if (rBHelper.bDisposed || rBHelper.bInDispose) { throw lang::DisposedException ( - OUString(RTL_CONSTASCII_USTRINGPARAM( - "PresenterHelpView has been already disposed")), + OUString( "PresenterHelpView has been already disposed"), const_cast<uno::XWeak*>(static_cast<const uno::XWeak*>(this))); } } diff --git a/sdext/source/presenter/PresenterHelper.cxx b/sdext/source/presenter/PresenterHelper.cxx index 42395cc1fb56..5689ee3347cd 100644 --- a/sdext/source/presenter/PresenterHelper.cxx +++ b/sdext/source/presenter/PresenterHelper.cxx @@ -40,29 +40,19 @@ using ::rtl::OUString; namespace sdext { namespace presenter { -const OUString PresenterHelper::msPaneURLPrefix( - RTL_CONSTASCII_USTRINGPARAM("private:resource/pane/")); -const OUString PresenterHelper::msCenterPaneURL( - msPaneURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("CenterPane"))); -const OUString PresenterHelper::msFullScreenPaneURL( - msPaneURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("FullScreenPane"))); +const OUString PresenterHelper::msPaneURLPrefix( "private:resource/pane/"); +const OUString PresenterHelper::msCenterPaneURL( msPaneURLPrefix + OUString("CenterPane")); +const OUString PresenterHelper::msFullScreenPaneURL( msPaneURLPrefix + OUString("FullScreenPane")); -const OUString PresenterHelper::msViewURLPrefix( - RTL_CONSTASCII_USTRINGPARAM("private:resource/view/")); -const OUString PresenterHelper::msPresenterScreenURL( - msViewURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterScreen"))); -const OUString PresenterHelper::msSlideSorterURL( - msViewURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("SlideSorter"))); +const OUString PresenterHelper::msViewURLPrefix( "private:resource/view/"); +const OUString PresenterHelper::msPresenterScreenURL( msViewURLPrefix + OUString("PresenterScreen")); +const OUString PresenterHelper::msSlideSorterURL( msViewURLPrefix + OUString("SlideSorter")); -const OUString PresenterHelper::msResourceActivationEvent( - RTL_CONSTASCII_USTRINGPARAM("ResourceActivation")); -const OUString PresenterHelper::msResourceDeactivationEvent( - RTL_CONSTASCII_USTRINGPARAM("ResourceDeactivation")); +const OUString PresenterHelper::msResourceActivationEvent( "ResourceActivation"); +const OUString PresenterHelper::msResourceDeactivationEvent( "ResourceDeactivation"); -const OUString PresenterHelper::msDefaultPaneStyle ( - RTL_CONSTASCII_USTRINGPARAM("DefaultPaneStyle")); -const OUString PresenterHelper::msDefaultViewStyle ( - RTL_CONSTASCII_USTRINGPARAM("DefaultViewStyle")); +const OUString PresenterHelper::msDefaultPaneStyle ( "DefaultPaneStyle"); +const OUString PresenterHelper::msDefaultViewStyle ( "DefaultViewStyle"); Reference<presentation::XSlideShowController> PresenterHelper::GetSlideShowController ( const Reference<frame::XController>& rxController) diff --git a/sdext/source/presenter/PresenterPane.cxx b/sdext/source/presenter/PresenterPane.cxx index ca1deabab7f0..3f2f98a4a21b 100644 --- a/sdext/source/presenter/PresenterPane.cxx +++ b/sdext/source/presenter/PresenterPane.cxx @@ -54,7 +54,7 @@ PresenterPane::PresenterPane ( mxComponentContext->getServiceManager(), UNO_QUERY_THROW); mxPresenterHelper = Reference<drawing::XPresenterHelper>( xFactory->createInstanceWithContext( - OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.PresenterHelper")), + OUString("com.sun.star.comp.Draw.PresenterHelper"), mxComponentContext), UNO_QUERY_THROW); } diff --git a/sdext/source/presenter/PresenterPaneBase.cxx b/sdext/source/presenter/PresenterPaneBase.cxx index a912230930d7..d50a1bc098fb 100644 --- a/sdext/source/presenter/PresenterPaneBase.cxx +++ b/sdext/source/presenter/PresenterPaneBase.cxx @@ -181,7 +181,7 @@ void SAL_CALL PresenterPaneBase::initialize (const Sequence<Any>& rArguments) if ( ! mxComponentContext.is()) { throw RuntimeException( - OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterSpritePane: missing component context")), + OUString("PresenterSpritePane: missing component context"), static_cast<XWeak*>(this)); } @@ -193,7 +193,7 @@ void SAL_CALL PresenterPaneBase::initialize (const Sequence<Any>& rArguments) if ( ! (rArguments[0] >>= mxPaneId)) { throw lang::IllegalArgumentException( - OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterPane: invalid pane id")), + OUString("PresenterPane: invalid pane id"), static_cast<XWeak*>(this), 0); } @@ -201,7 +201,7 @@ void SAL_CALL PresenterPaneBase::initialize (const Sequence<Any>& rArguments) if ( ! (rArguments[1] >>= mxParentWindow)) { throw lang::IllegalArgumentException( - OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterPane: invalid parent window")), + OUString("PresenterPane: invalid parent window"), static_cast<XWeak*>(this), 1); } @@ -210,7 +210,7 @@ void SAL_CALL PresenterPaneBase::initialize (const Sequence<Any>& rArguments) if ( ! (rArguments[2] >>= xParentCanvas)) { throw lang::IllegalArgumentException( - OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterPane: invalid parent canvas")), + OUString("PresenterPane: invalid parent canvas"), static_cast<XWeak*>(this), 2); } @@ -218,7 +218,7 @@ void SAL_CALL PresenterPaneBase::initialize (const Sequence<Any>& rArguments) if ( ! (rArguments[3] >>= msTitle)) { throw lang::IllegalArgumentException( - OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterPane: invalid title")), + OUString("PresenterPane: invalid title"), static_cast<XWeak*>(this), 3); } @@ -226,7 +226,7 @@ void SAL_CALL PresenterPaneBase::initialize (const Sequence<Any>& rArguments) if ( ! (rArguments[4] >>= mxBorderPainter)) { throw lang::IllegalArgumentException( - OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterPane: invalid border painter")), + OUString("PresenterPane: invalid border painter"), static_cast<XWeak*>(this), 4); } @@ -235,7 +235,7 @@ void SAL_CALL PresenterPaneBase::initialize (const Sequence<Any>& rArguments) if (rArguments.getLength()>5 && ! (rArguments[5] >>= bIsWindowVisibleOnCreation)) { throw lang::IllegalArgumentException( - OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterPane: invalid window visibility flag")), + OUString("PresenterPane: invalid window visibility flag"), static_cast<XWeak*>(this), 5); } @@ -263,7 +263,7 @@ void SAL_CALL PresenterPaneBase::initialize (const Sequence<Any>& rArguments) else { throw RuntimeException( - OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterSpritePane: invalid number of arguments")), + OUString("PresenterSpritePane: invalid number of arguments"), static_cast<XWeak*>(this)); } } @@ -457,8 +457,7 @@ void PresenterPaneBase::ThrowIfDisposed (void) if (rBHelper.bDisposed || rBHelper.bInDispose) { throw lang::DisposedException ( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "PresenterPane object has already been disposed")), + ::rtl::OUString( "PresenterPane object has already been disposed"), static_cast<uno::XWeak*>(this)); } } diff --git a/sdext/source/presenter/PresenterPaneBorderManager.cxx b/sdext/source/presenter/PresenterPaneBorderManager.cxx index 02cf34660cee..426a3810e908 100644 --- a/sdext/source/presenter/PresenterPaneBorderManager.cxx +++ b/sdext/source/presenter/PresenterPaneBorderManager.cxx @@ -56,13 +56,13 @@ namespace sdext { namespace presenter { OUString PresenterPaneBorderManager::getImplementationName_static (void) { - return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.PresenterPaneBorderManager")); + return OUString("com.sun.star.comp.Draw.PresenterPaneBorderManager"); } Sequence<OUString> PresenterPaneBorderManager::getSupportedServiceNames_static (void) { static const ::rtl::OUString sServiceName( - RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.PresenterPaneBorderManager")); + "com.sun.star.drawing.PresenterPaneBorderManager"); return Sequence<rtl::OUString>(&sServiceName, 1); } @@ -95,13 +95,13 @@ PresenterPaneBorderManager::PresenterPaneBorderManager ( { mxPointer = Reference<awt::XPointer>( xFactory->createInstanceWithContext( - OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.Pointer")), + OUString("com.sun.star.awt.Pointer"), rxContext), UNO_QUERY_THROW); mxPresenterHelper = Reference<drawing::XPresenterHelper>( xFactory->createInstanceWithContext( - OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.PresenterHelper")), + OUString("com.sun.star.comp.Draw.PresenterHelper"), rxContext), UNO_QUERY_THROW); } @@ -257,7 +257,7 @@ void SAL_CALL PresenterPaneBorderManager::initialize (const Sequence<Any>& rArgu else { throw RuntimeException( - OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterPane: invalid number of arguments")), + OUString("PresenterPane: invalid number of arguments"), static_cast<XWeak*>(this)); } } @@ -513,8 +513,7 @@ void PresenterPaneBorderManager::ThrowIfDisposed (void) if (rBHelper.bDisposed || rBHelper.bInDispose) { throw lang::DisposedException ( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "PresenterPaneBorderManager object has already been disposed")), + ::rtl::OUString( "PresenterPaneBorderManager object has already been disposed"), static_cast<uno::XWeak*>(this)); } } diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.cxx b/sdext/source/presenter/PresenterPaneBorderPainter.cxx index 05051a2410cd..cecf92501f1e 100644 --- a/sdext/source/presenter/PresenterPaneBorderPainter.cxx +++ b/sdext/source/presenter/PresenterPaneBorderPainter.cxx @@ -52,7 +52,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using ::rtl::OUString; -#define A2S(s) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(s))) +#define A2S(s) (::rtl::OUString(s)) namespace sdext { namespace presenter { @@ -394,8 +394,8 @@ void PresenterPaneBorderPainter::ThrowIfDisposed (void) const if (rBHelper.bDisposed || rBHelper.bInDispose) { throw lang::DisposedException ( - OUString(RTL_CONSTASCII_USTRINGPARAM( - "PresenterPaneBorderPainter object has already been disposed")), + OUString( + "PresenterPaneBorderPainter object has already been disposed"), const_cast<uno::XWeak*>(static_cast<const uno::XWeak*>(this))); } } @@ -421,7 +421,7 @@ PresenterPaneBorderPainter::Renderer::Renderer ( { mxPresenterHelper = Reference<drawing::XPresenterHelper>( xFactory->createInstanceWithContext( - OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.PresenterHelper")), + OUString("com.sun.star.comp.Draw.PresenterHelper"), rxContext), UNO_QUERY_THROW); } @@ -624,7 +624,7 @@ void PresenterPaneBorderPainter::Renderer::PaintTitle ( RendererPaneStyleContainer::const_iterator iStyle (maRendererPaneStyles.find(rsResourceURL)); if (iStyle == maRendererPaneStyles.end()) { - OUString sPaneStyleName (RTL_CONSTASCII_USTRINGPARAM("DefaultRendererPaneStyle")); + OUString sPaneStyleName ("DefaultRendererPaneStyle"); // Get pane layout name for resource URL. const OUString sStyleName (mpTheme->GetStyleName(rsResourceURL)); @@ -865,7 +865,7 @@ RendererPaneStyle::RendererPaneStyle ( // Get font description. mpFont = rpTheme->GetFont(rsStyleName); - OUString sAnchor (RTL_CONSTASCII_USTRINGPARAM("Left")); + OUString sAnchor ("Left"); if (mpFont.get() != NULL) { sAnchor = mpFont->msAnchor; diff --git a/sdext/source/presenter/PresenterPaneContainer.cxx b/sdext/source/presenter/PresenterPaneContainer.cxx index 3e26b156445f..74e56c138d1e 100644 --- a/sdext/source/presenter/PresenterPaneContainer.cxx +++ b/sdext/source/presenter/PresenterPaneContainer.cxx @@ -52,7 +52,7 @@ PresenterPaneContainer::PresenterPaneContainer ( { mxPresenterHelper = Reference<drawing::XPresenterHelper>( xFactory->createInstanceWithContext( - OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.PresenterHelper")), + OUString("com.sun.star.comp.Draw.PresenterHelper"), rxContext), UNO_QUERY_THROW); } diff --git a/sdext/source/presenter/PresenterPaneFactory.cxx b/sdext/source/presenter/PresenterPaneFactory.cxx index ebdae6f7df7d..7091ff9efe57 100644 --- a/sdext/source/presenter/PresenterPaneFactory.cxx +++ b/sdext/source/presenter/PresenterPaneFactory.cxx @@ -50,20 +50,20 @@ using ::rtl::OUString; namespace sdext { namespace presenter { const ::rtl::OUString PresenterPaneFactory::msCurrentSlidePreviewPaneURL( - RTL_CONSTASCII_USTRINGPARAM("private:resource/pane/Presenter/Pane1")); + "private:resource/pane/Presenter/Pane1"); const ::rtl::OUString PresenterPaneFactory::msNextSlidePreviewPaneURL( - RTL_CONSTASCII_USTRINGPARAM("private:resource/pane/Presenter/Pane2")); + "private:resource/pane/Presenter/Pane2"); const ::rtl::OUString PresenterPaneFactory::msNotesPaneURL( - RTL_CONSTASCII_USTRINGPARAM("private:resource/pane/Presenter/Pane3")); + "private:resource/pane/Presenter/Pane3"); const ::rtl::OUString PresenterPaneFactory::msToolBarPaneURL( - RTL_CONSTASCII_USTRINGPARAM("private:resource/pane/Presenter/Pane4")); + "private:resource/pane/Presenter/Pane4"); const ::rtl::OUString PresenterPaneFactory::msSlideSorterPaneURL( - RTL_CONSTASCII_USTRINGPARAM("private:resource/pane/Presenter/Pane5")); + "private:resource/pane/Presenter/Pane5"); const ::rtl::OUString PresenterPaneFactory::msHelpPaneURL( - RTL_CONSTASCII_USTRINGPARAM("private:resource/pane/Presenter/Pane6")); + "private:resource/pane/Presenter/Pane6"); const ::rtl::OUString PresenterPaneFactory::msOverlayPaneURL( - RTL_CONSTASCII_USTRINGPARAM("private:resource/pane/Presenter/Overlay")); + "private:resource/pane/Presenter/Overlay"); //===== PresenterPaneFactory ================================================== @@ -106,7 +106,7 @@ void PresenterPaneFactory::Register (const Reference<frame::XController>& rxCont else { xCC->addResourceFactory( - OUString(RTL_CONSTASCII_USTRINGPARAM("private:resource/pane/Presenter/*")), + OUString("private:resource/pane/Presenter/*"), this); } } @@ -337,8 +337,7 @@ void PresenterPaneFactory::ThrowIfDisposed (void) const if (rBHelper.bDisposed || rBHelper.bInDispose) { throw lang::DisposedException ( - OUString(RTL_CONSTASCII_USTRINGPARAM( - "PresenterPaneFactory object has already been disposed")), + OUString( "PresenterPaneFactory object has already been disposed"), const_cast<uno::XWeak*>(static_cast<const uno::XWeak*>(this))); } } diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx index d6e505711f23..f89af706d239 100644 --- a/sdext/source/presenter/PresenterScreen.cxx +++ b/sdext/source/presenter/PresenterScreen.cxx @@ -56,7 +56,7 @@ using namespace ::com::sun::star::presentation; using namespace ::com::sun::star::drawing::framework; using ::rtl::OUString; -#define A2S(s) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(s))) +#define A2S(s) (::rtl::OUString(s)) namespace sdext { namespace presenter { @@ -170,7 +170,7 @@ Any SAL_CALL PresenterScreenJob::execute( } Reference< XServiceInfo > xInfo( xModel, UNO_QUERY ); - if( xInfo.is() && xInfo->supportsService( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.PresentationDocument" ) ) ) ) + if( xInfo.is() && xInfo->supportsService( OUString( "com.sun.star.presentation.PresentationDocument" ) ) ) { // Create a new listener that waits for the full screen presentation // to start and to end. It takes care of its own lifetime. @@ -265,8 +265,8 @@ void PresenterScreenListener::ThrowIfDisposed (void) const throw ( if (rBHelper.bDisposed || rBHelper.bInDispose) { throw lang::DisposedException ( - OUString(RTL_CONSTASCII_USTRINGPARAM( - "PresenterScreenListener object has already been disposed")), + OUString( + "PresenterScreenListener object has already been disposed"), const_cast<uno::XWeak*>(static_cast<const uno::XWeak*>(this))); } } @@ -507,11 +507,11 @@ sal_Int32 PresenterScreen::GetPresenterScreenNumber ( Reference<XComponentContext> xContext (mxContextWeak); PresenterConfigurationAccess aConfiguration ( xContext, - OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.extension.PresenterScreen/")), + OUString("/org.openoffice.Office.extension.PresenterScreen/"), PresenterConfigurationAccess::READ_ONLY); bool bStartAlways (false); if (aConfiguration.GetConfigurationNode( - OUString(RTL_CONSTASCII_USTRINGPARAM("Presenter/StartAlways"))) >>= bStartAlways) + OUString("Presenter/StartAlways")) >>= bStartAlways) { if (bStartAlways) return GetPresenterScreenFromScreen(nScreenNumber); @@ -656,13 +656,13 @@ void PresenterScreen::SetupConfiguration ( { PresenterConfigurationAccess aConfiguration ( rxContext, - OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.extension.PresenterScreen")), + OUString("org.openoffice.Office.extension.PresenterScreen"), PresenterConfigurationAccess::READ_ONLY); maViewDescriptors.clear(); ProcessViewDescriptions(aConfiguration); - OUString sLayoutName (RTL_CONSTASCII_USTRINGPARAM("DefaultLayout")); + OUString sLayoutName ("DefaultLayout"); aConfiguration.GetConfigurationNode( - OUString(RTL_CONSTASCII_USTRINGPARAM("Presenter/CurrentLayout"))) >>= sLayoutName; + OUString("Presenter/CurrentLayout")) >>= sLayoutName; ProcessLayout(aConfiguration, sLayoutName, rxContext, rxAnchorId); } catch (RuntimeException&) @@ -680,14 +680,14 @@ void PresenterScreen::ProcessLayout ( { Reference<container::XHierarchicalNameAccess> xLayoutNode ( rConfiguration.GetConfigurationNode( - OUString(RTL_CONSTASCII_USTRINGPARAM("Presenter/Layouts/"))+rsLayoutName), + OUString("Presenter/Layouts/")+rsLayoutName), UNO_QUERY_THROW); // Read the parent layout first, if one is referenced. OUString sParentLayout; rConfiguration.GetConfigurationNode( xLayoutNode, - OUString(RTL_CONSTASCII_USTRINGPARAM("ParentLayout"))) >>= sParentLayout; + OUString("ParentLayout")) >>= sParentLayout; if (!sParentLayout.isEmpty()) { // Prevent infinite recursion. @@ -699,16 +699,16 @@ void PresenterScreen::ProcessLayout ( Reference<container::XNameAccess> xList ( rConfiguration.GetConfigurationNode( xLayoutNode, - OUString(RTL_CONSTASCII_USTRINGPARAM("Layout"))), + OUString("Layout")), UNO_QUERY_THROW); ::std::vector<rtl::OUString> aProperties (6); - aProperties[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("PaneURL")); - aProperties[1] = OUString(RTL_CONSTASCII_USTRINGPARAM("ViewURL")); - aProperties[2] = OUString(RTL_CONSTASCII_USTRINGPARAM("RelativeX")); - aProperties[3] = OUString(RTL_CONSTASCII_USTRINGPARAM("RelativeY")); - aProperties[4] = OUString(RTL_CONSTASCII_USTRINGPARAM("RelativeWidth")); - aProperties[5] = OUString(RTL_CONSTASCII_USTRINGPARAM("RelativeHeight")); + aProperties[0] = OUString("PaneURL"); + aProperties[1] = OUString("ViewURL"); + aProperties[2] = OUString("RelativeX"); + aProperties[3] = OUString("RelativeY"); + aProperties[4] = OUString("RelativeWidth"); + aProperties[5] = OUString("RelativeHeight"); mnComponentIndex = 1; PresenterConfigurationAccess::ForAll( xList, @@ -734,10 +734,10 @@ void PresenterScreen::ProcessViewDescriptions ( UNO_QUERY_THROW); ::std::vector<rtl::OUString> aProperties (4); - aProperties[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("ViewURL")); - aProperties[1] = OUString(RTL_CONSTASCII_USTRINGPARAM("Title")); - aProperties[2] = OUString(RTL_CONSTASCII_USTRINGPARAM("AccessibleTitle")); - aProperties[3] = OUString(RTL_CONSTASCII_USTRINGPARAM("IsOpaque")); + aProperties[0] = OUString("ViewURL"); + aProperties[1] = OUString("Title"); + aProperties[2] = OUString("AccessibleTitle"); + aProperties[3] = OUString("IsOpaque"); mnComponentIndex = 1; PresenterConfigurationAccess::ForAll( xViewDescriptionsNode, diff --git a/sdext/source/presenter/PresenterScrollBar.cxx b/sdext/source/presenter/PresenterScrollBar.cxx index da5dfc69503b..8c86515011dd 100644 --- a/sdext/source/presenter/PresenterScrollBar.cxx +++ b/sdext/source/presenter/PresenterScrollBar.cxx @@ -50,7 +50,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using ::rtl::OUString; -#define A2S(pString) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(pString))) +#define A2S(pString) (::rtl::OUString(pString)) const static double gnScrollBarGap (10); @@ -123,7 +123,7 @@ PresenterScrollBar::PresenterScrollBar ( mxPresenterHelper = Reference<drawing::XPresenterHelper>( xFactory->createInstanceWithContext( - OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.PresenterHelper")), + OUString("com.sun.star.comp.Draw.PresenterHelper"), rxComponentContext), UNO_QUERY_THROW); @@ -278,7 +278,7 @@ void PresenterScrollBar::SetCanvas (const Reference<css::rendering::XCanvas>& rx try { mpBitmaps.reset(new PresenterBitmapContainer( - OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterScreenSettings/ScrollBar/Bitmaps")), + OUString("PresenterScreenSettings/ScrollBar/Bitmaps"), ::boost::shared_ptr<PresenterBitmapContainer>(), mxComponentContext, mxCanvas, diff --git a/sdext/source/presenter/PresenterSlidePreview.cxx b/sdext/source/presenter/PresenterSlidePreview.cxx index 2ac144054dee..884f5273cad3 100644 --- a/sdext/source/presenter/PresenterSlidePreview.cxx +++ b/sdext/source/presenter/PresenterSlidePreview.cxx @@ -76,8 +76,8 @@ PresenterSlidePreview::PresenterSlidePreview ( || ! rpPresenterController.is()) { throw RuntimeException( - OUString(RTL_CONSTASCII_USTRINGPARAM( - "PresenterSlidePreview can not be constructed due to empty argument")), + OUString( + "PresenterSlidePreview can not be constructed due to empty argument"), static_cast<XWeak*>(this)); } @@ -103,7 +103,7 @@ PresenterSlidePreview::PresenterSlidePreview ( if (xFactory.is()) mxPreviewRenderer = Reference<drawing::XSlideRenderer>( xFactory->createInstanceWithContext( - OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.SlideRenderer")), + OUString("com.sun.star.drawing.SlideRenderer"), rxContext), UNO_QUERY); @@ -235,9 +235,9 @@ void PresenterSlidePreview::SetSlide (const Reference<drawing::XDrawPage>& rxPag try { xPropertySet->getPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM("Width"))) >>= aSlideSize.Width; + OUString("Width")) >>= aSlideSize.Width; xPropertySet->getPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM("Height"))) >>= aSlideSize.Height; + OUString("Height")) >>= aSlideSize.Height; } catch (beans::UnknownPropertyException&) { @@ -365,8 +365,7 @@ void PresenterSlidePreview::ThrowIfDisposed (void) if (PresenterSlidePreviewInterfaceBase::rBHelper.bDisposed || PresenterSlidePreviewInterfaceBase::rBHelper.bInDispose) { throw lang::DisposedException ( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "PresenterSlidePreview object has already been disposed")), + ::rtl::OUString( "PresenterSlidePreview object has already been disposed"), static_cast<uno::XWeak*>(this)); } } diff --git a/sdext/source/presenter/PresenterSlideShowView.cxx b/sdext/source/presenter/PresenterSlideShowView.cxx index b1dad0911ed5..8892aaeef772 100644 --- a/sdext/source/presenter/PresenterSlideShowView.cxx +++ b/sdext/source/presenter/PresenterSlideShowView.cxx @@ -53,7 +53,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; using ::rtl::OUString; -#define A2S(pString) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(pString))) +#define A2S(pString) (::rtl::OUString(pString)) namespace sdext { namespace presenter { @@ -111,7 +111,7 @@ void PresenterSlideShowView::LateInit (void) Reference<lang::XMultiComponentFactory> xFactory ( mxComponentContext->getServiceManager(), UNO_QUERY_THROW); mxPresenterHelper.set (xFactory->createInstanceWithContext( - OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.PresenterHelper")), + OUString("com.sun.star.comp.Draw.PresenterHelper"), mxComponentContext), UNO_QUERY_THROW); @@ -479,7 +479,7 @@ void SAL_CALL PresenterSlideShowView::setMouseCursor(::sal_Int16 nPointerShape) mxComponentContext, UNO_QUERY); if (xFactory.is()) mxPointer = Reference<awt::XPointer>( - xFactory->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.Pointer"))), + xFactory->createInstance(OUString("com.sun.star.awt.Pointer")), UNO_QUERY); } @@ -845,7 +845,7 @@ Reference<awt::XWindow> PresenterSlideShowView::CreateViewWindow ( Reference<awt::XToolkit> xToolkit ( xFactory->createInstanceWithContext( - OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.Toolkit")), + OUString("com.sun.star.awt.Toolkit"), mxComponentContext), UNO_QUERY_THROW); awt::WindowDescriptor aWindowDescriptor ( @@ -1005,7 +1005,7 @@ void PresenterSlideShowView::ThrowIfDisposed (void) if (rBHelper.bDisposed || rBHelper.bInDispose) { throw lang::DisposedException ( - OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterSlideShowView object has already been disposed")), + OUString("PresenterSlideShowView object has already been disposed"), static_cast<uno::XWeak*>(this)); } } diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx index 4c466cbcb23f..2aaf8e6018fb 100644 --- a/sdext/source/presenter/PresenterSlideSorter.cxx +++ b/sdext/source/presenter/PresenterSlideSorter.cxx @@ -57,7 +57,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; using ::rtl::OUString; -#define A2S(pString) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(pString))) +#define A2S(pString) (::rtl::OUString(pString)) namespace { const static sal_Int32 gnVerticalGap (10); @@ -340,7 +340,7 @@ PresenterSlideSorter::PresenterSlideSorter ( // Create the preview cache. mxPreviewCache = Reference<drawing::XSlidePreviewCache>( xFactory->createInstanceWithContext( - OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.PresenterPreviewCache")), + OUString("com.sun.star.drawing.PresenterPreviewCache"), mxComponentContext), UNO_QUERY_THROW); Reference<container::XIndexAccess> xSlides (mxSlideShowController, UNO_QUERY); @@ -361,7 +361,7 @@ PresenterSlideSorter::PresenterSlideSorter ( // Listen for changes of the current slide. Reference<beans::XPropertySet> xControllerProperties (rxController, UNO_QUERY_THROW); xControllerProperties->addPropertyChangeListener( - OUString(RTL_CONSTASCII_USTRINGPARAM("CurrentPage")), + OUString("CurrentPage"), this); // Move the current slide in the center of the window. @@ -831,8 +831,8 @@ double PresenterSlideSorter::GetSlideAspectRatio (void) const Reference<beans::XPropertySet> xProperties(xSlides->getByIndex(0),UNO_QUERY_THROW); sal_Int32 nWidth (28000); sal_Int32 nHeight (21000); - if ((xProperties->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("Width"))) >>= nWidth) - && (xProperties->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("Height"))) >>= nHeight) + if ((xProperties->getPropertyValue(OUString("Width")) >>= nWidth) + && (xProperties->getPropertyValue(OUString("Height")) >>= nHeight) && nHeight > 0) { nSlideAspectRatio = double(nWidth) / double(nHeight); @@ -1056,8 +1056,8 @@ void PresenterSlideSorter::ThrowIfDisposed (void) if (rBHelper.bDisposed || rBHelper.bInDispose) { throw lang::DisposedException ( - OUString(RTL_CONSTASCII_USTRINGPARAM( - "PresenterSlideSorter has been already disposed")), + OUString( + "PresenterSlideSorter has been already disposed"), const_cast<uno::XWeak*>(static_cast<const uno::XWeak*>(this))); } } @@ -1714,7 +1714,7 @@ PresenterSlideSorter::CurrentSlideFrameRenderer::CurrentSlideFrameRenderer ( { PresenterConfigurationAccess aConfiguration ( rxContext, - OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.extension.PresenterScreen/")), + OUString("/org.openoffice.Office.extension.PresenterScreen/"), PresenterConfigurationAccess::READ_ONLY); Reference<container::XHierarchicalNameAccess> xBitmaps ( aConfiguration.GetConfigurationNode( diff --git a/sdext/source/presenter/PresenterSpritePane.cxx b/sdext/source/presenter/PresenterSpritePane.cxx index 52895ba13dd8..9eef52d62729 100644 --- a/sdext/source/presenter/PresenterSpritePane.cxx +++ b/sdext/source/presenter/PresenterSpritePane.cxx @@ -52,7 +52,7 @@ PresenterSpritePane::PresenterSpritePane (const Reference<XComponentContext>& rx mxComponentContext->getServiceManager(), UNO_QUERY_THROW); mxPresenterHelper = Reference<drawing::XPresenterHelper>( xFactory->createInstanceWithContext( - OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.PresenterHelper")), + OUString("com.sun.star.comp.Draw.PresenterHelper"), mxComponentContext), UNO_QUERY_THROW); } diff --git a/sdext/source/presenter/PresenterTheme.cxx b/sdext/source/presenter/PresenterTheme.cxx index 8990416c19fc..0b600d4ec994 100644 --- a/sdext/source/presenter/PresenterTheme.cxx +++ b/sdext/source/presenter/PresenterTheme.cxx @@ -48,7 +48,7 @@ using namespace ::com::sun::star::uno; using namespace ::std; using ::rtl::OUString; -#define A2S(s) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(s))) +#define A2S(s) (::rtl::OUString(s)) namespace sdext { namespace presenter { @@ -302,7 +302,7 @@ PresenterTheme::~PresenterTheme (void) PresenterConfigurationAccess aConfiguration ( mxContext, - OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.extension.PresenterScreen/")), + OUString("/org.openoffice.Office.extension.PresenterScreen/"), PresenterConfigurationAccess::READ_ONLY); return aReadContext.ReadTheme(aConfiguration, msThemeName); @@ -390,7 +390,7 @@ bool PresenterTheme::ConvertToColor ( ::boost::shared_ptr<PresenterConfigurationAccess> pConfiguration ( new PresenterConfigurationAccess( mxContext, - OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.extension.PresenterScreen/")), + OUString("/org.openoffice.Office.extension.PresenterScreen/"), PresenterConfigurationAccess::READ_WRITE)); // Get configuration node for the view style container of the current @@ -517,7 +517,7 @@ PresenterTheme::FontDescriptor::FontDescriptor ( msStyleName(), mnSize(12), mnColor(0x00000000), - msAnchor(OUString(RTL_CONSTASCII_USTRINGPARAM("Left"))), + msAnchor(OUString("Left")), mnXOffset(0), mnYOffset(0) { @@ -737,7 +737,7 @@ ReadContext::ReadContext ( { mxPresenterHelper = Reference<drawing::XPresenterHelper>( xFactory->createInstanceWithContext( - OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.PresenterHelper")), + OUString("com.sun.star.comp.Draw.PresenterHelper"), rxContext), UNO_QUERY_THROW); } diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx index b6181bdc5868..c5acb8c6c8b3 100644 --- a/sdext/source/presenter/PresenterToolBar.cxx +++ b/sdext/source/presenter/PresenterToolBar.cxx @@ -67,7 +67,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; using ::rtl::OUString; -#define A2S(pString) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(pString))) +#define A2S(pString) (::rtl::OUString(pString)) namespace sdext { namespace presenter { @@ -638,7 +638,7 @@ void PresenterToolBar::CreateControls ( // Expand the macro in the bitmap file names. PresenterConfigurationAccess aConfiguration ( mxComponentContext, - OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.extension.PresenterScreen/")), + OUString("/org.openoffice.Office.extension.PresenterScreen/"), PresenterConfigurationAccess::READ_ONLY); const OUString sBasePath (PresenterComponent::GetBasePath(mxComponentContext)); @@ -989,8 +989,7 @@ void PresenterToolBar::ThrowIfDisposed (void) const if (rBHelper.bDisposed || rBHelper.bInDispose) { throw lang::DisposedException ( - OUString(RTL_CONSTASCII_USTRINGPARAM( - "PresenterToolBar has already been disposed")), + OUString( "PresenterToolBar has already been disposed"), const_cast<uno::XWeak*>(static_cast<const uno::XWeak*>(this))); } } diff --git a/sdext/source/presenter/PresenterWindowManager.cxx b/sdext/source/presenter/PresenterWindowManager.cxx index d7f93308de89..bc0866fed2a7 100644 --- a/sdext/source/presenter/PresenterWindowManager.cxx +++ b/sdext/source/presenter/PresenterWindowManager.cxx @@ -66,7 +66,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; using ::rtl::OUString; -#define A2S(pString) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(pString))) +#define A2S(pString) (::rtl::OUString(pString)) namespace sdext { namespace presenter { @@ -542,7 +542,7 @@ void PresenterWindowManager::RestoreViewMode (void) sal_Int32 nMode (0); PresenterConfigurationAccess aConfiguration ( mxComponentContext, - OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.extension.PresenterScreen/")), + OUString("/org.openoffice.Office.extension.PresenterScreen/"), PresenterConfigurationAccess::READ_ONLY); aConfiguration.GetConfigurationNode(A2S("Presenter/InitialViewMode")) >>= nMode; switch (nMode) @@ -568,7 +568,7 @@ void PresenterWindowManager::StoreViewMode (const ViewMode eViewMode) { PresenterConfigurationAccess aConfiguration ( mxComponentContext, - OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.extension.PresenterScreen/")), + OUString("/org.openoffice.Office.extension.PresenterScreen/"), PresenterConfigurationAccess::READ_WRITE); aConfiguration.GoToChild(A2S("Presenter")); Any aValue; @@ -1179,8 +1179,7 @@ void PresenterWindowManager::ThrowIfDisposed (void) const if (rBHelper.bDisposed || rBHelper.bInDispose) { throw lang::DisposedException ( - OUString(RTL_CONSTASCII_USTRINGPARAM( - "PresenterWindowManager has already been disposed")), + OUString( "PresenterWindowManager has already been disposed"), const_cast<uno::XWeak*>(static_cast<const uno::XWeak*>(this))); } } |