diff options
276 files changed, 3283 insertions, 3497 deletions
diff --git a/bridges/source/jni_uno/jni_base.h b/bridges/source/jni_uno/jni_base.h index ad0fd8df753d..7b668c17270d 100644 --- a/bridges/source/jni_uno/jni_base.h +++ b/bridges/source/jni_uno/jni_base.h @@ -41,8 +41,6 @@ typedef __va_list va_list; #include "uno/environment.h" #include "typelib/typedescription.h" -#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) - namespace jni_uno { @@ -244,7 +242,7 @@ inline ::std::auto_ptr< rtl_mem > rtl_mem::allocate( ::std::size_t bytes ) { void * p = rtl_allocateMemory( bytes ); if (0 == p) - throw BridgeRuntimeError( OUSTR("out of memory!") ); + throw BridgeRuntimeError( "out of memory!" ); return ::std::auto_ptr< rtl_mem >( (rtl_mem *)p ); } @@ -274,7 +272,7 @@ inline TypeDescr::TypeDescr( typelib_TypeDescriptionReference * td_ref ) if (0 == m_td) { throw BridgeRuntimeError( - OUSTR("cannot get comprehensive type description for ") + + "cannot get comprehensive type description for " + ::rtl::OUString::unacquired( &td_ref->pTypeName ) ); } } diff --git a/bridges/source/jni_uno/jni_bridge.cxx b/bridges/source/jni_uno/jni_bridge.cxx index 4ba0f7b1ac4b..a8bef0c0b8b7 100644 --- a/bridges/source/jni_uno/jni_bridge.cxx +++ b/bridges/source/jni_uno/jni_bridge.cxx @@ -102,7 +102,7 @@ void SAL_CALL Mapping_map_to_uno( #if OSL_DEBUG_LEVEL > 0 OString cstr_msg( OUStringToOString( - OUSTR("[jni_uno bridge error] ") + err.m_message, + "[jni_uno bridge error] " + err.m_message, RTL_TEXTENCODING_ASCII_US ) ); OSL_FAIL( cstr_msg.getStr() ); #else @@ -171,7 +171,7 @@ void SAL_CALL Mapping_map_to_java( #if OSL_DEBUG_LEVEL > 0 OString cstr_msg( OUStringToOString( - OUSTR("[jni_uno bridge error] ") + err.m_message, + "[jni_uno bridge error] " + err.m_message, RTL_TEXTENCODING_ASCII_US ) ); OSL_FAIL( cstr_msg.getStr() ); #else @@ -289,7 +289,7 @@ void JNI_context::java_exc_occurred() const if (! jo_exc.is()) { throw BridgeRuntimeError( - OUSTR("java exception occurred, but not available!?") + + "java exception occurred, but not available!?" + get_stack_trace() ); } @@ -299,7 +299,7 @@ void JNI_context::java_exc_occurred() const { m_env->ExceptionClear(); throw BridgeRuntimeError( - OUSTR("cannot get class java.lang.Object!") + get_stack_trace() ); + "cannot get class java.lang.Object!" + get_stack_trace() ); } JLocalAutoRef jo_Object( *this, jo_class ); // method Object.toString() @@ -309,7 +309,7 @@ void JNI_context::java_exc_occurred() const { m_env->ExceptionClear(); throw BridgeRuntimeError( - OUSTR("cannot get method id of java.lang.Object.toString()!") + + "cannot get method id of java.lang.Object.toString()!" + get_stack_trace() ); } OSL_ASSERT( 0 != method_Object_toString ); @@ -321,7 +321,7 @@ void JNI_context::java_exc_occurred() const { m_env->ExceptionClear(); throw BridgeRuntimeError( - OUSTR("error examining java exception object!") + + "error examining java exception object!" + get_stack_trace() ); } @@ -337,7 +337,7 @@ void JNI_context::java_exc_occurred() const { m_env->ExceptionClear(); throw BridgeRuntimeError( - OUSTR("invalid java string object!") + get_stack_trace() ); + "invalid java string object!" + get_stack_trace() ); } ustr->refCount = 1; ustr->length = len; @@ -535,7 +535,7 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL uno_ext_getMapping( #if OSL_DEBUG_LEVEL > 0 OString cstr_msg( OUStringToOString( - OUSTR("[jni_uno bridge error] ") + err.m_message, + "[jni_uno bridge error] " + err.m_message, RTL_TEXTENCODING_ASCII_US ) ); OSL_FAIL( cstr_msg.getStr() ); #else diff --git a/bridges/source/jni_uno/jni_info.h b/bridges/source/jni_uno/jni_info.h index b02bb88eb3a4..de63914631a4 100644 --- a/bridges/source/jni_uno/jni_info.h +++ b/bridges/source/jni_uno/jni_info.h @@ -356,7 +356,7 @@ inline void JNI_info::append_sig( break; default: throw BridgeRuntimeError( - OUSTR("unsupported type: ") + + "unsupported type: " + ::rtl::OUString::unacquired( &type->pTypeName ) ); } } diff --git a/bridges/source/jni_uno/jni_java2uno.cxx b/bridges/source/jni_uno/jni_java2uno.cxx index 589cd753bbf6..9107cc796b0d 100644 --- a/bridges/source/jni_uno/jni_java2uno.cxx +++ b/bridges/source/jni_uno/jni_java2uno.cxx @@ -145,7 +145,7 @@ void Bridge::handle_uno_exc( JNI_context const & jni, uno_Any * uno_exc ) const else { OUString message( - OUSTR("thrown exception is no uno exception: ") + + "thrown exception is no uno exception: " + OUString::unacquired( &uno_exc->pType->pTypeName ) + jni.get_stack_trace() ); uno_any_destruct( uno_exc, 0 ); @@ -433,7 +433,7 @@ JNICALL Java_com_sun_star_bridges_jni_1uno_JNI_1proxy_dispatch_1call( if (! jo_type_name.is()) { throw BridgeRuntimeError( - OUSTR("incomplete type object: no type name!") + + "incomplete type object: no type name!" + jni.get_stack_trace() ); } OUString type_name( @@ -443,7 +443,7 @@ JNICALL Java_com_sun_star_bridges_jni_1uno_JNI_1proxy_dispatch_1call( if (typelib_TypeClass_INTERFACE != info->m_td.get()->eTypeClass) { throw BridgeRuntimeError( - OUSTR("queryInterface() call demands an INTERFACE type!") ); + "queryInterface() call demands an INTERFACE type!" ); } JNI_interface_type_info const * iface_info = static_cast< JNI_interface_type_info const * >( info ); @@ -674,7 +674,7 @@ JNICALL Java_com_sun_star_bridges_jni_1uno_JNI_1proxy_finalize__J( OUString oid( jstring_to_oustring( jni, (jstring) jo_oid.get() ) ); OString cstr_msg( OUStringToOString( - OUSTR("freeing java uno proxy: ") + oid, + "freeing java uno proxy: " + oid, RTL_TEXTENCODING_ASCII_US ) ); OSL_TRACE( "%s", cstr_msg.getStr() ); } diff --git a/bridges/source/jni_uno/jni_uno2java.cxx b/bridges/source/jni_uno/jni_uno2java.cxx index b6e3745e86f0..88922ca371fc 100644 --- a/bridges/source/jni_uno/jni_uno2java.cxx +++ b/bridges/source/jni_uno/jni_uno2java.cxx @@ -67,7 +67,7 @@ void Bridge::handle_java_exc( if (! jo_exc.is()) { throw BridgeRuntimeError( - OUSTR("java exception occurred, but no java exception available!?") + + "java exception occurred, but no java exception available!?" + jni.get_stack_trace() ); } @@ -547,7 +547,7 @@ void SAL_CALL UNO_proxy_free( uno_ExtEnvironment * env, void * proxy ) #if OSL_DEBUG_LEVEL > 1 OString cstr_msg( OUStringToOString( - OUSTR("freeing binary uno proxy: ") + that->m_oid, + "freeing binary uno proxy: " + that->m_oid, RTL_TEXTENCODING_ASCII_US ) ); OSL_TRACE( "%s", cstr_msg.getStr() ); #endif @@ -699,8 +699,7 @@ void SAL_CALL UNO_proxy_dispatch( demanded_td.get()->eTypeClass) { throw BridgeRuntimeError( - OUSTR("queryInterface() call demands " - "an INTERFACE type!") ); + "queryInterface() call demands an INTERFACE type!" ); } uno_Interface * pInterface = 0; @@ -809,7 +808,7 @@ void SAL_CALL UNO_proxy_dispatch( default: { throw BridgeRuntimeError( - OUSTR("illegal member type description!") ); + "illegal member type description!" ); } } } @@ -846,8 +845,7 @@ void SAL_CALL UNO_proxy_dispatch( { // binary identical struct ::com::sun::star::uno::RuntimeException exc( - OUSTR("[jni_uno bridge error] attaching current thread " - "to java failed!"), + "[jni_uno bridge error] attaching current thread to java failed!", ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() ); ::com::sun::star::uno::Type const & exc_type = ::getCppuType( &exc ); diff --git a/bridges/test/inter_libs_exc/inter.cxx b/bridges/test/inter_libs_exc/inter.cxx index fe60c8ccc50a..3c1190dabb4b 100644 --- a/bridges/test/inter_libs_exc/inter.cxx +++ b/bridges/test/inter_libs_exc/inter.cxx @@ -35,18 +35,18 @@ extern "C" int main( int argc, char const * argv [] ) #define SAL_DLLPREFIX "" #endif Module mod_starter( - OUSTR(SAL_DLLPREFIX "starter" SAL_DLLEXTENSION), + SAL_DLLPREFIX "starter" SAL_DLLEXTENSION, SAL_LOADMODULE_LAZY | SAL_LOADMODULE_GLOBAL ); Module mod_thrower( - OUSTR(SAL_DLLPREFIX "thrower" SAL_DLLEXTENSION), + SAL_DLLPREFIX "thrower" SAL_DLLEXTENSION, SAL_LOADMODULE_LAZY | SAL_LOADMODULE_GLOBAL ); typedef t_throws_exc (SAL_CALL * t_get_thrower)(); - t_get_thrower get_thrower = (t_get_thrower)mod_thrower.getSymbol( OUSTR("get_thrower") ); + t_get_thrower get_thrower = (t_get_thrower)mod_thrower.getSymbol( "get_thrower" ); t_throws_exc thrower = (*get_thrower)(); typedef void (SAL_CALL * t_starter)( t_throws_exc ); - t_starter start = (t_starter)mod_starter.getSymbol( OUSTR("start") ); + t_starter start = (t_starter)mod_starter.getSymbol( "start" ); (*start)( thrower ); diff --git a/bridges/test/inter_libs_exc/share.h b/bridges/test/inter_libs_exc/share.h index fffa41b5bf82..260883df0a04 100644 --- a/bridges/test/inter_libs_exc/share.h +++ b/bridges/test/inter_libs_exc/share.h @@ -20,8 +20,6 @@ #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/uno/DeploymentException.hpp> -#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) - typedef void (SAL_CALL * t_throws_exc)(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/bridges/test/inter_libs_exc/thrower.cxx b/bridges/test/inter_libs_exc/thrower.cxx index 5f42f4a44892..de37e1d90a70 100644 --- a/bridges/test/inter_libs_exc/thrower.cxx +++ b/bridges/test/inter_libs_exc/thrower.cxx @@ -27,7 +27,7 @@ using namespace ::com::sun::star::uno; static void SAL_CALL throws_exc() { throw lang::IllegalArgumentException( - OUSTR("bla"), Reference< XInterface >(), 0 ); + "bla", Reference< XInterface >(), 0 ); } extern "C" t_throws_exc SAL_CALL get_thrower() diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx index d51b5a561ead..13d5316f5c67 100644 --- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx +++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx @@ -68,7 +68,6 @@ void Chart2ModelContact::setModel( const ::com::sun::star::uno::Reference< uno::Reference< container::XNameContainer > xHatchTable( xTableFactory->createInstance("com.sun.star.drawing.HatchTable"), uno::UNO_QUERY ); uno::Reference< container::XNameContainer > xBitmapTable( xTableFactory->createInstance("com.sun.star.drawing.BitmapTable"), uno::UNO_QUERY ); uno::Reference< container::XNameContainer > xTransparencyGradientTable( xTableFactory->createInstance("com.sun.star.drawing.TransparencyGradientTable"), uno::UNO_QUERY ); - //C2U( "com.sun.star.drawing.MarkerTable" ) m_aTableMap["LineDashName"] = xDashTable; m_aTableMap["FillGradientName"] = xGradientTable; m_aTableMap["FillHatchName"] = xHatchTable; diff --git a/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx b/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx index f10fb417ffaf..f813eb2598e5 100644 --- a/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx @@ -65,7 +65,7 @@ RegressionEquationItemConverter::RegressionEquationItemConverter( GraphicPropertyItemConverter::LINE_AND_FILL_PROPERTIES )); m_aConverters.push_back( new CharacterPropertyItemConverter( - rPropertySet, rItemPool, pRefSize, C2U("ReferencePageSize"))); + rPropertySet, rItemPool, pRefSize, "ReferencePageSize")); } SAL_WNODEPRECATED_DECLARATIONS_POP @@ -126,9 +126,9 @@ bool RegressionEquationItemConverter::ApplySpecialItem( uno::Any aValue( static_cast< sal_Int32 >( static_cast< const SfxUInt32Item & >( rItemSet.Get( nWhichId )).GetValue())); - if( GetPropertySet()->getPropertyValue( C2U( "NumberFormat" )) != aValue ) + if( GetPropertySet()->getPropertyValue( "NumberFormat" ) != aValue ) { - GetPropertySet()->setPropertyValue( C2U( "NumberFormat" ), aValue ); + GetPropertySet()->setPropertyValue( "NumberFormat", aValue ); bChanged = true; } } @@ -147,7 +147,7 @@ void RegressionEquationItemConverter::FillSpecialItem( case SID_ATTR_NUMBERFORMAT_VALUE: { sal_Int32 nFormatKey = 0; - if( GetPropertySet()->getPropertyValue( C2U( "NumberFormat" )) >>= nFormatKey ) + if( GetPropertySet()->getPropertyValue( "NumberFormat" ) >>= nFormatKey ) { rOutItemSet.Put( SfxUInt32Item( nWhichId, nFormatKey )); } diff --git a/chart2/source/controller/main/ChartController_Insert.cxx b/chart2/source/controller/main/ChartController_Insert.cxx index d257a7d76254..cd42430c3c73 100644 --- a/chart2/source/controller/main/ChartController_Insert.cxx +++ b/chart2/source/controller/main/ChartController_Insert.cxx @@ -281,9 +281,8 @@ void ChartController::executeDispatch_InsertMenu_DataLabels() // add labels DataSeriesHelper::insertDataLabelsToSeriesAndAllPoints( xSeries ); - rtl::OUString aChildParticle( ObjectIdentifier::getStringForType( OBJECTTYPE_DATA_LABELS ) ); - aChildParticle+=(C2U("=")); - rtl::OUString aObjectCID = ObjectIdentifier::createClassifiedIdentifierForParticles( + OUString aChildParticle( ObjectIdentifier::getStringForType( OBJECTTYPE_DATA_LABELS ) + "=" ); + OUString aObjectCID = ObjectIdentifier::createClassifiedIdentifierForParticles( ObjectIdentifier::getSeriesParticleFromCID(m_aSelection.getSelectedCID()), aChildParticle ); bool bSuccess = ChartController::executeDlg_ObjectProperties_withoutUndoGuard( aObjectCID, true ); @@ -585,8 +584,8 @@ void ChartController::executeDispatch_InsertTrendlineEquation( bool bInsertR2 ) ActionDescriptionProvider::createDescription( ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_CURVE_EQUATION ))), m_xUndoManager ); - xEqProp->setPropertyValue( C2U("ShowEquation"), uno::makeAny( true )); - xEqProp->setPropertyValue( C2U("ShowCorrelationCoefficient"), uno::makeAny( bInsertR2 )); + xEqProp->setPropertyValue( "ShowEquation", uno::makeAny( true )); + xEqProp->setPropertyValue( "ShowCorrelationCoefficient", uno::makeAny( bInsertR2 )); aUndoGuard.commit(); } } @@ -602,7 +601,7 @@ void ChartController::executeDispatch_InsertR2Value() ActionDescriptionProvider::createDescription( ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_CURVE_EQUATION ))), m_xUndoManager ); - xEqProp->setPropertyValue( C2U("ShowCorrelationCoefficient"), uno::makeAny( true )); + xEqProp->setPropertyValue( "ShowCorrelationCoefficient", uno::makeAny( true )); aUndoGuard.commit(); } } @@ -617,7 +616,7 @@ void ChartController::executeDispatch_DeleteR2Value() ActionDescriptionProvider::createDescription( ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_CURVE_EQUATION ))), m_xUndoManager ); - xEqProp->setPropertyValue( C2U("ShowCorrelationCoefficient"), uno::makeAny( false )); + xEqProp->setPropertyValue( "ShowCorrelationCoefficient", uno::makeAny( false )); aUndoGuard.commit(); } } diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx index 0f3172027cd4..d78a5d719ae1 100644 --- a/chart2/source/controller/main/ChartController_Properties.cxx +++ b/chart2/source/controller/main/ChartController_Properties.cxx @@ -97,7 +97,7 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH } rtl::OUString aParticleID = ObjectIdentifier::getParticleID( aObjectCID ); - bool bAffectsMultipleObjects = aParticleID.equals(C2U("ALLELEMENTS")); + bool bAffectsMultipleObjects = aParticleID == "ALLELEMENTS"; //------------------------------------------------------------- if( !bAffectsMultipleObjects ) { @@ -211,7 +211,7 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH uno::Reference< beans::XPropertySet > xSeriesProp( xSeries, uno::UNO_QUERY ); bool bVaryColorsByPoint = false; if( xSeriesProp.is() && - (xSeriesProp->getPropertyValue(C2U("VaryColorsByPoint")) >>= bVaryColorsByPoint) && + (xSeriesProp->getPropertyValue("VaryColorsByPoint") >>= bVaryColorsByPoint) && bVaryColorsByPoint ) { if( !ColorPerPointHelper::hasPointOwnColor( xSeriesProp, nPointIndex, xObjectProperties ) ) @@ -320,7 +320,7 @@ SAL_WNODEPRECATED_DECLARATIONS_POP rtl::OUString lcl_getTitleCIDForCommand( const ::rtl::OString& rDispatchCommand, const uno::Reference< frame::XModel > & xChartModel ) { if( rDispatchCommand.equals("AllTitles")) - return ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_TITLE, C2U("ALLELEMENTS") ); + return ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_TITLE, "ALLELEMENTS" ); TitleHelper::eTitleType nTitleType( TitleHelper::MAIN_TITLE ); if( rDispatchCommand.equals("SubTitle") ) @@ -343,7 +343,7 @@ rtl::OUString lcl_getTitleCIDForCommand( const ::rtl::OString& rDispatchCommand, rtl::OUString lcl_getAxisCIDForCommand( const ::rtl::OString& rDispatchCommand, const uno::Reference< frame::XModel >& xChartModel ) { if( rDispatchCommand.equals("DiagramAxisAll")) - return ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_AXIS, C2U("ALLELEMENTS") ); + return ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_AXIS, "ALLELEMENTS" ); sal_Int32 nDimensionIndex=0; bool bMainAxis=true; @@ -378,7 +378,7 @@ rtl::OUString lcl_getGridCIDForCommand( const ::rtl::OString& rDispatchCommand, uno::Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( xChartModel ) ); if( rDispatchCommand.equals("DiagramGridAll")) - return ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_GRID, C2U("ALLELEMENTS") ); + return ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_GRID, "ALLELEMENTS" ); sal_Int32 nDimensionIndex=0; bool bMainGrid=true; @@ -537,8 +537,7 @@ rtl::OUString lcl_getObjectCIDForCommand( const ::rtl::OString& rDispatchCommand if( nPointIndex>=0 ) { OUString aSeriesParticle = ObjectIdentifier::getSeriesParticleFromCID( rSelectedCID ); - OUString aChildParticle( ObjectIdentifier::getStringForType( OBJECTTYPE_DATA_LABELS ) ); - aChildParticle+=(C2U("=")); + OUString aChildParticle( ObjectIdentifier::getStringForType( OBJECTTYPE_DATA_LABELS ) + "=" ); OUString aLabelsCID = ObjectIdentifier::createClassifiedIdentifierForParticles( aSeriesParticle, aChildParticle ); OUString aLabelCID_Stub = ObjectIdentifier::createClassifiedIdentifierWithParent( OBJECTTYPE_DATA_LABEL, ::rtl::OUString(), aLabelsCID ); diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx b/chart2/source/controller/main/ChartController_TextEdit.cxx index c57a5544dc11..80056ac468b8 100644 --- a/chart2/source/controller/main/ChartController_TextEdit.cxx +++ b/chart2/source/controller/main/ChartController_TextEdit.cxx @@ -79,7 +79,7 @@ void ChartController::StartTextEdit( const Point* pMousePixel ) //#i77362 change notification for changes on additional shapes are missing uno::Reference< beans::XPropertySet > xChartViewProps( m_xChartView, uno::UNO_QUERY ); if( xChartViewProps.is() ) - xChartViewProps->setPropertyValue( C2U("SdrViewIsInEditMode"), uno::makeAny(sal_True) ); + xChartViewProps->setPropertyValue( "SdrViewIsInEditMode", uno::makeAny(sal_True) ); sal_Bool bEdit = m_pDrawViewWrapper->SdrBeginTextEdit( pTextObj , m_pDrawViewWrapper->GetPageView() @@ -119,7 +119,7 @@ bool ChartController::EndTextEdit() //#i77362 change notification for changes on additional shapes are missing uno::Reference< beans::XPropertySet > xChartViewProps( m_xChartView, uno::UNO_QUERY ); if( xChartViewProps.is() ) - xChartViewProps->setPropertyValue( C2U("SdrViewIsInEditMode"), uno::makeAny(sal_False) ); + xChartViewProps->setPropertyValue( "SdrViewIsInEditMode", uno::makeAny(sal_False) ); SdrObject* pTextObject = m_pDrawViewWrapper->getTextEditObject(); if(!pTextObject) diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx index 8edd6271f6b9..17581e3b06ab 100644 --- a/chart2/source/controller/main/ChartController_Tools.cxx +++ b/chart2/source/controller/main/ChartController_Tools.cxx @@ -190,9 +190,9 @@ void ChartController::executeDispatch_NewArrangement() // diagram Reference< beans::XPropertyState > xState( xDiagram, uno::UNO_QUERY_THROW ); - xState->setPropertyToDefault( C2U("RelativeSize")); - xState->setPropertyToDefault( C2U("RelativePosition")); - xState->setPropertyToDefault( C2U("PosSizeExcludeAxes")); + xState->setPropertyToDefault( "RelativeSize"); + xState->setPropertyToDefault( "RelativePosition"); + xState->setPropertyToDefault( "PosSizeExcludeAxes"); // 3d rotation ThreeDHelper::set3DSettingsToDefault( uno::Reference< beans::XPropertySet >( xDiagram, uno::UNO_QUERY ) ); @@ -201,9 +201,9 @@ void ChartController::executeDispatch_NewArrangement() Reference< beans::XPropertyState > xLegendState( xDiagram->getLegend(), uno::UNO_QUERY ); if( xLegendState.is()) { - xLegendState->setPropertyToDefault( C2U("RelativePosition")); - xLegendState->setPropertyToDefault( C2U("RelativeSize")); - xLegendState->setPropertyToDefault( C2U("AnchorPosition")); + xLegendState->setPropertyToDefault( "RelativePosition"); + xLegendState->setPropertyToDefault( "RelativeSize"); + xLegendState->setPropertyToDefault( "AnchorPosition"); } // titles @@ -215,7 +215,7 @@ void ChartController::executeDispatch_NewArrangement() TitleHelper::getTitle( static_cast< TitleHelper::eTitleType >( eType ), xModel ), uno::UNO_QUERY ); if( xTitleState.is()) - xTitleState->setPropertyToDefault( C2U("RelativePosition")); + xTitleState->setPropertyToDefault( "RelativePosition"); } // regression curve equations @@ -341,7 +341,7 @@ void ChartController::impl_PasteGraphic( return; uno::Reference< lang::XMultiServiceFactory > xFact( pDrawModelWrapper->getShapeFactory()); uno::Reference< drawing::XShape > xGraphicShape( - xFact->createInstance( C2U( "com.sun.star.drawing.GraphicObjectShape" )), uno::UNO_QUERY ); + xFact->createInstance( "com.sun.star.drawing.GraphicObjectShape" ), uno::UNO_QUERY ); uno::Reference< beans::XPropertySet > xGraphicShapeProp( xGraphicShape, uno::UNO_QUERY ); if( xGraphicShapeProp.is() && xGraphicShape.is()) { @@ -359,13 +359,13 @@ void ChartController::impl_PasteGraphic( m_aSelection.setSelection( xGraphicShape ); m_aSelection.applySelection( m_pDrawViewWrapper ); } - xGraphicShapeProp->setPropertyValue( C2U("Graphic"), uno::makeAny( xGraphic )); + xGraphicShapeProp->setPropertyValue( "Graphic", uno::makeAny( xGraphic )); uno::Reference< beans::XPropertySet > xGraphicProp( xGraphic, uno::UNO_QUERY ); awt::Size aGraphicSize( 1000, 1000 ); // first try size in 100th mm, then pixel size - if( ! ( xGraphicProp->getPropertyValue( C2U("Size100thMM")) >>= aGraphicSize ) && - ( ( xGraphicProp->getPropertyValue( C2U("SizePixel")) >>= aGraphicSize ) && m_pChartWindow )) + if( ! ( xGraphicProp->getPropertyValue( "Size100thMM") >>= aGraphicSize ) && + ( ( xGraphicProp->getPropertyValue( "SizePixel") >>= aGraphicSize ) && m_pChartWindow )) { ::Size aVCLSize( m_pChartWindow->PixelToLogic( Size( aGraphicSize.Width, aGraphicSize.Height ))); aGraphicSize.Width = aVCLSize.getWidth(); @@ -446,7 +446,7 @@ void ChartController::impl_PasteStringAsTextShape( const OUString& rString, cons try { Reference< drawing::XShape > xTextShape( - xShapeFactory->createInstance( C2U( "com.sun.star.drawing.TextShape" ) ), uno::UNO_QUERY_THROW ); + xShapeFactory->createInstance( "com.sun.star.drawing.TextShape" ), uno::UNO_QUERY_THROW ); xDrawPage->add( xTextShape ); Reference< text::XTextRange > xRange( xTextShape, uno::UNO_QUERY_THROW ); @@ -454,14 +454,14 @@ void ChartController::impl_PasteStringAsTextShape( const OUString& rString, cons float fCharHeight = 10.0; Reference< beans::XPropertySet > xProperties( xTextShape, uno::UNO_QUERY_THROW ); - xProperties->setPropertyValue( C2U( "TextAutoGrowHeight" ), uno::makeAny( true ) ); - xProperties->setPropertyValue( C2U( "TextAutoGrowWidth" ), uno::makeAny( true ) ); - xProperties->setPropertyValue( C2U( "CharHeight" ), uno::makeAny( fCharHeight ) ); - xProperties->setPropertyValue( C2U( "CharHeightAsian" ), uno::makeAny( fCharHeight ) ); - xProperties->setPropertyValue( C2U( "CharHeightComplex" ), uno::makeAny( fCharHeight ) ); - xProperties->setPropertyValue( C2U( "TextVerticalAdjust" ), uno::makeAny( drawing::TextVerticalAdjust_CENTER ) ); - xProperties->setPropertyValue( C2U( "TextHorizontalAdjust" ), uno::makeAny( drawing::TextHorizontalAdjust_CENTER ) ); - xProperties->setPropertyValue( C2U( "CharFontName" ), uno::makeAny( C2U( "Albany" ) ) ); + xProperties->setPropertyValue( "TextAutoGrowHeight", uno::makeAny( true ) ); + xProperties->setPropertyValue( "TextAutoGrowWidth", uno::makeAny( true ) ); + xProperties->setPropertyValue( "CharHeight", uno::makeAny( fCharHeight ) ); + xProperties->setPropertyValue( "CharHeightAsian", uno::makeAny( fCharHeight ) ); + xProperties->setPropertyValue( "CharHeightComplex", uno::makeAny( fCharHeight ) ); + xProperties->setPropertyValue( "TextVerticalAdjust", uno::makeAny( drawing::TextVerticalAdjust_CENTER ) ); + xProperties->setPropertyValue( "TextHorizontalAdjust", uno::makeAny( drawing::TextHorizontalAdjust_CENTER ) ); + xProperties->setPropertyValue( "CharFontName", uno::makeAny( OUString("Albany") ) ); xTextShape->setPosition( rPosition ); @@ -641,7 +641,7 @@ bool ChartController::executeDispatch_Delete() ActionDescriptionProvider::createDescription( ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_LEGEND ))), m_xUndoManager ); - xLegendProp->setPropertyValue( C2U("Show"), uno::makeAny( false )); + xLegendProp->setPropertyValue( "Show", uno::makeAny( false )); bReturn = true; aUndoGuard.commit(); } @@ -706,8 +706,8 @@ bool ChartController::executeDispatch_Delete() m_xUndoManager ); { ControllerLockGuard aCtlLockGuard( xModel ); - xEqProp->setPropertyValue( C2U("ShowEquation"), uno::makeAny( false )); - xEqProp->setPropertyValue( C2U("ShowCorrelationCoefficient"), uno::makeAny( false )); + xEqProp->setPropertyValue( "ShowEquation", uno::makeAny( false )); + xEqProp->setPropertyValue( "ShowCorrelationCoefficient", uno::makeAny( false )); } bReturn = true; aUndoGuard.commit(); @@ -741,7 +741,7 @@ bool ChartController::executeDispatch_Delete() { ControllerLockGuard aCtlLockGuard( xModel ); xErrorBarProp->setPropertyValue( - C2U("ErrorBarStyle"), + "ErrorBarStyle", uno::makeAny( ::com::sun::star::chart::ErrorBarStyle::NONE )); } bReturn = true; @@ -763,7 +763,7 @@ bool ChartController::executeDispatch_Delete() SchResId( aObjectType == OBJECTTYPE_DATA_LABEL ? STR_OBJECT_LABEL : STR_OBJECT_DATALABELS )))), m_xUndoManager ); chart2::DataPointLabel aLabel; - xObjectProperties->getPropertyValue( C2U( "Label" ) ) >>= aLabel; + xObjectProperties->getPropertyValue( "Label" ) >>= aLabel; aLabel.ShowNumber = false; aLabel.ShowNumberInPercent = false; aLabel.ShowCategoryName = false; @@ -771,10 +771,10 @@ bool ChartController::executeDispatch_Delete() if( aObjectType == OBJECTTYPE_DATA_LABELS ) { uno::Reference< chart2::XDataSeries > xSeries( ObjectIdentifier::getDataSeriesForCID( aCID, getModel() )); - ::chart::DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, C2U( "Label" ), uno::makeAny(aLabel) ); + ::chart::DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "Label", uno::makeAny(aLabel) ); } else - xObjectProperties->setPropertyValue( C2U( "Label" ), uno::makeAny(aLabel) ); + xObjectProperties->setPropertyValue( "Label", uno::makeAny(aLabel) ); bReturn = true; aUndoGuard.commit(); } @@ -833,9 +833,9 @@ void ChartController::executeDispatch_ToggleLegend() try { bool bShow = false; - if( xLegendProp->getPropertyValue( C2U("Show")) >>= bShow ) + if( xLegendProp->getPropertyValue( "Show") >>= bShow ) { - xLegendProp->setPropertyValue( C2U("Show"), uno::makeAny( ! bShow )); + xLegendProp->setPropertyValue( "Show", uno::makeAny( ! bShow )); bChanged = true; } } diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx index 7f66efbc628b..193f80a2ceec 100644 --- a/chart2/source/controller/main/ChartController_Window.cxx +++ b/chart2/source/controller/main/ChartController_Window.cxx @@ -143,7 +143,7 @@ void lcl_insertMenuCommand( OUString lcl_getFormatCommandForObjectCID( const OUString& rCID ) { - OUString aDispatchCommand( C2U(".uno:FormatSelection") ); + OUString aDispatchCommand( ".uno:FormatSelection" ); ObjectType eObjectType = ObjectIdentifier::getObjectType( rCID ); @@ -151,71 +151,71 @@ OUString lcl_getFormatCommandForObjectCID( const OUString& rCID ) { case OBJECTTYPE_DIAGRAM: case OBJECTTYPE_DIAGRAM_WALL: - aDispatchCommand = C2U(".uno:FormatWall"); + aDispatchCommand = ".uno:FormatWall"; break; case OBJECTTYPE_DIAGRAM_FLOOR: - aDispatchCommand = C2U(".uno:FormatFloor"); + aDispatchCommand = ".uno:FormatFloor"; break; case OBJECTTYPE_PAGE: - aDispatchCommand = C2U(".uno:FormatChartArea"); + aDispatchCommand = ".uno:FormatChartArea"; break; case OBJECTTYPE_LEGEND: - aDispatchCommand = C2U(".uno:FormatLegend"); + aDispatchCommand = ".uno:FormatLegend"; break; case OBJECTTYPE_TITLE: - aDispatchCommand = C2U(".uno:FormatTitle"); + aDispatchCommand = ".uno:FormatTitle"; break; case OBJECTTYPE_LEGEND_ENTRY: - aDispatchCommand = C2U(".uno:FormatDataSeries"); + aDispatchCommand = ".uno:FormatDataSeries"; break; case OBJECTTYPE_AXIS: case OBJECTTYPE_AXIS_UNITLABEL: - aDispatchCommand = C2U(".uno:FormatAxis"); + aDispatchCommand = ".uno:FormatAxis"; break; case OBJECTTYPE_GRID: - aDispatchCommand = C2U(".uno:FormatMajorGrid"); + aDispatchCommand = ".uno:FormatMajorGrid"; break; case OBJECTTYPE_SUBGRID: - aDispatchCommand = C2U(".uno:FormatMinorGrid"); + aDispatchCommand = ".uno:FormatMinorGrid"; break; case OBJECTTYPE_DATA_LABELS: - aDispatchCommand = C2U(".uno:FormatDataLabels"); + aDispatchCommand = ".uno:FormatDataLabels"; break; case OBJECTTYPE_DATA_SERIES: - aDispatchCommand = C2U(".uno:FormatDataSeries"); + aDispatchCommand = ".uno:FormatDataSeries"; break; case OBJECTTYPE_DATA_LABEL: - aDispatchCommand = C2U(".uno:FormatDataLabel"); + aDispatchCommand = ".uno:FormatDataLabel"; break; case OBJECTTYPE_DATA_POINT: - aDispatchCommand = C2U(".uno:FormatDataPoint"); + aDispatchCommand = ".uno:FormatDataPoint"; break; case OBJECTTYPE_DATA_AVERAGE_LINE: - aDispatchCommand = C2U(".uno:FormatMeanValue"); + aDispatchCommand = ".uno:FormatMeanValue"; break; case OBJECTTYPE_DATA_ERRORS_X: - aDispatchCommand = C2U(".uno:FormatXErrorBars"); + aDispatchCommand = ".uno:FormatXErrorBars"; break; case OBJECTTYPE_DATA_ERRORS_Y: - aDispatchCommand = C2U(".uno:FormatYErrorBars"); + aDispatchCommand = ".uno:FormatYErrorBars"; break; case OBJECTTYPE_DATA_ERRORS_Z: - aDispatchCommand = C2U(".uno:FormatZErrorBars"); + aDispatchCommand = ".uno:FormatZErrorBars"; break; case OBJECTTYPE_DATA_CURVE: - aDispatchCommand = C2U(".uno:FormatTrendline"); + aDispatchCommand = ".uno:FormatTrendline"; break; case OBJECTTYPE_DATA_CURVE_EQUATION: - aDispatchCommand = C2U(".uno:FormatTrendlineEquation"); + aDispatchCommand = ".uno:FormatTrendlineEquation"; break; case OBJECTTYPE_DATA_STOCK_RANGE: - aDispatchCommand = C2U(".uno:FormatSelection"); + aDispatchCommand = ".uno:FormatSelection"; break; case OBJECTTYPE_DATA_STOCK_LOSS: - aDispatchCommand = C2U(".uno:FormatStockLoss"); + aDispatchCommand = ".uno:FormatStockLoss"; break; case OBJECTTYPE_DATA_STOCK_GAIN: - aDispatchCommand = C2U(".uno:FormatStockGain"); + aDispatchCommand = ".uno:FormatStockGain"; break; default: //OBJECTTYPE_UNKNOWN break; @@ -263,15 +263,15 @@ const short HITPIX=2; //hit-tolerance in pixel if( xProp.is() ) { uno::Sequence< beans::PropertyValue > aZoomFactors(4); - aZoomFactors[0].Name = C2U("ScaleXNumerator"); + aZoomFactors[0].Name = "ScaleXNumerator"; aZoomFactors[0].Value = uno::makeAny( nScaleXNumerator ); - aZoomFactors[1].Name = C2U("ScaleXDenominator"); + aZoomFactors[1].Name = "ScaleXDenominator"; aZoomFactors[1].Value = uno::makeAny( nScaleXDenominator ); - aZoomFactors[2].Name = C2U("ScaleYNumerator"); + aZoomFactors[2].Name = "ScaleYNumerator"; aZoomFactors[2].Value = uno::makeAny( nScaleYNumerator ); - aZoomFactors[3].Name = C2U("ScaleYDenominator"); + aZoomFactors[3].Name = "ScaleYDenominator"; aZoomFactors[3].Value = uno::makeAny( nScaleYDenominator ); - xProp->setPropertyValue( C2U("ZoomFactors"), uno::makeAny( aZoomFactors )); + xProp->setPropertyValue( "ZoomFactors", uno::makeAny( aZoomFactors )); } //a correct work area is at least necessary for correct values in the position and size dialog and for dragging area @@ -517,7 +517,7 @@ void ChartController::execute_Paint( const Rectangle& rRect ) aResolution.Height = m_pChartWindow->GetSizePixel().Height(); } } - xProp->setPropertyValue( C2U("Resolution"), uno::makeAny( aResolution )); + xProp->setPropertyValue( "Resolution", uno::makeAny( aResolution )); } // @@ -1034,7 +1034,7 @@ void ChartController::execute_Command( const CommandEvent& rCEvt ) // todo: the context menu should be specified by an xml file in uiconfig uno::Reference< awt::XPopupMenu > xPopupMenu( m_xCC->getServiceManager()->createInstanceWithContext( - C2U("com.sun.star.awt.PopupMenu"), m_xCC ), uno::UNO_QUERY ); + "com.sun.star.awt.PopupMenu", m_xCC ), uno::UNO_QUERY ); uno::Reference< awt::XMenuExtended > xMenuEx( xPopupMenu, uno::UNO_QUERY ); if( xPopupMenu.is() && xMenuEx.is()) { @@ -1073,7 +1073,7 @@ void ChartController::execute_Command( const CommandEvent& rCEvt ) if( xSeriesProperties.is() ) { uno::Sequence< sal_Int32 > aAttributedDataPointIndexList; - if( xSeriesProperties->getPropertyValue( C2U( "AttributedDataPoints" ) ) >>= aAttributedDataPointIndexList ) + if( xSeriesProperties->getPropertyValue( "AttributedDataPoints" ) >>= aAttributedDataPointIndexList ) { if( aAttributedDataPointIndexList.hasElements() ) { @@ -1095,17 +1095,17 @@ void ChartController::execute_Command( const CommandEvent& rCEvt ) if( bIsPoint ) { if( bHasDataLabelAtPoint ) - lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatDataLabel") ); + lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:FormatDataLabel" ); if( !bHasDataLabelAtPoint ) - lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertDataLabel") ); + lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:InsertDataLabel" ); else - lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DeleteDataLabel") ); + lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:DeleteDataLabel" ); if( bSelectedPointIsFormatted ) - lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:ResetDataPoint")); + lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:ResetDataPoint" ); xPopupMenu->insertSeparator( -1 ); - lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatDataSeries") ); + lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:FormatDataSeries" ); } Reference< chart2::XChartType > xChartType( DiagramHelper::getChartTypeOfSeries( xDiagram, xSeries ) ); @@ -1117,12 +1117,12 @@ void ChartController::execute_Command( const CommandEvent& rCEvt ) if( xChartTypeProp.is() ) { bool bJapaneseStyle = false; - xChartTypeProp->getPropertyValue( C2U( "Japanese" ) ) >>= bJapaneseStyle; + xChartTypeProp->getPropertyValue( "Japanese" ) >>= bJapaneseStyle; if( bJapaneseStyle ) { - lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatStockLoss") ); - lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatStockGain") ); + lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:FormatStockLoss" ); + lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:FormatStockGain" ); } } } @@ -1133,62 +1133,62 @@ void ChartController::execute_Command( const CommandEvent& rCEvt ) } if( bHasDataLabelsAtSeries ) - lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatDataLabels") ); + lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:FormatDataLabels" ); if( xTrendline.is() ) - lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatTrendline") ); + lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:FormatTrendline" ); if( bHasEquation ) - lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatTrendlineEquation") ); + lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:FormatTrendlineEquation" ); if( xMeanValue.is() ) - lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatMeanValue") ); + lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:FormatMeanValue" ); if( bHasXErrorBars ) - lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatXErrorBars") ); + lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:FormatXErrorBars" ); if( bHasYErrorBars ) - lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatYErrorBars") ); + lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:FormatYErrorBars" ); xPopupMenu->insertSeparator( -1 ); if( !bHasDataLabelsAtSeries ) - lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertDataLabels") ); + lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:InsertDataLabels" ); if( !xTrendline.is() ) - lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertTrendline") ); + lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:InsertTrendline" ); else if( !bHasEquation ) - lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertTrendlineEquation") ); + lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:InsertTrendlineEquation" ); if( !xMeanValue.is() ) - lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertMeanValue") ); + lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:InsertMeanValue" ); if( !bHasXErrorBars ) - lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertXErrorBars")); + lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:InsertXErrorBars" ); if( !bHasYErrorBars ) - lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertYErrorBars") ); + lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:InsertYErrorBars" ); if( bHasDataLabelsAtSeries || ( bHasDataLabelsAtPoints && bHasFormattedDataPointsOtherThanSelected ) ) - lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DeleteDataLabels") ); + lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:DeleteDataLabels" ); if( xTrendline.is() ) - lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DeleteTrendline") ); + lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:DeleteTrendline" ); if( bHasEquation ) - lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DeleteTrendlineEquation") ); + lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:DeleteTrendlineEquation" ); if( xMeanValue.is() ) - lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DeleteMeanValue") ); + lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:DeleteMeanValue" ); if( bHasXErrorBars ) - lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DeleteXErrorBars")); + lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:DeleteXErrorBars" ); if( bHasYErrorBars ) - lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DeleteYErrorBars") ); + lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:DeleteYErrorBars" ); if( bHasFormattedDataPointsOtherThanSelected ) - lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:ResetAllDataPoints")); + lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:ResetAllDataPoints" ); xPopupMenu->insertSeparator( -1 ); - lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId, C2U(".uno:ArrangeRow")); + lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId, ".uno:ArrangeRow" ); uno::Reference< awt::XPopupMenu > xArrangePopupMenu( m_xCC->getServiceManager()->createInstanceWithContext( - C2U("com.sun.star.awt.PopupMenu"), m_xCC ), uno::UNO_QUERY ); + "com.sun.star.awt.PopupMenu", m_xCC ), uno::UNO_QUERY ); uno::Reference< awt::XMenuExtended > xArrangeMenuEx( xArrangePopupMenu, uno::UNO_QUERY ); if( xArrangePopupMenu.is() && xArrangeMenuEx.is()) { sal_Int16 nSubId = nUniqueId + 1; - lcl_insertMenuCommand( xArrangePopupMenu, xArrangeMenuEx, nSubId++, C2U(".uno:Forward") ); - lcl_insertMenuCommand( xArrangePopupMenu, xArrangeMenuEx, nSubId, C2U(".uno:Backward") ); + lcl_insertMenuCommand( xArrangePopupMenu, xArrangeMenuEx, nSubId++, ".uno:Forward" ); + lcl_insertMenuCommand( xArrangePopupMenu, xArrangeMenuEx, nSubId, ".uno:Backward" ); xPopupMenu->setPopupMenu( nUniqueId, xArrangePopupMenu ); nUniqueId = nSubId; } @@ -1196,17 +1196,17 @@ void ChartController::execute_Command( const CommandEvent& rCEvt ) } else if( OBJECTTYPE_DATA_CURVE == eObjectType ) { - lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatTrendlineEquation") ); - lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertTrendlineEquation") ); - lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertTrendlineEquationAndR2") ); - lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertR2Value") ); - lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DeleteTrendlineEquation") ); - lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DeleteR2Value") ); + lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:FormatTrendlineEquation" ); + lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:InsertTrendlineEquation" ); + lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:InsertTrendlineEquationAndR2" ); + lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:InsertR2Value" ); + lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:DeleteTrendlineEquation" ); + lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:DeleteR2Value" ); } else if( OBJECTTYPE_DATA_CURVE_EQUATION == eObjectType ) { - lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertR2Value") ); - lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DeleteR2Value") ); + lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:InsertR2Value" ); + lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:DeleteR2Value" ); } //some commands for axes: and grids @@ -1230,38 +1230,38 @@ void ChartController::execute_Command( const CommandEvent& rCEvt ) bHasTitle = !TitleHelper::getCompleteString( xTitled->getTitleObject() ).isEmpty(); if( OBJECTTYPE_AXIS != eObjectType && bIsAxisVisible ) - lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatAxis") ); + lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:FormatAxis" ); if( OBJECTTYPE_GRID != eObjectType && bIsMajorGridVisible && !bIsSecondaryAxis ) - lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatMajorGrid") ); + lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:FormatMajorGrid" ); if( OBJECTTYPE_SUBGRID != eObjectType && bIsMinorGridVisible && !bIsSecondaryAxis ) - lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatMinorGrid") ); + lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:FormatMinorGrid" ); xPopupMenu->insertSeparator( -1 ); if( OBJECTTYPE_AXIS != eObjectType && !bIsAxisVisible ) - lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertAxis") ); + lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:InsertAxis" ); if( OBJECTTYPE_GRID != eObjectType && !bIsMajorGridVisible && !bIsSecondaryAxis ) - lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertMajorGrid") ); + lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:InsertMajorGrid" ); if( OBJECTTYPE_SUBGRID != eObjectType && !bIsMinorGridVisible && !bIsSecondaryAxis ) - lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertMinorGrid") ); + lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:InsertMinorGrid" ); if( !bHasTitle ) - lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertAxisTitle") ); + lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:InsertAxisTitle" ); if( bIsAxisVisible ) - lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DeleteAxis") ); + lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:DeleteAxis" ); if( bIsMajorGridVisible && !bIsSecondaryAxis ) - lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DeleteMajorGrid") ); + lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:DeleteMajorGrid" ); if( bIsMinorGridVisible && !bIsSecondaryAxis ) - lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DeleteMinorGrid") ); + lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:DeleteMinorGrid" ); } } if( OBJECTTYPE_DATA_STOCK_LOSS == eObjectType ) - lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatStockGain") ); + lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:FormatStockGain" ); else if( OBJECTTYPE_DATA_STOCK_GAIN == eObjectType ) - lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatStockLoss") ); + lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:FormatStockLoss" ); - lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:TransformDialog")); + lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:TransformDialog" ); if( OBJECTTYPE_PAGE == eObjectType || OBJECTTYPE_DIAGRAM == eObjectType || OBJECTTYPE_DIAGRAM_WALL == eObjectType @@ -1271,24 +1271,24 @@ void ChartController::execute_Command( const CommandEvent& rCEvt ) if( OBJECTTYPE_UNKNOWN != eObjectType ) xPopupMenu->insertSeparator( -1 ); bool bHasLegend = LegendHelper::hasLegend( xDiagram ); - lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertTitles") ); + lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:InsertTitles" ); if( !bHasLegend ) - lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertLegend") ); - lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertRemoveAxes") ); + lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:InsertLegend" ); + lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:InsertRemoveAxes" ); if( bHasLegend ) - lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DeleteLegend") ); + lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:DeleteLegend" ); } //----- xPopupMenu->insertSeparator( -1 ); - lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DiagramType")); - lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DataRanges")); - lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DiagramData")); - lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:View3D")); + lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:DiagramType" ); + lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:DataRanges" ); + lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:DiagramData" ); + lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:View3D" ); xPopupMenu->insertSeparator( -1 ); - lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:Cut")); - lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:Copy")); - lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:Paste")); + lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:Cut" ); + lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:Copy" ); + lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:Paste" ); ::svt::ContextMenuHelper aContextMenuHelper( m_xFrame ); Point aPos( rCEvt.GetMousePosPixel() ); @@ -1553,8 +1553,8 @@ bool ChartController::execute_KeyInput( const KeyEvent& rKEvt ) uno::Sequence< beans::PropertyValue > aArgs; xDispatchHelper->executeDispatch( uno::Reference< frame::XDispatchProvider >( m_xFrame, uno::UNO_QUERY ), - C2U(".uno:TerminateInplaceActivation"), - C2U("_parent"), + ".uno:TerminateInplaceActivation", + "_parent", frame::FrameSearchFlag::PARENT, aArgs ); bReturn = true; @@ -1764,8 +1764,8 @@ bool ChartController::impl_moveOrResizeObject( chart2::RelativePosition aRelPos; chart2::RelativeSize aRelSize; - bool bDeterminePos = !(xObjProp->getPropertyValue( C2U("RelativePosition")) >>= aRelPos); - bool bDetermineSize = !bNeedResize || !(xObjProp->getPropertyValue( C2U("RelativeSize")) >>= aRelSize); + bool bDeterminePos = !(xObjProp->getPropertyValue( "RelativePosition") >>= aRelPos); + bool bDetermineSize = !bNeedResize || !(xObjProp->getPropertyValue( "RelativeSize") >>= aRelSize); if( ( bDeterminePos || bDetermineSize ) && ( aRefSize.Width > 0 && aRefSize.Height > 0 ) ) @@ -1819,9 +1819,9 @@ bool ChartController::impl_moveOrResizeObject( { ControllerLockGuard aCLGuard( xChartModel ); if( bNeedShift ) - xObjProp->setPropertyValue( C2U("RelativePosition"), uno::makeAny( aRelPos )); + xObjProp->setPropertyValue( "RelativePosition", uno::makeAny( aRelPos )); if( bNeedResize || (eObjectType == OBJECTTYPE_DIAGRAM) )//Also set an explicat size at the diagram when an explicit position is set - xObjProp->setPropertyValue( C2U("RelativeSize"), uno::makeAny( aRelSize )); + xObjProp->setPropertyValue( "RelativeSize", uno::makeAny( aRelSize )); } aUndoGuard.commit(); } @@ -1845,7 +1845,7 @@ bool ChartController::impl_DragDataPoint( const ::rtl::OUString & rCID, double f uno::Reference< beans::XPropertySet > xPointProp( xSeries->getDataPointByIndex( nDataPointIndex )); double fOffset = 0.0; if( xPointProp.is() && - (xPointProp->getPropertyValue( C2U("Offset" )) >>= fOffset ) && + (xPointProp->getPropertyValue( "Offset" ) >>= fOffset ) && (( fAdditionalOffset > 0.0 && fOffset < 1.0 ) || (fOffset > 0.0)) ) { fOffset += fAdditionalOffset; @@ -1853,7 +1853,7 @@ bool ChartController::impl_DragDataPoint( const ::rtl::OUString & rCID, double f fOffset = 1.0; else if( fOffset < 0.0 ) fOffset = 0.0; - xPointProp->setPropertyValue( C2U("Offset"), uno::makeAny( fOffset )); + xPointProp->setPropertyValue( "Offset", uno::makeAny( fOffset )); bResult = true; } } diff --git a/chart2/source/controller/main/ChartFrameloader.cxx b/chart2/source/controller/main/ChartFrameloader.cxx index f2cf139d487c..5ca460b0be5f 100644 --- a/chart2/source/controller/main/ChartFrameloader.cxx +++ b/chart2/source/controller/main/ChartFrameloader.cxx @@ -167,7 +167,7 @@ APPHELPER_XSERVICEINFO_IMPL(ChartFrameLoader,CHART_FRAMELOADER_SERVICE_IMPLEMENT xLoadable->load( aCompleteMediaDescriptor ); //resize standalone files to get correct size: - if( xComponentWindow.is() && aMDHelper.ISSET_FilterName && aMDHelper.FilterName.equals( C2U("StarChart 5.0")) ) + if( xComponentWindow.is() && aMDHelper.ISSET_FilterName && aMDHelper.FilterName.equals( "StarChart 5.0") ) { awt::Rectangle aRect( xComponentWindow->getPosSize() ); sal_Int16 nFlags=0; diff --git a/chart2/source/controller/main/CommandDispatchContainer.cxx b/chart2/source/controller/main/CommandDispatchContainer.cxx index 2c17bc5cdaef..2c02b0261291 100644 --- a/chart2/source/controller/main/CommandDispatchContainer.cxx +++ b/chart2/source/controller/main/CommandDispatchContainer.cxx @@ -49,9 +49,9 @@ CommandDispatchContainer::CommandDispatchContainer( { m_aContainerDocumentCommands = ::comphelper::MakeSet< OUString > - ( C2U("AddDirect")) ( C2U("NewDoc")) ( C2U("Open")) - ( C2U("Save")) ( C2U("SaveAs")) ( C2U("SendMail")) - ( C2U("EditDoc")) ( C2U("ExportDirectToPDF")) ( C2U("PrintDefault")) + ("AddDirect") ("NewDoc") ("Open") + ("Save") ("SaveAs") ("SendMail") + ("EditDoc") ("ExportDirectToPDF") ("PrintDefault") ; } @@ -93,8 +93,8 @@ Reference< frame::XDispatch > CommandDispatchContainer::getDispatchForURL( CommandDispatch * pDispatch = new UndoCommandDispatch( m_xContext, xModel ); xResult.set( pDispatch ); pDispatch->initialize(); - m_aCachedDispatches[ C2U(".uno:Undo") ].set( xResult ); - m_aCachedDispatches[ C2U(".uno:Redo") ].set( xResult ); + m_aCachedDispatches[ ".uno:Undo" ].set( xResult ); + m_aCachedDispatches[ ".uno:Redo" ].set( xResult ); m_aToBeDisposedDispatches.push_back( xResult ); } else if( xModel.is() && ( rURL.Path == "Context" || rURL.Path == "ModifiedStatus" ) ) @@ -103,8 +103,8 @@ Reference< frame::XDispatch > CommandDispatchContainer::getDispatchForURL( CommandDispatch * pDispatch = new StatusBarCommandDispatch( m_xContext, xModel, xSelSupp ); xResult.set( pDispatch ); pDispatch->initialize(); - m_aCachedDispatches[ C2U(".uno:Context") ].set( xResult ); - m_aCachedDispatches[ C2U(".uno:ModifiedStatus") ].set( xResult ); + m_aCachedDispatches[ ".uno:Context" ].set( xResult ); + m_aCachedDispatches[ ".uno:ModifiedStatus" ].set( xResult ); m_aToBeDisposedDispatches.push_back( xResult ); } else if( xModel.is() && @@ -177,7 +177,7 @@ Reference< frame::XDispatch > CommandDispatchContainer::getContainerDispatchForU { Reference< frame::XDispatchProvider > xDispProv( xFrame->getCreator(), uno::UNO_QUERY ); if( xDispProv.is()) - xResult.set( xDispProv->queryDispatch( rURL, C2U("_self"), 0 )); + xResult.set( xDispProv->queryDispatch( rURL, "_self", 0 )); } } return xResult; diff --git a/chart2/source/controller/main/ConfigurationAccess.cxx b/chart2/source/controller/main/ConfigurationAccess.cxx index 995da901b41f..621e918a8e97 100644 --- a/chart2/source/controller/main/ConfigurationAccess.cxx +++ b/chart2/source/controller/main/ConfigurationAccess.cxx @@ -61,7 +61,7 @@ public: }; CalcConfigItem::CalcConfigItem() - : ConfigItem( ::rtl::OUString( C2U( "Office.Calc/Layout" ))) + : ConfigItem( ::rtl::OUString( "Office.Calc/Layout" )) { } @@ -78,9 +78,9 @@ FieldUnit CalcConfigItem::getFieldUnit() uno::Sequence< ::rtl::OUString > aNames( 1 ); if( lcl_IsMetric() ) - aNames[ 0 ] = ::rtl::OUString( C2U( "Other/MeasureUnit/Metric" )); + aNames[ 0 ] = ::rtl::OUString( "Other/MeasureUnit/Metric" ); else - aNames[ 0 ] = ::rtl::OUString( C2U( "Other/MeasureUnit/NonMetric" )); + aNames[ 0 ] = ::rtl::OUString( "Other/MeasureUnit/NonMetric" ); uno::Sequence< uno::Any > aResult( GetProperties( aNames )); sal_Int32 nValue = 0; diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx b/chart2/source/controller/main/ControllerCommandDispatch.cxx index 14a74c3a0d59..bcde205f12e4 100644 --- a/chart2/source/controller/main/ControllerCommandDispatch.cxx +++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx @@ -63,9 +63,9 @@ bool lcl_isStatusBarVisible( const Reference< frame::XController > & xController if( xPropSet.is() ) { uno::Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager; - xPropSet->getPropertyValue( C2U( "LayoutManager" ) ) >>= xLayoutManager; + xPropSet->getPropertyValue( "LayoutManager" ) >>= xLayoutManager; if ( xLayoutManager.is() ) - bIsStatusBarVisible = xLayoutManager->isElementVisible( C2U("private:resource/statusbar/statusbar")); + bIsStatusBarVisible = xLayoutManager->isElementVisible( "private:resource/statusbar/statusbar" ); } } return bIsStatusBarVisible; @@ -290,7 +290,7 @@ void ControllerState::update( uno::Reference< beans::XPropertySet > xEqProp( ObjectIdentifier::getObjectPropertySet( aSelObjCID, xModel ), uno::UNO_QUERY ); if( xEqProp.is()) - xEqProp->getPropertyValue( C2U("ShowCorrelationCoefficient") ) >>= bHasR2Value; + xEqProp->getPropertyValue( "ShowCorrelationCoefficient" ) >>= bHasR2Value; } catch(const uno::RuntimeException& e) { @@ -540,7 +540,7 @@ void ControllerCommandDispatch::updateCommandAvailability() { try { - xProps->getPropertyValue( C2U( "DisableDataTableDialog" ) ) >>= bDisableDataTableDialog; + xProps->getPropertyValue( "DisableDataTableDialog" ) >>= bDisableDataTableDialog; } catch( const uno::Exception& e ) { @@ -550,146 +550,146 @@ void ControllerCommandDispatch::updateCommandAvailability() } // edit commands - m_aCommandAvailability[ C2U(".uno:Cut")] = bIsWritable && bControllerStateIsValid && m_apControllerState->bIsDeleteableObjectSelected; - m_aCommandAvailability[ C2U(".uno:Copy")] = bControllerStateIsValid && m_apControllerState->bHasSelectedObject; - m_aCommandAvailability[ C2U(".uno:Paste")] = bIsWritable && bHasSuitableClipboardContent; + m_aCommandAvailability[ ".uno:Cut" ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bIsDeleteableObjectSelected; + m_aCommandAvailability[ ".uno:Copy" ] = bControllerStateIsValid && m_apControllerState->bHasSelectedObject; + m_aCommandAvailability[ ".uno:Paste" ] = bIsWritable && bHasSuitableClipboardContent; // toolbar commands - m_aCommandAvailability[ C2U(".uno:ToggleGridHorizontal")] = bIsWritable; - m_aCommandArguments[ C2U(".uno:ToggleGridHorizontal")] = uno::makeAny( m_apModelState->bHasMainYGrid ); - - m_aCommandAvailability[ C2U(".uno:ToggleLegend")] = bIsWritable; - m_aCommandArguments[ C2U(".uno:ToggleLegend")] = uno::makeAny( m_apModelState->bHasLegend ); - - m_aCommandAvailability[ C2U(".uno:NewArrangement")] = bIsWritable; - m_aCommandAvailability[ C2U(".uno:Update")] = bIsWritable; - m_aCommandAvailability[ C2U(".uno:DefaultColors")] = bIsWritable; - m_aCommandAvailability[ C2U(".uno:BarWidth")] = bIsWritable; - m_aCommandAvailability[ C2U(".uno:NumberOfLines")] = bIsWritable; - m_aCommandAvailability[ C2U(".uno:ArrangeRow")] = + m_aCommandAvailability[ ".uno:ToggleGridHorizontal" ] = bIsWritable; + m_aCommandArguments[ ".uno:ToggleGridHorizontal" ] = uno::makeAny( m_apModelState->bHasMainYGrid ); + + m_aCommandAvailability[ ".uno:ToggleLegend" ] = bIsWritable; + m_aCommandArguments[ ".uno:ToggleLegend" ] = uno::makeAny( m_apModelState->bHasLegend ); + + m_aCommandAvailability[ ".uno:NewArrangement" ] = bIsWritable; + m_aCommandAvailability[ ".uno:Update" ] = bIsWritable; + m_aCommandAvailability[ ".uno:DefaultColors" ] = bIsWritable; + m_aCommandAvailability[ ".uno:BarWidth" ] = bIsWritable; + m_aCommandAvailability[ ".uno:NumberOfLines" ] = bIsWritable; + m_aCommandAvailability[ ".uno:ArrangeRow" ] = bShapeContext || ( bIsWritable && bControllerStateIsValid && ( m_apControllerState->bMayMoveSeriesForward || m_apControllerState->bMayMoveSeriesBackward ) ); // insert objects - m_aCommandAvailability[ C2U(".uno:InsertTitles")] = m_aCommandAvailability[ C2U(".uno:InsertMenuTitles")] = bIsWritable; - m_aCommandAvailability[ C2U(".uno:InsertLegend")] = m_aCommandAvailability[ C2U(".uno:InsertMenuLegend")] = bIsWritable; - m_aCommandAvailability[ C2U(".uno:DeleteLegend")] = bIsWritable; - m_aCommandAvailability[ C2U(".uno:InsertMenuDataLabels")] = bIsWritable; - m_aCommandAvailability[ C2U(".uno:InsertRemoveAxes")] = m_aCommandAvailability[ C2U(".uno:InsertMenuAxes")] = bIsWritable && m_apModelState->bSupportsAxes; - m_aCommandAvailability[ C2U(".uno:InsertMenuGrids")] = bIsWritable && m_apModelState->bSupportsAxes; - m_aCommandAvailability[ C2U(".uno:InsertMenuTrendlines")] = bIsWritable && m_apModelState->bSupportsStatistics; - m_aCommandAvailability[ C2U(".uno:InsertMenuMeanValues")] = bIsWritable && m_apModelState->bSupportsStatistics; - m_aCommandAvailability[ C2U(".uno:InsertMenuXErrorBars")] = bIsWritable && m_apModelState->bSupportsStatistics; - m_aCommandAvailability[ C2U(".uno:InsertMenuYErrorBars")] = bIsWritable && m_apModelState->bSupportsStatistics; - m_aCommandAvailability[ C2U(".uno:InsertSymbol")] = bIsWritable && m_apControllerState->bIsTextObject; + m_aCommandAvailability[ ".uno:InsertTitles" ] = m_aCommandAvailability[ ".uno:InsertMenuTitles" ] = bIsWritable; + m_aCommandAvailability[ ".uno:InsertLegend" ] = m_aCommandAvailability[ ".uno:InsertMenuLegend" ] = bIsWritable; + m_aCommandAvailability[ ".uno:DeleteLegend" ] = bIsWritable; + m_aCommandAvailability[ ".uno:InsertMenuDataLabels" ] = bIsWritable; + m_aCommandAvailability[ ".uno:InsertRemoveAxes" ] = m_aCommandAvailability[ ".uno:InsertMenuAxes" ] = bIsWritable && m_apModelState->bSupportsAxes; + m_aCommandAvailability[ ".uno:InsertMenuGrids" ] = bIsWritable && m_apModelState->bSupportsAxes; + m_aCommandAvailability[ ".uno:InsertMenuTrendlines" ] = bIsWritable && m_apModelState->bSupportsStatistics; + m_aCommandAvailability[ ".uno:InsertMenuMeanValues" ] = bIsWritable && m_apModelState->bSupportsStatistics; + m_aCommandAvailability[ ".uno:InsertMenuXErrorBars" ] = bIsWritable && m_apModelState->bSupportsStatistics; + m_aCommandAvailability[ ".uno:InsertMenuYErrorBars" ] = bIsWritable && m_apModelState->bSupportsStatistics; + m_aCommandAvailability[ ".uno:InsertSymbol" ] = bIsWritable && m_apControllerState->bIsTextObject; // format objects bool bFormatObjectAvailable = bIsWritable && bControllerStateIsValid && m_apControllerState->bIsFormateableObjectSelected; - m_aCommandAvailability[ C2U(".uno:FormatSelection")] = bFormatObjectAvailable; - m_aCommandAvailability[ C2U(".uno:FormatAxis")] = bFormatObjectAvailable; - m_aCommandAvailability[ C2U(".uno:FormatTitle")] = bFormatObjectAvailable; - m_aCommandAvailability[ C2U(".uno:FormatDataSeries")] = bFormatObjectAvailable; - m_aCommandAvailability[ C2U(".uno:FormatDataPoint")] = bFormatObjectAvailable; - m_aCommandAvailability[ C2U(".uno:FormatDataLabels")] = bFormatObjectAvailable; - m_aCommandAvailability[ C2U(".uno:FormatDataLabel")] = bFormatObjectAvailable; - m_aCommandAvailability[ C2U(".uno:FormatXErrorBars")] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayFormatXErrorBars; - m_aCommandAvailability[ C2U(".uno:FormatYErrorBars")] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayFormatYErrorBars; - m_aCommandAvailability[ C2U(".uno:FormatMeanValue")] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayFormatMeanValue; - m_aCommandAvailability[ C2U(".uno:FormatTrendline")] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayFormatTrendline; - m_aCommandAvailability[ C2U(".uno:FormatTrendlineEquation")] = bFormatObjectAvailable && bControllerStateIsValid && m_apControllerState->bMayFormatTrendlineEquation; - m_aCommandAvailability[ C2U(".uno:FormatStockLoss")] = bFormatObjectAvailable; - m_aCommandAvailability[ C2U(".uno:FormatStockGain")] = bFormatObjectAvailable; - - m_aCommandAvailability[ C2U(".uno:DiagramType")] = bIsWritable; - m_aCommandAvailability[ C2U(".uno:Legend")] = bIsWritable && m_apModelState->bHasLegend; - m_aCommandAvailability[ C2U(".uno:DiagramWall")] = bIsWritable && bModelStateIsValid && m_apModelState->bHasWall; - m_aCommandAvailability[ C2U(".uno:DiagramArea")] = bIsWritable; - - m_aCommandAvailability[ C2U(".uno:TransformDialog")] = bIsWritable && bControllerStateIsValid && m_apControllerState->bHasSelectedObject && m_apControllerState->bIsPositionableObject; + m_aCommandAvailability[ ".uno:FormatSelection" ] = bFormatObjectAvailable; + m_aCommandAvailability[ ".uno:FormatAxis" ] = bFormatObjectAvailable; + m_aCommandAvailability[ ".uno:FormatTitle" ] = bFormatObjectAvailable; + m_aCommandAvailability[ ".uno:FormatDataSeries" ] = bFormatObjectAvailable; + m_aCommandAvailability[ ".uno:FormatDataPoint" ] = bFormatObjectAvailable; + m_aCommandAvailability[ ".uno:FormatDataLabels" ] = bFormatObjectAvailable; + m_aCommandAvailability[ ".uno:FormatDataLabel" ] = bFormatObjectAvailable; + m_aCommandAvailability[ ".uno:FormatXErrorBars" ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayFormatXErrorBars; + m_aCommandAvailability[ ".uno:FormatYErrorBars" ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayFormatYErrorBars; + m_aCommandAvailability[ ".uno:FormatMeanValue" ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayFormatMeanValue; + m_aCommandAvailability[ ".uno:FormatTrendline" ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayFormatTrendline; + m_aCommandAvailability[ ".uno:FormatTrendlineEquation" ] = bFormatObjectAvailable && bControllerStateIsValid && m_apControllerState->bMayFormatTrendlineEquation; + m_aCommandAvailability[ ".uno:FormatStockLoss" ] = bFormatObjectAvailable; + m_aCommandAvailability[ ".uno:FormatStockGain" ] = bFormatObjectAvailable; + + m_aCommandAvailability[ ".uno:DiagramType" ] = bIsWritable; + m_aCommandAvailability[ ".uno:Legend" ] = bIsWritable && m_apModelState->bHasLegend; + m_aCommandAvailability[ ".uno:DiagramWall" ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasWall; + m_aCommandAvailability[ ".uno:DiagramArea" ] = bIsWritable; + + m_aCommandAvailability[ ".uno:TransformDialog" ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bHasSelectedObject && m_apControllerState->bIsPositionableObject; // 3d commands - m_aCommandAvailability[ C2U(".uno:View3D")] = bIsWritable && bModelStateIsValid && m_apModelState->bIsThreeD; - m_aCommandAvailability[ C2U(".uno:DiagramFloor")] = bIsWritable && bModelStateIsValid && m_apModelState->bHasFloor; + m_aCommandAvailability[ ".uno:View3D" ] = bIsWritable && bModelStateIsValid && m_apModelState->bIsThreeD; + m_aCommandAvailability[ ".uno:DiagramFloor" ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasFloor; //some mor format commands with different ui text - m_aCommandAvailability[ C2U(".uno:FormatWall")] = m_aCommandAvailability[ C2U(".uno:DiagramWall")]; - m_aCommandAvailability[ C2U(".uno:FormatFloor")] = m_aCommandAvailability[ C2U(".uno:DiagramFloor")]; - m_aCommandAvailability[ C2U(".uno:FormatChartArea")] = m_aCommandAvailability[ C2U(".uno:DiagramArea")]; - m_aCommandAvailability[ C2U(".uno:FormatLegend")] = m_aCommandAvailability[ C2U(".uno:Legend")]; + m_aCommandAvailability[ ".uno:FormatWall" ] = m_aCommandAvailability[ ".uno:DiagramWall" ]; + m_aCommandAvailability[ ".uno:FormatFloor" ] = m_aCommandAvailability[ ".uno:DiagramFloor" ]; + m_aCommandAvailability[ ".uno:FormatChartArea" ] = m_aCommandAvailability[ ".uno:DiagramArea" ]; + m_aCommandAvailability[ ".uno:FormatLegend" ] = m_aCommandAvailability[ ".uno:Legend" ]; // depending on own data - m_aCommandAvailability[ C2U(".uno:DataRanges")] = bIsWritable && bModelStateIsValid && (! m_apModelState->bHasOwnData); - m_aCommandAvailability[ C2U(".uno:DiagramData")] = bIsWritable && bModelStateIsValid && m_apModelState->bHasOwnData && !bDisableDataTableDialog; + m_aCommandAvailability[ ".uno:DataRanges" ] = bIsWritable && bModelStateIsValid && (! m_apModelState->bHasOwnData); + m_aCommandAvailability[ ".uno:DiagramData" ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasOwnData && !bDisableDataTableDialog; // titles - m_aCommandAvailability[ C2U(".uno:MainTitle")] = bIsWritable && bModelStateIsValid && m_apModelState->bHasMainTitle; - m_aCommandAvailability[ C2U(".uno:SubTitle")] = bIsWritable && bModelStateIsValid && m_apModelState->bHasSubTitle; - m_aCommandAvailability[ C2U(".uno:XTitle")] = bIsWritable && bModelStateIsValid && m_apModelState->bHasXAxisTitle; - m_aCommandAvailability[ C2U(".uno:YTitle")] = bIsWritable && bModelStateIsValid && m_apModelState->bHasYAxisTitle; - m_aCommandAvailability[ C2U(".uno:ZTitle")] = bIsWritable && bModelStateIsValid && m_apModelState->bHasZAxisTitle; - m_aCommandAvailability[ C2U(".uno:SecondaryXTitle")] = bIsWritable && bModelStateIsValid && m_apModelState->bHasSecondaryXAxisTitle; - m_aCommandAvailability[ C2U(".uno:SecondaryYTitle")] = bIsWritable && bModelStateIsValid && m_apModelState->bHasSecondaryYAxisTitle; - m_aCommandAvailability[ C2U(".uno:AllTitles")] = bIsWritable && bModelStateIsValid && m_apModelState->HasAnyTitle(); + m_aCommandAvailability[ ".uno:MainTitle" ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasMainTitle; + m_aCommandAvailability[ ".uno:SubTitle" ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasSubTitle; + m_aCommandAvailability[ ".uno:XTitle" ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasXAxisTitle; + m_aCommandAvailability[ ".uno:YTitle" ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasYAxisTitle; + m_aCommandAvailability[ ".uno:ZTitle" ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasZAxisTitle; + m_aCommandAvailability[ ".uno:SecondaryXTitle" ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasSecondaryXAxisTitle; + m_aCommandAvailability[ ".uno:SecondaryYTitle" ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasSecondaryYAxisTitle; + m_aCommandAvailability[ ".uno:AllTitles" ] = bIsWritable && bModelStateIsValid && m_apModelState->HasAnyTitle(); // text - m_aCommandAvailability[ C2U(".uno:ScaleText")] = bIsWritable && bModelStateIsValid ; - m_aCommandArguments[ C2U(".uno:ScaleText")] = uno::makeAny( m_apModelState->bHasAutoScaledText ); + m_aCommandAvailability[ ".uno:ScaleText" ] = bIsWritable && bModelStateIsValid ; + m_aCommandArguments[ ".uno:ScaleText" ] = uno::makeAny( m_apModelState->bHasAutoScaledText ); // axes - m_aCommandAvailability[ C2U(".uno:DiagramAxisX")] = bIsWritable && bModelStateIsValid && m_apModelState->bHasXAxis; - m_aCommandAvailability[ C2U(".uno:DiagramAxisY")] = bIsWritable && bModelStateIsValid && m_apModelState->bHasYAxis; - m_aCommandAvailability[ C2U(".uno:DiagramAxisZ")] = bIsWritable && bModelStateIsValid && m_apModelState->bHasZAxis; - m_aCommandAvailability[ C2U(".uno:DiagramAxisA")] = bIsWritable && bModelStateIsValid && m_apModelState->bHasAAxis; - m_aCommandAvailability[ C2U(".uno:DiagramAxisB")] = bIsWritable && bModelStateIsValid && m_apModelState->bHasBAxis; - m_aCommandAvailability[ C2U(".uno:DiagramAxisAll")] = bIsWritable && bModelStateIsValid && m_apModelState->HasAnyAxis(); + m_aCommandAvailability[ ".uno:DiagramAxisX" ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasXAxis; + m_aCommandAvailability[ ".uno:DiagramAxisY" ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasYAxis; + m_aCommandAvailability[ ".uno:DiagramAxisZ" ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasZAxis; + m_aCommandAvailability[ ".uno:DiagramAxisA" ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasAAxis; + m_aCommandAvailability[ ".uno:DiagramAxisB" ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasBAxis; + m_aCommandAvailability[ ".uno:DiagramAxisAll" ] = bIsWritable && bModelStateIsValid && m_apModelState->HasAnyAxis(); // grids // note: x and y are swapped in the commands! - m_aCommandAvailability[ C2U(".uno:DiagramGridYMain")] = bIsWritable && bModelStateIsValid && m_apModelState->bHasMainXGrid; - m_aCommandAvailability[ C2U(".uno:DiagramGridXMain")] = bIsWritable && bModelStateIsValid && m_apModelState->bHasMainYGrid; - m_aCommandAvailability[ C2U(".uno:DiagramGridZMain")] = bIsWritable && bModelStateIsValid && m_apModelState->bHasMainZGrid; - m_aCommandAvailability[ C2U(".uno:DiagramGridYHelp")] = bIsWritable && bModelStateIsValid && m_apModelState->bHasHelpXGrid; - m_aCommandAvailability[ C2U(".uno:DiagramGridXHelp")] = bIsWritable && bModelStateIsValid && m_apModelState->bHasHelpYGrid; - m_aCommandAvailability[ C2U(".uno:DiagramGridZHelp")] = bIsWritable && bModelStateIsValid && m_apModelState->bHasHelpZGrid; - m_aCommandAvailability[ C2U(".uno:DiagramGridAll")] = bIsWritable && bModelStateIsValid && m_apModelState->HasAnyGrid(); + m_aCommandAvailability[ ".uno:DiagramGridYMain" ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasMainXGrid; + m_aCommandAvailability[ ".uno:DiagramGridXMain" ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasMainYGrid; + m_aCommandAvailability[ ".uno:DiagramGridZMain" ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasMainZGrid; + m_aCommandAvailability[ ".uno:DiagramGridYHelp" ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasHelpXGrid; + m_aCommandAvailability[ ".uno:DiagramGridXHelp" ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasHelpYGrid; + m_aCommandAvailability[ ".uno:DiagramGridZHelp" ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasHelpZGrid; + m_aCommandAvailability[ ".uno:DiagramGridAll" ] = bIsWritable && bModelStateIsValid && m_apModelState->HasAnyGrid(); // series arrangement - m_aCommandAvailability[ C2U(".uno:Forward")] = ( bShapeContext ? isShapeControllerCommandAvailable( C2U( ".uno:Forward" ) ) : + m_aCommandAvailability[ ".uno:Forward" ] = ( bShapeContext ? isShapeControllerCommandAvailable( ".uno:Forward" ) : ( bIsWritable && bControllerStateIsValid && m_apControllerState->bMayMoveSeriesForward && !bDisableDataTableDialog ) ); - m_aCommandAvailability[ C2U(".uno:Backward")] = ( bShapeContext ? isShapeControllerCommandAvailable( C2U( ".uno:Backward" ) ) : + m_aCommandAvailability[ ".uno:Backward" ] = ( bShapeContext ? isShapeControllerCommandAvailable( ".uno:Backward" ) : ( bIsWritable && bControllerStateIsValid && m_apControllerState->bMayMoveSeriesBackward && !bDisableDataTableDialog ) ); - m_aCommandAvailability[ C2U(".uno:InsertDataLabels")] = bIsWritable; - m_aCommandAvailability[ C2U(".uno:InsertDataLabel")] = bIsWritable; - m_aCommandAvailability[ C2U(".uno:InsertMeanValue")] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayAddMeanValue; - m_aCommandAvailability[ C2U(".uno:InsertTrendline")] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayAddTrendline; - m_aCommandAvailability[ C2U(".uno:InsertTrendlineEquation")] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayAddTrendlineEquation; - m_aCommandAvailability[ C2U(".uno:InsertTrendlineEquationAndR2")] = m_aCommandAvailability[ C2U(".uno:InsertTrendlineEquation")]; - m_aCommandAvailability[ C2U(".uno:InsertR2Value")] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayAddR2Value; - m_aCommandAvailability[ C2U(".uno:DeleteR2Value")] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayDeleteR2Value; - - m_aCommandAvailability[ C2U(".uno:InsertXErrorBars")] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayAddXErrorBars; - m_aCommandAvailability[ C2U(".uno:InsertYErrorBars")] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayAddYErrorBars; - - m_aCommandAvailability[ C2U(".uno:DeleteDataLabels")] = bIsWritable; - m_aCommandAvailability[ C2U(".uno:DeleteDataLabel") ] = bIsWritable; - m_aCommandAvailability[ C2U(".uno:DeleteTrendline") ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayDeleteTrendline; - m_aCommandAvailability[ C2U(".uno:DeleteTrendlineEquation") ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayDeleteTrendlineEquation; - m_aCommandAvailability[ C2U(".uno:DeleteMeanValue") ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayDeleteMeanValue; - m_aCommandAvailability[ C2U(".uno:DeleteXErrorBars")] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayDeleteXErrorBars; - m_aCommandAvailability[ C2U(".uno:DeleteYErrorBars") ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayDeleteYErrorBars; - - m_aCommandAvailability[ C2U(".uno:ResetDataPoint") ] = bIsWritable; - m_aCommandAvailability[ C2U(".uno:ResetAllDataPoints") ] = bIsWritable; - - m_aCommandAvailability[ C2U(".uno:InsertAxis") ] = bIsWritable; - m_aCommandAvailability[ C2U(".uno:DeleteAxis") ] = bIsWritable; - m_aCommandAvailability[ C2U(".uno:InsertAxisTitle") ] = bIsWritable; - m_aCommandAvailability[ C2U(".uno:FormatMajorGrid") ] = bIsWritable; - m_aCommandAvailability[ C2U(".uno:InsertMajorGrid") ] = bIsWritable; - m_aCommandAvailability[ C2U(".uno:DeleteMajorGrid") ] = bIsWritable; - m_aCommandAvailability[ C2U(".uno:FormatMinorGrid") ] = bIsWritable; - m_aCommandAvailability[ C2U(".uno:InsertMinorGrid") ] = bIsWritable; - m_aCommandAvailability[ C2U(".uno:DeleteMinorGrid") ] = bIsWritable; + m_aCommandAvailability[ ".uno:InsertDataLabels" ] = bIsWritable; + m_aCommandAvailability[ ".uno:InsertDataLabel" ] = bIsWritable; + m_aCommandAvailability[ ".uno:InsertMeanValue" ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayAddMeanValue; + m_aCommandAvailability[ ".uno:InsertTrendline" ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayAddTrendline; + m_aCommandAvailability[ ".uno:InsertTrendlineEquation" ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayAddTrendlineEquation; + m_aCommandAvailability[ ".uno:InsertTrendlineEquationAndR2" ] = m_aCommandAvailability[ ".uno:InsertTrendlineEquation" ]; + m_aCommandAvailability[ ".uno:InsertR2Value" ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayAddR2Value; + m_aCommandAvailability[ ".uno:DeleteR2Value" ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayDeleteR2Value; + + m_aCommandAvailability[ ".uno:InsertXErrorBars" ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayAddXErrorBars; + m_aCommandAvailability[ ".uno:InsertYErrorBars" ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayAddYErrorBars; + + m_aCommandAvailability[ ".uno:DeleteDataLabels" ] = bIsWritable; + m_aCommandAvailability[ ".uno:DeleteDataLabel" ] = bIsWritable; + m_aCommandAvailability[ ".uno:DeleteTrendline" ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayDeleteTrendline; + m_aCommandAvailability[ ".uno:DeleteTrendlineEquation" ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayDeleteTrendlineEquation; + m_aCommandAvailability[ ".uno:DeleteMeanValue" ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayDeleteMeanValue; + m_aCommandAvailability[ ".uno:DeleteXErrorBars" ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayDeleteXErrorBars; + m_aCommandAvailability[ ".uno:DeleteYErrorBars" ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayDeleteYErrorBars; + + m_aCommandAvailability[ ".uno:ResetDataPoint" ] = bIsWritable; + m_aCommandAvailability[ ".uno:ResetAllDataPoints" ] = bIsWritable; + + m_aCommandAvailability[ ".uno:InsertAxis" ] = bIsWritable; + m_aCommandAvailability[ ".uno:DeleteAxis" ] = bIsWritable; + m_aCommandAvailability[ ".uno:InsertAxisTitle" ] = bIsWritable; + m_aCommandAvailability[ ".uno:FormatMajorGrid" ] = bIsWritable; + m_aCommandAvailability[ ".uno:InsertMajorGrid" ] = bIsWritable; + m_aCommandAvailability[ ".uno:DeleteMajorGrid" ] = bIsWritable; + m_aCommandAvailability[ ".uno:FormatMinorGrid" ] = bIsWritable; + m_aCommandAvailability[ ".uno:InsertMinorGrid" ] = bIsWritable; + m_aCommandAvailability[ ".uno:DeleteMinorGrid" ] = bIsWritable; } bool ControllerCommandDispatch::commandAvailable( const OUString & rCommand ) @@ -721,7 +721,7 @@ void ControllerCommandDispatch::fireStatusEvent( { uno::Any aArg; aArg <<= m_xController; - fireStatusEventForURL( C2U(".uno:ChartElementSelector"), aArg, true, xSingleListener ); + fireStatusEventForURL( ".uno:ChartElementSelector", aArg, true, xSingleListener ); } if( rURL.isEmpty() ) @@ -736,7 +736,7 @@ void ControllerCommandDispatch::fireStatusEvent( if( rURL.isEmpty() || rURL == ".uno:StatusBarVisible" ) { bool bIsStatusBarVisible( lcl_isStatusBarVisible( m_xController )); - fireStatusEventForURL( C2U(".uno:StatusBarVisible"), uno::makeAny( bIsStatusBarVisible ), true, xSingleListener ); + fireStatusEventForURL( ".uno:StatusBarVisible", uno::makeAny( bIsStatusBarVisible ), true, xSingleListener ); } } diff --git a/chart2/source/controller/main/DragMethod_PieSegment.cxx b/chart2/source/controller/main/DragMethod_PieSegment.cxx index 99ce279e7b3b..27267eaab5a6 100644 --- a/chart2/source/controller/main/DragMethod_PieSegment.cxx +++ b/chart2/source/controller/main/DragMethod_PieSegment.cxx @@ -119,7 +119,7 @@ bool DragMethod_PieSegment::EndSdrDrag(bool /*bCopy*/) Reference< beans::XPropertySet > xPointProperties( ObjectIdentifier::getObjectPropertySet( m_aObjectCID, xChartModel ) ); if( xPointProperties.is() ) - xPointProperties->setPropertyValue( C2U( "Offset" ), uno::makeAny( m_fAdditionalOffset+m_fInitialOffset )); + xPointProperties->setPropertyValue( "Offset", uno::makeAny( m_fAdditionalOffset+m_fInitialOffset )); } } catch( const uno::Exception & ex ) diff --git a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx index 8489ab376cdd..ce8a0e120aaa 100644 --- a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx +++ b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx @@ -88,7 +88,7 @@ DragMethod_RotateDiagram::DragMethod_RotateDiagram( DrawViewWrapper& rDrawViewWr if( ChartTypeHelper::isSupportingRightAngledAxes( DiagramHelper::getChartTypeByIndex( xDiagram, 0 ) ) ) - xDiagramProperties->getPropertyValue(C2U( "RightAngledAxes" )) >>= m_bRightAngledAxes; + xDiagramProperties->getPropertyValue("RightAngledAxes") >>= m_bRightAngledAxes; if(m_bRightAngledAxes) { if( m_eRotationDirection==ROTATIONDIRECTION_Z ) diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx b/chart2/source/controller/main/DrawCommandDispatch.cxx index 116ac6f5f811..1820e80fdc1d 100644 --- a/chart2/source/controller/main/DrawCommandDispatch.cxx +++ b/chart2/source/controller/main/DrawCommandDispatch.cxx @@ -382,7 +382,7 @@ void DrawCommandDispatch::execute( const ::rtl::OUString& rCommand, const Sequen pDrawViewWrapper->SetCreateMode(); } - const ::rtl::OUString sKeyModifier( C2U( "KeyModifier" ) ); + const ::rtl::OUString sKeyModifier( "KeyModifier" ); const beans::PropertyValue* pIter = rArgs.getConstArray(); const beans::PropertyValue* pEnd = pIter + rArgs.getLength(); const beans::PropertyValue* pKeyModifier = ::std::find_if( diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx index 550532442308..55132d7a5ea4 100644 --- a/chart2/source/controller/main/ElementSelector.cxx +++ b/chart2/source/controller/main/ElementSelector.cxx @@ -256,7 +256,7 @@ APPHELPER_XSERVICEINFO_IMPL( ElementSelectorToolbarController, lcl_aServiceName Sequence< ::rtl::OUString > ElementSelectorToolbarController::getSupportedServiceNames_Static() { Sequence< ::rtl::OUString > aServices(1); - aServices[ 0 ] = C2U( "com.sun.star.frame.ToolbarController" ); + aServices[ 0 ] = "com.sun.star.frame.ToolbarController"; return aServices; } // ----------------------------------------------------------------------------- diff --git a/chart2/source/controller/main/ObjectHierarchy.cxx b/chart2/source/controller/main/ObjectHierarchy.cxx index 3a38de79c430..6ed11f9f64fd 100644 --- a/chart2/source/controller/main/ObjectHierarchy.cxx +++ b/chart2/source/controller/main/ObjectHierarchy.cxx @@ -85,8 +85,8 @@ void lcl_getChildOIDs( Reference< beans::XPropertySetInfo > xInfo( xShapeProp->getPropertySetInfo()); OUString aName; if( xInfo.is() && - xInfo->hasPropertyByName( C2U("Name")) && - (xShapeProp->getPropertyValue( C2U("Name")) >>= aName ) && + xInfo->hasPropertyByName( "Name") && + (xShapeProp->getPropertyValue( "Name") >>= aName ) && !aName.isEmpty() && ::chart::ObjectIdentifier::isCID( aName )) { @@ -444,7 +444,7 @@ void ImplObjectHierarchy::createDataSeriesTree( if( DataSeriesHelper::hasDataLabelsAtSeries( xSeries ) ) { rtl::OUString aChildParticle( ObjectIdentifier::getStringForType( OBJECTTYPE_DATA_LABELS ) ); - aChildParticle+=(C2U("=")); + aChildParticle+=("="); aSeriesSubContainer.push_back( ObjectIdentifier( ObjectIdentifier::createClassifiedIdentifierForParticles( aSeriesParticle, aChildParticle ) ) ); } @@ -470,11 +470,11 @@ void ImplObjectHierarchy::createDataSeriesTree( Reference< beans::XPropertySet > xSeriesProp( xSeries, uno::UNO_QUERY ); Reference< beans::XPropertySet > xErrorBarProp; if( xSeriesProp.is() && - (xSeriesProp->getPropertyValue( C2U("ErrorBarY")) >>= xErrorBarProp) && + (xSeriesProp->getPropertyValue( "ErrorBarY") >>= xErrorBarProp) && xErrorBarProp.is()) { sal_Int32 nStyle = ::com::sun::star::chart::ErrorBarStyle::NONE; - if( ( xErrorBarProp->getPropertyValue( C2U("ErrorBarStyle")) >>= nStyle ) && + if( ( xErrorBarProp->getPropertyValue( "ErrorBarStyle") >>= nStyle ) && ( nStyle != ::com::sun::star::chart::ErrorBarStyle::NONE ) ) { aSeriesSubContainer.push_back( @@ -484,11 +484,11 @@ void ImplObjectHierarchy::createDataSeriesTree( } if( xSeriesProp.is() && - (xSeriesProp->getPropertyValue( C2U("ErrorBarX")) >>= xErrorBarProp) && + (xSeriesProp->getPropertyValue( "ErrorBarX") >>= xErrorBarProp) && xErrorBarProp.is()) { sal_Int32 nStyle = ::com::sun::star::chart::ErrorBarStyle::NONE; - if( ( xErrorBarProp->getPropertyValue( C2U("ErrorBarStyle")) >>= nStyle ) && + if( ( xErrorBarProp->getPropertyValue( "ErrorBarStyle") >>= nStyle ) && ( nStyle != ::com::sun::star::chart::ErrorBarStyle::NONE ) ) { aSeriesSubContainer.push_back( @@ -636,7 +636,7 @@ ObjectHierarchy::~ObjectHierarchy() ObjectHierarchy::tOID ObjectHierarchy::getRootNodeOID() { - return ObjectIdentifier( C2U( "ROOT" ) ); + return ObjectIdentifier( "ROOT" ); } bool ObjectHierarchy::isRootNode( const ObjectHierarchy::tOID& rOID ) diff --git a/chart2/source/controller/main/PositionAndSizeHelper.cxx b/chart2/source/controller/main/PositionAndSizeHelper.cxx index 258dd0706cfe..047d55dd5709 100644 --- a/chart2/source/controller/main/PositionAndSizeHelper.cxx +++ b/chart2/source/controller/main/PositionAndSizeHelper.cxx @@ -59,7 +59,7 @@ bool PositionAndSizeHelper::moveObject( ObjectType eObjectType Point aPos = aObjectRect.TopLeft(); aRelativePosition.Primary = (double(aPos.X())+double(aObjectRect.getWidth())/2.0)/double(aPageRect.getWidth()); aRelativePosition.Secondary = (double(aPos.Y())+double(aObjectRect.getHeight())/2.0)/double(aPageRect.getHeight()); - xObjectProp->setPropertyValue( C2U( "RelativePosition" ), uno::makeAny(aRelativePosition) ); + xObjectProp->setPropertyValue( "RelativePosition", uno::makeAny(aRelativePosition) ); } else if( OBJECTTYPE_DATA_CURVE_EQUATION==eObjectType ) { @@ -70,12 +70,12 @@ bool PositionAndSizeHelper::moveObject( ObjectType eObjectType Point aPos = aObjectRect.TopLeft(); aRelativePosition.Primary = double(aPos.X())/double(aPageRect.getWidth()); aRelativePosition.Secondary = double(aPos.Y())/double(aPageRect.getHeight()); - xObjectProp->setPropertyValue( C2U( "RelativePosition" ), uno::makeAny(aRelativePosition) ); + xObjectProp->setPropertyValue( "RelativePosition", uno::makeAny(aRelativePosition) ); } else if(OBJECTTYPE_LEGEND==eObjectType) { - xObjectProp->setPropertyValue( C2U( "AnchorPosition" ), uno::makeAny(LegendPosition(LegendPosition_CUSTOM))); - xObjectProp->setPropertyValue( C2U( "Expansion" ), uno::makeAny(::com::sun::star::chart::ChartLegendExpansion_CUSTOM)); + xObjectProp->setPropertyValue( "AnchorPosition", uno::makeAny(LegendPosition(LegendPosition_CUSTOM))); + xObjectProp->setPropertyValue( "Expansion", uno::makeAny(::com::sun::star::chart::ChartLegendExpansion_CUSTOM)); chart2::RelativePosition aRelativePosition; chart2::RelativeSize aRelativeSize; Point aAnchor = aObjectRect.TopLeft(); @@ -87,7 +87,7 @@ bool PositionAndSizeHelper::moveObject( ObjectType eObjectType static_cast< double >( aAnchor.Y()) / static_cast< double >( aPageRect.getHeight()); - xObjectProp->setPropertyValue( C2U( "RelativePosition" ), uno::makeAny(aRelativePosition) ); + xObjectProp->setPropertyValue( "RelativePosition", uno::makeAny(aRelativePosition) ); aRelativeSize.Primary = static_cast< double >( aObjectRect.getWidth()) / @@ -100,7 +100,7 @@ bool PositionAndSizeHelper::moveObject( ObjectType eObjectType if (aRelativeSize.Secondary > 1.0) aRelativeSize.Secondary = 1.0; - xObjectProp->setPropertyValue( C2U( "RelativeSize" ), uno::makeAny(aRelativeSize) ); + xObjectProp->setPropertyValue( "RelativeSize", uno::makeAny(aRelativeSize) ); } else if(OBJECTTYPE_DIAGRAM==eObjectType || OBJECTTYPE_DIAGRAM_WALL==eObjectType || OBJECTTYPE_DIAGRAM_FLOOR==eObjectType) { @@ -113,7 +113,7 @@ bool PositionAndSizeHelper::moveObject( ObjectType eObjectType Point aPos = aObjectRect.Center(); aRelativePosition.Primary = double(aPos.X())/double(aPageRect.getWidth()); aRelativePosition.Secondary = double(aPos.Y())/double(aPageRect.getHeight()); - xObjectProp->setPropertyValue( C2U( "RelativePosition" ), uno::makeAny(aRelativePosition) ); + xObjectProp->setPropertyValue( "RelativePosition", uno::makeAny(aRelativePosition) ); //set size: RelativeSize aRelativeSize; @@ -121,7 +121,7 @@ bool PositionAndSizeHelper::moveObject( ObjectType eObjectType //and in the middle of the page aRelativeSize.Primary = double(aObjectRect.getWidth())/double(aPageRect.getWidth()); aRelativeSize.Secondary = double(aObjectRect.getHeight())/double(aPageRect.getHeight()); - xObjectProp->setPropertyValue( C2U( "RelativeSize" ), uno::makeAny(aRelativeSize) ); + xObjectProp->setPropertyValue( "RelativeSize", uno::makeAny(aRelativeSize) ); } else return false; diff --git a/chart2/source/controller/main/SelectionHelper.cxx b/chart2/source/controller/main/SelectionHelper.cxx index 104d7672aeaa..16c795875aa6 100644 --- a/chart2/source/controller/main/SelectionHelper.cxx +++ b/chart2/source/controller/main/SelectionHelper.cxx @@ -19,7 +19,6 @@ #include "SelectionHelper.hxx" #include "ObjectIdentifier.hxx" -//for C2U #include "macros.hxx" #include "DiagramHelper.hxx" #include "ChartModelHelper.hxx" @@ -192,7 +191,7 @@ void Selection::adaptSelectionToNewPos( const Point& rMousePos, DrawViewWrapper* m_aSelectedOID = ObjectIdentifier( lcl_getObjectName( pNewObj ) );//name of pNewObj //ignore handle only objects for hit test - while( pNewObj && m_aSelectedOID.getObjectCID().match( C2U( "HandlesOnly" ) ) ) + while( pNewObj && m_aSelectedOID.getObjectCID().match( "HandlesOnly" ) ) { pNewObj->SetMarkProtect(true); pNewObj = pDrawViewWrapper->getHitObject(rMousePos); @@ -412,7 +411,7 @@ bool SelectionHelper::isDragableObjectHitTwice( const Point& rMPos aRet = lcl_getObjectName( pNewObj );//name of pNewObj //ignore handle only objects for hit test - while( pNewObj && aRet.match(C2U("HandlesOnly")) ) + while( pNewObj && aRet.match("HandlesOnly") ) { pNewObj->SetMarkProtect(true); pNewObj = rDrawViewWrapper.getHitObject(rMPos); @@ -499,7 +498,7 @@ SdrObject* SelectionHelper::getMarkHandlesObject( SdrObject* pObj ) if(!pObj) return 0; rtl::OUString aName( lcl_getObjectName( pObj ) ); - if( aName.match(C2U("MarkHandles")) || aName.match(C2U("HandlesOnly")) ) + if( aName.match("MarkHandles") || aName.match("HandlesOnly") ) return pObj; if( !aName.isEmpty() )//dont't get the markhandles of a different object return 0; diff --git a/chart2/source/controller/main/StatusBarCommandDispatch.cxx b/chart2/source/controller/main/StatusBarCommandDispatch.cxx index 1e0cfba55165..55da8a8bf1e1 100644 --- a/chart2/source/controller/main/StatusBarCommandDispatch.cxx +++ b/chart2/source/controller/main/StatusBarCommandDispatch.cxx @@ -76,14 +76,14 @@ void StatusBarCommandDispatch::fireStatusEvent( uno::Any aArg; Reference< chart2::XChartDocument > xDoc( m_xModifiable, uno::UNO_QUERY ); aArg <<= ObjectNameProvider::getSelectedObjectText( m_aSelectedOID.getObjectCID(), xDoc ); - fireStatusEventForURL( C2U(".uno:Context"), aArg, true, xSingleListener ); + fireStatusEventForURL( ".uno:Context", aArg, true, xSingleListener ); } if( bFireModified ) { uno::Any aArg; if( m_bIsModified ) - aArg <<= C2U("*"); - fireStatusEventForURL( C2U(".uno:ModifiedStatus"), aArg, true, xSingleListener ); + aArg <<= OUString("*"); + fireStatusEventForURL( ".uno:ModifiedStatus", aArg, true, xSingleListener ); } } diff --git a/chart2/source/controller/main/UndoCommandDispatch.cxx b/chart2/source/controller/main/UndoCommandDispatch.cxx index 24cfb507e9c2..27d23d137a44 100644 --- a/chart2/source/controller/main/UndoCommandDispatch.cxx +++ b/chart2/source/controller/main/UndoCommandDispatch.cxx @@ -84,9 +84,9 @@ void UndoCommandDispatch::fireStatusEvent( } if( bFireAll || rURL == ".uno:Undo" ) - fireStatusEventForURL( C2U(".uno:Undo"), aUndoState, m_xUndoManager->isUndoPossible(), xSingleListener ); + fireStatusEventForURL( ".uno:Undo", aUndoState, m_xUndoManager->isUndoPossible(), xSingleListener ); if( bFireAll || rURL == ".uno:Redo" ) - fireStatusEventForURL( C2U(".uno:Redo"), aRedoState, m_xUndoManager->isRedoPossible(), xSingleListener ); + fireStatusEventForURL( ".uno:Redo", aRedoState, m_xUndoManager->isRedoPossible(), xSingleListener ); } } diff --git a/chart2/source/inc/macros.hxx b/chart2/source/inc/macros.hxx index 77bd04e82ebd..56e064332334 100644 --- a/chart2/source/inc/macros.hxx +++ b/chart2/source/inc/macros.hxx @@ -22,7 +22,7 @@ #include <typeinfo> /// creates a unicode-string from an ASCII string -#define C2U(constAsciiStr) (::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( constAsciiStr ) )) +#define constAsciiStr (::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( constAsciiStr ) )) /** shows an error-box for an exception ex else-branch necessary to avoid warning diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx index 41cff8a6053f..885bee06e6dc 100644 --- a/chart2/source/model/filter/XMLFilter.cxx +++ b/chart2/source/model/filter/XMLFilter.cxx @@ -138,10 +138,10 @@ uno::Reference< embed::XStorage > lcl_getWriteStorage( uno::Reference<beans::XPropertySet> xProp(xStorage,uno::UNO_QUERY); OUString aMediaType; if ( ! xProp.is() || - ! ( xProp->getPropertyValue( C2U("MediaType")) >>= aMediaType ) || + ! ( xProp->getPropertyValue( "MediaType") >>= aMediaType ) || ( aMediaType.isEmpty() )) { - xProp->setPropertyValue( C2U("MediaType"), uno::makeAny( _sMediaType )); + xProp->setPropertyValue( "MediaType", uno::makeAny( _sMediaType )); } } catch (const uno::Exception& ex) @@ -315,7 +315,7 @@ sal_Int32 XMLFilter::impl_Import( try { Reference< lang::XServiceInfo > xServInfo( xDocumentComp, uno::UNO_QUERY_THROW ); - if( ! xServInfo->supportsService( C2U( "com.sun.star.chart2.ChartDocument" ))) + if( ! xServInfo->supportsService( "com.sun.star.chart2.ChartDocument")) { OSL_FAIL( "Import: No ChartDocument" ); return ERRCODE_SFX_GENERAL; @@ -343,7 +343,7 @@ sal_Int32 XMLFilter::impl_Import( aArgs[0] <<= xStorage; xGraphicObjectResolver.set( xServiceFactory->createInstanceWithArguments( - C2U("com.sun.star.comp.Svx.GraphicImportHelper"), aArgs ), uno::UNO_QUERY ); + "com.sun.star.comp.Svx.GraphicImportHelper", aArgs ), uno::UNO_QUERY ); } // create XPropertySet with extra informatio for the filter @@ -383,12 +383,12 @@ sal_Int32 XMLFilter::impl_Import( uno::Sequence< beans::PropertyValue > aModProps = xModel->getArgs(); for( sal_Int32 nInd = 0; nInd < aModProps.getLength(); nInd++ ) { - if( aModProps[nInd].Name.equals( C2U( "HierarchicalDocumentName" ) ) ) + if( aModProps[nInd].Name.equals( "HierarchicalDocumentName" ) ) { // Actually this argument only has meaning for embedded documents aModProps[nInd].Value >>= aHierarchName; } - else if( aModProps[nInd].Name.equals( C2U( "DocumentBaseURL" ) ) ) + else if( aModProps[nInd].Name.equals( "DocumentBaseURL" ) ) { aModProps[nInd].Value >>= aBaseUri; } @@ -396,32 +396,32 @@ sal_Int32 XMLFilter::impl_Import( } if( !aBaseUri.isEmpty() ) - xImportInfo->setPropertyValue( C2U("BaseURI"), uno::makeAny( aBaseUri ) ); + xImportInfo->setPropertyValue( "BaseURI", uno::makeAny( aBaseUri ) ); if( !aHierarchName.isEmpty() ) - xImportInfo->setPropertyValue( C2U("StreamRelPath"), uno::makeAny( aHierarchName ) ); + xImportInfo->setPropertyValue( "StreamRelPath", uno::makeAny( aHierarchName ) ); // import meta information if( bOasis ) nWarning |= impl_ImportStream( - C2U( sXML_metaStreamName ), - C2U( sXML_import_chart_oasis_meta_service ), + sXML_metaStreamName, + sXML_import_chart_oasis_meta_service, xStorage, xSaxParser, xFactory, xGraphicObjectResolver, xImportInfo ); // import styles nWarning |= impl_ImportStream( - C2U( sXML_styleStreamName ), + sXML_styleStreamName, bOasis - ? C2U( sXML_import_chart_oasis_styles_service ) - : C2U( sXML_import_chart_styles_service ), + ? OUString(sXML_import_chart_oasis_styles_service) + : OUString(sXML_import_chart_styles_service), xStorage, xSaxParser, xFactory, xGraphicObjectResolver, xImportInfo ); // import content sal_Int32 nContentWarning = impl_ImportStream( - C2U( sXML_contentStreamName ), + sXML_contentStreamName, bOasis - ? C2U( sXML_import_chart_oasis_content_service ) - : C2U( sXML_import_chart_content_service ), + ? OUString(sXML_import_chart_oasis_content_service) + : OUString(sXML_import_chart_content_service), xStorage, xSaxParser, xFactory, xGraphicObjectResolver, xImportInfo ); nWarning |= nContentWarning; @@ -429,8 +429,8 @@ sal_Int32 XMLFilter::impl_Import( if( nContentWarning != 0 ) { nWarning = impl_ImportStream( - C2U( sXML_oldContentStreamName ), - C2U( sXML_import_chart_old_content_service ), + sXML_oldContentStreamName, + sXML_import_chart_old_content_service, xStorage, xSaxParser, xFactory, xGraphicObjectResolver, xImportInfo ); } } @@ -462,7 +462,7 @@ sal_Int32 XMLFilter::impl_ImportStream( return 0; if( xImportInfo.is() ) - xImportInfo->setPropertyValue( C2U("StreamName"), uno::makeAny( rStreamName ) ); + xImportInfo->setPropertyValue( "StreamName", uno::makeAny( rStreamName ) ); if( xStorage.is() && xStorage->isStreamElement( rStreamName ) ) @@ -571,7 +571,7 @@ sal_Int32 XMLFilter::impl_Export( try { Reference< lang::XServiceInfo > xServInfo( xDocumentComp, uno::UNO_QUERY_THROW ); - if( ! xServInfo->supportsService( C2U( "com.sun.star.chart2.ChartDocument" ))) + if( ! xServInfo->supportsService( "com.sun.star.chart2.ChartDocument")) { OSL_FAIL( "Export: No ChartDocument" ); return ERRCODE_SFX_GENERAL; @@ -641,7 +641,7 @@ sal_Int32 XMLFilter::impl_Export( sal_Bool bUsePrettyPrinting( aSaveOpt.IsPrettyPrinting() ); xInfoSet->setPropertyValue( sUsePrettyPrinting, uno::makeAny( bUsePrettyPrinting ) ); if( ! bOasis ) - xInfoSet->setPropertyValue( C2U("ExportTableNumberList"), uno::makeAny( true )); + xInfoSet->setPropertyValue( "ExportTableNumberList", uno::makeAny( true )); sal_Int32 nArgs = 2; if( xGraphicObjectResolver.is()) @@ -659,24 +659,24 @@ sal_Int32 XMLFilter::impl_Export( // export meta information if( bOasis ) nWarning |= impl_ExportStream( - C2U( sXML_metaStreamName ), - C2U( sXML_export_chart_oasis_meta_service ), + sXML_metaStreamName, + sXML_export_chart_oasis_meta_service, xStorage, xSaxWriter, xServiceFactory, aFilterProperties ); // export styles nWarning |= impl_ExportStream( - C2U( sXML_styleStreamName ), + sXML_styleStreamName, bOasis - ? C2U( sXML_export_chart_oasis_styles_service ) - : C2U( sXML_export_chart_styles_service ), + ? OUString(sXML_export_chart_oasis_styles_service) + : OUString(sXML_export_chart_styles_service), xStorage, xSaxWriter, xServiceFactory, aFilterProperties ); // export content sal_Int32 nContentWarning = impl_ExportStream( - C2U( sXML_contentStreamName ), + sXML_contentStreamName, bOasis - ? C2U( sXML_export_chart_oasis_content_service ) - : C2U( sXML_export_chart_content_service ), + ? OUString(sXML_export_chart_oasis_content_service) + : OUString(sXML_export_chart_content_service), xStorage, xSaxWriter, xServiceFactory, aFilterProperties ); nWarning |= nContentWarning; @@ -729,9 +729,9 @@ sal_Int32 XMLFilter::impl_ExportStream( uno::Reference< beans::XPropertySet > xStreamProp( xOutputStream, uno::UNO_QUERY ); if(xStreamProp.is()) try { - xStreamProp->setPropertyValue( C2U("MediaType"), uno::makeAny( C2U("text/xml") ) ); - xStreamProp->setPropertyValue( C2U("Compressed"), uno::makeAny( sal_True ) );//@todo? - xStreamProp->setPropertyValue( C2U("UseCommonStoragePasswordEncryption"), uno::makeAny( sal_True ) ); + xStreamProp->setPropertyValue( "MediaType", uno::makeAny( OUString("text/xml") ) ); + xStreamProp->setPropertyValue( "Compressed", uno::makeAny( sal_True ) );//@todo? + xStreamProp->setPropertyValue( "UseCommonStoragePasswordEncryption", uno::makeAny( sal_True ) ); } catch (const uno::Exception& rEx) { @@ -747,7 +747,7 @@ sal_Int32 XMLFilter::impl_ExportStream( rFilterProperties.getConstArray()[0] >>= xInfoSet; OSL_ENSURE( xInfoSet.is(), "missing infoset for export" ); if( xInfoSet.is() ) - xInfoSet->setPropertyValue( C2U("StreamName"), uno::makeAny( rStreamName ) ); + xInfoSet->setPropertyValue( "StreamName", uno::makeAny( rStreamName ) ); } Reference< XExporter > xExporter( xServiceFactory->createInstanceWithArguments( @@ -777,8 +777,8 @@ sal_Int32 XMLFilter::impl_ExportStream( Sequence< OUString > XMLFilter::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 2 ); - aServices[ 0 ] = C2U( "com.sun.star.document.ImportFilter" ); - aServices[ 1 ] = C2U( "com.sun.star.document.ExportFilter" ); + aServices[ 0 ] = "com.sun.star.document.ImportFilter"; + aServices[ 1 ] = "com.sun.star.document.ExportFilter"; // todo: services are incomplete. Missing: // XInitialization, XNamed @@ -799,7 +799,7 @@ void XMLFilter::isOasisFormat(const Sequence< beans::PropertyValue >& _rMediaDes } // ----------------------------------------------------------------------------- -APPHELPER_XSERVICEINFO_IMPL( XMLFilter, C2U( "com.sun.star.comp.chart2.XMLFilter" ) ); +APPHELPER_XSERVICEINFO_IMPL( XMLFilter, OUString("com.sun.star.comp.chart2.XMLFilter") ); // ----------------------------------------------------------------------------- void XMLReportFilterHelper::isOasisFormat(const Sequence< beans::PropertyValue >& _rMediaDescriptor, bool & rOutOASIS ) diff --git a/chart2/source/model/main/Axis.cxx b/chart2/source/model/main/Axis.cxx index 5e0d07e6e4aa..b949ece25b14 100644 --- a/chart2/source/model/main/Axis.cxx +++ b/chart2/source/model/main/Axis.cxx @@ -85,100 +85,100 @@ void lcl_AddPropertiesToVector( ::std::vector< Property > & rOutProperties ) { rOutProperties.push_back( - Property( C2U( "Show" ), + Property( "Show", PROP_AXIS_SHOW, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "CrossoverPosition" ), + Property( "CrossoverPosition", PROP_AXIS_CROSSOVER_POSITION, ::getCppuType( reinterpret_cast< const ::com::sun::star::chart::ChartAxisPosition * >(0)), beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "CrossoverValue" ), + Property( "CrossoverValue", PROP_AXIS_CROSSOVER_VALUE, ::getCppuType( reinterpret_cast< const double * >(0)), beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( - Property( C2U( "DisplayLabels" ), + Property( "DisplayLabels", PROP_AXIS_DISPLAY_LABELS, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "NumberFormat" ), + Property( "NumberFormat", PROP_AXIS_NUMBER_FORMAT, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( - Property( C2U( "LabelPosition" ), + Property( "LabelPosition", PROP_AXIS_LABEL_POSITION, ::getCppuType( reinterpret_cast< const ::com::sun::star::chart::ChartAxisLabelPosition * >(0)), beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "TextRotation" ), + Property( "TextRotation", PROP_AXIS_TEXT_ROTATION, ::getCppuType( reinterpret_cast< const double * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "TextBreak" ), + Property( "TextBreak", PROP_AXIS_TEXT_BREAK, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "TextOverlap" ), + Property( "TextOverlap", PROP_AXIS_TEXT_OVERLAP, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "StackCharacters" ), + Property( "StackCharacters", PROP_AXIS_TEXT_STACKED, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "ArrangeOrder" ), + Property( "ArrangeOrder", PROP_AXIS_TEXT_ARRANGE_ORDER, ::getCppuType( reinterpret_cast< const ::com::sun::star::chart::ChartAxisArrangeOrderType * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "ReferencePageSize" ), + Property( "ReferencePageSize", PROP_AXIS_REFERENCE_DIAGRAM_SIZE, ::getCppuType( reinterpret_cast< const awt::Size * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( - Property( C2U( "MajorTickmarks" ), + Property( "MajorTickmarks", PROP_AXIS_MAJOR_TICKMARKS, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "MinorTickmarks" ), + Property( "MinorTickmarks", PROP_AXIS_MINOR_TICKMARKS, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "MarkPosition" ), + Property( "MarkPosition", PROP_AXIS_MARK_POSITION, ::getCppuType( reinterpret_cast< const ::com::sun::star::chart::ChartAxisMarkPosition * >(0)), beans::PropertyAttribute::MAYBEDEFAULT )); @@ -606,8 +606,8 @@ Reference< beans::XPropertySetInfo > SAL_CALL Axis::getPropertySetInfo() Sequence< OUString > Axis::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 2 ); - aServices[ 0 ] = C2U( "com.sun.star.chart2.Axis" ); - aServices[ 1 ] = C2U( "com.sun.star.beans.PropertySet" ); + aServices[ 0 ] = "com.sun.star.chart2.Axis"; + aServices[ 1 ] = "com.sun.star.beans.PropertySet"; return aServices; } diff --git a/chart2/source/model/main/BaseCoordinateSystem.cxx b/chart2/source/model/main/BaseCoordinateSystem.cxx index cb937f2be7cc..048f38d4e579 100644 --- a/chart2/source/model/main/BaseCoordinateSystem.cxx +++ b/chart2/source/model/main/BaseCoordinateSystem.cxx @@ -53,7 +53,7 @@ void lcl_AddPropertiesToVector( ::std::vector< Property > & rOutProperties ) { rOutProperties.push_back( - Property( C2U( "SwapXAndYAxis" ), + Property( "SwapXAndYAxis", PROP_COORDINATESYSTEM_SWAPXANDYAXIS, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND @@ -289,7 +289,7 @@ void SAL_CALL BaseCoordinateSystem::removeChartType( const Reference< chart2::XC aIt( ::std::find( m_aChartTypes.begin(), m_aChartTypes.end(), aChartType )); if( aIt == m_aChartTypes.end()) throw container::NoSuchElementException( - C2U( "The given chart type is no element of the container" ), + "The given chart type is no element of the container", static_cast< uno::XWeak * >( this )); m_aChartTypes.erase( aIt ); diff --git a/chart2/source/model/main/CartesianCoordinateSystem.cxx b/chart2/source/model/main/CartesianCoordinateSystem.cxx index ff8be7fe568d..73d249bac593 100644 --- a/chart2/source/model/main/CartesianCoordinateSystem.cxx +++ b/chart2/source/model/main/CartesianCoordinateSystem.cxx @@ -91,7 +91,7 @@ Sequence< OUString > CartesianCoordinateSystem::getSupportedServiceNames_Static( // implement XServiceInfo methods basing upon getSupportedServiceNames_Static APPHELPER_XSERVICEINFO_IMPL( CartesianCoordinateSystem, - C2U( "com.sun.star.comp.chart.CartesianCoordinateSystem" )) + OUString("com.sun.star.comp.chart.CartesianCoordinateSystem")) // ================================= diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx index 0564adde45e1..743e248a2b3c 100644 --- a/chart2/source/model/main/ChartModel.cxx +++ b/chart2/source/model/main/ChartModel.cxx @@ -104,7 +104,7 @@ ChartModel::ChartModel(uno::Reference<uno::XComponentContext > const & xContext) , m_xInternalDataProvider( 0 ) , m_xPageBackground( new PageBackground( m_xContext ) ) , m_xXMLNamespaceMap( createNameContainer( ::getCppuType( (const OUString*) 0 ), - C2U( "com.sun.star.xml.NamespaceMap" ), C2U( "com.sun.star.comp.chart.XMLNameSpaceMap" ) ), uno::UNO_QUERY) + "com.sun.star.xml.NamespaceMap", "com.sun.star.comp.chart.XMLNameSpaceMap" ), uno::UNO_QUERY) { OSL_TRACE( "ChartModel: CTOR called" ); @@ -120,7 +120,7 @@ ChartModel::ChartModel(uno::Reference<uno::XComponentContext > const & xContext) { ModifyListenerHelper::addListener( m_xPageBackground, this ); m_xChartTypeManager.set( xContext->getServiceManager()->createInstanceWithContext( - C2U( "com.sun.star.chart2.ChartTypeManager" ), m_xContext ), uno::UNO_QUERY ); + "com.sun.star.chart2.ChartTypeManager", m_xContext ), uno::UNO_QUERY ); } osl_atomic_decrement(&m_refCount); } @@ -273,7 +273,7 @@ void ChartModel::impl_adjustAdditionalShapesPositionAndSize( const awt::Size& aV if ( xProperties.is() ) { uno::Reference< drawing::XShapes > xShapes; - xProperties->getPropertyValue( C2U( "AdditionalShapes" ) ) >>= xShapes; + xProperties->getPropertyValue( "AdditionalShapes" ) >>= xShapes; if ( xShapes.is() ) { sal_Int32 nCount = xShapes->getCount(); @@ -314,8 +314,8 @@ uno::Sequence< rtl::OUString > ChartModel::getSupportedServiceNames_Static() { uno::Sequence< rtl::OUString > aSNS( 3 ); aSNS[0] = CHART_MODEL_SERVICE_NAME; - aSNS[1] = C2U( "com.sun.star.document.OfficeDocument" ); - aSNS[2] = C2U( "com.sun.star.chart.ChartDocument" ); + aSNS[1] = "com.sun.star.document.OfficeDocument"; + aSNS[2] = "com.sun.star.chart.ChartDocument"; //// @todo : add additional services if you support any further return aSNS; } @@ -760,8 +760,8 @@ Reference< chart2::data::XDataSource > ChartModel::impl_createDefaultData() //create data uno::Sequence< beans::PropertyValue > aArgs( 4 ); aArgs[0] = beans::PropertyValue( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CellRangeRepresentation" )), -1, - uno::makeAny( C2U("all") ), beans::PropertyState_DIRECT_VALUE ); + OUString( "CellRangeRepresentation" ), -1, + uno::makeAny( OUString("all") ), beans::PropertyState_DIRECT_VALUE ); aArgs[1] = beans::PropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "HasCategories" )), -1, uno::makeAny( true ), beans::PropertyState_DIRECT_VALUE ); @@ -821,7 +821,7 @@ void SAL_CALL ChartModel::attachDataProvider( const uno::Reference< chart2::data try { sal_Bool bIncludeHiddenCells = ChartModelHelper::isIncludeHiddenCells( Reference< frame::XModel >(this) ); - xProp->setPropertyValue(C2U("IncludeHiddenCells"), uno::makeAny(bIncludeHiddenCells)); + xProp->setPropertyValue("IncludeHiddenCells", uno::makeAny(bIncludeHiddenCells)); } catch (const beans::UnknownPropertyException&) { @@ -934,7 +934,7 @@ Reference< chart2::XChartTypeTemplate > ChartModel::impl_createDefaultChartTypeT Reference< chart2::XChartTypeTemplate > xTemplate; Reference< lang::XMultiServiceFactory > xFact( m_xChartTypeManager, uno::UNO_QUERY ); if( xFact.is() ) - xTemplate.set( xFact->createInstance( C2U( "com.sun.star.chart2.template.Column" ) ), uno::UNO_QUERY ); + xTemplate.set( xFact->createInstance( "com.sun.star.chart2.template.Column" ), uno::UNO_QUERY ); return xTemplate; } @@ -1079,7 +1079,7 @@ embed::VisualRepresentation SAL_CALL ChartModel::getPreferredVisualRepresentatio if( xTransferable.is() ) { datatransfer::DataFlavor aDataFlavor( lcl_aGDIMetaFileMIMEType, - C2U( "GDIMetaFile" ), + "GDIMetaFile", ::getCppuType( (const uno::Sequence< sal_Int8 >*) 0 ) ); uno::Any aData( xTransferable->getTransferData( aDataFlavor ) ); @@ -1149,7 +1149,7 @@ Sequence< datatransfer::DataFlavor > SAL_CALL ChartModel::getTransferDataFlavors uno::Sequence< datatransfer::DataFlavor > aRet(1); aRet[0] = datatransfer::DataFlavor( lcl_aGDIMetaFileMIMETypeHighContrast, - C2U( "GDIMetaFile" ), + "GDIMetaFile", ::getCppuType( (const uno::Sequence< sal_Int8 >*) NULL ) ); return aRet; @@ -1183,13 +1183,13 @@ tServiceNameMap & lcl_getStaticServiceNameMap() { static tServiceNameMap aServiceNameMap( tMakeServiceNameMap - ( C2U( "com.sun.star.drawing.DashTable" ), SERVICE_DASH_TABLE ) - ( C2U( "com.sun.star.drawing.GradientTable" ), SERVICE_GARDIENT_TABLE ) - ( C2U( "com.sun.star.drawing.HatchTable" ), SERVICE_HATCH_TABLE ) - ( C2U( "com.sun.star.drawing.BitmapTable" ), SERVICE_BITMAP_TABLE ) - ( C2U( "com.sun.star.drawing.TransparencyGradientTable" ), SERVICE_TRANSP_GRADIENT_TABLE ) - ( C2U( "com.sun.star.drawing.MarkerTable" ), SERVICE_MARKER_TABLE ) - ( C2U( "com.sun.star.xml.NamespaceMap" ), SERVICE_NAMESPACE_MAP ) + ( "com.sun.star.drawing.DashTable", SERVICE_DASH_TABLE ) + ( "com.sun.star.drawing.GradientTable", SERVICE_GARDIENT_TABLE ) + ( "com.sun.star.drawing.HatchTable", SERVICE_HATCH_TABLE ) + ( "com.sun.star.drawing.BitmapTable", SERVICE_BITMAP_TABLE ) + ( "com.sun.star.drawing.TransparencyGradientTable", SERVICE_TRANSP_GRADIENT_TABLE ) + ( "com.sun.star.drawing.MarkerTable", SERVICE_MARKER_TABLE ) + ( "com.sun.star.xml.NamespaceMap", SERVICE_NAMESPACE_MAP ) ); return aServiceNameMap; } diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx b/chart2/source/model/main/ChartModel_Persistence.cxx index 0e638ece1c15..e0bf13019595 100644 --- a/chart2/source/model/main/ChartModel_Persistence.cxx +++ b/chart2/source/model/main/ChartModel_Persistence.cxx @@ -100,7 +100,7 @@ void lcl_addStorageToMediaDescriptor( { rOutMD.realloc( rOutMD.getLength() + 1 ); rOutMD[rOutMD.getLength() - 1] = beans::PropertyValue( - C2U("Storage"), -1, uno::makeAny( xStorage ), beans::PropertyState_DIRECT_VALUE ); + "Storage", -1, uno::makeAny( xStorage ), beans::PropertyState_DIRECT_VALUE ); } Reference< embed::XStorage > lcl_createStorage( @@ -157,7 +157,7 @@ Reference< document::XFilter > ChartModel::impl_createFilter( { Reference< container::XNameAccess > xFilterFact( m_xContext->getServiceManager()->createInstanceWithContext( - C2U( "com.sun.star.document.FilterFactory" ), m_xContext ), + "com.sun.star.document.FilterFactory", m_xContext ), uno::UNO_QUERY_THROW ); uno::Any aFilterProps( xFilterFact->getByName( aFilterName )); Sequence< beans::PropertyValue > aProps; @@ -190,7 +190,7 @@ Reference< document::XFilter > ChartModel::impl_createFilter( OSL_TRACE( "No FilterName passed in MediaDescriptor" ); xFilter.set( m_xContext->getServiceManager()->createInstanceWithContext( - C2U("com.sun.star.comp.chart2.XMLFilter"), m_xContext ), + "com.sun.star.comp.chart2.XMLFilter", m_xContext ), uno::UNO_QUERY_THROW ); } @@ -247,10 +247,10 @@ void SAL_CALL ChartModel::store() ::rtl::OUString aLocation = m_aResource; if( aLocation.isEmpty() ) - throw io::IOException( C2U( "no location specified" ), static_cast< ::cppu::OWeakObject* >(this)); + throw io::IOException( "no location specified", static_cast< ::cppu::OWeakObject* >(this)); //@todo check whether aLocation is something like private:factory... if( m_bReadOnly ) - throw io::IOException( C2U( "document is read only" ), static_cast< ::cppu::OWeakObject* >(this)); + throw io::IOException( "document is read only", static_cast< ::cppu::OWeakObject* >(this)); aGuard.clear(); @@ -411,7 +411,7 @@ void SAL_CALL ChartModel::initNew() if( bSupportsCategories ) { aParam.realloc( 1 ); - aParam[0] = beans::PropertyValue( C2U("HasCategories"), -1, uno::makeAny( true ), + aParam[0] = beans::PropertyValue( "HasCategories", -1, uno::makeAny( true ), beans::PropertyState_DIRECT_VALUE ); } @@ -427,17 +427,17 @@ void SAL_CALL ChartModel::initNew() // create and attach legend Reference< chart2::XLegend > xLegend( m_xContext->getServiceManager()->createInstanceWithContext( - C2U( "com.sun.star.chart2.Legend" ), m_xContext ), uno::UNO_QUERY_THROW ); + "com.sun.star.chart2.Legend", m_xContext ), uno::UNO_QUERY_THROW ); Reference< beans::XPropertySet > xLegendProperties( xLegend, uno::UNO_QUERY ); if( xLegendProperties.is() ) { - xLegendProperties->setPropertyValue( C2U( "FillStyle" ), uno::makeAny( drawing::FillStyle_NONE )); - xLegendProperties->setPropertyValue( C2U( "LineStyle" ), uno::makeAny( drawing::LineStyle_NONE )); - xLegendProperties->setPropertyValue( C2U( "LineColor" ), uno::makeAny( static_cast< sal_Int32 >( 0xb3b3b3 ) )); // gray30 - xLegendProperties->setPropertyValue( C2U( "FillColor" ), uno::makeAny( static_cast< sal_Int32 >( 0xe6e6e6 ) ) ); // gray10 + xLegendProperties->setPropertyValue( "FillStyle", uno::makeAny( drawing::FillStyle_NONE )); + xLegendProperties->setPropertyValue( "LineStyle", uno::makeAny( drawing::LineStyle_NONE )); + xLegendProperties->setPropertyValue( "LineColor", uno::makeAny( static_cast< sal_Int32 >( 0xb3b3b3 ) )); // gray30 + xLegendProperties->setPropertyValue( "FillColor", uno::makeAny( static_cast< sal_Int32 >( 0xe6e6e6 ) ) ); // gray10 if( bIsRTL ) - xLegendProperties->setPropertyValue( C2U( "AnchorPosition" ), uno::makeAny( chart2::LegendPosition_LINE_START )); + xLegendProperties->setPropertyValue( "AnchorPosition", uno::makeAny( chart2::LegendPosition_LINE_START )); } if(xDiagram.is()) xDiagram->setLegend( xLegend ); @@ -446,8 +446,8 @@ void SAL_CALL ChartModel::initNew() Reference< beans::XPropertySet > xDiagramProperties( xDiagram, uno::UNO_QUERY ); if( xDiagramProperties.is() ) { - xDiagramProperties->setPropertyValue( C2U("RightAngledAxes"), uno::makeAny( sal_True )); - xDiagramProperties->setPropertyValue( C2U("D3DScenePerspective"), uno::makeAny( drawing::ProjectionMode_PARALLEL )); + xDiagramProperties->setPropertyValue( "RightAngledAxes", uno::makeAny( sal_True )); + xDiagramProperties->setPropertyValue( "D3DScenePerspective", uno::makeAny( drawing::ProjectionMode_PARALLEL )); ThreeDHelper::setScheme( xDiagram, ThreeDLookScheme_Realistic ); } @@ -457,18 +457,18 @@ void SAL_CALL ChartModel::initNew() Reference< beans::XPropertySet > xWall( xDiagram->getWall() ); if( xWall.is() ) { - xWall->setPropertyValue( C2U( "LineStyle" ), uno::makeAny( drawing::LineStyle_SOLID ) ); - xWall->setPropertyValue( C2U( "FillStyle" ), uno::makeAny( drawing::FillStyle_NONE ) ); - xWall->setPropertyValue( C2U( "LineColor" ), uno::makeAny( static_cast< sal_Int32 >( 0xb3b3b3 ) ) ); // gray30 - xWall->setPropertyValue( C2U( "FillColor" ), uno::makeAny( static_cast< sal_Int32 >( 0xe6e6e6 ) ) ); // gray10 + xWall->setPropertyValue( "LineStyle", uno::makeAny( drawing::LineStyle_SOLID ) ); + xWall->setPropertyValue( "FillStyle", uno::makeAny( drawing::FillStyle_NONE ) ); + xWall->setPropertyValue( "LineColor", uno::makeAny( static_cast< sal_Int32 >( 0xb3b3b3 ) ) ); // gray30 + xWall->setPropertyValue( "FillColor", uno::makeAny( static_cast< sal_Int32 >( 0xe6e6e6 ) ) ); // gray10 } Reference< beans::XPropertySet > xFloor( xDiagram->getFloor() ); if( xFloor.is() ) { - xFloor->setPropertyValue( C2U( "LineStyle" ), uno::makeAny( drawing::LineStyle_NONE ) ); - xFloor->setPropertyValue( C2U( "FillStyle" ), uno::makeAny( drawing::FillStyle_SOLID ) ); - xFloor->setPropertyValue( C2U( "LineColor" ), uno::makeAny( static_cast< sal_Int32 >( 0xb3b3b3 ) ) ); // gray30 - xFloor->setPropertyValue( C2U( "FillColor" ), uno::makeAny( static_cast< sal_Int32 >( 0xcccccc ) ) ); // gray20 + xFloor->setPropertyValue( "LineStyle", uno::makeAny( drawing::LineStyle_NONE ) ); + xFloor->setPropertyValue( "FillStyle", uno::makeAny( drawing::FillStyle_SOLID ) ); + xFloor->setPropertyValue( "LineColor", uno::makeAny( static_cast< sal_Int32 >( 0xb3b3b3 ) ) ); // gray30 + xFloor->setPropertyValue( "FillColor", uno::makeAny( static_cast< sal_Int32 >( 0xcccccc ) ) ); // gray20 } } @@ -514,9 +514,9 @@ void SAL_CALL ChartModel::load( aMDHelper.ISSET_InputStream ) { if( aMDHelper.ISSET_FilterName && - (aMDHelper.FilterName.equals( C2U("StarChart 5.0")) || - aMDHelper.FilterName.equals( C2U("StarChart 4.0")) || - aMDHelper.FilterName.equals( C2U("StarChart 3.0")) )) + (aMDHelper.FilterName.equals( "StarChart 5.0") || + aMDHelper.FilterName.equals( "StarChart 4.0") || + aMDHelper.FilterName.equals( "StarChart 3.0") )) { attachResource( aMDHelper.URL, rMediaDescriptor ); impl_load( rMediaDescriptor, 0 ); // cannot create a storage from binary streams, but I do not need the storage here anyhow @@ -612,7 +612,7 @@ void ChartModel::impl_loadGraphics( try { const Reference< embed::XStorage >& xGraphicsStorage( - xStorage->openStorageElement( C2U( "Pictures" ), + xStorage->openStorageElement( "Pictures", embed::ElementModes::READ ) ); if( xGraphicsStorage.is() ) diff --git a/chart2/source/model/main/DataPoint.cxx b/chart2/source/model/main/DataPoint.cxx index 14711771169c..2537dba9f869 100644 --- a/chart2/source/model/main/DataPoint.cxx +++ b/chart2/source/model/main/DataPoint.cxx @@ -289,9 +289,9 @@ void DataPoint::fireModifyEvent() Sequence< OUString > DataPoint::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 3 ); - aServices[ 0 ] = C2U( "com.sun.star.chart2.DataPoint" ); - aServices[ 1 ] = C2U( "com.sun.star.chart2.DataPointProperties" ); - aServices[ 2 ] = C2U( "com.sun.star.beans.PropertySet" ); + aServices[ 0 ] = "com.sun.star.chart2.DataPoint"; + aServices[ 1 ] = "com.sun.star.chart2.DataPointProperties"; + aServices[ 2 ] = "com.sun.star.beans.PropertySet"; return aServices; } @@ -301,7 +301,7 @@ using impl::DataPoint_Base; IMPLEMENT_FORWARD_XINTERFACE2( DataPoint, DataPoint_Base, ::property::OPropertySet ) // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( DataPoint, C2U( "com.sun.star.comp.chart.DataPoint" )); +APPHELPER_XSERVICEINFO_IMPL( DataPoint, OUString("com.sun.star.comp.chart.DataPoint") ); } // namespace chart diff --git a/chart2/source/model/main/DataPointProperties.cxx b/chart2/source/model/main/DataPointProperties.cxx index 3eba35af4b72..fb11ece86a93 100644 --- a/chart2/source/model/main/DataPointProperties.cxx +++ b/chart2/source/model/main/DataPointProperties.cxx @@ -51,7 +51,7 @@ void DataPointProperties::AddPropertiesToVector( // Common // ------ rOutProperties.push_back( - Property( C2U( "Color" ), + Property( "Color", PROP_DATAPOINT_COLOR, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND @@ -59,7 +59,7 @@ void DataPointProperties::AddPropertiesToVector( | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "Transparency" ), + Property( "Transparency", PROP_DATAPOINT_TRANSPARENCY, ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)), beans::PropertyAttribute::BOUND @@ -68,14 +68,14 @@ void DataPointProperties::AddPropertiesToVector( // Fill Properties // --------------- rOutProperties.push_back( - Property( C2U( "FillStyle" ), + Property( "FillStyle", PROP_DATAPOINT_FILL_STYLE, ::getCppuType( reinterpret_cast< const drawing::FillStyle * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "TransparencyGradientName" ), + Property( "TransparencyGradientName", PROP_DATAPOINT_TRANSPARENCY_GRADIENT_NAME, ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)), beans::PropertyAttribute::BOUND @@ -83,7 +83,7 @@ void DataPointProperties::AddPropertiesToVector( | beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( - Property( C2U( "GradientName" ), + Property( "GradientName", PROP_DATAPOINT_GRADIENT_NAME, ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)), beans::PropertyAttribute::BOUND @@ -92,14 +92,14 @@ void DataPointProperties::AddPropertiesToVector( rOutProperties.push_back( - beans::Property( C2U( "GradientStepCount" ), + beans::Property( "GradientStepCount", PROP_DATAPOINT_GRADIENT_STEPCOUNT, ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( - Property( C2U( "HatchName" ), + Property( "HatchName", PROP_DATAPOINT_HATCH_NAME, ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)), beans::PropertyAttribute::BOUND @@ -107,14 +107,14 @@ void DataPointProperties::AddPropertiesToVector( | beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( - Property( C2U( "FillBitmapName" ), + Property( "FillBitmapName", PROP_DATAPOINT_FILL_BITMAP_NAME, ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT | beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( - Property( C2U( "FillBackground" ), + Property( "FillBackground", PROP_DATAPOINT_FILL_BACKGROUND, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND @@ -123,32 +123,32 @@ void DataPointProperties::AddPropertiesToVector( // border for filled objects rOutProperties.push_back( - Property( C2U( "BorderColor" ), + Property( "BorderColor", PROP_DATAPOINT_BORDER_COLOR, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID // "maybe auto" | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "BorderStyle" ), + Property( "BorderStyle", PROP_DATAPOINT_BORDER_STYLE, ::getCppuType( reinterpret_cast< const drawing::LineStyle * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "BorderWidth" ), + Property( "BorderWidth", PROP_DATAPOINT_BORDER_WIDTH, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "BorderDashName" ), + Property( "BorderDashName", PROP_DATAPOINT_BORDER_DASH_NAME, ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( - Property( C2U( "BorderTransparency" ), + Property( "BorderTransparency", PROP_DATAPOINT_BORDER_TRANSPARENCY, ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)), beans::PropertyAttribute::BOUND @@ -157,25 +157,25 @@ void DataPointProperties::AddPropertiesToVector( // Line Properties // --------------- rOutProperties.push_back( - Property( C2U( "LineStyle" ), + Property( "LineStyle", LineProperties::PROP_LINE_STYLE, ::getCppuType( reinterpret_cast< const drawing::LineStyle * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "LineWidth" ), + Property( "LineWidth", LineProperties::PROP_LINE_WIDTH, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "LineDash" ), + Property( "LineDash", LineProperties::PROP_LINE_DASH, ::getCppuType( reinterpret_cast< const drawing::LineDash * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( - Property( C2U( "LineDashName" ), + Property( "LineDashName", LineProperties::PROP_LINE_DASH_NAME, ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)), beans::PropertyAttribute::BOUND @@ -184,28 +184,28 @@ void DataPointProperties::AddPropertiesToVector( // FillProperties // bitmap properties rOutProperties.push_back( - Property( C2U( "FillBitmapOffsetX" ), + Property( "FillBitmapOffsetX", FillProperties::PROP_FILL_BITMAP_OFFSETX, ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "FillBitmapOffsetY" ), + Property( "FillBitmapOffsetY", FillProperties::PROP_FILL_BITMAP_OFFSETY, ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "FillBitmapPositionOffsetX" ), + Property( "FillBitmapPositionOffsetX", FillProperties::PROP_FILL_BITMAP_POSITION_OFFSETX, ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "FillBitmapPositionOffsetY" ), + Property( "FillBitmapPositionOffsetY", FillProperties::PROP_FILL_BITMAP_POSITION_OFFSETY, ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)), beans::PropertyAttribute::BOUND @@ -213,35 +213,35 @@ void DataPointProperties::AddPropertiesToVector( rOutProperties.push_back( - Property( C2U( "FillBitmapRectanglePoint" ), + Property( "FillBitmapRectanglePoint", FillProperties::PROP_FILL_BITMAP_RECTANGLEPOINT, ::getCppuType( reinterpret_cast< const drawing::RectanglePoint * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "FillBitmapLogicalSize" ), + Property( "FillBitmapLogicalSize", FillProperties::PROP_FILL_BITMAP_LOGICALSIZE, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "FillBitmapSizeX" ), + Property( "FillBitmapSizeX", FillProperties::PROP_FILL_BITMAP_SIZEX, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "FillBitmapSizeY" ), + Property( "FillBitmapSizeY", FillProperties::PROP_FILL_BITMAP_SIZEY, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "FillBitmapMode" ), + Property( "FillBitmapMode", FillProperties::PROP_FILL_BITMAP_MODE, ::getCppuType( reinterpret_cast< const drawing::BitmapMode * >(0)), beans::PropertyAttribute::BOUND @@ -249,40 +249,40 @@ void DataPointProperties::AddPropertiesToVector( // others rOutProperties.push_back( - Property( C2U( "Symbol" ), + Property( "Symbol", PROP_DATAPOINT_SYMBOL_PROP, ::getCppuType( reinterpret_cast< const chart2::Symbol * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "Offset" ), + Property( "Offset", PROP_DATAPOINT_OFFSET, ::getCppuType( reinterpret_cast< const double * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "Geometry3D" ), + Property( "Geometry3D", PROP_DATAPOINT_GEOMETRY3D, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "Label" ), + Property( "Label", PROP_DATAPOINT_LABEL, ::getCppuType( reinterpret_cast< const chart2::DataPointLabel * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "LabelSeparator" ), + Property( "LabelSeparator", PROP_DATAPOINT_LABEL_SEPARATOR, ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "NumberFormat" ), + Property( "NumberFormat", PROP_DATAPOINT_NUMBER_FORMAT, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND @@ -290,28 +290,28 @@ void DataPointProperties::AddPropertiesToVector( //additional 'PercentageNumberFormat' rOutProperties.push_back( - Property( C2U( "PercentageNumberFormat" ), + Property( "PercentageNumberFormat", PROP_DATAPOINT_PERCENTAGE_NUMBER_FORMAT, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( - Property( C2U( "LabelPlacement" ), + Property( "LabelPlacement", PROP_DATAPOINT_LABEL_PLACEMENT, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( - Property( C2U( "ReferencePageSize" ), + Property( "ReferencePageSize", PROP_DATAPOINT_REFERENCE_DIAGRAM_SIZE, ::getCppuType( reinterpret_cast< const awt::Size * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( - Property( C2U( "TextRotation" ), + Property( "TextRotation", PROP_DATAPOINT_TEXT_ROTATION, ::getCppuType( reinterpret_cast< const double * >(0)), beans::PropertyAttribute::BOUND @@ -319,27 +319,27 @@ void DataPointProperties::AddPropertiesToVector( // statistics rOutProperties.push_back( - Property( C2U( "ErrorBarX" ), + Property( "ErrorBarX", PROP_DATAPOINT_ERROR_BAR_X, // XPropertySet supporting service ErrorBar ::getCppuType( reinterpret_cast< const uno::Reference< beans::XPropertySet > * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( - Property( C2U( "ErrorBarY" ), + Property( "ErrorBarY", PROP_DATAPOINT_ERROR_BAR_Y, // XPropertySet supporting service ErrorBar ::getCppuType( reinterpret_cast< const uno::Reference< beans::XPropertySet > * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( - Property( C2U( "ShowErrorBox" ), + Property( "ShowErrorBox", PROP_DATAPOINT_SHOW_ERROR_BOX, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( - Property( C2U( "PercentDiagonal" ), + Property( "PercentDiagonal", PROP_DATAPOINT_PERCENT_DIAGONAL, ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)), beans::PropertyAttribute::BOUND @@ -406,7 +406,7 @@ void DataPointProperties::AddDefaultsToMap( sal_False // ShowLegendSymbol )); - PropertyHelper::setPropertyValueDefault< rtl::OUString >( rOutMap, PROP_DATAPOINT_LABEL_SEPARATOR, C2U(" ") ); + PropertyHelper::setPropertyValueDefault< rtl::OUString >( rOutMap, PROP_DATAPOINT_LABEL_SEPARATOR, " " ); //@todo maybe choose a different one here -> should be dynamically that of the attached axis PropertyHelper::setPropertyValueDefault( rOutMap, PROP_DATAPOINT_ERROR_BAR_X, uno::Reference< beans::XPropertySet >()); diff --git a/chart2/source/model/main/DataSeries.cxx b/chart2/source/model/main/DataSeries.cxx index 26c64c350515..c292e1822a5f 100644 --- a/chart2/source/model/main/DataSeries.cxx +++ b/chart2/source/model/main/DataSeries.cxx @@ -268,9 +268,9 @@ uno::Reference< util::XCloneable > SAL_CALL DataSeries::createClone() Sequence< OUString > DataSeries::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 3 ); - aServices[ 0 ] = C2U( "com.sun.star.chart2.DataSeries" ); - aServices[ 1 ] = C2U( "com.sun.star.chart2.DataPointProperties" ); - aServices[ 2 ] = C2U( "com.sun.star.beans.PropertySet" ); + aServices[ 0 ] = "com.sun.star.chart2.DataSeries"; + aServices[ 1 ] = "com.sun.star.chart2.DataPointProperties"; + aServices[ 2 ] = "com.sun.star.beans.PropertySet"; return aServices; } @@ -366,7 +366,7 @@ Reference< beans::XPropertySet > } ::std::vector< Reference< chart2::data::XLabeledDataSequence > > aValuesSeries( - DataSeriesHelper::getAllDataSequencesByRole( aSequences , C2U("values"), true ) ); + DataSeriesHelper::getAllDataSequencesByRole( aSequences , "values", true ) ); if( !aValuesSeries.empty() ) { Reference< chart2::data::XDataSequence > xSeq( aValuesSeries.front()->getValues() ); @@ -513,7 +513,7 @@ void SAL_CALL DataSeries::removeRegressionCurve( ::std::find( m_aRegressionCurves.begin(), m_aRegressionCurves.end(), xRegressionCurve ) ); if( aIt == m_aRegressionCurves.end()) throw container::NoSuchElementException( - C2U( "The given regression curve is no element of this series" ), + "The given regression curve is no element of this series", static_cast< uno::XWeak * >( this )); m_aRegressionCurves.erase( aIt ); } @@ -616,7 +616,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( DataSeries, DataSeries_Base, OPropertySet ) // implement XServiceInfo methods basing upon getSupportedServiceNames_Static APPHELPER_XSERVICEINFO_IMPL( DataSeries, - C2U( "com.sun.star.comp.chart.DataSeries" )); + OUString("com.sun.star.comp.chart.DataSeries") ); } // namespace chart diff --git a/chart2/source/model/main/DataSeriesProperties.cxx b/chart2/source/model/main/DataSeriesProperties.cxx index 941d1bdf29f8..74ca6183f34c 100644 --- a/chart2/source/model/main/DataSeriesProperties.cxx +++ b/chart2/source/model/main/DataSeriesProperties.cxx @@ -40,28 +40,28 @@ void DataSeriesProperties::AddPropertiesToVector( ::std::vector< Property > & rOutProperties ) { rOutProperties.push_back( - Property( C2U( "AttributedDataPoints" ), + Property( "AttributedDataPoints", PROP_DATASERIES_ATTRIBUTED_DATA_POINTS, ::getCppuType( reinterpret_cast< const uno::Sequence< sal_Int32 > * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( - Property( C2U( "StackingDirection" ), + Property( "StackingDirection", PROP_DATASERIES_STACKING_DIRECTION, ::getCppuType( reinterpret_cast< const chart2::StackingDirection * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "VaryColorsByPoint" ), + Property( "VaryColorsByPoint", PROP_DATASERIES_VARY_COLORS_BY_POINT, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "AttachedAxisIndex" ), + Property( "AttachedAxisIndex", PROP_DATASERIES_ATTACHED_AXIS_INDEX, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND diff --git a/chart2/source/model/main/Diagram.cxx b/chart2/source/model/main/Diagram.cxx index 1cca41cb71a2..75c97e173f93 100644 --- a/chart2/source/model/main/Diagram.cxx +++ b/chart2/source/model/main/Diagram.cxx @@ -80,88 +80,88 @@ void lcl_AddPropertiesToVector( ::std::vector< Property > & rOutProperties ) { rOutProperties.push_back( - Property( C2U( "RelativePosition" ), + Property( "RelativePosition", PROP_DIAGRAM_REL_POS, ::getCppuType( reinterpret_cast< const chart2::RelativePosition * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( - Property( C2U( "RelativeSize" ), + Property( "RelativeSize", PROP_DIAGRAM_REL_SIZE, ::getCppuType( reinterpret_cast< const chart2::RelativeSize * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( - Property( C2U( "PosSizeExcludeAxes" ), + Property( "PosSizeExcludeAxes", PROP_DIAGRAM_POSSIZE_EXCLUDE_LABELS, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "SortByXValues" ), + Property( "SortByXValues", PROP_DIAGRAM_SORT_BY_X_VALUES, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U("ConnectBars"), + Property( "ConnectBars", PROP_DIAGRAM_CONNECT_BARS, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U("GroupBarsPerAxis"), + Property( "GroupBarsPerAxis", PROP_DIAGRAM_GROUP_BARS_PER_AXIS, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U("IncludeHiddenCells"), + Property( "IncludeHiddenCells", PROP_DIAGRAM_INCLUDE_HIDDEN_CELLS, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "StartingAngle" ), + Property( "StartingAngle", PROP_DIAGRAM_STARTING_ANGLE, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U("RightAngledAxes"), + Property( "RightAngledAxes", PROP_DIAGRAM_RIGHT_ANGLED_AXES, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U("Perspective"), + Property( "Perspective", PROP_DIAGRAM_PERSPECTIVE, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( - Property( C2U("RotationHorizontal"), + Property( "RotationHorizontal", PROP_DIAGRAM_ROTATION_HORIZONTAL, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( - Property( C2U("RotationVertical"), + Property( "RotationVertical", PROP_DIAGRAM_ROTATION_VERTICAL, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( - Property( C2U( "MissingValueTreatment" ), + Property( "MissingValueTreatment", PROP_DIAGRAM_MISSING_VALUE_TREATMENT, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND @@ -425,11 +425,11 @@ void SAL_CALL Diagram::setDiagramData( throw (uno::RuntimeException) { uno::Reference< lang::XMultiServiceFactory > xChartTypeManager( m_xContext->getServiceManager()->createInstanceWithContext( - C2U( "com.sun.star.chart2.ChartTypeManager" ), m_xContext ), uno::UNO_QUERY ); + "com.sun.star.chart2.ChartTypeManager", m_xContext ), uno::UNO_QUERY ); DiagramHelper::tTemplateWithServiceName aTemplateAndService = DiagramHelper::getTemplateForDiagram( this, xChartTypeManager ); uno::Reference< chart2::XChartTypeTemplate > xTemplate( aTemplateAndService.first ); if( !xTemplate.is() ) - xTemplate.set( xChartTypeManager->createInstance( C2U("com.sun.star.chart2.template.Column") ), uno::UNO_QUERY ); + xTemplate.set( xChartTypeManager->createInstance( "com.sun.star.chart2.template.Column" ), uno::UNO_QUERY ); if(!xTemplate.is()) return; xTemplate->changeDiagramData( this, xDataSource, aArguments ); @@ -514,7 +514,7 @@ void SAL_CALL Diagram::removeCoordinateSystem( aIt( ::std::find( m_aCoordSystems.begin(), m_aCoordSystems.end(), aCoordSys )); if( aIt == m_aCoordSystems.end()) throw container::NoSuchElementException( - C2U( "The given coordinate-system is no element of the container" ), + "The given coordinate-system is no element of the container", static_cast< uno::XWeak * >( this )); m_aCoordSystems.erase( aIt ); } @@ -619,9 +619,9 @@ Sequence< OUString > Diagram::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 3 ); - aServices[ 0 ] = C2U( "com.sun.star.chart2.Diagram" ); - aServices[ 1 ] = C2U( "com.sun.star.layout.LayoutElement" ); - aServices[ 2 ] = C2U( "com.sun.star.beans.PropertySet" ); + aServices[ 0 ] = "com.sun.star.chart2.Diagram"; + aServices[ 1 ] = "com.sun.star.layout.LayoutElement"; + aServices[ 2 ] = "com.sun.star.beans.PropertySet"; return aServices; } @@ -716,7 +716,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( Diagram, Diagram_Base, ::property::OPropertySe // implement XServiceInfo methods basing upon getSupportedServiceNames_Static APPHELPER_XSERVICEINFO_IMPL( Diagram, - C2U( "com.sun.star.comp.chart2.Diagram" )); + OUString("com.sun.star.comp.chart2.Diagram") ); } // namespace chart diff --git a/chart2/source/model/main/FormattedString.cxx b/chart2/source/model/main/FormattedString.cxx index bdb71320e096..e21beed575df 100644 --- a/chart2/source/model/main/FormattedString.cxx +++ b/chart2/source/model/main/FormattedString.cxx @@ -207,8 +207,8 @@ Sequence< OUString > FormattedString::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 2 ); - aServices[ 0 ] = C2U( "com.sun.star.chart2.FormattedString" ); - aServices[ 1 ] = C2U( "com.sun.star.beans.PropertySet" ); + aServices[ 0 ] = "com.sun.star.chart2.FormattedString"; + aServices[ 1 ] = "com.sun.star.beans.PropertySet"; return aServices; } @@ -248,7 +248,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( FormattedString, FormattedString_Base, ::prope // implement XServiceInfo methods basing upon getSupportedServiceNames_Static APPHELPER_XSERVICEINFO_IMPL( FormattedString, - C2U( "com.sun.star.comp.chart.FormattedString" )); + OUString("com.sun.star.comp.chart.FormattedString") ); } // namespace chart diff --git a/chart2/source/model/main/GridProperties.cxx b/chart2/source/model/main/GridProperties.cxx index ec947bdd219f..77e009be2f2c 100644 --- a/chart2/source/model/main/GridProperties.cxx +++ b/chart2/source/model/main/GridProperties.cxx @@ -54,7 +54,7 @@ void lcl_AddPropertiesToVector( ::std::vector< Property > & rOutProperties ) { rOutProperties.push_back( - Property( C2U( "Show" ), + Property( "Show", PROP_GRID_SHOW, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND @@ -247,8 +247,8 @@ void GridProperties::fireModifyEvent() Sequence< OUString > GridProperties::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 2 ); - aServices[ 0 ] = C2U( "com.sun.star.chart2.GridProperties" ); - aServices[ 1 ] = C2U( "com.sun.star.beans.PropertySet" ); + aServices[ 0 ] = "com.sun.star.chart2.GridProperties"; + aServices[ 1 ] = "com.sun.star.beans.PropertySet"; return aServices; } diff --git a/chart2/source/model/main/Legend.cxx b/chart2/source/model/main/Legend.cxx index 5e1656f48316..353d1e9eeb0c 100644 --- a/chart2/source/model/main/Legend.cxx +++ b/chart2/source/model/main/Legend.cxx @@ -65,41 +65,41 @@ void lcl_AddPropertiesToVector( ::std::vector< Property > & rOutProperties ) { rOutProperties.push_back( - Property( C2U( "AnchorPosition" ), + Property( "AnchorPosition", PROP_LEGEND_ANCHOR_POSITION, ::getCppuType( reinterpret_cast< const chart2::LegendPosition * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "Expansion" ), + Property( "Expansion", PROP_LEGEND_EXPANSION, ::getCppuType( reinterpret_cast< const ::com::sun::star::chart::ChartLegendExpansion * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "Show" ), + Property( "Show", PROP_LEGEND_SHOW, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "ReferencePageSize" ), + Property( "ReferencePageSize", PROP_LEGEND_REF_PAGE_SIZE, ::getCppuType( reinterpret_cast< const awt::Size * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( - Property( C2U( "RelativePosition" ), + Property( "RelativePosition", PROP_LEGEND_REL_POS, ::getCppuType( reinterpret_cast< const chart2::RelativePosition * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( - Property( C2U( "RelativeSize" ), + Property( "RelativeSize", PROP_LEGEND_REL_SIZE, ::getCppuType( reinterpret_cast< const chart2::RelativeSize * >(0)), beans::PropertyAttribute::BOUND @@ -271,12 +271,12 @@ Sequence< OUString > Legend::getSupportedServiceNames_Static() const sal_Int32 nNumServices( 6 ); sal_Int32 nI = 0; Sequence< OUString > aServices( nNumServices ); - aServices[ nI++ ] = C2U( "com.sun.star.chart2.Legend" ); - aServices[ nI++ ] = C2U( "com.sun.star.beans.PropertySet" ); - aServices[ nI++ ] = C2U( "com.sun.star.drawing.FillProperties" ); - aServices[ nI++ ] = C2U( "com.sun.star.drawing.LineProperties" ); - aServices[ nI++ ] = C2U( "com.sun.star.style.CharacterProperties" ); - aServices[ nI++ ] = C2U( "com.sun.star.layout.LayoutElement" ); + aServices[ nI++ ] = "com.sun.star.chart2.Legend"; + aServices[ nI++ ] = "com.sun.star.beans.PropertySet"; + aServices[ nI++ ] = "com.sun.star.drawing.FillProperties"; + aServices[ nI++ ] = "com.sun.star.drawing.LineProperties"; + aServices[ nI++ ] = "com.sun.star.style.CharacterProperties"; + aServices[ nI++ ] = "com.sun.star.layout.LayoutElement"; OSL_ASSERT( nNumServices == nI ); return aServices; } diff --git a/chart2/source/model/main/PageBackground.cxx b/chart2/source/model/main/PageBackground.cxx index dce468a589df..83a4c8e02ea8 100644 --- a/chart2/source/model/main/PageBackground.cxx +++ b/chart2/source/model/main/PageBackground.cxx @@ -224,8 +224,8 @@ void PageBackground::fireModifyEvent() uno::Sequence< ::rtl::OUString > PageBackground::getSupportedServiceNames_Static() { uno::Sequence< ::rtl::OUString > aServices( 2 ); - aServices[ 0 ] = C2U( "com.sun.star.chart2.PageBackground" ); - aServices[ 1 ] = C2U( "com.sun.star.beans.PropertySet" ); + aServices[ 0 ] = "com.sun.star.chart2.PageBackground"; + aServices[ 1 ] = "com.sun.star.beans.PropertySet"; return aServices; } diff --git a/chart2/source/model/main/PolarCoordinateSystem.cxx b/chart2/source/model/main/PolarCoordinateSystem.cxx index 6f34cc44a9dc..d82b09369e7c 100644 --- a/chart2/source/model/main/PolarCoordinateSystem.cxx +++ b/chart2/source/model/main/PolarCoordinateSystem.cxx @@ -91,7 +91,7 @@ Sequence< OUString > PolarCoordinateSystem::getSupportedServiceNames_Static() // implement XServiceInfo methods basing upon getSupportedServiceNames_Static APPHELPER_XSERVICEINFO_IMPL( PolarCoordinateSystem, - C2U( "com.sun.star.comp.chart.PolarCoordinateSystem" )) + OUString("com.sun.star.comp.chart.PolarCoordinateSystem") ) // ================================= diff --git a/chart2/source/model/main/StockBar.cxx b/chart2/source/model/main/StockBar.cxx index 0fbf2e648c1d..f0d440f6f36f 100644 --- a/chart2/source/model/main/StockBar.cxx +++ b/chart2/source/model/main/StockBar.cxx @@ -236,8 +236,8 @@ void StockBar::fireModifyEvent() uno::Sequence< ::rtl::OUString > StockBar::getSupportedServiceNames_Static() { uno::Sequence< ::rtl::OUString > aServices( 2 ); - aServices[ 0 ] = C2U( "com.sun.star.chart2.StockBar" ); - aServices[ 1 ] = C2U( "com.sun.star.beans.PropertySet" ); + aServices[ 0 ] = "com.sun.star.chart2.StockBar"; + aServices[ 1 ] = "com.sun.star.beans.PropertySet"; return aServices; } diff --git a/chart2/source/model/main/Title.cxx b/chart2/source/model/main/Title.cxx index fc3769d9c3ef..8295a390926f 100644 --- a/chart2/source/model/main/Title.cxx +++ b/chart2/source/model/main/Title.cxx @@ -70,76 +70,76 @@ void lcl_AddPropertiesToVector( ::std::vector< Property > & rOutProperties ) { rOutProperties.push_back( - Property( C2U( "ParaAdjust" ), + Property( "ParaAdjust", PROP_TITLE_PARA_ADJUST, ::getCppuType( reinterpret_cast< ::com::sun::star::style::ParagraphAdjust * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "ParaLastLineAdjust" ), + Property( "ParaLastLineAdjust", PROP_TITLE_PARA_LAST_LINE_ADJUST, ::getCppuType( reinterpret_cast< sal_Int16 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "ParaLeftMargin" ), + Property( "ParaLeftMargin", PROP_TITLE_PARA_LEFT_MARGIN, ::getCppuType( reinterpret_cast< sal_Int32 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "ParaRightMargin" ), + Property( "ParaRightMargin", PROP_TITLE_PARA_RIGHT_MARGIN, ::getCppuType( reinterpret_cast< sal_Int32 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "ParaTopMargin" ), + Property( "ParaTopMargin", PROP_TITLE_PARA_TOP_MARGIN, ::getCppuType( reinterpret_cast< sal_Int32 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "ParaBottomMargin" ), + Property( "ParaBottomMargin", PROP_TITLE_PARA_BOTTOM_MARGIN, ::getCppuType( reinterpret_cast< sal_Int32 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "ParaIsHyphenation" ), + Property( "ParaIsHyphenation", PROP_TITLE_PARA_IS_HYPHENATION, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "TextRotation" ), + Property( "TextRotation", PROP_TITLE_TEXT_ROTATION, ::getCppuType( reinterpret_cast< const double * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "StackCharacters" ), + Property( "StackCharacters", PROP_TITLE_TEXT_STACKED, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "RelativePosition" ), + Property( "RelativePosition", PROP_TITLE_REL_POS, ::getCppuType( reinterpret_cast< const chart2::RelativePosition * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( - Property( C2U( "ReferencePageSize" ), + Property( "ReferencePageSize", PROP_TITLE_REF_PAGE_SIZE, ::getCppuType( reinterpret_cast< const awt::Size * >(0)), beans::PropertyAttribute::BOUND @@ -377,10 +377,10 @@ void Title::fireModifyEvent() uno::Sequence< ::rtl::OUString > Title::getSupportedServiceNames_Static() { uno::Sequence< ::rtl::OUString > aServices( 4 ); - aServices[ 0 ] = C2U( "com.sun.star.chart2.Title" ); - aServices[ 1 ] = C2U( "com.sun.star.style.ParagraphProperties" ); - aServices[ 2 ] = C2U( "com.sun.star.beans.PropertySet" ); - aServices[ 3 ] = C2U( "com.sun.star.layout.LayoutElement" ); + aServices[ 0 ] = "com.sun.star.chart2.Title"; + aServices[ 1 ] = "com.sun.star.style.ParagraphProperties"; + aServices[ 2 ] = "com.sun.star.beans.PropertySet"; + aServices[ 3 ] = "com.sun.star.layout.LayoutElement"; return aServices; } diff --git a/chart2/source/model/main/Wall.cxx b/chart2/source/model/main/Wall.cxx index 2f56aa568909..4947f259e180 100644 --- a/chart2/source/model/main/Wall.cxx +++ b/chart2/source/model/main/Wall.cxx @@ -227,8 +227,8 @@ void Wall::fireModifyEvent() uno::Sequence< ::rtl::OUString > Wall::getSupportedServiceNames_Static() { uno::Sequence< ::rtl::OUString > aServices( 2 ); - aServices[ 0 ] = C2U( "com.sun.star.chart2.Wall" ); - aServices[ 1 ] = C2U( "com.sun.star.beans.PropertySet" ); + aServices[ 0 ] = "com.sun.star.chart2.Wall"; + aServices[ 1 ] = "com.sun.star.beans.PropertySet"; return aServices; } diff --git a/chart2/source/model/template/AreaChartType.cxx b/chart2/source/model/template/AreaChartType.cxx index a00dc9dac108..2a06ac188695 100644 --- a/chart2/source/model/template/AreaChartType.cxx +++ b/chart2/source/model/template/AreaChartType.cxx @@ -56,13 +56,13 @@ uno::Sequence< ::rtl::OUString > AreaChartType::getSupportedServiceNames_Static( { uno::Sequence< ::rtl::OUString > aServices( 2 ); aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_AREA; - aServices[ 1 ] = C2U( "com.sun.star.chart2.ChartType" ); + aServices[ 1 ] = "com.sun.star.chart2.ChartType"; return aServices; } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static APPHELPER_XSERVICEINFO_IMPL( AreaChartType, - C2U( "com.sun.star.comp.chart.AreaChartType" )); + OUString("com.sun.star.comp.chart.AreaChartType") ); } // namespace chart diff --git a/chart2/source/model/template/AreaChartTypeTemplate.cxx b/chart2/source/model/template/AreaChartTypeTemplate.cxx index 7b63bee3908f..695d662da3db 100644 --- a/chart2/source/model/template/AreaChartTypeTemplate.cxx +++ b/chart2/source/model/template/AreaChartTypeTemplate.cxx @@ -53,7 +53,7 @@ void lcl_AddPropertiesToVector( ::std::vector< Property > & rOutProperties ) { rOutProperties.push_back( - Property( C2U( "Dimension" ), + Property( "Dimension", PROP_AREA_TEMPLATE_DIMENSION, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND @@ -194,7 +194,7 @@ void SAL_CALL AreaChartTypeTemplate::applyStyle( throw (uno::RuntimeException) { ChartTypeTemplate::applyStyle( xSeries, nChartTypeIndex, nSeriesIndex, nSeriesCount ); - DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, C2U( "BorderStyle" ), uno::makeAny( drawing::LineStyle_NONE ) ); + DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "BorderStyle", uno::makeAny( drawing::LineStyle_NONE ) ); } void SAL_CALL AreaChartTypeTemplate::resetStyles( const Reference< chart2::XDiagram >& xDiagram ) @@ -211,9 +211,9 @@ void SAL_CALL AreaChartTypeTemplate::resetStyles( const Reference< chart2::XDiag Reference< beans::XPropertySet > xProp( *aIt, uno::UNO_QUERY ); if( xState.is() && xProp.is() && - xProp->getPropertyValue( C2U("BorderStyle")) == aLineStyleAny ) + xProp->getPropertyValue( "BorderStyle") == aLineStyleAny ) { - xState->setPropertyToDefault( C2U("BorderStyle")); + xState->setPropertyToDefault( "BorderStyle"); } } } @@ -253,7 +253,7 @@ uno::Sequence< ::rtl::OUString > AreaChartTypeTemplate::getSupportedServiceNames { uno::Sequence< ::rtl::OUString > aServices( 2 ); aServices[ 0 ] = lcl_aServiceName; - aServices[ 1 ] = C2U( "com.sun.star.chart2.ChartTypeTemplate" ); + aServices[ 1 ] = "com.sun.star.chart2.ChartTypeTemplate"; return aServices; } diff --git a/chart2/source/model/template/BarChartType.cxx b/chart2/source/model/template/BarChartType.cxx index 5450bc9bee90..cec160893c6c 100644 --- a/chart2/source/model/template/BarChartType.cxx +++ b/chart2/source/model/template/BarChartType.cxx @@ -57,13 +57,13 @@ uno::Sequence< ::rtl::OUString > BarChartType::getSupportedServiceNames_Static() { uno::Sequence< ::rtl::OUString > aServices( 2 ); aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_BAR; - aServices[ 1 ] = C2U( "com.sun.star.chart2.ChartType" ); + aServices[ 1 ] = "com.sun.star.chart2.ChartType"; return aServices; } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static APPHELPER_XSERVICEINFO_IMPL( BarChartType, - C2U( "com.sun.star.comp.chart.BarChartType" )); + OUString("com.sun.star.comp.chart.BarChartType") ); } // namespace chart diff --git a/chart2/source/model/template/BarChartTypeTemplate.cxx b/chart2/source/model/template/BarChartTypeTemplate.cxx index 49c51d56be05..7f936b4f1b5b 100644 --- a/chart2/source/model/template/BarChartTypeTemplate.cxx +++ b/chart2/source/model/template/BarChartTypeTemplate.cxx @@ -54,13 +54,13 @@ void lcl_AddPropertiesToVector( ::std::vector< Property > & rOutProperties ) { rOutProperties.push_back( - Property( C2U( "Dimension" ), + Property( "Dimension", PROP_BAR_TEMPLATE_DIMENSION, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "Geometry3D" ), + Property( "Geometry3D", PROP_BAR_TEMPLATE_GEOMETRY3D, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND @@ -264,7 +264,7 @@ void SAL_CALL BarChartTypeTemplate::applyStyle( throw (uno::RuntimeException) { ChartTypeTemplate::applyStyle( xSeries, nChartTypeIndex, nSeriesIndex, nSeriesCount ); - DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, C2U( "BorderStyle" ), uno::makeAny( drawing::LineStyle_NONE ) ); + DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "BorderStyle", uno::makeAny( drawing::LineStyle_NONE ) ); if( getDimension() == 3 ) { try @@ -272,7 +272,7 @@ void SAL_CALL BarChartTypeTemplate::applyStyle( //apply Geometry3D uno::Any aAGeometry3D; this->getFastPropertyValue( aAGeometry3D, PROP_BAR_TEMPLATE_GEOMETRY3D ); - DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, C2U( "Geometry3D" ), aAGeometry3D ); + DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "Geometry3D", aAGeometry3D ); } catch( const uno::Exception & ex ) { @@ -296,12 +296,12 @@ void SAL_CALL BarChartTypeTemplate::resetStyles( if( xState.is()) { if( getDimension() == 3 ) - xState->setPropertyToDefault( C2U("Geometry3D")); + xState->setPropertyToDefault( "Geometry3D"); Reference< beans::XPropertySet > xProp( xState, uno::UNO_QUERY ); if( xProp.is() && - xProp->getPropertyValue( C2U("BorderStyle")) == aLineStyleAny ) + xProp->getPropertyValue( "BorderStyle") == aLineStyleAny ) { - xState->setPropertyToDefault( C2U("BorderStyle")); + xState->setPropertyToDefault( "BorderStyle"); } } } @@ -325,7 +325,7 @@ Sequence< OUString > BarChartTypeTemplate::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 2 ); aServices[ 0 ] = lcl_aServiceName; - aServices[ 1 ] = C2U( "com.sun.star.chart2.ChartTypeTemplate" ); + aServices[ 1 ] = "com.sun.star.chart2.ChartTypeTemplate"; return aServices; } diff --git a/chart2/source/model/template/BubbleChartType.cxx b/chart2/source/model/template/BubbleChartType.cxx index aff8baa2d17d..d18219356b6a 100644 --- a/chart2/source/model/template/BubbleChartType.cxx +++ b/chart2/source/model/template/BubbleChartType.cxx @@ -169,17 +169,17 @@ uno::Sequence< ::rtl::OUString > SAL_CALL BubbleChartType::getSupportedMandatory { uno::Sequence< ::rtl::OUString > aMandRolesSeq(4); aMandRolesSeq.realloc( 4 ); - aMandRolesSeq[0] = C2U( "label" ); - aMandRolesSeq[1] = C2U( "values-x" ); - aMandRolesSeq[2] = C2U( "values-y" ); - aMandRolesSeq[3] = C2U( "values-size" ); + aMandRolesSeq[0] = "label"; + aMandRolesSeq[1] = "values-x"; + aMandRolesSeq[2] = "values-y"; + aMandRolesSeq[3] = "values-size"; return aMandRolesSeq; } OUString SAL_CALL BubbleChartType::getRoleOfSequenceForSeriesLabel() throw (uno::RuntimeException) { - return C2U( "values-size" ); + return OUString("values-size"); } // ____ OPropertySet ____ @@ -210,14 +210,14 @@ uno::Sequence< ::rtl::OUString > BubbleChartType::getSupportedServiceNames_Stati { uno::Sequence< ::rtl::OUString > aServices( 3 ); aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE; - aServices[ 1 ] = C2U( "com.sun.star.chart2.ChartType" ); - aServices[ 2 ] = C2U( "com.sun.star.beans.PropertySet" ); + aServices[ 1 ] = "com.sun.star.chart2.ChartType"; + aServices[ 2 ] = "com.sun.star.beans.PropertySet"; return aServices; } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static APPHELPER_XSERVICEINFO_IMPL( BubbleChartType, - C2U( "com.sun.star.comp.chart.BubbleChartType" )); + OUString("com.sun.star.comp.chart.BubbleChartType") ); } // namespace chart diff --git a/chart2/source/model/template/BubbleChartTypeTemplate.cxx b/chart2/source/model/template/BubbleChartTypeTemplate.cxx index b48c3696578f..79fef5d67752 100644 --- a/chart2/source/model/template/BubbleChartTypeTemplate.cxx +++ b/chart2/source/model/template/BubbleChartTypeTemplate.cxx @@ -164,7 +164,7 @@ void SAL_CALL BubbleChartTypeTemplate::applyStyle( throw (uno::RuntimeException) { ChartTypeTemplate::applyStyle( xSeries, nChartTypeIndex, nSeriesIndex, nSeriesCount ); - DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, C2U( "BorderStyle" ), uno::makeAny( drawing::LineStyle_NONE ) ); + DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "BorderStyle", uno::makeAny( drawing::LineStyle_NONE ) ); try { @@ -279,7 +279,7 @@ Sequence< OUString > BubbleChartTypeTemplate::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 2 ); aServices[ 0 ] = lcl_aServiceName; - aServices[ 1 ] = C2U( "com.sun.star.chart2.ChartTypeTemplate" ); + aServices[ 1 ] = "com.sun.star.chart2.ChartTypeTemplate"; return aServices; } diff --git a/chart2/source/model/template/BubbleDataInterpreter.cxx b/chart2/source/model/template/BubbleDataInterpreter.cxx index 9e7db81b72c2..be2f1f0aee3f 100644 --- a/chart2/source/model/template/BubbleDataInterpreter.cxx +++ b/chart2/source/model/template/BubbleDataInterpreter.cxx @@ -86,7 +86,7 @@ chart2::InterpretedData SAL_CALL BubbleDataInterpreter::interpretDataSource( xCategories.set( aData[nDataIdx] ); if( xCategories.is()) { - SetRole( xCategories->getValues(), C2U("categories")); + SetRole( xCategories->getValues(), "categories"); if( bUseCategoriesAsX ) { bSetXValues = false; @@ -99,20 +99,20 @@ chart2::InterpretedData SAL_CALL BubbleDataInterpreter::interpretDataSource( { xValuesX.set( aData[nDataIdx] ); if( xValuesX.is()) - SetRole( xValuesX->getValues(), C2U("values-x")); + SetRole( xValuesX->getValues(), "values-x"); } else if( bNextIsYValues ) { aYValuesVector.push_back( aData[nDataIdx] ); if( aData[nDataIdx].is()) - SetRole( aData[nDataIdx]->getValues(), C2U("values-y")); + SetRole( aData[nDataIdx]->getValues(), "values-y"); bNextIsYValues = false; } else if( !bNextIsYValues ) { aSizeValuesVector.push_back( aData[nDataIdx] ); if( aData[nDataIdx].is()) - SetRole( aData[nDataIdx]->getValues(), C2U("values-size")); + SetRole( aData[nDataIdx]->getValues(), "values-size"); bNextIsYValues = (nDataSeqCount-(nDataIdx+1)) >= 2;//two or more left } } @@ -179,11 +179,11 @@ chart2::InterpretedData SAL_CALL BubbleDataInterpreter::reinterpretDataSeries( Sequence< Reference< data::XLabeledDataSequence > > aNewSequences; Reference< data::XLabeledDataSequence > xValuesSize( - DataSeriesHelper::getDataSequenceByRole( xSeriesSource, C2U("values-size"), false )); + DataSeriesHelper::getDataSequenceByRole( xSeriesSource, "values-size", false )); Reference< data::XLabeledDataSequence > xValuesY( - DataSeriesHelper::getDataSequenceByRole( xSeriesSource, C2U("values-y"), false )); + DataSeriesHelper::getDataSequenceByRole( xSeriesSource, "values-y", false )); Reference< data::XLabeledDataSequence > xValuesX( - DataSeriesHelper::getDataSequenceByRole( xSeriesSource, C2U("values-x"), false )); + DataSeriesHelper::getDataSequenceByRole( xSeriesSource, "values-x", false )); if( ! xValuesX.is() || ! xValuesY.is() || @@ -191,7 +191,7 @@ chart2::InterpretedData SAL_CALL BubbleDataInterpreter::reinterpretDataSeries( { vector< Reference< data::XLabeledDataSequence > > aValueSeqVec( DataSeriesHelper::getAllDataSequencesByRole( - xSeriesSource->getDataSequences(), C2U("values"), true )); + xSeriesSource->getDataSequences(), "values", true )); if( xValuesX.is()) aValueSeqVec.erase( find( aValueSeqVec.begin(), aValueSeqVec.end(), xValuesX )); if( xValuesY.is()) @@ -206,7 +206,7 @@ chart2::InterpretedData SAL_CALL BubbleDataInterpreter::reinterpretDataSeries( { xValuesSize.set( aValueSeqVec[nIndex++] ); if( xValuesSize.is()) - SetRole( xValuesSize->getValues(), C2U("values-size")); + SetRole( xValuesSize->getValues(), "values-size"); } if( ! xValuesY.is() && @@ -214,7 +214,7 @@ chart2::InterpretedData SAL_CALL BubbleDataInterpreter::reinterpretDataSeries( { xValuesY.set( aValueSeqVec[nIndex++] ); if( xValuesY.is()) - SetRole( xValuesY->getValues(), C2U("values-y")); + SetRole( xValuesY->getValues(), "values-y"); } if( ! xValuesX.is() && @@ -222,7 +222,7 @@ chart2::InterpretedData SAL_CALL BubbleDataInterpreter::reinterpretDataSeries( { xValuesX.set( aValueSeqVec[nIndex++] ); if( xValuesX.is()) - SetRole( xValuesY->getValues(), C2U("values-x")); + SetRole( xValuesY->getValues(), "values-x"); } } if( xValuesSize.is()) diff --git a/chart2/source/model/template/CandleStickChartType.cxx b/chart2/source/model/template/CandleStickChartType.cxx index 7593bee4a06e..d1ccc532ef0e 100644 --- a/chart2/source/model/template/CandleStickChartType.cxx +++ b/chart2/source/model/template/CandleStickChartType.cxx @@ -52,33 +52,33 @@ void lcl_AddPropertiesToVector( ::std::vector< Property > & rOutProperties ) { rOutProperties.push_back( - Property( C2U( "Japanese" ), + Property( "Japanese", PROP_CANDLESTICKCHARTTYPE_JAPANESE, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "WhiteDay" ), + Property( "WhiteDay", PROP_CANDLESTICKCHARTTYPE_WHITE_DAY, ::getCppuType( reinterpret_cast< Reference< beans::XPropertySet > *>(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( - Property( C2U( "BlackDay" ), + Property( "BlackDay", PROP_CANDLESTICKCHARTTYPE_BLACK_DAY, ::getCppuType( reinterpret_cast< Reference< beans::XPropertySet > *>(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( - Property( C2U( "ShowFirst" ), + Property( "ShowFirst", PROP_CANDLESTICKCHARTTYPE_SHOW_FIRST, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "ShowHighLow" ), + Property( "ShowHighLow", PROP_CANDLESTICKCHARTTYPE_SHOW_HIGH_LOW, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND @@ -232,17 +232,17 @@ uno::Sequence< ::rtl::OUString > SAL_CALL CandleStickChartType::getSupportedMand ::std::vector< OUString > aMandRoles; - aMandRoles.push_back( C2U( "label" )); + aMandRoles.push_back( "label"); if( bShowFirst ) - aMandRoles.push_back( C2U( "values-first" )); + aMandRoles.push_back( "values-first"); if( bShowHiLow ) { - aMandRoles.push_back( C2U( "values-min" )); - aMandRoles.push_back( C2U( "values-max" )); + aMandRoles.push_back( "values-min"); + aMandRoles.push_back( "values-max"); } - aMandRoles.push_back( C2U( "values-last" )); + aMandRoles.push_back( "values-last"); return ContainerHelper::ContainerToSequence( aMandRoles ); } @@ -258,12 +258,12 @@ Sequence< OUString > SAL_CALL CandleStickChartType::getSupportedOptionalRoles() ::std::vector< OUString > aOptRoles; if( ! bShowFirst ) - aOptRoles.push_back( C2U( "values-first" )); + aOptRoles.push_back( "values-first"); if( ! bShowHiLow ) { - aOptRoles.push_back( C2U( "values-min" )); - aOptRoles.push_back( C2U( "values-max" )); + aOptRoles.push_back( "values-min"); + aOptRoles.push_back( "values-max"); } return ContainerHelper::ContainerToSequence( aOptRoles ); @@ -272,7 +272,7 @@ Sequence< OUString > SAL_CALL CandleStickChartType::getSupportedOptionalRoles() OUString SAL_CALL CandleStickChartType::getRoleOfSequenceForSeriesLabel() throw (uno::RuntimeException) { - return C2U( "values-last" ); + return OUString("values-last"); } // ____ OPropertySet ____ @@ -332,14 +332,14 @@ uno::Sequence< ::rtl::OUString > CandleStickChartType::getSupportedServiceNames_ { uno::Sequence< ::rtl::OUString > aServices( 3 ); aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK; - aServices[ 1 ] = C2U( "com.sun.star.chart2.ChartType" ); - aServices[ 2 ] = C2U( "com.sun.star.beans.PropertySet" ); + aServices[ 1 ] = "com.sun.star.chart2.ChartType"; + aServices[ 2 ] = "com.sun.star.beans.PropertySet"; return aServices; } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static APPHELPER_XSERVICEINFO_IMPL( CandleStickChartType, - C2U( "com.sun.star.comp.chart.CandleStickChartType" )); + OUString("com.sun.star.comp.chart.CandleStickChartType") ); } // namespace chart diff --git a/chart2/source/model/template/ChartType.cxx b/chart2/source/model/template/ChartType.cxx index b87107a975f1..d78d16ed0e89 100644 --- a/chart2/source/model/template/ChartType.cxx +++ b/chart2/source/model/template/ChartType.cxx @@ -112,8 +112,8 @@ Sequence< OUString > SAL_CALL ChartType::getSupportedMandatoryRoles() throw (uno::RuntimeException) { Sequence< OUString > aDefaultSeq(2); - aDefaultSeq[0] = C2U( "label" ); - aDefaultSeq[1] = C2U( "values-y" ); + aDefaultSeq[0] = "label"; + aDefaultSeq[1] = "values-y"; return aDefaultSeq; } @@ -126,7 +126,7 @@ Sequence< OUString > SAL_CALL ChartType::getSupportedOptionalRoles() OUString SAL_CALL ChartType::getRoleOfSequenceForSeriesLabel() throw (uno::RuntimeException) { - return C2U( "values-y" ); + return OUString("values-y"); } void ChartType::impl_addDataSeriesWithoutNotification( @@ -161,7 +161,7 @@ void SAL_CALL ChartType::removeDataSeries( const Reference< chart2::XDataSeries if( aIt == m_aDataSeries.end()) throw container::NoSuchElementException( - C2U( "The given series is no element of this charttype" ), + "The given series is no element of this charttype", static_cast< uno::XWeak * >( this )); ModifyListenerHelper::removeListener( xDataSeries, m_xModifyEventForwarder ); diff --git a/chart2/source/model/template/ChartTypeManager.cxx b/chart2/source/model/template/ChartTypeManager.cxx index 61f55cffd54c..25aba04d05c1 100644 --- a/chart2/source/model/template/ChartTypeManager.cxx +++ b/chart2/source/model/template/ChartTypeManager.cxx @@ -135,72 +135,72 @@ const tTemplateMapType & lcl_DefaultChartTypeMap() { static const tTemplateMapType aMap = tTemplateMapType( ::comphelper::MakeMap< tTemplateMapType::key_type, tTemplateMapType::mapped_type > - ( C2U( "com.sun.star.chart2.template.Symbol" ), TEMPLATE_SYMBOL ) - ( C2U( "com.sun.star.chart2.template.StackedSymbol" ), TEMPLATE_STACKEDSYMBOL ) - ( C2U( "com.sun.star.chart2.template.PercentStackedSymbol" ), TEMPLATE_PERCENTSTACKEDSYMBOL ) - ( C2U( "com.sun.star.chart2.template.Line" ), TEMPLATE_LINE ) - ( C2U( "com.sun.star.chart2.template.StackedLine" ), TEMPLATE_STACKEDLINE ) - ( C2U( "com.sun.star.chart2.template.PercentStackedLine" ), TEMPLATE_PERCENTSTACKEDLINE ) - ( C2U( "com.sun.star.chart2.template.LineSymbol" ), TEMPLATE_LINESYMBOL ) - ( C2U( "com.sun.star.chart2.template.StackedLineSymbol" ), TEMPLATE_STACKEDLINESYMBOL ) - ( C2U( "com.sun.star.chart2.template.PercentStackedLineSymbol" ), TEMPLATE_PERCENTSTACKEDLINESYMBOL ) - ( C2U( "com.sun.star.chart2.template.ThreeDLine" ), TEMPLATE_THREEDLINE ) - ( C2U( "com.sun.star.chart2.template.StackedThreeDLine" ), TEMPLATE_STACKEDTHREEDLINE ) - ( C2U( "com.sun.star.chart2.template.PercentStackedThreeDLine" ), TEMPLATE_PERCENTSTACKEDTHREEDLINE ) - ( C2U( "com.sun.star.chart2.template.ThreeDLineDeep" ), TEMPLATE_THREEDLINEDEEP ) - ( C2U( "com.sun.star.chart2.template.Column" ), TEMPLATE_COLUMN ) - ( C2U( "com.sun.star.chart2.template.StackedColumn" ), TEMPLATE_STACKEDCOLUMN ) - ( C2U( "com.sun.star.chart2.template.PercentStackedColumn" ), TEMPLATE_PERCENTSTACKEDCOLUMN ) - ( C2U( "com.sun.star.chart2.template.Bar" ), TEMPLATE_BAR ) - ( C2U( "com.sun.star.chart2.template.StackedBar" ), TEMPLATE_STACKEDBAR ) - ( C2U( "com.sun.star.chart2.template.PercentStackedBar" ), TEMPLATE_PERCENTSTACKEDBAR ) - ( C2U( "com.sun.star.chart2.template.ThreeDColumnDeep" ), TEMPLATE_THREEDCOLUMNDEEP ) - ( C2U( "com.sun.star.chart2.template.ThreeDColumnFlat" ), TEMPLATE_THREEDCOLUMNFLAT ) - ( C2U( "com.sun.star.chart2.template.StackedThreeDColumnFlat" ), TEMPLATE_STACKEDTHREEDCOLUMNFLAT ) - ( C2U( "com.sun.star.chart2.template.PercentStackedThreeDColumnFlat" ), TEMPLATE_PERCENTSTACKEDTHREEDCOLUMNFLAT ) - ( C2U( "com.sun.star.chart2.template.ThreeDBarDeep" ), TEMPLATE_THREEDBARDEEP ) - ( C2U( "com.sun.star.chart2.template.ThreeDBarFlat" ), TEMPLATE_THREEDBARFLAT ) - ( C2U( "com.sun.star.chart2.template.StackedThreeDBarFlat" ), TEMPLATE_STACKEDTHREEDBARFLAT ) - ( C2U( "com.sun.star.chart2.template.PercentStackedThreeDBarFlat" ), TEMPLATE_PERCENTSTACKEDTHREEDBARFLAT ) - ( C2U( "com.sun.star.chart2.template.ColumnWithLine" ), TEMPLATE_COLUMNWITHLINE ) - ( C2U( "com.sun.star.chart2.template.StackedColumnWithLine" ), TEMPLATE_STACKEDCOLUMNWITHLINE ) - ( C2U( "com.sun.star.chart2.template.Area" ), TEMPLATE_AREA ) - ( C2U( "com.sun.star.chart2.template.StackedArea" ), TEMPLATE_STACKEDAREA ) - ( C2U( "com.sun.star.chart2.template.PercentStackedArea" ), TEMPLATE_PERCENTSTACKEDAREA ) - ( C2U( "com.sun.star.chart2.template.ThreeDArea" ), TEMPLATE_THREEDAREA ) - ( C2U( "com.sun.star.chart2.template.StackedThreeDArea" ), TEMPLATE_STACKEDTHREEDAREA ) - ( C2U( "com.sun.star.chart2.template.PercentStackedThreeDArea" ), TEMPLATE_PERCENTSTACKEDTHREEDAREA ) - ( C2U( "com.sun.star.chart2.template.Pie" ), TEMPLATE_PIE ) - ( C2U( "com.sun.star.chart2.template.PieAllExploded" ), TEMPLATE_PIEALLEXPLODED ) - ( C2U( "com.sun.star.chart2.template.Donut" ), TEMPLATE_DONUT ) - ( C2U( "com.sun.star.chart2.template.DonutAllExploded" ), TEMPLATE_DONUTALLEXPLODED ) - ( C2U( "com.sun.star.chart2.template.ThreeDPie" ), TEMPLATE_THREEDPIE ) - ( C2U( "com.sun.star.chart2.template.ThreeDPieAllExploded" ), TEMPLATE_THREEDPIEALLEXPLODED ) - ( C2U( "com.sun.star.chart2.template.ThreeDDonut" ), TEMPLATE_THREEDDONUT ) - ( C2U( "com.sun.star.chart2.template.ThreeDDonutAllExploded" ), TEMPLATE_THREEDDONUTALLEXPLODED ) - ( C2U( "com.sun.star.chart2.template.ScatterLineSymbol" ), TEMPLATE_SCATTERLINESYMBOL ) - ( C2U( "com.sun.star.chart2.template.ScatterLine" ), TEMPLATE_SCATTERLINE ) - ( C2U( "com.sun.star.chart2.template.ScatterSymbol" ), TEMPLATE_SCATTERSYMBOL ) - ( C2U( "com.sun.star.chart2.template.ThreeDScatter" ), TEMPLATE_THREEDSCATTER ) - ( C2U( "com.sun.star.chart2.template.Net" ), TEMPLATE_NET ) - ( C2U( "com.sun.star.chart2.template.NetSymbol" ), TEMPLATE_NETSYMBOL ) - ( C2U( "com.sun.star.chart2.template.NetLine" ), TEMPLATE_NETLINE ) - ( C2U( "com.sun.star.chart2.template.StackedNet" ), TEMPLATE_STACKEDNET ) - ( C2U( "com.sun.star.chart2.template.StackedNetSymbol" ), TEMPLATE_STACKEDNETSYMBOL ) - ( C2U( "com.sun.star.chart2.template.StackedNetLine" ), TEMPLATE_STACKEDNETLINE ) - ( C2U( "com.sun.star.chart2.template.PercentStackedNet" ), TEMPLATE_PERCENTSTACKEDNET ) - ( C2U( "com.sun.star.chart2.template.PercentStackedNetSymbol" ), TEMPLATE_PERCENTSTACKEDNETSYMBOL ) - ( C2U( "com.sun.star.chart2.template.PercentStackedNetLine" ), TEMPLATE_PERCENTSTACKEDNETLINE ) - ( C2U( "com.sun.star.chart2.template.FilledNet" ), TEMPLATE_FILLEDNET ) - ( C2U( "com.sun.star.chart2.template.StackedFilledNet" ), TEMPLATE_STACKEDFILLEDNET ) - ( C2U( "com.sun.star.chart2.template.PercentStackedFilledNet" ), TEMPLATE_PERCENTSTACKEDFILLEDNET ) - ( C2U( "com.sun.star.chart2.template.StockLowHighClose" ), TEMPLATE_STOCKLOWHIGHCLOSE ) - ( C2U( "com.sun.star.chart2.template.StockOpenLowHighClose" ), TEMPLATE_STOCKOPENLOWHIGHCLOSE ) - ( C2U( "com.sun.star.chart2.template.StockVolumeLowHighClose" ), TEMPLATE_STOCKVOLUMELOWHIGHCLOSE ) - ( C2U( "com.sun.star.chart2.template.StockVolumeOpenLowHighClose" ), TEMPLATE_STOCKVOLUMEOPENLOWHIGHCLOSE ) - ( C2U( "com.sun.star.chart2.template.Bubble" ), TEMPLATE_BUBBLE ) -// ( C2U( "com.sun.star.chart2.template.Surface" ), TEMPLATE_SURFACE ) -// ( C2U( "com.sun.star.chart2.template.Addin" ), TEMPLATE_ADDIN ) + ( "com.sun.star.chart2.template.Symbol", TEMPLATE_SYMBOL ) + ( "com.sun.star.chart2.template.StackedSymbol", TEMPLATE_STACKEDSYMBOL ) + ( "com.sun.star.chart2.template.PercentStackedSymbol", TEMPLATE_PERCENTSTACKEDSYMBOL ) + ( "com.sun.star.chart2.template.Line", TEMPLATE_LINE ) + ( "com.sun.star.chart2.template.StackedLine", TEMPLATE_STACKEDLINE ) + ( "com.sun.star.chart2.template.PercentStackedLine", TEMPLATE_PERCENTSTACKEDLINE ) + ( "com.sun.star.chart2.template.LineSymbol", TEMPLATE_LINESYMBOL ) + ( "com.sun.star.chart2.template.StackedLineSymbol", TEMPLATE_STACKEDLINESYMBOL ) + ( "com.sun.star.chart2.template.PercentStackedLineSymbol", TEMPLATE_PERCENTSTACKEDLINESYMBOL ) + ( "com.sun.star.chart2.template.ThreeDLine", TEMPLATE_THREEDLINE ) + ( "com.sun.star.chart2.template.StackedThreeDLine", TEMPLATE_STACKEDTHREEDLINE ) + ( "com.sun.star.chart2.template.PercentStackedThreeDLine", TEMPLATE_PERCENTSTACKEDTHREEDLINE ) + ( "com.sun.star.chart2.template.ThreeDLineDeep", TEMPLATE_THREEDLINEDEEP ) + ( "com.sun.star.chart2.template.Column", TEMPLATE_COLUMN ) + ( "com.sun.star.chart2.template.StackedColumn", TEMPLATE_STACKEDCOLUMN ) + ( "com.sun.star.chart2.template.PercentStackedColumn", TEMPLATE_PERCENTSTACKEDCOLUMN ) + ( "com.sun.star.chart2.template.Bar", TEMPLATE_BAR ) + ( "com.sun.star.chart2.template.StackedBar", TEMPLATE_STACKEDBAR ) + ( "com.sun.star.chart2.template.PercentStackedBar", TEMPLATE_PERCENTSTACKEDBAR ) + ( "com.sun.star.chart2.template.ThreeDColumnDeep", TEMPLATE_THREEDCOLUMNDEEP ) + ( "com.sun.star.chart2.template.ThreeDColumnFlat", TEMPLATE_THREEDCOLUMNFLAT ) + ( "com.sun.star.chart2.template.StackedThreeDColumnFlat", TEMPLATE_STACKEDTHREEDCOLUMNFLAT ) + ( "com.sun.star.chart2.template.PercentStackedThreeDColumnFlat", TEMPLATE_PERCENTSTACKEDTHREEDCOLUMNFLAT ) + ( "com.sun.star.chart2.template.ThreeDBarDeep", TEMPLATE_THREEDBARDEEP ) + ( "com.sun.star.chart2.template.ThreeDBarFlat", TEMPLATE_THREEDBARFLAT ) + ( "com.sun.star.chart2.template.StackedThreeDBarFlat", TEMPLATE_STACKEDTHREEDBARFLAT ) + ( "com.sun.star.chart2.template.PercentStackedThreeDBarFlat", TEMPLATE_PERCENTSTACKEDTHREEDBARFLAT ) + ( "com.sun.star.chart2.template.ColumnWithLine", TEMPLATE_COLUMNWITHLINE ) + ( "com.sun.star.chart2.template.StackedColumnWithLine", TEMPLATE_STACKEDCOLUMNWITHLINE ) + ( "com.sun.star.chart2.template.Area", TEMPLATE_AREA ) + ( "com.sun.star.chart2.template.StackedArea", TEMPLATE_STACKEDAREA ) + ( "com.sun.star.chart2.template.PercentStackedArea", TEMPLATE_PERCENTSTACKEDAREA ) + ( "com.sun.star.chart2.template.ThreeDArea", TEMPLATE_THREEDAREA ) + ( "com.sun.star.chart2.template.StackedThreeDArea", TEMPLATE_STACKEDTHREEDAREA ) + ( "com.sun.star.chart2.template.PercentStackedThreeDArea", TEMPLATE_PERCENTSTACKEDTHREEDAREA ) + ( "com.sun.star.chart2.template.Pie", TEMPLATE_PIE ) + ( "com.sun.star.chart2.template.PieAllExploded", TEMPLATE_PIEALLEXPLODED ) + ( "com.sun.star.chart2.template.Donut", TEMPLATE_DONUT ) + ( "com.sun.star.chart2.template.DonutAllExploded", TEMPLATE_DONUTALLEXPLODED ) + ( "com.sun.star.chart2.template.ThreeDPie", TEMPLATE_THREEDPIE ) + ( "com.sun.star.chart2.template.ThreeDPieAllExploded", TEMPLATE_THREEDPIEALLEXPLODED ) + ( "com.sun.star.chart2.template.ThreeDDonut", TEMPLATE_THREEDDONUT ) + ( "com.sun.star.chart2.template.ThreeDDonutAllExploded", TEMPLATE_THREEDDONUTALLEXPLODED ) + ( "com.sun.star.chart2.template.ScatterLineSymbol", TEMPLATE_SCATTERLINESYMBOL ) + ( "com.sun.star.chart2.template.ScatterLine", TEMPLATE_SCATTERLINE ) + ( "com.sun.star.chart2.template.ScatterSymbol", TEMPLATE_SCATTERSYMBOL ) + ( "com.sun.star.chart2.template.ThreeDScatter", TEMPLATE_THREEDSCATTER ) + ( "com.sun.star.chart2.template.Net", TEMPLATE_NET ) + ( "com.sun.star.chart2.template.NetSymbol", TEMPLATE_NETSYMBOL ) + ( "com.sun.star.chart2.template.NetLine", TEMPLATE_NETLINE ) + ( "com.sun.star.chart2.template.StackedNet", TEMPLATE_STACKEDNET ) + ( "com.sun.star.chart2.template.StackedNetSymbol", TEMPLATE_STACKEDNETSYMBOL ) + ( "com.sun.star.chart2.template.StackedNetLine", TEMPLATE_STACKEDNETLINE ) + ( "com.sun.star.chart2.template.PercentStackedNet", TEMPLATE_PERCENTSTACKEDNET ) + ( "com.sun.star.chart2.template.PercentStackedNetSymbol", TEMPLATE_PERCENTSTACKEDNETSYMBOL ) + ( "com.sun.star.chart2.template.PercentStackedNetLine", TEMPLATE_PERCENTSTACKEDNETLINE ) + ( "com.sun.star.chart2.template.FilledNet", TEMPLATE_FILLEDNET ) + ( "com.sun.star.chart2.template.StackedFilledNet", TEMPLATE_STACKEDFILLEDNET ) + ( "com.sun.star.chart2.template.PercentStackedFilledNet", TEMPLATE_PERCENTSTACKEDFILLEDNET ) + ( "com.sun.star.chart2.template.StockLowHighClose", TEMPLATE_STOCKLOWHIGHCLOSE ) + ( "com.sun.star.chart2.template.StockOpenLowHighClose", TEMPLATE_STOCKOPENLOWHIGHCLOSE ) + ( "com.sun.star.chart2.template.StockVolumeLowHighClose", TEMPLATE_STOCKVOLUMELOWHIGHCLOSE ) + ( "com.sun.star.chart2.template.StockVolumeOpenLowHighClose", TEMPLATE_STOCKVOLUMEOPENLOWHIGHCLOSE ) + ( "com.sun.star.chart2.template.Bubble", TEMPLATE_BUBBLE ) +// ( "com.sun.star.chart2.template.Surface", TEMPLATE_SURFACE ) +// ( "com.sun.star.chart2.template.Addin", TEMPLATE_ADDIN ) ); return aMap; @@ -573,7 +573,7 @@ uno::Sequence< OUString > SAL_CALL ChartTypeManager::getAvailableServiceNames() if( xEnumAcc.is()) { uno::Reference< container::XEnumeration > xEnum( - xEnumAcc->createContentEnumeration( C2U( "com.sun.star.chart2.ChartTypeTemplate" ) )); + xEnumAcc->createContentEnumeration( "com.sun.star.chart2.ChartTypeTemplate" )); if( xEnum.is()) { uno::Reference< uno::XInterface > xFactIntf; @@ -597,8 +597,8 @@ uno::Sequence< OUString > SAL_CALL ChartTypeManager::getAvailableServiceNames() Sequence< OUString > ChartTypeManager::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 2 ); - aServices[ 0 ] = C2U( "com.sun.star.chart2.ChartTypeManager" ); - aServices[ 1 ] = C2U( "com.sun.star.lang.MultiServiceFactory" ); + aServices[ 0 ] = "com.sun.star.chart2.ChartTypeManager"; + aServices[ 1 ] = "com.sun.star.lang.MultiServiceFactory"; return aServices; } @@ -606,7 +606,7 @@ Sequence< OUString > ChartTypeManager::getSupportedServiceNames_Static() // implement XServiceInfo methods basing upon getSupportedServiceNames_Static APPHELPER_XSERVICEINFO_IMPL( ChartTypeManager, - C2U( "com.sun.star.comp.chart.ChartTypeManager" )); + OUString("com.sun.star.comp.chart.ChartTypeManager") ); } // namespace chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx b/chart2/source/model/template/ChartTypeTemplate.cxx index 195dbb2f9f61..3f7899f34e15 100644 --- a/chart2/source/model/template/ChartTypeTemplate.cxx +++ b/chart2/source/model/template/ChartTypeTemplate.cxx @@ -67,7 +67,7 @@ void lcl_applyDefaultStyle( Reference< chart2::XColorScheme > xColorScheme( xDiagram->getDefaultColorScheme()); if( xSeriesProp.is() && xColorScheme.is() ) xSeriesProp->setPropertyValue( - C2U("Color"), + "Color", uno::makeAny( xColorScheme->getColorByIndex( nIndex ))); } } @@ -75,7 +75,7 @@ void lcl_applyDefaultStyle( void lcl_ensureCorrectLabelPlacement( const Reference< beans::XPropertySet >& xProp, const uno::Sequence < sal_Int32 >& rAvailablePlacements ) { sal_Int32 nLabelPlacement=0; - if( xProp.is() && (xProp->getPropertyValue( C2U( "LabelPlacement" ) ) >>= nLabelPlacement) ) + if( xProp.is() && (xProp->getPropertyValue( "LabelPlacement" ) >>= nLabelPlacement) ) { bool bValid = false; for( sal_Int32 nN = 0; nN < rAvailablePlacements.getLength(); nN++ ) @@ -92,7 +92,7 @@ void lcl_ensureCorrectLabelPlacement( const Reference< beans::XPropertySet >& xP //otherwise use the first supported one if( rAvailablePlacements.getLength() ) aNewValue <<=rAvailablePlacements[0]; - xProp->setPropertyValue( C2U("LabelPlacement"), aNewValue ); + xProp->setPropertyValue( "LabelPlacement", aNewValue ); } } } @@ -101,10 +101,10 @@ void lcl_resetLabelPlacementIfDefault( const Reference< beans::XPropertySet >& x { sal_Int32 nLabelPlacement=0; - if( xProp.is() && (xProp->getPropertyValue( C2U( "LabelPlacement" ) ) >>= nLabelPlacement) ) + if( xProp.is() && (xProp->getPropertyValue( "LabelPlacement" ) >>= nLabelPlacement) ) { if( nDefaultPlacement == nLabelPlacement ) - xProp->setPropertyValue( C2U("LabelPlacement"), uno::Any() ); + xProp->setPropertyValue( "LabelPlacement", uno::Any() ); } } @@ -117,9 +117,9 @@ void lcl_ensureCorrectMissingValueTreatment( const Reference< chart2::XDiagram > ::chart::ChartTypeHelper::getSupportedMissingValueTreatments( xChartType ) ); if( aAvailableMissingValueTreatment.getLength() ) - xDiaProp->setPropertyValue( C2U( "MissingValueTreatment" ), uno::makeAny( aAvailableMissingValueTreatment[0] ) ); + xDiaProp->setPropertyValue( "MissingValueTreatment", uno::makeAny( aAvailableMissingValueTreatment[0] ) ); else - xDiaProp->setPropertyValue( C2U( "MissingValueTreatment" ), uno::Any() ); + xDiaProp->setPropertyValue( "MissingValueTreatment", uno::Any() ); } } @@ -152,7 +152,7 @@ uno::Reference< XDiagram > SAL_CALL ChartTypeTemplate::createDiagramByDataSource // create diagram xDia.set( GetComponentContext()->getServiceManager()->createInstanceWithContext( - C2U( "com.sun.star.chart2.Diagram" ), + "com.sun.star.chart2.Diagram", GetComponentContext() ), uno::UNO_QUERY_THROW ); @@ -221,7 +221,7 @@ void SAL_CALL ChartTypeTemplate::changeDiagram( const uno::Reference< XDiagram > if( aData.Categories.is()) { aParam.realloc( 1 ); - aParam[0] = beans::PropertyValue( C2U("HasCategories"), -1, uno::makeAny( true ), + aParam[0] = beans::PropertyValue( "HasCategories", -1, uno::makeAny( true ), beans::PropertyState_DIRECT_VALUE ); } aData = xInterpreter->interpretDataSource( xSource, aParam, aFlatSeriesSeq ); @@ -404,7 +404,7 @@ void SAL_CALL ChartTypeTemplate::applyStyle( : (eStackMode == StackMode_Z_STACKED ) ? chart2::StackingDirection_Z_STACKING : chart2::StackingDirection_NO_STACKING ); - xSeriesProp->setPropertyValue( C2U("StackingDirection"), aPropValue ); + xSeriesProp->setPropertyValue( "StackingDirection", aPropValue ); //ensure valid label placement { @@ -413,7 +413,7 @@ void SAL_CALL ChartTypeTemplate::applyStyle( lcl_ensureCorrectLabelPlacement( xSeriesProp, aAvailablePlacements ); uno::Sequence< sal_Int32 > aAttributedDataPointIndexList; - if( xSeriesProp->getPropertyValue( C2U( "AttributedDataPoints" ) ) >>= aAttributedDataPointIndexList ) + if( xSeriesProp->getPropertyValue( "AttributedDataPoints" ) >>= aAttributedDataPointIndexList ) for(sal_Int32 nN=aAttributedDataPointIndexList.getLength();nN--;) lcl_ensureCorrectLabelPlacement( xSeries->getDataPointByIndex(aAttributedDataPointIndexList[nN]), aAvailablePlacements ); } @@ -458,9 +458,9 @@ void SAL_CALL ChartTypeTemplate::resetStyles( const Reference< chart2::XDiagram if( xAxisProp.is()) { // set number format to source format - uno::Any aValue( xAxisProp->getPropertyValue(C2U("NumberFormat"))); + uno::Any aValue( xAxisProp->getPropertyValue("NumberFormat")); if( aValue.hasValue()) - xAxisProp->setPropertyValue(C2U("NumberFormat"), uno::Any()); + xAxisProp->setPropertyValue("NumberFormat", uno::Any()); } } } @@ -510,7 +510,7 @@ void SAL_CALL ChartTypeTemplate::resetStyles( const Reference< chart2::XDiagram lcl_resetLabelPlacementIfDefault( xSeriesProp, nDefaultPlacement ); uno::Sequence< sal_Int32 > aAttributedDataPointIndexList; - if( xSeriesProp->getPropertyValue( C2U( "AttributedDataPoints" ) ) >>= aAttributedDataPointIndexList ) + if( xSeriesProp->getPropertyValue( "AttributedDataPoints" ) >>= aAttributedDataPointIndexList ) for(sal_Int32 nN=aAttributedDataPointIndexList.getLength();nN--;) lcl_resetLabelPlacementIfDefault( xSeries->getDataPointByIndex(aAttributedDataPointIndexList[nN]), nDefaultPlacement ); } @@ -762,9 +762,9 @@ void ChartTypeTemplate::adaptAxes( if( xAxisProp.is()) { // set number format to source format - uno::Any aValue( xAxisProp->getPropertyValue(C2U("NumberFormat"))); + uno::Any aValue( xAxisProp->getPropertyValue("NumberFormat")); if( aValue.hasValue()) - xAxisProp->setPropertyValue(C2U("NumberFormat"), uno::Any()); + xAxisProp->setPropertyValue("NumberFormat", uno::Any()); } } } @@ -915,9 +915,9 @@ void ChartTypeTemplate::copyPropertiesFromOldToNewCoordianteSystem( Sequence< OUString > ChartTypeTemplate::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 3 ); - aServices[ 0 ] = C2U( "com.sun.star.chart2.ChartTypeTemplate" ); - aServices[ 1 ] = C2U( "com.sun.star.layout.LayoutElement" ); - aServices[ 2 ] = C2U( "com.sun.star.beans.PropertySet" ); + aServices[ 0 ] = "com.sun.star.chart2.ChartTypeTemplate"; + aServices[ 1 ] = "com.sun.star.layout.LayoutElement"; + aServices[ 2 ] = "com.sun.star.beans.PropertySet"; return aServices; } @@ -930,7 +930,7 @@ Reference< uno::XComponentContext > ChartTypeTemplate::GetComponentContext() con // implement XServiceInfo methods basing upon getSupportedServiceNames_Static APPHELPER_XSERVICEINFO_IMPL( ChartTypeTemplate, - C2U( "com.sun.star.comp.chart.ChartTypeTemplate" )); + OUString("com.sun.star.comp.chart.ChartTypeTemplate") ); } // namespace chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/model/template/ColumnChartType.cxx b/chart2/source/model/template/ColumnChartType.cxx index c4bb660d9f5c..90bf825e42de 100644 --- a/chart2/source/model/template/ColumnChartType.cxx +++ b/chart2/source/model/template/ColumnChartType.cxx @@ -43,14 +43,14 @@ void lcl_AddPropertiesToVector( ::std::vector< Property > & rOutProperties ) { rOutProperties.push_back( - Property( C2U( "OverlapSequence" ), + Property( "OverlapSequence", PROP_BARCHARTTYPE_OVERLAP_SEQUENCE, ::getCppuType( reinterpret_cast< const Sequence< sal_Int32 > * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "GapwidthSequence" ), + Property( "GapwidthSequence", PROP_BARCHARTTYPE_GAPWIDTH_SEQUENCE, ::getCppuType( reinterpret_cast< const Sequence< sal_Int32 > * >(0)), beans::PropertyAttribute::BOUND @@ -182,13 +182,13 @@ uno::Sequence< ::rtl::OUString > ColumnChartType::getSupportedServiceNames_Stati { uno::Sequence< ::rtl::OUString > aServices( 2 ); aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_COLUMN; - aServices[ 1 ] = C2U( "com.sun.star.chart2.ChartType" ); + aServices[ 1 ] = "com.sun.star.chart2.ChartType"; return aServices; } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static APPHELPER_XSERVICEINFO_IMPL( ColumnChartType, - C2U( "com.sun.star.comp.chart.ColumnChartType" )); + OUString("com.sun.star.comp.chart.ColumnChartType") ); } // namespace chart diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx index 1df923c33e3f..28f956512355 100644 --- a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx +++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx @@ -59,7 +59,7 @@ void lcl_AddPropertiesToVector( ::std::vector< Property > & rOutProperties ) { rOutProperties.push_back( - Property( C2U( "NumberOfLines" ), + Property( "NumberOfLines", PROP_COL_LINE_NUMBER_OF_LINES, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND @@ -258,7 +258,7 @@ void SAL_CALL ColumnLineChartTypeTemplate::applyStyle( if( nChartTypeIndex==0 ) // columns { - DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, C2U( "BorderStyle" ), uno::makeAny( drawing::LineStyle_NONE ) ); + DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "BorderStyle", uno::makeAny( drawing::LineStyle_NONE ) ); } else if( nChartTypeIndex==1 ) // lines { @@ -425,7 +425,7 @@ uno::Sequence< ::rtl::OUString > ColumnLineChartTypeTemplate::getSupportedServic { uno::Sequence< ::rtl::OUString > aServices( 2 ); aServices[ 0 ] = lcl_aServiceName; - aServices[ 1 ] = C2U( "com.sun.star.chart2.ChartTypeTemplate" ); + aServices[ 1 ] = "com.sun.star.chart2.ChartTypeTemplate"; return aServices; } diff --git a/chart2/source/model/template/DataInterpreter.cxx b/chart2/source/model/template/DataInterpreter.cxx index 374add7f1626..613570f164b9 100644 --- a/chart2/source/model/template/DataInterpreter.cxx +++ b/chart2/source/model/template/DataInterpreter.cxx @@ -97,14 +97,14 @@ InterpretedData SAL_CALL DataInterpreter::interpretDataSource( { xCategories.set( aData[i] ); if( xCategories.is()) - SetRole( xCategories->getValues(), C2U("categories")); + SetRole( xCategories->getValues(), "categories"); bCategoriesUsed = true; } else { aSequencesVec.push_back( aData[i] ); if( aData[i].is()) - SetRole( aData[i]->getValues(), C2U("values-y")); + SetRole( aData[i]->getValues(), "values-y"); } } catch( const uno::Exception & ex ) @@ -160,14 +160,14 @@ InterpretedData SAL_CALL DataInterpreter::reinterpretDataSeries( // values-y Reference< data::XLabeledDataSequence > xValuesY( - DataSeriesHelper::getDataSequenceByRole( xSeriesSource, C2U("values-y"), false )); + DataSeriesHelper::getDataSequenceByRole( xSeriesSource, "values-y", false )); // re-use values-... as values-y if( ! xValuesY.is()) { xValuesY.set( - DataSeriesHelper::getDataSequenceByRole( xSeriesSource, C2U("values"), true )); + DataSeriesHelper::getDataSequenceByRole( xSeriesSource, "values", true )); if( xValuesY.is()) - SetRole( xValuesY->getValues(), C2U("values-y")); + SetRole( xValuesY->getValues(), "values-y"); } if( xValuesY.is()) { @@ -328,7 +328,7 @@ OUString DataInterpreter::GetRole( const Reference< data::XDataSequence > & xSeq try { Reference< beans::XPropertySet > xProp( xSeq, uno::UNO_QUERY_THROW ); - xProp->getPropertyValue( C2U("Role")) >>= aResult; + xProp->getPropertyValue( "Role") >>= aResult; } catch( const uno::Exception & ex ) { @@ -344,7 +344,7 @@ void DataInterpreter::SetRole( const Reference< data::XDataSequence > & xSeq, co try { Reference< beans::XPropertySet > xProp( xSeq, uno::UNO_QUERY_THROW ); - xProp->setPropertyValue( C2U("Role"), uno::makeAny( rRole )); + xProp->setPropertyValue( "Role", uno::makeAny( rRole )); } catch( const uno::Exception & ex ) { @@ -371,7 +371,7 @@ bool DataInterpreter::HasCategories( bool bHasCategories = false; if( rArguments.getLength() > 0 ) - GetProperty( rArguments, C2U(("HasCategories"))) >>= bHasCategories; + GetProperty( rArguments, "HasCategories" ) >>= bHasCategories; for( sal_Int32 nLSeqIdx=0; ! bHasCategories && nLSeqIdx<rData.getLength(); ++nLSeqIdx ) bHasCategories = ( rData[nLSeqIdx].is() && GetRole( rData[nLSeqIdx]->getValues() ) == "categories"); @@ -383,7 +383,7 @@ bool DataInterpreter::UseCategoriesAsX( const Sequence< beans::PropertyValue > & { bool bUseCategoriesAsX = true; if( rArguments.getLength() > 0 ) - GetProperty( rArguments, C2U(("UseCategoriesAsX"))) >>= bUseCategoriesAsX; + GetProperty( rArguments, "UseCategoriesAsX" ) >>= bUseCategoriesAsX; return bUseCategoriesAsX; } @@ -392,12 +392,12 @@ bool DataInterpreter::UseCategoriesAsX( const Sequence< beans::PropertyValue > & Sequence< OUString > DataInterpreter::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 1 ); - aServices[0] = C2U( "com.sun.star.chart2.DataInterpreter" ); + aServices[0] = "com.sun.star.chart2.DataInterpreter"; return aServices; } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( DataInterpreter, C2U("com.sun.star.comp.chart2.DataInterpreter")); +APPHELPER_XSERVICEINFO_IMPL( DataInterpreter, OUString("com.sun.star.comp.chart2.DataInterpreter") ); } // namespace chart @@ -419,12 +419,12 @@ void lcl_ShowDataSource( const Reference< data::XDataSource > & xSource ) { if( aSequences[k].is()) { - OUString aSourceRepr(C2U("<none>")); + OUString aSourceRepr("<none>"); if( aSequences[k]->getValues().is()) aSourceRepr = aSequences[k]->getValues()->getSourceRangeRepresentation(); xProp.set( aSequences[k]->getValues(), uno::UNO_QUERY ); if( xProp.is() && - ( xProp->getPropertyValue( C2U( "Role" )) >>= aId )) + ( xProp->getPropertyValue( "Role") >>= aId )) { OSL_TRACE( " <data sequence %d> Role: %s, Source: %s", k, U2C( aId ), U2C( aSourceRepr )); } @@ -433,12 +433,12 @@ void lcl_ShowDataSource( const Reference< data::XDataSource > & xSource ) OSL_TRACE( " <data sequence %d> unknown Role, Source: %s", k, U2C( aSourceRepr ) ); } - aSourceRepr = C2U("<none>"); + aSourceRepr = "<none>"; if( aSequences[k]->getLabel().is()) aSourceRepr = OUString( aSequences[k]->getLabel()->getSourceRangeRepresentation()); xProp.set( aSequences[k]->getLabel(), uno::UNO_QUERY ); if( xProp.is() && - ( xProp->getPropertyValue( C2U( "Role" )) >>= aId )) + ( xProp->getPropertyValue( "Role") >>= aId )) { OSL_TRACE( " <data sequence label %d> Role: %s, Source: %s", k, U2C( aId ), U2C( aSourceRepr )); } diff --git a/chart2/source/model/template/FilledNetChartType.cxx b/chart2/source/model/template/FilledNetChartType.cxx index 3ffd11967926..4c267fe40679 100644 --- a/chart2/source/model/template/FilledNetChartType.cxx +++ b/chart2/source/model/template/FilledNetChartType.cxx @@ -72,14 +72,14 @@ uno::Sequence< ::rtl::OUString > FilledNetChartType::getSupportedServiceNames_St { uno::Sequence< ::rtl::OUString > aServices( 3 ); aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET; - aServices[ 1 ] = C2U( "com.sun.star.chart2.ChartType" ); - aServices[ 2 ] = C2U( "com.sun.star.beans.PropertySet" ); + aServices[ 1 ] = "com.sun.star.chart2.ChartType"; + aServices[ 2 ] = "com.sun.star.beans.PropertySet"; return aServices; } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static APPHELPER_XSERVICEINFO_IMPL( FilledNetChartType, - C2U( "com.sun.star.comp.chart.FilledNetChartType" )); + OUString("com.sun.star.comp.chart.FilledNetChartType") ); } // namespace chart diff --git a/chart2/source/model/template/LineChartType.cxx b/chart2/source/model/template/LineChartType.cxx index 5aaaec1adb99..d35dde6fe776 100644 --- a/chart2/source/model/template/LineChartType.cxx +++ b/chart2/source/model/template/LineChartType.cxx @@ -48,20 +48,20 @@ void lcl_AddPropertiesToVector( ::std::vector< Property > & rOutProperties ) { rOutProperties.push_back( - Property( C2U( "CurveStyle" ), + Property( "CurveStyle", PROP_LINECHARTTYPE_CURVE_STYLE, ::getCppuType( reinterpret_cast< const chart2::CurveStyle * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "CurveResolution" ), + Property( "CurveResolution", PROP_LINECHARTTYPE_CURVE_RESOLUTION, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "SplineOrder" ), + Property( "SplineOrder", PROP_LINECHARTTYPE_SPLINE_ORDER, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND @@ -193,14 +193,14 @@ uno::Sequence< ::rtl::OUString > LineChartType::getSupportedServiceNames_Static( { uno::Sequence< ::rtl::OUString > aServices( 3 ); aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_LINE; - aServices[ 1 ] = C2U( "com.sun.star.chart2.ChartType" ); - aServices[ 2 ] = C2U( "com.sun.star.beans.PropertySet" ); + aServices[ 1 ] = "com.sun.star.chart2.ChartType"; + aServices[ 2 ] = "com.sun.star.beans.PropertySet"; return aServices; } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static APPHELPER_XSERVICEINFO_IMPL( LineChartType, - C2U( "com.sun.star.comp.chart.LineChartType" )); + OUString("com.sun.star.comp.chart.LineChartType") ); } // namespace chart diff --git a/chart2/source/model/template/LineChartTypeTemplate.cxx b/chart2/source/model/template/LineChartTypeTemplate.cxx index 78229978c392..5f264bee3100 100644 --- a/chart2/source/model/template/LineChartTypeTemplate.cxx +++ b/chart2/source/model/template/LineChartTypeTemplate.cxx @@ -59,19 +59,19 @@ void lcl_AddPropertiesToVector( ::std::vector< Property > & rOutProperties ) { rOutProperties.push_back( - Property( C2U( "CurveStyle" ), + Property( "CurveStyle", PROP_LINECHARTTYPE_TEMPLATE_CURVE_STYLE, ::getCppuType( reinterpret_cast< const chart2::CurveStyle * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "CurveResolution" ), + Property( "CurveResolution", PROP_LINECHARTTYPE_TEMPLATE_CURVE_RESOLUTION, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "SplineOrder" ), + Property( "SplineOrder", PROP_LINECHARTTYPE_TEMPLATE_SPLINE_ORDER, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND @@ -229,7 +229,7 @@ sal_Bool SAL_CALL LineChartTypeTemplate::matchesTemplate( drawing::LineStyle eLineStyle; Reference< beans::XPropertySet > xProp( *aIt, uno::UNO_QUERY_THROW ); - bool bCurrentHasSymbol = (xProp->getPropertyValue( C2U( "Symbol" )) >>= aSymbProp) && + bool bCurrentHasSymbol = (xProp->getPropertyValue( "Symbol") >>= aSymbProp) && (aSymbProp.Style != chart2::SymbolStyle_NONE); if( bCurrentHasSymbol ) @@ -241,7 +241,7 @@ sal_Bool SAL_CALL LineChartTypeTemplate::matchesTemplate( break; } - bool bCurrentHasLine = (xProp->getPropertyValue( C2U( "LineStyle" )) >>= eLineStyle) && + bool bCurrentHasLine = (xProp->getPropertyValue( "LineStyle") >>= eLineStyle) && ( eLineStyle != drawing::LineStyle_NONE ); if( bCurrentHasLine ) @@ -278,9 +278,9 @@ sal_Bool SAL_CALL LineChartTypeTemplate::matchesTemplate( uno::Reference< beans::XPropertySet > xChartTypeProp( DiagramHelper::getChartTypeByIndex( xDiagram, 0 ), uno::UNO_QUERY_THROW ); - setFastPropertyValue_NoBroadcast( PROP_LINECHARTTYPE_TEMPLATE_CURVE_STYLE, xChartTypeProp->getPropertyValue(C2U("CurveStyle" )) ); - setFastPropertyValue_NoBroadcast( PROP_LINECHARTTYPE_TEMPLATE_CURVE_RESOLUTION, xChartTypeProp->getPropertyValue(C2U("CurveResolution" )) ); - setFastPropertyValue_NoBroadcast( PROP_LINECHARTTYPE_TEMPLATE_SPLINE_ORDER, xChartTypeProp->getPropertyValue(C2U("SplineOrder" )) ); + setFastPropertyValue_NoBroadcast( PROP_LINECHARTTYPE_TEMPLATE_CURVE_STYLE, xChartTypeProp->getPropertyValue("CurveStyle") ); + setFastPropertyValue_NoBroadcast( PROP_LINECHARTTYPE_TEMPLATE_CURVE_RESOLUTION, xChartTypeProp->getPropertyValue("CurveResolution") ); + setFastPropertyValue_NoBroadcast( PROP_LINECHARTTYPE_TEMPLATE_SPLINE_ORDER, xChartTypeProp->getPropertyValue("SplineOrder") ); } catch( const uno::Exception & ex ) { @@ -306,11 +306,11 @@ Reference< chart2::XChartType > LineChartTypeTemplate::getChartTypeForIndex( sal if( xCTProp.is()) { xCTProp->setPropertyValue( - C2U( "CurveStyle" ), getFastPropertyValue( PROP_LINECHARTTYPE_TEMPLATE_CURVE_STYLE )); + "CurveStyle", getFastPropertyValue( PROP_LINECHARTTYPE_TEMPLATE_CURVE_STYLE )); xCTProp->setPropertyValue( - C2U( "CurveResolution" ), getFastPropertyValue( PROP_LINECHARTTYPE_TEMPLATE_CURVE_RESOLUTION )); + "CurveResolution", getFastPropertyValue( PROP_LINECHARTTYPE_TEMPLATE_CURVE_RESOLUTION )); xCTProp->setPropertyValue( - C2U( "SplineOrder" ), getFastPropertyValue( PROP_LINECHARTTYPE_TEMPLATE_SPLINE_ORDER )); + "SplineOrder", getFastPropertyValue( PROP_LINECHARTTYPE_TEMPLATE_SPLINE_ORDER )); } } catch( const uno::Exception & ex ) @@ -340,11 +340,11 @@ Reference< chart2::XChartType > SAL_CALL LineChartTypeTemplate::getChartTypeForN if( xCTProp.is()) { xCTProp->setPropertyValue( - C2U( "CurveStyle" ), getFastPropertyValue( PROP_LINECHARTTYPE_TEMPLATE_CURVE_STYLE )); + "CurveStyle", getFastPropertyValue( PROP_LINECHARTTYPE_TEMPLATE_CURVE_STYLE )); xCTProp->setPropertyValue( - C2U( "CurveResolution" ), getFastPropertyValue( PROP_LINECHARTTYPE_TEMPLATE_CURVE_RESOLUTION )); + "CurveResolution", getFastPropertyValue( PROP_LINECHARTTYPE_TEMPLATE_CURVE_RESOLUTION )); xCTProp->setPropertyValue( - C2U( "SplineOrder" ), getFastPropertyValue( PROP_LINECHARTTYPE_TEMPLATE_SPLINE_ORDER )); + "SplineOrder", getFastPropertyValue( PROP_LINECHARTTYPE_TEMPLATE_SPLINE_ORDER )); } } catch( const uno::Exception & ex ) @@ -384,7 +384,7 @@ Sequence< OUString > LineChartTypeTemplate::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 2 ); aServices[ 0 ] = lcl_aServiceName; - aServices[ 1 ] = C2U( "com.sun.star.chart2.ChartTypeTemplate" ); + aServices[ 1 ] = "com.sun.star.chart2.ChartTypeTemplate"; return aServices; } diff --git a/chart2/source/model/template/NetChartType.cxx b/chart2/source/model/template/NetChartType.cxx index 84ae4653054d..ca3ddc545056 100644 --- a/chart2/source/model/template/NetChartType.cxx +++ b/chart2/source/model/template/NetChartType.cxx @@ -62,7 +62,7 @@ Reference< XCoordinateSystem > SAL_CALL { if( DimensionCount != 2 ) throw lang::IllegalArgumentException( - C2U( "NetChart must be two-dimensional" ), + "NetChart must be two-dimensional", static_cast< ::cppu::OWeakObject* >( this ), 0 ); Reference< XCoordinateSystem > xResult( @@ -178,14 +178,14 @@ uno::Sequence< ::rtl::OUString > NetChartType::getSupportedServiceNames_Static() { uno::Sequence< ::rtl::OUString > aServices( 3 ); aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_NET; - aServices[ 1 ] = C2U( "com.sun.star.chart2.ChartType" ); - aServices[ 2 ] = C2U( "com.sun.star.beans.PropertySet" ); + aServices[ 1 ] = "com.sun.star.chart2.ChartType"; + aServices[ 2 ] = "com.sun.star.beans.PropertySet"; return aServices; } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static APPHELPER_XSERVICEINFO_IMPL( NetChartType, - C2U( "com.sun.star.comp.chart.NetChartType" )); + OUString("com.sun.star.comp.chart.NetChartType") ); } // namespace chart diff --git a/chart2/source/model/template/NetChartTypeTemplate.cxx b/chart2/source/model/template/NetChartTypeTemplate.cxx index 0a1ae7836ae5..f7205f1581e1 100644 --- a/chart2/source/model/template/NetChartTypeTemplate.cxx +++ b/chart2/source/model/template/NetChartTypeTemplate.cxx @@ -126,7 +126,7 @@ sal_Bool SAL_CALL NetChartTypeTemplate::matchesTemplate( drawing::LineStyle eLineStyle; Reference< beans::XPropertySet > xProp( *aIt, uno::UNO_QUERY_THROW ); - bool bCurrentHasSymbol = (xProp->getPropertyValue( C2U( "Symbol" )) >>= aSymbProp) && + bool bCurrentHasSymbol = (xProp->getPropertyValue( "Symbol") >>= aSymbProp) && (aSymbProp.Style != chart2::SymbolStyle_NONE); if( bCurrentHasSymbol ) @@ -138,7 +138,7 @@ sal_Bool SAL_CALL NetChartTypeTemplate::matchesTemplate( break; } - bool bCurrentHasLine = (xProp->getPropertyValue( C2U( "LineStyle" )) >>= eLineStyle) && + bool bCurrentHasLine = (xProp->getPropertyValue( "LineStyle") >>= eLineStyle) && ( eLineStyle != drawing::LineStyle_NONE ); if( bCurrentHasLine ) @@ -209,7 +209,7 @@ Sequence< OUString > NetChartTypeTemplate::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 2 ); aServices[ 0 ] = lcl_aServiceName; - aServices[ 1 ] = C2U( "com.sun.star.chart2.ChartTypeTemplate" ); + aServices[ 1 ] = "com.sun.star.chart2.ChartTypeTemplate"; return aServices; } diff --git a/chart2/source/model/template/PieChartType.cxx b/chart2/source/model/template/PieChartType.cxx index 450a622b52ab..41e44fafd89a 100644 --- a/chart2/source/model/template/PieChartType.cxx +++ b/chart2/source/model/template/PieChartType.cxx @@ -49,7 +49,7 @@ static void lcl_AddPropertiesToVector( ::std::vector< Property > & rOutProperties ) { rOutProperties.push_back( - Property( C2U( "UseRings" ), + Property( "UseRings", PROP_PIECHARTTYPE_USE_RINGS, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND @@ -217,14 +217,14 @@ uno::Sequence< ::rtl::OUString > PieChartType::getSupportedServiceNames_Static() { uno::Sequence< ::rtl::OUString > aServices( 3 ); aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_PIE; - aServices[ 1 ] = C2U( "com.sun.star.chart2.ChartType" ); - aServices[ 2 ] = C2U( "com.sun.star.beans.PropertySet" ); + aServices[ 1 ] = "com.sun.star.chart2.ChartType"; + aServices[ 2 ] = "com.sun.star.beans.PropertySet"; return aServices; } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static APPHELPER_XSERVICEINFO_IMPL( PieChartType, - C2U( "com.sun.star.comp.chart.PieChartType" )); + OUString("com.sun.star.comp.chart.PieChartType") ); } // namespace chart diff --git a/chart2/source/model/template/PieChartTypeTemplate.cxx b/chart2/source/model/template/PieChartTypeTemplate.cxx index 49cc2e1c944a..36c727a558d4 100644 --- a/chart2/source/model/template/PieChartTypeTemplate.cxx +++ b/chart2/source/model/template/PieChartTypeTemplate.cxx @@ -65,25 +65,25 @@ static void lcl_AddPropertiesToVector( ::std::vector< Property > & rOutProperties ) { rOutProperties.push_back( - Property( C2U( "OffsetMode" ), + Property( "OffsetMode", PROP_PIE_TEMPLATE_OFFSET_MODE, ::getCppuType( reinterpret_cast< const chart2::PieChartOffsetMode * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "DefaultOffset" ), + Property( "DefaultOffset", PROP_PIE_TEMPLATE_DEFAULT_OFFSET, ::getCppuType( reinterpret_cast< const double * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "Dimension" ), + Property( "Dimension", PROP_PIE_TEMPLATE_DIMENSION, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "UseRings" ), + Property( "UseRings", PROP_PIE_TEMPLATE_USE_RINGS, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND @@ -288,7 +288,7 @@ void PieChartTypeTemplate::createChartTypes( if( xCTProp.is()) { xCTProp->setPropertyValue( - C2U( "UseRings" ), getFastPropertyValue( PROP_PIE_TEMPLATE_USE_RINGS )); + "UseRings", getFastPropertyValue( PROP_PIE_TEMPLATE_USE_RINGS )); } Reference< chart2::XChartTypeContainer > xCTCnt( rCoordSys[0], uno::UNO_QUERY_THROW ); xCTCnt->setChartTypes( Sequence< Reference< chart2::XChartType > >( &xCT, 1 )); @@ -339,11 +339,11 @@ sal_Bool SAL_CALL PieChartTypeTemplate::matchesTemplate( sal_Int32 nOuterSeriesIndex = 0; //@todo in future this will depend on Orientation of the radius axis scale Reference< chart2::XDataSeries > xSeries( aSeriesVec[nOuterSeriesIndex] ); Reference< beans::XPropertySet > xProp( xSeries, uno::UNO_QUERY_THROW ); - xProp->getPropertyValue( C2U( "Offset" )) >>= fOffset; + xProp->getPropertyValue( "Offset") >>= fOffset; //get AttributedDataPoints uno::Sequence< sal_Int32 > aAttributedDataPointIndexList; - if( xProp->getPropertyValue( C2U( "AttributedDataPoints" ) ) >>= aAttributedDataPointIndexList ) + if( xProp->getPropertyValue( "AttributedDataPoints" ) >>= aAttributedDataPointIndexList ) { for(sal_Int32 nN=aAttributedDataPointIndexList.getLength();nN--;) { @@ -351,7 +351,7 @@ sal_Bool SAL_CALL PieChartTypeTemplate::matchesTemplate( if(xPointProp.is()) { double fPointOffset=0.0; - if( (xProp->getPropertyValue( C2U( "Offset" )) >>= fPointOffset ) ) + if( (xProp->getPropertyValue( "Offset") >>= fPointOffset ) ) { if( ! ::rtl::math::approxEqual( fPointOffset, fOffset ) ) { @@ -387,7 +387,7 @@ sal_Bool SAL_CALL PieChartTypeTemplate::matchesTemplate( uno::Reference< beans::XPropertySet > xCTProp( DiagramHelper::getChartTypeByIndex( xDiagram, 0 ), uno::UNO_QUERY_THROW ); sal_Bool bUseRings = false; - if( xCTProp->getPropertyValue( C2U( "UseRings" )) >>= bUseRings ) + if( xCTProp->getPropertyValue( "UseRings") >>= bUseRings ) { bResult = ( bTemplateUsesRings == bUseRings ); } @@ -410,7 +410,7 @@ Reference< chart2::XChartType > PieChartTypeTemplate::getChartTypeForIndex( sal_ if( xCTProp.is()) { xCTProp->setPropertyValue( - C2U( "UseRings" ), getFastPropertyValue( PROP_PIE_TEMPLATE_USE_RINGS )); + "UseRings", getFastPropertyValue( PROP_PIE_TEMPLATE_USE_RINGS )); } } @@ -439,7 +439,7 @@ Reference< chart2::XChartType > SAL_CALL PieChartTypeTemplate::getChartTypeForNe if( xCTProp.is()) { xCTProp->setPropertyValue( - C2U( "UseRings" ), getFastPropertyValue( PROP_PIE_TEMPLATE_USE_RINGS )); + "UseRings", getFastPropertyValue( PROP_PIE_TEMPLATE_USE_RINGS )); } } @@ -480,7 +480,7 @@ void SAL_CALL PieChartTypeTemplate::applyStyle( double fOffsetToSet = fDefaultOffset; uno::Sequence< sal_Int32 > aAttributedDataPointIndexList; - xProp->getPropertyValue( C2U( "AttributedDataPoints" ) ) >>= aAttributedDataPointIndexList; + xProp->getPropertyValue( "AttributedDataPoints" ) >>= aAttributedDataPointIndexList; // determine whether to set the new offset bool bSetOffset = ( ePieOffsetMode == chart2::PieChartOffsetMode_ALL_EXPLODED ); @@ -531,10 +531,10 @@ void SAL_CALL PieChartTypeTemplate::applyStyle( } // line style - DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, C2U( "BorderStyle" ), uno::makeAny( drawing::LineStyle_NONE ) ); + DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "BorderStyle", uno::makeAny( drawing::LineStyle_NONE ) ); // vary colors by point - xProp->setPropertyValue( C2U("VaryColorsByPoint"), uno::makeAny( true )); + xProp->setPropertyValue( "VaryColorsByPoint", uno::makeAny( true )); } catch( const uno::Exception & ex ) { @@ -595,12 +595,12 @@ void SAL_CALL PieChartTypeTemplate::resetStyles( const Reference< chart2::XDiagr Reference< beans::XPropertyState > xState( *aIt, uno::UNO_QUERY ); if( xState.is()) { - xState->setPropertyToDefault( C2U("VaryColorsByPoint")); + xState->setPropertyToDefault( "VaryColorsByPoint"); Reference< beans::XPropertySet > xProp( xState, uno::UNO_QUERY ); if( xProp.is() && - xProp->getPropertyValue( C2U("BorderStyle")) == aLineStyleAny ) + xProp->getPropertyValue( "BorderStyle") == aLineStyleAny ) { - xState->setPropertyToDefault( C2U("BorderStyle")); + xState->setPropertyToDefault( "BorderStyle"); } } } @@ -625,7 +625,7 @@ uno::Sequence< ::rtl::OUString > PieChartTypeTemplate::getSupportedServiceNames_ { uno::Sequence< ::rtl::OUString > aServices( 2 ); aServices[ 0 ] = lcl_aServiceName; - aServices[ 1 ] = C2U( "com.sun.star.chart2.ChartTypeTemplate" ); + aServices[ 1 ] = "com.sun.star.chart2.ChartTypeTemplate"; return aServices; } diff --git a/chart2/source/model/template/ScatterChartType.cxx b/chart2/source/model/template/ScatterChartType.cxx index 2cab24ef67d9..20e89cb15ff7 100644 --- a/chart2/source/model/template/ScatterChartType.cxx +++ b/chart2/source/model/template/ScatterChartType.cxx @@ -52,20 +52,20 @@ void lcl_AddPropertiesToVector( ::std::vector< Property > & rOutProperties ) { rOutProperties.push_back( - Property( C2U( "CurveStyle" ), + Property( "CurveStyle", PROP_SCATTERCHARTTYPE_CURVE_STYLE, ::getCppuType( reinterpret_cast< const chart2::CurveStyle * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "CurveResolution" ), + Property( "CurveResolution", PROP_SCATTERCHARTTYPE_CURVE_RESOLUTION, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "SplineOrder" ), + Property( "SplineOrder", PROP_SCATTERCHARTTYPE_SPLINE_ORDER, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND @@ -218,9 +218,9 @@ uno::Sequence< ::rtl::OUString > SAL_CALL ScatterChartType::getSupportedMandator throw (uno::RuntimeException) { uno::Sequence< ::rtl::OUString > aMandRolesSeq(3); - aMandRolesSeq[0] = C2U( "label" ); - aMandRolesSeq[1] = C2U( "values-x" ); - aMandRolesSeq[2] = C2U( "values-y" ); + aMandRolesSeq[0] = "label"; + aMandRolesSeq[1] = "values-x"; + aMandRolesSeq[2] = "values-y"; return aMandRolesSeq; } @@ -259,14 +259,14 @@ uno::Sequence< ::rtl::OUString > ScatterChartType::getSupportedServiceNames_Stat { uno::Sequence< ::rtl::OUString > aServices( 3 ); aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_SCATTER; - aServices[ 1 ] = C2U( "com.sun.star.chart2.ChartType" ); - aServices[ 2 ] = C2U( "com.sun.star.beans.PropertySet" ); + aServices[ 1 ] = "com.sun.star.chart2.ChartType"; + aServices[ 2 ] = "com.sun.star.beans.PropertySet"; return aServices; } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static APPHELPER_XSERVICEINFO_IMPL( ScatterChartType, - C2U( "com.sun.star.comp.chart.ScatterChartType" )); + OUString("com.sun.star.comp.chart.ScatterChartType") ); } // namespace chart diff --git a/chart2/source/model/template/ScatterChartTypeTemplate.cxx b/chart2/source/model/template/ScatterChartTypeTemplate.cxx index 2b895fd0b985..57a48ebda661 100644 --- a/chart2/source/model/template/ScatterChartTypeTemplate.cxx +++ b/chart2/source/model/template/ScatterChartTypeTemplate.cxx @@ -61,19 +61,19 @@ void lcl_AddPropertiesToVector( ::std::vector< Property > & rOutProperties ) { rOutProperties.push_back( - Property( C2U( "CurveStyle" ), + Property( "CurveStyle", PROP_SCATTERCHARTTYPE_TEMPLATE_CURVE_STYLE, ::getCppuType( reinterpret_cast< const chart2::CurveStyle * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "CurveResolution" ), + Property( "CurveResolution", PROP_SCATTERCHARTTYPE_TEMPLATE_CURVE_RESOLUTION, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "SplineOrder" ), + Property( "SplineOrder", PROP_SCATTERCHARTTYPE_TEMPLATE_SPLINE_ORDER, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND @@ -221,7 +221,7 @@ void SAL_CALL ScatterChartTypeTemplate::applyStyle( DataSeriesHelper::switchLinesOnOrOff( xProp, m_bHasLines ); DataSeriesHelper::makeLinesThickOrThin( xProp, m_nDim==2 ); if( m_nDim==3 ) - DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, C2U( "BorderStyle" ), uno::makeAny( drawing::LineStyle_NONE ) ); + DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "BorderStyle", uno::makeAny( drawing::LineStyle_NONE ) ); } catch( const uno::Exception & ex ) { @@ -263,7 +263,7 @@ sal_Bool SAL_CALL ScatterChartTypeTemplate::matchesTemplate( drawing::LineStyle eLineStyle; Reference< beans::XPropertySet > xProp( *aIt, uno::UNO_QUERY_THROW ); - bool bCurrentHasSymbol = (xProp->getPropertyValue( C2U( "Symbol" )) >>= aSymbProp) && + bool bCurrentHasSymbol = (xProp->getPropertyValue( "Symbol") >>= aSymbProp) && (aSymbProp.Style != chart2::SymbolStyle_NONE); if( bCurrentHasSymbol ) @@ -275,7 +275,7 @@ sal_Bool SAL_CALL ScatterChartTypeTemplate::matchesTemplate( break; } - bool bCurrentHasLine = (xProp->getPropertyValue( C2U( "LineStyle" )) >>= eLineStyle) && + bool bCurrentHasLine = (xProp->getPropertyValue( "LineStyle") >>= eLineStyle) && ( eLineStyle != drawing::LineStyle_NONE ); if( bCurrentHasLine ) @@ -312,9 +312,9 @@ sal_Bool SAL_CALL ScatterChartTypeTemplate::matchesTemplate( uno::Reference< beans::XPropertySet > xChartTypeProp( DiagramHelper::getChartTypeByIndex( xDiagram, 0 ), uno::UNO_QUERY_THROW ); - setFastPropertyValue_NoBroadcast( PROP_SCATTERCHARTTYPE_TEMPLATE_CURVE_STYLE, xChartTypeProp->getPropertyValue(C2U("CurveStyle" )) ); - setFastPropertyValue_NoBroadcast( PROP_SCATTERCHARTTYPE_TEMPLATE_CURVE_RESOLUTION, xChartTypeProp->getPropertyValue(C2U("CurveResolution" )) ); - setFastPropertyValue_NoBroadcast( PROP_SCATTERCHARTTYPE_TEMPLATE_SPLINE_ORDER, xChartTypeProp->getPropertyValue(C2U("SplineOrder" )) ); + setFastPropertyValue_NoBroadcast( PROP_SCATTERCHARTTYPE_TEMPLATE_CURVE_STYLE, xChartTypeProp->getPropertyValue("CurveStyle") ); + setFastPropertyValue_NoBroadcast( PROP_SCATTERCHARTTYPE_TEMPLATE_CURVE_RESOLUTION, xChartTypeProp->getPropertyValue("CurveResolution") ); + setFastPropertyValue_NoBroadcast( PROP_SCATTERCHARTTYPE_TEMPLATE_SPLINE_ORDER, xChartTypeProp->getPropertyValue("SplineOrder") ); } catch( const uno::Exception & ex ) { @@ -340,11 +340,11 @@ Reference< chart2::XChartType > ScatterChartTypeTemplate::getChartTypeForIndex( if( xCTProp.is()) { xCTProp->setPropertyValue( - C2U( "CurveStyle" ), getFastPropertyValue( PROP_SCATTERCHARTTYPE_TEMPLATE_CURVE_STYLE )); + "CurveStyle", getFastPropertyValue( PROP_SCATTERCHARTTYPE_TEMPLATE_CURVE_STYLE )); xCTProp->setPropertyValue( - C2U( "CurveResolution" ), getFastPropertyValue( PROP_SCATTERCHARTTYPE_TEMPLATE_CURVE_RESOLUTION )); + "CurveResolution", getFastPropertyValue( PROP_SCATTERCHARTTYPE_TEMPLATE_CURVE_RESOLUTION )); xCTProp->setPropertyValue( - C2U( "SplineOrder" ), getFastPropertyValue( PROP_SCATTERCHARTTYPE_TEMPLATE_SPLINE_ORDER )); + "SplineOrder", getFastPropertyValue( PROP_SCATTERCHARTTYPE_TEMPLATE_SPLINE_ORDER )); } } catch( const uno::Exception & ex ) @@ -374,11 +374,11 @@ Reference< chart2::XChartType > SAL_CALL ScatterChartTypeTemplate::getChartTypeF if( xCTProp.is()) { xCTProp->setPropertyValue( - C2U( "CurveStyle" ), getFastPropertyValue( PROP_SCATTERCHARTTYPE_TEMPLATE_CURVE_STYLE )); + "CurveStyle", getFastPropertyValue( PROP_SCATTERCHARTTYPE_TEMPLATE_CURVE_STYLE )); xCTProp->setPropertyValue( - C2U( "CurveResolution" ), getFastPropertyValue( PROP_SCATTERCHARTTYPE_TEMPLATE_CURVE_RESOLUTION )); + "CurveResolution", getFastPropertyValue( PROP_SCATTERCHARTTYPE_TEMPLATE_CURVE_RESOLUTION )); xCTProp->setPropertyValue( - C2U( "SplineOrder" ), getFastPropertyValue( PROP_SCATTERCHARTTYPE_TEMPLATE_SPLINE_ORDER )); + "SplineOrder", getFastPropertyValue( PROP_SCATTERCHARTTYPE_TEMPLATE_SPLINE_ORDER )); } } catch( const uno::Exception & ex ) @@ -404,7 +404,7 @@ Sequence< OUString > ScatterChartTypeTemplate::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 2 ); aServices[ 0 ] = lcl_aServiceName; - aServices[ 1 ] = C2U( "com.sun.star.chart2.ChartTypeTemplate" ); + aServices[ 1 ] = "com.sun.star.chart2.ChartTypeTemplate"; return aServices; } diff --git a/chart2/source/model/template/StockChartTypeTemplate.cxx b/chart2/source/model/template/StockChartTypeTemplate.cxx index fb50ae3faf58..b203abd4e8c4 100644 --- a/chart2/source/model/template/StockChartTypeTemplate.cxx +++ b/chart2/source/model/template/StockChartTypeTemplate.cxx @@ -68,25 +68,25 @@ void lcl_AddPropertiesToVector( ::std::vector< Property > & rOutProperties ) { rOutProperties.push_back( - Property( C2U( "Volume" ), + Property( "Volume", PROP_STOCKCHARTTYPE_TEMPLATE_VOLUME, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "Open" ), + Property( "Open", PROP_STOCKCHARTTYPE_TEMPLATE_OPEN, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "LowHigh" ), + Property( "LowHigh", PROP_STOCKCHARTTYPE_TEMPLATE_LOW_HIGH, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "Japanese" ), + Property( "Japanese", PROP_STOCKCHARTTYPE_TEMPLATE_JAPANESE, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND @@ -246,12 +246,12 @@ void SAL_CALL StockChartTypeTemplate::applyStyle( Reference< beans::XPropertySet > xProp( xSeries, uno::UNO_QUERY ); if( xProp.is() ) - xProp->setPropertyValue( C2U("AttachedAxisIndex"), uno::makeAny( nNewAxisIndex ) ); + xProp->setPropertyValue( "AttachedAxisIndex", uno::makeAny( nNewAxisIndex ) ); if( bHasVolume && nChartTypeIndex==0 ) { //switch lines off for volume bars - DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, C2U( "BorderStyle" ), uno::makeAny( drawing::LineStyle_NONE ) ); + DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "BorderStyle", uno::makeAny( drawing::LineStyle_NONE ) ); } else { @@ -259,9 +259,9 @@ void SAL_CALL StockChartTypeTemplate::applyStyle( if( xProp.is() ) { drawing::LineStyle eStyle = drawing::LineStyle_NONE; - xProp->getPropertyValue( C2U("LineStyle") ) >>= eStyle; + xProp->getPropertyValue( "LineStyle" ) >>= eStyle; if( eStyle == drawing::LineStyle_NONE ) - xProp->setPropertyValue( C2U("LineStyle"), uno::makeAny( drawing::LineStyle_SOLID )); + xProp->setPropertyValue( "LineStyle", uno::makeAny( drawing::LineStyle_SOLID )); } } @@ -286,7 +286,7 @@ void SAL_CALL StockChartTypeTemplate::resetStyles( { Reference< beans::XPropertySet > xProp( *aIt, uno::UNO_QUERY ); if( xProp.is() ) - xProp->setPropertyValue( C2U("AttachedAxisIndex"), uno::makeAny( sal_Int32(0) ) ); + xProp->setPropertyValue( "AttachedAxisIndex", uno::makeAny( sal_Int32(0) ) ); } } @@ -374,9 +374,9 @@ void StockChartTypeTemplate::createChartTypes( Reference< beans::XPropertySet > xCTProp( xCT, uno::UNO_QUERY ); if( xCTProp.is()) { - xCTProp->setPropertyValue( C2U("Japanese"), uno::makeAny( bJapaneseStyle )); - xCTProp->setPropertyValue( C2U("ShowFirst"), uno::makeAny( bShowFirst )); - xCTProp->setPropertyValue( C2U("ShowHighLow"), uno::makeAny( bShowHighLow )); + xCTProp->setPropertyValue( "Japanese", uno::makeAny( bJapaneseStyle )); + xCTProp->setPropertyValue( "ShowFirst", uno::makeAny( bShowFirst )); + xCTProp->setPropertyValue( "ShowHighLow", uno::makeAny( bShowHighLow )); } if( aSeriesSeq.getLength() > nSeriesIndex && @@ -475,12 +475,12 @@ sal_Bool SAL_CALL StockChartTypeTemplate::matchesTemplate( if( xCTProp.is()) { sal_Bool bJapaneseProp = sal_False; - xCTProp->getPropertyValue( C2U("Japanese")) >>= bJapaneseProp; + xCTProp->getPropertyValue( "Japanese") >>= bJapaneseProp; bResult = bResult && ( bHasJapaneseStyle == bJapaneseProp ); // in old chart japanese == showFirst sal_Bool bShowFirstProp = sal_False; - xCTProp->getPropertyValue( C2U("ShowFirst")) >>= bShowFirstProp; + xCTProp->getPropertyValue( "ShowFirst") >>= bShowFirstProp; bResult = bResult && ( bHasOpenValue == bShowFirstProp ); } } @@ -530,7 +530,7 @@ Sequence< OUString > StockChartTypeTemplate::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 2 ); aServices[ 0 ] = lcl_aServiceName; - aServices[ 1 ] = C2U( "com.sun.star.chart2.ChartTypeTemplate" ); + aServices[ 1 ] = "com.sun.star.chart2.ChartTypeTemplate"; return aServices; } diff --git a/chart2/source/model/template/StockDataInterpreter.cxx b/chart2/source/model/template/StockDataInterpreter.cxx index 75379c89e04b..0cafbd98a14a 100644 --- a/chart2/source/model/template/StockDataInterpreter.cxx +++ b/chart2/source/model/template/StockDataInterpreter.cxx @@ -143,7 +143,7 @@ InterpretedData SAL_CALL StockDataInterpreter::interpretDataSource( aSequences[nBarGroupIndex][nLabeledSeqIdx].realloc( 1 ); aSequences[nBarGroupIndex][nLabeledSeqIdx][0].set( aData[nSourceIndex] ); if( aData[nSourceIndex].is()) - SetRole( aData[nSourceIndex]->getValues(), C2U("values-y")); + SetRole( aData[nSourceIndex]->getValues(), "values-y"); ++nSourceIndex; } @@ -153,7 +153,7 @@ InterpretedData SAL_CALL StockDataInterpreter::interpretDataSource( aSequences[nCandleStickGroupIndex][nLabeledSeqIdx].realloc( 4 ); aSequences[nCandleStickGroupIndex][nLabeledSeqIdx][nSeqIdx].set( aData[nSourceIndex] ); if( aData[nSourceIndex].is()) - SetRole( aData[nSourceIndex]->getValues(), C2U("values-first")); + SetRole( aData[nSourceIndex]->getValues(), "values-first"); ++nSourceIndex, ++nSeqIdx; } else @@ -161,17 +161,17 @@ InterpretedData SAL_CALL StockDataInterpreter::interpretDataSource( aSequences[nCandleStickGroupIndex][nLabeledSeqIdx][nSeqIdx].set( aData[nSourceIndex] ); if( aData[nSourceIndex].is()) - SetRole( aData[nSourceIndex]->getValues(), C2U("values-min")); + SetRole( aData[nSourceIndex]->getValues(), "values-min"); ++nSourceIndex, ++nSeqIdx; aSequences[nCandleStickGroupIndex][nLabeledSeqIdx][nSeqIdx].set( aData[nSourceIndex] ); if( aData[nSourceIndex].is()) - SetRole( aData[nSourceIndex]->getValues(), C2U("values-max")); + SetRole( aData[nSourceIndex]->getValues(), "values-max"); ++nSourceIndex, ++nSeqIdx; aSequences[nCandleStickGroupIndex][nLabeledSeqIdx][nSeqIdx].set( aData[nSourceIndex] ); if( aData[nSourceIndex].is()) - SetRole( aData[nSourceIndex]->getValues(), C2U("values-last")); + SetRole( aData[nSourceIndex]->getValues(), "values-last"); ++nSourceIndex, ++nSeqIdx; } @@ -182,7 +182,7 @@ InterpretedData SAL_CALL StockDataInterpreter::interpretDataSource( aSequences[nBarGroupIndex][nVolumeSeries - 1].realloc( 1 ); OSL_ASSERT( nDataCount > nSourceIndex ); if( aData[nSourceIndex].is()) - SetRole( aData[nSourceIndex]->getValues(), C2U("values-y")); + SetRole( aData[nSourceIndex]->getValues(), "values-y"); aSequences[nBarGroupIndex][nVolumeSeries - 1][0].set( aData[nSourceIndex] ); ++nSourceIndex; --nRemaining; @@ -201,7 +201,7 @@ InterpretedData SAL_CALL StockDataInterpreter::interpretDataSource( sal_Int32 nSeqIdx( 0 ); aSequences[nCandleStickGroupIndex][nSeriesIndex][nSeqIdx].set( aData[nSourceIndex] ); if( aData[nSourceIndex].is()) - SetRole( aData[nSourceIndex]->getValues(), C2U("values-min")); + SetRole( aData[nSourceIndex]->getValues(), "values-min"); ++nSourceIndex, ++nSeqIdx; // 2. high @@ -209,7 +209,7 @@ InterpretedData SAL_CALL StockDataInterpreter::interpretDataSource( { aSequences[nCandleStickGroupIndex][nSeriesIndex][nSeqIdx].set( aData[nSourceIndex] ); if( aData[nSourceIndex].is()) - SetRole( aData[nSourceIndex]->getValues(), C2U("values-max")); + SetRole( aData[nSourceIndex]->getValues(), "values-max"); ++nSourceIndex, ++nSeqIdx; } @@ -219,7 +219,7 @@ InterpretedData SAL_CALL StockDataInterpreter::interpretDataSource( { aSequences[nCandleStickGroupIndex][nSeriesIndex][nSeqIdx].set( aData[nSourceIndex] ); if( aData[nSourceIndex].is()) - SetRole( aData[nSourceIndex]->getValues(), C2U("values-last")); + SetRole( aData[nSourceIndex]->getValues(), "values-last"); ++nSourceIndex, ++nSeqIdx; } diff --git a/chart2/source/model/template/XYDataInterpreter.cxx b/chart2/source/model/template/XYDataInterpreter.cxx index e79c23444572..48d742421d83 100644 --- a/chart2/source/model/template/XYDataInterpreter.cxx +++ b/chart2/source/model/template/XYDataInterpreter.cxx @@ -80,7 +80,7 @@ chart2::InterpretedData SAL_CALL XYDataInterpreter::interpretDataSource( xCategories.set( aData[nDataIdx] ); if( xCategories.is()) { - SetRole( xCategories->getValues(), C2U("categories")); + SetRole( xCategories->getValues(), "categories"); if( bUseCategoriesAsX ) bSetXValues = false; } @@ -90,13 +90,13 @@ chart2::InterpretedData SAL_CALL XYDataInterpreter::interpretDataSource( { xValuesX.set( aData[nDataIdx] ); if( xValuesX.is()) - SetRole( xValuesX->getValues(), C2U("values-x")); + SetRole( xValuesX->getValues(), "values-x"); } else { aSequencesVec.push_back( aData[nDataIdx] ); if( aData[nDataIdx].is()) - SetRole( aData[nDataIdx]->getValues(), C2U("values-y")); + SetRole( aData[nDataIdx]->getValues(), "values-y"); } } catch( const uno::Exception & ex ) @@ -163,16 +163,16 @@ chart2::InterpretedData SAL_CALL XYDataInterpreter::reinterpretDataSeries( // values-y Reference< data::XLabeledDataSequence > xValuesY( - DataSeriesHelper::getDataSequenceByRole( xSeriesSource, C2U("values-y"), false )); + DataSeriesHelper::getDataSequenceByRole( xSeriesSource, "values-y", false )); Reference< data::XLabeledDataSequence > xValuesX( - DataSeriesHelper::getDataSequenceByRole( xSeriesSource, C2U("values-x"), false )); + DataSeriesHelper::getDataSequenceByRole( xSeriesSource, "values-x", false )); // re-use values-... as values-x/values-y if( ! xValuesX.is() || ! xValuesY.is()) { vector< Reference< data::XLabeledDataSequence > > aValueSeqVec( DataSeriesHelper::getAllDataSequencesByRole( - xSeriesSource->getDataSequences(), C2U("values"), true )); + xSeriesSource->getDataSequences(), "values", true )); if( xValuesX.is()) aValueSeqVec.erase( find( aValueSeqVec.begin(), aValueSeqVec.end(), xValuesX )); if( xValuesY.is()) @@ -184,7 +184,7 @@ chart2::InterpretedData SAL_CALL XYDataInterpreter::reinterpretDataSeries( { xValuesY.set( aValueSeqVec[nIndex++] ); if( xValuesY.is()) - SetRole( xValuesY->getValues(), C2U("values-y")); + SetRole( xValuesY->getValues(), "values-y"); } if( ! xValuesX.is() && @@ -192,7 +192,7 @@ chart2::InterpretedData SAL_CALL XYDataInterpreter::reinterpretDataSeries( { xValuesX.set( aValueSeqVec[nIndex++] ); if( xValuesX.is()) - SetRole( xValuesY->getValues(), C2U("values-x")); + SetRole( xValuesY->getValues(), "values-x"); } } if( xValuesY.is()) diff --git a/chart2/source/tools/AxisHelper.cxx b/chart2/source/tools/AxisHelper.cxx index d7281a71e04d..614236dff6d7 100644 --- a/chart2/source/tools/AxisHelper.cxx +++ b/chart2/source/tools/AxisHelper.cxx @@ -95,7 +95,7 @@ bool AxisHelper::isLogarithmic( const Reference< XScaling >& xScaling ) bool bReturn = false; Reference< lang::XServiceName > xServiceName( xScaling, uno::UNO_QUERY ); bReturn =( xServiceName.is() && (xServiceName->getServiceName()).equals( - C2U( "com.sun.star.chart2.LogarithmicScaling" ))); + "com.sun.star.chart2.LogarithmicScaling")); return bReturn; } @@ -149,7 +149,7 @@ sal_Int32 AxisHelper::getExplicitNumberFormatKeyForAxis( Reference< chart2::XChartDocument > xChartDoc( xNumberFormatsSupplier, uno::UNO_QUERY ); Reference< beans::XPropertySet > xProp( xAxis, uno::UNO_QUERY ); - if( xProp.is() && !( xProp->getPropertyValue( C2U( "NumberFormat" ) ) >>= nNumberFormatKey ) ) + if( xProp.is() && !( xProp->getPropertyValue( "NumberFormat" ) >>= nNumberFormatKey ) ) { bool bFormatSet = false; //check whether we have a percent scale -> use percent format @@ -190,7 +190,7 @@ sal_Int32 AxisHelper::getExplicitNumberFormatKeyForAxis( if( xSource.is() ) { ::std::vector< Reference< chart2::data::XLabeledDataSequence > > aXValues( - DataSeriesHelper::getAllDataSequencesByRole( xSource->getDataSequences(), C2U("values-x"), true ) ); + DataSeriesHelper::getAllDataSequencesByRole( xSource->getDataSequences(), "values-x", true ) ); if( aXValues.empty() ) { Reference< data::XLabeledDataSequence > xCategories( DiagramHelper::getCategoriesFromDiagram( xDiagram ) ); @@ -234,7 +234,7 @@ sal_Int32 AxisHelper::getExplicitNumberFormatKeyForAxis( { ::rtl::OUString aRoleToMatch; if( nDimensionIndex == 0 ) - aRoleToMatch = C2U("values-x"); + aRoleToMatch = "values-x"; Sequence< Reference< XChartType > > aChartTypes( xCTCnt->getChartTypes()); for( sal_Int32 nCTIdx=0; nCTIdx<aChartTypes.getLength(); ++nCTIdx ) { @@ -333,7 +333,7 @@ Reference< XAxis > AxisHelper::createAxis( return NULL; Reference< XAxis > xAxis( xContext->getServiceManager()->createInstanceWithContext( - C2U( "com.sun.star.chart2.Axis" ), xContext ), uno::UNO_QUERY ); + "com.sun.star.chart2.Axis", xContext ), uno::UNO_QUERY ); OSL_ASSERT( xAxis.is()); if( xAxis.is()) @@ -362,7 +362,7 @@ Reference< XAxis > AxisHelper::createAxis( if( xMainProp.is() ) { ::com::sun::star::chart::ChartAxisPosition eMainAxisPos( ::com::sun::star::chart::ChartAxisPosition_ZERO ); - xMainProp->getPropertyValue(C2U( "CrossoverPosition" )) >>= eMainAxisPos; + xMainProp->getPropertyValue("CrossoverPosition") >>= eMainAxisPos; if( ::com::sun::star::chart::ChartAxisPosition_END == eMainAxisPos ) eNewAxisPos = ::com::sun::star::chart::ChartAxisPosition_START; } @@ -370,7 +370,7 @@ Reference< XAxis > AxisHelper::createAxis( Reference< beans::XPropertySet > xProp( xAxis, uno::UNO_QUERY ); if( xProp.is() ) - xProp->setPropertyValue(C2U( "CrossoverPosition" ), uno::makeAny(eNewAxisPos) ); + xProp->setPropertyValue("CrossoverPosition", uno::makeAny(eNewAxisPos) ); } Reference< beans::XPropertySet > xProp( xAxis, uno::UNO_QUERY ); @@ -462,9 +462,9 @@ void AxisHelper::makeAxisVisible( const Reference< XAxis >& xAxis ) Reference< beans::XPropertySet > xProps( xAxis, uno::UNO_QUERY ); if( xProps.is() ) { - xProps->setPropertyValue( C2U( "Show" ), uno::makeAny( sal_True ) ); + xProps->setPropertyValue( "Show", uno::makeAny( sal_True ) ); LineProperties::SetLineVisible( xProps ); - xProps->setPropertyValue( C2U( "DisplayLabels" ), uno::makeAny( sal_True ) ); + xProps->setPropertyValue( "DisplayLabels", uno::makeAny( sal_True ) ); } } @@ -472,7 +472,7 @@ void AxisHelper::makeGridVisible( const Reference< beans::XPropertySet >& xGridP { if( xGridProperties.is() ) { - xGridProperties->setPropertyValue( C2U( "Show" ), uno::makeAny( sal_True ) ); + xGridProperties->setPropertyValue( "Show", uno::makeAny( sal_True ) ); LineProperties::SetLineVisible( xGridProperties ); } } @@ -488,7 +488,7 @@ void AxisHelper::makeAxisInvisible( const Reference< XAxis >& xAxis ) Reference< beans::XPropertySet > xProps( xAxis, uno::UNO_QUERY ); if( xProps.is() ) { - xProps->setPropertyValue( C2U( "Show" ), uno::makeAny( sal_False ) ); + xProps->setPropertyValue( "Show", uno::makeAny( sal_False ) ); } } @@ -539,7 +539,7 @@ void AxisHelper::makeGridInvisible( const Reference< beans::XPropertySet >& xGri { if( xGridProperties.is() ) { - xGridProperties->setPropertyValue( C2U( "Show" ), uno::makeAny( sal_False ) ); + xGridProperties->setPropertyValue( "Show", uno::makeAny( sal_False ) ); } } @@ -621,7 +621,7 @@ Reference< XAxis > AxisHelper::getCrossingMainAxis( const Reference< XAxis >& xA nDimensionIndex=1; bool bSwapXY = false; Reference< beans::XPropertySet > xCooSysProp( xCooSys, uno::UNO_QUERY ); - if( xCooSysProp.is() && (xCooSysProp->getPropertyValue( C2U("SwapXAndYAxis") ) >>= bSwapXY) && bSwapXY ) + if( xCooSysProp.is() && (xCooSysProp->getPropertyValue( "SwapXAndYAxis" ) >>= bSwapXY) && bSwapXY ) nDimensionIndex=0; } else if( 1==nDimensionIndex ) @@ -664,7 +664,7 @@ sal_Bool AxisHelper::isAxisVisible( const Reference< XAxis >& xAxis ) Reference< beans::XPropertySet > xProps( xAxis, uno::UNO_QUERY ); if( xProps.is() ) { - xProps->getPropertyValue( C2U( "Show" ) ) >>= bRet; + xProps->getPropertyValue( "Show" ) >>= bRet; bRet = bRet && ( LineProperties::IsLineVisible( xProps ) || areAxisLabelsVisible( xProps ) ); } @@ -677,7 +677,7 @@ sal_Bool AxisHelper::areAxisLabelsVisible( const Reference< beans::XPropertySet sal_Bool bRet = false; if( xAxisProperties.is() ) { - xAxisProperties->getPropertyValue( C2U( "DisplayLabels" ) ) >>= bRet; + xAxisProperties->getPropertyValue( "DisplayLabels" ) >>= bRet; } return bRet; } @@ -688,7 +688,7 @@ sal_Bool AxisHelper::isGridVisible( const Reference< beans::XPropertySet >& xGri if( xGridProperies.is() ) { - xGridProperies->getPropertyValue( C2U( "Show" ) ) >>= bRet; + xGridProperies->getPropertyValue( "Show" ) >>= bRet; bRet = bRet && LineProperties::IsLineVisible( xGridProperies ); } @@ -813,7 +813,7 @@ std::vector< Reference< XAxis > > AxisHelper::getAllAxesOfCoordinateSystem( { Reference< beans::XPropertySet > xAxisProp( xAxis, uno::UNO_QUERY ); if( !xAxisProp.is() || - !(xAxisProp->getPropertyValue( C2U("Show")) >>= bAddAxis) ) + !(xAxisProp->getPropertyValue( "Show") >>= bAddAxis) ) bAddAxis = false; } if( bAddAxis ) @@ -919,7 +919,7 @@ bool AxisHelper::isSecondaryYAxisNeeded( const Reference< XCoordinateSystem >& x if(xProp.is()) { sal_Int32 nAttachedAxisIndex = 0; - if( ( xProp->getPropertyValue( C2U( "AttachedAxisIndex" ) ) >>= nAttachedAxisIndex ) && nAttachedAxisIndex>0 ) + if( ( xProp->getPropertyValue( "AttachedAxisIndex" ) >>= nAttachedAxisIndex ) && nAttachedAxisIndex>0 ) return true; } } @@ -1074,7 +1074,7 @@ void AxisHelper::setRTLAxisLayout( const Reference< XCoordinateSystem >& xCooSys bool bVertical = false; Reference< beans::XPropertySet > xCooSysProp( xCooSys, uno::UNO_QUERY ); if( xCooSysProp.is() ) - xCooSysProp->getPropertyValue( C2U("SwapXAndYAxis") ) >>= bVertical; + xCooSysProp->getPropertyValue( "SwapXAndYAxis" ) >>= bVertical; sal_Int32 nHorizontalAxisDimension = bVertical ? 1 : 0; sal_Int32 nVerticalAxisDimension = bVertical ? 0 : 1; diff --git a/chart2/source/tools/CachedDataSequence.cxx b/chart2/source/tools/CachedDataSequence.cxx index a91bb89579a8..6426170481ff 100644 --- a/chart2/source/tools/CachedDataSequence.cxx +++ b/chart2/source/tools/CachedDataSequence.cxx @@ -123,13 +123,13 @@ CachedDataSequence::~CachedDataSequence() void CachedDataSequence::registerProperties() { - registerProperty( C2U( "NumberFormatKey" ), + registerProperty( "NumberFormatKey", PROP_NUMBERFORMAT_KEY, 0, // PropertyAttributes & m_nNumberFormatKey, ::getCppuType( & m_nNumberFormatKey ) ); - registerProperty( C2U( "Role" ), + registerProperty( "Role", PROP_PROPOSED_ROLE, 0, // PropertyAttributes & m_sRole, @@ -234,9 +234,9 @@ Sequence< OUString > CachedDataSequence::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 4 ); aServices[ 0 ] = lcl_aServiceName; - aServices[ 1 ] = C2U( "com.sun.star.chart2.data.DataSequence" ); - aServices[ 2 ] = C2U( "com.sun.star.chart2.data.NumericalDataSequence" ); - aServices[ 3 ] = C2U( "com.sun.star.chart2.data.TextualDataSequence" ); + aServices[ 1 ] = "com.sun.star.chart2.data.DataSequence"; + aServices[ 2 ] = "com.sun.star.chart2.data.NumericalDataSequence"; + aServices[ 3 ] = "com.sun.star.chart2.data.TextualDataSequence"; return aServices; } diff --git a/chart2/source/tools/CharacterProperties.cxx b/chart2/source/tools/CharacterProperties.cxx index 029b07197ed8..b04390e2c1a5 100644 --- a/chart2/source/tools/CharacterProperties.cxx +++ b/chart2/source/tools/CharacterProperties.cxx @@ -62,13 +62,13 @@ void CharacterProperties::AddPropertiesToVector( { // CharacterProperties rOutProperties.push_back( - Property( C2U( "CharFontName" ), + Property( "CharFontName", PROP_CHAR_FONT_NAME, ::getCppuType( reinterpret_cast< const OUString * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "CharFontStyleName" ), + Property( "CharFontStyleName", PROP_CHAR_FONT_STYLE_NAME, ::getCppuType( reinterpret_cast< const OUString * >(0)), beans::PropertyAttribute::BOUND @@ -76,56 +76,56 @@ void CharacterProperties::AddPropertiesToVector( | beans::PropertyAttribute::MAYBEVOID )); // CharFontFamily (see awt.FontFamily) rOutProperties.push_back( - Property( C2U( "CharFontFamily" ), + Property( "CharFontFamily", PROP_CHAR_FONT_FAMILY, ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); // CharFontCharSet (see awt.CharSet) rOutProperties.push_back( - Property( C2U( "CharFontCharSet" ), + Property( "CharFontCharSet", PROP_CHAR_FONT_CHAR_SET, ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); // CharFontPitch (see awt.FontPitch) rOutProperties.push_back( - Property( C2U( "CharFontPitch" ), + Property( "CharFontPitch", PROP_CHAR_FONT_PITCH, ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); // CharColor rOutProperties.push_back( - Property( C2U( "CharColor" ), + Property( "CharColor", PROP_CHAR_COLOR, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); // CharEscapement rOutProperties.push_back( - Property( C2U( "CharEscapement" ), + Property( "CharEscapement", PROP_CHAR_ESCAPEMENT, ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID )); // CharHeight rOutProperties.push_back( - Property( C2U( "CharHeight" ), + Property( "CharHeight", PROP_CHAR_CHAR_HEIGHT, ::getCppuType( reinterpret_cast< const float * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); // CharUnderline (see awt.FontUnderline) rOutProperties.push_back( - Property( C2U( "CharUnderline" ), + Property( "CharUnderline", PROP_CHAR_UNDERLINE, ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); // CharUnderlineColor rOutProperties.push_back( - Property( C2U( "CharUnderlineColor" ), + Property( "CharUnderlineColor", PROP_CHAR_UNDERLINE_COLOR, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND @@ -133,21 +133,21 @@ void CharacterProperties::AddPropertiesToVector( | beans::PropertyAttribute::MAYBEVOID )); // CharUnderlineHasColor rOutProperties.push_back( - Property( C2U( "CharUnderlineHasColor" ), + Property( "CharUnderlineHasColor", PROP_CHAR_UNDERLINE_HAS_COLOR, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); // CharOverline (see awt.FontUnderline) rOutProperties.push_back( - Property( C2U( "CharOverline" ), + Property( "CharOverline", PROP_CHAR_OVERLINE, ::getCppuType( reinterpret_cast< const sal_Int16* >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT ) ); // CharOverlineColor rOutProperties.push_back( - Property( C2U( "CharOverlineColor" ), + Property( "CharOverlineColor", PROP_CHAR_OVERLINE_COLOR, ::getCppuType( reinterpret_cast< const sal_Int32* >( 0 ) ), beans::PropertyAttribute::BOUND @@ -155,34 +155,34 @@ void CharacterProperties::AddPropertiesToVector( | beans::PropertyAttribute::MAYBEVOID ) ); // CharOverlineHasColor rOutProperties.push_back( - Property( C2U( "CharOverlineHasColor" ), + Property( "CharOverlineHasColor", PROP_CHAR_OVERLINE_HAS_COLOR, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT ) ); // CharWeight (see awt.FontWeight) rOutProperties.push_back( - Property( C2U( "CharWeight" ), + Property( "CharWeight", PROP_CHAR_WEIGHT, ::getCppuType( reinterpret_cast< const float * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); // CharPosture rOutProperties.push_back( - Property( C2U( "CharPosture" ), + Property( "CharPosture", PROP_CHAR_POSTURE, ::getCppuType( reinterpret_cast< const awt::FontSlant * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "CharAutoKerning" ), + Property( "CharAutoKerning", PROP_CHAR_AUTO_KERNING, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT | beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( - Property( C2U( "CharKerning" ), + Property( "CharKerning", PROP_CHAR_KERNING, ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)), beans::PropertyAttribute::BOUND @@ -190,49 +190,49 @@ void CharacterProperties::AddPropertiesToVector( | beans::PropertyAttribute::MAYBEVOID )); // CharEscapementHeight rOutProperties.push_back( - Property( C2U( "CharEscapementHeight" ), + Property( "CharEscapementHeight", PROP_CHAR_ESCAPEMENT_HEIGHT, ::getCppuType( reinterpret_cast< const sal_Int8 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID )); // CharStrikeout (see awt.FontStrikeout) rOutProperties.push_back( - Property( C2U( "CharStrikeout" ), + Property( "CharStrikeout", PROP_CHAR_STRIKE_OUT, ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); // CharWordMode rOutProperties.push_back( - Property( C2U( "CharWordMode" ), + Property( "CharWordMode", PROP_CHAR_WORD_MODE, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); // CharLocale rOutProperties.push_back( - Property( C2U( "CharLocale" ), + Property( "CharLocale", PROP_CHAR_LOCALE, ::getCppuType( reinterpret_cast< const lang::Locale * >(0)), //#i111967# no PropertyChangeEvent is fired on change so far beans::PropertyAttribute::MAYBEDEFAULT )); // CharShadowed rOutProperties.push_back( - Property( C2U( "CharShadowed" ), + Property( "CharShadowed", PROP_CHAR_SHADOWED, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); // CharContoured rOutProperties.push_back( - Property( C2U( "CharContoured" ), + Property( "CharContoured", PROP_CHAR_CONTOURED, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); // CharRelief (see text.FontRelief) rOutProperties.push_back( - Property( C2U( "CharRelief" ), + Property( "CharRelief", PROP_CHAR_RELIEF, ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)), beans::PropertyAttribute::BOUND @@ -240,7 +240,7 @@ void CharacterProperties::AddPropertiesToVector( // CharEmphasize (see text.FontEmphasis) rOutProperties.push_back( - Property( C2U( "CharEmphasis" ), + Property( "CharEmphasis", PROP_CHAR_EMPHASIS, ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)), beans::PropertyAttribute::BOUND @@ -249,14 +249,14 @@ void CharacterProperties::AddPropertiesToVector( // ===== // CharFontNameAsian rOutProperties.push_back( - Property( C2U( "CharFontNameAsian" ), + Property( "CharFontNameAsian", PROP_CHAR_ASIAN_FONT_NAME, ::getCppuType( reinterpret_cast< const OUString * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); // CharFontStyleNameAsian rOutProperties.push_back( - Property( C2U( "CharFontStyleNameAsian" ), + Property( "CharFontStyleNameAsian", PROP_CHAR_ASIAN_FONT_STYLE_NAME, ::getCppuType( reinterpret_cast< const OUString * >(0)), beans::PropertyAttribute::BOUND @@ -264,49 +264,49 @@ void CharacterProperties::AddPropertiesToVector( | beans::PropertyAttribute::MAYBEVOID )); // CharFontFamilyAsian (see awt.FontFamily) rOutProperties.push_back( - Property( C2U( "CharFontFamilyAsian" ), + Property( "CharFontFamilyAsian", PROP_CHAR_ASIAN_FONT_FAMILY, ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); // CharFontCharSetAsian (see awt.CharSet) rOutProperties.push_back( - Property( C2U( "CharFontCharSetAsian" ), + Property( "CharFontCharSetAsian", PROP_CHAR_ASIAN_CHAR_SET, ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); // CharFontPitchAsian (see awt.FontPitch) rOutProperties.push_back( - Property( C2U( "CharFontPitchAsian" ), + Property( "CharFontPitchAsian", PROP_CHAR_ASIAN_FONT_PITCH, ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); // CharHeightAsian rOutProperties.push_back( - Property( C2U( "CharHeightAsian" ), + Property( "CharHeightAsian", PROP_CHAR_ASIAN_CHAR_HEIGHT, ::getCppuType( reinterpret_cast< const float * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); // CharWeightAsian rOutProperties.push_back( - Property( C2U( "CharWeightAsian" ), + Property( "CharWeightAsian", PROP_CHAR_ASIAN_WEIGHT, ::getCppuType( reinterpret_cast< const float * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); // CharPostureAsian rOutProperties.push_back( - Property( C2U( "CharPostureAsian" ), + Property( "CharPostureAsian", PROP_CHAR_ASIAN_POSTURE, ::getCppuType( reinterpret_cast< const awt::FontSlant * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); // CharLocaleAsian rOutProperties.push_back( - Property( C2U( "CharLocaleAsian" ), + Property( "CharLocaleAsian", PROP_CHAR_ASIAN_LOCALE, ::getCppuType( reinterpret_cast< const lang::Locale * >(0)), //#i111967# no PropertyChangeEvent is fired on change so far @@ -316,14 +316,14 @@ void CharacterProperties::AddPropertiesToVector( // === // CharFontNameComplex rOutProperties.push_back( - Property( C2U( "CharFontNameComplex" ), + Property( "CharFontNameComplex", PROP_CHAR_COMPLEX_FONT_NAME, ::getCppuType( reinterpret_cast< const OUString * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); // CharFontStyleNameComplex rOutProperties.push_back( - Property( C2U( "CharFontStyleNameComplex" ), + Property( "CharFontStyleNameComplex", PROP_CHAR_COMPLEX_FONT_STYLE_NAME, ::getCppuType( reinterpret_cast< const OUString * >(0)), beans::PropertyAttribute::BOUND @@ -331,49 +331,49 @@ void CharacterProperties::AddPropertiesToVector( | beans::PropertyAttribute::MAYBEVOID )); // CharFontFamilyComplex (see awt.FontFamily) rOutProperties.push_back( - Property( C2U( "CharFontFamilyComplex" ), + Property( "CharFontFamilyComplex", PROP_CHAR_COMPLEX_FONT_FAMILY, ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); // CharFontCharSetComplex (see awt.CharSet) rOutProperties.push_back( - Property( C2U( "CharFontCharSetComplex" ), + Property( "CharFontCharSetComplex", PROP_CHAR_COMPLEX_CHAR_SET, ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); // CharFontPitchComplex (see awt.FontPitch) rOutProperties.push_back( - Property( C2U( "CharFontPitchComplex" ), + Property( "CharFontPitchComplex", PROP_CHAR_COMPLEX_FONT_PITCH, ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); // CharHeightComplex rOutProperties.push_back( - Property( C2U( "CharHeightComplex" ), + Property( "CharHeightComplex", PROP_CHAR_COMPLEX_CHAR_HEIGHT, ::getCppuType( reinterpret_cast< const float * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); // CharWeightComplex rOutProperties.push_back( - Property( C2U( "CharWeightComplex" ), + Property( "CharWeightComplex", PROP_CHAR_COMPLEX_WEIGHT, ::getCppuType( reinterpret_cast< const float * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); // CharPostureComplex rOutProperties.push_back( - Property( C2U( "CharPostureComplex" ), + Property( "CharPostureComplex", PROP_CHAR_COMPLEX_POSTURE, ::getCppuType( reinterpret_cast< const awt::FontSlant * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); // CharLocaleComplex rOutProperties.push_back( - Property( C2U( "CharLocaleComplex" ), + Property( "CharLocaleComplex", PROP_CHAR_COMPLEX_LOCALE, ::getCppuType( reinterpret_cast< const lang::Locale * >(0)), //#i111967# no PropertyChangeEvent is fired on change so far @@ -381,14 +381,14 @@ void CharacterProperties::AddPropertiesToVector( // Writing Mode left to right vs right to left rOutProperties.push_back( - Property( C2U( "WritingMode" ), + Property( "WritingMode", PROP_WRITING_MODE, ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)), /*com::sun::star::text::WritingMode2*/ beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "ParaIsCharacterDistance" ), + Property( "ParaIsCharacterDistance", PROP_PARA_IS_CHARACTER_DISTANCE, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND @@ -402,11 +402,11 @@ void CharacterProperties::AddDefaultsToMap( SvtLinguConfig aLinguConfig; lang::Locale aDefaultLocale; - aLinguConfig.GetProperty(C2U("DefaultLocale")) >>= aDefaultLocale; + aLinguConfig.GetProperty("DefaultLocale") >>= aDefaultLocale; lang::Locale aDefaultLocale_CJK; - aLinguConfig.GetProperty(C2U("DefaultLocale_CJK")) >>= aDefaultLocale_CJK; + aLinguConfig.GetProperty("DefaultLocale_CJK") >>= aDefaultLocale_CJK; lang::Locale aDefaultLocale_CTL; - aLinguConfig.GetProperty(C2U("DefaultLocale_CTL")) >>= aDefaultLocale_CTL; + aLinguConfig.GetProperty("DefaultLocale_CTL") >>= aDefaultLocale_CTL; using namespace ::com::sun::star::i18n::ScriptType; LanguageType nLang; @@ -480,18 +480,18 @@ awt::FontDescriptor CharacterProperties::createFontDescriptorFromPropertySet( awt::FontDescriptor aResult; // Note: keep this sorted! ::comphelper::MakeVector< OUString > aPropNames - ( C2U("CharFontCharSet")); // CharSet + ( "CharFontCharSet"); // CharSet aPropNames - ( C2U("CharFontFamily")) // Family - ( C2U("CharFontName")) // Name - ( C2U("CharFontPitch")) // Pitch - ( C2U("CharFontStyleName")) // StyleName - ( C2U("CharHeight")) // Height - ( C2U("CharPosture")) // Slant - ( C2U("CharStrikeout")) // Strikeout - ( C2U("CharUnderline")) // Underline - ( C2U("CharWeight")) // Weight - ( C2U("CharWordMode")) // WordLineMode + ( "CharFontFamily") // Family + ( "CharFontName") // Name + ( "CharFontPitch") // Pitch + ( "CharFontStyleName") // StyleName + ( "CharHeight") // Height + ( "CharPosture") // Slant + ( "CharStrikeout") // Strikeout + ( "CharUnderline") // Underline + ( "CharWeight") // Weight + ( "CharWordMode") // WordLineMode ; uno::Sequence< OUString > aPropNameSeq( ContainerHelper::ContainerToSequence( aPropNames )); diff --git a/chart2/source/tools/ChartModelHelper.cxx b/chart2/source/tools/ChartModelHelper.cxx index 7dbb649de98d..7002a471f2d0 100644 --- a/chart2/source/tools/ChartModelHelper.cxx +++ b/chart2/source/tools/ChartModelHelper.cxx @@ -166,7 +166,7 @@ bool ChartModelHelper::isIncludeHiddenCells( const uno::Reference< frame::XModel try { - xProp->getPropertyValue(C2U("IncludeHiddenCells")) >>= bIncluded; + xProp->getPropertyValue("IncludeHiddenCells") >>= bIncluded; } catch( const beans::UnknownPropertyException& ) { @@ -186,7 +186,7 @@ bool ChartModelHelper::setIncludeHiddenCells( bool bIncludeHiddenCells, const un if (xDiagramProperties.is()) { bool bOldValue = bIncludeHiddenCells; - xDiagramProperties->getPropertyValue( C2U("IncludeHiddenCells") ) >>= bOldValue; + xDiagramProperties->getPropertyValue( "IncludeHiddenCells" ) >>= bOldValue; if( bOldValue == bIncludeHiddenCells ) bChanged = true; @@ -201,7 +201,7 @@ bool ChartModelHelper::setIncludeHiddenCells( bool bIncludeHiddenCells, const un { uno::Reference< beans::XPropertySet > xDataProviderProperties( xChartDoc->getDataProvider(), uno::UNO_QUERY ); if( xDataProviderProperties.is() ) - xDataProviderProperties->setPropertyValue(C2U("IncludeHiddenCells"), aNewValue ); + xDataProviderProperties->setPropertyValue("IncludeHiddenCells", aNewValue ); } } catch( const beans::UnknownPropertyException& ) @@ -220,10 +220,10 @@ bool ChartModelHelper::setIncludeHiddenCells( bool bIncludeHiddenCells, const un { xProp.set( uno::Reference< beans::XPropertySet >( aData[i]->getValues(), uno::UNO_QUERY ) ); if(xProp.is()) - xProp->setPropertyValue(C2U("IncludeHiddenCells"), aNewValue ); + xProp->setPropertyValue("IncludeHiddenCells", aNewValue ); xProp.set( uno::Reference< beans::XPropertySet >( aData[i]->getLabel(), uno::UNO_QUERY ) ); if(xProp.is()) - xProp->setPropertyValue(C2U("IncludeHiddenCells"), aNewValue ); + xProp->setPropertyValue("IncludeHiddenCells", aNewValue ); } } } @@ -232,7 +232,7 @@ bool ChartModelHelper::setIncludeHiddenCells( bool bIncludeHiddenCells, const un //the property is optional! } - xDiagramProperties->setPropertyValue( C2U("IncludeHiddenCells"), aNewValue); + xDiagramProperties->setPropertyValue( "IncludeHiddenCells", aNewValue); } } catch (const uno::Exception& e) diff --git a/chart2/source/tools/ChartTypeHelper.cxx b/chart2/source/tools/ChartTypeHelper.cxx index d31a50efe804..51b760de355d 100644 --- a/chart2/source/tools/ChartTypeHelper.cxx +++ b/chart2/source/tools/ChartTypeHelper.cxx @@ -254,7 +254,7 @@ uno::Sequence < sal_Int32 > ChartTypeHelper::getSupportedLabelPlacements( const bool bDonut = false; uno::Reference< beans::XPropertySet > xChartTypeProp( xChartType, uno::UNO_QUERY_THROW ); if(xChartTypeProp.is()) - xChartTypeProp->getPropertyValue( C2U("UseRings")) >>= bDonut; + xChartTypeProp->getPropertyValue( "UseRings") >>= bDonut; if(!bDonut) { @@ -293,7 +293,7 @@ uno::Sequence < sal_Int32 > ChartTypeHelper::getSupportedLabelPlacements( const { uno::Reference< beans::XPropertySet > xSeriesProp( xSeries, uno::UNO_QUERY ); chart2::StackingDirection eStacking = chart2::StackingDirection_NO_STACKING; - xSeriesProp->getPropertyValue( C2U("StackingDirection") ) >>= eStacking; + xSeriesProp->getPropertyValue( "StackingDirection" ) >>= eStacking; bStacked = (chart2::StackingDirection_Y_STACKING == eStacking); } @@ -553,7 +553,7 @@ sal_Int32 ChartTypeHelper::getNumberOfDisplayedSeries( { uno::Reference< beans::XPropertySet > xChartTypeProp( xChartType, uno::UNO_QUERY_THROW ); bool bDonut = false; - if( (xChartTypeProp->getPropertyValue( C2U("UseRings")) >>= bDonut) + if( (xChartTypeProp->getPropertyValue( "UseRings") >>= bDonut) && !bDonut ) { return nNumberOfSeries>0 ? 1 : 0; @@ -643,7 +643,7 @@ bool ChartTypeHelper::isSeriesInFrontOfAxisLine( const uno::Reference< XChartTyp rtl::OUString ChartTypeHelper::getRoleOfSequenceForYAxisNumberFormatDetection( const uno::Reference< XChartType >& xChartType ) { - rtl::OUString aRet( C2U( "values-y" ) ); + rtl::OUString aRet( "values-y" ); if( !xChartType.is() ) return aRet; rtl::OUString aChartTypeName = xChartType->getChartType(); @@ -654,7 +654,7 @@ rtl::OUString ChartTypeHelper::getRoleOfSequenceForYAxisNumberFormatDetection( c rtl::OUString ChartTypeHelper::getRoleOfSequenceForDataLabelNumberFormatDetection( const uno::Reference< XChartType >& xChartType ) { - rtl::OUString aRet( C2U( "values-y" ) ); + rtl::OUString aRet( "values-y" ); if( !xChartType.is() ) return aRet; rtl::OUString aChartTypeName = xChartType->getChartType(); diff --git a/chart2/source/tools/ColorPerPointHelper.cxx b/chart2/source/tools/ColorPerPointHelper.cxx index 84ecf6017620..ad60db5af27a 100644 --- a/chart2/source/tools/ColorPerPointHelper.cxx +++ b/chart2/source/tools/ColorPerPointHelper.cxx @@ -55,7 +55,7 @@ bool ColorPerPointHelper::hasPointOwnColor( if( !xPointState.is() ) return false; - return (xPointState->getPropertyState( C2U("Color")) != beans::PropertyState_DEFAULT_VALUE ); + return (xPointState->getPropertyState( "Color") != beans::PropertyState_DEFAULT_VALUE ); } return false; @@ -69,7 +69,7 @@ bool ColorPerPointHelper::hasPointOwnProperties( if( xSeriesProperties.is() ) { uno::Sequence< sal_Int32 > aIndexList; - if( xSeriesProperties->getPropertyValue( C2U( "AttributedDataPoints" ) ) >>= aIndexList ) + if( xSeriesProperties->getPropertyValue( "AttributedDataPoints" ) >>= aIndexList ) { const sal_Int32 * pBegIt = aIndexList.getConstArray(); const sal_Int32 * pEndIt = pBegIt + aIndexList.getLength(); diff --git a/chart2/source/tools/ConfigColorScheme.cxx b/chart2/source/tools/ConfigColorScheme.cxx index ba90ac631571..6167490401cb 100644 --- a/chart2/source/tools/ConfigColorScheme.cxx +++ b/chart2/source/tools/ConfigColorScheme.cxx @@ -73,7 +73,7 @@ private: }; ChartConfigItem::ChartConfigItem( ConfigItemListener & rListener ) : - ::utl::ConfigItem( C2U("Office.Chart/DefaultColor")), + ::utl::ConfigItem( "Office.Chart/DefaultColor"), m_rListener( rListener ) {} @@ -180,13 +180,13 @@ void ConfigColorScheme::notify( const OUString & rPropertyName ) Sequence< OUString > ConfigColorScheme::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 1 ); - aServices[ 0 ] = C2U( "com.sun.star.chart2.ColorScheme" ); + aServices[ 0 ] = "com.sun.star.chart2.ColorScheme"; return aServices; } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static APPHELPER_XSERVICEINFO_IMPL( ConfigColorScheme, - C2U( "com.sun.star.comp.chart2.ConfigDefaultColorScheme" )) + OUString("com.sun.star.comp.chart2.ConfigDefaultColorScheme") ) // ================================================================================ diff --git a/chart2/source/tools/DataSeriesHelper.cxx b/chart2/source/tools/DataSeriesHelper.cxx index 15ea9151e1e2..ca39c3f92739 100644 --- a/chart2/source/tools/DataSeriesHelper.cxx +++ b/chart2/source/tools/DataSeriesHelper.cxx @@ -152,16 +152,16 @@ void lcl_insertOrDeleteDataLabelsToSeriesAndAllPoints( const Reference< chart2:: if( xSeriesProperties.is() ) { DataPointLabel aLabelAtSeries; - xSeriesProperties->getPropertyValue( C2U( "Label" ) ) >>= aLabelAtSeries; + xSeriesProperties->getPropertyValue( "Label" ) >>= aLabelAtSeries; aLabelAtSeries.ShowNumber = bInsert; if( !bInsert ) { aLabelAtSeries.ShowNumberInPercent = false; aLabelAtSeries.ShowCategoryName = false; } - xSeriesProperties->setPropertyValue( C2U( "Label" ), uno::makeAny( aLabelAtSeries ) ); + xSeriesProperties->setPropertyValue( "Label", uno::makeAny( aLabelAtSeries ) ); uno::Sequence< sal_Int32 > aAttributedDataPointIndexList; - if( xSeriesProperties->getPropertyValue( C2U( "AttributedDataPoints" ) ) >>= aAttributedDataPointIndexList ) + if( xSeriesProperties->getPropertyValue( "AttributedDataPoints" ) >>= aAttributedDataPointIndexList ) { for(sal_Int32 nN=aAttributedDataPointIndexList.getLength();nN--;) { @@ -169,14 +169,14 @@ void lcl_insertOrDeleteDataLabelsToSeriesAndAllPoints( const Reference< chart2:: if( xPointProp.is() ) { DataPointLabel aLabel; - xPointProp->getPropertyValue( C2U( "Label" ) ) >>= aLabel; + xPointProp->getPropertyValue( "Label" ) >>= aLabel; aLabel.ShowNumber = bInsert; if( !bInsert ) { aLabel.ShowNumberInPercent = false; aLabel.ShowCategoryName = false; } - xPointProp->setPropertyValue( C2U( "Label" ), uno::makeAny( aLabel ) ); + xPointProp->setPropertyValue( "Label", uno::makeAny( aLabel ) ); } } } @@ -204,7 +204,7 @@ OUString GetRole( const uno::Reference< chart2::data::XLabeledDataSequence >& xL { Reference< beans::XPropertySet > xProp( xLabeledDataSequence->getValues(), uno::UNO_QUERY ); if( xProp.is() ) - xProp->getPropertyValue( C2U("Role") ) >>= aRet; + xProp->getPropertyValue( "Role" ) >>= aRet; } return aRet; } @@ -408,7 +408,7 @@ void setStackModeAtSeries( xProp->setPropertyValue( aPropName, aPropValue ); sal_Int32 nAxisIndex; - xProp->getPropertyValue( C2U("AttachedAxisIndex") ) >>= nAxisIndex; + xProp->getPropertyValue( "AttachedAxisIndex" ) >>= nAxisIndex; aAxisIndexSet.insert(nAxisIndex); } } @@ -460,7 +460,7 @@ sal_Int32 getAttachedAxisIndex( const Reference< chart2::XDataSeries > & xSeries Reference< beans::XPropertySet > xProp( xSeries, uno::UNO_QUERY ); if( xProp.is() ) { - xProp->getPropertyValue( C2U("AttachedAxisIndex") ) >>= nRet; + xProp->getPropertyValue( "AttachedAxisIndex" ) >>= nRet; } } catch( const uno::Exception & ex ) @@ -484,7 +484,7 @@ sal_Int32 getNumberFormatKeyFromAxis( Reference< beans::XPropertySet > xAxisProp( xCorrespondingCoordinateSystem->getAxisByDimension( nDimensionIndex, nAxisIndex ), uno::UNO_QUERY ); if( xAxisProp.is()) - xAxisProp->getPropertyValue( C2U("NumberFormat")) >>= nResult; + xAxisProp->getPropertyValue( "NumberFormat") >>= nResult; } catch( const uno::Exception & ex ) { @@ -546,7 +546,7 @@ void switchSymbolsOnOrOff( const Reference< beans::XPropertySet > & xSeriesPrope return; chart2::Symbol aSymbProp; - if( (xSeriesProperties->getPropertyValue( C2U( "Symbol" )) >>= aSymbProp ) ) + if( (xSeriesProperties->getPropertyValue( "Symbol") >>= aSymbProp ) ) { if( !bSymbolsOn ) aSymbProp.Style = chart2::SymbolStyle_NONE; @@ -555,7 +555,7 @@ void switchSymbolsOnOrOff( const Reference< beans::XPropertySet > & xSeriesPrope aSymbProp.Style = chart2::SymbolStyle_STANDARD; aSymbProp.StandardSymbol = nSeriesIndex; } - xSeriesProperties->setPropertyValue( C2U( "Symbol" ), uno::makeAny( aSymbProp )); + xSeriesProperties->setPropertyValue( "Symbol", uno::makeAny( aSymbProp )); } //todo: check attributed data points } @@ -569,14 +569,14 @@ void switchLinesOnOrOff( const Reference< beans::XPropertySet > & xSeriesPropert { // keep line-styles that are not NONE drawing::LineStyle eLineStyle; - if( (xSeriesProperties->getPropertyValue( C2U( "LineStyle" )) >>= eLineStyle ) && + if( (xSeriesProperties->getPropertyValue( "LineStyle") >>= eLineStyle ) && eLineStyle == drawing::LineStyle_NONE ) { - xSeriesProperties->setPropertyValue( C2U( "LineStyle" ), uno::makeAny( drawing::LineStyle_SOLID ) ); + xSeriesProperties->setPropertyValue( "LineStyle", uno::makeAny( drawing::LineStyle_SOLID ) ); } } else - xSeriesProperties->setPropertyValue( C2U( "LineStyle" ), uno::makeAny( drawing::LineStyle_NONE ) ); + xSeriesProperties->setPropertyValue( "LineStyle", uno::makeAny( drawing::LineStyle_NONE ) ); } void makeLinesThickOrThin( const Reference< beans::XPropertySet > & xSeriesProperties, bool bThick ) @@ -586,11 +586,11 @@ void makeLinesThickOrThin( const Reference< beans::XPropertySet > & xSeriesPrope sal_Int32 nNewValue = bThick ? 80 : 0; sal_Int32 nOldValue = 0; - if( (xSeriesProperties->getPropertyValue( C2U( "LineWidth" )) >>= nOldValue ) && + if( (xSeriesProperties->getPropertyValue( "LineWidth") >>= nOldValue ) && nOldValue != nNewValue ) { if( !(bThick && nOldValue>0)) - xSeriesProperties->setPropertyValue( C2U( "LineWidth" ), uno::makeAny( nNewValue ) ); + xSeriesProperties->setPropertyValue( "LineWidth", uno::makeAny( nNewValue ) ); } } @@ -603,7 +603,7 @@ void setPropertyAlsoToAllAttributedDataPoints( const Reference< chart2::XDataSer xSeriesProperties->setPropertyValue( rPropertyName, rPropertyValue ); uno::Sequence< sal_Int32 > aAttributedDataPointIndexList; - if( xSeriesProperties->getPropertyValue( C2U( "AttributedDataPoints" ) ) >>= aAttributedDataPointIndexList ) + if( xSeriesProperties->getPropertyValue( "AttributedDataPoints" ) >>= aAttributedDataPointIndexList ) { for(sal_Int32 nN=aAttributedDataPointIndexList.getLength();nN--;) { @@ -623,7 +623,7 @@ bool hasAttributedDataPointDifferentValue( const Reference< chart2::XDataSeries return false; uno::Sequence< sal_Int32 > aAttributedDataPointIndexList; - if( xSeriesProperties->getPropertyValue( C2U( "AttributedDataPoints" ) ) >>= aAttributedDataPointIndexList ) + if( xSeriesProperties->getPropertyValue( "AttributedDataPoints" ) >>= aAttributedDataPointIndexList ) { for(sal_Int32 nN=aAttributedDataPointIndexList.getLength();nN--;) { @@ -689,7 +689,7 @@ bool lcl_SequenceHasUnhiddenData( const uno::Reference< chart2::data::XDataSeque uno::Sequence< sal_Int32 > aHiddenValues; try { - xProp->getPropertyValue( C2U( "HiddenValues" ) ) >>= aHiddenValues; + xProp->getPropertyValue( "HiddenValues" ) >>= aHiddenValues; if( !aHiddenValues.getLength() ) return true; } @@ -743,7 +743,7 @@ sal_Int32 translateIndexFromHiddenToFullSequence( sal_Int32 nIndex, const Refere if( xProp.is()) { Sequence<sal_Int32> aHiddenIndicesSeq; - xProp->getPropertyValue( C2U("HiddenValues") ) >>= aHiddenIndicesSeq; + xProp->getPropertyValue( "HiddenValues" ) >>= aHiddenIndicesSeq; if( aHiddenIndicesSeq.getLength() ) { ::std::vector< sal_Int32 > aHiddenIndices( ContainerHelper::SequenceToVector( aHiddenIndicesSeq ) ); @@ -775,7 +775,7 @@ bool hasDataLabelsAtSeries( const Reference< chart2::XDataSeries >& xSeries ) if( xProp.is() ) { DataPointLabel aLabel; - if( (xProp->getPropertyValue( C2U( "Label" ) ) >>= aLabel) ) + if( (xProp->getPropertyValue( "Label" ) >>= aLabel) ) bRet = aLabel.ShowNumber || aLabel.ShowNumberInPercent || aLabel.ShowCategoryName; } } @@ -795,7 +795,7 @@ bool hasDataLabelsAtPoints( const Reference< chart2::XDataSeries >& xSeries ) if( xSeriesProperties.is() ) { uno::Sequence< sal_Int32 > aAttributedDataPointIndexList; - if( xSeriesProperties->getPropertyValue( C2U( "AttributedDataPoints" ) ) >>= aAttributedDataPointIndexList ) + if( xSeriesProperties->getPropertyValue( "AttributedDataPoints" ) >>= aAttributedDataPointIndexList ) { for(sal_Int32 nN=aAttributedDataPointIndexList.getLength();nN--;) { @@ -803,7 +803,7 @@ bool hasDataLabelsAtPoints( const Reference< chart2::XDataSeries >& xSeries ) if( xPointProp.is() ) { DataPointLabel aLabel; - if( (xPointProp->getPropertyValue( C2U( "Label" ) ) >>= aLabel) ) + if( (xPointProp->getPropertyValue( "Label" ) >>= aLabel) ) bRet = aLabel.ShowNumber || aLabel.ShowNumberInPercent || aLabel.ShowCategoryName; if( bRet ) break; @@ -829,7 +829,7 @@ bool hasDataLabelAtPoint( const Reference< chart2::XDataSeries >& xSeries, sal_I if( xSeriesProperties.is() ) { uno::Sequence< sal_Int32 > aAttributedDataPointIndexList; - if( xSeriesProperties->getPropertyValue( C2U( "AttributedDataPoints" ) ) >>= aAttributedDataPointIndexList ) + if( xSeriesProperties->getPropertyValue( "AttributedDataPoints" ) >>= aAttributedDataPointIndexList ) { ::std::vector< sal_Int32 > aIndices( ContainerHelper::SequenceToVector( aAttributedDataPointIndexList ) ); ::std::vector< sal_Int32 >::iterator aIt = ::std::find( aIndices.begin(), aIndices.end(), nPointIndex ); @@ -841,7 +841,7 @@ bool hasDataLabelAtPoint( const Reference< chart2::XDataSeries >& xSeries, sal_I if( xProp.is() ) { DataPointLabel aLabel; - if( (xProp->getPropertyValue( C2U( "Label" ) ) >>= aLabel) ) + if( (xProp->getPropertyValue( "Label" ) >>= aLabel) ) bRet = aLabel.ShowNumber || aLabel.ShowNumberInPercent || aLabel.ShowCategoryName; } } @@ -871,9 +871,9 @@ void insertDataLabelToPoint( const Reference< beans::XPropertySet >& xPointProp if( xPointProp.is() ) { DataPointLabel aLabel; - xPointProp->getPropertyValue( C2U( "Label" ) ) >>= aLabel; + xPointProp->getPropertyValue( "Label" ) >>= aLabel; aLabel.ShowNumber = true; - xPointProp->setPropertyValue( C2U( "Label" ), uno::makeAny( aLabel ) ); + xPointProp->setPropertyValue( "Label", uno::makeAny( aLabel ) ); } } catch(const uno::Exception &e) @@ -889,11 +889,11 @@ void deleteDataLabelsFromPoint( const Reference< beans::XPropertySet >& xPointPr if( xPointProp.is() ) { DataPointLabel aLabel; - xPointProp->getPropertyValue( C2U( "Label" ) ) >>= aLabel; + xPointProp->getPropertyValue( "Label" ) >>= aLabel; aLabel.ShowNumber = false; aLabel.ShowNumberInPercent = false; aLabel.ShowCategoryName = false; - xPointProp->setPropertyValue( C2U( "Label" ), uno::makeAny( aLabel ) ); + xPointProp->setPropertyValue( "Label", uno::makeAny( aLabel ) ); } } catch(const uno::Exception &e) diff --git a/chart2/source/tools/DataSourceHelper.cxx b/chart2/source/tools/DataSourceHelper.cxx index cf905481bb3a..cef1dc179d89 100644 --- a/chart2/source/tools/DataSourceHelper.cxx +++ b/chart2/source/tools/DataSourceHelper.cxx @@ -85,11 +85,11 @@ void lcl_addErrorBarRanges( try { uno::Reference< beans::XPropertySet > xErrorBarProp; - if( ( xSeriesProp->getPropertyValue( C2U("ErrorBarY")) >>= xErrorBarProp ) && + if( ( xSeriesProp->getPropertyValue( "ErrorBarY") >>= xErrorBarProp ) && xErrorBarProp.is()) { sal_Int32 eStyle = ::com::sun::star::chart::ErrorBarStyle::NONE; - if( ( xErrorBarProp->getPropertyValue( C2U("ErrorBarStyle")) >>= eStyle ) && + if( ( xErrorBarProp->getPropertyValue( "ErrorBarStyle") >>= eStyle ) && eStyle == ::com::sun::star::chart::ErrorBarStyle::FROM_DATA ) { uno::Reference< data::XDataSource > xErrorBarDataSource( xErrorBarProp, uno::UNO_QUERY ); @@ -161,13 +161,13 @@ uno::Sequence< beans::PropertyValue > DataSourceHelper::createArguments( eRowSource = ::com::sun::star::chart::ChartDataRowSource_COLUMNS; uno::Sequence< beans::PropertyValue > aArguments(3); - aArguments[0] = beans::PropertyValue( C2U("DataRowSource") + aArguments[0] = beans::PropertyValue( "DataRowSource" , -1, uno::makeAny( eRowSource ) , beans::PropertyState_DIRECT_VALUE ); - aArguments[1] = beans::PropertyValue( C2U("FirstCellAsLabel") + aArguments[1] = beans::PropertyValue( "FirstCellAsLabel" , -1, uno::makeAny( bFirstCellAsLabel ) , beans::PropertyState_DIRECT_VALUE ); - aArguments[2] = beans::PropertyValue( C2U("HasCategories") + aArguments[2] = beans::PropertyValue( "HasCategories" , -1, uno::makeAny( bHasCategories ) , beans::PropertyState_DIRECT_VALUE ); @@ -182,14 +182,14 @@ uno::Sequence< beans::PropertyValue > DataSourceHelper::createArguments( uno::Sequence< beans::PropertyValue > aArguments( createArguments( bUseColumns, bFirstCellAsLabel, bHasCategories )); aArguments.realloc( aArguments.getLength() + 1 ); aArguments[aArguments.getLength() - 1] = - beans::PropertyValue( C2U("CellRangeRepresentation") + beans::PropertyValue( "CellRangeRepresentation" , -1, uno::makeAny( rRangeRepresentation ) , beans::PropertyState_DIRECT_VALUE ); if( rSequenceMapping.getLength() ) { aArguments.realloc( aArguments.getLength() + 1 ); aArguments[aArguments.getLength() - 1] = - beans::PropertyValue( C2U("SequenceMapping") + beans::PropertyValue( "SequenceMapping" , -1, uno::makeAny( rSequenceMapping ) , beans::PropertyState_DIRECT_VALUE ); } @@ -251,7 +251,7 @@ uno::Reference< chart2::data::XDataSource > DataSourceHelper::pressUsedDataIntoR //the first x-values is always the next sequence //todo ... other x-values get lost for old format Reference< chart2::data::XLabeledDataSequence > xXValues( - DataSeriesHelper::getDataSequenceByRole( xSeriesSource, C2U("values-x") ) ); + DataSeriesHelper::getDataSequenceByRole( xSeriesSource, "values-x" ) ); if( xXValues.is() ) aResultVector.push_back( xXValues ); @@ -259,7 +259,7 @@ uno::Reference< chart2::data::XDataSource > DataSourceHelper::pressUsedDataIntoR for( sal_Int32 nN=0; nN<aDataSeqences.getLength(); nN++ ) { OUString aRole( DataSeriesHelper::GetRole( aDataSeqences[nN] ) ); - if( !aRole.equals(C2U("values-x")) ) + if( !aRole.equals("values-x") ) aResultVector.push_back( aDataSeqences[nN] ); } diff --git a/chart2/source/tools/DiagramHelper.cxx b/chart2/source/tools/DiagramHelper.cxx index 6d2fcb82b74c..0da667653051 100644 --- a/chart2/source/tools/DiagramHelper.cxx +++ b/chart2/source/tools/DiagramHelper.cxx @@ -150,12 +150,12 @@ void DiagramHelper::setVertical( if( xProp.is() ) { bool bOldSwap = sal_False; - if( !(xProp->getPropertyValue( C2U("SwapXAndYAxis") ) >>= bOldSwap) + if( !(xProp->getPropertyValue( "SwapXAndYAxis" ) >>= bOldSwap) || bVertical != bOldSwap ) bChanged = true; if( bChanged ) - xProp->setPropertyValue( C2U("SwapXAndYAxis"), aValue ); + xProp->setPropertyValue( "SwapXAndYAxis", aValue ); } if( xCooSys.is() ) { @@ -179,7 +179,7 @@ void DiagramHelper::setVertical( if( !xTitleProps.is() ) continue; double fAngleDegree = 0.0; - xTitleProps->getPropertyValue( C2U( "TextRotation" ) ) >>= fAngleDegree; + xTitleProps->getPropertyValue( "TextRotation" ) >>= fAngleDegree; if( !::rtl::math::approxEqual( fAngleDegree, 0.0 ) && !::rtl::math::approxEqual( fAngleDegree, 90.0 ) ) continue; @@ -190,7 +190,7 @@ void DiagramHelper::setVertical( else if( bVertical && nDimIndex == 0 ) fNewAngleDegree = 90.0; - xTitleProps->setPropertyValue( C2U( "TextRotation" ), uno::makeAny( fNewAngleDegree )); + xTitleProps->setPropertyValue( "TextRotation", uno::makeAny( fNewAngleDegree )); } } } @@ -224,7 +224,7 @@ bool DiagramHelper::getVertical( const uno::Reference< chart2::XDiagram > & xDia if( xProp.is()) { bool bCurrent = false; - if( xProp->getPropertyValue( C2U("SwapXAndYAxis") ) >>= bCurrent ) + if( xProp->getPropertyValue( "SwapXAndYAxis" ) >>= bCurrent ) { if( !rbFound ) { @@ -323,7 +323,7 @@ void DiagramHelper::setStackMode( { Reference< beans::XPropertySet > xProp( aSeriesList[nS], uno::UNO_QUERY ); if(xProp.is()) - xProp->setPropertyValue( C2U( "StackingDirection" ), aNewDirection ); + xProp->setPropertyValue( "StackingDirection", aNewDirection ); } } } @@ -402,7 +402,7 @@ StackMode DiagramHelper::getStackModeFromChartType( Reference< beans::XPropertySet > xProp( aSeries[i], uno::UNO_QUERY_THROW ); chart2::StackingDirection eCurrentDirection = eCommonDirection; // property is not MAYBEVOID - bool bSuccess = ( xProp->getPropertyValue( C2U("StackingDirection") ) >>= eCurrentDirection ); + bool bSuccess = ( xProp->getPropertyValue( "StackingDirection" ) >>= eCurrentDirection ); OSL_ASSERT( bSuccess ); (void)(bSuccess); // avoid warning in non-debug builds if( ! bDirectionInitialized ) @@ -613,7 +613,7 @@ bool DiagramHelper::attachSeriesToAxis( bool bAttachToMainAxis { try { - xProp->setPropertyValue( C2U("AttachedAxisIndex"), uno::makeAny( nNewAxisIndex ) ); + xProp->setPropertyValue( "AttachedAxisIndex", uno::makeAny( nNewAxisIndex ) ); bChanged = true; } catch( const uno::Exception & ex ) @@ -935,7 +935,7 @@ Reference< data::XLabeledDataSequence > { try { - xProp->setPropertyValue( C2U( "Role" ), uno::makeAny( C2U("categories") ) ); + xProp->setPropertyValue( "Role", uno::makeAny( OUString("categories") ) ); } catch( const uno::Exception & ex ) { @@ -1059,7 +1059,7 @@ void lcl_switchToDateCategories( const Reference< XChartDocument >& xChartDoc, c if( xAxisProps.is() && xNumberFormatsSupplier.is() ) { sal_Int32 nNumberFormat = -1; - xAxisProps->getPropertyValue( C2U("NumberFormat") ) >>= nNumberFormat; + xAxisProps->getPropertyValue( "NumberFormat" ) >>= nNumberFormat; Reference< util::XNumberFormats > xNumberFormats = Reference< util::XNumberFormats >( xNumberFormatsSupplier->getNumberFormats() ); if( xNumberFormats.is() ) @@ -1075,7 +1075,7 @@ void lcl_switchToDateCategories( const Reference< XChartDocument >& xChartDoc, c } sal_Int32 nType = util::NumberFormat::UNDEFINED; if( xKeyProps.is() ) - xKeyProps->getPropertyValue( C2U("Type") ) >>= nType; + xKeyProps->getPropertyValue( "Type" ) >>= nType; if( !( nType & util::NumberFormat::DATE ) ) { //set a date format to the axis @@ -1084,7 +1084,7 @@ void lcl_switchToDateCategories( const Reference< XChartDocument >& xChartDoc, c Sequence<sal_Int32> aKeySeq = xNumberFormats->queryKeys( util::NumberFormat::DATE, rLocaleDataWrapper.getLanguageTag().getLocale(), bCreate ); if( aKeySeq.getLength() ) { - xAxisProps->setPropertyValue( C2U("NumberFormat"), uno::makeAny(aKeySeq[0]) ); + xAxisProps->setPropertyValue( "NumberFormat", uno::makeAny(aKeySeq[0]) ); } } } @@ -1161,7 +1161,7 @@ bool DiagramHelper::isDateNumberFormat( sal_Int32 nNumberFormat, const Reference if( xKeyProps.is() ) { sal_Int32 nType = util::NumberFormat::UNDEFINED; - xKeyProps->getPropertyValue( C2U("Type") ) >>= nType; + xKeyProps->getPropertyValue( "Type" ) >>= nType; bIsDate = nType & util::NumberFormat::DATE; } return bIsDate; @@ -1522,7 +1522,7 @@ sal_Int32 DiagramHelper::getGeometry3D( { sal_Int32 nGeom = 0; Reference< beans::XPropertySet > xProp( *aIt, uno::UNO_QUERY_THROW ); - if( xProp->getPropertyValue( C2U( "Geometry3D" )) >>= nGeom ) + if( xProp->getPropertyValue( "Geometry3D") >>= nGeom ) { if( ! rbFound ) { @@ -1558,7 +1558,7 @@ void DiagramHelper::setGeometry3D( aSeriesVec.begin(); aIt != aSeriesVec.end(); ++aIt ) { DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( - *aIt, C2U( "Geometry3D" ), uno::makeAny( nNewGeometry )); + *aIt, "Geometry3D", uno::makeAny( nNewGeometry )); } } @@ -1571,7 +1571,7 @@ sal_Int32 DiagramHelper::getCorrectedMissingValueTreatment( ChartTypeHelper::getSupportedMissingValueTreatments( xChartType ) ); uno::Reference< beans::XPropertySet > xDiaProp( xDiagram, uno::UNO_QUERY ); - if( xDiaProp.is() && (xDiaProp->getPropertyValue( C2U( "MissingValueTreatment" ) ) >>= nResult) ) + if( xDiaProp.is() && (xDiaProp->getPropertyValue( "MissingValueTreatment" ) >>= nResult) ) { //ensure that the set value is supported by this charttype for( sal_Int32 nN = 0; nN < aAvailableMissingValueTreatments.getLength(); nN++ ) @@ -1598,11 +1598,11 @@ DiagramPositioningMode DiagramHelper::getDiagramPositioningMode( const uno::Refe { RelativePosition aRelPos; RelativeSize aRelSize; - if( (xDiaProps->getPropertyValue(C2U("RelativePosition")) >>= aRelPos ) && - (xDiaProps->getPropertyValue(C2U("RelativeSize")) >>= aRelSize ) ) + if( (xDiaProps->getPropertyValue("RelativePosition") >>= aRelPos ) && + (xDiaProps->getPropertyValue("RelativeSize") >>= aRelSize ) ) { bool bPosSizeExcludeAxes=false; - xDiaProps->getPropertyValue(C2U("PosSizeExcludeAxes")) >>= bPosSizeExcludeAxes; + xDiaProps->getPropertyValue("PosSizeExcludeAxes") >>= bPosSizeExcludeAxes; if( bPosSizeExcludeAxes ) eMode = DiagramPositioningMode_EXCLUDING; else @@ -1633,8 +1633,8 @@ bool DiagramHelper::setDiagramPositioning( const uno::Reference< frame::XModel > RelativePosition aOldPos; RelativeSize aOldSize; - xDiaProps->getPropertyValue(C2U("RelativePosition") ) >>= aOldPos; - xDiaProps->getPropertyValue(C2U("RelativeSize") ) >>= aOldSize; + xDiaProps->getPropertyValue("RelativePosition" ) >>= aOldPos; + xDiaProps->getPropertyValue("RelativeSize" ) >>= aOldSize; RelativePosition aNewPos; aNewPos.Anchor = drawing::Alignment_TOP_LEFT; @@ -1654,8 +1654,8 @@ bool DiagramHelper::setDiagramPositioning( const uno::Reference< frame::XModel > if( (aNewPos.Secondary + aNewSize.Secondary) > 1.0 ) aNewPos.Secondary = 1.0 - aNewSize.Secondary; - xDiaProps->setPropertyValue( C2U( "RelativePosition" ), uno::makeAny(aNewPos) ); - xDiaProps->setPropertyValue( C2U( "RelativeSize" ), uno::makeAny(aNewSize) ); + xDiaProps->setPropertyValue( "RelativePosition", uno::makeAny(aNewPos) ); + xDiaProps->setPropertyValue( "RelativeSize", uno::makeAny(aNewSize) ); bChanged = (aOldPos.Anchor!=aNewPos.Anchor) || (aOldPos.Primary!=aNewPos.Primary) || @@ -1677,8 +1677,8 @@ awt::Rectangle DiagramHelper::getDiagramRectangleFromModel( const uno::Reference RelativePosition aRelPos; RelativeSize aRelSize; - xDiaProps->getPropertyValue(C2U("RelativePosition") ) >>= aRelPos; - xDiaProps->getPropertyValue(C2U("RelativeSize") ) >>= aRelSize; + xDiaProps->getPropertyValue("RelativePosition" ) >>= aRelPos; + xDiaProps->getPropertyValue("RelativeSize" ) >>= aRelSize; awt::Size aAbsSize( static_cast< sal_Int32 >( aRelSize.Primary * aPageSize.Width ), diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx index 96e000c3f6aa..b9515b222862 100644 --- a/chart2/source/tools/ErrorBar.cxx +++ b/chart2/source/tools/ErrorBar.cxx @@ -57,40 +57,40 @@ void lcl_AddPropertiesToVector( ::std::vector< Property > & rOutProperties ) { rOutProperties.push_back( - Property( C2U( "ErrorBarStyle" ), + Property( "ErrorBarStyle", PROP_ERROR_BAR_STYLE, ::getCppuType( reinterpret_cast< sal_Int32 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "PositiveError" ), + Property( "PositiveError", PROP_ERROR_BAR_POS_ERROR, ::getCppuType( reinterpret_cast< const double * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "NegativeError" ), + Property( "NegativeError", PROP_ERROR_BAR_NEG_ERROR, ::getCppuType( reinterpret_cast< const double * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "Weight" ), + Property( "Weight", PROP_ERROR_BAR_WEIGHT, ::getCppuType( reinterpret_cast< const double * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "ShowPositiveError" ), + Property( "ShowPositiveError", PROP_ERROR_BAR_SHOW_POS_ERROR, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "ShowNegativeError" ), + Property( "ShowNegativeError", PROP_ERROR_BAR_SHOW_NEG_ERROR, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND @@ -332,7 +332,7 @@ uno::Sequence< ::rtl::OUString > ErrorBar::getSupportedServiceNames_Static() { uno::Sequence< ::rtl::OUString > aServices( 2 ); aServices[ 0 ] = lcl_aServiceName; - aServices[ 1 ] = C2U( "com.sun.star.chart2.ErrorBar" ); + aServices[ 1 ] = "com.sun.star.chart2.ErrorBar"; return aServices; } diff --git a/chart2/source/tools/ExplicitCategoriesProvider.cxx b/chart2/source/tools/ExplicitCategoriesProvider.cxx index e3d800f1b1f8..b1a52555b8e0 100644 --- a/chart2/source/tools/ExplicitCategoriesProvider.cxx +++ b/chart2/source/tools/ExplicitCategoriesProvider.cxx @@ -383,7 +383,7 @@ Sequence< OUString > lcl_getExplicitSimpleCategories( { aRet.realloc(nMaxCategoryCount); aOuterEnd = aComplexCatsPerIndex.end(); - OUString aSpace(C2U(" ")); + OUString aSpace(" "); for(sal_Int32 nN=0; nN<nMaxCategoryCount; nN++) { OUString aText; @@ -445,7 +445,7 @@ bool lcl_fillDateCategories( const uno::Reference< data::XDataSequence >& xDataS bOwnData = true; Reference< beans::XPropertySet > xAxisProps( xCooSysModel->getAxisByDimension(0,0), uno::UNO_QUERY ); sal_Int32 nAxisNumberFormat = 0; - if( xAxisProps.is() && (xAxisProps->getPropertyValue( C2U("NumberFormat") ) >>= nAxisNumberFormat) ) + if( xAxisProps.is() && (xAxisProps->getPropertyValue( "NumberFormat" ) >>= nAxisNumberFormat) ) { bOwnDataAnddAxisHasAnyFormat = true; bOwnDataAnddAxisHasDateFormat = DiagramHelper::isDateNumberFormat( nAxisNumberFormat, xNumberFormats ); diff --git a/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx b/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx index 64ed951f2f74..75e66ce52a32 100644 --- a/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx +++ b/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx @@ -143,42 +143,42 @@ OUString ExponentialRegressionCurveCalculator::ImplGetRepresentation( bool bHasSlope = !rtl::math::approxEqual( fSlope, 1.0 ); bool bHasIntercept = !rtl::math::approxEqual( fIntercept, 1.0 ); - OUStringBuffer aBuf( C2U( "f(x) = " )); + OUStringBuffer aBuf( "f(x) = "); if ( fIntercept == 0.0) { // underflow, a true zero is impossible - aBuf.append( C2U( "exp( " )); + aBuf.append( "exp( "); aBuf.append( getFormattedString( xNumFormatter, nNumberFormatKey, m_fLogIntercept) ); - aBuf.append( (m_fLogSlope < 0.0) ? C2U( " - " ) : C2U( " + " )); + aBuf.append( (m_fLogSlope < 0.0) ? " - " : " + "); aBuf.append( getFormattedString( xNumFormatter, nNumberFormatKey, fabs(m_fLogSlope)) ); - aBuf.append( C2U( " x )" )); + aBuf.append( " x )"); } else { if (bHasIntercept) { aBuf.append( getFormattedString( xNumFormatter, nNumberFormatKey, fIntercept) ); - aBuf.append( C2U( " exp( " )); + aBuf.append( " exp( "); aBuf.append( getFormattedString( xNumFormatter, nNumberFormatKey, m_fLogSlope) ); - aBuf.append( C2U( " x )" )); + aBuf.append( " x )"); } else { // show logarithmic output, if intercept and slope both are near one // otherwise drop output of intercept, which is 1 here - aBuf.append( C2U( " exp( " )); + aBuf.append( " exp( "); if (!bHasSlope) { aBuf.append( getFormattedString( xNumFormatter, nNumberFormatKey, m_fLogIntercept) ); - aBuf.append( (m_fLogSlope < 0.0) ? C2U( " - " ) : C2U( " + " )); + aBuf.append( (m_fLogSlope < 0.0) ? " - " : " + "); aBuf.append( getFormattedString( xNumFormatter, nNumberFormatKey, fabs(m_fLogSlope)) ); } else { aBuf.append( getFormattedString( xNumFormatter, nNumberFormatKey, m_fLogSlope) ); } - aBuf.append( C2U( " x )" )); + aBuf.append( " x )"); } } diff --git a/chart2/source/tools/FillProperties.cxx b/chart2/source/tools/FillProperties.cxx index e6f6f716500a..64b822edd314 100644 --- a/chart2/source/tools/FillProperties.cxx +++ b/chart2/source/tools/FillProperties.cxx @@ -37,14 +37,14 @@ namespace void lcl_AddPropertiesToVector_without_BitmapProperties( ::std::vector< ::com::sun::star::beans::Property > & rOutProperties ) { rOutProperties.push_back( - Property( C2U( "FillStyle" ), + Property( "FillStyle", FillProperties::PROP_FILL_STYLE, ::getCppuType( reinterpret_cast< const drawing::FillStyle * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "FillColor" ), + Property( "FillColor", FillProperties::PROP_FILL_COLOR, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND @@ -52,14 +52,14 @@ void lcl_AddPropertiesToVector_without_BitmapProperties( ::std::vector< ::com::s | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "FillTransparence" ), + Property( "FillTransparence", FillProperties::PROP_FILL_TRANSPARENCE, ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "FillTransparenceGradientName" ), + Property( "FillTransparenceGradientName", FillProperties::PROP_FILL_TRANSPARENCE_GRADIENT_NAME, ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)), beans::PropertyAttribute::BOUND @@ -67,7 +67,7 @@ void lcl_AddPropertiesToVector_without_BitmapProperties( ::std::vector< ::com::s | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "FillGradientName" ), + Property( "FillGradientName", FillProperties::PROP_FILL_GRADIENT_NAME, ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)), beans::PropertyAttribute::BOUND @@ -75,14 +75,14 @@ void lcl_AddPropertiesToVector_without_BitmapProperties( ::std::vector< ::com::s | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - beans::Property( C2U( "FillGradientStepCount" ), + beans::Property( "FillGradientStepCount", FillProperties::PROP_FILL_GRADIENT_STEPCOUNT, ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( - Property( C2U( "FillHatchName" ), + Property( "FillHatchName", FillProperties::PROP_FILL_HATCH_NAME, ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)), beans::PropertyAttribute::BOUND @@ -92,7 +92,7 @@ void lcl_AddPropertiesToVector_without_BitmapProperties( ::std::vector< ::com::s //bitmap properties see lcl_AddPropertiesToVector_only_BitmapProperties() rOutProperties.push_back( - Property( C2U( "FillBackground" ), + Property( "FillBackground", FillProperties::PROP_FILL_BACKGROUND, ::getCppuType( reinterpret_cast< const sal_Bool * >(0)), beans::PropertyAttribute::BOUND @@ -102,7 +102,7 @@ void lcl_AddPropertiesToVector_without_BitmapProperties( ::std::vector< ::com::s void lcl_AddPropertiesToVector_only_BitmapProperties( ::std::vector< ::com::sun::star::beans::Property > & rOutProperties ) { rOutProperties.push_back( - Property( C2U( "FillBitmapName" ), + Property( "FillBitmapName", FillProperties::PROP_FILL_BITMAP_NAME, ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)), beans::PropertyAttribute::BOUND @@ -110,28 +110,28 @@ void lcl_AddPropertiesToVector_only_BitmapProperties( ::std::vector< ::com::sun: | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "FillBitmapOffsetX" ), + Property( "FillBitmapOffsetX", FillProperties::PROP_FILL_BITMAP_OFFSETX, ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "FillBitmapOffsetY" ), + Property( "FillBitmapOffsetY", FillProperties::PROP_FILL_BITMAP_OFFSETY, ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "FillBitmapPositionOffsetX" ), + Property( "FillBitmapPositionOffsetX", FillProperties::PROP_FILL_BITMAP_POSITION_OFFSETX, ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "FillBitmapPositionOffsetY" ), + Property( "FillBitmapPositionOffsetY", FillProperties::PROP_FILL_BITMAP_POSITION_OFFSETY, ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)), beans::PropertyAttribute::BOUND @@ -139,35 +139,35 @@ void lcl_AddPropertiesToVector_only_BitmapProperties( ::std::vector< ::com::sun: rOutProperties.push_back( - Property( C2U( "FillBitmapRectanglePoint" ), + Property( "FillBitmapRectanglePoint", FillProperties::PROP_FILL_BITMAP_RECTANGLEPOINT, ::getCppuType( reinterpret_cast< const drawing::RectanglePoint * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "FillBitmapLogicalSize" ), + Property( "FillBitmapLogicalSize", FillProperties::PROP_FILL_BITMAP_LOGICALSIZE, ::getCppuType( reinterpret_cast< const sal_Bool * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "FillBitmapSizeX" ), + Property( "FillBitmapSizeX", FillProperties::PROP_FILL_BITMAP_SIZEX, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "FillBitmapSizeY" ), + Property( "FillBitmapSizeY", FillProperties::PROP_FILL_BITMAP_SIZEY, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "FillBitmapMode" ), + Property( "FillBitmapMode", FillProperties::PROP_FILL_BITMAP_MODE, ::getCppuType( reinterpret_cast< const drawing::BitmapMode * >(0)), beans::PropertyAttribute::BOUND diff --git a/chart2/source/tools/FormattedStringHelper.cxx b/chart2/source/tools/FormattedStringHelper.cxx index 71fafe4f5440..43593bcd49f7 100644 --- a/chart2/source/tools/FormattedStringHelper.cxx +++ b/chart2/source/tools/FormattedStringHelper.cxx @@ -46,7 +46,7 @@ Sequence< Reference< chart2::XFormattedString > > { xFormStr.set( xContext->getServiceManager()->createInstanceWithContext( - C2U("com.sun.star.chart2.FormattedString"), xContext ), + "com.sun.star.chart2.FormattedString", xContext ), uno::UNO_QUERY_THROW ); xFormStr->setString( rString ); diff --git a/chart2/source/tools/InternalData.cxx b/chart2/source/tools/InternalData.cxx index a60706481a7f..c7458c75e463 100644 --- a/chart2/source/tools/InternalData.cxx +++ b/chart2/source/tools/InternalData.cxx @@ -107,12 +107,12 @@ void InternalData::createDefaultData() m_aRowLabels.clear(); m_aRowLabels.reserve( m_nRowCount ); generate_n( back_inserter( m_aRowLabels ), m_nRowCount, - lcl_NumberedStringGenerator( aRowName, C2U("%ROWNUMBER") )); + lcl_NumberedStringGenerator( aRowName, "%ROWNUMBER" )); m_aColumnLabels.clear(); m_aColumnLabels.reserve( m_nColumnCount ); generate_n( back_inserter( m_aColumnLabels ), m_nColumnCount, - lcl_NumberedStringGenerator( aColName, C2U("%COLUMNNUMBER") )); + lcl_NumberedStringGenerator( aColName, "%COLUMNNUMBER" )); } bool InternalData::isDefaultData() diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx index 2ce54495a804..4c9b4030d4e9 100644 --- a/chart2/source/tools/InternalDataProvider.cxx +++ b/chart2/source/tools/InternalDataProvider.cxx @@ -714,19 +714,19 @@ Sequence< beans::PropertyValue > SAL_CALL InternalDataProvider::detectArguments( { Sequence< beans::PropertyValue > aArguments( 4 ); aArguments[0] = beans::PropertyValue( - C2U("CellRangeRepresentation"), -1, uno::makeAny( lcl_aCompleteRange ), + "CellRangeRepresentation", -1, uno::makeAny( lcl_aCompleteRange ), beans::PropertyState_DIRECT_VALUE ); aArguments[1] = beans::PropertyValue( - C2U("DataRowSource"), -1, uno::makeAny( + "DataRowSource", -1, uno::makeAny( m_bDataInColumns ? ::com::sun::star::chart::ChartDataRowSource_COLUMNS : ::com::sun::star::chart::ChartDataRowSource_ROWS ), beans::PropertyState_DIRECT_VALUE ); // internal data always contains labels and categories aArguments[2] = beans::PropertyValue( - C2U("FirstCellAsLabel"), -1, uno::makeAny( true ), beans::PropertyState_DIRECT_VALUE ); + "FirstCellAsLabel", -1, uno::makeAny( true ), beans::PropertyState_DIRECT_VALUE ); aArguments[3] = beans::PropertyValue( - C2U("HasCategories"), -1, uno::makeAny( true ), beans::PropertyState_DIRECT_VALUE ); + "HasCategories", -1, uno::makeAny( true ), beans::PropertyState_DIRECT_VALUE ); // #i85913# Sequence Mapping is not needed for internal data, as it is // applied to the data when the data source is created. @@ -1038,7 +1038,7 @@ void SAL_CALL InternalDataProvider::insertDataPointForAllSequences( ::sal_Int32 } // notify change to all affected ranges - tSequenceMap::const_iterator aBegin( m_aSequenceMap.lower_bound( C2U("0"))); + tSequenceMap::const_iterator aBegin( m_aSequenceMap.lower_bound( "0")); tSequenceMap::const_iterator aEnd( m_aSequenceMap.upper_bound( OUString::valueOf( nMaxRep ))); ::std::for_each( aBegin, aEnd, lcl_setModified()); @@ -1062,7 +1062,7 @@ void SAL_CALL InternalDataProvider::deleteDataPointForAllSequences( ::sal_Int32 } // notify change to all affected ranges - tSequenceMap::const_iterator aBegin( m_aSequenceMap.lower_bound( C2U("0"))); + tSequenceMap::const_iterator aBegin( m_aSequenceMap.lower_bound( "0")); tSequenceMap::const_iterator aEnd( m_aSequenceMap.upper_bound( OUString::valueOf( nMaxRep ))); ::std::for_each( aBegin, aEnd, lcl_setModified()); @@ -1082,7 +1082,7 @@ void SAL_CALL InternalDataProvider::swapDataPointWithNextOneForAllSequences( ::s : m_aInternalData.getRowCount()); // notify change to all affected ranges - tSequenceMap::const_iterator aBegin( m_aSequenceMap.lower_bound( C2U("0"))); + tSequenceMap::const_iterator aBegin( m_aSequenceMap.lower_bound( "0")); tSequenceMap::const_iterator aEnd( m_aSequenceMap.upper_bound( OUString::valueOf( nMaxRep ))); ::std::for_each( aBegin, aEnd, lcl_setModified()); diff --git a/chart2/source/tools/LabeledDataSequence.cxx b/chart2/source/tools/LabeledDataSequence.cxx index 5b214a251295..a7ac13fb9b15 100644 --- a/chart2/source/tools/LabeledDataSequence.cxx +++ b/chart2/source/tools/LabeledDataSequence.cxx @@ -156,13 +156,13 @@ void SAL_CALL LabeledDataSequence::removeModifyListener( const Reference< util:: Sequence< OUString > LabeledDataSequence::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 1 ); - aServices[ 0 ] = C2U( "com.sun.star.chart2.data.LabeledDataSequence" ); + aServices[ 0 ] = "com.sun.star.chart2.data.LabeledDataSequence"; return aServices; } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static APPHELPER_XSERVICEINFO_IMPL( LabeledDataSequence, - C2U( "com.sun.star.comp.chart2.LabeledDataSequence" )) + OUString("com.sun.star.comp.chart2.LabeledDataSequence") ) // ================================================================================ diff --git a/chart2/source/tools/LegendHelper.cxx b/chart2/source/tools/LegendHelper.cxx index 540a6a190aba..f636dc0e3400 100644 --- a/chart2/source/tools/LegendHelper.cxx +++ b/chart2/source/tools/LegendHelper.cxx @@ -42,24 +42,24 @@ Reference< chart2::XLegend > LegendHelper::showLegend( const Reference< frame::X uno::Reference< beans::XPropertySet > xProp( xLegend, uno::UNO_QUERY ); if( xProp.is()) { - xProp->setPropertyValue( C2U("Show"), uno::makeAny(sal_True) ); + xProp->setPropertyValue( "Show", uno::makeAny(sal_True) ); chart2::RelativePosition aRelativePosition; - if( !(xProp->getPropertyValue( C2U( "RelativePosition" )) >>= aRelativePosition) ) + if( !(xProp->getPropertyValue( "RelativePosition") >>= aRelativePosition) ) { chart2::LegendPosition ePos = chart2::LegendPosition_LINE_END; - if( !(xProp->getPropertyValue( C2U( "AnchorPosition" )) >>= ePos ) ) - xProp->setPropertyValue( C2U( "AnchorPosition" ), uno::makeAny( ePos )); + if( !(xProp->getPropertyValue( "AnchorPosition") >>= ePos ) ) + xProp->setPropertyValue( "AnchorPosition", uno::makeAny( ePos )); ::com::sun::star::chart::ChartLegendExpansion eExpansion = ( ePos == chart2::LegendPosition_LINE_END || ePos == chart2::LegendPosition_LINE_START ) ? ::com::sun::star::chart::ChartLegendExpansion_HIGH : ::com::sun::star::chart::ChartLegendExpansion_WIDE; - if( !(xProp->getPropertyValue( C2U( "Expansion" )) >>= eExpansion ) ) - xProp->setPropertyValue( C2U( "Expansion" ), uno::makeAny( eExpansion )); + if( !(xProp->getPropertyValue( "Expansion") >>= eExpansion ) ) + xProp->setPropertyValue( "Expansion", uno::makeAny( eExpansion )); - xProp->setPropertyValue( C2U( "RelativePosition" ), uno::Any()); + xProp->setPropertyValue( "RelativePosition", uno::Any()); } } @@ -72,7 +72,7 @@ void LegendHelper::hideLegend( const Reference< frame::XModel >& xModel ) uno::Reference< beans::XPropertySet > xProp( xLegend, uno::UNO_QUERY ); if( xProp.is()) { - xProp->setPropertyValue( C2U("Show"), uno::makeAny(sal_False) ); + xProp->setPropertyValue( "Show", uno::makeAny(sal_False) ); } } @@ -95,7 +95,7 @@ uno::Reference< chart2::XLegend > LegendHelper::getLegend( if( bCreate && !xResult.is() && xContext.is() ) { xResult.set( xContext->getServiceManager()->createInstanceWithContext( - C2U( "com.sun.star.chart2.Legend" ), xContext ), uno::UNO_QUERY ); + "com.sun.star.chart2.Legend", xContext ), uno::UNO_QUERY ); xDia->setLegend( xResult ); } } @@ -120,7 +120,7 @@ bool LegendHelper::hasLegend( const uno::Reference< chart2::XDiagram > & xDiagra { uno::Reference< beans::XPropertySet > xLegendProp( xDiagram->getLegend(), uno::UNO_QUERY ); if( xLegendProp.is()) - xLegendProp->getPropertyValue( C2U("Show")) >>= bReturn; + xLegendProp->getPropertyValue( "Show") >>= bReturn; } return bReturn; diff --git a/chart2/source/tools/LineProperties.cxx b/chart2/source/tools/LineProperties.cxx index 5a78cdaaadef..54de032cf02c 100644 --- a/chart2/source/tools/LineProperties.cxx +++ b/chart2/source/tools/LineProperties.cxx @@ -37,14 +37,14 @@ void LineProperties::AddPropertiesToVector( // Line Properties see service drawing::LineProperties // --------------- rOutProperties.push_back( - Property( C2U( "LineStyle" ), + Property( "LineStyle", PROP_LINE_STYLE, ::getCppuType( reinterpret_cast< const drawing::LineStyle * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "LineDash" ), + Property( "LineDash", PROP_LINE_DASH, ::getCppuType( reinterpret_cast< const drawing::LineDash * >(0)), beans::PropertyAttribute::BOUND @@ -52,7 +52,7 @@ void LineProperties::AddPropertiesToVector( //not in service description rOutProperties.push_back( - Property( C2U( "LineDashName" ), + Property( "LineDashName", PROP_LINE_DASH_NAME, ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)), beans::PropertyAttribute::BOUND @@ -60,28 +60,28 @@ void LineProperties::AddPropertiesToVector( | beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( - Property( C2U( "LineColor" ), + Property( "LineColor", PROP_LINE_COLOR, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "LineTransparence" ), + Property( "LineTransparence", PROP_LINE_TRANSPARENCE, ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "LineWidth" ), + Property( "LineWidth", PROP_LINE_WIDTH, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "LineJoint" ), + Property( "LineJoint", PROP_LINE_JOINT, ::getCppuType( reinterpret_cast< const drawing::LineJoint * >(0)), beans::PropertyAttribute::BOUND @@ -107,11 +107,11 @@ bool LineProperties::IsLineVisible( const ::com::sun::star::uno::Reference< if( xLineProperties.is() ) { drawing::LineStyle aLineStyle(drawing::LineStyle_SOLID); - xLineProperties->getPropertyValue( C2U( "LineStyle" ) ) >>= aLineStyle; + xLineProperties->getPropertyValue( "LineStyle" ) >>= aLineStyle; if( aLineStyle != drawing::LineStyle_NONE ) { sal_Int16 nLineTransparence=0; - xLineProperties->getPropertyValue( C2U( "LineTransparence" ) ) >>= nLineTransparence; + xLineProperties->getPropertyValue( "LineTransparence" ) >>= nLineTransparence; if(100!=nLineTransparence) { bRet = true; @@ -134,14 +134,14 @@ void LineProperties::SetLineVisible( const ::com::sun::star::uno::Reference< if( xLineProperties.is() ) { drawing::LineStyle aLineStyle(drawing::LineStyle_SOLID); - xLineProperties->getPropertyValue( C2U( "LineStyle" ) ) >>= aLineStyle; + xLineProperties->getPropertyValue( "LineStyle" ) >>= aLineStyle; if( aLineStyle == drawing::LineStyle_NONE ) - xLineProperties->setPropertyValue( C2U( "LineStyle" ), uno::makeAny( drawing::LineStyle_SOLID ) ); + xLineProperties->setPropertyValue( "LineStyle", uno::makeAny( drawing::LineStyle_SOLID ) ); sal_Int16 nLineTransparence=0; - xLineProperties->getPropertyValue( C2U( "LineTransparence" ) ) >>= nLineTransparence; + xLineProperties->getPropertyValue( "LineTransparence" ) >>= nLineTransparence; if(100==nLineTransparence) - xLineProperties->setPropertyValue( C2U( "LineTransparence" ), uno::makeAny( sal_Int16(0) ) ); + xLineProperties->setPropertyValue( "LineTransparence", uno::makeAny( sal_Int16(0) ) ); } } catch( const uno::Exception & ex ) @@ -158,9 +158,9 @@ void LineProperties::SetLineInvisible( const ::com::sun::star::uno::Reference< if( xLineProperties.is() ) { drawing::LineStyle aLineStyle(drawing::LineStyle_SOLID); - xLineProperties->getPropertyValue( C2U( "LineStyle" ) ) >>= aLineStyle; + xLineProperties->getPropertyValue( "LineStyle" ) >>= aLineStyle; if( aLineStyle != drawing::LineStyle_NONE ) - xLineProperties->setPropertyValue( C2U( "LineStyle" ), uno::makeAny( drawing::LineStyle_NONE ) ); + xLineProperties->setPropertyValue( "LineStyle", uno::makeAny( drawing::LineStyle_NONE ) ); } } catch( const uno::Exception & ex ) diff --git a/chart2/source/tools/LinearRegressionCurveCalculator.cxx b/chart2/source/tools/LinearRegressionCurveCalculator.cxx index 59083d0f9c8a..f168f63429d3 100644 --- a/chart2/source/tools/LinearRegressionCurveCalculator.cxx +++ b/chart2/source/tools/LinearRegressionCurveCalculator.cxx @@ -126,7 +126,7 @@ OUString LinearRegressionCurveCalculator::ImplGetRepresentation( const uno::Reference< util::XNumberFormatter >& xNumFormatter, ::sal_Int32 nNumberFormatKey ) const { - OUStringBuffer aBuf( C2U( "f(x) = " )); + OUStringBuffer aBuf( "f(x) = "); bool bHaveSlope = false; diff --git a/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx b/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx index 59ef94522ed7..29ea58f996ff 100644 --- a/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx +++ b/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx @@ -135,7 +135,7 @@ OUString LogarithmicRegressionCurveCalculator::ImplGetRepresentation( const uno::Reference< util::XNumberFormatter >& xNumFormatter, ::sal_Int32 nNumberFormatKey ) const { - OUStringBuffer aBuf( C2U( "f(x) = " )); + OUStringBuffer aBuf( "f(x) = "); bool bHaveSlope = false; diff --git a/chart2/source/tools/ObjectIdentifier.cxx b/chart2/source/tools/ObjectIdentifier.cxx index b1c85c6ba514..358385f059a3 100644 --- a/chart2/source/tools/ObjectIdentifier.cxx +++ b/chart2/source/tools/ObjectIdentifier.cxx @@ -51,12 +51,12 @@ using rtl::OUStringBuffer; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; -static OUString m_aMultiClick( C2U("MultiClick") ); -static OUString m_aDragMethodEquals( C2U("DragMethod=") ); -static OUString m_aDragParameterEquals( C2U("DragParameter=") ); -static OUString m_aProtocol( C2U("CID/") ); +static OUString m_aMultiClick( "MultiClick" ); +static OUString m_aDragMethodEquals( "DragMethod=" ); +static OUString m_aDragParameterEquals( "DragParameter=" ); +static OUString m_aProtocol( "CID/" ); static OUString m_aEmptyString; -static OUString m_aPieSegmentDragMethodServiceName( C2U("PieSegmentDraging") ); +static OUString m_aPieSegmentDragMethodServiceName( "PieSegmentDraging" ); namespace { @@ -103,13 +103,13 @@ const tTitleMap& lcl_getTitleMap() { //maps the title type to the ParentParticle for that title static tTitleMap m_aTitleMap = tTitleMap - ( TitleHelper::MAIN_TITLE, C2U("") ) - ( TitleHelper::SUB_TITLE, C2U("D=0") ) - ( TitleHelper::X_AXIS_TITLE, C2U("D=0:CS=0:Axis=0,0") ) - ( TitleHelper::Y_AXIS_TITLE, C2U("D=0:CS=0:Axis=1,0") ) - ( TitleHelper::Z_AXIS_TITLE, C2U("D=0:CS=0:Axis=2,0") ) - ( TitleHelper::SECONDARY_X_AXIS_TITLE, C2U("D=0:CS=0:Axis=0,1") ) - ( TitleHelper::SECONDARY_Y_AXIS_TITLE, C2U("D=0:CS=0:Axis=1,1") ) + ( TitleHelper::MAIN_TITLE, "" ) + ( TitleHelper::SUB_TITLE, "D=0" ) + ( TitleHelper::X_AXIS_TITLE, "D=0:CS=0:Axis=0,0" ) + ( TitleHelper::Y_AXIS_TITLE, "D=0:CS=0:Axis=1,0" ) + ( TitleHelper::Z_AXIS_TITLE, "D=0:CS=0:Axis=2,0" ) + ( TitleHelper::SECONDARY_X_AXIS_TITLE, "D=0:CS=0:Axis=0,1" ) + ( TitleHelper::SECONDARY_Y_AXIS_TITLE, "D=0:CS=0:Axis=1,1" ) ; return m_aTitleMap; } @@ -191,13 +191,13 @@ sal_Int32 lcl_StringToIndex( const OUString& rIndexString ) void lcl_parseCooSysIndices( sal_Int32& rnDiagram, sal_Int32& rnCooSys, const OUString& rString ) { - rnDiagram = lcl_StringToIndex( lcl_getIndexStringAfterString( rString, C2U("D=") ) ); - rnCooSys = lcl_StringToIndex( lcl_getIndexStringAfterString( rString, C2U("CS=") ) ); + rnDiagram = lcl_StringToIndex( lcl_getIndexStringAfterString( rString, "D=" ) ); + rnCooSys = lcl_StringToIndex( lcl_getIndexStringAfterString( rString, "CS=" ) ); } void lcl_parseAxisIndices( sal_Int32& rnDimensionIndex, sal_Int32& rnAxisIndex, const OUString& rString ) { - OUString aAxisIndexString = lcl_getIndexStringAfterString( rString, C2U(":Axis=") ); + OUString aAxisIndexString = lcl_getIndexStringAfterString( rString, ":Axis=" ); sal_Int32 nCharacterIndex=0; rnDimensionIndex = lcl_StringToIndex( aAxisIndexString.getToken( 0, ',', nCharacterIndex ) ); rnAxisIndex = lcl_StringToIndex( aAxisIndexString.getToken( 0, ',', nCharacterIndex ) ); @@ -206,14 +206,14 @@ void lcl_parseAxisIndices( sal_Int32& rnDimensionIndex, sal_Int32& rnAxisIndex, void lcl_parseGridIndices( sal_Int32& rnSubGridIndex, const OUString& rString ) { rnSubGridIndex = -1; - rnSubGridIndex = lcl_StringToIndex( lcl_getIndexStringAfterString( rString, C2U(":SubGrid=") ) ); + rnSubGridIndex = lcl_StringToIndex( lcl_getIndexStringAfterString( rString, ":SubGrid=" ) ); } void lcl_parseSeriesIndices( sal_Int32& rnChartTypeIndex, sal_Int32& rnSeriesIndex, sal_Int32& rnPointIndex, const OUString& rString ) { - rnChartTypeIndex = lcl_StringToIndex( lcl_getIndexStringAfterString( rString, C2U("CT=") ) ); - rnSeriesIndex = lcl_StringToIndex( lcl_getIndexStringAfterString( rString, C2U("Series=") ) ); - rnPointIndex = lcl_StringToIndex( lcl_getIndexStringAfterString( rString, C2U("Point=") ) ); + rnChartTypeIndex = lcl_StringToIndex( lcl_getIndexStringAfterString( rString, "CT=" ) ); + rnSeriesIndex = lcl_StringToIndex( lcl_getIndexStringAfterString( rString, "Series=" ) ); + rnPointIndex = lcl_StringToIndex( lcl_getIndexStringAfterString( rString, "Point=" ) ); } void lcl_getDiagramAndCooSys( const OUString& rObjectCID @@ -449,7 +449,7 @@ OUString ObjectIdentifier::createParticleForDiagram( const Reference< XDiagram >& /*xDiagram*/ , const Reference< frame::XModel >& /*xChartModel*/ ) { - static OUString aRet(C2U("D=0")); + static OUString aRet("D=0"); //todo: if more than one diagram is implemeted, add the correct diagram index here return aRet; } @@ -486,7 +486,7 @@ OUString ObjectIdentifier::createParticleForAxis( sal_Int32 nDimensionIndex , sal_Int32 nAxisIndex ) { - OUStringBuffer aRet(C2U("Axis=")); + OUStringBuffer aRet("Axis="); aRet.append( OUString::valueOf( nDimensionIndex ) ); aRet.appendAscii(","); @@ -499,11 +499,11 @@ OUString ObjectIdentifier::createParticleForGrid( sal_Int32 nDimensionIndex , sal_Int32 nAxisIndex ) { - OUStringBuffer aRet(C2U("Axis=")); + OUStringBuffer aRet("Axis="); aRet.append( OUString::valueOf( nDimensionIndex ) ); aRet.appendAscii(","); aRet.append( OUString::valueOf( nAxisIndex ) ); - aRet.append( C2U(":Grid=0") ); + aRet.append( ":Grid=0" ); return aRet.makeStringAndClear(); } @@ -825,76 +825,76 @@ OUString ObjectIdentifier::getStringForType( ObjectType eObjectType ) switch( eObjectType ) { case OBJECTTYPE_PAGE: - aRet=C2U("Page"); + aRet="Page"; break; case OBJECTTYPE_TITLE: - aRet=C2U("Title"); + aRet="Title"; break; case OBJECTTYPE_LEGEND: - aRet=C2U("Legend"); + aRet="Legend"; break; case OBJECTTYPE_LEGEND_ENTRY: - aRet=C2U("LegendEntry"); + aRet="LegendEntry"; break; case OBJECTTYPE_DIAGRAM: - aRet=C2U("D"); + aRet="D"; break; case OBJECTTYPE_DIAGRAM_WALL: - aRet=C2U("DiagramWall"); + aRet="DiagramWall"; break; case OBJECTTYPE_DIAGRAM_FLOOR: - aRet=C2U("DiagramFloor"); + aRet="DiagramFloor"; break; case OBJECTTYPE_AXIS: - aRet=C2U("Axis"); + aRet="Axis"; break; case OBJECTTYPE_AXIS_UNITLABEL: - aRet=C2U("AxisUnitLabel"); + aRet="AxisUnitLabel"; break; case OBJECTTYPE_GRID: - aRet=C2U("Grid"); + aRet="Grid"; break; case OBJECTTYPE_SUBGRID: - aRet=C2U("SubGrid"); + aRet="SubGrid"; break; case OBJECTTYPE_DATA_SERIES: - aRet=C2U("Series"); + aRet="Series"; break; case OBJECTTYPE_DATA_POINT: - aRet=C2U("Point"); + aRet="Point"; break; case OBJECTTYPE_DATA_LABELS: - aRet=C2U("DataLabels"); + aRet="DataLabels"; break; case OBJECTTYPE_DATA_LABEL: - aRet=C2U("DataLabel"); + aRet="DataLabel"; break; case OBJECTTYPE_DATA_ERRORS_X: - aRet=C2U("ErrorsX"); + aRet="ErrorsX"; break; case OBJECTTYPE_DATA_ERRORS_Y: - aRet=C2U("ErrorsY"); + aRet="ErrorsY"; break; case OBJECTTYPE_DATA_ERRORS_Z: - aRet=C2U("ErrorsZ"); + aRet="ErrorsZ"; break; case OBJECTTYPE_DATA_CURVE: - aRet=C2U("Curve"); + aRet="Curve"; break; case OBJECTTYPE_DATA_CURVE_EQUATION: - aRet=C2U("Equation"); + aRet="Equation"; break; case OBJECTTYPE_DATA_AVERAGE_LINE: - aRet=C2U("Average"); + aRet="Average"; break; case OBJECTTYPE_DATA_STOCK_RANGE: - aRet=C2U("StockRange"); + aRet="StockRange"; break; case OBJECTTYPE_DATA_STOCK_LOSS: - aRet=C2U("StockLoss"); + aRet="StockLoss"; break; case OBJECTTYPE_DATA_STOCK_GAIN: - aRet=C2U("StockGain"); + aRet="StockGain"; break; default: //OBJECTTYPE_UNKNOWN ; @@ -918,53 +918,53 @@ ObjectType ObjectIdentifier::getObjectType( const OUString& rCID ) if( nLastSign>0 ) nLastSign++; - if( rCID.match(C2U("Page"),nLastSign) ) + if( rCID.match("Page",nLastSign) ) eRet = OBJECTTYPE_PAGE; - else if( rCID.match(C2U("Title"),nLastSign) ) + else if( rCID.match("Title",nLastSign) ) eRet = OBJECTTYPE_TITLE; - else if( rCID.match(C2U("LegendEntry"),nLastSign) ) + else if( rCID.match("LegendEntry",nLastSign) ) eRet = OBJECTTYPE_LEGEND_ENTRY; - else if( rCID.match(C2U("Legend"),nLastSign) ) + else if( rCID.match("Legend",nLastSign) ) eRet = OBJECTTYPE_LEGEND; - else if( rCID.match(C2U("DiagramWall"),nLastSign) ) + else if( rCID.match("DiagramWall",nLastSign) ) eRet = OBJECTTYPE_DIAGRAM_WALL; - else if( rCID.match(C2U("DiagramFloor"),nLastSign) ) + else if( rCID.match("DiagramFloor",nLastSign) ) eRet = OBJECTTYPE_DIAGRAM_FLOOR; - else if( rCID.match(C2U("D="),nLastSign) ) + else if( rCID.match("D=",nLastSign) ) eRet = OBJECTTYPE_DIAGRAM; - else if( rCID.match(C2U("AxisUnitLabel"),nLastSign) ) + else if( rCID.match("AxisUnitLabel",nLastSign) ) eRet = OBJECTTYPE_AXIS_UNITLABEL; - else if( rCID.match(C2U("Axis"),nLastSign) ) + else if( rCID.match("Axis",nLastSign) ) eRet = OBJECTTYPE_AXIS; - else if( rCID.match(C2U("Grid"),nLastSign) ) + else if( rCID.match("Grid",nLastSign) ) eRet = OBJECTTYPE_GRID; - else if( rCID.match(C2U("SubGrid"),nLastSign) ) + else if( rCID.match("SubGrid",nLastSign) ) eRet = OBJECTTYPE_SUBGRID; - else if( rCID.match(C2U("Series"),nLastSign) ) + else if( rCID.match("Series",nLastSign) ) eRet = OBJECTTYPE_DATA_SERIES; - else if( rCID.match(C2U("Point"),nLastSign) ) + else if( rCID.match("Point",nLastSign) ) eRet = OBJECTTYPE_DATA_POINT; - else if( rCID.match(C2U("DataLabels"),nLastSign) ) + else if( rCID.match("DataLabels",nLastSign) ) eRet = OBJECTTYPE_DATA_LABELS; - else if( rCID.match(C2U("DataLabel"),nLastSign) ) + else if( rCID.match("DataLabel",nLastSign) ) eRet = OBJECTTYPE_DATA_LABEL; - else if( rCID.match(C2U("ErrorsX"),nLastSign) ) + else if( rCID.match("ErrorsX",nLastSign) ) eRet = OBJECTTYPE_DATA_ERRORS_X; - else if( rCID.match(C2U("ErrorsY"),nLastSign) ) + else if( rCID.match("ErrorsY",nLastSign) ) eRet = OBJECTTYPE_DATA_ERRORS_Y; - else if( rCID.match(C2U("ErrorsZ"),nLastSign) ) + else if( rCID.match("ErrorsZ",nLastSign) ) eRet = OBJECTTYPE_DATA_ERRORS_Z; - else if( rCID.match(C2U("Curve"),nLastSign) ) + else if( rCID.match("Curve",nLastSign) ) eRet = OBJECTTYPE_DATA_CURVE; - else if( rCID.match(C2U("Equation"),nLastSign) ) + else if( rCID.match("Equation",nLastSign) ) eRet = OBJECTTYPE_DATA_CURVE_EQUATION; - else if( rCID.match(C2U("Average"),nLastSign) ) + else if( rCID.match("Average",nLastSign) ) eRet = OBJECTTYPE_DATA_AVERAGE_LINE; - else if( rCID.match(C2U("StockRange"),nLastSign) ) + else if( rCID.match("StockRange",nLastSign) ) eRet = OBJECTTYPE_DATA_STOCK_RANGE; - else if( rCID.match(C2U("StockLoss"),nLastSign) ) + else if( rCID.match("StockLoss",nLastSign) ) eRet = OBJECTTYPE_DATA_STOCK_LOSS; - else if( rCID.match(C2U("StockGain"),nLastSign) ) + else if( rCID.match("StockGain",nLastSign) ) eRet = OBJECTTYPE_DATA_STOCK_GAIN; else eRet = OBJECTTYPE_UNKNOWN; @@ -1031,7 +1031,7 @@ sal_Int32 ObjectIdentifier::getIndexFromParticleOrCID( const rtl::OUString& rPar { sal_Int32 nRet = -1; - OUString aIndexString = lcl_getIndexStringAfterString( rParticleOrCID, C2U("=") ); + OUString aIndexString = lcl_getIndexStringAfterString( rParticleOrCID, "=" ); sal_Int32 nCharacterIndex=0; nRet = lcl_StringToIndex( aIndexString.getToken( 0, ',', nCharacterIndex ) ); @@ -1044,7 +1044,7 @@ OUString ObjectIdentifier::createSeriesSubObjectStub( ObjectType eSubObjectType , const rtl::OUString& rDragParameterString ) { OUString aChildParticle( getStringForType( eSubObjectType ) ); - aChildParticle+=(C2U("=")); + aChildParticle+=("="); return createClassifiedIdentifierForParticles( rSeriesParticle, aChildParticle @@ -1237,11 +1237,11 @@ Reference< beans::XPropertySet > ObjectIdentifier::getObjectPropertySet( OUString errorBar; if ( eObjectType == OBJECTTYPE_DATA_ERRORS_X) - errorBar = C2U("ErrorBarX"); + errorBar = "ErrorBarX"; else if (eObjectType == OBJECTTYPE_DATA_ERRORS_Y) - errorBar = C2U("ErrorBarY"); + errorBar = "ErrorBarY"; else - errorBar = C2U("ErrorBarZ"); + errorBar = "ErrorBarZ"; xSeriesProp->getPropertyValue( errorBar ) >>= xErrorBarProp; xObjectProperties = Reference< beans::XPropertySet >( xErrorBarProp, uno::UNO_QUERY ); @@ -1277,7 +1277,7 @@ Reference< beans::XPropertySet > ObjectIdentifier::getObjectPropertySet( Reference<XChartType> xChartType( lcl_getFirstStockChartType( xChartModel ) ); Reference< beans::XPropertySet > xChartTypeProps( xChartType, uno::UNO_QUERY ); if(xChartTypeProps.is()) - xChartTypeProps->getPropertyValue( C2U( "BlackDay" ) ) >>= xObjectProperties; + xChartTypeProps->getPropertyValue( "BlackDay" ) >>= xObjectProperties; } break; case OBJECTTYPE_DATA_STOCK_GAIN: @@ -1285,7 +1285,7 @@ Reference< beans::XPropertySet > ObjectIdentifier::getObjectPropertySet( Reference<XChartType> xChartType( lcl_getFirstStockChartType( xChartModel ) ); Reference< beans::XPropertySet > xChartTypeProps( xChartType, uno::UNO_QUERY ); if(xChartTypeProps.is()) - xChartTypeProps->getPropertyValue( C2U( "WhiteDay" ) ) >>= xObjectProperties; + xChartTypeProps->getPropertyValue( "WhiteDay" ) >>= xObjectProperties; } break; default: //OBJECTTYPE_UNKNOWN @@ -1387,10 +1387,10 @@ OUString ObjectIdentifier::getSeriesParticleFromCID( const OUString& rCID ) OUString ObjectIdentifier::getMovedSeriesCID( const ::rtl::OUString& rObjectCID, sal_Bool bForward ) { - sal_Int32 nDiagramIndex = lcl_StringToIndex( lcl_getIndexStringAfterString( rObjectCID, C2U("CID/D=") ) ); - sal_Int32 nCooSysIndex = lcl_StringToIndex( lcl_getIndexStringAfterString( rObjectCID, C2U("CS=") ) ); - sal_Int32 nChartTypeIndex = lcl_StringToIndex( lcl_getIndexStringAfterString( rObjectCID, C2U("CT=") ) ); - sal_Int32 nSeriesIndex = lcl_StringToIndex( lcl_getIndexStringAfterString( rObjectCID, C2U("Series=") ) ); + sal_Int32 nDiagramIndex = lcl_StringToIndex( lcl_getIndexStringAfterString( rObjectCID, "CID/D=" ) ); + sal_Int32 nCooSysIndex = lcl_StringToIndex( lcl_getIndexStringAfterString( rObjectCID, "CS=" ) ); + sal_Int32 nChartTypeIndex = lcl_StringToIndex( lcl_getIndexStringAfterString( rObjectCID, "CT=" ) ); + sal_Int32 nSeriesIndex = lcl_StringToIndex( lcl_getIndexStringAfterString( rObjectCID, "Series=" ) ); if( bForward ) nSeriesIndex--; diff --git a/chart2/source/tools/PotentialRegressionCurveCalculator.cxx b/chart2/source/tools/PotentialRegressionCurveCalculator.cxx index 7e7e794d76e2..b84032790e06 100644 --- a/chart2/source/tools/PotentialRegressionCurveCalculator.cxx +++ b/chart2/source/tools/PotentialRegressionCurveCalculator.cxx @@ -137,7 +137,7 @@ OUString PotentialRegressionCurveCalculator::ImplGetRepresentation( const uno::Reference< util::XNumberFormatter >& xNumFormatter, ::sal_Int32 nNumberFormatKey ) const { - OUStringBuffer aBuf( C2U( "f(x) = " )); + OUStringBuffer aBuf( "f(x) = "); if( m_fIntercept == 0.0 ) { diff --git a/chart2/source/tools/PropertyHelper.cxx b/chart2/source/tools/PropertyHelper.cxx index c333832e7c63..746cf6a1a35b 100644 --- a/chart2/source/tools/PropertyHelper.cxx +++ b/chart2/source/tools/PropertyHelper.cxx @@ -187,11 +187,11 @@ OUString addLineDashUniqueNameToTable( if( xFact.is()) { Reference< container::XNameContainer > xNameCnt( - xFact->createInstance( C2U( "com.sun.star.drawing.DashTable" )), + xFact->createInstance( "com.sun.star.drawing.DashTable"), uno::UNO_QUERY ); if( xNameCnt.is()) return lcl_addNamedPropertyUniqueNameToTable( - rValue, xNameCnt, C2U( "ChartDash " ), rPreferredName ); + rValue, xNameCnt, "ChartDash ", rPreferredName ); } return OUString(); } @@ -204,11 +204,11 @@ OUString addGradientUniqueNameToTable( if( xFact.is()) { Reference< container::XNameContainer > xNameCnt( - xFact->createInstance( C2U( "com.sun.star.drawing.GradientTable" )), + xFact->createInstance( "com.sun.star.drawing.GradientTable"), uno::UNO_QUERY ); if( xNameCnt.is()) return lcl_addNamedPropertyUniqueNameToTable( - rValue, xNameCnt, C2U( "ChartGradient " ), rPreferredName ); + rValue, xNameCnt, "ChartGradient ", rPreferredName ); } return OUString(); } @@ -222,11 +222,11 @@ OUString addTransparencyGradientUniqueNameToTable( if( xFact.is()) { Reference< container::XNameContainer > xNameCnt( - xFact->createInstance( C2U( "com.sun.star.drawing.TransparencyGradientTable" )), + xFact->createInstance( "com.sun.star.drawing.TransparencyGradientTable"), uno::UNO_QUERY ); if( xNameCnt.is()) return lcl_addNamedPropertyUniqueNameToTable( - rValue, xNameCnt, C2U( "ChartTransparencyGradient " ), rPreferredName ); + rValue, xNameCnt, "ChartTransparencyGradient ", rPreferredName ); } return OUString(); } @@ -239,11 +239,11 @@ OUString addHatchUniqueNameToTable( if( xFact.is()) { Reference< container::XNameContainer > xNameCnt( - xFact->createInstance( C2U( "com.sun.star.drawing.HatchTable" )), + xFact->createInstance( "com.sun.star.drawing.HatchTable"), uno::UNO_QUERY ); if( xNameCnt.is()) return lcl_addNamedPropertyUniqueNameToTable( - rValue, xNameCnt, C2U( "ChartHatch " ), rPreferredName ); + rValue, xNameCnt, "ChartHatch ", rPreferredName ); } return OUString(); } @@ -256,11 +256,11 @@ OUString addBitmapUniqueNameToTable( if( xFact.is()) { Reference< container::XNameContainer > xNameCnt( - xFact->createInstance( C2U( "com.sun.star.drawing.BitmapTable" )), + xFact->createInstance( "com.sun.star.drawing.BitmapTable"), uno::UNO_QUERY ); if( xNameCnt.is()) return lcl_addNamedPropertyUniqueNameToTable( - rValue, xNameCnt, C2U( "ChartBitmap " ), rPreferredName ); + rValue, xNameCnt, "ChartBitmap ", rPreferredName ); } return OUString(); } diff --git a/chart2/source/tools/RangeHighlighter.cxx b/chart2/source/tools/RangeHighlighter.cxx index b77c2ae5f752..545e4e697626 100644 --- a/chart2/source/tools/RangeHighlighter.cxx +++ b/chart2/source/tools/RangeHighlighter.cxx @@ -228,7 +228,7 @@ void RangeHighlighter::fillRangesForErrorBars( sal_Int32 nStyle = ::com::sun::star::chart::ErrorBarStyle::NONE; bUsesRangesAsErrorBars = ( xErrorBar.is() && - (xErrorBar->getPropertyValue( C2U("ErrorBarStyle")) >>= nStyle) && + (xErrorBar->getPropertyValue( "ErrorBarStyle") >>= nStyle) && nStyle == ::com::sun::star::chart::ErrorBarStyle::FROM_DATA ); } catch( const uno::Exception & ex ) diff --git a/chart2/source/tools/ReferenceSizeProvider.cxx b/chart2/source/tools/ReferenceSizeProvider.cxx index ec0e7067bbbf..4f63a5b45fd5 100644 --- a/chart2/source/tools/ReferenceSizeProvider.cxx +++ b/chart2/source/tools/ReferenceSizeProvider.cxx @@ -81,7 +81,7 @@ void ReferenceSizeProvider::setValuesAtTitle( Reference< beans::XPropertySet > xTitleProp( xTitle, uno::UNO_QUERY_THROW ); awt::Size aOldRefSize; bool bHasOldRefSize( - xTitleProp->getPropertyValue( C2U("ReferencePageSize")) >>= aOldRefSize ); + xTitleProp->getPropertyValue( "ReferencePageSize") >>= aOldRefSize ); // set from auto-resize on to off -> adapt font sizes at XFormattedStrings if( bHasOldRefSize && ! useAutoScale()) @@ -122,7 +122,7 @@ void ReferenceSizeProvider::setValuesAtAllDataSeries() Sequence< sal_Int32 > aPointIndexes; try { - if( xSeriesProp->getPropertyValue( C2U("AttributedDataPoints")) >>= aPointIndexes ) + if( xSeriesProp->getPropertyValue( "AttributedDataPoints") >>= aPointIndexes ) { for( sal_Int32 i=0; i< aPointIndexes.getLength(); ++i ) setValuesAtPropertySet( @@ -298,7 +298,7 @@ ReferenceSizeProvider::AutoResizeState ReferenceSizeProvider::getAutoResizeState Sequence< sal_Int32 > aPointIndexes; try { - if( xSeriesProp->getPropertyValue( C2U("AttributedDataPoints")) >>= aPointIndexes ) + if( xSeriesProp->getPropertyValue( "AttributedDataPoints") >>= aPointIndexes ) { for( sal_Int32 i=0; i< aPointIndexes.getLength(); ++i ) { diff --git a/chart2/source/tools/RegressionCurveHelper.cxx b/chart2/source/tools/RegressionCurveHelper.cxx index 07c033ae7baa..16a57e838249 100644 --- a/chart2/source/tools/RegressionCurveHelper.cxx +++ b/chart2/source/tools/RegressionCurveHelper.cxx @@ -53,20 +53,20 @@ OUString lcl_getServiceNameForType( ::chart::RegressionCurveHelper::tRegressionT switch( eType ) { case ::chart::RegressionCurveHelper::REGRESSION_TYPE_LINEAR: - aServiceName = C2U( "com.sun.star.chart2.LinearRegressionCurve" ); + aServiceName = "com.sun.star.chart2.LinearRegressionCurve"; break; case ::chart::RegressionCurveHelper::REGRESSION_TYPE_LOG: - aServiceName = C2U( "com.sun.star.chart2.LogarithmicRegressionCurve" ); + aServiceName = "com.sun.star.chart2.LogarithmicRegressionCurve"; break; case ::chart::RegressionCurveHelper::REGRESSION_TYPE_EXP: - aServiceName = C2U( "com.sun.star.chart2.ExponentialRegressionCurve" ); + aServiceName = "com.sun.star.chart2.ExponentialRegressionCurve"; break; case ::chart::RegressionCurveHelper::REGRESSION_TYPE_POWER: - aServiceName = C2U( "com.sun.star.chart2.PotentialRegressionCurve" ); + aServiceName = "com.sun.star.chart2.PotentialRegressionCurve"; break; default: OSL_FAIL("unknown regression curve type - use linear instead"); - aServiceName = C2U( "com.sun.star.chart2.LinearRegressionCurve" ); + aServiceName = "com.sun.star.chart2.LinearRegressionCurve"; break; } return aServiceName; @@ -250,7 +250,7 @@ bool RegressionCurveHelper::isMeanValueLine( uno::Reference< XServiceName > xServName( xRegCurve, uno::UNO_QUERY ); if( xServName.is() && xServName->getServiceName().equals( - C2U( "com.sun.star.chart2.MeanValueRegressionCurve" ))) + "com.sun.star.chart2.MeanValueRegressionCurve")) return true; return false; } @@ -298,8 +298,8 @@ void RegressionCurveHelper::addMeanValueLine( uno::Reference< XPropertySet > xProp( xCurve, uno::UNO_QUERY ); if( xProp.is()) { - xProp->setPropertyValue( C2U( "LineColor" ), - xSeriesProp->getPropertyValue( C2U( "Color" ))); + xProp->setPropertyValue( "LineColor", + xSeriesProp->getPropertyValue( "Color")); } } } @@ -371,10 +371,10 @@ void RegressionCurveHelper::addRegressionCurve( uno::Reference< XPropertySet > xSeriesProp( xRegCnt, uno::UNO_QUERY ); if( xSeriesProp.is()) { - xProp->setPropertyValue( C2U( "LineColor" ), - xSeriesProp->getPropertyValue( C2U( "Color" ))); + xProp->setPropertyValue( "LineColor", + xSeriesProp->getPropertyValue( "Color")); } -// xProp->setPropertyValue( C2U( "LineWidth" ), uno::makeAny( sal_Int32( 100 ))); +// xProp->setPropertyValue( "LineWidth", uno::makeAny( sal_Int32( 100 ))); } } } @@ -437,8 +437,8 @@ void RegressionCurveHelper::removeEquations( uno::Reference< beans::XPropertySet > xEqProp( xRegCurve->getEquationProperties() ) ; if( xEqProp.is()) { - xEqProp->setPropertyValue( C2U("ShowEquation"), uno::makeAny( false )); - xEqProp->setPropertyValue( C2U("ShowCorrelationCoefficient"), uno::makeAny( false )); + xEqProp->setPropertyValue( "ShowEquation", uno::makeAny( false )); + xEqProp->setPropertyValue( "ShowCorrelationCoefficient", uno::makeAny( false )); } } } @@ -669,8 +669,8 @@ bool RegressionCurveHelper::hasEquation( const Reference< chart2::XRegressionCur { bool bShowEquation = false; bool bShowCoefficient = false; - xEquationProp->getPropertyValue( C2U("ShowEquation")) >>= bShowEquation; - xEquationProp->getPropertyValue( C2U("ShowCorrelationCoefficient")) >>= bShowCoefficient; + xEquationProp->getPropertyValue( "ShowEquation") >>= bShowEquation; + xEquationProp->getPropertyValue( "ShowCorrelationCoefficient") >>= bShowCoefficient; bHasEquation = bShowEquation || bShowCoefficient; } } diff --git a/chart2/source/tools/RegressionCurveModel.cxx b/chart2/source/tools/RegressionCurveModel.cxx index f82064ae666a..7312081755be 100644 --- a/chart2/source/tools/RegressionCurveModel.cxx +++ b/chart2/source/tools/RegressionCurveModel.cxx @@ -40,18 +40,18 @@ using ::osl::MutexGuard; namespace { static const OUString lcl_aImplementationName_MeanValue( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.MeanValueRegressionCurve" )); + "com.sun.star.comp.chart2.MeanValueRegressionCurve" ); static const OUString lcl_aImplementationName_Linear( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.LinearRegressionCurve" )); + "com.sun.star.comp.chart2.LinearRegressionCurve" ); static const OUString lcl_aImplementationName_Logarithmic( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.LogarithmicRegressionCurve" )); + "com.sun.star.comp.chart2.LogarithmicRegressionCurve" ); static const OUString lcl_aImplementationName_Exponential( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.ExponentialRegressionCurve" )); + "com.sun.star.comp.chart2.ExponentialRegressionCurve" ); static const OUString lcl_aImplementationName_Potential( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.PotentialRegressionCurve" )); + "com.sun.star.comp.chart2.PotentialRegressionCurve" ); static const OUString lcl_aServiceName( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.RegressionCurve" )); + "com.sun.star.chart2.RegressionCurve" ); struct StaticXXXDefaults_Initializer { @@ -182,15 +182,15 @@ void SAL_CALL RegressionCurveModel::setEquationProperties( const uno::Reference< switch( m_eRegressionCurveType ) { case CURVE_TYPE_MEAN_VALUE: - return C2U( "com.sun.star.chart2.MeanValueRegressionCurve" ); + return OUString("com.sun.star.chart2.MeanValueRegressionCurve"); case CURVE_TYPE_LINEAR: - return C2U( "com.sun.star.chart2.LinearRegressionCurve" ); + return OUString("com.sun.star.chart2.LinearRegressionCurve"); case CURVE_TYPE_LOGARITHM: - return C2U( "com.sun.star.chart2.LogarithmicRegressionCurve" ); + return OUString("com.sun.star.chart2.LogarithmicRegressionCurve"); case CURVE_TYPE_EXPONENTIAL: - return C2U( "com.sun.star.chart2.ExponentialRegressionCurve" ); + return OUString("com.sun.star.chart2.ExponentialRegressionCurve"); case CURVE_TYPE_POWER: - return C2U( "com.sun.star.chart2.PotentialRegressionCurve" ); + return OUString("com.sun.star.chart2.PotentialRegressionCurve"); } return ::rtl::OUString(); @@ -303,7 +303,7 @@ uno::Sequence< ::rtl::OUString > MeanValueRegressionCurve::getSupportedServiceNa { uno::Sequence< ::rtl::OUString > aServices( 2 ); aServices[ 0 ] = lcl_aServiceName; - aServices[ 1 ] = C2U( "com.sun.star.chart2.MeanValueRegressionCurve" ); + aServices[ 1 ] = "com.sun.star.chart2.MeanValueRegressionCurve"; return aServices; } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static @@ -331,7 +331,7 @@ uno::Sequence< ::rtl::OUString > LinearRegressionCurve::getSupportedServiceNames { uno::Sequence< ::rtl::OUString > aServices( 2 ); aServices[ 0 ] = lcl_aServiceName; - aServices[ 1 ] = C2U( "com.sun.star.chart2.LinearRegressionCurve" ); + aServices[ 1 ] = "com.sun.star.chart2.LinearRegressionCurve"; return aServices; } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static @@ -359,7 +359,7 @@ uno::Sequence< ::rtl::OUString > LogarithmicRegressionCurve::getSupportedService { uno::Sequence< ::rtl::OUString > aServices( 2 ); aServices[ 0 ] = lcl_aServiceName; - aServices[ 1 ] = C2U( "com.sun.star.chart2.LogarithmicRegressionCurve" ); + aServices[ 1 ] = "com.sun.star.chart2.LogarithmicRegressionCurve"; return aServices; } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static @@ -387,7 +387,7 @@ uno::Sequence< ::rtl::OUString > ExponentialRegressionCurve::getSupportedService { uno::Sequence< ::rtl::OUString > aServices( 2 ); aServices[ 0 ] = lcl_aServiceName; - aServices[ 1 ] = C2U( "com.sun.star.chart2.ExponentialRegressionCurve" ); + aServices[ 1 ] = "com.sun.star.chart2.ExponentialRegressionCurve"; return aServices; } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static @@ -415,7 +415,7 @@ uno::Sequence< ::rtl::OUString > PotentialRegressionCurve::getSupportedServiceNa { uno::Sequence< ::rtl::OUString > aServices( 2 ); aServices[ 0 ] = lcl_aServiceName; - aServices[ 1 ] = C2U( "com.sun.star.chart2.PotentialRegressionCurve" ); + aServices[ 1 ] = "com.sun.star.chart2.PotentialRegressionCurve"; return aServices; } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static diff --git a/chart2/source/tools/RegressionEquation.cxx b/chart2/source/tools/RegressionEquation.cxx index 553650cc4cfe..dacbd2d90d6f 100644 --- a/chart2/source/tools/RegressionEquation.cxx +++ b/chart2/source/tools/RegressionEquation.cxx @@ -65,35 +65,35 @@ void lcl_AddPropertiesToVector( ::std::vector< Property > & rOutProperties ) { rOutProperties.push_back( - Property( C2U( "ShowEquation" ), + Property( "ShowEquation", PROP_EQUATION_SHOW, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "ShowCorrelationCoefficient" ), + Property( "ShowCorrelationCoefficient", PROP_EQUATION_SHOW_CORRELATION_COEFF, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "ReferencePageSize" ), + Property( "ReferencePageSize", PROP_EQUATION_REF_PAGE_SIZE, ::getCppuType( reinterpret_cast< const awt::Size * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( - Property( C2U( "RelativePosition" ), + Property( "RelativePosition", PROP_EQUATION_REL_POS, ::getCppuType( reinterpret_cast< const chart2::RelativePosition * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( - Property( C2U( "NumberFormat" ), + Property( "NumberFormat", PROP_EQUATION_NUMBER_FORMAT, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND @@ -317,10 +317,10 @@ uno::Sequence< ::rtl::OUString > RegressionEquation::getSupportedServiceNames_St sal_Int32 nI = 0; uno::Sequence< ::rtl::OUString > aServices( nNumServices ); aServices[ nI++ ] = lcl_aServiceName; - aServices[ nI++ ] = C2U( "com.sun.star.beans.PropertySet" ); - aServices[ nI++ ] = C2U( "com.sun.star.drawing.FillProperties" ); - aServices[ nI++ ] = C2U( "com.sun.star.drawing.LineProperties" ); - aServices[ nI++ ] = C2U( "com.sun.star.style.CharacterProperties" ); + aServices[ nI++ ] = "com.sun.star.beans.PropertySet"; + aServices[ nI++ ] = "com.sun.star.drawing.FillProperties"; + aServices[ nI++ ] = "com.sun.star.drawing.LineProperties"; + aServices[ nI++ ] = "com.sun.star.style.CharacterProperties"; OSL_ASSERT( nNumServices == nI ); return aServices; } diff --git a/chart2/source/tools/SceneProperties.cxx b/chart2/source/tools/SceneProperties.cxx index 71329513e967..8e86976501e8 100644 --- a/chart2/source/tools/SceneProperties.cxx +++ b/chart2/source/tools/SceneProperties.cxx @@ -44,7 +44,7 @@ void SceneProperties::AddPropertiesToVector( { // transformation matrix rOutProperties.push_back( - Property( C2U( "D3DTransformMatrix" ), + Property( "D3DTransformMatrix", PROP_SCENE_TRANSF_MATRIX, ::getCppuType( reinterpret_cast< const drawing::HomogenMatrix * >(0)), beans::PropertyAttribute::BOUND @@ -53,7 +53,7 @@ void SceneProperties::AddPropertiesToVector( // distance: deprecated ( this is not used by the chart view; it's only here for compatibility with old chart ) rOutProperties.push_back( - Property( C2U( "D3DSceneDistance" ), + Property( "D3DSceneDistance", PROP_SCENE_DISTANCE, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND @@ -62,7 +62,7 @@ void SceneProperties::AddPropertiesToVector( // focalLength: deprecated ( this is not used by the chart view; it's only here for compatibility with old chart ) rOutProperties.push_back( - Property( C2U( "D3DSceneFocalLength" ), + Property( "D3DSceneFocalLength", PROP_SCENE_FOCAL_LENGTH, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND @@ -71,7 +71,7 @@ void SceneProperties::AddPropertiesToVector( // shadowSlant rOutProperties.push_back( - Property( C2U( "D3DSceneShadowSlant" ), + Property( "D3DSceneShadowSlant", PROP_SCENE_SHADOW_SLANT, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND @@ -80,7 +80,7 @@ void SceneProperties::AddPropertiesToVector( // shadeMode rOutProperties.push_back( - Property( C2U( "D3DSceneShadeMode" ), + Property( "D3DSceneShadeMode", PROP_SCENE_SHADE_MODE, ::getCppuType( reinterpret_cast< const drawing::ShadeMode * >(0)), beans::PropertyAttribute::BOUND @@ -89,7 +89,7 @@ void SceneProperties::AddPropertiesToVector( // ambientColor rOutProperties.push_back( - Property( C2U( "D3DSceneAmbientColor" ), + Property( "D3DSceneAmbientColor", PROP_SCENE_AMBIENT_COLOR, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND @@ -98,7 +98,7 @@ void SceneProperties::AddPropertiesToVector( // lightingMode rOutProperties.push_back( - Property( C2U( "D3DSceneTwoSidedLighting" ), + Property( "D3DSceneTwoSidedLighting", PROP_SCENE_TWO_SIDED_LIGHTING, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND @@ -107,7 +107,7 @@ void SceneProperties::AddPropertiesToVector( // camera geometry rOutProperties.push_back( - Property( C2U( "D3DCameraGeometry" ), + Property( "D3DCameraGeometry", PROP_SCENE_CAMERA_GEOMETRY, ::getCppuType( reinterpret_cast< const drawing::CameraGeometry * >(0)), beans::PropertyAttribute::BOUND @@ -116,7 +116,7 @@ void SceneProperties::AddPropertiesToVector( // perspective rOutProperties.push_back( - Property( C2U( "D3DScenePerspective" ), + Property( "D3DScenePerspective", PROP_SCENE_PERSPECTIVE, ::getCppuType( reinterpret_cast< const drawing::ProjectionMode * >(0)), beans::PropertyAttribute::BOUND @@ -128,21 +128,21 @@ void SceneProperties::AddPropertiesToVector( // ------------- // light source 1 rOutProperties.push_back( - Property( C2U( "D3DSceneLightColor1" ), + Property( "D3DSceneLightColor1", PROP_SCENE_LIGHT_COLOR_1, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "D3DSceneLightDirection1" ), + Property( "D3DSceneLightDirection1", PROP_SCENE_LIGHT_DIRECTION_1, ::getCppuType( reinterpret_cast< const drawing::Direction3D * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "D3DSceneLightOn1" ), + Property( "D3DSceneLightOn1", PROP_SCENE_LIGHT_ON_1, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND @@ -150,21 +150,21 @@ void SceneProperties::AddPropertiesToVector( | beans::PropertyAttribute::MAYBEDEFAULT )); // light source 2 rOutProperties.push_back( - Property( C2U( "D3DSceneLightColor2" ), + Property( "D3DSceneLightColor2", PROP_SCENE_LIGHT_COLOR_2, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "D3DSceneLightDirection2" ), + Property( "D3DSceneLightDirection2", PROP_SCENE_LIGHT_DIRECTION_2, ::getCppuType( reinterpret_cast< const drawing::Direction3D * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "D3DSceneLightOn2" ), + Property( "D3DSceneLightOn2", PROP_SCENE_LIGHT_ON_2, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND @@ -172,21 +172,21 @@ void SceneProperties::AddPropertiesToVector( | beans::PropertyAttribute::MAYBEDEFAULT )); // light source 3 rOutProperties.push_back( - Property( C2U( "D3DSceneLightColor3" ), + Property( "D3DSceneLightColor3", PROP_SCENE_LIGHT_COLOR_3, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "D3DSceneLightDirection3" ), + Property( "D3DSceneLightDirection3", PROP_SCENE_LIGHT_DIRECTION_3, ::getCppuType( reinterpret_cast< const drawing::Direction3D * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "D3DSceneLightOn3" ), + Property( "D3DSceneLightOn3", PROP_SCENE_LIGHT_ON_3, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND @@ -194,21 +194,21 @@ void SceneProperties::AddPropertiesToVector( | beans::PropertyAttribute::MAYBEDEFAULT )); // light source 4 rOutProperties.push_back( - Property( C2U( "D3DSceneLightColor4" ), + Property( "D3DSceneLightColor4", PROP_SCENE_LIGHT_COLOR_4, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "D3DSceneLightDirection4" ), + Property( "D3DSceneLightDirection4", PROP_SCENE_LIGHT_DIRECTION_4, ::getCppuType( reinterpret_cast< const drawing::Direction3D * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "D3DSceneLightOn4" ), + Property( "D3DSceneLightOn4", PROP_SCENE_LIGHT_ON_4, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND @@ -216,21 +216,21 @@ void SceneProperties::AddPropertiesToVector( | beans::PropertyAttribute::MAYBEDEFAULT )); // light source 5 rOutProperties.push_back( - Property( C2U( "D3DSceneLightColor5" ), + Property( "D3DSceneLightColor5", PROP_SCENE_LIGHT_COLOR_5, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "D3DSceneLightDirection5" ), + Property( "D3DSceneLightDirection5", PROP_SCENE_LIGHT_DIRECTION_5, ::getCppuType( reinterpret_cast< const drawing::Direction3D * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "D3DSceneLightOn5" ), + Property( "D3DSceneLightOn5", PROP_SCENE_LIGHT_ON_5, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND @@ -238,21 +238,21 @@ void SceneProperties::AddPropertiesToVector( | beans::PropertyAttribute::MAYBEDEFAULT )); // light source 6 rOutProperties.push_back( - Property( C2U( "D3DSceneLightColor6" ), + Property( "D3DSceneLightColor6", PROP_SCENE_LIGHT_COLOR_6, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "D3DSceneLightDirection6" ), + Property( "D3DSceneLightDirection6", PROP_SCENE_LIGHT_DIRECTION_6, ::getCppuType( reinterpret_cast< const drawing::Direction3D * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "D3DSceneLightOn6" ), + Property( "D3DSceneLightOn6", PROP_SCENE_LIGHT_ON_6, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND @@ -260,21 +260,21 @@ void SceneProperties::AddPropertiesToVector( | beans::PropertyAttribute::MAYBEDEFAULT )); // light source 7 rOutProperties.push_back( - Property( C2U( "D3DSceneLightColor7" ), + Property( "D3DSceneLightColor7", PROP_SCENE_LIGHT_COLOR_7, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "D3DSceneLightDirection7" ), + Property( "D3DSceneLightDirection7", PROP_SCENE_LIGHT_DIRECTION_7, ::getCppuType( reinterpret_cast< const drawing::Direction3D * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "D3DSceneLightOn7" ), + Property( "D3DSceneLightOn7", PROP_SCENE_LIGHT_ON_7, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND @@ -282,21 +282,21 @@ void SceneProperties::AddPropertiesToVector( | beans::PropertyAttribute::MAYBEDEFAULT )); // light source 8 rOutProperties.push_back( - Property( C2U( "D3DSceneLightColor8" ), + Property( "D3DSceneLightColor8", PROP_SCENE_LIGHT_COLOR_8, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "D3DSceneLightDirection8" ), + Property( "D3DSceneLightDirection8", PROP_SCENE_LIGHT_DIRECTION_8, ::getCppuType( reinterpret_cast< const drawing::Direction3D * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "D3DSceneLightOn8" ), + Property( "D3DSceneLightOn8", PROP_SCENE_LIGHT_ON_8, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND diff --git a/chart2/source/tools/StatisticsHelper.cxx b/chart2/source/tools/StatisticsHelper.cxx index fd6282d02551..a955a97bb7bf 100644 --- a/chart2/source/tools/StatisticsHelper.cxx +++ b/chart2/source/tools/StatisticsHelper.cxx @@ -81,7 +81,7 @@ Reference< chart2::data::XLabeledDataSequence > lcl_getErrorBarLabeledSequence( bool bPositiveValue, bool bYError, OUString & rOutRoleNameUsed ) { - OUStringBuffer aRole( C2U("error-bars-")); + OUStringBuffer aRole( "error-bars-"); if( bYError ) aRole.append( sal_Unicode( 'y' )); else @@ -120,7 +120,7 @@ void lcl_setRole( { Reference< beans::XPropertySet > xSeqProp( xNewSequence, uno::UNO_QUERY ); if( xSeqProp.is()) - xSeqProp->setPropertyValue( C2U("Role"), uno::makeAny( rRole )); + xSeqProp->setPropertyValue( "Role", uno::makeAny( rRole )); } void lcl_addSequenceToDataSource( @@ -150,7 +150,7 @@ void lcl_setXMLRangePropertyAtDataSequence( { try { - const OUString aXMLRangePropName( C2U( "CachedXMLRange" )); + const OUString aXMLRangePropName( "CachedXMLRange"); Reference< beans::XPropertySet > xProp( xDataSequence, uno::UNO_QUERY_THROW ); Reference< beans::XPropertySetInfo > xInfo( xProp->getPropertySetInfo()); if( xInfo.is() && xInfo->hasPropertyByName( aXMLRangePropName )) @@ -308,7 +308,7 @@ Reference< beans::XPropertySet > StatisticsHelper::addErrorBars( if( !xSeriesProp.is()) return xErrorBar; - const OUString aPropName( bYError ? C2U("ErrorBarY") : C2U("ErrorBarX")); + const OUString aPropName( bYError ? "ErrorBarY" : "ErrorBarX"); if( !( xSeriesProp->getPropertyValue( aPropName ) >>= xErrorBar ) || !xErrorBar.is()) { @@ -318,7 +318,7 @@ Reference< beans::XPropertySet > StatisticsHelper::addErrorBars( OSL_ASSERT( xErrorBar.is()); if( xErrorBar.is()) { - xErrorBar->setPropertyValue( C2U("ErrorBarStyle"), uno::makeAny( nStyle )); + xErrorBar->setPropertyValue( "ErrorBarStyle", uno::makeAny( nStyle )); } xSeriesProp->setPropertyValue( aPropName, uno::makeAny( xErrorBar )); @@ -332,7 +332,7 @@ Reference< beans::XPropertySet > StatisticsHelper::getErrorBars( { Reference< beans::XPropertySet > xSeriesProp( xDataSeries, uno::UNO_QUERY ); Reference< beans::XPropertySet > xErrorBar; - const OUString aPropName( bYError ? C2U("ErrorBarY") : C2U("ErrorBarX")); + const OUString aPropName( bYError ? "ErrorBarY" : "ErrorBarX"); if ( xSeriesProp.is()) xSeriesProp->getPropertyValue( aPropName ) >>= xErrorBar; @@ -348,7 +348,7 @@ bool StatisticsHelper::hasErrorBars( sal_Int32 nStyle = ::com::sun::star::chart::ErrorBarStyle::NONE; return ( xErrorBar.is() && - ( xErrorBar->getPropertyValue( C2U("ErrorBarStyle")) >>= nStyle ) && + ( xErrorBar->getPropertyValue( "ErrorBarStyle") >>= nStyle ) && nStyle != ::com::sun::star::chart::ErrorBarStyle::NONE ); } @@ -358,7 +358,7 @@ void StatisticsHelper::removeErrorBars( { Reference< beans::XPropertySet > xErrorBar( getErrorBars( xDataSeries, bYError )); if ( xErrorBar.is()) - xErrorBar->setPropertyValue( C2U("ErrorBarStyle"), uno::makeAny( + xErrorBar->setPropertyValue( "ErrorBarStyle", uno::makeAny( ::com::sun::star::chart::ErrorBarStyle::NONE )); } @@ -370,7 +370,7 @@ bool StatisticsHelper::usesErrorBarRanges( sal_Int32 nStyle = ::com::sun::star::chart::ErrorBarStyle::NONE; return ( xErrorBar.is() && - ( xErrorBar->getPropertyValue( C2U("ErrorBarStyle")) >>= nStyle ) && + ( xErrorBar->getPropertyValue( "ErrorBarStyle") >>= nStyle ) && nStyle == ::com::sun::star::chart::ErrorBarStyle::FROM_DATA ); } diff --git a/chart2/source/tools/ThreeDHelper.cxx b/chart2/source/tools/ThreeDHelper.cxx index 66199cc114bd..4805390c4b8c 100644 --- a/chart2/source/tools/ThreeDHelper.cxx +++ b/chart2/source/tools/ThreeDHelper.cxx @@ -53,7 +53,7 @@ bool lcl_isRightAngledAxesSetAndSupported( const Reference< beans::XPropertySet sal_Bool bRightAngledAxes = sal_False; if( xSceneProperties.is() ) { - xSceneProperties->getPropertyValue( C2U("RightAngledAxes")) >>= bRightAngledAxes; + xSceneProperties->getPropertyValue( "RightAngledAxes") >>= bRightAngledAxes; if(bRightAngledAxes) { uno::Reference< chart2::XDiagram > xDiagram( xSceneProperties, uno::UNO_QUERY ); @@ -101,14 +101,14 @@ void lcl_rotateLights( const ::basegfx::B3DHomMatrix& rLightRottion, const Refer ::basegfx::B3DHomMatrix aLightRottion( rLightRottion ); BaseGFXHelper::ReduceToRotationMatrix( aLightRottion ); - lcl_RotateLightSource( xSceneProperties, C2U("D3DSceneLightDirection1"), C2U("D3DSceneLightOn1"), aLightRottion ); - lcl_RotateLightSource( xSceneProperties, C2U("D3DSceneLightDirection2"), C2U("D3DSceneLightOn2"), aLightRottion ); - lcl_RotateLightSource( xSceneProperties, C2U("D3DSceneLightDirection3"), C2U("D3DSceneLightOn3"), aLightRottion ); - lcl_RotateLightSource( xSceneProperties, C2U("D3DSceneLightDirection4"), C2U("D3DSceneLightOn4"), aLightRottion ); - lcl_RotateLightSource( xSceneProperties, C2U("D3DSceneLightDirection5"), C2U("D3DSceneLightOn5"), aLightRottion ); - lcl_RotateLightSource( xSceneProperties, C2U("D3DSceneLightDirection6"), C2U("D3DSceneLightOn6"), aLightRottion ); - lcl_RotateLightSource( xSceneProperties, C2U("D3DSceneLightDirection7"), C2U("D3DSceneLightOn7"), aLightRottion ); - lcl_RotateLightSource( xSceneProperties, C2U("D3DSceneLightDirection8"), C2U("D3DSceneLightOn8"), aLightRottion ); + lcl_RotateLightSource( xSceneProperties, "D3DSceneLightDirection1", "D3DSceneLightOn1", aLightRottion ); + lcl_RotateLightSource( xSceneProperties, "D3DSceneLightDirection2", "D3DSceneLightOn2", aLightRottion ); + lcl_RotateLightSource( xSceneProperties, "D3DSceneLightDirection3", "D3DSceneLightOn3", aLightRottion ); + lcl_RotateLightSource( xSceneProperties, "D3DSceneLightDirection4", "D3DSceneLightOn4", aLightRottion ); + lcl_RotateLightSource( xSceneProperties, "D3DSceneLightDirection5", "D3DSceneLightOn5", aLightRottion ); + lcl_RotateLightSource( xSceneProperties, "D3DSceneLightDirection6", "D3DSceneLightOn6", aLightRottion ); + lcl_RotateLightSource( xSceneProperties, "D3DSceneLightDirection7", "D3DSceneLightOn7", aLightRottion ); + lcl_RotateLightSource( xSceneProperties, "D3DSceneLightDirection8", "D3DSceneLightOn8", aLightRottion ); } ::basegfx::B3DHomMatrix lcl_getInverseRotationMatrix( const Reference< beans::XPropertySet >& xSceneProperties ) @@ -150,7 +150,7 @@ bool lcl_isLightScheme( const uno::Reference< beans::XPropertySet >& xDiagramPro return false; sal_Bool bIsOn = sal_False; - xDiagramProps->getPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTON_2 ) ) >>= bIsOn; + xDiagramProps->getPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_2 ) >>= bIsOn; if(!bIsOn) return false; @@ -158,17 +158,17 @@ bool lcl_isLightScheme( const uno::Reference< beans::XPropertySet >& xDiagramPro uno::Reference< chart2::XChartType > xChartType( DiagramHelper::getChartTypeByIndex( xDiagram, 0 ) ); sal_Int32 nColor = 0; - xDiagramProps->getPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTCOLOR_2 ) ) >>= nColor; + xDiagramProps->getPropertyValue( UNO_NAME_3D_SCENE_LIGHTCOLOR_2 ) >>= nColor; if( nColor != ::chart::ChartTypeHelper::getDefaultDirectLightColor( !bRealistic, xChartType ) ) return false; sal_Int32 nAmbientColor = 0; - xDiagramProps->getPropertyValue( C2U( UNO_NAME_3D_SCENE_AMBIENTCOLOR ) ) >>= nAmbientColor; + xDiagramProps->getPropertyValue( UNO_NAME_3D_SCENE_AMBIENTCOLOR ) >>= nAmbientColor; if( nAmbientColor != ::chart::ChartTypeHelper::getDefaultAmbientLightColor( !bRealistic, xChartType ) ) return false; drawing::Direction3D aDirection(0,0,0); - xDiagramProps->getPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTDIRECTION_2 ) ) >>= aDirection; + xDiagramProps->getPropertyValue( UNO_NAME_3D_SCENE_LIGHTDIRECTION_2 ) >>= aDirection; drawing::Direction3D aDefaultDirection( bRealistic ? ChartTypeHelper::getDefaultRealisticLightDirection(xChartType) @@ -177,7 +177,7 @@ bool lcl_isLightScheme( const uno::Reference< beans::XPropertySet >& xDiagramPro //rotate default light direction when right angled axes are off but supported { sal_Bool bRightAngledAxes = sal_False; - xDiagramProps->getPropertyValue( C2U("RightAngledAxes")) >>= bRightAngledAxes; + xDiagramProps->getPropertyValue( "RightAngledAxes") >>= bRightAngledAxes; if(!bRightAngledAxes) { if( ChartTypeHelper::isSupportingRightAngledAxes( @@ -210,7 +210,7 @@ void lcl_setLightsForScheme( const uno::Reference< beans::XPropertySet >& xDiagr if( rScheme == ThreeDLookScheme_Unknown) return; - xDiagramProps->setPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTON_2 ), uno::makeAny( sal_True ) ); + xDiagramProps->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_2, uno::makeAny( sal_True ) ); uno::Reference< chart2::XDiagram > xDiagram( xDiagramProps, uno::UNO_QUERY ); uno::Reference< chart2::XChartType > xChartType( DiagramHelper::getChartTypeByIndex( xDiagram, 0 ) ); @@ -218,27 +218,27 @@ void lcl_setLightsForScheme( const uno::Reference< beans::XPropertySet >& xDiagr ? ChartTypeHelper::getDefaultSimpleLightDirection(xChartType) : ChartTypeHelper::getDefaultRealisticLightDirection(xChartType) ) ); - xDiagramProps->setPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTDIRECTION_2 ), aADirection ); + xDiagramProps->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTDIRECTION_2, aADirection ); //rotate light direction when right angled axes are off but supported { sal_Bool bRightAngledAxes = sal_False; - xDiagramProps->getPropertyValue( C2U("RightAngledAxes")) >>= bRightAngledAxes; + xDiagramProps->getPropertyValue( "RightAngledAxes") >>= bRightAngledAxes; if(!bRightAngledAxes) { if( ChartTypeHelper::isSupportingRightAngledAxes( xChartType ) ) { ::basegfx::B3DHomMatrix aRotation( lcl_getCompleteRotationMatrix( xDiagramProps ) ); BaseGFXHelper::ReduceToRotationMatrix( aRotation ); - lcl_RotateLightSource( xDiagramProps, C2U("D3DSceneLightDirection2"), C2U("D3DSceneLightOn2"), aRotation ); + lcl_RotateLightSource( xDiagramProps, "D3DSceneLightDirection2", "D3DSceneLightOn2", aRotation ); } } } sal_Int32 nColor = ::chart::ChartTypeHelper::getDefaultDirectLightColor( rScheme==ThreeDLookScheme_Simple, xChartType ); - xDiagramProps->setPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTCOLOR_2 ), uno::makeAny( nColor ) ); + xDiagramProps->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTCOLOR_2, uno::makeAny( nColor ) ); sal_Int32 nAmbientColor = ::chart::ChartTypeHelper::getDefaultAmbientLightColor( rScheme==ThreeDLookScheme_Simple, xChartType ); - xDiagramProps->setPropertyValue( C2U( UNO_NAME_3D_SCENE_AMBIENTCOLOR ), uno::makeAny( nAmbientColor ) ); + xDiagramProps->setPropertyValue( UNO_NAME_3D_SCENE_AMBIENTCOLOR, uno::makeAny( nAmbientColor ) ); } bool lcl_isRealisticScheme( drawing::ShadeMode aShadeMode @@ -325,7 +325,7 @@ namespace drawing::CameraGeometry aCG( ThreeDHelper::getDefaultCameraGeometry() ); if( xSceneProperties.is() ) - xSceneProperties->getPropertyValue( C2U( "D3DCameraGeometry" ) ) >>= aCG; + xSceneProperties->getPropertyValue( "D3DCameraGeometry" ) >>= aCG; ::basegfx::B3DVector aVPN( BaseGFXHelper::Direction3DToB3DVector( aCG.vpn ) ); ::basegfx::B3DVector aVUP( BaseGFXHelper::Direction3DToB3DVector( aCG.vup ) ); @@ -937,7 +937,7 @@ void ThreeDHelper::getRotationAngleFromDiagram( ::basegfx::B3DHomMatrix aSceneRotation; { drawing::HomogenMatrix aHomMatrix; - if( xSceneProperties->getPropertyValue( C2U("D3DTransformMatrix")) >>= aHomMatrix ) + if( xSceneProperties->getPropertyValue( "D3DTransformMatrix") >>= aHomMatrix ) { aSceneRotation = BaseGFXHelper::HomogenMatrixToB3DHomMatrix( aHomMatrix ); BaseGFXHelper::ReduceToRotationMatrix( aSceneRotation ); @@ -970,10 +970,10 @@ void ThreeDHelper::switchRightAngledAxes( const Reference< beans::XPropertySet > if( xSceneProperties.is() ) { sal_Bool bOldRightAngledAxes = sal_False; - xSceneProperties->getPropertyValue( C2U("RightAngledAxes")) >>= bOldRightAngledAxes; + xSceneProperties->getPropertyValue( "RightAngledAxes") >>= bOldRightAngledAxes; if( bOldRightAngledAxes!=bRightAngledAxes) { - xSceneProperties->setPropertyValue( C2U("RightAngledAxes"), uno::makeAny( bRightAngledAxes )); + xSceneProperties->setPropertyValue( "RightAngledAxes", uno::makeAny( bRightAngledAxes )); if( bRotateLights ) { if(bRightAngledAxes) @@ -1031,11 +1031,11 @@ void ThreeDHelper::setRotationAngleToDiagram( //set new rotation to transformation matrix xSceneProperties->setPropertyValue( - C2U("D3DTransformMatrix"), uno::makeAny( BaseGFXHelper::B3DHomMatrixToHomogenMatrix( aSceneRotation ))); + "D3DTransformMatrix", uno::makeAny( BaseGFXHelper::B3DHomMatrixToHomogenMatrix( aSceneRotation ))); //rotate lights if RightAngledAxes are not set or not supported sal_Bool bRightAngledAxes = sal_False; - xSceneProperties->getPropertyValue( C2U("RightAngledAxes")) >>= bRightAngledAxes; + xSceneProperties->getPropertyValue( "RightAngledAxes") >>= bRightAngledAxes; uno::Reference< chart2::XDiagram > xDiagram( xSceneProperties, uno::UNO_QUERY ); if(!bRightAngledAxes || !ChartTypeHelper::isSupportingRightAngledAxes( DiagramHelper::getChartTypeByIndex( xDiagram, 0 ) ) ) @@ -1120,7 +1120,7 @@ double ThreeDHelper::getCameraDistance( try { drawing::CameraGeometry aCG( ThreeDHelper::getDefaultCameraGeometry() ); - xSceneProperties->getPropertyValue( C2U( "D3DCameraGeometry" ) ) >>= aCG; + xSceneProperties->getPropertyValue( "D3DCameraGeometry" ) >>= aCG; ::basegfx::B3DVector aVRP( BaseGFXHelper::Position3DToB3DVector( aCG.vrp ) ); fCameraDistance = aVRP.getLength(); @@ -1145,14 +1145,14 @@ void ThreeDHelper::setCameraDistance( fCameraDistance = FIXED_SIZE_FOR_3D_CHART_VOLUME; drawing::CameraGeometry aCG( ThreeDHelper::getDefaultCameraGeometry() ); - xSceneProperties->getPropertyValue( C2U( "D3DCameraGeometry" ) ) >>= aCG; + xSceneProperties->getPropertyValue( "D3DCameraGeometry" ) >>= aCG; ::basegfx::B3DVector aVRP( BaseGFXHelper::Position3DToB3DVector( aCG.vrp ) ); if( ::basegfx::fTools::equalZero( aVRP.getLength() ) ) aVRP = ::basegfx::B3DVector(0,0,1); aVRP.setLength(fCameraDistance); aCG.vrp = BaseGFXHelper::B3DVectorToPosition3D( aVRP ); - xSceneProperties->setPropertyValue( C2U("D3DCameraGeometry"), uno::makeAny( aCG )); + xSceneProperties->setPropertyValue( "D3DCameraGeometry", uno::makeAny( aCG )); } catch( const uno::Exception & ex ) { @@ -1204,7 +1204,7 @@ ThreeDLookScheme ThreeDHelper::detectScheme( const uno::Reference< XDiagram >& x try { if( xDiagramProps.is() ) - xDiagramProps->getPropertyValue( C2U( "D3DSceneShadeMode" ) )>>= aShadeMode; + xDiagramProps->getPropertyValue( "D3DSceneShadeMode" )>>= aShadeMode; } catch( const uno::Exception & ex ) { @@ -1247,10 +1247,10 @@ void ThreeDHelper::setScheme( const uno::Reference< XDiagram >& xDiagram, ThreeD if( xProp.is() ) { drawing::ShadeMode aOldShadeMode; - if( ! ( (xProp->getPropertyValue( C2U( "D3DSceneShadeMode" ) )>>=aOldShadeMode) && + if( ! ( (xProp->getPropertyValue( "D3DSceneShadeMode" )>>=aOldShadeMode) && aOldShadeMode == aShadeMode )) { - xProp->setPropertyValue( C2U( "D3DSceneShadeMode" ), uno::makeAny( aShadeMode )); + xProp->setPropertyValue( "D3DSceneShadeMode", uno::makeAny( aShadeMode )); } } @@ -1268,8 +1268,8 @@ void ThreeDHelper::set3DSettingsToDefault( const uno::Reference< beans::XPropert Reference< beans::XPropertyState > xState( xSceneProperties, uno::UNO_QUERY ); if(xState.is()) { - xState->setPropertyToDefault( C2U("D3DSceneDistance")); - xState->setPropertyToDefault( C2U("D3DSceneFocalLength")); + xState->setPropertyToDefault( "D3DSceneDistance"); + xState->setPropertyToDefault( "D3DSceneFocalLength"); } ThreeDHelper::setDefaultRotation( xSceneProperties ); ThreeDHelper::setDefaultIllumination( xSceneProperties ); @@ -1281,12 +1281,12 @@ void ThreeDHelper::setDefaultRotation( const uno::Reference< beans::XPropertySet return; drawing::CameraGeometry aCameraGeo( ThreeDHelper::getDefaultCameraGeometry( bPieOrDonut ) ); - xSceneProperties->setPropertyValue( C2U("D3DCameraGeometry"), uno::makeAny( aCameraGeo )); + xSceneProperties->setPropertyValue( "D3DCameraGeometry", uno::makeAny( aCameraGeo )); ::basegfx::B3DHomMatrix aSceneRotation; if( bPieOrDonut ) aSceneRotation.rotate( -F_PI/3.0, 0, 0 ); - xSceneProperties->setPropertyValue( C2U("D3DTransformMatrix"), + xSceneProperties->setPropertyValue( "D3DTransformMatrix", uno::makeAny( BaseGFXHelper::B3DHomMatrixToHomogenMatrix( aSceneRotation ))); } @@ -1304,14 +1304,14 @@ void ThreeDHelper::setDefaultIllumination( const uno::Reference< beans::XPropert drawing::ShadeMode aShadeMode( drawing::ShadeMode_SMOOTH ); try { - xSceneProperties->getPropertyValue( C2U( "D3DSceneShadeMode" ) )>>= aShadeMode; - xSceneProperties->setPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTON_1 ), uno::makeAny( sal_False ) ); - xSceneProperties->setPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTON_3 ), uno::makeAny( sal_False ) ); - xSceneProperties->setPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTON_4 ), uno::makeAny( sal_False ) ); - xSceneProperties->setPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTON_5 ), uno::makeAny( sal_False ) ); - xSceneProperties->setPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTON_6 ), uno::makeAny( sal_False ) ); - xSceneProperties->setPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTON_7 ), uno::makeAny( sal_False ) ); - xSceneProperties->setPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTON_8 ), uno::makeAny( sal_False ) ); + xSceneProperties->getPropertyValue( "D3DSceneShadeMode" )>>= aShadeMode; + xSceneProperties->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_1, uno::makeAny( sal_False ) ); + xSceneProperties->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_3, uno::makeAny( sal_False ) ); + xSceneProperties->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_4, uno::makeAny( sal_False ) ); + xSceneProperties->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_5, uno::makeAny( sal_False ) ); + xSceneProperties->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_6, uno::makeAny( sal_False ) ); + xSceneProperties->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_7, uno::makeAny( sal_False ) ); + xSceneProperties->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_8, uno::makeAny( sal_False ) ); } catch( const uno::Exception & ex ) { @@ -1339,8 +1339,8 @@ void ThreeDHelper::getRoundedEdgesAndObjectLines( DiagramHelper::getDataSeriesFromDiagram( xDiagram ) ); sal_Int32 nSeriesCount = static_cast<sal_Int32>( aSeriesList.size() ); - rtl::OUString aPercentDiagonalPropertyName( C2U( "PercentDiagonal" ) ); - rtl::OUString aBorderStylePropertyName( C2U( "BorderStyle" ) ); + rtl::OUString aPercentDiagonalPropertyName( "PercentDiagonal" ); + rtl::OUString aBorderStylePropertyName( "BorderStyle" ); for( sal_Int32 nS = 0; nS < nSeriesCount; ++nS ) { @@ -1444,10 +1444,10 @@ void ThreeDHelper::setRoundedEdgesAndObjectLines( uno::Reference< XDataSeries > xSeries( aSeriesList[nS] ); if( nRoundedEdges>=0 && nRoundedEdges<=100 ) - DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, C2U( "PercentDiagonal" ), aARoundedEdges ); + DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "PercentDiagonal", aARoundedEdges ); if( nObjectLines==0 || nObjectLines==1 ) - DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, C2U( "BorderStyle" ), aALineStyle ); + DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "BorderStyle", aALineStyle ); } } diff --git a/chart2/source/tools/TitleHelper.cxx b/chart2/source/tools/TitleHelper.cxx index 7abd2d0e21fb..f618780e8876 100644 --- a/chart2/source/tools/TitleHelper.cxx +++ b/chart2/source/tools/TitleHelper.cxx @@ -158,7 +158,7 @@ uno::Reference< XTitle > TitleHelper::createTitle( uno::Reference< beans::XPropertySet > xProps( xAxis, uno::UNO_QUERY ); if( xProps.is() ) { - xProps->setPropertyValue( C2U( "Show" ), uno::makeAny( sal_False ) ); + xProps->setPropertyValue( "Show", uno::makeAny( sal_False ) ); xTitled = lcl_getTitleParent( eTitleType, xModel ); } } @@ -168,7 +168,7 @@ uno::Reference< XTitle > TitleHelper::createTitle( uno::Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( xModel ) ); xTitle.set( xContext->getServiceManager()->createInstanceWithContext( - C2U( "com.sun.star.chart2.Title" ), + "com.sun.star.chart2.Title", xContext ), uno::UNO_QUERY ); if(xTitle.is()) @@ -224,7 +224,7 @@ uno::Reference< XTitle > TitleHelper::createTitle( || (bIsVertical && eTitleType == TitleHelper::SECONDARY_X_AXIS_TITLE) ) { double fNewAngleDegree = 90.0; - xTitleProps->setPropertyValue( C2U( "TextRotation" ), uno::makeAny( fNewAngleDegree )); + xTitleProps->setPropertyValue( "TextRotation", uno::makeAny( fNewAngleDegree )); } } } @@ -264,7 +264,7 @@ void TitleHelper::setCompleteString( const rtl::OUString& rNewText bool bStacked = false; uno::Reference< beans::XPropertySet > xTitleProperties( xTitle, uno::UNO_QUERY ); if( xTitleProperties.is() ) - xTitleProperties->getPropertyValue( C2U( "StackCharacters" ) ) >>= bStacked; + xTitleProperties->getPropertyValue( "StackCharacters" ) >>= bStacked; if( bStacked ) { @@ -302,7 +302,7 @@ void TitleHelper::setCompleteString( const rtl::OUString& rNewText { uno::Reference< uno::XInterface > xI( xContext->getServiceManager()->createInstanceWithContext( - C2U( "com.sun.star.chart2.FormattedString" ), xContext ) ); + "com.sun.star.chart2.FormattedString", xContext ) ); uno::Reference< XFormattedString > xFormattedString( xI, uno::UNO_QUERY ); if(xFormattedString.is()) @@ -316,9 +316,9 @@ void TitleHelper::setCompleteString( const rtl::OUString& rNewText uno::Reference< beans::XPropertySet > xProp( xFormattedString, uno::UNO_QUERY_THROW ); uno::Any aFontSize( uno::makeAny( *pDefaultCharHeight )); - xProp->setPropertyValue( C2U("CharHeight"), aFontSize ); - xProp->setPropertyValue( C2U("CharHeightAsian"), aFontSize ); - xProp->setPropertyValue( C2U("CharHeightComplex"), aFontSize ); + xProp->setPropertyValue( "CharHeight", aFontSize ); + xProp->setPropertyValue( "CharHeightAsian", aFontSize ); + xProp->setPropertyValue( "CharHeightComplex", aFontSize ); } catch( const uno::Exception & ex ) { diff --git a/chart2/source/tools/UncachedDataSequence.cxx b/chart2/source/tools/UncachedDataSequence.cxx index b0a6ab194ffe..4fe74ef72d23 100644 --- a/chart2/source/tools/UncachedDataSequence.cxx +++ b/chart2/source/tools/UncachedDataSequence.cxx @@ -105,19 +105,19 @@ UncachedDataSequence::~UncachedDataSequence() void UncachedDataSequence::registerProperties() { - registerProperty( C2U( "NumberFormatKey" ), + registerProperty( "NumberFormatKey", PROP_NUMBERFORMAT_KEY, 0, // PropertyAttributes & m_nNumberFormatKey, ::getCppuType( & m_nNumberFormatKey ) ); - registerProperty( C2U( "Role" ), + registerProperty( "Role", PROP_PROPOSED_ROLE, 0, // PropertyAttributes & m_sRole, ::getCppuType( & m_sRole ) ); - registerProperty( C2U( "CachedXMLRange" ), + registerProperty( "CachedXMLRange", PROP_XML_RANGE, 0, // PropertyAttributes & m_aXMLRange, @@ -130,9 +130,9 @@ Sequence< OUString > UncachedDataSequence::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 4 ); aServices[ 0 ] = lcl_aServiceName; - aServices[ 1 ] = C2U( "com.sun.star.chart2.data.DataSequence" ); - aServices[ 2 ] = C2U( "com.sun.star.chart2.data.NumericalDataSequence" ); - aServices[ 3 ] = C2U( "com.sun.star.chart2.data.TextualDataSequence" ); + aServices[ 1 ] = "com.sun.star.chart2.data.DataSequence"; + aServices[ 2 ] = "com.sun.star.chart2.data.NumericalDataSequence"; + aServices[ 3 ] = "com.sun.star.chart2.data.TextualDataSequence"; return aServices; } diff --git a/chart2/source/tools/UserDefinedProperties.cxx b/chart2/source/tools/UserDefinedProperties.cxx index 69ad99db5b6b..c145cb48edfe 100644 --- a/chart2/source/tools/UserDefinedProperties.cxx +++ b/chart2/source/tools/UserDefinedProperties.cxx @@ -33,19 +33,19 @@ void UserDefinedProperties::AddPropertiesToVector( ::std::vector< Property > & rOutProperties ) { rOutProperties.push_back( - Property( C2U( "ChartUserDefinedAttributes" ), + Property( "ChartUserDefinedAttributes", PROP_XML_USERDEF_CHART, ::getCppuType( reinterpret_cast< const uno::Reference< container::XNameContainer > * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( - Property( C2U( "TextUserDefinedAttributes" ), + Property( "TextUserDefinedAttributes", PROP_XML_USERDEF_TEXT, ::getCppuType( reinterpret_cast< const uno::Reference< container::XNameContainer > * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( - Property( C2U( "ParaUserDefinedAttributes" ), + Property( "ParaUserDefinedAttributes", PROP_XML_USERDEF_PARA, ::getCppuType( reinterpret_cast< const uno::Reference< container::XNameContainer > * >(0)), beans::PropertyAttribute::BOUND @@ -53,7 +53,7 @@ void UserDefinedProperties::AddPropertiesToVector( // UserDefinedAttributesSupplier // ---------------------------- rOutProperties.push_back( - Property( C2U( "UserDefinedAttributes" ), + Property( "UserDefinedAttributes", PROP_XML_USERDEF, ::getCppuType( reinterpret_cast< const uno::Reference< container::XNameContainer > * >(0)), beans::PropertyAttribute::BOUND diff --git a/chart2/source/tools/WrappedIgnoreProperty.cxx b/chart2/source/tools/WrappedIgnoreProperty.cxx index 24099f1fd40d..069d18ab2b00 100644 --- a/chart2/source/tools/WrappedIgnoreProperty.cxx +++ b/chart2/source/tools/WrappedIgnoreProperty.cxx @@ -84,12 +84,12 @@ beans::PropertyState WrappedIgnoreProperty::getPropertyState( const Reference< b void WrappedIgnoreProperties::addIgnoreLineProperties( std::vector< WrappedProperty* >& rList ) { - rList.push_back( new WrappedIgnoreProperty( C2U( "LineStyle" ), uno::makeAny( drawing::LineStyle_SOLID ) ) ); - rList.push_back( new WrappedIgnoreProperty( C2U( "LineDashName" ), uno::makeAny( rtl::OUString() ) ) ); - rList.push_back( new WrappedIgnoreProperty( C2U( "LineColor" ), uno::makeAny( sal_Int32(0) ) ) ); - rList.push_back( new WrappedIgnoreProperty( C2U( "LineTransparence" ), uno::makeAny( sal_Int16(0) ) ) ); - rList.push_back( new WrappedIgnoreProperty( C2U( "LineWidth" ), uno::makeAny( sal_Int32(0) ) ) ); - rList.push_back( new WrappedIgnoreProperty( C2U( "LineJoint" ), uno::makeAny( drawing::LineJoint_ROUND ) ) ); + rList.push_back( new WrappedIgnoreProperty( "LineStyle", uno::makeAny( drawing::LineStyle_SOLID ) ) ); + rList.push_back( new WrappedIgnoreProperty( "LineDashName", uno::makeAny( rtl::OUString() ) ) ); + rList.push_back( new WrappedIgnoreProperty( "LineColor", uno::makeAny( sal_Int32(0) ) ) ); + rList.push_back( new WrappedIgnoreProperty( "LineTransparence", uno::makeAny( sal_Int16(0) ) ) ); + rList.push_back( new WrappedIgnoreProperty( "LineWidth", uno::makeAny( sal_Int32(0) ) ) ); + rList.push_back( new WrappedIgnoreProperty( "LineJoint", uno::makeAny( drawing::LineJoint_ROUND ) ) ); } void WrappedIgnoreProperties::addIgnoreFillProperties( std::vector< WrappedProperty* >& rList ) @@ -100,32 +100,32 @@ void WrappedIgnoreProperties::addIgnoreFillProperties( std::vector< WrappedPrope void WrappedIgnoreProperties::addIgnoreFillProperties_without_BitmapProperties( ::std::vector< WrappedProperty* >& rList ) { - rList.push_back( new WrappedIgnoreProperty( C2U( "FillStyle" ), uno::makeAny( drawing::FillStyle_SOLID ) ) ); - rList.push_back( new WrappedIgnoreProperty( C2U( "FillColor" ), uno::makeAny( sal_Int32(-1) ) ) ); - rList.push_back( new WrappedIgnoreProperty( C2U( "FillTransparence" ), uno::makeAny( sal_Int16(0) ) ) ); - rList.push_back( new WrappedIgnoreProperty( C2U( "FillTransparenceGradientName" ), uno::makeAny( ::rtl::OUString() ) ) ); -// rList.push_back( new WrappedIgnoreProperty( C2U( "FillTransparenceGradient" ), uno::makeAny( awt::Gradient() ) ) ); - rList.push_back( new WrappedIgnoreProperty( C2U( "FillGradientName" ), uno::makeAny( ::rtl::OUString() ) ) ); -// rList.push_back( new WrappedIgnoreProperty( C2U( "FillGradient" ), uno::makeAny( awt::Gradient() ) ) ); - rList.push_back( new WrappedIgnoreProperty( C2U( "FillHatchName" ), uno::makeAny( ::rtl::OUString() ) ) ); -// rList.push_back( new WrappedIgnoreProperty( C2U( "FillHatch" ), uno::makeAny( drawing::Hatch() ) ) ); - rList.push_back( new WrappedIgnoreProperty( C2U( "FillBackground" ), uno::makeAny( sal_Bool(sal_False) ) ) ); + rList.push_back( new WrappedIgnoreProperty( "FillStyle", uno::makeAny( drawing::FillStyle_SOLID ) ) ); + rList.push_back( new WrappedIgnoreProperty( "FillColor", uno::makeAny( sal_Int32(-1) ) ) ); + rList.push_back( new WrappedIgnoreProperty( "FillTransparence", uno::makeAny( sal_Int16(0) ) ) ); + rList.push_back( new WrappedIgnoreProperty( "FillTransparenceGradientName", uno::makeAny( ::rtl::OUString() ) ) ); +// rList.push_back( new WrappedIgnoreProperty( "FillTransparenceGradient", uno::makeAny( awt::Gradient() ) ) ); + rList.push_back( new WrappedIgnoreProperty( "FillGradientName", uno::makeAny( ::rtl::OUString() ) ) ); +// rList.push_back( new WrappedIgnoreProperty( "FillGradient", uno::makeAny( awt::Gradient() ) ) ); + rList.push_back( new WrappedIgnoreProperty( "FillHatchName", uno::makeAny( ::rtl::OUString() ) ) ); +// rList.push_back( new WrappedIgnoreProperty( "FillHatch", uno::makeAny( drawing::Hatch() ) ) ); + rList.push_back( new WrappedIgnoreProperty( "FillBackground", uno::makeAny( sal_Bool(sal_False) ) ) ); } void WrappedIgnoreProperties::addIgnoreFillProperties_only_BitmapProperties( ::std::vector< WrappedProperty* >& rList ) { -// rList.push_back( new WrappedIgnoreProperty( C2U( "FillBitmapName" ), uno::makeAny( ::rtl::OUString() ) ) ); -// rList.push_back( new WrappedIgnoreProperty( C2U( "FillBitmap" ), uno::makeAny( uno::Reference< awt::XBitmap > (0) ) ) ); -// rList.push_back( new WrappedIgnoreProperty( C2U( "FillBitmapURL" ), uno::makeAny( ::rtl::OUString() ) ) ); - rList.push_back( new WrappedIgnoreProperty( C2U( "FillBitmapOffsetX" ), uno::makeAny( sal_Int16(0) ) ) ); - rList.push_back( new WrappedIgnoreProperty( C2U( "FillBitmapOffsetY" ), uno::makeAny( sal_Int16(0) ) ) ); - rList.push_back( new WrappedIgnoreProperty( C2U( "FillBitmapPositionOffsetX" ), uno::makeAny( sal_Int16(0) ) ) ); - rList.push_back( new WrappedIgnoreProperty( C2U( "FillBitmapPositionOffsetY" ), uno::makeAny( sal_Int16(0) ) ) ); - rList.push_back( new WrappedIgnoreProperty( C2U( "FillBitmapRectanglePoint" ), uno::makeAny( drawing::RectanglePoint_LEFT_TOP ) ) ); - rList.push_back( new WrappedIgnoreProperty( C2U( "FillBitmapLogicalSize" ), uno::makeAny( sal_Bool(sal_False) ) ) );//todo correct default? - rList.push_back( new WrappedIgnoreProperty( C2U( "FillBitmapSizeX" ), uno::makeAny( sal_Int32(10) ) ) );//todo which default? - rList.push_back( new WrappedIgnoreProperty( C2U( "FillBitmapSizeY" ), uno::makeAny( sal_Int32(10) ) ) );//todo which default? - rList.push_back( new WrappedIgnoreProperty( C2U( "FillBitmapMode" ), uno::makeAny( drawing::BitmapMode_REPEAT ) ) ); +// rList.push_back( new WrappedIgnoreProperty( "FillBitmapName", uno::makeAny( ::rtl::OUString() ) ) ); +// rList.push_back( new WrappedIgnoreProperty( "FillBitmap", uno::makeAny( uno::Reference< awt::XBitmap > (0) ) ) ); +// rList.push_back( new WrappedIgnoreProperty( "FillBitmapURL", uno::makeAny( ::rtl::OUString() ) ) ); + rList.push_back( new WrappedIgnoreProperty( "FillBitmapOffsetX", uno::makeAny( sal_Int16(0) ) ) ); + rList.push_back( new WrappedIgnoreProperty( "FillBitmapOffsetY", uno::makeAny( sal_Int16(0) ) ) ); + rList.push_back( new WrappedIgnoreProperty( "FillBitmapPositionOffsetX", uno::makeAny( sal_Int16(0) ) ) ); + rList.push_back( new WrappedIgnoreProperty( "FillBitmapPositionOffsetY", uno::makeAny( sal_Int16(0) ) ) ); + rList.push_back( new WrappedIgnoreProperty( "FillBitmapRectanglePoint", uno::makeAny( drawing::RectanglePoint_LEFT_TOP ) ) ); + rList.push_back( new WrappedIgnoreProperty( "FillBitmapLogicalSize", uno::makeAny( sal_Bool(sal_False) ) ) );//todo correct default? + rList.push_back( new WrappedIgnoreProperty( "FillBitmapSizeX", uno::makeAny( sal_Int32(10) ) ) );//todo which default? + rList.push_back( new WrappedIgnoreProperty( "FillBitmapSizeY", uno::makeAny( sal_Int32(10) ) ) );//todo which default? + rList.push_back( new WrappedIgnoreProperty( "FillBitmapMode", uno::makeAny( drawing::BitmapMode_REPEAT ) ) ); } //............................................................................. diff --git a/chart2/source/view/axes/VAxisBase.cxx b/chart2/source/view/axes/VAxisBase.cxx index e50e543bbe5c..c2a12a6bcb7a 100644 --- a/chart2/source/view/axes/VAxisBase.cxx +++ b/chart2/source/view/axes/VAxisBase.cxx @@ -140,7 +140,7 @@ sal_Bool VAxisBase::isAnythingToDraw() if( xProps.is() ) { sal_Bool bShow = sal_False; - xProps->getPropertyValue( C2U( "Show" ) ) >>= bShow; + xProps->getPropertyValue( "Show" ) >>= bShow; if( !bShow ) return false; } @@ -187,7 +187,7 @@ bool VAxisBase::prepareShapeCreation() //----------------------------------------- //create named group shape - m_xGroupShape_Shapes = this->createGroupShape( m_xLogicTarget, m_nDimension==2 ? m_aCID : C2U("")); + m_xGroupShape_Shapes = this->createGroupShape( m_xLogicTarget, m_nDimension==2 ? m_aCID : ""); if( m_aAxisProperties.m_bDisplayLabels ) m_xTextTarget = m_pShapeFactory->createGroup2D( m_xFinalTarget, m_aCID ); diff --git a/chart2/source/view/axes/VAxisProperties.cxx b/chart2/source/view/axes/VAxisProperties.cxx index 86ec8f2ac6b9..2ebe0f10652d 100644 --- a/chart2/source/view/axes/VAxisProperties.cxx +++ b/chart2/source/view/axes/VAxisProperties.cxx @@ -259,11 +259,11 @@ void AxisProperties::initAxisPositioning( const uno::Reference< beans::XProperty { if( AxisHelper::isAxisPositioningEnabled() ) { - xAxisProp->getPropertyValue(C2U( "CrossoverPosition" )) >>= m_eCrossoverType; + xAxisProp->getPropertyValue("CrossoverPosition") >>= m_eCrossoverType; if( ::com::sun::star::chart::ChartAxisPosition_VALUE == m_eCrossoverType ) { double fValue = 0.0; - xAxisProp->getPropertyValue(C2U( "CrossoverValue" )) >>= fValue; + xAxisProp->getPropertyValue("CrossoverValue") >>= fValue; if( m_bCrossingAxisIsCategoryAxes ) fValue = ::rtl::math::round(fValue); @@ -272,8 +272,8 @@ void AxisProperties::initAxisPositioning( const uno::Reference< beans::XProperty else if( ::com::sun::star::chart::ChartAxisPosition_ZERO == m_eCrossoverType ) m_pfMainLinePositionAtOtherAxis = new double(0.0); - xAxisProp->getPropertyValue(C2U( "LabelPosition" )) >>= m_eLabelPos; - xAxisProp->getPropertyValue(C2U( "MarkPosition" )) >>= m_eTickmarkPos; + xAxisProp->getPropertyValue("LabelPosition") >>= m_eLabelPos; + xAxisProp->getPropertyValue("MarkPosition") >>= m_eTickmarkPos; } else { @@ -350,11 +350,11 @@ void AxisProperties::init( bool bCartesian ) m_aLineProperties.initFromPropertySet( xProp ); //init display labels - xProp->getPropertyValue( C2U( "DisplayLabels" ) ) >>= m_bDisplayLabels; + xProp->getPropertyValue( "DisplayLabels" ) >>= m_bDisplayLabels; //init TickmarkProperties - xProp->getPropertyValue( C2U( "MajorTickmarks" ) ) >>= m_nMajorTickmarks; - xProp->getPropertyValue( C2U( "MinorTickmarks" ) ) >>= m_nMinorTickmarks; + xProp->getPropertyValue( "MajorTickmarks" ) >>= m_nMajorTickmarks; + xProp->getPropertyValue( "MinorTickmarks" ) >>= m_nMinorTickmarks; sal_Int32 nMaxDepth = 0; if(m_nMinorTickmarks!=0) @@ -400,13 +400,13 @@ void AxisLabelProperties::init( const uno::Reference< XAxis >& xAxisModel ) { try { - xProp->getPropertyValue( C2U( "TextBreak" ) ) >>= this->bLineBreakAllowed; - xProp->getPropertyValue( C2U( "TextOverlap" ) ) >>= this->bOverlapAllowed; - xProp->getPropertyValue( C2U( "StackCharacters" ) ) >>= this->bStackCharacters; - xProp->getPropertyValue( C2U( "TextRotation" ) ) >>= this->fRotationAngleDegree; + xProp->getPropertyValue( "TextBreak" ) >>= this->bLineBreakAllowed; + xProp->getPropertyValue( "TextOverlap" ) >>= this->bOverlapAllowed; + xProp->getPropertyValue( "StackCharacters" ) >>= this->bStackCharacters; + xProp->getPropertyValue( "TextRotation" ) >>= this->fRotationAngleDegree; ::com::sun::star::chart::ChartAxisArrangeOrderType eArrangeOrder; - xProp->getPropertyValue( C2U( "ArrangeOrder" ) ) >>= eArrangeOrder; + xProp->getPropertyValue( "ArrangeOrder" ) >>= eArrangeOrder; switch(eArrangeOrder) { case ::com::sun::star::chart::ChartAxisArrangeOrderType_SIDE_BY_SIDE: diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx index 40b48862d7c1..fee4c6b8878c 100644 --- a/chart2/source/view/axes/VCartesianAxis.cxx +++ b/chart2/source/view/axes/VCartesianAxis.cxx @@ -650,7 +650,7 @@ bool VCartesianAxis::createTextShapes( , m_aAxisLabelProperties.m_aFontReferenceSize ); LabelPositionHelper::changeTextAdjustment( aPropValues, aPropNames, m_aAxisProperties.m_aLabelAlignment ); - uno::Any* pColorAny = PropertyMapper::getValuePointer(aPropValues,aPropNames,C2U("CharColor")); + uno::Any* pColorAny = PropertyMapper::getValuePointer(aPropValues,aPropNames,"CharColor"); sal_Int32 nColor = Color( COL_AUTO ).GetColor(); if(pColorAny) *pColorAny >>= nColor; @@ -1512,7 +1512,7 @@ void VCartesianAxis::updatePositions() { try { - xProp->setPropertyValue( C2U( "Transformation" ), aATransformation ); + xProp->setPropertyValue( "Transformation", aATransformation ); } catch( const uno::Exception& e ) { @@ -1643,7 +1643,7 @@ void VCartesianAxis::createShapes() m_xGroupShape_Shapes, aPoints , &m_aAxisProperties.m_aLineProperties ); //because of this name this line will be used for marking the axis - m_pShapeFactory->setShapeName( xShape, C2U("MarkHandles") ); + m_pShapeFactory->setShapeName( xShape, "MarkHandles" ); } //----------------------------------------- //create an additional line at NULL diff --git a/chart2/source/view/axes/VCartesianGrid.cxx b/chart2/source/view/axes/VCartesianGrid.cxx index 195a25c47c86..2c7ca4b4ba48 100644 --- a/chart2/source/view/axes/VCartesianGrid.cxx +++ b/chart2/source/view/axes/VCartesianGrid.cxx @@ -286,7 +286,7 @@ void VCartesianGrid::createShapes() aHandleLineProperties.LineStyle = uno::makeAny( drawing::LineStyle_NONE ); Reference< drawing::XShape > xHandleShape = m_pShapeFactory->createLine2D( xTarget, aHandlesPoints, &aHandleLineProperties ); - m_pShapeFactory->setShapeName( xHandleShape, C2U("HandlesOnly") ); + m_pShapeFactory->setShapeName( xHandleShape, "HandlesOnly" ); } //----------------------------------------- else //if(2!=m_nDimension) diff --git a/chart2/source/view/axes/VCoordinateSystem.cxx b/chart2/source/view/axes/VCoordinateSystem.cxx index 6d8f1abc7808..90343690ee59 100644 --- a/chart2/source/view/axes/VCoordinateSystem.cxx +++ b/chart2/source/view/axes/VCoordinateSystem.cxx @@ -561,7 +561,7 @@ bool VCoordinateSystem::getPropertySwapXAndYAxis() const sal_Bool bSwapXAndY = false; if( xProp.is()) try { - xProp->getPropertyValue( C2U( "SwapXAndYAxis" ) ) >>= bSwapXAndY; + xProp->getPropertyValue( "SwapXAndYAxis" ) >>= bSwapXAndY; } catch( const uno::Exception& e ) { diff --git a/chart2/source/view/axes/VPolarAngleAxis.cxx b/chart2/source/view/axes/VPolarAngleAxis.cxx index 647d30873cb4..8d65bc74f392 100644 --- a/chart2/source/view/axes/VPolarAngleAxis.cxx +++ b/chart2/source/view/axes/VPolarAngleAxis.cxx @@ -73,7 +73,7 @@ bool VPolarAngleAxis::createTextShapes_ForAngleAxis( LabelPositionHelper::doDynamicFontResize( aPropValues, aPropNames, xProps , rAxisLabelProperties.m_aFontReferenceSize ); - uno::Any* pColorAny = PropertyMapper::getValuePointer(aPropValues,aPropNames,C2U("CharColor")); + uno::Any* pColorAny = PropertyMapper::getValuePointer(aPropValues,aPropNames,"CharColor"); sal_Int32 nColor = Color( COL_AUTO ).GetColor(); if(pColorAny) *pColorAny >>= nColor; @@ -212,7 +212,7 @@ void VPolarAngleAxis::createShapes() uno::Reference< drawing::XShape > xShape = m_pShapeFactory->createLine2D( m_xGroupShape_Shapes, aPoints, &m_aAxisProperties.m_aLineProperties ); //because of this name this line will be used for marking the axis - m_pShapeFactory->setShapeName( xShape, C2U("MarkHandles") ); + m_pShapeFactory->setShapeName( xShape, "MarkHandles" ); //----------------------------------------- //create labels diff --git a/chart2/source/view/axes/VPolarGrid.cxx b/chart2/source/view/axes/VPolarGrid.cxx index dc05b79f4618..fb485e3623bb 100644 --- a/chart2/source/view/axes/VPolarGrid.cxx +++ b/chart2/source/view/axes/VPolarGrid.cxx @@ -154,7 +154,7 @@ void VPolarGrid::create2DAngleGrid( const Reference< drawing::XShapes >& xLogicT Reference< drawing::XShape > xShape = m_pShapeFactory->createLine2D( xMainTarget, aAllPoints, &rLinePropertiesList[nDepth] ); //because of this name this line will be used for marking - m_pShapeFactory->setShapeName( xShape, C2U("MarkHandles") ); + m_pShapeFactory->setShapeName( xShape, "MarkHandles" ); } } #endif @@ -218,7 +218,7 @@ void VPolarGrid::create2DRadiusGrid( const Reference< drawing::XShapes >& xLogic Reference< drawing::XShape > xShape = m_pShapeFactory->createLine2D( xTarget, aAllPoints, &rLinePropertiesList[nDepth] ); //because of this name this line will be used for marking - m_pShapeFactory->setShapeName( xShape, C2U("MarkHandles") ); + m_pShapeFactory->setShapeName( xShape, "MarkHandles" ); } } diff --git a/chart2/source/view/charttypes/BarChart.cxx b/chart2/source/view/charttypes/BarChart.cxx index 5058bc644896..c78a495506d3 100644 --- a/chart2/source/view/charttypes/BarChart.cxx +++ b/chart2/source/view/charttypes/BarChart.cxx @@ -53,8 +53,8 @@ BarChart::BarChart( const uno::Reference<XChartType>& xChartTypeModel { if( m_xChartTypeModelProps.is() ) { - m_xChartTypeModelProps->getPropertyValue( C2U( "OverlapSequence" ) ) >>= m_aOverlapSequence; - m_xChartTypeModelProps->getPropertyValue( C2U( "GapwidthSequence" ) ) >>= m_aGapwidthSequence; + m_xChartTypeModelProps->getPropertyValue( "OverlapSequence" ) >>= m_aOverlapSequence; + m_xChartTypeModelProps->getPropertyValue( "GapwidthSequence" ) >>= m_aGapwidthSequence; } } catch( const uno::Exception& e ) @@ -276,7 +276,7 @@ uno::Reference< drawing::XShape > BarChart::createDataPoint3D_Bar( if( xObjectProperties.is() ) { sal_Int16 nPercentDiagonal = 0; - xObjectProperties->getPropertyValue( C2U( "PercentDiagonal" ) ) >>= nPercentDiagonal; + xObjectProperties->getPropertyValue( "PercentDiagonal" ) >>= nPercentDiagonal; if( nPercentDiagonal < 5 ) bRoundedEdges = false; } @@ -639,7 +639,7 @@ void BarChart::createShapes() sal_Int32 nGeometry3D = DataPointGeometry3D::CUBOID; if(m_nDimension==3) try { - xDataPointProperties->getPropertyValue( C2U( "Geometry3D" )) >>= nGeometry3D; + xDataPointProperties->getPropertyValue( "Geometry3D") >>= nGeometry3D; } catch( const uno::Exception& e ) { diff --git a/chart2/source/view/charttypes/BubbleChart.cxx b/chart2/source/view/charttypes/BubbleChart.cxx index 9177babffce6..0352621b3ca4 100644 --- a/chart2/source/view/charttypes/BubbleChart.cxx +++ b/chart2/source/view/charttypes/BubbleChart.cxx @@ -333,7 +333,7 @@ void BubbleChart::createShapes() , pSeries->getPropertiesOfPoint( nIndex ) , PropertyMapper::getPropertyNameMapForFilledSeriesProperties() ); - m_pShapeFactory->setShapeName( xShape, C2U("MarkHandles") ); + m_pShapeFactory->setShapeName( xShape, "MarkHandles" ); } //create data point label diff --git a/chart2/source/view/charttypes/CandleStickChart.cxx b/chart2/source/view/charttypes/CandleStickChart.cxx index 5a9787f7b5d5..ad1a16405a22 100644 --- a/chart2/source/view/charttypes/CandleStickChart.cxx +++ b/chart2/source/view/charttypes/CandleStickChart.cxx @@ -127,13 +127,13 @@ void CandleStickChart::createShapes() { if( m_xChartTypeModelProps.is() ) { - m_xChartTypeModelProps->getPropertyValue( C2U( "ShowFirst" ) ) >>= bShowFirst; + m_xChartTypeModelProps->getPropertyValue( "ShowFirst" ) >>= bShowFirst; uno::Reference< beans::XPropertySet > xWhiteDayProps(0); uno::Reference< beans::XPropertySet > xBlackDayProps(0); - m_xChartTypeModelProps->getPropertyValue( C2U( "Japanese" ) ) >>= bJapaneseStyle; - m_xChartTypeModelProps->getPropertyValue( C2U( "WhiteDay" ) ) >>= xWhiteDayProps; - m_xChartTypeModelProps->getPropertyValue( C2U( "BlackDay" ) ) >>= xBlackDayProps; + m_xChartTypeModelProps->getPropertyValue( "Japanese" ) >>= bJapaneseStyle; + m_xChartTypeModelProps->getPropertyValue( "WhiteDay" ) >>= xWhiteDayProps; + m_xChartTypeModelProps->getPropertyValue( "BlackDay" ) >>= xBlackDayProps; tPropertyNameValueMap aWhiteBox_Map; PropertyMapper::getValueMap( aWhiteBox_Map, PropertyMapper::getPropertyNameMapForFillAndLineProperties(), xWhiteDayProps ); @@ -260,7 +260,7 @@ void CandleStickChart::createShapes() sal_Int32 nLineIndex =0; AddPointToPoly( aPoly, aPosMiddleMinimum, nLineIndex); AddPointToPoly( aPoly, aPosMiddleMaximum, nLineIndex); - xProp->setPropertyValue( C2U( UNO_NAME_POLYPOLYGON ), uno::makeAny( PolyToPointSequence(aPoly) ) ); + xProp->setPropertyValue( UNO_NAME_POLYPOLYGON, uno::makeAny( PolyToPointSequence(aPoly) ) ); } this->setMappedProperties( xShape, xPointProp, PropertyMapper::getPropertyNameMapForLineSeriesProperties() ); } @@ -315,7 +315,7 @@ void CandleStickChart::createShapes() uno::Reference< beans::XPropertySet > xProp( xShape, uno::UNO_QUERY ); if(xProp.is()) { - xProp->setPropertyValue( C2U( UNO_NAME_POLYPOLYGON ), uno::makeAny( PolyToPointSequence(aPoly) ) ); + xProp->setPropertyValue( UNO_NAME_POLYPOLYGON, uno::makeAny( PolyToPointSequence(aPoly) ) ); this->setMappedProperties( xShape, xPointProp, PropertyMapper::getPropertyNameMapForLineSeriesProperties() ); } } diff --git a/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx index e8fc6892d89d..b5c307a86c87 100644 --- a/chart2/source/view/charttypes/PieChart.cxx +++ b/chart2/source/view/charttypes/PieChart.cxx @@ -124,7 +124,7 @@ PieChart::PieChart( const uno::Reference<XChartType>& xChartTypeModel uno::Reference< beans::XPropertySet > xChartTypeProps( xChartTypeModel, uno::UNO_QUERY ); if( xChartTypeProps.is() ) try { - xChartTypeProps->getPropertyValue( C2U( "UseRings" )) >>= m_bUseRings; + xChartTypeProps->getPropertyValue( "UseRings") >>= m_bUseRings; if( m_bUseRings ) { m_pPosHelper->m_fRadiusOffset = 1.0; @@ -245,14 +245,14 @@ double PieChart::getMaxOffset() return m_fMaxOffset; double fExplodePercentage=0.0; - xSeriesProp->getPropertyValue( C2U( "Offset" )) >>= fExplodePercentage; + xSeriesProp->getPropertyValue( "Offset") >>= fExplodePercentage; if(fExplodePercentage>m_fMaxOffset) m_fMaxOffset=fExplodePercentage; if(!m_bSizeExcludesLabelsAndExplodedSegments) { uno::Sequence< sal_Int32 > aAttributedDataPointIndexList; - if( xSeriesProp->getPropertyValue( C2U( "AttributedDataPoints" ) ) >>= aAttributedDataPointIndexList ) + if( xSeriesProp->getPropertyValue( "AttributedDataPoints" ) >>= aAttributedDataPointIndexList ) { for(sal_Int32 nN=aAttributedDataPointIndexList.getLength();nN--;) { @@ -260,7 +260,7 @@ double PieChart::getMaxOffset() if(xPointProp.is()) { fExplodePercentage=0.0; - xPointProp->getPropertyValue( C2U( "Offset" )) >>= fExplodePercentage; + xPointProp->getPropertyValue( "Offset") >>= fExplodePercentage; if(fExplodePercentage>m_fMaxOffset) m_fMaxOffset=fExplodePercentage; } @@ -404,7 +404,7 @@ void PieChart::createShapes() bool bDoExplode = ( nExplodeableSlot == static_cast< ::std::vector< VDataSeriesGroup >::size_type >(fSlotX) ); if(bDoExplode) try { - xPointProperties->getPropertyValue( C2U( "Offset" )) >>= fExplodePercentage; + xPointProperties->getPropertyValue( "Offset") >>= fExplodePercentage; } catch( const uno::Exception& e ) { @@ -425,7 +425,7 @@ void PieChart::createShapes() if(!pSeries->hasPointOwnColor(nPointIndex) && m_xColorScheme.is()) { apOverwritePropertiesMap.reset( new tPropertyNameValueMap() ); - (*apOverwritePropertiesMap)[C2U("FillColor")] = uno::makeAny( + (*apOverwritePropertiesMap)["FillColor"] = uno::makeAny( m_xColorScheme->getColorByIndex( nPointIndex )); } } @@ -857,7 +857,7 @@ void PieChart::rearrangeLabelToAvoidOverlapIfRequested( const awt::Size& rPageSi if( xProp.is() ) { sal_Int32 nColor = 0; - xProp->getPropertyValue(C2U("CharColor")) >>= nColor; + xProp->getPropertyValue("CharColor") >>= nColor; if( nColor != -1 )//automatic font color does not work for lines -> fallback to black aVLineProperties.Color = uno::makeAny(nColor); } diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx index 533638d78935..3caa6604f673 100644 --- a/chart2/source/view/charttypes/VSeriesPlotter.cxx +++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx @@ -454,7 +454,7 @@ uno::Reference< drawing::XShape > VSeriesPlotter::createDataLabel( const uno::Re { uno::Reference< beans::XPropertySet > xProps( rDataSeries.getPropertiesOfPoint( nPointIndex ) ); if( xProps.is() ) - xProps->getPropertyValue( C2U( "CharHeight" )) >>= fViewFontSize; + xProps->getPropertyValue( "CharHeight") >>= fViewFontSize; // pt -> 1/100th mm fViewFontSize *= (2540.0f / 72.0f); } @@ -485,15 +485,15 @@ uno::Reference< drawing::XShape > VSeriesPlotter::createDataLabel( const uno::Re uno::Reference< beans::XPropertySet > xPointProps( rDataSeries.getPropertiesOfPoint( nPointIndex ) ); if(xPointProps.is()) { - xPointProps->getPropertyValue( C2U( "LabelSeparator" ) ) >>= aSeparator; - xPointProps->getPropertyValue( C2U( "TextRotation" ) ) >>= fRotationDegrees; + xPointProps->getPropertyValue( "LabelSeparator" ) >>= aSeparator; + xPointProps->getPropertyValue( "TextRotation" ) >>= fRotationDegrees; } } catch( const uno::Exception& e ) { ASSERT_EXCEPTION( e ); } - bool bMultiLineLabel = aSeparator.equals(C2U("\n"));; + bool bMultiLineLabel = aSeparator.equals("\n");; sal_Int32 nLineCountForSymbolsize = 0; { if(pLabel->ShowCategoryName) @@ -564,7 +564,7 @@ uno::Reference< drawing::XShape > VSeriesPlotter::createDataLabel( const uno::Re const double fDegreesPi( fRotationDegrees * ( F_PI / -180.0 ) ); uno::Reference< beans::XPropertySet > xProp( xTextShape, uno::UNO_QUERY ); if( xProp.is() ) - xProp->setPropertyValue( C2U( "Transformation" ), ShapeFactory::makeTransformation( aScreenPosition2D, fDegreesPi ) ); + xProp->setPropertyValue( "Transformation", ShapeFactory::makeTransformation( aScreenPosition2D, fDegreesPi ) ); LabelPositionHelper::correctPositionForRotation( xTextShape, eAlignment, fRotationDegrees, true /*bRotateAroundCenter*/ ); } @@ -642,8 +642,8 @@ double lcl_getErrorBarLogicLength( { double fPercent = 0; if( xProp->getPropertyValue( bPositive - ? C2U("PositiveError") - : C2U("NegativeError")) >>= fPercent ) + ? "PositiveError" + : "NegativeError") >>= fPercent ) { if( nIndex >=0 && nIndex < rData.getLength() && ! ::rtl::math::isNan( rData[nIndex] ) && @@ -656,16 +656,16 @@ double lcl_getErrorBarLogicLength( break; case ::com::sun::star::chart::ErrorBarStyle::ABSOLUTE: xProp->getPropertyValue( bPositive - ? C2U("PositiveError") - : C2U("NegativeError")) >>= fResult; + ? "PositiveError" + : "NegativeError") >>= fResult; break; case ::com::sun::star::chart::ErrorBarStyle::ERROR_MARGIN: { // todo: check if this is really what's called error-margin double fPercent = 0; if( xProp->getPropertyValue( bPositive - ? C2U("PositiveError") - : C2U("NegativeError")) >>= fPercent ) + ? "PositiveError" + : "NegativeError") >>= fPercent ) { double fMaxValue; ::rtl::math::setInf(&fMaxValue, true); @@ -801,9 +801,9 @@ void VSeriesPlotter::createErrorBar( sal_Bool bShowNegative = sal_False; sal_Int32 nErrorBarStyle = ::com::sun::star::chart::ErrorBarStyle::VARIANCE; - xErrorBarProperties->getPropertyValue( C2U( "ShowPositiveError" )) >>= bShowPositive; - xErrorBarProperties->getPropertyValue( C2U( "ShowNegativeError" )) >>= bShowNegative; - xErrorBarProperties->getPropertyValue( C2U( "ErrorBarStyle" )) >>= nErrorBarStyle; + xErrorBarProperties->getPropertyValue( "ShowPositiveError") >>= bShowPositive; + xErrorBarProperties->getPropertyValue( "ShowNegativeError") >>= bShowNegative; + xErrorBarProperties->getPropertyValue( "ErrorBarStyle") >>= nErrorBarStyle; if(!bShowPositive && !bShowNegative) return; @@ -1050,7 +1050,7 @@ void VSeriesPlotter::createRegressionCurvesShapes( VDataSeries& rVDataSeries createGroupShape( xTarget, rVDataSeries.getDataCurveCID( nN, bAverageLine ) ); uno::Reference< drawing::XShape > xShape = m_pShapeFactory->createLine2D( xRegressionGroupShapes, PolyToPointSequence( aRegressionPoly ), &aVLineProperties ); - m_pShapeFactory->setShapeName( xShape, C2U("MarkHandles") ); + m_pShapeFactory->setShapeName( xShape, "MarkHandles" ); aDefaultPos = xShape->getPosition(); } @@ -1080,15 +1080,15 @@ void VSeriesPlotter::createRegressionCurveEquationShapes( bool bShowEquation = false; bool bShowCorrCoeff = false; OUString aSep( sal_Unicode('\n')); - if(( xEquationProperties->getPropertyValue( C2U("ShowEquation")) >>= bShowEquation ) && - ( xEquationProperties->getPropertyValue( C2U("ShowCorrelationCoefficient")) >>= bShowCorrCoeff )) + if(( xEquationProperties->getPropertyValue( "ShowEquation") >>= bShowEquation ) && + ( xEquationProperties->getPropertyValue( "ShowCorrelationCoefficient") >>= bShowCorrCoeff )) { if( ! (bShowEquation || bShowCorrCoeff)) return; ::rtl::OUStringBuffer aFormula; sal_Int32 nNumberFormatKey = 0; - xEquationProperties->getPropertyValue( C2U("NumberFormat")) >>= nNumberFormatKey; + xEquationProperties->getPropertyValue( "NumberFormat") >>= nNumberFormatKey; if( bShowEquation ) { @@ -1112,7 +1112,7 @@ void VSeriesPlotter::createRegressionCurveEquationShapes( { aFormula.append( sal_Unicode( 'R' )); aFormula.append( sal_Unicode( 0x00b2 )); - aFormula.append( C2U( " = " )); + aFormula.append( " = "); double fR( xRegressionCurveCalculator->getCorrelationCoefficient()); if( m_apNumberFormatterWrapper.get()) { @@ -1133,7 +1133,7 @@ void VSeriesPlotter::createRegressionCurveEquationShapes( awt::Point aScreenPosition2D; chart2::RelativePosition aRelativePosition; - if( xEquationProperties->getPropertyValue( C2U("RelativePosition")) >>= aRelativePosition ) + if( xEquationProperties->getPropertyValue( "RelativePosition") >>= aRelativePosition ) { //@todo decide whether x is primary or secondary double fX = aRelativePosition.Primary*m_aPageReferenceSize.Width; @@ -2071,7 +2071,7 @@ bool lcl_HasVisibleLine( const uno::Reference< beans::XPropertySet >& xProps, bo bool bHasVisibleLine = false; rbHasDashedLine = false; drawing::LineStyle aLineStyle = drawing::LineStyle_NONE; - if( xProps.is() && ( xProps->getPropertyValue( C2U("LineStyle")) >>= aLineStyle ) ) + if( xProps.is() && ( xProps->getPropertyValue( "LineStyle") >>= aLineStyle ) ) { if( aLineStyle != drawing::LineStyle_NONE ) bHasVisibleLine = true; @@ -2235,7 +2235,7 @@ Reference< drawing::XShape > VSeriesPlotter::createLegendSymbolForPoint( OSL_ASSERT( xPointSet.is()); xPointSet->setPropertyValue( - C2U("Color"), uno::makeAny( m_xColorScheme->getColorByIndex( nPointIndex ))); + "Color", uno::makeAny( m_xColorScheme->getColorByIndex( nPointIndex ))); } } @@ -2319,7 +2319,7 @@ std::vector< ViewLegendEntry > VSeriesPlotter::createLegendEntriesForSeries( } // label - aLabelText = ( DataSeriesHelper::getDataSeriesLabel( rSeries.getModel(), m_xChartTypeModel.is() ? m_xChartTypeModel->getRoleOfSequenceForSeriesLabel() : C2U("values-y")) ); + aLabelText = ( DataSeriesHelper::getDataSeriesLabel( rSeries.getModel(), m_xChartTypeModel.is() ? m_xChartTypeModel->getRoleOfSequenceForSeriesLabel() : "values-y") ); aEntry.aLabel = FormattedStringHelper::createFormattedStringSequence( xContext, aLabelText, xTextProperties ); aResult.push_back(aEntry); @@ -2341,7 +2341,7 @@ std::vector< ViewLegendEntry > VSeriesPlotter::createLegendEntriesForSeries( { //label OUString aResStr( RegressionCurveHelper::getUINameForRegressionCurve( aCurves[i] ) ); - replaceParamterInString( aResStr, C2U("%SERIESNAME"), aLabelText ); + replaceParamterInString( aResStr, "%SERIESNAME", aLabelText ); aEntry.aLabel = FormattedStringHelper::createFormattedStringSequence( xContext, aResStr, xTextProperties ); // symbol diff --git a/chart2/source/view/diagram/VDiagram.cxx b/chart2/source/view/diagram/VDiagram.cxx index f3dd98ecdf32..4c26350b802f 100644 --- a/chart2/source/view/diagram/VDiagram.cxx +++ b/chart2/source/view/diagram/VDiagram.cxx @@ -78,7 +78,7 @@ VDiagram::VDiagram( DiagramHelper::getChartTypeByIndex( m_xDiagram, 0 ) ) ) { if(xSourceProp.is()) - xSourceProp->getPropertyValue(C2U( "RightAngledAxes" )) >>= m_bRightAngledAxes; + xSourceProp->getPropertyValue("RightAngledAxes") >>= m_bRightAngledAxes; if( m_bRightAngledAxes ) { ThreeDHelper::adaptRadAnglesForRightAngledAxes( m_fXAnglePi, m_fYAnglePi ); @@ -167,11 +167,11 @@ void VDiagram::createShapes_2d() uno::Reference< drawing::XShapes > xOuterGroup_Shapes = m_pShapeFactory->createGroup2D(m_xLogicTarget); m_xOuterGroupShape = uno::Reference<drawing::XShape>( xOuterGroup_Shapes, uno::UNO_QUERY ); - uno::Reference< drawing::XShapes > xGroupForWall( m_pShapeFactory->createGroup2D(xOuterGroup_Shapes,C2U("PlotAreaExcludingAxes")) ); + uno::Reference< drawing::XShapes > xGroupForWall( m_pShapeFactory->createGroup2D(xOuterGroup_Shapes,"PlotAreaExcludingAxes") ); //create independent group shape as container for datapoints and such things { - uno::Reference< drawing::XShapes > xShapes = m_pShapeFactory->createGroup2D(xOuterGroup_Shapes,C2U("testonly;CooContainer=XXX_CID")); + uno::Reference< drawing::XShapes > xShapes = m_pShapeFactory->createGroup2D(xOuterGroup_Shapes,"testonly;CooContainer=XXX_CID"); m_xCoordinateRegionShape = uno::Reference<drawing::XShape>( xShapes, uno::UNO_QUERY ); } @@ -181,8 +181,8 @@ void VDiagram::createShapes_2d() //add back wall { m_xWall2D = uno::Reference< drawing::XShape >( - m_xShapeFactory->createInstance( C2U( - "com.sun.star.drawing.RectangleShape" ) ), uno::UNO_QUERY ); + m_xShapeFactory->createInstance( + "com.sun.star.drawing.RectangleShape" ), uno::UNO_QUERY ); xGroupForWall->add(m_xWall2D); uno::Reference< beans::XPropertySet > xProp( m_xWall2D, uno::UNO_QUERY ); @@ -207,7 +207,7 @@ void VDiagram::createShapes_2d() { //CID for selection handling rtl::OUString aWallCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, rtl::OUString() ) );//@todo read CID from model - xProp->setPropertyValue( C2U( UNO_NAME_MISC_OBJ_NAME ), uno::makeAny( aWallCID ) ); + xProp->setPropertyValue( UNO_NAME_MISC_OBJ_NAME, uno::makeAny( aWallCID ) ); } } catch( const uno::Exception& e ) @@ -245,56 +245,56 @@ void lcl_setLightSources( const uno::Reference< beans::XPropertySet > & xSource, const uno::Reference< beans::XPropertySet > & xDest ) { - xDest->setPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTON_1 ), - xSource->getPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTON_1 ))); - xDest->setPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTON_2 ), - xSource->getPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTON_2 ))); - xDest->setPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTON_3 ), - xSource->getPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTON_3 ))); - xDest->setPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTON_4 ), - xSource->getPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTON_4 ))); - xDest->setPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTON_5 ), - xSource->getPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTON_5 ))); - xDest->setPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTON_6 ), - xSource->getPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTON_6 ))); - xDest->setPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTON_7 ), - xSource->getPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTON_7 ))); - xDest->setPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTON_8 ), - xSource->getPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTON_8 ))); - - xDest->setPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTDIRECTION_1 ), - xSource->getPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTDIRECTION_1 ))); - xDest->setPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTDIRECTION_2 ), - xSource->getPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTDIRECTION_2 ))); - xDest->setPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTDIRECTION_3 ), - xSource->getPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTDIRECTION_3 ))); - xDest->setPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTDIRECTION_4 ), - xSource->getPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTDIRECTION_4 ))); - xDest->setPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTDIRECTION_5 ), - xSource->getPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTDIRECTION_5 ))); - xDest->setPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTDIRECTION_6 ), - xSource->getPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTDIRECTION_6 ))); - xDest->setPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTDIRECTION_7 ), - xSource->getPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTDIRECTION_7 ))); - xDest->setPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTDIRECTION_8 ), - xSource->getPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTDIRECTION_8 ))); - - xDest->setPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTCOLOR_1 ), - xSource->getPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTCOLOR_1 ))); - xDest->setPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTCOLOR_2 ), - xSource->getPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTCOLOR_2 ))); - xDest->setPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTCOLOR_3 ), - xSource->getPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTCOLOR_3 ))); - xDest->setPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTCOLOR_4 ), - xSource->getPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTCOLOR_4 ))); - xDest->setPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTCOLOR_5 ), - xSource->getPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTCOLOR_5 ))); - xDest->setPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTCOLOR_6 ), - xSource->getPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTCOLOR_6 ))); - xDest->setPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTCOLOR_7 ), - xSource->getPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTCOLOR_7 ))); - xDest->setPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTCOLOR_8 ), - xSource->getPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTCOLOR_8 ))); + xDest->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_1, + xSource->getPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_1)); + xDest->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_2, + xSource->getPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_2)); + xDest->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_3, + xSource->getPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_3)); + xDest->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_4, + xSource->getPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_4)); + xDest->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_5, + xSource->getPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_5)); + xDest->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_6, + xSource->getPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_6)); + xDest->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_7, + xSource->getPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_7)); + xDest->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_8, + xSource->getPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_8)); + + xDest->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTDIRECTION_1, + xSource->getPropertyValue( UNO_NAME_3D_SCENE_LIGHTDIRECTION_1)); + xDest->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTDIRECTION_2, + xSource->getPropertyValue( UNO_NAME_3D_SCENE_LIGHTDIRECTION_2)); + xDest->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTDIRECTION_3, + xSource->getPropertyValue( UNO_NAME_3D_SCENE_LIGHTDIRECTION_3)); + xDest->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTDIRECTION_4, + xSource->getPropertyValue( UNO_NAME_3D_SCENE_LIGHTDIRECTION_4)); + xDest->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTDIRECTION_5, + xSource->getPropertyValue( UNO_NAME_3D_SCENE_LIGHTDIRECTION_5)); + xDest->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTDIRECTION_6, + xSource->getPropertyValue( UNO_NAME_3D_SCENE_LIGHTDIRECTION_6)); + xDest->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTDIRECTION_7, + xSource->getPropertyValue( UNO_NAME_3D_SCENE_LIGHTDIRECTION_7)); + xDest->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTDIRECTION_8, + xSource->getPropertyValue( UNO_NAME_3D_SCENE_LIGHTDIRECTION_8)); + + xDest->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTCOLOR_1, + xSource->getPropertyValue( UNO_NAME_3D_SCENE_LIGHTCOLOR_1)); + xDest->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTCOLOR_2, + xSource->getPropertyValue( UNO_NAME_3D_SCENE_LIGHTCOLOR_2)); + xDest->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTCOLOR_3, + xSource->getPropertyValue( UNO_NAME_3D_SCENE_LIGHTCOLOR_3)); + xDest->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTCOLOR_4, + xSource->getPropertyValue( UNO_NAME_3D_SCENE_LIGHTCOLOR_4)); + xDest->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTCOLOR_5, + xSource->getPropertyValue( UNO_NAME_3D_SCENE_LIGHTCOLOR_5)); + xDest->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTCOLOR_6, + xSource->getPropertyValue( UNO_NAME_3D_SCENE_LIGHTCOLOR_6)); + xDest->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTCOLOR_7, + xSource->getPropertyValue( UNO_NAME_3D_SCENE_LIGHTCOLOR_7)); + xDest->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTCOLOR_8, + xSource->getPropertyValue( UNO_NAME_3D_SCENE_LIGHTCOLOR_8)); } namespace @@ -453,7 +453,7 @@ void VDiagram::adjustAspectRatio3d( const awt::Size& rAvailableSize ) // and in it's destructor, calculates a new 2D SnapRect for the scene and it's modified 3D geometry. E3DModifySceneSnapRectUpdater aUpdater(lcl_getE3dScene( m_xOuterGroupShape )); - m_xAspectRatio3D->setPropertyValue( C2U( UNO_NAME_3D_TRANSFORM_MATRIX ) + m_xAspectRatio3D->setPropertyValue( UNO_NAME_3D_TRANSFORM_MATRIX , uno::makeAny(BaseGFXHelper::B3DHomMatrixToHomogenMatrix( aResult )) ); } catch( const uno::Exception& e ) @@ -488,9 +488,9 @@ void VDiagram::createShapes_3d() //create shape m_xOuterGroupShape = uno::Reference< drawing::XShape >( - m_xShapeFactory->createInstance( C2U( - "com.sun.star.drawing.Shape3DSceneObject" ) ), uno::UNO_QUERY ); - ShapeFactory::setShapeName( m_xOuterGroupShape, C2U("PlotAreaExcludingAxes") ); + m_xShapeFactory->createInstance( + "com.sun.star.drawing.Shape3DSceneObject" ), uno::UNO_QUERY ); + ShapeFactory::setShapeName( m_xOuterGroupShape, "PlotAreaExcludingAxes" ); m_xLogicTarget->add(m_xOuterGroupShape); uno::Reference< drawing::XShapes > xOuterGroup_Shapes = @@ -591,20 +591,20 @@ void VDiagram::createShapes_3d() { //ignore distance and focal length from file format and model comcpletely //use vrp only to indicate the distance of the camera and thus influence the perspecitve - xDestProp->setPropertyValue( C2U( UNO_NAME_3D_SCENE_DISTANCE ), uno::makeAny( + xDestProp->setPropertyValue( UNO_NAME_3D_SCENE_DISTANCE, uno::makeAny( static_cast<sal_Int32>(ThreeDHelper::getCameraDistance( xSourceProp )))); - xDestProp->setPropertyValue( C2U( UNO_NAME_3D_SCENE_PERSPECTIVE ), - xSourceProp->getPropertyValue( C2U( UNO_NAME_3D_SCENE_PERSPECTIVE ))); + xDestProp->setPropertyValue( UNO_NAME_3D_SCENE_PERSPECTIVE, + xSourceProp->getPropertyValue( UNO_NAME_3D_SCENE_PERSPECTIVE)); } //light { - xDestProp->setPropertyValue( C2U( UNO_NAME_3D_SCENE_SHADE_MODE ), - xSourceProp->getPropertyValue( C2U( UNO_NAME_3D_SCENE_SHADE_MODE ))); - xDestProp->setPropertyValue( C2U( UNO_NAME_3D_SCENE_AMBIENTCOLOR ), - xSourceProp->getPropertyValue( C2U( UNO_NAME_3D_SCENE_AMBIENTCOLOR ))); - xDestProp->setPropertyValue( C2U( UNO_NAME_3D_SCENE_TWO_SIDED_LIGHTING ), - xSourceProp->getPropertyValue( C2U( UNO_NAME_3D_SCENE_TWO_SIDED_LIGHTING ))); + xDestProp->setPropertyValue( UNO_NAME_3D_SCENE_SHADE_MODE, + xSourceProp->getPropertyValue( UNO_NAME_3D_SCENE_SHADE_MODE)); + xDestProp->setPropertyValue( UNO_NAME_3D_SCENE_AMBIENTCOLOR, + xSourceProp->getPropertyValue( UNO_NAME_3D_SCENE_AMBIENTCOLOR)); + xDestProp->setPropertyValue( UNO_NAME_3D_SCENE_TWO_SIDED_LIGHTING, + xSourceProp->getPropertyValue( UNO_NAME_3D_SCENE_TWO_SIDED_LIGHTING)); lcl_setLightSources( xSourceProp, xDestProp ); } @@ -624,7 +624,7 @@ void VDiagram::createShapes_3d() //#i98497# 3D charts are rendered with wrong size E3DModifySceneSnapRectUpdater aUpdater(lcl_getE3dScene( m_xOuterGroupShape )); - xDestProp->setPropertyValue( C2U( UNO_NAME_3D_TRANSFORM_MATRIX ), + xDestProp->setPropertyValue( UNO_NAME_3D_TRANSFORM_MATRIX, uno::makeAny( BaseGFXHelper::B3DHomMatrixToHomogenMatrix( aEffectiveTranformation ) ) ); } } @@ -665,7 +665,7 @@ void VDiagram::createShapes_3d() //create an additional scene for the smaller inner coordinate region: { - uno::Reference< drawing::XShapes > xShapes = m_pShapeFactory->createGroup3D( xOuterGroup_Shapes,C2U("testonly;CooContainer=XXX_CID") ); + uno::Reference< drawing::XShapes > xShapes = m_pShapeFactory->createGroup3D( xOuterGroup_Shapes,"testonly;CooContainer=XXX_CID" ); m_xCoordinateRegionShape = uno::Reference< drawing::XShape >( xShapes, uno::UNO_QUERY ); uno::Reference< beans::XPropertySet > xShapeProp( m_xCoordinateRegionShape, uno::UNO_QUERY ); @@ -682,7 +682,7 @@ void VDiagram::createShapes_3d() aM.translate(GRID_TO_WALL_DISTANCE/fXScale, GRID_TO_WALL_DISTANCE/fYScale, GRID_TO_WALL_DISTANCE/fZScale); aM.scale( fXScale, fYScale, fZScale ); E3DModifySceneSnapRectUpdater aUpdater(lcl_getE3dScene( m_xOuterGroupShape )); - xShapeProp->setPropertyValue( C2U( UNO_NAME_3D_TRANSFORM_MATRIX ) + xShapeProp->setPropertyValue( UNO_NAME_3D_TRANSFORM_MATRIX , uno::makeAny(BaseGFXHelper::B3DHomMatrixToHomogenMatrix(aM)) ); } catch( const uno::Exception& e ) diff --git a/chart2/source/view/main/ChartItemPool.cxx b/chart2/source/view/main/ChartItemPool.cxx index e60f3345c2ca..8847ffad4ac4 100644 --- a/chart2/source/view/main/ChartItemPool.cxx +++ b/chart2/source/view/main/ChartItemPool.cxx @@ -49,7 +49,7 @@ ChartItemPool::ChartItemPool(): ppPoolDefaults[SCHATTR_DATADESCR_SHOW_PERCENTAGE- SCHATTR_START] = new SfxBoolItem(SCHATTR_DATADESCR_SHOW_PERCENTAGE); ppPoolDefaults[SCHATTR_DATADESCR_SHOW_CATEGORY - SCHATTR_START] = new SfxBoolItem(SCHATTR_DATADESCR_SHOW_CATEGORY); ppPoolDefaults[SCHATTR_DATADESCR_SHOW_SYMBOL - SCHATTR_START] = new SfxBoolItem(SCHATTR_DATADESCR_SHOW_SYMBOL); - ppPoolDefaults[SCHATTR_DATADESCR_SEPARATOR - SCHATTR_START] = new SfxStringItem(SCHATTR_DATADESCR_SEPARATOR,C2U(" ")); + ppPoolDefaults[SCHATTR_DATADESCR_SEPARATOR - SCHATTR_START] = new SfxStringItem(SCHATTR_DATADESCR_SEPARATOR," "); ppPoolDefaults[SCHATTR_DATADESCR_PLACEMENT - SCHATTR_START] = new SfxInt32Item(SCHATTR_DATADESCR_PLACEMENT,0); ppPoolDefaults[SCHATTR_DATADESCR_AVAILABLE_PLACEMENTS - SCHATTR_START] = new SfxIntegerListItem(SCHATTR_DATADESCR_AVAILABLE_PLACEMENTS, ::std::vector < sal_Int32 >() ); ppPoolDefaults[SCHATTR_DATADESCR_NO_PERCENTVALUE - SCHATTR_START] = new SfxBoolItem(SCHATTR_DATADESCR_NO_PERCENTVALUE); diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index f2ace4a0c072..fed30c56ed91 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -247,46 +247,46 @@ void ChartView::getMetaFile( const uno::Reference< io::XOutputStream >& xOutStre // creating the graphic exporter uno::Reference< document::XExporter > xExporter( xFactory->createInstance( - C2U("com.sun.star.drawing.GraphicExportFilter")), uno::UNO_QUERY); + "com.sun.star.drawing.GraphicExportFilter"), uno::UNO_QUERY); uno::Reference< document::XFilter > xFilter( xExporter, uno::UNO_QUERY ); if( !xExporter.is() || !xFilter.is() ) return; uno::Sequence< beans::PropertyValue > aProps(3); - aProps[0].Name = C2U("FilterName"); - aProps[0].Value <<= C2U("SVM"); + aProps[0].Name = "FilterName"; + aProps[0].Value <<= OUString("SVM"); - aProps[1].Name = C2U("OutputStream"); + aProps[1].Name = "OutputStream"; aProps[1].Value <<= xOutStream; uno::Sequence< beans::PropertyValue > aFilterData(4); - aFilterData[0].Name = C2U("ExportOnlyBackground"); + aFilterData[0].Name = "ExportOnlyBackground"; aFilterData[0].Value <<= sal_False; - aFilterData[1].Name = C2U("HighContrast"); + aFilterData[1].Name = "HighContrast"; aFilterData[1].Value <<= bUseHighContrast; - aFilterData[2].Name = C2U("Version"); + aFilterData[2].Name = "Version"; const sal_Int32 nVersion = SOFFICE_FILEFORMAT_50; aFilterData[2].Value <<= nVersion; - aFilterData[3].Name = C2U("CurrentPage"); + aFilterData[3].Name = "CurrentPage"; aFilterData[3].Value <<= uno::Reference< uno::XInterface >( m_xDrawPage, uno::UNO_QUERY ); //#i75867# poor quality of ole's alternative view with 3D scenes and zoomfactors besides 100% { aFilterData.realloc( aFilterData.getLength()+4 ); - aFilterData[4].Name = C2U("ScaleXNumerator"); + aFilterData[4].Name = "ScaleXNumerator"; aFilterData[4].Value = uno::makeAny( m_nScaleXNumerator ); - aFilterData[5].Name = C2U("ScaleXDenominator"); + aFilterData[5].Name = "ScaleXDenominator"; aFilterData[5].Value = uno::makeAny( m_nScaleXDenominator ); - aFilterData[6].Name = C2U("ScaleYNumerator"); + aFilterData[6].Name = "ScaleYNumerator"; aFilterData[6].Value = uno::makeAny( m_nScaleYNumerator ); - aFilterData[7].Name = C2U("ScaleYDenominator"); + aFilterData[7].Name = "ScaleYDenominator"; aFilterData[7].Value = uno::makeAny( m_nScaleYDenominator ); } - aProps[2].Name = C2U("FilterData"); + aProps[2].Name = "FilterData"; aProps[2].Value <<= aFilterData; xExporter->setSourceDocument( uno::Reference< lang::XComponent >( m_xDrawPage, uno::UNO_QUERY) ); @@ -340,10 +340,10 @@ uno::Sequence< datatransfer::DataFlavor > SAL_CALL ChartView::getTransferDataFla uno::Sequence< datatransfer::DataFlavor > aRet(2); aRet[0] = datatransfer::DataFlavor( lcl_aGDIMetaFileMIMEType, - C2U( "GDIMetaFile" ), + "GDIMetaFile", ::getCppuType( (const uno::Sequence< sal_Int8 >*) NULL ) ); aRet[1] = datatransfer::DataFlavor( lcl_aGDIMetaFileMIMETypeHighContrast, - C2U( "GDIMetaFile" ), + "GDIMetaFile", ::getCppuType( (const uno::Sequence< sal_Int8 >*) NULL ) ); return aRet; @@ -624,11 +624,11 @@ void SeriesPlotterContainer::initializeCooSysAndSeriesPlotter( try { uno::Reference< beans::XPropertySet > xDiaProp( xDiagram, uno::UNO_QUERY_THROW ); - xDiaProp->getPropertyValue( C2U( "SortByXValues" ) ) >>= bSortByXValues; - xDiaProp->getPropertyValue( C2U( "ConnectBars" ) ) >>= bConnectBars; - xDiaProp->getPropertyValue( C2U( "GroupBarsPerAxis" ) ) >>= bGroupBarsPerAxis; - xDiaProp->getPropertyValue( C2U( "IncludeHiddenCells" ) ) >>= bIncludeHiddenCells; - xDiaProp->getPropertyValue( C2U( "StartingAngle" ) ) >>= nStartingAngle; + xDiaProp->getPropertyValue( "SortByXValues" ) >>= bSortByXValues; + xDiaProp->getPropertyValue( "ConnectBars" ) >>= bConnectBars; + xDiaProp->getPropertyValue( "GroupBarsPerAxis" ) >>= bGroupBarsPerAxis; + xDiaProp->getPropertyValue( "IncludeHiddenCells" ) >>= bIncludeHiddenCells; + xDiaProp->getPropertyValue( "StartingAngle" ) >>= nStartingAngle; } catch( const uno::Exception & ex ) { @@ -881,7 +881,7 @@ void SeriesPlotterContainer::setNumberFormatsFromAxes() if( xAxisProp.is()) { sal_Int32 nNumberFormatKey(0); - if( xAxisProp->getPropertyValue( C2U( "NumberFormat" ) ) >>= nNumberFormatKey ) + if( xAxisProp->getPropertyValue( "NumberFormat" ) >>= nNumberFormatKey ) { aAxesNumberFormats.setFormat( nNumberFormatKey, nDimensionIndex, nAxisIndex ); } @@ -1096,11 +1096,11 @@ void SeriesPlotterContainer::AdaptScaleOfYAxisWithoutAttachedSeries( const uno:: ::com::sun::star::chart::ChartAxisPosition eCrossingMainAxisPos( ::com::sun::star::chart::ChartAxisPosition_ZERO ); if( xCrossingMainAxis.is() ) { - xCrossingMainAxis->getPropertyValue(C2U( "CrossoverPosition" )) >>= eCrossingMainAxisPos; + xCrossingMainAxis->getPropertyValue("CrossoverPosition") >>= eCrossingMainAxisPos; if( ::com::sun::star::chart::ChartAxisPosition_VALUE == eCrossingMainAxisPos ) { double fValue = 0.0; - xCrossingMainAxis->getPropertyValue(C2U( "CrossoverValue" )) >>= fValue; + xCrossingMainAxis->getPropertyValue("CrossoverValue") >>= fValue; aExplicitScale.Origin = fValue; } else if( ::com::sun::star::chart::ChartAxisPosition_ZERO == eCrossingMainAxisPos ) @@ -1194,20 +1194,20 @@ void lcl_setDefaultWritingMode( ::boost::shared_ptr< DrawModelWrapper > pDrawMod uno::Reference< container::XNameAccess > xStylesFamilies( xStyleFamiliesSupplier->getStyleFamilies() ); if( xStylesFamilies.is() ) { - if( !xStylesFamilies->hasByName( C2U("PageStyles") ) ) + if( !xStylesFamilies->hasByName( "PageStyles" ) ) { //draw/impress is parent document uno::Reference< lang::XMultiServiceFactory > xFatcory( xParentProps, uno::UNO_QUERY ); if( xFatcory.is() ) { - uno::Reference< beans::XPropertySet > xDrawDefaults( xFatcory->createInstance( C2U( "com.sun.star.drawing.Defaults" ) ), uno::UNO_QUERY ); + uno::Reference< beans::XPropertySet > xDrawDefaults( xFatcory->createInstance( "com.sun.star.drawing.Defaults" ), uno::UNO_QUERY ); if( xDrawDefaults.is() ) - xDrawDefaults->getPropertyValue( C2U("WritingMode") ) >>= nWritingMode; + xDrawDefaults->getPropertyValue( "WritingMode" ) >>= nWritingMode; } } else { - uno::Reference< container::XNameAccess > xPageStyles( xStylesFamilies->getByName( C2U("PageStyles") ), uno::UNO_QUERY ); + uno::Reference< container::XNameAccess > xPageStyles( xStylesFamilies->getByName( "PageStyles" ), uno::UNO_QUERY ); if( xPageStyles.is() ) { rtl::OUString aPageStyle; @@ -1234,11 +1234,11 @@ void lcl_setDefaultWritingMode( ::boost::shared_ptr< DrawModelWrapper > pDrawMod { static rtl::OUString aChartCLSID = rtl::OUString( SvGlobalName( SO3_SCH_CLASSID ).GetHexName()); rtl::OUString aCLSID; - xEmbeddedProps->getPropertyValue( C2U("CLSID") ) >>= aCLSID; + xEmbeddedProps->getPropertyValue( "CLSID" ) >>= aCLSID; if( aCLSID.equals(aChartCLSID) ) { uno::Reference< frame::XModel > xModel; - xEmbeddedProps->getPropertyValue( C2U("Model") ) >>= xModel; + xEmbeddedProps->getPropertyValue( "Model" ) >>= xModel; if( xModel == xChartModel ) { uno::Reference< text::XTextContent > xEmbeddedObject( xEmbeddedProps, uno::UNO_QUERY ); @@ -1250,14 +1250,14 @@ void lcl_setDefaultWritingMode( ::boost::shared_ptr< DrawModelWrapper > pDrawMod uno::Reference< beans::XPropertySet > xAnchorProps( xAnchor, uno::UNO_QUERY ); if( xAnchorProps.is() ) { - xAnchorProps->getPropertyValue( C2U("WritingMode") ) >>= nWritingMode; + xAnchorProps->getPropertyValue( "WritingMode" ) >>= nWritingMode; } uno::Reference< text::XText > xText( xAnchor->getText() ); if( xText.is() ) { uno::Reference< beans::XPropertySet > xTextCursorProps( xText->createTextCursor(), uno::UNO_QUERY ); if( xTextCursorProps.is() ) - xTextCursorProps->getPropertyValue( C2U("PageStyleName") ) >>= aPageStyle; + xTextCursorProps->getPropertyValue( "PageStyleName" ) >>= aPageStyle; } } } @@ -1275,22 +1275,22 @@ void lcl_setDefaultWritingMode( ::boost::shared_ptr< DrawModelWrapper > pDrawMod { uno::Reference< beans::XPropertySet > xTextCursorProps( xText->createTextCursor(), uno::UNO_QUERY ); if( xTextCursorProps.is() ) - xTextCursorProps->getPropertyValue( C2U("PageStyleName") ) >>= aPageStyle; + xTextCursorProps->getPropertyValue( "PageStyleName" ) >>= aPageStyle; } } } else { //Calc is parent document - xParentProps->getPropertyValue( C2U("PageStyle") ) >>= aPageStyle; + xParentProps->getPropertyValue( "PageStyle" ) >>= aPageStyle; if(aPageStyle.isEmpty()) - aPageStyle = C2U("Default"); + aPageStyle = "Default"; } if( nWritingMode == -1 || nWritingMode == text::WritingMode2::PAGE ) { uno::Reference< beans::XPropertySet > xPageStyle( xPageStyles->getByName( aPageStyle ), uno::UNO_QUERY ); if( xPageStyle.is() ) - xPageStyle->getPropertyValue( C2U("WritingMode") ) >>= nWritingMode; + xPageStyle->getPropertyValue( "WritingMode" ) >>= nWritingMode; } } } @@ -1577,7 +1577,7 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer& if(bSnapRectToUsedArea) { if( bUseFixedInnerSize ) - m_aResultingDiagramRectangleExcludingAxes = getRectangleOfObject( C2U("PlotAreaExcludingAxes") ); + m_aResultingDiagramRectangleExcludingAxes = getRectangleOfObject( "PlotAreaExcludingAxes" ); else { ::basegfx::B2IRectangle aConsumedInnerRect = aVDiagram.getCurrentRectangle(); @@ -1602,7 +1602,7 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer& bool bPosSizeExcludeAxesProperty = true; uno::Reference< beans::XPropertySet > xDiaProps( xDiagram, uno::UNO_QUERY_THROW ); if( xDiaProps.is() ) - xDiaProps->getPropertyValue(C2U("PosSizeExcludeAxes")) >>= bPosSizeExcludeAxesProperty; + xDiaProps->getPropertyValue("PosSizeExcludeAxes") >>= bPosSizeExcludeAxesProperty; if( bUseFixedInnerSize || bPosSizeExcludeAxesProperty ) { aPos = awt::Point( m_aResultingDiagramRectangleExcludingAxes.X, m_aResultingDiagramRectangleExcludingAxes.Y ); @@ -1724,9 +1724,9 @@ awt::Rectangle ChartView::getRectangleOfObject( const rtl::OUString& rObjectCID, SdrObjList* pRootList = pRootSdrObject->GetSubList(); if( pRootList ) { - OUString aShapeName = C2U("MarkHandles"); + OUString aShapeName = "MarkHandles"; if( eObjectType == OBJECTTYPE_DIAGRAM ) - aShapeName = C2U("PlotAreaIncludingAxes"); + aShapeName = "PlotAreaIncludingAxes"; SdrObject* pShape = DrawModelWrapper::getNamedSdrObject( aShapeName, pRootList ); if( pShape ) xShape = uno::Reference< drawing::XShape >( pShape->getUnoShape(), uno::UNO_QUERY); @@ -1780,7 +1780,7 @@ bool lcl_getPropertySwapXAndYAxis( const uno::Reference< XDiagram >& xDiagram ) uno::Reference<beans::XPropertySet> xProp(aCooSysList[0], uno::UNO_QUERY ); if( xProp.is()) try { - xProp->getPropertyValue( C2U( "SwapXAndYAxis" ) ) >>= bSwapXAndY; + xProp->getPropertyValue( "SwapXAndYAxis" ) >>= bSwapXAndY; } catch( const uno::Exception& e ) { @@ -1813,7 +1813,7 @@ sal_Int32 ExplicitValueProvider::getExplicitNumberFormatKeyForDataLabel( if( !xSeriesOrPointProp.is() ) return nFormat; - rtl::OUString aPropName( C2U( "NumberFormat" ) ); + rtl::OUString aPropName( "NumberFormat" ); if( !(xSeriesOrPointProp->getPropertyValue(aPropName) >>= nFormat) ) { uno::Reference< chart2::XChartType > xChartType( DataSeriesHelper::getChartTypeOfSeries( xSeries, xDiagram ) ); @@ -1852,7 +1852,7 @@ sal_Int32 ExplicitValueProvider::getExplicitPercentageNumberFormatKeyForDataLabe sal_Int32 nFormat=0; if( !xSeriesOrPointProp.is() ) return nFormat; - if( !(xSeriesOrPointProp->getPropertyValue(C2U( "PercentageNumberFormat" )) >>= nFormat) ) + if( !(xSeriesOrPointProp->getPropertyValue("PercentageNumberFormat") >>= nFormat) ) { nFormat = DiagramHelper::getPercentNumberFormat( xNumberFormatsSupplier ); } @@ -2026,11 +2026,11 @@ bool getAvailablePosAndSizeForDiagram( bool bPosSizeExcludeAxes = false; if( xProp.is() ) - xProp->getPropertyValue( C2U( "PosSizeExcludeAxes" ) ) >>= bPosSizeExcludeAxes; + xProp->getPropertyValue( "PosSizeExcludeAxes" ) >>= bPosSizeExcludeAxes; //size: ::com::sun::star::chart2::RelativeSize aRelativeSize; - if( xProp.is() && (xProp->getPropertyValue( C2U( "RelativeSize" ) )>>=aRelativeSize) ) + if( xProp.is() && (xProp->getPropertyValue( "RelativeSize" )>>=aRelativeSize) ) { rOutAvailableDiagramSize.Height = static_cast<sal_Int32>(aRelativeSize.Secondary*rPageSize.Height); rOutAvailableDiagramSize.Width = static_cast<sal_Int32>(aRelativeSize.Primary*rPageSize.Width); @@ -2041,7 +2041,7 @@ bool getAvailablePosAndSizeForDiagram( //position: chart2::RelativePosition aRelativePosition; - if( xProp.is() && (xProp->getPropertyValue( C2U( "RelativePosition" ) )>>=aRelativePosition) ) + if( xProp.is() && (xProp->getPropertyValue( "RelativePosition" )>>=aRelativePosition) ) { //@todo decide whether x is primary or secondary @@ -2170,7 +2170,7 @@ boost::shared_ptr<VTitle> lcl_createTitle( TitleHelper::eTitleType eType awt::Point aNewPosition(0,0); chart2::RelativePosition aRelativePosition; uno::Reference< beans::XPropertySet > xProp(xTitle, uno::UNO_QUERY); - if( xProp.is() && (xProp->getPropertyValue( C2U( "RelativePosition" ) )>>=aRelativePosition) ) + if( xProp.is() && (xProp->getPropertyValue( "RelativePosition" )>>=aRelativePosition) ) { rbAutoPosition = false; @@ -2314,7 +2314,7 @@ void formatPage( { uno::Reference< drawing::XShape > xShape( xShapeFactory->createInstance( - C2U( "com.sun.star.drawing.RectangleShape" )), uno::UNO_QUERY ); + "com.sun.star.drawing.RectangleShape"), uno::UNO_QUERY ); if( xTarget.is() && xShape.is()) { @@ -2323,7 +2323,7 @@ void formatPage( xPageProp.set( xShape, uno::UNO_QUERY ); if( xPageProp.is()) { - xPageProp->setPropertyValue( C2U("LineStyle"), uno::makeAny( drawing::LineStyle_NONE )); + xPageProp->setPropertyValue( "LineStyle", uno::makeAny( drawing::LineStyle_NONE )); } } } @@ -2335,7 +2335,7 @@ void formatPage( PropertyMapper::getValueMap( aNameValueMap, PropertyMapper::getPropertyNameMapForFillAndLineProperties(), xModelPage ); rtl::OUString aCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, rtl::OUString() ) ); - aNameValueMap.insert( tPropertyNameValueMap::value_type( C2U("Name"), uno::makeAny( aCID ) ) ); //CID rtl::OUString + aNameValueMap.insert( tPropertyNameValueMap::value_type( "Name", uno::makeAny( aCID ) ) ); //CID rtl::OUString tNameSequence aNames; tAnySequence aValues; @@ -2393,11 +2393,11 @@ void ChartView::impl_refreshAddIn() if( xProp.is()) try { uno::Reference< util::XRefreshable > xAddIn; - xProp->getPropertyValue( C2U( "AddIn" ) ) >>= xAddIn; + xProp->getPropertyValue( "AddIn" ) >>= xAddIn; if( xAddIn.is() ) { sal_Bool bRefreshAddInAllowed = sal_True; - xProp->getPropertyValue( C2U( "RefreshAddInAllowed" ) ) >>= bRefreshAddInAllowed; + xProp->getPropertyValue( "RefreshAddInAllowed" ) >>= bRefreshAddInAllowed; if( bRefreshAddInAllowed ) xAddIn->refresh(); } @@ -2463,11 +2463,11 @@ void ChartView::createShapes() uno::Reference< drawing::XShape > xDiagram_MarkHandles( ShapeFactory(m_xShapeFactory).createInvisibleRectangle( xDiagramPlusAxesPlusMarkHandlesGroup_Shapes, awt::Size(0,0) ) ); - ShapeFactory::setShapeName( xDiagram_MarkHandles, C2U("MarkHandles") ); + ShapeFactory::setShapeName( xDiagram_MarkHandles, "MarkHandles" ); uno::Reference< drawing::XShape > xDiagram_OuterRect( ShapeFactory(m_xShapeFactory).createInvisibleRectangle( xDiagramPlusAxesPlusMarkHandlesGroup_Shapes, awt::Size(0,0) ) ); - ShapeFactory::setShapeName( xDiagram_OuterRect, C2U("PlotAreaIncludingAxes") ); + ShapeFactory::setShapeName( xDiagram_OuterRect, "PlotAreaIncludingAxes" ); uno::Reference< drawing::XShapes > xDiagramPlusAxes_Shapes( ShapeFactory(m_xShapeFactory).createGroup2D(xDiagramPlusAxesPlusMarkHandlesGroup_Shapes ) ); @@ -2625,7 +2625,7 @@ void ChartView::impl_updateView() //m_bRefreshAddIn = false; try { - impl_notifyModeChangeListener(C2U("invalid")); + impl_notifyModeChangeListener("invalid"); //prepare draw model { @@ -2668,7 +2668,7 @@ void ChartView::impl_updateView() m_pDrawModelWrapper->unlockControllers(); } - impl_notifyModeChangeListener(C2U("valid")); + impl_notifyModeChangeListener("valid"); //m_bRefreshAddIn = bOldRefreshAddIn; } @@ -2682,7 +2682,7 @@ void SAL_CALL ChartView::modified( const lang::EventObject& /* aEvent */ ) if( m_bInViewUpdate ) m_bViewUpdatePending = true; - impl_notifyModeChangeListener(C2U("dirty")); + impl_notifyModeChangeListener("dirty"); } //SfxListener @@ -2825,11 +2825,11 @@ void SAL_CALL ChartView::setPropertyValue( const ::rtl::OUString& rPropertyName throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException , lang::WrappedTargetException, uno::RuntimeException) { - if( rPropertyName.equals(C2U("Resolution")) ) + if( rPropertyName.equals("Resolution") ) { awt::Size aNewResolution; if( ! (rValue >>= aNewResolution) ) - throw lang::IllegalArgumentException( C2U("Property 'Resolution' requires value of type awt::Size"), 0, 0 ); + throw lang::IllegalArgumentException( "Property 'Resolution' requires value of type awt::Size", 0, 0 ); if( m_aPageResolution.Width!=aNewResolution.Width || m_aPageResolution.Height!=aNewResolution.Height ) { @@ -2842,12 +2842,12 @@ void SAL_CALL ChartView::setPropertyValue( const ::rtl::OUString& rPropertyName this->modified( lang::EventObject( static_cast< uno::XWeak* >( this ) ) ); } } - else if( rPropertyName.equals(C2U("ZoomFactors")) ) + else if( rPropertyName.equals("ZoomFactors") ) { //#i75867# poor quality of ole's alternative view with 3D scenes and zoomfactors besides 100% uno::Sequence< beans::PropertyValue > aZoomFactors; if( ! (rValue >>= aZoomFactors) ) - throw lang::IllegalArgumentException( C2U("Property 'ZoomFactors' requires value of type Sequence< PropertyValue >"), 0, 0 ); + throw lang::IllegalArgumentException( "Property 'ZoomFactors' requires value of type Sequence< PropertyValue >", 0, 0 ); sal_Int32 nFilterArgs = aZoomFactors.getLength(); beans::PropertyValue* pDataValues = aZoomFactors.getArray(); @@ -2865,26 +2865,26 @@ void SAL_CALL ChartView::setPropertyValue( const ::rtl::OUString& rPropertyName pDataValues++; } } - else if( rPropertyName.equals(C2U("SdrViewIsInEditMode")) ) + else if( rPropertyName.equals("SdrViewIsInEditMode") ) { //#i77362 change notification for changes on additional shapes are missing if( ! (rValue >>= m_bSdrViewIsInEditMode) ) - throw lang::IllegalArgumentException( C2U("Property 'SdrViewIsInEditMode' requires value of type sal_Bool"), 0, 0 ); + throw lang::IllegalArgumentException( "Property 'SdrViewIsInEditMode' requires value of type sal_Bool", 0, 0 ); } else - throw beans::UnknownPropertyException( C2U("unknown property was tried to set to chart wizard"), 0 ); + throw beans::UnknownPropertyException( "unknown property was tried to set to chart wizard", 0 ); } Any SAL_CALL ChartView::getPropertyValue( const ::rtl::OUString& rPropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; - if( rPropertyName.equals(C2U("Resolution")) ) + if( rPropertyName.equals("Resolution") ) { aRet = uno::makeAny( m_aPageResolution ); } else - throw beans::UnknownPropertyException( C2U("unknown property was tried to get from chart wizard"), 0 ); + throw beans::UnknownPropertyException( "unknown property was tried to get from chart wizard", 0 ); return aRet; } diff --git a/chart2/source/view/main/DataPointSymbolSupplier.cxx b/chart2/source/view/main/DataPointSymbolSupplier.cxx index b07d7eefabd7..cdd80540093a 100644 --- a/chart2/source/view/main/DataPointSymbolSupplier.cxx +++ b/chart2/source/view/main/DataPointSymbolSupplier.cxx @@ -34,8 +34,8 @@ uno::Reference< drawing::XShapes > DataPointSymbolSupplier::create2DSymbolList( , const drawing::Direction3D& rSize ) { uno::Reference< drawing::XShape > xGroup( - xShapeFactory->createInstance( C2U( - "com.sun.star.drawing.GroupShape" ) ), uno::UNO_QUERY ); + xShapeFactory->createInstance( + "com.sun.star.drawing.GroupShape" ), uno::UNO_QUERY ); if(xTarget.is()) xTarget->add(xGroup); uno::Reference< drawing::XShapes > xGroupShapes = diff --git a/chart2/source/view/main/LabelPositionHelper.cxx b/chart2/source/view/main/LabelPositionHelper.cxx index 9a56c2c51fd8..2ef17307407b 100644 --- a/chart2/source/view/main/LabelPositionHelper.cxx +++ b/chart2/source/view/main/LabelPositionHelper.cxx @@ -66,7 +66,7 @@ void LabelPositionHelper::changeTextAdjustment( tAnySequence& rPropValues, const eHorizontalAdjust = drawing::TextHorizontalAdjust_LEFT; else if( LABEL_ALIGN_LEFT==eAlignment || LABEL_ALIGN_LEFT_TOP==eAlignment || LABEL_ALIGN_LEFT_BOTTOM==eAlignment ) eHorizontalAdjust = drawing::TextHorizontalAdjust_RIGHT; - uno::Any* pHorizontalAdjustAny = PropertyMapper::getValuePointer(rPropValues,rPropNames,C2U("TextHorizontalAdjust")); + uno::Any* pHorizontalAdjustAny = PropertyMapper::getValuePointer(rPropValues,rPropNames,"TextHorizontalAdjust"); if(pHorizontalAdjustAny) *pHorizontalAdjustAny = uno::makeAny(eHorizontalAdjust); } @@ -78,7 +78,7 @@ void LabelPositionHelper::changeTextAdjustment( tAnySequence& rPropValues, const eVerticalAdjust = drawing::TextVerticalAdjust_BOTTOM; else if( LABEL_ALIGN_BOTTOM==eAlignment || LABEL_ALIGN_RIGHT_BOTTOM==eAlignment || LABEL_ALIGN_LEFT_BOTTOM==eAlignment ) eVerticalAdjust = drawing::TextVerticalAdjust_TOP; - uno::Any* pVerticalAdjustAny = PropertyMapper::getValuePointer(rPropValues,rPropNames,C2U("TextVerticalAdjust")); + uno::Any* pVerticalAdjustAny = PropertyMapper::getValuePointer(rPropValues,rPropNames,"TextVerticalAdjust"); if(pVerticalAdjustAny) *pVerticalAdjustAny = uno::makeAny(eVerticalAdjust); } @@ -105,13 +105,13 @@ void LabelPositionHelper::doDynamicFontResize( tAnySequence& rPropValues //------------------------- //handle dynamic font resize: awt::Size aOldReferenceSize; - if( xAxisModelProps->getPropertyValue( C2U("ReferencePageSize")) >>= aOldReferenceSize ) + if( xAxisModelProps->getPropertyValue( "ReferencePageSize") >>= aOldReferenceSize ) { - uno::Any* pAOldAndNewFontHeightAny = PropertyMapper::getValuePointer( rPropValues, rPropNames, C2U("CharHeight") ); + uno::Any* pAOldAndNewFontHeightAny = PropertyMapper::getValuePointer( rPropValues, rPropNames, "CharHeight" ); lcl_doDynamicFontResize( pAOldAndNewFontHeightAny, aOldReferenceSize, rNewReferenceSize ); - pAOldAndNewFontHeightAny = PropertyMapper::getValuePointer( rPropValues, rPropNames, C2U("CharHeightAsian") ); + pAOldAndNewFontHeightAny = PropertyMapper::getValuePointer( rPropValues, rPropNames, "CharHeightAsian" ); lcl_doDynamicFontResize( pAOldAndNewFontHeightAny, aOldReferenceSize, rNewReferenceSize ); - pAOldAndNewFontHeightAny = PropertyMapper::getValuePointer( rPropValues, rPropNames, C2U("CharHeightComplex") ); + pAOldAndNewFontHeightAny = PropertyMapper::getValuePointer( rPropValues, rPropNames, "CharHeightComplex" ); lcl_doDynamicFontResize( pAOldAndNewFontHeightAny, aOldReferenceSize, rNewReferenceSize ); } } diff --git a/chart2/source/view/main/PropertyMapper.cxx b/chart2/source/view/main/PropertyMapper.cxx index e5b784bbe246..b022a92435d5 100644 --- a/chart2/source/view/main/PropertyMapper.cxx +++ b/chart2/source/view/main/PropertyMapper.cxx @@ -159,7 +159,7 @@ uno::Any* PropertyMapper::getValuePointerForLimitedSpace( tAnySequence& rPropVal , bool bLimitedHeight) { return PropertyMapper::getValuePointer( rPropValues, rPropNames - , bLimitedHeight ? C2U("TextMaximumFrameHeight") : C2U("TextMaximumFrameWidth") ); + , bLimitedHeight ? OUString("TextMaximumFrameHeight") : OUString("TextMaximumFrameWidth") ); } const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForCharacterProperties() @@ -410,21 +410,21 @@ void PropertyMapper::getTextLabelMultiPropertyLists( , xSourceProp ); //some more shape properties apart from character properties, position-matrix and label string - aValueMap.insert( tPropertyNameValueMap::value_type( C2U("LineStyle"), uno::makeAny(drawing::LineStyle_NONE) ) ); // drawing::LineStyle - aValueMap.insert( tPropertyNameValueMap::value_type( C2U("TextHorizontalAdjust"), uno::makeAny(drawing::TextHorizontalAdjust_CENTER) ) ); // drawing::TextHorizontalAdjust - needs to be overwritten - aValueMap.insert( tPropertyNameValueMap::value_type( C2U("TextVerticalAdjust"), uno::makeAny(drawing::TextVerticalAdjust_CENTER) ) ); //drawing::TextVerticalAdjust - needs to be overwritten - aValueMap.insert( tPropertyNameValueMap::value_type( C2U("TextAutoGrowHeight"), uno::makeAny(sal_True) ) ); // sal_Bool - aValueMap.insert( tPropertyNameValueMap::value_type( C2U("TextAutoGrowWidth"), uno::makeAny(sal_True) ) ); // sal_Bool + aValueMap.insert( tPropertyNameValueMap::value_type( "LineStyle", uno::makeAny(drawing::LineStyle_NONE) ) ); // drawing::LineStyle + aValueMap.insert( tPropertyNameValueMap::value_type( "TextHorizontalAdjust", uno::makeAny(drawing::TextHorizontalAdjust_CENTER) ) ); // drawing::TextHorizontalAdjust - needs to be overwritten + aValueMap.insert( tPropertyNameValueMap::value_type( "TextVerticalAdjust", uno::makeAny(drawing::TextVerticalAdjust_CENTER) ) ); //drawing::TextVerticalAdjust - needs to be overwritten + aValueMap.insert( tPropertyNameValueMap::value_type( "TextAutoGrowHeight", uno::makeAny(sal_True) ) ); // sal_Bool + aValueMap.insert( tPropertyNameValueMap::value_type( "TextAutoGrowWidth", uno::makeAny(sal_True) ) ); // sal_Bool if( bName ) - aValueMap.insert( tPropertyNameValueMap::value_type( C2U("Name"), uno::makeAny( rtl::OUString() ) ) ); //CID rtl::OUString - needs to be overwritten for each point + aValueMap.insert( tPropertyNameValueMap::value_type( "Name", uno::makeAny( rtl::OUString() ) ) ); //CID rtl::OUString - needs to be overwritten for each point if( nLimitedSpace > 0 ) { if(bLimitedHeight) - aValueMap.insert( tPropertyNameValueMap::value_type( C2U("TextMaximumFrameHeight"), uno::makeAny(nLimitedSpace) ) ); //sal_Int32 + aValueMap.insert( tPropertyNameValueMap::value_type( "TextMaximumFrameHeight", uno::makeAny(nLimitedSpace) ) ); //sal_Int32 else - aValueMap.insert( tPropertyNameValueMap::value_type( C2U("TextMaximumFrameWidth"), uno::makeAny(nLimitedSpace) ) ); //sal_Int32 - aValueMap.insert( tPropertyNameValueMap::value_type( C2U("ParaIsHyphenation"), uno::makeAny(sal_True) ) ); + aValueMap.insert( tPropertyNameValueMap::value_type( "TextMaximumFrameWidth", uno::makeAny(nLimitedSpace) ) ); //sal_Int32 + aValueMap.insert( tPropertyNameValueMap::value_type( "ParaIsHyphenation", uno::makeAny(sal_True) ) ); } PropertyMapper::getMultiPropertyListsFromValueMap( rPropNames, rPropValues, aValueMap ); @@ -441,22 +441,22 @@ void PropertyMapper::getPreparedTextShapePropertyLists( , xSourceProp ); // auto-grow makes sure the shape has the correct size after setting text - aValueMap.insert( tPropertyNameValueMap::value_type( C2U("TextHorizontalAdjust"), uno::makeAny( drawing::TextHorizontalAdjust_CENTER ))); - aValueMap.insert( tPropertyNameValueMap::value_type( C2U("TextVerticalAdjust"), uno::makeAny( drawing::TextVerticalAdjust_CENTER ))); - aValueMap.insert( tPropertyNameValueMap::value_type( C2U("TextAutoGrowHeight"), uno::makeAny( true ))); - aValueMap.insert( tPropertyNameValueMap::value_type( C2U("TextAutoGrowWidth"), uno::makeAny( true ))); + aValueMap.insert( tPropertyNameValueMap::value_type( "TextHorizontalAdjust", uno::makeAny( drawing::TextHorizontalAdjust_CENTER ))); + aValueMap.insert( tPropertyNameValueMap::value_type( "TextVerticalAdjust", uno::makeAny( drawing::TextVerticalAdjust_CENTER ))); + aValueMap.insert( tPropertyNameValueMap::value_type( "TextAutoGrowHeight", uno::makeAny( true ))); + aValueMap.insert( tPropertyNameValueMap::value_type( "TextAutoGrowWidth", uno::makeAny( true ))); // set some distance to the border, in case it is shown const sal_Int32 nWidthDist = 250; const sal_Int32 nHeightDist = 125; - aValueMap.insert( tPropertyNameValueMap::value_type( C2U("TextLeftDistance"), uno::makeAny( nWidthDist ))); - aValueMap.insert( tPropertyNameValueMap::value_type( C2U("TextRightDistance"), uno::makeAny( nWidthDist ))); - aValueMap.insert( tPropertyNameValueMap::value_type( C2U("TextUpperDistance"), uno::makeAny( nHeightDist ))); - aValueMap.insert( tPropertyNameValueMap::value_type( C2U("TextLowerDistance"), uno::makeAny( nHeightDist ))); + aValueMap.insert( tPropertyNameValueMap::value_type( "TextLeftDistance", uno::makeAny( nWidthDist ))); + aValueMap.insert( tPropertyNameValueMap::value_type( "TextRightDistance", uno::makeAny( nWidthDist ))); + aValueMap.insert( tPropertyNameValueMap::value_type( "TextUpperDistance", uno::makeAny( nHeightDist ))); + aValueMap.insert( tPropertyNameValueMap::value_type( "TextLowerDistance", uno::makeAny( nHeightDist ))); // use a line-joint showing the border of thick lines like two rectangles // filled in between. - aValueMap[C2U("LineJoint")] <<= drawing::LineJoint_ROUND; + aValueMap["LineJoint"] <<= drawing::LineJoint_ROUND; PropertyMapper::getMultiPropertyListsFromValueMap( rPropNames, rPropValues, aValueMap ); } diff --git a/chart2/source/view/main/ShapeFactory.cxx b/chart2/source/view/main/ShapeFactory.cxx index 6a4569399fc1..739ce751ad5b 100644 --- a/chart2/source/view/main/ShapeFactory.cxx +++ b/chart2/source/view/main/ShapeFactory.cxx @@ -77,7 +77,7 @@ void ShapeFactory::setShapeName( const uno::Reference< drawing::XShape >& xShape { try { - xProp->setPropertyValue( C2U( UNO_NAME_MISC_OBJ_NAME ) + xProp->setPropertyValue( UNO_NAME_MISC_OBJ_NAME , uno::makeAny( rName ) ); } catch( const uno::Exception& e ) @@ -99,7 +99,7 @@ rtl::OUString ShapeFactory::getShapeName( const uno::Reference< drawing::XShape { try { - xProp->getPropertyValue( C2U( UNO_NAME_MISC_OBJ_NAME ) ) >>= aRet; + xProp->getPropertyValue( UNO_NAME_MISC_OBJ_NAME ) >>= aRet; } catch( const uno::Exception& e ) { @@ -125,7 +125,7 @@ uno::Reference< drawing::XShapes > ShapeFactory::getChartRootShape( { if( xShapes->getByIndex( nN ) >>= xShape ) { - if( ShapeFactory::getShapeName( xShape ).equals(C2U("com.sun.star.chart2.shapes")) ) + if( ShapeFactory::getShapeName( xShape ).equals("com.sun.star.chart2.shapes") ) { xRet = uno::Reference< drawing::XShapes >( xShape, uno::UNO_QUERY ); break; @@ -147,7 +147,7 @@ uno::Reference< drawing::XShapes > ShapeFactory::getOrCreateChartRootShape( //create the root shape xRet = this->createGroup2D( uno::Reference<drawing::XShapes>( xDrawPage, uno::UNO_QUERY ) - , C2U("com.sun.star.chart2.shapes") ); + , "com.sun.star.chart2.shapes" ); } return xRet; } @@ -442,7 +442,7 @@ uno::Reference<drawing::XShape> if( xSourceProp.is() ) { drawing::LineStyle aLineStyle; - xSourceProp->getPropertyValue( C2U( "BorderStyle" ) ) >>= aLineStyle; + xSourceProp->getPropertyValue( "BorderStyle" ) >>= aLineStyle; if( aLineStyle == drawing::LineStyle_SOLID ) bRounded = false; } @@ -471,8 +471,8 @@ uno::Reference<drawing::XShape> //create shape uno::Reference< drawing::XShape > xShape( - m_xShapeFactory->createInstance( C2U( - "com.sun.star.drawing.Shape3DExtrudeObject") ), uno::UNO_QUERY ); + m_xShapeFactory->createInstance( + "com.sun.star.drawing.Shape3DExtrudeObject" ), uno::UNO_QUERY ); xTarget->add(xShape); //set properties @@ -486,16 +486,16 @@ uno::Reference<drawing::XShape> double fDepth = rSize.DirectionZ; if(fDepth<0) fDepth*=-1.0; - xProp->setPropertyValue( C2U( UNO_NAME_3D_EXTRUDE_DEPTH ) + xProp->setPropertyValue( UNO_NAME_3D_EXTRUDE_DEPTH , uno::makeAny((sal_Int32)fDepth) ); //PercentDiagonal sal_Int16 nPercentDiagonal = bRounded ? 3 : 0; - xProp->setPropertyValue( C2U( UNO_NAME_3D_PERCENT_DIAGONAL ) + xProp->setPropertyValue( UNO_NAME_3D_PERCENT_DIAGONAL , uno::makeAny( nPercentDiagonal ) ); //Polygon - xProp->setPropertyValue( C2U( UNO_NAME_3D_POLYPOLYGON3D ) + xProp->setPropertyValue( UNO_NAME_3D_POLYPOLYGON3D , createPolyPolygon_Cube( rSize, double(nPercentDiagonal)/200.0,bRounded) ); //Matrix for position @@ -507,7 +507,7 @@ uno::Reference<drawing::XShape> , rPosition.PositionY , rPosition.PositionZ - (fDepth/2.0)); drawing::HomogenMatrix aHM = B3DHomMatrixToHomogenMatrix(aM); - xProp->setPropertyValue( C2U( UNO_NAME_3D_TRANSFORM_MATRIX ) + xProp->setPropertyValue( UNO_NAME_3D_TRANSFORM_MATRIX , uno::makeAny(aHM) ); } } @@ -710,8 +710,8 @@ uno::Reference<drawing::XShape> //create shape uno::Reference< drawing::XShape > xShape( - m_xShapeFactory->createInstance( C2U( - "com.sun.star.drawing.Shape3DLatheObject") ), uno::UNO_QUERY ); + m_xShapeFactory->createInstance( + "com.sun.star.drawing.Shape3DLatheObject" ), uno::UNO_QUERY ); xTarget->add(xShape); double fWidth = rSize.DirectionX/2.0; //The depth will be corrrected within Matrix @@ -727,7 +727,7 @@ uno::Reference<drawing::XShape> { //PercentDiagonal sal_Int16 nPercentDiagonal = 5; - xProp->setPropertyValue( C2U( UNO_NAME_3D_PERCENT_DIAGONAL ) + xProp->setPropertyValue( UNO_NAME_3D_PERCENT_DIAGONAL , uno::makeAny( nPercentDiagonal ) ); //Polygon @@ -736,7 +736,7 @@ uno::Reference<drawing::XShape> fHeight, fRadius, nVerticalSegmentCount) : createPolyPolygon_Cone( fHeight, fRadius, fTopHeight, nVerticalSegmentCount); - xProp->setPropertyValue( C2U( UNO_NAME_3D_POLYPOLYGON3D ), aPPolygon ); + xProp->setPropertyValue( UNO_NAME_3D_POLYPOLYGON3D, aPPolygon ); //Matrix for position { @@ -747,18 +747,18 @@ uno::Reference<drawing::XShape> aM.scale(1.0,1.0,rSize.DirectionZ/rSize.DirectionX); aM.translate(rPosition.PositionX, rPosition.PositionY, rPosition.PositionZ); drawing::HomogenMatrix aHM = B3DHomMatrixToHomogenMatrix(aM); - xProp->setPropertyValue( C2U( UNO_NAME_3D_TRANSFORM_MATRIX ) + xProp->setPropertyValue( UNO_NAME_3D_TRANSFORM_MATRIX , uno::makeAny(aHM) ); } //Segments - xProp->setPropertyValue( C2U( UNO_NAME_3D_HORZ_SEGS ) + xProp->setPropertyValue( UNO_NAME_3D_HORZ_SEGS , uno::makeAny(CHART_3DOBJECT_SEGMENTCOUNT) ); - xProp->setPropertyValue( C2U( UNO_NAME_3D_VERT_SEGS ) + xProp->setPropertyValue( UNO_NAME_3D_VERT_SEGS , uno::makeAny((sal_Int32)nVerticalSegmentCount) );//depends on point count of the used polygon //Reduced lines - xProp->setPropertyValue( C2U( UNO_NAME_3D_REDUCED_LINE_GEOMETRY ) + xProp->setPropertyValue( UNO_NAME_3D_REDUCED_LINE_GEOMETRY , uno::makeAny((sal_Bool)sal_True) ); } catch( const uno::Exception& e ) @@ -961,7 +961,7 @@ uno::Reference< drawing::XShape > //create shape uno::Reference< drawing::XShape > xShape( m_xShapeFactory->createInstance( - C2U("com.sun.star.drawing.ClosedBezierShape") ), uno::UNO_QUERY ); + "com.sun.star.drawing.ClosedBezierShape" ), uno::UNO_QUERY ); xTarget->add(xShape); //need to add the shape before setting of properties //set properties @@ -981,7 +981,7 @@ uno::Reference< drawing::XShape > , fUnitCircleStartAngleDegree*F_PI/180.0, fUnitCircleWidthAngleDegree*F_PI/180.0 , aTransformationFromUnitCircle, fAngleSubdivisionRadian ); - xProp->setPropertyValue( C2U( "PolyPolygonBezier" ), uno::makeAny( aCoords ) ); + xProp->setPropertyValue( "PolyPolygonBezier", uno::makeAny( aCoords ) ); } catch( const uno::Exception& e ) { @@ -1013,8 +1013,8 @@ uno::Reference< drawing::XShape > //create shape uno::Reference< drawing::XShape > xShape( - m_xShapeFactory->createInstance( C2U( - "com.sun.star.drawing.Shape3DExtrudeObject") ), uno::UNO_QUERY ); + m_xShapeFactory->createInstance( + "com.sun.star.drawing.Shape3DExtrudeObject" ), uno::UNO_QUERY ); xTarget->add(xShape); //need to add the shape before setting of properties //set properties @@ -1035,36 +1035,36 @@ uno::Reference< drawing::XShape > , aTransformationFromUnitCircle, fAngleSubdivisionRadian ); //depth - xProp->setPropertyValue( C2U( UNO_NAME_3D_EXTRUDE_DEPTH ) + xProp->setPropertyValue( UNO_NAME_3D_EXTRUDE_DEPTH , uno::makeAny((sal_Int32)fDepth) ); //PercentDiagonal sal_Int16 nPercentDiagonal = 0; - xProp->setPropertyValue( C2U( UNO_NAME_3D_PERCENT_DIAGONAL ) + xProp->setPropertyValue( UNO_NAME_3D_PERCENT_DIAGONAL , uno::makeAny( nPercentDiagonal ) ); //Polygon drawing::PolyPolygonShape3D aPoly( BezierToPoly(aCoords) ); ShapeFactory::closePolygon( aPoly ); - xProp->setPropertyValue( C2U( UNO_NAME_3D_POLYPOLYGON3D ) + xProp->setPropertyValue( UNO_NAME_3D_POLYPOLYGON3D , uno::makeAny( aPoly ) ); //DoubleSided - xProp->setPropertyValue( C2U( UNO_NAME_3D_DOUBLE_SIDED ) + xProp->setPropertyValue( UNO_NAME_3D_DOUBLE_SIDED , uno::makeAny( (sal_Bool)true) ); //Reduced lines - xProp->setPropertyValue( C2U( UNO_NAME_3D_REDUCED_LINE_GEOMETRY ) + xProp->setPropertyValue( UNO_NAME_3D_REDUCED_LINE_GEOMETRY , uno::makeAny((sal_Bool)sal_True) ); //TextureProjectionMode - xProp->setPropertyValue( C2U( UNO_NAME_3D_TEXTURE_PROJ_Y ) + xProp->setPropertyValue( UNO_NAME_3D_TEXTURE_PROJ_Y , uno::makeAny( drawing::TextureProjectionMode_OBJECTSPECIFIC ) ); //TextureProjectionMode - xProp->setPropertyValue( C2U( UNO_NAME_3D_TEXTURE_PROJ_X ) + xProp->setPropertyValue( UNO_NAME_3D_TEXTURE_PROJ_X , uno::makeAny( drawing::TextureProjectionMode_PARALLEL ) ); - xProp->setPropertyValue( C2U( UNO_NAME_3D_TEXTURE_PROJ_Y ) + xProp->setPropertyValue( UNO_NAME_3D_TEXTURE_PROJ_Y , uno::makeAny( drawing::TextureProjectionMode_OBJECTSPECIFIC ) ); } catch( const uno::Exception& e ) @@ -1093,8 +1093,8 @@ uno::Reference< drawing::XShape > //create shape uno::Reference< drawing::XShape > xShape( - m_xShapeFactory->createInstance( C2U( - "com.sun.star.drawing.Shape3DPolygonObject" ) ), uno::UNO_QUERY ); + m_xShapeFactory->createInstance( + "com.sun.star.drawing.Shape3DPolygonObject" ), uno::UNO_QUERY ); xTarget->add(xShape); //set properties @@ -1105,27 +1105,27 @@ uno::Reference< drawing::XShape > try { //Polygon - xProp->setPropertyValue( C2U( UNO_NAME_3D_POLYPOLYGON3D ) + xProp->setPropertyValue( UNO_NAME_3D_POLYPOLYGON3D , rStripe.getPolyPolygonShape3D() ); //TexturePolygon - xProp->setPropertyValue( C2U( UNO_NAME_3D_TEXTUREPOLYGON3D ) + xProp->setPropertyValue( UNO_NAME_3D_TEXTUREPOLYGON3D , rStripe.getTexturePolygon( nRotatedTexture ) ); //Normals Polygon - xProp->setPropertyValue( C2U( UNO_NAME_3D_NORMALSPOLYGON3D ) + xProp->setPropertyValue( UNO_NAME_3D_NORMALSPOLYGON3D , rStripe.getNormalsPolygon() ); //NormalsKind if(bFlatNormals) - xProp->setPropertyValue( C2U( UNO_NAME_3D_NORMALS_KIND ) + xProp->setPropertyValue( UNO_NAME_3D_NORMALS_KIND , uno::makeAny( drawing::NormalsKind_FLAT ) ); //LineOnly - xProp->setPropertyValue( C2U( UNO_NAME_3D_LINEONLY ) + xProp->setPropertyValue( UNO_NAME_3D_LINEONLY , uno::makeAny( (sal_Bool)false) ); //DoubleSided - xProp->setPropertyValue( C2U( UNO_NAME_3D_DOUBLE_SIDED ) + xProp->setPropertyValue( UNO_NAME_3D_DOUBLE_SIDED , uno::makeAny(bDoubleSided) ); if( xSourceProp.is()) @@ -1152,8 +1152,8 @@ uno::Reference< drawing::XShape > //create shape uno::Reference< drawing::XShape > xShape( - m_xShapeFactory->createInstance( C2U( - "com.sun.star.drawing.Shape3DExtrudeObject") ), uno::UNO_QUERY ); + m_xShapeFactory->createInstance( + "com.sun.star.drawing.Shape3DExtrudeObject" ), uno::UNO_QUERY ); xTarget->add(xShape); //set properties @@ -1164,20 +1164,20 @@ uno::Reference< drawing::XShape > try { //depth - xProp->setPropertyValue( C2U( UNO_NAME_3D_EXTRUDE_DEPTH ) + xProp->setPropertyValue( UNO_NAME_3D_EXTRUDE_DEPTH , uno::makeAny((sal_Int32)fDepth) ); //PercentDiagonal sal_Int16 nPercentDiagonal = 0; - xProp->setPropertyValue( C2U( UNO_NAME_3D_PERCENT_DIAGONAL ) + xProp->setPropertyValue( UNO_NAME_3D_PERCENT_DIAGONAL , uno::makeAny( nPercentDiagonal ) ); //Polygon - xProp->setPropertyValue( C2U( UNO_NAME_3D_POLYPOLYGON3D ) + xProp->setPropertyValue( UNO_NAME_3D_POLYPOLYGON3D , uno::makeAny( rPolyPolygon ) ); //DoubleSided - xProp->setPropertyValue( C2U( UNO_NAME_3D_DOUBLE_SIDED ) + xProp->setPropertyValue( UNO_NAME_3D_DOUBLE_SIDED , uno::makeAny( (sal_Bool)true) ); //the z component of the polygon is now ignored by the drawing layer, @@ -1191,7 +1191,7 @@ uno::Reference< drawing::XShape > , 0 , rPolyPolygon.SequenceZ[0][0] ); drawing::HomogenMatrix aHM = B3DHomMatrixToHomogenMatrix(aM); - xProp->setPropertyValue( C2U( UNO_NAME_3D_TRANSFORM_MATRIX ) + xProp->setPropertyValue( UNO_NAME_3D_TRANSFORM_MATRIX , uno::makeAny(aHM) ); } } @@ -1212,8 +1212,8 @@ uno::Reference< drawing::XShape > //create shape uno::Reference< drawing::XShape > xShape( - m_xShapeFactory->createInstance( C2U( - "com.sun.star.drawing.PolyPolygonShape") ), uno::UNO_QUERY ); + m_xShapeFactory->createInstance( + "com.sun.star.drawing.PolyPolygonShape" ), uno::UNO_QUERY ); xTarget->add(xShape); //set properties @@ -1227,12 +1227,12 @@ uno::Reference< drawing::XShape > drawing::PointSequenceSequence aPoints( PolyToPointSequence(rPolyPolygon) ); //Polygon - xProp->setPropertyValue( C2U( UNO_NAME_POLYPOLYGON ) + xProp->setPropertyValue( UNO_NAME_POLYPOLYGON , uno::makeAny( aPoints ) ); //ZOrder //an area should always be behind other shapes - xProp->setPropertyValue( C2U( UNO_NAME_MISC_OBJ_ZORDER ) + xProp->setPropertyValue( UNO_NAME_MISC_OBJ_ZORDER , uno::makeAny( sal_Int32(0) ) ); } catch( const uno::Exception& e ) @@ -1785,8 +1785,8 @@ uno::Reference< drawing::XShape > //create shape uno::Reference< drawing::XShape > xShape( - m_xShapeFactory->createInstance( C2U( - "com.sun.star.drawing.PolyPolygonShape") ), uno::UNO_QUERY ); + m_xShapeFactory->createInstance( + "com.sun.star.drawing.PolyPolygonShape" ), uno::UNO_QUERY ); xTarget->add(xShape); //set properties @@ -1800,15 +1800,15 @@ uno::Reference< drawing::XShape > createPolyPolygon_Symbol( rPosition, rSize, nStandardSymbol ) )); //Polygon - xProp->setPropertyValue( C2U( UNO_NAME_POLYPOLYGON ) + xProp->setPropertyValue( UNO_NAME_POLYPOLYGON , uno::makeAny( aPoints ) ); //LineColor - xProp->setPropertyValue( C2U( UNO_NAME_LINECOLOR ) + xProp->setPropertyValue( UNO_NAME_LINECOLOR , uno::makeAny( nBorderColor ) ); //FillColor - xProp->setPropertyValue( C2U( UNO_NAME_FILLCOLOR ) + xProp->setPropertyValue( UNO_NAME_FILLCOLOR , uno::makeAny( nFillColor ) ); } catch( const uno::Exception& e ) @@ -1834,8 +1834,8 @@ uno::Reference< drawing::XShape > //create shape uno::Reference< drawing::XShape > xShape( - m_xShapeFactory->createInstance( C2U( - "com.sun.star.drawing.GraphicObjectShape") ), uno::UNO_QUERY ); + m_xShapeFactory->createInstance( + "com.sun.star.drawing.GraphicObjectShape" ), uno::UNO_QUERY ); xTarget->add(xShape); try @@ -1858,7 +1858,7 @@ uno::Reference< drawing::XShape > { try { - xProp->setPropertyValue( C2U("Graphic"), uno::makeAny( xGraphic )); + xProp->setPropertyValue( "Graphic", uno::makeAny( xGraphic )); } catch( const uno::Exception& e ) { @@ -1878,8 +1878,8 @@ uno::Reference< drawing::XShapes > { //create and add to target uno::Reference< drawing::XShape > xShape( - m_xShapeFactory->createInstance( C2U( - "com.sun.star.drawing.GroupShape" ) ), uno::UNO_QUERY ); + m_xShapeFactory->createInstance( + "com.sun.star.drawing.GroupShape" ), uno::UNO_QUERY ); xTarget->add(xShape); //set name @@ -1913,8 +1913,8 @@ uno::Reference< drawing::XShapes > { //create shape uno::Reference< drawing::XShape > xShape( - m_xShapeFactory->createInstance( C2U( - "com.sun.star.drawing.Shape3DSceneObject" ) ), uno::UNO_QUERY ); + m_xShapeFactory->createInstance( + "com.sun.star.drawing.Shape3DSceneObject" ), uno::UNO_QUERY ); xTarget->add(xShape); @@ -1930,7 +1930,7 @@ uno::Reference< drawing::XShapes > try { ::basegfx::B3DHomMatrix aM; - xProp->setPropertyValue( C2U( UNO_NAME_3D_TRANSFORM_MATRIX ) + xProp->setPropertyValue( UNO_NAME_3D_TRANSFORM_MATRIX , uno::makeAny(B3DHomMatrixToHomogenMatrix(aM)) ); } catch( const uno::Exception& e ) @@ -1966,8 +1966,8 @@ uno::Reference< drawing::XShape > //create shape uno::Reference< drawing::XShape > xShape( - m_xShapeFactory->createInstance( C2U( - "com.sun.star.drawing.EllipseShape") ), uno::UNO_QUERY ); + m_xShapeFactory->createInstance( + "com.sun.star.drawing.EllipseShape" ), uno::UNO_QUERY ); xTarget->add(xShape); try @@ -1992,7 +1992,7 @@ uno::Reference< drawing::XShape > try { drawing::CircleKind eKind = drawing::CircleKind_FULL; - xProp->setPropertyValue( C2U( UNO_NAME_CIRCKIND ) + xProp->setPropertyValue( UNO_NAME_CIRCKIND , uno::makeAny( eKind ) ); } catch( const uno::Exception& e ) @@ -2016,8 +2016,8 @@ uno::Reference< drawing::XShape > //create shape uno::Reference< drawing::XShape > xShape( - m_xShapeFactory->createInstance( C2U( - "com.sun.star.drawing.Shape3DPolygonObject") ), uno::UNO_QUERY ); + m_xShapeFactory->createInstance( + "com.sun.star.drawing.Shape3DPolygonObject" ), uno::UNO_QUERY ); xTarget->add(xShape); //set properties @@ -2028,31 +2028,31 @@ uno::Reference< drawing::XShape > try { //Polygon - xProp->setPropertyValue( C2U( UNO_NAME_3D_POLYPOLYGON3D ) + xProp->setPropertyValue( UNO_NAME_3D_POLYPOLYGON3D , uno::makeAny( rPoints ) ); //LineOnly - xProp->setPropertyValue( C2U( UNO_NAME_3D_LINEONLY ) + xProp->setPropertyValue( UNO_NAME_3D_LINEONLY , uno::makeAny( (sal_Bool)true ) ); //Transparency if(rLineProperties.Transparence.hasValue()) - xProp->setPropertyValue( C2U( UNO_NAME_LINETRANSPARENCE ) + xProp->setPropertyValue( UNO_NAME_LINETRANSPARENCE , rLineProperties.Transparence ); //LineStyle if(rLineProperties.LineStyle.hasValue()) - xProp->setPropertyValue( C2U( UNO_NAME_LINESTYLE ) + xProp->setPropertyValue( UNO_NAME_LINESTYLE , rLineProperties.LineStyle ); //LineWidth if(rLineProperties.Width.hasValue()) - xProp->setPropertyValue( C2U( UNO_NAME_LINEWIDTH ) + xProp->setPropertyValue( UNO_NAME_LINEWIDTH , rLineProperties.Width ); //LineColor if(rLineProperties.Color.hasValue()) - xProp->setPropertyValue( C2U( UNO_NAME_LINECOLOR ) + xProp->setPropertyValue( UNO_NAME_LINECOLOR , rLineProperties.Color ); //, uno::makeAny( sal_Int32( Color(COL_RED).GetColor()) ) ); } @@ -2077,8 +2077,8 @@ uno::Reference< drawing::XShape > //create shape uno::Reference< drawing::XShape > xShape( - m_xShapeFactory->createInstance( C2U( - "com.sun.star.drawing.PolyLineShape") ), uno::UNO_QUERY ); + m_xShapeFactory->createInstance( + "com.sun.star.drawing.PolyLineShape" ), uno::UNO_QUERY ); xTarget->add(xShape); //set properties @@ -2089,34 +2089,34 @@ uno::Reference< drawing::XShape > try { //Polygon - xProp->setPropertyValue( C2U( UNO_NAME_POLYPOLYGON ) + xProp->setPropertyValue( UNO_NAME_POLYPOLYGON , uno::makeAny( rPoints ) ); if(pLineProperties) { //Transparency if(pLineProperties->Transparence.hasValue()) - xProp->setPropertyValue( C2U( UNO_NAME_LINETRANSPARENCE ) + xProp->setPropertyValue( UNO_NAME_LINETRANSPARENCE , pLineProperties->Transparence ); //LineStyle if(pLineProperties->LineStyle.hasValue()) - xProp->setPropertyValue( C2U( UNO_NAME_LINESTYLE ) + xProp->setPropertyValue( UNO_NAME_LINESTYLE , pLineProperties->LineStyle ); //LineWidth if(pLineProperties->Width.hasValue()) - xProp->setPropertyValue( C2U( UNO_NAME_LINEWIDTH ) + xProp->setPropertyValue( UNO_NAME_LINEWIDTH , pLineProperties->Width ); //LineColor if(pLineProperties->Color.hasValue()) - xProp->setPropertyValue( C2U( UNO_NAME_LINECOLOR ) + xProp->setPropertyValue( UNO_NAME_LINECOLOR , pLineProperties->Color ); //LineDashName if(pLineProperties->DashName.hasValue()) - xProp->setPropertyValue( C2U( "LineDashName" ) + xProp->setPropertyValue( "LineDashName" , pLineProperties->DashName ); } } @@ -2148,8 +2148,8 @@ void ShapeFactory::makeShapeInvisible( const uno::Reference< drawing::XShape >& { try { - xShapeProp->setPropertyValue( C2U("LineStyle"), uno::makeAny( drawing::LineStyle_NONE )); - xShapeProp->setPropertyValue( C2U("FillStyle"), uno::makeAny( drawing::FillStyle_NONE )); + xShapeProp->setPropertyValue( "LineStyle", uno::makeAny( drawing::LineStyle_NONE )); + xShapeProp->setPropertyValue( "FillStyle", uno::makeAny( drawing::FillStyle_NONE )); } catch( const uno::Exception& e ) { @@ -2168,7 +2168,7 @@ uno::Reference< drawing::XShape > ShapeFactory::createInvisibleRectangle( return 0; uno::Reference< drawing::XShape > xShape( m_xShapeFactory->createInstance( - C2U( "com.sun.star.drawing.RectangleShape" )), uno::UNO_QUERY ); + "com.sun.star.drawing.RectangleShape"), uno::UNO_QUERY ); if( xTarget.is() && xShape.is()) { xTarget->add( xShape ); @@ -2199,8 +2199,8 @@ uno::Reference< drawing::XShape > //create shape and add to page uno::Reference< drawing::XShape > xShape( - m_xShapeFactory->createInstance( C2U( - "com.sun.star.drawing.TextShape" ) ), uno::UNO_QUERY ); + m_xShapeFactory->createInstance( + "com.sun.star.drawing.TextShape" ), uno::UNO_QUERY ); xTarget->add(xShape); //set text @@ -2218,7 +2218,7 @@ uno::Reference< drawing::XShape > //the matrix needs to be set at the end behind autogrow and such position influencing properties try { - xProp->setPropertyValue( C2U( "Transformation" ), rATransformation ); + xProp->setPropertyValue( "Transformation", rATransformation ); } catch( const uno::Exception& e ) { diff --git a/chart2/source/view/main/VLegend.cxx b/chart2/source/view/main/VLegend.cxx index 13b136d9d363..764274883e74 100644 --- a/chart2/source/view/main/VLegend.cxx +++ b/chart2/source/view/main/VLegend.cxx @@ -70,12 +70,12 @@ double lcl_CalcViewFontSize( awt::Size aPropRefSize; float fFontHeight( 0.0 ); - if( xProp.is() && ( xProp->getPropertyValue( C2U( "CharHeight" )) >>= fFontHeight )) + if( xProp.is() && ( xProp->getPropertyValue( "CharHeight") >>= fFontHeight )) { fResult = fFontHeight; try { - if( (xProp->getPropertyValue( C2U( "ReferencePageSize" )) >>= aPropRefSize) && + if( (xProp->getPropertyValue( "ReferencePageSize") >>= aPropRefSize) && (aPropRefSize.Height > 0)) { fResult = ::chart::RelativeSizeHelper::calculate( fFontHeight, aPropRefSize, rReferenceSize ); @@ -104,7 +104,7 @@ void lcl_getProperties( ::chart::tPropertyNameValueMap aLineFillValueMap; ::chart::PropertyMapper::getValueMap( aLineFillValueMap, ::chart::PropertyMapper::getPropertyNameMapForFillAndLineProperties(), xLegendProp ); - aLineFillValueMap[ C2U("LineJoint") ] = uno::makeAny( drawing::LineJoint_ROUND ); + aLineFillValueMap[ "LineJoint" ] = uno::makeAny( drawing::LineJoint_ROUND ); ::chart::PropertyMapper::getMultiPropertyListsFromValueMap( rOutLineFillProperties.first, rOutLineFillProperties.second, aLineFillValueMap ); @@ -114,31 +114,31 @@ void lcl_getProperties( ::chart::PropertyMapper::getValueMap( aTextValueMap, ::chart::PropertyMapper::getPropertyNameMapForCharacterProperties(), xLegendProp ); drawing::TextHorizontalAdjust eHorizAdjust( drawing::TextHorizontalAdjust_LEFT ); - aTextValueMap[ C2U("TextAutoGrowHeight") ] = uno::makeAny( sal_True ); - aTextValueMap[ C2U("TextAutoGrowWidth") ] = uno::makeAny( sal_True ); - aTextValueMap[ C2U("TextHorizontalAdjust") ] = uno::makeAny( eHorizAdjust ); - aTextValueMap[ C2U("TextMaximumFrameWidth") ] = uno::makeAny( rReferenceSize.Width ); //needs to be overwritten by actual available space in the legend + aTextValueMap[ "TextAutoGrowHeight" ] = uno::makeAny( sal_True ); + aTextValueMap[ "TextAutoGrowWidth" ] = uno::makeAny( sal_True ); + aTextValueMap[ "TextHorizontalAdjust" ] = uno::makeAny( eHorizAdjust ); + aTextValueMap[ "TextMaximumFrameWidth" ] = uno::makeAny( rReferenceSize.Width ); //needs to be overwritten by actual available space in the legend // recalculate font size awt::Size aPropRefSize; float fFontHeight( 0.0 ); - if( (xLegendProp->getPropertyValue( C2U( "ReferencePageSize" )) >>= aPropRefSize) && + if( (xLegendProp->getPropertyValue( "ReferencePageSize") >>= aPropRefSize) && (aPropRefSize.Height > 0) && - (aTextValueMap[ C2U("CharHeight") ] >>= fFontHeight) ) + (aTextValueMap[ "CharHeight" ] >>= fFontHeight) ) { - aTextValueMap[ C2U("CharHeight") ] = uno::makeAny( + aTextValueMap[ "CharHeight" ] = uno::makeAny( static_cast< float >( ::chart::RelativeSizeHelper::calculate( fFontHeight, aPropRefSize, rReferenceSize ))); - if( aTextValueMap[ C2U("CharHeightAsian") ] >>= fFontHeight ) + if( aTextValueMap[ "CharHeightAsian" ] >>= fFontHeight ) { - aTextValueMap[ C2U("CharHeightAsian") ] = uno::makeAny( + aTextValueMap[ "CharHeightAsian" ] = uno::makeAny( static_cast< float >( ::chart::RelativeSizeHelper::calculate( fFontHeight, aPropRefSize, rReferenceSize ))); } - if( aTextValueMap[ C2U("CharHeightComplex") ] >>= fFontHeight ) + if( aTextValueMap[ "CharHeightComplex" ] >>= fFontHeight ) { - aTextValueMap[ C2U("CharHeightComplex") ] = uno::makeAny( + aTextValueMap[ "CharHeightComplex" ] = uno::makeAny( static_cast< float >( ::chart::RelativeSizeHelper::calculate( fFontHeight, aPropRefSize, rReferenceSize ))); } @@ -166,7 +166,7 @@ awt::Size lcl_createTextShapes( // create label shape Reference< drawing::XShape > xEntry( xShapeFactory->createInstance( - C2U( "com.sun.star.drawing.TextShape" )), uno::UNO_QUERY_THROW ); + "com.sun.star.drawing.TextShape"), uno::UNO_QUERY_THROW ); xTarget->add( xEntry ); // set label text @@ -181,7 +181,7 @@ awt::Size lcl_createTextShapes( OUString aLabelString( aLabelSeq[i]->getString()); // workaround for Issue #i67540# if( aLabelString.isEmpty()) - aLabelString = C2U(" "); + aLabelString = " "; if( xRange.is()) xRange->setString( aLabelString ); @@ -300,7 +300,7 @@ awt::Size lcl_placeLegendEntries( const sal_Int32 nSymbolToTextDistance = static_cast< sal_Int32 >( std::max( 100.0, fViewFontSize * 0.22 ) );//minimum 1mm const sal_Int32 nSymbolPlusDistanceWidth = rMaxSymbolExtent.Width + nSymbolToTextDistance; sal_Int32 nMaxTextWidth = rAvailableSpace.Width - (2 * nXPadding) - nSymbolPlusDistanceWidth; - rtl::OUString aPropNameTextMaximumFrameWidth( C2U("TextMaximumFrameWidth") ); + rtl::OUString aPropNameTextMaximumFrameWidth( "TextMaximumFrameWidth" ); uno::Any* pFrameWidthAny = PropertyMapper::getValuePointer( rTextProperties.second, rTextProperties.first, aPropNameTextMaximumFrameWidth); if(pFrameWidthAny) { @@ -769,7 +769,7 @@ bool lcl_shouldSymbolsBePlacedOnTheLeftSide( const Reference< beans::XPropertySe if(xLegendProp.is()) { sal_Int16 nWritingMode=-1; - if( (xLegendProp->getPropertyValue( C2U("WritingMode") ) >>= nWritingMode) ) + if( (xLegendProp->getPropertyValue( "WritingMode" ) >>= nWritingMode) ) { if( nWritingMode == text::WritingMode2::PAGE ) nWritingMode = nDefaultWritingMode; @@ -828,7 +828,7 @@ bool VLegend::isVisible( const Reference< XLegend > & xLegend ) try { Reference< beans::XPropertySet > xLegendProp( xLegend, uno::UNO_QUERY_THROW ); - xLegendProp->getPropertyValue( C2U( "Show" )) >>= bShow; + xLegendProp->getPropertyValue( "Show") >>= bShow; } catch( const uno::Exception & ex ) { @@ -853,7 +853,7 @@ void VLegend::createShapes( { //create shape and add to page m_xShape.set( m_xShapeFactory->createInstance( - C2U( "com.sun.star.drawing.GroupShape" )), uno::UNO_QUERY ); + "com.sun.star.drawing.GroupShape"), uno::UNO_QUERY ); m_xTarget->add( m_xShape ); // set name to enable selection @@ -868,7 +868,7 @@ void VLegend::createShapes( { Reference< drawing::XShape > xBorder( m_xShapeFactory->createInstance( - C2U( "com.sun.star.drawing.RectangleShape" )), uno::UNO_QUERY ); + "com.sun.star.drawing.RectangleShape"), uno::UNO_QUERY ); // for quickly setting properties tPropertyValues aLineFillProperties; @@ -881,11 +881,11 @@ void VLegend::createShapes( if( xLegendProp.is()) { // get Expansion property - xLegendProp->getPropertyValue( C2U( "Expansion" )) >>= eExpansion; + xLegendProp->getPropertyValue( "Expansion") >>= eExpansion; if( eExpansion == ::com::sun::star::chart::ChartLegendExpansion_CUSTOM ) { RelativeSize aRelativeSize; - if ((xLegendProp->getPropertyValue( C2U( "RelativeSize" )) >>= aRelativeSize)) + if ((xLegendProp->getPropertyValue( "RelativeSize") >>= aRelativeSize)) { aLegendSize.Width = static_cast<sal_Int32>(::rtl::math::approxCeil( aRelativeSize.Primary * rPageSize.Width )); aLegendSize.Height = static_cast<sal_Int32>(::rtl::math::approxCeil( aRelativeSize.Secondary * rPageSize.Height )); @@ -906,7 +906,7 @@ void VLegend::createShapes( Reference< beans::XPropertySet >( xBorder, uno::UNO_QUERY )); //because of this name this border will be used for marking the legend - ShapeFactory(m_xShapeFactory).setShapeName( xBorder, C2U("MarkHandles") ); + ShapeFactory(m_xShapeFactory).setShapeName( xBorder, "MarkHandles" ); } // create entries @@ -977,10 +977,10 @@ void VLegend::changePosition( chart2::RelativePosition aRelativePosition; bool bAutoPosition = - ! (xLegendProp->getPropertyValue( C2U( "RelativePosition" )) >>= aRelativePosition); + ! (xLegendProp->getPropertyValue( "RelativePosition") >>= aRelativePosition); LegendPosition ePos = LegendPosition_CUSTOM; - xLegendProp->getPropertyValue( C2U( "AnchorPosition" )) >>= ePos; + xLegendProp->getPropertyValue( "AnchorPosition") >>= ePos; //calculate position if( bAutoPosition ) diff --git a/chart2/source/view/main/VLegendSymbolFactory.cxx b/chart2/source/view/main/VLegendSymbolFactory.cxx index 24979bb30a59..a22cd9cffeb2 100644 --- a/chart2/source/view/main/VLegendSymbolFactory.cxx +++ b/chart2/source/view/main/VLegendSymbolFactory.cxx @@ -71,7 +71,7 @@ void lcl_setPropetiesToShape( ::chart::tAnySequence aPropValues; ::chart::PropertyMapper::getMultiPropertyListsFromValueMap( aPropNames, aPropValues, aValueMap ); - uno::Any* pLineWidthAny = ::chart::PropertyMapper::getValuePointer(aPropValues,aPropNames,C2U("LineWidth")); + uno::Any* pLineWidthAny = ::chart::PropertyMapper::getValuePointer(aPropValues,aPropNames,"LineWidth"); sal_Int32 nLineWidth = 0; if( pLineWidthAny && (*pLineWidthAny>>=nLineWidth) ) { @@ -104,7 +104,7 @@ Reference< drawing::XShape > VLegendSymbolFactory::createSymbol( return xResult; xResult.set( xShapeFactory->createInstance( - C2U( "com.sun.star.drawing.GroupShape" )), uno::UNO_QUERY ); + "com.sun.star.drawing.GroupShape"), uno::UNO_QUERY ); xSymbolContainer->add( xResult ); Reference< drawing::XShapes > xResultGroup( xResult, uno::UNO_QUERY ); if( ! xResultGroup.is()) @@ -120,7 +120,7 @@ Reference< drawing::XShape > VLegendSymbolFactory::createSymbol( if( eStyle == LegendSymbolStyle_LINE ) { Reference< drawing::XShape > xLine( xShapeFactory->createInstance( - C2U( "com.sun.star.drawing.LineShape" )), uno::UNO_QUERY ); + "com.sun.star.drawing.LineShape"), uno::UNO_QUERY ); if( xLine.is()) { xResultGroup->add( xLine ); @@ -141,7 +141,7 @@ Reference< drawing::XShape > VLegendSymbolFactory::createSymbol( if( aSymbol.Style == chart2::SymbolStyle_STANDARD ) { // take series color as fill color - xLegendEntryProperties->getPropertyValue( C2U("Color")) >>= aSymbol.FillColor; + xLegendEntryProperties->getPropertyValue( "Color") >>= aSymbol.FillColor; // border of symbols always same as fill color aSymbol.BorderColor = aSymbol.FillColor; @@ -170,7 +170,7 @@ Reference< drawing::XShape > VLegendSymbolFactory::createSymbol( else if( eStyle == LegendSymbolStyle_CIRCLE ) { Reference< drawing::XShape > xShape( xShapeFactory->createInstance( - C2U( "com.sun.star.drawing.EllipseShape" )), uno::UNO_QUERY ); + "com.sun.star.drawing.EllipseShape"), uno::UNO_QUERY ); if( xShape.is() ) { xResultGroup->add( xShape ); @@ -183,7 +183,7 @@ Reference< drawing::XShape > VLegendSymbolFactory::createSymbol( else // eStyle == LegendSymbolStyle_BOX { Reference< drawing::XShape > xShape( xShapeFactory->createInstance( - C2U( "com.sun.star.drawing.RectangleShape" )), uno::UNO_QUERY ); + "com.sun.star.drawing.RectangleShape"), uno::UNO_QUERY ); if( xShape.is() ) { xResultGroup->add( xShape ); diff --git a/chart2/source/view/main/VLineProperties.cxx b/chart2/source/view/main/VLineProperties.cxx index f999388a4fd9..22c4155811d9 100644 --- a/chart2/source/view/main/VLineProperties.cxx +++ b/chart2/source/view/main/VLineProperties.cxx @@ -48,11 +48,11 @@ void VLineProperties::initFromPropertySet( const uno::Reference< beans::XPropert { if( bUseSeriesPropertyNames ) try { - this->Color = xProp->getPropertyValue( C2U( "BorderColor" ) ); - this->LineStyle = xProp->getPropertyValue( C2U( "BorderStyle" ) ); - this->Transparence = xProp->getPropertyValue( C2U( "BorderTransparency" ) ); - this->Width = xProp->getPropertyValue( C2U( "BorderWidth" ) ); - this->DashName = xProp->getPropertyValue( C2U( "BorderDashName" ) ); + this->Color = xProp->getPropertyValue( "BorderColor" ); + this->LineStyle = xProp->getPropertyValue( "BorderStyle" ); + this->Transparence = xProp->getPropertyValue( "BorderTransparency" ); + this->Width = xProp->getPropertyValue( "BorderWidth" ); + this->DashName = xProp->getPropertyValue( "BorderDashName" ); } catch( const uno::Exception& e ) { @@ -60,11 +60,11 @@ void VLineProperties::initFromPropertySet( const uno::Reference< beans::XPropert } else try { - this->Color = xProp->getPropertyValue( C2U( "LineColor" ) ); - this->LineStyle = xProp->getPropertyValue( C2U( "LineStyle" ) ); - this->Transparence = xProp->getPropertyValue( C2U( "LineTransparence" ) ); - this->Width = xProp->getPropertyValue( C2U( "LineWidth" ) ); - this->DashName = xProp->getPropertyValue( C2U( "LineDashName" ) ); + this->Color = xProp->getPropertyValue( "LineColor" ); + this->LineStyle = xProp->getPropertyValue( "LineStyle" ); + this->Transparence = xProp->getPropertyValue( "LineTransparence" ); + this->Width = xProp->getPropertyValue( "LineWidth" ); + this->DashName = xProp->getPropertyValue( "LineDashName" ); } catch( const uno::Exception& e ) { diff --git a/chart2/source/view/main/VTitle.cxx b/chart2/source/view/main/VTitle.cxx index 4fb26a00410d..9fcd762d6fff 100644 --- a/chart2/source/view/main/VTitle.cxx +++ b/chart2/source/view/main/VTitle.cxx @@ -101,7 +101,7 @@ void VTitle::changePosition( const awt::Point& rPos ) ::basegfx::B2DHomMatrix aM; aM.rotate( -m_fRotationAngleDegree*F_PI/180.0 );//#i78696#->#i80521# aM.translate( m_nXPos, m_nYPos); - xShapeProp->setPropertyValue( C2U( "Transformation" ), uno::makeAny( B2DHomMatrixToHomogenMatrix3(aM) ) ); + xShapeProp->setPropertyValue( "Transformation", uno::makeAny( B2DHomMatrixToHomogenMatrix3(aM) ) ); } catch( const uno::Exception& e ) { @@ -124,8 +124,8 @@ void VTitle::createShapes( //create shape and add to page uno::Reference< drawing::XShape > xShape( - m_xShapeFactory->createInstance( C2U( - "com.sun.star.drawing.TextShape" ) ), uno::UNO_QUERY ); + m_xShapeFactory->createInstance( + "com.sun.star.drawing.TextShape" ), uno::UNO_QUERY ); m_xTarget->add(xShape); m_xShape = xShape; @@ -152,14 +152,14 @@ void VTitle::createShapes( drawing::TextHorizontalAdjust eHorizontalAdjust = drawing::TextHorizontalAdjust_CENTER; drawing::TextVerticalAdjust eVerticalAdjust = drawing::TextVerticalAdjust_CENTER; - aValueMap.insert( tPropertyNameValueMap::value_type( C2U("TextHorizontalAdjust"), uno::makeAny(eHorizontalAdjust) ) ); // drawing::TextHorizontalAdjust - aValueMap.insert( tPropertyNameValueMap::value_type( C2U("TextVerticalAdjust"), uno::makeAny(eVerticalAdjust) ) ); //drawing::TextVerticalAdjust - aValueMap.insert( tPropertyNameValueMap::value_type( C2U("TextAutoGrowHeight"), uno::makeAny(sal_True) ) ); // sal_Bool - aValueMap.insert( tPropertyNameValueMap::value_type( C2U("TextAutoGrowWidth"), uno::makeAny(sal_True) ) ); // sal_Bool + aValueMap.insert( tPropertyNameValueMap::value_type( "TextHorizontalAdjust", uno::makeAny(eHorizontalAdjust) ) ); // drawing::TextHorizontalAdjust + aValueMap.insert( tPropertyNameValueMap::value_type( "TextVerticalAdjust", uno::makeAny(eVerticalAdjust) ) ); //drawing::TextVerticalAdjust + aValueMap.insert( tPropertyNameValueMap::value_type( "TextAutoGrowHeight", uno::makeAny(sal_True) ) ); // sal_Bool + aValueMap.insert( tPropertyNameValueMap::value_type( "TextAutoGrowWidth", uno::makeAny(sal_True) ) ); // sal_Bool //set name/classified ObjectID (CID) if( !m_aCID.isEmpty() ) - aValueMap.insert( tPropertyNameValueMap::value_type( C2U("Name"), uno::makeAny( m_aCID ) ) ); //CID rtl::OUString + aValueMap.insert( tPropertyNameValueMap::value_type( "Name", uno::makeAny( m_aCID ) ) ); //CID rtl::OUString } //set global title properties @@ -173,7 +173,7 @@ void VTitle::createShapes( sal_Bool bStackCharacters(sal_False); try { - xTitleProperties->getPropertyValue( C2U( "StackCharacters" ) ) >>= bStackCharacters; + xTitleProperties->getPropertyValue( "StackCharacters" ) >>= bStackCharacters; } catch( const uno::Exception& e ) { @@ -200,7 +200,7 @@ void VTitle::createShapes( // adapt font size according to page size awt::Size aOldRefSize; - if( xTitleProperties->getPropertyValue( C2U("ReferencePageSize")) >>= aOldRefSize ) + if( xTitleProperties->getPropertyValue( "ReferencePageSize") >>= aOldRefSize ) { RelativeSizeHelper::adaptFontSizes( xTargetProps, aOldRefSize, rReferenceSize ); } @@ -219,7 +219,7 @@ void VTitle::createShapes( } awt::Size aOldRefSize; bool bHasRefPageSize = - ( xTitleProperties->getPropertyValue( C2U("ReferencePageSize")) >>= aOldRefSize ); + ( xTitleProperties->getPropertyValue( "ReferencePageSize") >>= aOldRefSize ); if( aStringList.getLength()>0 ) { @@ -237,23 +237,23 @@ void VTitle::createShapes( // #i109336# Improve auto positioning in chart float fFontHeight = 0.0; - if ( xShapeProp.is() && ( xShapeProp->getPropertyValue( C2U( "CharHeight" ) ) >>= fFontHeight ) ) + if ( xShapeProp.is() && ( xShapeProp->getPropertyValue( "CharHeight" ) >>= fFontHeight ) ) { fFontHeight *= ( 2540.0f / 72.0f ); // pt -> 1/100 mm float fXFraction = 0.18f; sal_Int32 nXDistance = static_cast< sal_Int32 >( ::rtl::math::round( fFontHeight * fXFraction ) ); float fYFraction = 0.30f; sal_Int32 nYDistance = static_cast< sal_Int32 >( ::rtl::math::round( fFontHeight * fYFraction ) ); - xShapeProp->setPropertyValue( C2U( "TextLeftDistance" ), uno::makeAny( nXDistance ) ); - xShapeProp->setPropertyValue( C2U( "TextRightDistance" ), uno::makeAny( nXDistance ) ); - xShapeProp->setPropertyValue( C2U( "TextUpperDistance" ), uno::makeAny( nYDistance ) ); - xShapeProp->setPropertyValue( C2U( "TextLowerDistance" ), uno::makeAny( nYDistance ) ); + xShapeProp->setPropertyValue( "TextLeftDistance", uno::makeAny( nXDistance ) ); + xShapeProp->setPropertyValue( "TextRightDistance", uno::makeAny( nXDistance ) ); + xShapeProp->setPropertyValue( "TextUpperDistance", uno::makeAny( nYDistance ) ); + xShapeProp->setPropertyValue( "TextLowerDistance", uno::makeAny( nYDistance ) ); } try { double fAngleDegree = 0; - xTitleProperties->getPropertyValue( C2U( "TextRotation" ) ) >>= fAngleDegree; + xTitleProperties->getPropertyValue( "TextRotation" ) >>= fAngleDegree; m_fRotationAngleDegree += fAngleDegree; } catch( const uno::Exception& e ) @@ -268,7 +268,7 @@ void VTitle::createShapes( ::basegfx::B2DHomMatrix aM; aM.rotate( -m_fRotationAngleDegree*F_PI/180.0 );//#i78696#->#i80521# aM.translate( m_nXPos, m_nYPos ); - xShapeProp->setPropertyValue( C2U( "Transformation" ), uno::makeAny( B2DHomMatrixToHomogenMatrix3(aM) ) ); + xShapeProp->setPropertyValue( "Transformation", uno::makeAny( B2DHomMatrixToHomogenMatrix3(aM) ) ); } catch( const uno::Exception& e ) { diff --git a/cli_ure/source/climaker/climaker_app.cxx b/cli_ure/source/climaker/climaker_app.cxx index 5294d93a97bf..151c7ab81889 100644 --- a/cli_ure/source/climaker/climaker_app.cxx +++ b/cli_ure/source/climaker/climaker_app.cxx @@ -238,14 +238,14 @@ static OUString path_make_absolute_file_url( OUString const & path ) else { throw RuntimeException( - OUSTR("cannot make absolute: ") + file_url, + "cannot make absolute: " + file_url, Reference< XInterface >() ); } } else { throw RuntimeException( - OUSTR("cannot get file url from system path: ") + path, + "cannot get file url from system path: " + path, Reference< XInterface >() ); } } @@ -258,7 +258,7 @@ Reference< registry::XSimpleRegistry > open_registries( if (registries.empty()) { throw RuntimeException( - OUSTR("no registries given!"), + "no registries given!", Reference< XInterface >() ); } @@ -267,13 +267,13 @@ Reference< registry::XSimpleRegistry > open_registries( { Reference< registry::XSimpleRegistry > xReg( xContext->getServiceManager()->createInstanceWithContext( - OUSTR("com.sun.star.registry.SimpleRegistry"), xContext ), + "com.sun.star.registry.SimpleRegistry", xContext ), UNO_QUERY_THROW ); xReg->open( registries[ nPos ], sal_True, sal_False ); if (! xReg->isValid()) { throw RuntimeException( - OUSTR("invalid registry: ") + registries[ nPos ], + "invalid registry: " + registries[ nPos ], Reference< XInterface >() ); } @@ -281,7 +281,7 @@ Reference< registry::XSimpleRegistry > open_registries( { Reference< registry::XSimpleRegistry > xNested( xContext->getServiceManager()->createInstanceWithContext( - OUSTR("com.sun.star.registry.NestedRegistry"), xContext ), + "com.sun.star.registry.NestedRegistry", xContext ), UNO_QUERY_THROW ); Reference< lang::XInitialization > xInit( xNested, UNO_QUERY_THROW ); @@ -320,33 +320,33 @@ SAL_IMPLEMENT_MAIN() try { OptionInfo const * info_help = - get_option_info( OUSTR("help") ); + get_option_info( "help" ); OptionInfo const * info_verbose = - get_option_info( OUSTR("verbose") ); + get_option_info( "verbose" ); OptionInfo const * info_out = - get_option_info( OUSTR("out") ); + get_option_info( "out" ); OptionInfo const * info_types = - get_option_info( OUSTR("types") ); + get_option_info( "types" ); OptionInfo const * info_reference = - get_option_info( OUSTR("reference") ); + get_option_info( "reference" ); OptionInfo const * info_extra = - get_option_info( OUSTR("extra") ); + get_option_info( "extra" ); OptionInfo const * info_keyfile = - get_option_info( OUSTR("keyfile") ); + get_option_info( "keyfile" ); OptionInfo const * info_delaySign = - get_option_info( OUSTR("delaySign") ); + get_option_info( "delaySign" ); OptionInfo const * info_version = - get_option_info( OUSTR("assembly-version") ); + get_option_info( "assembly-version" ); OptionInfo const * info_product = - get_option_info( OUSTR("assembly-product") ); + get_option_info( "assembly-product" ); OptionInfo const * info_description = - get_option_info( OUSTR("assembly-description") ); + get_option_info( "assembly-description" ); OptionInfo const * info_company = - get_option_info( OUSTR("assembly-company") ); + get_option_info( "assembly-company" ); OptionInfo const * info_copyright = - get_option_info( OUSTR("assembly-copyright") ); + get_option_info( "assembly-copyright" ); OptionInfo const * info_trademark = - get_option_info( OUSTR("assembly-trademark") ); + get_option_info( "assembly-trademark" ); OUString output; vector< OUString > mandatory_registries; @@ -455,23 +455,23 @@ SAL_IMPLEMENT_MAIN() xContext = ::cppu::defaultBootstrap_InitialComponentContext(); Reference< container::XHierarchicalNameAccess > xTDmgr( xContext->getValueByName( - OUSTR("/singletons/com.sun.star.reflection." - "theTypeDescriptionManager") ), + "/singletons/com.sun.star.reflection." + "theTypeDescriptionManager" ), UNO_QUERY_THROW ); // get rdb tdprovider factory Reference< lang::XSingleComponentFactory > xTDprov_factory( ::cppu::loadSharedLibComponentFactory( - OUSTR("bootstrap.uno" SAL_DLLEXTENSION), OUString(), - OUSTR("com.sun.star.comp.stoc.RegistryTypeDescriptionProvider"), + "bootstrap.uno" SAL_DLLEXTENSION, OUString(), + "com.sun.star.comp.stoc.RegistryTypeDescriptionProvider", Reference< lang::XMultiServiceFactory >( xContext->getServiceManager(), UNO_QUERY ), Reference< registry::XRegistryKey >() ), UNO_QUERY ); if (! xTDprov_factory.is()) { throw RuntimeException( - OUSTR("cannot get registry typedescription provider: " - "bootstrap.uno" SAL_DLLEXTENSION "!"), + "cannot get registry typedescription provider: " + "bootstrap.uno" SAL_DLLEXTENSION "!", Reference< XInterface >() ); } @@ -508,7 +508,7 @@ SAL_IMPLEMENT_MAIN() } else { - output = OUSTR("cli_unotypes"); + output = "cli_unotypes"; } } output = path_make_absolute_file_url( output ); @@ -518,7 +518,7 @@ SAL_IMPLEMENT_MAIN() output.copy( 0, slash ), sys_output_dir )) { throw RuntimeException( - OUSTR("cannot get system path from file url ") + + "cannot get system path from file url " + output.copy( 0, slash ), Reference< XInterface >() ); } @@ -526,7 +526,7 @@ SAL_IMPLEMENT_MAIN() sal_Int32 dot = filename.lastIndexOf( '.' ); OUString name( filename ); if (dot < 0) // has no extension - filename += OUSTR(".dll"); + filename += ".dll"; else name = name.copy( 0, dot ); ::System::String ^ output_dir = ustring_to_String( sys_output_dir ); @@ -545,7 +545,7 @@ SAL_IMPLEMENT_MAIN() } catch (System::IO::FileNotFoundException ^ ) { - throw Exception(OUSTR("Could not find the keyfile. Verify the --keyfile argument!"), 0); + throw Exception("Could not find the keyfile. Verify the --keyfile argument!", 0); } } else diff --git a/cli_ure/source/climaker/climaker_emit.cxx b/cli_ure/source/climaker/climaker_emit.cxx index 1eb1f9f1e1eb..cb4e427d7904 100644 --- a/cli_ure/source/climaker/climaker_emit.cxx +++ b/cli_ure/source/climaker/climaker_emit.cxx @@ -89,7 +89,7 @@ static inline ::System::Object ^ to_cli_constant( Any const & value ) value.getValue() )); default: throw RuntimeException( - OUSTR("unexpected constant type ") + + "unexpected constant type " + value.getValueType().getTypeName(), Reference< XInterface >() ); } @@ -1030,7 +1030,7 @@ Assembly ^ TypeEmitter::type_resolve( // getter Emit::MethodBuilder ^ method_builder = type_builder->DefineMethod( - ustring_to_String( OUSTR("get_") + + ustring_to_String( "get_" + xAttribute->getMemberName() ), c_property_method_attr, attribute_type, parameters ); @@ -1049,7 +1049,7 @@ Assembly ^ TypeEmitter::type_resolve( parameters[ 0 ] = attribute_type; method_builder = type_builder->DefineMethod( - ustring_to_String( OUSTR("set_") + + ustring_to_String( "set_" + xAttribute->getMemberName() ), c_property_method_attr, nullptr, parameters ); // define parameter info @@ -1140,9 +1140,9 @@ Assembly ^ TypeEmitter::type_resolve( const OUString sType(entry->m_xType->getName()); const OUString sMemberName(pseq_member_names[i]); if ( ! pseq_members[i].is()) - throw RuntimeException(OUSTR("Missing type description . Check if you need to " \ - "specify additional RDBs with the --extra option. Type missing for: ") + sType + - OUSTR("::") + sMemberName,0); + throw RuntimeException("Missing type description . Check if you need to " + + "specify additional RDBs with the --extra option. Type missing for: " + sType + + "::" + sMemberName,0); } sal_Int32 all_members_length = 0; @@ -1265,7 +1265,7 @@ Assembly ^ TypeEmitter::type_resolve( else { throw RuntimeException( - OUSTR("unexpected member type in ") + entry->m_xType->getName(), + "unexpected member type in " + entry->m_xType->getName(), Reference< XInterface >() ); } } @@ -2153,7 +2153,7 @@ Emit::CustomAttributeBuilder^ TypeEmitter::get_exception_attribute( return nullptr; default: throw RuntimeException( - OUSTR("unexpected type ") + xType->getName(), + "unexpected type " + xType->getName(), Reference< XInterface >() ); } } @@ -2287,7 +2287,7 @@ resolveInterfaceTypedef( type, UNO_QUERY); if (xIndTd.is() == sal_False) throw css::uno::Exception( - OUSTR("resolveInterfaceTypedef was called with an invalid argument"), 0); + "resolveInterfaceTypedef was called with an invalid argument", 0); return resolveInterfaceTypedef(xIndTd->getReferencedType()); } diff --git a/cli_ure/source/climaker/climaker_share.h b/cli_ure/source/climaker/climaker_share.h index f6e987f45777..b1d1b09c5dac 100755 --- a/cli_ure/source/climaker/climaker_share.h +++ b/cli_ure/source/climaker/climaker_share.h @@ -31,8 +31,6 @@ #include "com/sun/star/reflection/XSingletonTypeDescription2.hpp" #include "com/sun/star/reflection/XInterfaceMethodTypeDescription.hpp" -#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) - namespace climaker { diff --git a/cli_ure/source/native/native_share.h b/cli_ure/source/native/native_share.h index 23977dfb0f00..e4aa0cf6babf 100644 --- a/cli_ure/source/native/native_share.h +++ b/cli_ure/source/native/native_share.h @@ -25,8 +25,6 @@ #include <vcclr.h> -#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) - namespace uno { @@ -51,12 +49,12 @@ inline ::System::Object ^ to_cli( ::com::sun::star::uno::Reference< T > const & x ) { ::com::sun::star::uno::Mapping mapping( - OUSTR(CPPU_CURRENT_LANGUAGE_BINDING_NAME), OUSTR(UNO_LB_CLI) ); + CPPU_CURRENT_LANGUAGE_BINDING_NAME, UNO_LB_CLI ); OSL_ASSERT( mapping.is() ); if (! mapping.is()) { throw ::com::sun::star::uno::RuntimeException( - OUSTR("cannot get mapping from C++ to CLI!"), + "cannot get mapping from C++ to CLI!", ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() ); } @@ -75,12 +73,12 @@ inline void to_uno( ::com::sun::star::uno::Reference< T > * pRet, ::System::Object ^ x ) { ::com::sun::star::uno::Mapping mapping( - OUSTR(UNO_LB_CLI), OUSTR(CPPU_CURRENT_LANGUAGE_BINDING_NAME) ); + UNO_LB_CLI, CPPU_CURRENT_LANGUAGE_BINDING_NAME ); OSL_ASSERT( mapping.is() ); if (! mapping.is()) { throw ::com::sun::star::uno::RuntimeException( - OUSTR("cannot get mapping from CLI to C++!"), + "cannot get mapping from CLI to C++!", ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() ); } diff --git a/cli_ure/source/uno_bridge/cli_base.h b/cli_ure/source/uno_bridge/cli_base.h index 505790b132b6..b03504fcc90c 100644 --- a/cli_ure/source/uno_bridge/cli_base.h +++ b/cli_ure/source/uno_bridge/cli_base.h @@ -34,8 +34,6 @@ struct _oslMutexImpl #using <system.dll> -#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) - namespace cli_uno { System::Type^ loadCliType(System::String ^ typeName); @@ -133,7 +131,7 @@ inline ::std::auto_ptr< rtl_mem > rtl_mem::allocate( ::std::size_t bytes ) { void * p = rtl_allocateMemory( bytes ); if (0 == p) - throw BridgeRuntimeError(OUSTR("out of memory!") ); + throw BridgeRuntimeError("out of memory!" ); return ::std::auto_ptr< rtl_mem >( (rtl_mem *)p ); } @@ -161,7 +159,7 @@ inline TypeDescr::TypeDescr( typelib_TypeDescriptionReference * td_ref ) if (0 == m_td) { throw BridgeRuntimeError( - OUSTR("cannot get comprehensive type description for ") + + "cannot get comprehensive type description for " + *reinterpret_cast< ::rtl::OUString const * >( &td_ref->pTypeName ) ); } } diff --git a/cli_ure/source/uno_bridge/cli_bridge.cxx b/cli_ure/source/uno_bridge/cli_bridge.cxx index 4d6a4e3a2ddb..ef9fd01b732c 100644 --- a/cli_ure/source/uno_bridge/cli_bridge.cxx +++ b/cli_ure/source/uno_bridge/cli_bridge.cxx @@ -90,7 +90,7 @@ void SAL_CALL Mapping_cli2uno( #if OSL_DEBUG_LEVEL >= 1 OString cstr_msg( OUStringToOString( - OUSTR("[cli_uno bridge error] ") + err.m_message, RTL_TEXTENCODING_ASCII_US ) ); + "[cli_uno bridge error] " + err.m_message, RTL_TEXTENCODING_ASCII_US ) ); OSL_FAIL( cstr_msg.getStr() ); #else (void) err; // unused @@ -149,7 +149,7 @@ void SAL_CALL Mapping_uno2cli( #if OSL_DEBUG_LEVEL >= 1 rtl::OString cstr_msg( rtl::OUStringToOString( - OUSTR("[cli_uno bridge error] ") + err.m_message, RTL_TEXTENCODING_ASCII_US ) ); + "[cli_uno bridge error] " + err.m_message, RTL_TEXTENCODING_ASCII_US ) ); OSL_FAIL( cstr_msg.getStr() ); #else (void) err; // unused @@ -329,7 +329,7 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL uno_ext_getMapping( #if OSL_DEBUG_LEVEL >= 1 OString cstr_msg( OUStringToOString( - OUSTR("[cli_uno bridge error] ") + err.m_message, RTL_TEXTENCODING_ASCII_US ) ); + "[cli_uno bridge error] " + err.m_message, RTL_TEXTENCODING_ASCII_US ) ); OSL_FAIL( cstr_msg.getStr() ); #else (void) err; // unused diff --git a/cli_ure/source/uno_bridge/cli_data.cxx b/cli_ure/source/uno_bridge/cli_data.cxx index 373e4bf10a5f..48ad72c7a1a6 100644 --- a/cli_ure/source/uno_bridge/cli_data.cxx +++ b/cli_ure/source/uno_bridge/cli_data.cxx @@ -647,7 +647,7 @@ OUString mapCliTypeName(System::String^ typeName) { if (!bRightBracket) throw BridgeRuntimeError( - OUSTR("Typename is wrong. No matching brackets for sequence. Name is: ") + + "Typename is wrong. No matching brackets for sequence. Name is: " + mapCliString(typeName)); bRightBracket = false; dims ++; @@ -656,7 +656,7 @@ OUString mapCliTypeName(System::String^ typeName) { if (bRightBracket) throw BridgeRuntimeError( - OUSTR("Typename is wrong. No matching brackets for sequence. Name is: ") + + "Typename is wrong. No matching brackets for sequence. Name is: " + mapCliString(typeName)); break; } @@ -665,7 +665,7 @@ OUString mapCliTypeName(System::String^ typeName) if (bRightBracket || cur < 0) throw BridgeRuntimeError( - OUSTR("Typename is wrong. ") + + "Typename is wrong. " + mapCliString(typeName)); typeName = typeName->Substring(0, cur + 1); diff --git a/cli_ure/source/uno_bridge/cli_proxy.cxx b/cli_ure/source/uno_bridge/cli_proxy.cxx index 61c3036ee14d..0aa031161daa 100644 --- a/cli_ure/source/uno_bridge/cli_proxy.cxx +++ b/cli_ure/source/uno_bridge/cli_proxy.cxx @@ -1061,7 +1061,7 @@ void SAL_CALL cli_proxy_dispatch( != demanded_td.get()->eTypeClass) { throw BridgeRuntimeError( - OUSTR("queryInterface() call demands an INTERFACE type!")); + "queryInterface() call demands an INTERFACE type!"); } uno_Interface * pInterface = 0; @@ -1139,7 +1139,7 @@ void SAL_CALL cli_proxy_dispatch( default: { throw BridgeRuntimeError( - OUSTR("illegal member type description!") ); + "illegal member type description!" ); } } } @@ -1147,7 +1147,7 @@ void SAL_CALL cli_proxy_dispatch( { // binary identical struct ::com::sun::star::uno::RuntimeException exc( - OUSTR("[cli_uno bridge error] ") + err.m_message, + "[cli_uno bridge error] " + err.m_message, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() ); ::com::sun::star::uno::Type const & exc_type = ::getCppuType( & exc); diff --git a/cppuhelper/source/access_control.cxx b/cppuhelper/source/access_control.cxx index 8a08ccbb0124..5c39d73c99d7 100644 --- a/cppuhelper/source/access_control.cxx +++ b/cppuhelper/source/access_control.cxx @@ -25,8 +25,6 @@ #include <com/sun/star/io/FilePermission.hpp> #include <com/sun/star/connection/SocketPermission.hpp> -#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) - using namespace ::rtl; using namespace ::osl; @@ -37,7 +35,7 @@ namespace { inline OUString str_ac_singleton() { - return OUSTR("/singletons/com.sun.star.security.theAccessController"); + return OUString("/singletons/com.sun.star.security.theAccessController"); } } @@ -50,7 +48,7 @@ AccessControl::AccessControl( Reference< XComponentContext > const & xContext ) if (! (xContext->getValueByName( str_ac_singleton() ) >>= m_xController)) { throw SecurityException( - OUSTR("no access controller!"), Reference< XInterface >() ); + "no access controller!", Reference< XInterface >() ); } } //__________________________________________________________________________________________________ @@ -62,7 +60,7 @@ AccessControl::AccessControl( if (! m_xController.is()) { throw SecurityException( - OUSTR("no access controller!"), Reference< XInterface >() ); + "no access controller!", Reference< XInterface >() ); } } //__________________________________________________________________________________________________ @@ -73,7 +71,7 @@ AccessControl::AccessControl( AccessControl const & ac ) if (! m_xController.is()) { throw SecurityException( - OUSTR("no access controller!"), Reference< XInterface >() ); + "no access controller!", Reference< XInterface >() ); } } diff --git a/cppuhelper/source/bootstrap.cxx b/cppuhelper/source/bootstrap.cxx index 802fe1142d19..b984de0b82fa 100644 --- a/cppuhelper/source/bootstrap.cxx +++ b/cppuhelper/source/bootstrap.cxx @@ -42,7 +42,6 @@ #include "macro_expander.hxx" -#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) #define ARLEN(x) sizeof (x) / sizeof *(x) @@ -92,7 +91,7 @@ Reference< XComponentContext > SAL_CALL bootstrap() char const * p1 = cppuhelper_detail_findSofficePath(); if (p1 == NULL) { throw BootstrapException( - OUSTR("no soffice installation found!")); + "no soffice installation found!"); } rtl::OUString p2; if (!rtl_convertStringToUString( @@ -102,40 +101,40 @@ Reference< XComponentContext > SAL_CALL bootstrap() RTL_TEXTTOUNICODE_FLAGS_INVALID_ERROR))) { throw BootstrapException( - OUSTR("bad characters in soffice installation path!")); + "bad characters in soffice installation path!"); } OUString path; if (osl::FileBase::getFileURLFromSystemPath(p2, path) != osl::FileBase::E_None) { throw BootstrapException( - OUSTR("cannot convert soffice installation path to URL!")); + "cannot convert soffice installation path to URL!"); } if (!path.isEmpty() && path[path.getLength() - 1] != '/') { - path += OUSTR("/"); + path += "/"; } OUString uri; - if (!Bootstrap::get(OUSTR("URE_BOOTSTRAP"), uri)) { + if (!Bootstrap::get("URE_BOOTSTRAP", uri)) { Bootstrap::set( - OUSTR("URE_BOOTSTRAP"), - Bootstrap::encode(path + OUSTR(SAL_CONFIGFILE("fundamental")))); + "URE_BOOTSTRAP", + Bootstrap::encode(path + SAL_CONFIGFILE("fundamental"))); } // create default local component context Reference< XComponentContext > xLocalContext( defaultBootstrap_InitialComponentContext() ); if ( !xLocalContext.is() ) - throw BootstrapException( OUSTR( "no local component context!" ) ); + throw BootstrapException( "no local component context!" ); // create a random pipe name rtlRandomPool hPool = rtl_random_createPool(); if ( hPool == 0 ) - throw BootstrapException( OUSTR( "cannot create random pool!" ) ); + throw BootstrapException( "cannot create random pool!" ); sal_uInt8 bytes[ 16 ]; if ( rtl_random_getBytes( hPool, bytes, ARLEN( bytes ) ) != rtl_Random_E_None ) - throw BootstrapException( OUSTR( "random pool error!" ) ); + throw BootstrapException( "random pool error!" ); rtl_random_destroyPool( hPool ); ::rtl::OUStringBuffer buf; buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "uno" ) ); @@ -151,11 +150,11 @@ Reference< XComponentContext > SAL_CALL bootstrap() // arguments OUString args [] = { - OUSTR( "--nologo" ), - OUSTR( "--nodefault" ), - OUSTR( "--norestore" ), - OUSTR( "--nocrashreport" ), - OUSTR( "--nolockcheck" ), + OUString("--nologo"), + OUString("--nodefault"), + OUString("--norestore"), + OUString("--nocrashreport"), + OUString("--nolockcheck"), buf.makeStringAndClear() }; rtl_uString * ar_args [] = { @@ -183,16 +182,16 @@ Reference< XComponentContext > SAL_CALL bootstrap() osl_freeProcessHandle( hProcess ); break; case osl_Process_E_NotFound: - throw BootstrapException( OUSTR( "image not found!" ) ); + throw BootstrapException( "image not found!" ); case osl_Process_E_TimedOut: - throw BootstrapException( OUSTR( "timout occurred!" ) ); + throw BootstrapException( "timout occurred!" ); case osl_Process_E_NoPermission: - throw BootstrapException( OUSTR( "permission denied!" ) ); + throw BootstrapException( "permission denied!" ); case osl_Process_E_Unknown: - throw BootstrapException( OUSTR( "unknown error!" ) ); + throw BootstrapException( "unknown error!" ); case osl_Process_E_InvalidError: default: - throw BootstrapException( OUSTR( "unmapped error!" ) ); + throw BootstrapException( "unmapped error!" ); } // create a URL resolver @@ -228,7 +227,7 @@ Reference< XComponentContext > SAL_CALL bootstrap() catch ( Exception & e ) { throw BootstrapException( - OUSTR( "unexpected UNO exception caught: " ) + e.Message ); + "unexpected UNO exception caught: " + e.Message ); } return xRemoteContext; diff --git a/cppuhelper/source/component_context.cxx b/cppuhelper/source/component_context.cxx index 18e150c528ca..b95d50e1f304 100644 --- a/cppuhelper/source/component_context.cxx +++ b/cppuhelper/source/component_context.cxx @@ -59,7 +59,6 @@ #define SMGR_SINGLETON "/singletons/com.sun.star.lang.theServiceManager" #define TDMGR_SINGLETON "/singletons/com.sun.star.reflection.theTypeDescriptionManager" #define AC_SINGLETON "/singletons/com.sun.star.security.theAccessController" -#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) using namespace ::osl; @@ -76,7 +75,7 @@ static OUString val2str( void const * pVal, typelib_TypeDescriptionReference * p { OSL_ASSERT( pVal ); if (pTypeRef->eTypeClass == typelib_TypeClass_VOID) - return OUSTR("void"); + return "void"; OUStringBuffer buf( 64 ); buf.append( (sal_Unicode)'(' ); @@ -420,7 +419,7 @@ void ComponentContext::insertByName( t_map::value_type( name, entry ) ) ); if (! insertion.second) throw container::ElementExistException( - OUSTR("element already exists: ") + name, + "element already exists: " + name, static_cast<OWeakObject *>(this) ); } @@ -433,7 +432,7 @@ void ComponentContext::removeByName( OUString const & name ) t_map::iterator iFind( m_map.find( name ) ); if (iFind == m_map.end()) throw container::NoSuchElementException( - OUSTR("no such element: ") + name, + "no such element: " + name, static_cast<OWeakObject *>(this) ); delete iFind->second; @@ -451,7 +450,7 @@ void ComponentContext::replaceByName( t_map::const_iterator const iFind( m_map.find( name ) ); if (iFind == m_map.end()) throw container::NoSuchElementException( - OUSTR("no such element: ") + name, + "no such element: " + name, static_cast<OWeakObject *>(this) ); if (name.matchAsciiL( RTL_CONSTASCII_STRINGPARAM("/singletons/") ) && !element.hasValue()) @@ -551,8 +550,8 @@ Any ComponentContext::lookupMap( OUString const & rName ) try { - Any usesService( getValueByName( rName + OUSTR("/service") ) ); - Any args_( getValueByName( rName + OUSTR("/arguments") ) ); + Any usesService( getValueByName( rName + "/service" ) ); + Any args_( getValueByName( rName + "/arguments" ) ); Sequence<Any> args; if (args_.hasValue() && !(args_ >>= args)) { @@ -617,7 +616,7 @@ Any ComponentContext::lookupMap( OUString const & rName ) if (! xInstance.is()) { throw RuntimeException( - OUSTR("no service object raising singleton ") + rName, + "no service object raising singleton " + rName, static_cast<OWeakObject *>(this) ); } @@ -773,7 +772,7 @@ ComponentContext::ComponentContext( // singleton entry m_map[ rEntry.name ] = new ContextEntry( Any(), true ); // /service - m_map[ rEntry.name + OUSTR("/service") ] = new ContextEntry( rEntry.value, false ); + m_map[ rEntry.name + "/service" ] = new ContextEntry( rEntry.value, false ); // /initial-arguments are provided as optional context entry } else @@ -795,7 +794,7 @@ ComponentContext::ComponentContext( // create new smgr based on delegate's one m_xSMgr.set( xMgr->createInstanceWithContext( - OUSTR("com.sun.star.comp.stoc.OServiceManagerWrapper"), xDelegate ), + "com.sun.star.comp.stoc.OServiceManagerWrapper", xDelegate ), UNO_QUERY ); // patch DefaultContext property of new one Reference< beans::XPropertySet > xProps( m_xSMgr, UNO_QUERY ); @@ -803,7 +802,7 @@ ComponentContext::ComponentContext( if (xProps.is()) { Reference< XComponentContext > xThis( this ); - xProps->setPropertyValue( OUSTR("DefaultContext"), makeAny( xThis ) ); + xProps->setPropertyValue( "DefaultContext", makeAny( xThis ) ); } } catch (...) diff --git a/cppuhelper/source/exc_thrower.cxx b/cppuhelper/source/exc_thrower.cxx index 87e94677597d..d63b9bed8c38 100644 --- a/cppuhelper/source/exc_thrower.cxx +++ b/cppuhelper/source/exc_thrower.cxx @@ -29,8 +29,6 @@ #include "cppuhelper/exc_hlp.hxx" -#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) - using namespace ::rtl; using namespace ::osl; @@ -124,7 +122,7 @@ static void SAL_CALL ExceptionThrower_dispatch( { OSL_ASSERT( 0 ); RuntimeException exc( - OUSTR("not implemented!"), Reference< XInterface >() ); + "not implemented!", Reference< XInterface >() ); uno_type_any_construct( *ppException, &exc, ::getCppuType( &exc ).getTypeLibType(), 0 ); break; @@ -192,16 +190,16 @@ void SAL_CALL throwException( Any const & exc ) SAL_THROW( (Exception) ) if (exc.getValueTypeClass() != TypeClass_EXCEPTION) { throw RuntimeException( - OUSTR("no UNO exception given " - "(must be derived from com::sun::star::uno::Exception)!"), + "no UNO exception given " + "(must be derived from com::sun::star::uno::Exception)!", Reference< XInterface >() ); } - Mapping uno2cpp(Environment(OUSTR(UNO_LB_UNO)), Environment::getCurrent()); + Mapping uno2cpp(Environment(UNO_LB_UNO), Environment::getCurrent()); if (! uno2cpp.is()) { throw RuntimeException( - OUSTR("cannot get binary UNO to C++ mapping!"), + "cannot get binary UNO to C++ mapping!", Reference< XInterface >() ); } @@ -217,18 +215,18 @@ void SAL_CALL throwException( Any const & exc ) SAL_THROW( (Exception) ) //============================================================================== Any SAL_CALL getCaughtException() { - Mapping cpp2uno(Environment::getCurrent(), Environment(OUSTR(UNO_LB_UNO))); + Mapping cpp2uno(Environment::getCurrent(), Environment(UNO_LB_UNO)); if (! cpp2uno.is()) { throw RuntimeException( - OUSTR("cannot get C++ to binary UNO mapping!"), + "cannot get C++ to binary UNO mapping!", Reference< XInterface >() ); } - Mapping uno2cpp(Environment(OUSTR(UNO_LB_UNO)), Environment::getCurrent()); + Mapping uno2cpp(Environment(UNO_LB_UNO), Environment::getCurrent()); if (! uno2cpp.is()) { throw RuntimeException( - OUSTR("cannot get binary UNO to C++ mapping!"), + "cannot get binary UNO to C++ mapping!", Reference< XInterface >() ); } @@ -258,7 +256,7 @@ Any SAL_CALL getCaughtException() if (exc == 0) { throw RuntimeException( - OUSTR("rethrowing C++ exception failed!"), + "rethrowing C++ exception failed!", Reference< XInterface >() ); } diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx index b23204f5adee..853d77e825d3 100644 --- a/cppuhelper/source/factory.cxx +++ b/cppuhelper/source/factory.cxx @@ -44,8 +44,6 @@ #include <memory> -#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) - using namespace osl; using namespace com::sun::star; @@ -666,7 +664,7 @@ IPropertyArrayHelper & ORegistryFactoryHelper::getInfoHelper() if (m_property_array_helper.get() == 0) { beans::Property prop( - OUSTR("ImplementationKey") /* name */, + "ImplementationKey" /* name */, 0 /* handle */, ::getCppuType( &xImplementationKey ), beans::PropertyAttribute::READONLY | @@ -692,7 +690,7 @@ void ORegistryFactoryHelper::setFastPropertyValue_NoBroadcast( throw (Exception) { throw beans::PropertyVetoException( - OUSTR("unexpected: only readonly properties!"), + "unexpected: only readonly properties!", static_cast< OWeakObject * >(this) ); } @@ -708,7 +706,7 @@ void ORegistryFactoryHelper::getFastPropertyValue( { rValue.clear(); throw beans::UnknownPropertyException( - OUSTR("unknown property!"), static_cast< OWeakObject * >( + "unknown property!", static_cast< OWeakObject * >( const_cast< ORegistryFactoryHelper * >(this) ) ); } } diff --git a/cppuhelper/source/macro_expander.cxx b/cppuhelper/source/macro_expander.cxx index 5627b681eff6..3553d182b70c 100644 --- a/cppuhelper/source/macro_expander.cxx +++ b/cppuhelper/source/macro_expander.cxx @@ -34,7 +34,6 @@ #include "macro_expander.hxx" #include "paths.hxx" -#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) #define SERVICE_NAME_A "com.sun.star.lang.MacroExpander" #define SERVICE_NAME_B "com.sun.star.lang.BootstrapMacroExpander" #define IMPL_NAME "com.sun.star.lang.comp.cppuhelper.BootstrapMacroExpander" @@ -93,8 +92,8 @@ private: public: ImplNames() : m_aNames(2) { - m_aNames[0] = OUSTR(SERVICE_NAME_A); - m_aNames[1] = OUSTR(SERVICE_NAME_B); + m_aNames[0] = SERVICE_NAME_A; + m_aNames[1] = SERVICE_NAME_B; } const Sequence<OUString>& getNames() const { return m_aNames; } }; @@ -103,7 +102,7 @@ class theImplNames : public rtl::Static<ImplNames, theImplNames> {}; inline OUString s_impl_name() { - return OUSTR(IMPL_NAME); + return OUString(IMPL_NAME); } inline Sequence< OUString > const & s_get_service_names() diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx index acc4253a426b..9fe86e4bfa29 100644 --- a/cppuhelper/source/shlib.cxx +++ b/cppuhelper/source/shlib.cxx @@ -43,8 +43,6 @@ #include <osl/detail/ios-bootstrap.h> #endif -#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) - using namespace ::rtl; using namespace ::osl; @@ -227,10 +225,10 @@ static OUString makeComponentPath( if (rPath[ rPath.getLength() -1 ] != '/') buf.append( (sal_Unicode) '/' ); } - if (! rLibName.endsWithIgnoreAsciiCase( OUSTR(SAL_DLLEXTENSION) )) + if (! rLibName.endsWithIgnoreAsciiCase( SAL_DLLEXTENSION )) { #if defined SAL_DLLPREFIX - if (! rLibName.endsWithIgnoreAsciiCase( OUSTR(".uno") )) + if (! rLibName.endsWithIgnoreAsciiCase( ".uno" )) { buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(SAL_DLLPREFIX) ); } @@ -262,7 +260,7 @@ static void getLibEnv(oslModule lib, { sal_Char const * pEnvTypeName = NULL; - OUString aGetEnvNameExt = rPrefix + OUSTR(COMPONENT_GETENVEXT); + OUString aGetEnvNameExt = rPrefix + COMPONENT_GETENVEXT; component_getImplementationEnvironmentExtFunc pGetImplEnvExt = (component_getImplementationEnvironmentExtFunc)osl_getFunctionSymbol(lib, aGetEnvNameExt.pData); @@ -273,7 +271,7 @@ static void getLibEnv(oslModule lib, } else { - OUString aGetEnvName = rPrefix + OUSTR(COMPONENT_GETENV); + OUString aGetEnvName = rPrefix + COMPONENT_GETENV; component_getImplementationEnvironmentFunc pGetImplEnv = (component_getImplementationEnvironmentFunc)osl_getFunctionSymbol( lib, aGetEnvName.pData ); @@ -417,22 +415,22 @@ Reference< XInterface > invokeComponentFactory( } else { - rExcMsg = rModulePath; - rExcMsg += OUSTR(": cannot get factory of " - "demanded implementation: "); - rExcMsg += OStringToOUString( + rExcMsg = rModulePath + + ": cannot get factory of " + + "demanded implementation: " + + OStringToOUString( aImplName, RTL_TEXTENCODING_ASCII_US ); } } else { rExcMsg = - OUSTR("cannot get uno mappings: C++ <=> UNO!"); + "cannot get uno mappings: C++ <=> UNO!"; } } else { - rExcMsg = OUSTR("cannot get uno environments!"); + rExcMsg = "cannot get uno environments!"; } return xRet; @@ -479,15 +477,15 @@ Reference< XInterface > SAL_CALL loadSharedLibComponentFactory( OUString sLibName(rLibName); #ifdef ANDROID - if ( rLibName.equals( OUSTR("bootstrap.uno" SAL_DLLEXTENSION) ) ) - sLibName = OUSTR("libbootstrap.uno" SAL_DLLEXTENSION); + if ( rLibName.equals( "bootstrap.uno" SAL_DLLEXTENSION ) ) + sLibName = "libbootstrap.uno" SAL_DLLEXTENSION; #endif OUString aModulePath( makeComponentPath( sLibName, rPath ) ); if (! checkAccessPath( &aModulePath )) { throw loader::CannotActivateFactoryException( - OUSTR("permission denied to load component library: ") + + "permission denied to load component library: " + aModulePath, Reference< XInterface >() ); } @@ -497,17 +495,17 @@ Reference< XInterface > SAL_CALL loadSharedLibComponentFactory( if (! lib) { throw loader::CannotActivateFactoryException( - OUSTR("loading component library failed: ") + aModulePath, + "loading component library failed: " + aModulePath, Reference< XInterface >() ); } #else (void) rPath; oslModule lib; - OUString aModulePath(OUSTR("MAIN")); + OUString aModulePath("MAIN"); if (! osl_getModuleHandle( NULL, &lib)) { throw loader::CannotActivateFactoryException( - OUSTR("osl_getModuleHandle of the executable: "), + "osl_getModuleHandle of the executable: ", Reference< XInterface >() ); } #endif @@ -516,7 +514,7 @@ Reference< XInterface > SAL_CALL loadSharedLibComponentFactory( OUString aExcMsg; - OUString aGetFactoryName = rPrefix + OUSTR(COMPONENT_GETFACTORY); + OUString aGetFactoryName = rPrefix + COMPONENT_GETFACTORY; oslGenericFunction pSym = NULL; @@ -600,7 +598,7 @@ Reference< XInterface > SAL_CALL loadSharedLibComponentFactory( else { aExcMsg = aModulePath; - aExcMsg += OUSTR(": cannot get symbol: "); + aExcMsg += ": cannot get symbol: "; aExcMsg += aGetFactoryName; } @@ -633,7 +631,7 @@ Reference< XInterface > SAL_CALL invokeStaticComponentFactory( { Reference< XInterface > xRet; oslModule pExe; - OUString aExePath(OUSTR("MAIN")); + OUString aExePath("MAIN"); osl_getModuleHandle( NULL, &pExe ); OUString aExcMsg; @@ -679,7 +677,7 @@ void SAL_CALL writeSharedLibComponentInfo( if (! checkAccessPath( &aModulePath )) { throw registry::CannotRegisterImplementationException( - OUSTR("permission denied to load component library: ") + + "permission denied to load component library: " + aModulePath, Reference< XInterface >() ); } @@ -689,7 +687,7 @@ void SAL_CALL writeSharedLibComponentInfo( if (! lib) { throw registry::CannotRegisterImplementationException( - OUSTR("loading component library failed: ") + aModulePath, + "loading component library failed: " + aModulePath, Reference< XInterface >() ); } @@ -703,7 +701,7 @@ void SAL_CALL writeSharedLibComponentInfo( getLibEnv(lib, &env, &aEnvTypeName, currentEnv); - OUString aWriteInfoName = OUSTR(COMPONENT_WRITEINFO); + OUString aWriteInfoName = COMPONENT_WRITEINFO; oslGenericFunction pSym = osl_getFunctionSymbol( lib, aWriteInfoName.pData ); if (pSym != 0) { @@ -729,16 +727,16 @@ void SAL_CALL writeSharedLibComponentInfo( if (! bRet) { aExcMsg = aModulePath; - aExcMsg += OUSTR(": component_writeInfo() " - "returned false!"); + aExcMsg += ": component_writeInfo() " + "returned false!"; } } else { // key is mandatory aExcMsg = aModulePath; - aExcMsg += OUSTR(": registry is mandatory to invoke" - " component_writeInfo()!"); + aExcMsg += ": registry is mandatory to invoke" + " component_writeInfo()!"; } if (pSMgr) @@ -749,18 +747,18 @@ void SAL_CALL writeSharedLibComponentInfo( } else { - aExcMsg = OUSTR("cannot get uno mapping: C++ <=> UNO!"); + aExcMsg = "cannot get uno mapping: C++ <=> UNO!"; } } else { - aExcMsg = OUSTR("cannot get uno environments!"); + aExcMsg = "cannot get uno environments!"; } } else { aExcMsg = aModulePath; - aExcMsg += OUSTR(": cannot get symbol: "); + aExcMsg += ": cannot get symbol: "; aExcMsg += aWriteInfoName; } diff --git a/cppuhelper/test/cfg_test.cxx b/cppuhelper/test/cfg_test.cxx index 7649a37eb7b9..6dfece4a873f 100644 --- a/cppuhelper/test/cfg_test.cxx +++ b/cppuhelper/test/cfg_test.cxx @@ -40,8 +40,6 @@ #include <com/sun/star/registry/XImplementationRegistration.hpp> -#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) - using namespace ::cppu; using namespace ::rtl; @@ -101,17 +99,17 @@ ServiceImpl0::ServiceImpl0( Reference< XComponentContext > const & xContext ) SA // service properties OSL_VERIFY( m_xContext->getValueByName( - OUSTR("/services/com.sun.star.bootstrap.TestComponent0/context-properties/serviceprop0") ) >>= n ); + "/services/com.sun.star.bootstrap.TestComponent0/context-properties/serviceprop0" ) >>= n ); OSL_VERIFY( n == 13 ); OSL_VERIFY( m_xContext->getValueByName( - OUSTR("/services/com.sun.star.bootstrap.TestComponent0/context-properties/serviceprop1") ) >>= val ); + "/services/com.sun.star.bootstrap.TestComponent0/context-properties/serviceprop1" ) >>= val ); OSL_VERIFY( val == "value of serviceprop1" ); // impl properties OSL_VERIFY( m_xContext->getValueByName( - OUSTR("/implementations/com.sun.star.comp.bootstrap.TestComponent0/context-properties/implprop0") ) >>= n ); + "/implementations/com.sun.star.comp.bootstrap.TestComponent0/context-properties/implprop0" ) >>= n ); OSL_VERIFY( n == 15 ); OSL_VERIFY( m_xContext->getValueByName( - OUSTR("/implementations/com.sun.star.comp.bootstrap.TestComponent0/context-properties/implprop1") ) >>= val ); + "/implementations/com.sun.star.comp.bootstrap.TestComponent0/context-properties/implprop1" ) >>= val ); OSL_VERIFY( val == "value of implprop1" ); } // XInitialization @@ -238,32 +236,32 @@ SAL_IMPLEMENT_MAIN() Reference< lang::XMultiComponentFactory > xMgr( xContext->getServiceManager() ); // show what is in context - xContext->getValueByName( OUSTR("dump_maps") ); + xContext->getValueByName( "dump_maps" ); sal_Int32 n(0); - OSL_VERIFY( xContext->getValueByName( OUSTR("/global-context-properties/TestValue") ) >>= n ); + OSL_VERIFY( xContext->getValueByName( "/global-context-properties/TestValue" ) >>= n ); ::fprintf( stderr, "> n=%d\n", n ); Reference< XInterface > x; - OSL_VERIFY( !(xContext->getValueByName( OUSTR("/singletons/my_converter") ) >>= x) ); - OSL_VERIFY( xContext->getValueByName( OUSTR("/singletons/com.sun.star.script.theConverter") ) >>= x ); - OSL_VERIFY( xContext->getValueByName( OUSTR("/singletons/com.sun.star.bootstrap.theTestComponent0") ) >>= x ); + OSL_VERIFY( !(xContext->getValueByName( "/singletons/my_converter" ) >>= x) ); + OSL_VERIFY( xContext->getValueByName( "/singletons/com.sun.star.script.theConverter" ) >>= x ); + OSL_VERIFY( xContext->getValueByName( "/singletons/com.sun.star.bootstrap.theTestComponent0" ) >>= x ); ::fprintf( stderr, "> registering service...\n"); #if defined(SAL_W32) - OUString libName( OUSTR("cfg_test.dll") ); + OUString libName( "cfg_test.dll" ); #elif defined(SAL_UNX) - OUString libName( OUSTR("libcfg_test.so") ); + OUString libName( "libcfg_test.so" ); #endif Reference< registry::XImplementationRegistration > xImplReg( xMgr->createInstanceWithContext( - OUSTR("com.sun.star.registry.ImplementationRegistration"), xContext ), UNO_QUERY ); + "com.sun.star.registry.ImplementationRegistration", xContext ), UNO_QUERY ); OSL_ENSURE( xImplReg.is(), "### no impl reg!" ); xImplReg->registerImplementation( - OUSTR("com.sun.star.loader.SharedLibrary"), libName, + "com.sun.star.loader.SharedLibrary", libName, Reference< registry::XSimpleRegistry >() ); - OSL_VERIFY( (x = xMgr->createInstanceWithContext( OUSTR("com.sun.star.bootstrap.TestComponent0"), xContext )).is() ); - OSL_VERIFY( (x = xMgr->createInstanceWithContext( OUSTR("com.sun.star.bootstrap.TestComponent1"), xContext )).is() ); + OSL_VERIFY( (x = xMgr->createInstanceWithContext( "com.sun.star.bootstrap.TestComponent0", xContext )).is() ); + OSL_VERIFY( (x = xMgr->createInstanceWithContext( "com.sun.star.bootstrap.TestComponent1", xContext )).is() ); Reference< lang::XComponent > xComp( xContext, UNO_QUERY ); if (xComp.is()) diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx index 918a11fc1492..d977cac56b99 100644 --- a/cui/source/options/optsave.cxx +++ b/cui/source/options/optsave.cxx @@ -53,8 +53,7 @@ using namespace com::sun::star::beans; using namespace com::sun::star::container; using namespace comphelper; -#define C2S(cChar) String( RTL_CONSTASCII_USTRINGPARAM(cChar) ) -#define CFG_PAGE_AND_GROUP C2S("General"), C2S("LoadSave") +#define CFG_PAGE_AND_GROUP OUString("General"), OUString("LoadSave") // !! you have to update these index, if you changed the list of the child windows !! #define WININDEX_AUTOSAVE ((sal_uInt16)6) #define WININDEX_SAVEURL_RELFSYS ((sal_uInt16)9) @@ -224,7 +223,7 @@ void SfxSaveTabPage::DetectHiddenControls() sal_uInt16 nWinIndex = WININDEX_SAVEURL_RELFSYS; SvtOptionsDialogOptions aOptionsDlgOpt; - if ( aOptionsDlgOpt.IsOptionHidden( C2S("Backup"), CFG_PAGE_AND_GROUP ) ) + if ( aOptionsDlgOpt.IsOptionHidden( "Backup", CFG_PAGE_AND_GROUP ) ) { // hide controls of "Backup" aBackupFI.Hide(); @@ -233,7 +232,7 @@ void SfxSaveTabPage::DetectHiddenControls() nDelta = aAutoSaveCB.GetPosPixel().Y() - aBackupCB.GetPosPixel().Y(); } - if ( aOptionsDlgOpt.IsOptionHidden( C2S("AutoSave"), CFG_PAGE_AND_GROUP ) ) + if ( aOptionsDlgOpt.IsOptionHidden( "AutoSave", CFG_PAGE_AND_GROUP ) ) { // hide controls of "AutoSave" aAutoSaveCB.Hide(); diff --git a/dtrans/source/win32/ftransl/ftransl.cxx b/dtrans/source/win32/ftransl/ftransl.cxx index 4f64f15311c4..422ea63a79d4 100644 --- a/dtrans/source/win32/ftransl/ftransl.cxx +++ b/dtrans/source/win32/ftransl/ftransl.cxx @@ -39,7 +39,6 @@ #define CPPUTYPE_DEFAULT CPPUTYPE_SEQSALINT8 #define CPPUTYPE_OUSTR getCppuType( (const ::rtl::OUString*) 0 ) #define CPPUTYPE_SALINT32 getCppuType( ( sal_Int32 * ) 0 ) -#define OUSTR( str ) OUString( #str ) #define EMPTY_OUSTR OUString() const rtl::OUString Windows_FormatName ("windows_formatname"); @@ -126,7 +125,7 @@ Any SAL_CALL CDataFormatTranslator::getSystemDataTypeFromDataFlavor( const DataF try { Reference< XMimeContentTypeFactory > refXMimeCntFactory( m_SrvMgr->createInstance( - OUSTR( com.sun.star.datatransfer.MimeContentTypeFactory ) ), UNO_QUERY ); + "com.sun.star.datatransfer.MimeContentTypeFactory" ), UNO_QUERY ); if ( !refXMimeCntFactory.is( ) ) throw RuntimeException( ); @@ -140,10 +139,10 @@ Any SAL_CALL CDataFormatTranslator::getSystemDataTypeFromDataFlavor( const DataF // default is CF_TEXT aAny <<= static_cast< sal_Int32 >( CF_TEXT ); - if ( refXMimeCntType->hasParameter( OUSTR( charset ) ) ) + if ( refXMimeCntType->hasParameter( "charset" ) ) { // but maybe it is unicode text or oem text - OUString charset = refXMimeCntType->getParameterValue( OUSTR( charset ) ); + OUString charset = refXMimeCntType->getParameterValue( "charset" ); findStandardFormatIdForCharset( charset, aAny ); } } @@ -546,7 +545,7 @@ void SAL_CALL CDataFormatTranslator::findDataFlavorForNativeFormatName( const OU void SAL_CALL CDataFormatTranslator::findStandardFormatIdForCharset( const OUString& aCharset, Any& aAny ) const { - if ( aCharset.equalsIgnoreAsciiCase( OUSTR( utf-16 ) ) ) + if ( aCharset.equalsIgnoreAsciiCase( "utf-16" ) ) aAny <<= static_cast< sal_Int32 >( CF_UNICODETEXT ); else { @@ -610,7 +609,7 @@ void SAL_CALL CDataFormatTranslator::findStdFormatIdOrNativeFormatNameForFullMed inline sal_Bool CDataFormatTranslator::isTextPlainMediaType( const OUString& fullMediaType ) const { - return (fullMediaType.equalsIgnoreAsciiCase(OUSTR(text/plain))); + return fullMediaType.equalsIgnoreAsciiCase("text/plain"); } // ------------------------------------------------- diff --git a/editeng/source/editeng/textconv.cxx b/editeng/source/editeng/textconv.cxx index 4f494f4f56de..710a24c0d5fc 100644 --- a/editeng/source/editeng/textconv.cxx +++ b/editeng/source/editeng/textconv.cxx @@ -41,7 +41,7 @@ using namespace com::sun::star::beans; using namespace com::sun::star::lang; using namespace com::sun::star::linguistic2; -#define C2U(cChar) OUString::createFromAscii(cChar) +#define cChar OUString::createFromAscii(cChar) ////////////////////////////////////////////////////////////////////// @@ -352,8 +352,8 @@ void TextConvWrapper::ReplaceUnit( if (!bOK) return; - static OUString aBracketedStart( C2U( "(" ) ); - static OUString aBracketedEnd( C2U( ")" ) ); + static OUString aBracketedStart( "(" ); + static OUString aBracketedEnd( ")" ); // select current unit SelectNewUnit_impl( nUnitStart, nUnitEnd ); diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx index 733e66b3d2cc..a51f998e6a68 100644 --- a/editeng/source/misc/unolingu.cxx +++ b/editeng/source/misc/unolingu.cxx @@ -123,7 +123,7 @@ void ThesDummy_Impl::GetCfgLocales() if (!pLocaleSeq) { SvtLinguConfig aCfg; - String aNode( A2OU( "ServiceManager/ThesaurusList" ) ); + String aNode("ServiceManager/ThesaurusList"); Sequence < OUString > aNodeNames( aCfg.GetNodeNames( aNode ) ); const OUString *pNodeNames = aNodeNames.getConstArray(); sal_Int32 nLen = aNodeNames.getLength(); @@ -634,7 +634,7 @@ uno::Reference< XDictionaryList > LinguMgr::GetDicList() uno::Reference< XMultiServiceFactory > xMgr( getProcessServiceFactory() ); xDicList = uno::Reference< XDictionaryList > ( xMgr->createInstance( - A2OU("com.sun.star.linguistic2.DictionaryList") ), UNO_QUERY ); + "com.sun.star.linguistic2.DictionaryList" ), UNO_QUERY ); return xDicList; } @@ -648,7 +648,7 @@ uno::Reference< XPropertySet > LinguMgr::GetProp() uno::Reference< XMultiServiceFactory > xMgr( getProcessServiceFactory() ); xProp = uno::Reference< XPropertySet > ( xMgr->createInstance( - A2OU("com.sun.star.linguistic2.LinguProperties") ), UNO_QUERY ); + "com.sun.star.linguistic2.LinguProperties" ), UNO_QUERY ); return xProp; } @@ -664,7 +664,7 @@ uno::Reference< XDictionary > LinguMgr::GetIgnoreAll() if (xTmpDicList.is()) { xIgnoreAll = uno::Reference< XDictionary > ( xTmpDicList->getDictionaryByName( - A2OU("IgnoreAllList") ), UNO_QUERY ); + "IgnoreAllList" ), UNO_QUERY ); } return xIgnoreAll; } @@ -682,7 +682,7 @@ uno::Reference< XDictionary > LinguMgr::GetChangeAll() { xChangeAll = uno::Reference< XDictionary > ( _xDicList->createDictionary( - A2OU("ChangeAllList"), + "ChangeAllList", LanguageTag( LANGUAGE_NONE ).getLocale(), DictionaryType_NEGATIVE, String() ), UNO_QUERY ); } diff --git a/extensions/source/nsplugin/source/so_main.cxx b/extensions/source/nsplugin/source/so_main.cxx index 4a624fa6417a..5d46e353e3cd 100644 --- a/extensions/source/nsplugin/source/so_main.cxx +++ b/extensions/source/nsplugin/source/so_main.cxx @@ -84,8 +84,6 @@ #include "com/sun/star/bridge/UnoUrlResolver.hpp" #include "com/sun/star/bridge/XUnoUrlResolver.hpp" -#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) - using namespace ::rtl; using namespace ::osl; using namespace ::cppu; @@ -306,7 +304,7 @@ Reference< lang::XMultiServiceFactory > SAL_CALL start_office(NSP_PIPE_FD read_f ::rtl::OUStringBuffer buf; OUString aPath, aPluginPipeName; - if(!Bootstrap::get(OUSTR("BRAND_BASE_DIR"), aPath)) + if(!Bootstrap::get("BRAND_BASE_DIR", aPath)) { debug_fprintf(NSP_LOG_APPEND,"failed to get BRAND_BASE_DIR!\n"); return Reference< lang::XMultiServiceFactory >(NULL); @@ -323,9 +321,9 @@ Reference< lang::XMultiServiceFactory > SAL_CALL start_office(NSP_PIPE_FD read_f // arguments OUString args [] = { - OUSTR( "--nologo" ), - OUSTR( "--nodefault" ), - OUSTR( "--nolockcheck" ), + "--nologo", + "--nodefault", + "--nolockcheck", sConnectStartString, }; diff --git a/extensions/source/ole/ole2uno.hxx b/extensions/source/ole/ole2uno.hxx index 659a9cbde3a3..c7fc0a0b88e3 100644 --- a/extensions/source/ole/ole2uno.hxx +++ b/extensions/source/ole/ole2uno.hxx @@ -49,7 +49,6 @@ #include <rtl/uuid.h> #define UNO_2_OLE_EXCEPTIONCODE 1001 -#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::script; diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx index 67135accd290..58ed1ab29950 100644 --- a/extensions/source/ole/oleobjw.cxx +++ b/extensions/source/ole/oleobjw.cxx @@ -181,16 +181,16 @@ Any SAL_CALL IUnknownWrapper_Impl::invokeGetProperty( const OUString& aPropertyN getPropDesc(aPropertyName, & aDescGet, & aDescPut, & aVarDesc); if ( !aDescGet ) { - OUString msg(OUSTR("[automation bridge]Property \"") + aPropertyName + - OUSTR("\" is not supported")); + OUString msg("[automation bridge]Property \"" + aPropertyName + + "\" is not supported"); throw UnknownPropertyException(msg, Reference<XInterface>()); } aResult = invokeWithDispIdComTlb( aDescGet, aPropertyName, aParams, aOutParamIndex, aOutParam ); } catch ( const Exception& e ) { - throw RuntimeException(OUSTR("[automation bridge] unexpected exception in " - "IUnknownWrapper_Impl::invokeGetProperty ! Message : \n") + + throw RuntimeException("[automation bridge] unexpected exception in " + "IUnknownWrapper_Impl::invokeGetProperty ! Message : \n" + e.Message, Reference<XInterface>()); } return aResult; @@ -209,16 +209,16 @@ Any SAL_CALL IUnknownWrapper_Impl::invokePutProperty( const OUString& aPropertyN getPropDesc(aPropertyName, & aDescGet, & aDescPut, & aVarDesc); if ( !aDescPut ) { - OUString msg(OUSTR("[automation bridge]Property \"") + aPropertyName + - OUSTR("\" is not supported")); + OUString msg("[automation bridge]Property \"" + aPropertyName + + "\" is not supported"); throw UnknownPropertyException(msg, Reference<XInterface>()); } aResult = invokeWithDispIdComTlb( aDescPut, aPropertyName, aParams, aOutParamIndex, aOutParam ); } catch ( const Exception& e ) { - throw RuntimeException(OUSTR("[automation bridge] unexpected exception in " - "IUnknownWrapper_Impl::invokePutProperty ! Message : \n") + + throw RuntimeException("[automation bridge] unexpected exception in " + "IUnknownWrapper_Impl::invokePutProperty ! Message : \n" + e.Message, Reference<XInterface>()); } return aResult; @@ -234,7 +234,7 @@ Any SAL_CALL IUnknownWrapper_Impl::invoke( const OUString& aFunctionName, if ( ! m_spDispatch ) { throw RuntimeException( - OUSTR("[automation bridge] The object does not have an IDispatch interface"), + "[automation bridge] The object does not have an IDispatch interface", Reference<XInterface>()); } @@ -275,16 +275,15 @@ Any SAL_CALL IUnknownWrapper_Impl::invoke( const OUString& aFunctionName, } catch (const Exception & e) { - throw RuntimeException(OUSTR("[automation bridge] unexpected exception in " - "IUnknownWrapper_Impl::invoke ! Message : \n") + + throw RuntimeException("[automation bridge] unexpected exception in " + "IUnknownWrapper_Impl::invoke ! Message : \n" + e.Message, Reference<XInterface>()); } catch(...) { - throw RuntimeException( - OUSTR("[automation bridge] unexpected exception in " - "IUnknownWrapper_Impl::Invoke !"), Reference<XInterface>()); + throw RuntimeException("[automation bridge] unexpected exception in " + "IUnknownWrapper_Impl::Invoke !", Reference<XInterface>()); } return ret; } @@ -297,7 +296,7 @@ void SAL_CALL IUnknownWrapper_Impl::setValue( const OUString& aPropertyName, if ( ! m_spDispatch ) { throw RuntimeException( - OUSTR("[automation bridge] The object does not have an IDispatch interface"), + "[automation bridge] The object does not have an IDispatch interface", Reference<XInterface>()); } try @@ -312,8 +311,8 @@ void SAL_CALL IUnknownWrapper_Impl::setValue( const OUString& aPropertyName, //check if there is such a property at all or if it is read only if ( ! aDescPut && ! aDescGet && ! aVarDesc) { - OUString msg(OUSTR("[automation bridge]Property \"") + aPropertyName + - OUSTR("\" is not supported")); + OUString msg("[automation bridge]Property \"" + aPropertyName + + "\" is not supported"); throw UnknownPropertyException(msg, Reference<XInterface>()); } @@ -321,8 +320,8 @@ void SAL_CALL IUnknownWrapper_Impl::setValue( const OUString& aPropertyName, && aVarDesc->wVarFlags == VARFLAG_FREADONLY ) { //read-only - OUString msg(OUSTR("[automation bridge] Property ") + aPropertyName + - OUSTR(" is read-only")); + OUString msg("[automation bridge] Property " + aPropertyName + + " is read-only"); OString sMsg = OUStringToOString(msg, osl_getThreadTextEncoding()); OSL_FAIL(sMsg.getStr()); // ignore silently @@ -450,16 +449,16 @@ void SAL_CALL IUnknownWrapper_Impl::setValue( const OUString& aPropertyName, } catch (const Exception & e) { - throw RuntimeException(OUSTR("[automation bridge] unexpected exception in " - "IUnknownWrapper_Impl::setValue ! Message : \n") + + throw RuntimeException("[automation bridge] unexpected exception in " + "IUnknownWrapper_Impl::setValue ! Message : \n" + e.Message, Reference<XInterface>()); } catch (...) { throw RuntimeException( - OUSTR("[automation bridge] unexpected exception in " - "IUnknownWrapper_Impl::setValue !"), Reference<XInterface>()); + "[automation bridge] unexpected exception in " + "IUnknownWrapper_Impl::setValue !", Reference<XInterface>()); } } @@ -469,7 +468,7 @@ Any SAL_CALL IUnknownWrapper_Impl::getValue( const OUString& aPropertyName ) if ( ! m_spDispatch ) { throw RuntimeException( - OUSTR("[automation bridge] The object does not have an IDispatch interface"), + "[automation bridge] The object does not have an IDispatch interface", Reference<XInterface>()); } Any ret; @@ -524,8 +523,8 @@ Any SAL_CALL IUnknownWrapper_Impl::getValue( const OUString& aPropertyName ) if ( ! aDescGet && ! aDescPut && ! aVarDesc) { //property not found - OUString msg(OUSTR("[automation bridge]Property \"") + aPropertyName + - OUSTR("\" is not supported")); + OUString msg("[automation bridge]Property \"" + aPropertyName + + "\" is not supported"); throw UnknownPropertyException(msg, Reference<XInterface>()); } // write-only should not be possible @@ -632,15 +631,15 @@ Any SAL_CALL IUnknownWrapper_Impl::getValue( const OUString& aPropertyName ) } catch (const Exception & e) { - throw RuntimeException(OUSTR("[automation bridge] unexpected exception in " - "IUnknownWrapper_Impl::getValue ! Message : \n") + + throw RuntimeException("[automation bridge] unexpected exception in " + "IUnknownWrapper_Impl::getValue ! Message : \n" + e.Message, Reference<XInterface>()); } catch (...) { throw RuntimeException( - OUSTR("[automation bridge] unexpected exception in " - "IUnknownWrapper_Impl::getValue !"), Reference<XInterface>()); + "[automation bridge] unexpected exception in " + "IUnknownWrapper_Impl::getValue !", Reference<XInterface>()); } return ret; } @@ -651,7 +650,7 @@ sal_Bool SAL_CALL IUnknownWrapper_Impl::hasMethod( const OUString& aName ) if ( ! m_spDispatch ) { throw RuntimeException( - OUSTR("[automation bridge] The object does not have an IDispatch interface"), + "[automation bridge] The object does not have an IDispatch interface", Reference<XInterface>()); } sal_Bool ret = sal_False; @@ -683,14 +682,14 @@ sal_Bool SAL_CALL IUnknownWrapper_Impl::hasMethod( const OUString& aName ) } catch (const Exception & e) { - throw RuntimeException(OUSTR("[automation bridge] unexpected exception in " - "IUnknownWrapper_Impl::hasMethod ! Message : \n") + + throw RuntimeException("[automation bridge] unexpected exception in " + "IUnknownWrapper_Impl::hasMethod ! Message : \n" + e.Message, Reference<XInterface>()); } catch (...) { - throw RuntimeException(OUSTR("[automation bridge] unexpected exception in " - "IUnknownWrapper_Impl::hasMethod !"), Reference<XInterface>()); + throw RuntimeException("[automation bridge] unexpected exception in " + "IUnknownWrapper_Impl::hasMethod !", Reference<XInterface>()); } return ret; } @@ -700,8 +699,8 @@ sal_Bool SAL_CALL IUnknownWrapper_Impl::hasProperty( const OUString& aName ) { if ( ! m_spDispatch ) { - throw RuntimeException(OUSTR("[automation bridge] The object does not have an " - "IDispatch interface"), Reference<XInterface>()); + throw RuntimeException("[automation bridge] The object does not have an " + "IDispatch interface", Reference<XInterface>()); } sal_Bool ret = sal_False; try @@ -733,15 +732,15 @@ sal_Bool SAL_CALL IUnknownWrapper_Impl::hasProperty( const OUString& aName ) } catch (const Exception & e) { - throw RuntimeException(OUSTR("[automation bridge] unexpected exception in " - "IUnknownWrapper_Impl::hasProperty ! Message : \n") + + throw RuntimeException("[automation bridge] unexpected exception in " + "IUnknownWrapper_Impl::hasProperty ! Message : \n" + e.Message, Reference<XInterface>()); } catch (...) { - throw RuntimeException(OUSTR("[automation bridge] unexpected exception in " - "IUnknownWrapper_Impl::hasProperty !"), Reference<XInterface>()); + throw RuntimeException("[automation bridge] unexpected exception in " + "IUnknownWrapper_Impl::hasProperty !", Reference<XInterface>()); } return ret; } @@ -1031,19 +1030,19 @@ Any IUnknownWrapper_Impl::invokeWithDispIdUnoTlb(const OUString& sFunctionName, CComDispatchDriver dispDriver( pDisp); if(FAILED( dispDriver.PutPropertyByName( L"0", &varParam))) throw BridgeRuntimeError( - OUSTR("[automation bridge]IUnknownWrapper_Impl::" + "[automation bridge]IUnknownWrapper_Impl::" "invokeWithDispIdUnoTlb\n" "Could not set property \"0\" for the in/out " - "param!")); + "param!"); } } else { throw BridgeRuntimeError( - OUSTR("[automation bridge]IUnknownWrapper_Impl::" + "[automation bridge]IUnknownWrapper_Impl::" "invokeWithDispIdUnoTlb\n" - "Could not create out parameter at index: ") + + "Could not create out parameter at index: " + OUString::valueOf((sal_Int32) i)); } @@ -1163,15 +1162,15 @@ Any IUnknownWrapper_Impl::invokeWithDispIdUnoTlb(const OUString& sFunctionName, catch (IllegalArgumentException & e) { e.Message = - OUSTR("[automation bridge]IUnknownWrapper_Impl::invokeWithDispIdUnoTlb\n" - "Could not convert return value! \n Message: \n") + e.Message; + "[automation bridge]IUnknownWrapper_Impl::invokeWithDispIdUnoTlb\n" + "Could not convert return value! \n Message: \n" + e.Message; throw; } catch (CannotConvertException & e) { e.Message = - OUSTR("[automation bridge]IUnknownWrapper_Impl::invokeWithDispIdUnoTlb\n" - "Could not convert return value! \n Message: \n") + e.Message; + "[automation bridge]IUnknownWrapper_Impl::invokeWithDispIdUnoTlb\n" + "Could not convert return value! \n Message: \n" + e.Message; throw; } } @@ -1285,7 +1284,7 @@ void SAL_CALL IUnknownWrapper_Impl::initialize( const Sequence< Any >& aArgument { getFuncDesc( usName, &aDescGet ); if ( !aDescGet ) - throw BridgeRuntimeError( OUSTR("[automation bridge]IUnknownWrapper_Impl::initialize() Failed to get Function or Property desc. for " ) + usName ); + throw BridgeRuntimeError( "[automation bridge]IUnknownWrapper_Impl::initialize() Failed to get Function or Property desc. for " + usName ); } // now for some funny heuristics to make basic understand what to do // a single aDescGet ( that doesn't take any params ) would be @@ -1310,7 +1309,7 @@ void SAL_CALL IUnknownWrapper_Impl::initialize( const Sequence< Any >& aArgument catch( const Exception& e ) { throw RuntimeException( - OUSTR("[automation bridge] unexpected exception in IUnknownWrapper_Impl::initialiase() error message: \n") + e.Message, + "[automation bridge] unexpected exception in IUnknownWrapper_Impl::initialiase() error message: \n" + e.Message, Reference<XInterface>() ); } } @@ -1326,7 +1325,7 @@ uno::Any SAL_CALL IUnknownWrapper_Impl::directInvoke( const ::rtl::OUString& aNa if ( !m_spDispatch ) { throw RuntimeException( - OUSTR("[automation bridge] The object does not have an IDispatch interface"), + "[automation bridge] The object does not have an IDispatch interface", Reference<XInterface>()); } @@ -1334,7 +1333,7 @@ uno::Any SAL_CALL IUnknownWrapper_Impl::directInvoke( const ::rtl::OUString& aNa DISPID dispid; if ( !getDispid( aName, &dispid ) ) throw IllegalArgumentException( - OUSTR( "[automation bridge] The object does not have a function or property " ) + "[automation bridge] The object does not have a function or property " + aName, Reference<XInterface>(), 0); CComVariant varResult; @@ -1412,13 +1411,13 @@ uno::Any SAL_CALL IUnknownWrapper_Impl::directInvoke( const ::rtl::OUString& aNa else if (hr == DISP_E_UNKNOWNNAME) { throw IllegalArgumentException( - OUSTR("[automation bridge]One of the named arguments is wrong!"), + "[automation bridge]One of the named arguments is wrong!", Reference<XInterface>(), 0); } else { throw InvocationTargetException( - OUSTR("[automation bridge] ITypeInfo::GetIDsOfNames returned error ") + "[automation bridge] ITypeInfo::GetIDsOfNames returned error " + OUString::valueOf((sal_Int32) hr, 16), Reference<XInterface>(), Any()); } } @@ -1503,30 +1502,30 @@ uno::Any SAL_CALL IUnknownWrapper_Impl::directInvoke( const ::rtl::OUString& aNa case S_OK: break; case DISP_E_BADPARAMCOUNT: - throw IllegalArgumentException(OUSTR("[automation bridge] Wrong " - "number of arguments. Object returned DISP_E_BADPARAMCOUNT."), + throw IllegalArgumentException("[automation bridge] Wrong " + "number of arguments. Object returned DISP_E_BADPARAMCOUNT.", 0, 0); break; case DISP_E_BADVARTYPE: - throw RuntimeException(OUSTR("[automation bridge] One or more " + throw RuntimeException("[automation bridge] One or more " "arguments have the wrong type. Object returned " - "DISP_E_BADVARTYPE."), 0); + "DISP_E_BADVARTYPE.", 0); break; case DISP_E_EXCEPTION: - message = OUSTR("[automation bridge]: "); + message = "[automation bridge]: "; message += OUString(reinterpret_cast<const sal_Unicode*>(excepinfo.bstrDescription), ::SysStringLen(excepinfo.bstrDescription)); throw InvocationTargetException(message, Reference<XInterface>(), Any()); break; case DISP_E_MEMBERNOTFOUND: - message = OUSTR("[automation bridge]: A function with the name \"") - + aName + OUSTR("\" is not supported. Object returned " - "DISP_E_MEMBERNOTFOUND."); + message = "[automation bridge]: A function with the name \"" + + aName + "\" is not supported. Object returned " + "DISP_E_MEMBERNOTFOUND."; throw IllegalArgumentException(message, 0, 0); break; case DISP_E_NONAMEDARGS: - throw IllegalArgumentException(OUSTR("[automation bridge] Object " - "returned DISP_E_NONAMEDARGS"),0, ::sal::static_int_cast< sal_Int16, unsigned int >( uArgErr )); + throw IllegalArgumentException("[automation bridge] Object " + "returned DISP_E_NONAMEDARGS",0, ::sal::static_int_cast< sal_Int16, unsigned int >( uArgErr )); break; case DISP_E_OVERFLOW: throw CannotConvertException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[automation bridge] Call failed.")), @@ -1534,27 +1533,27 @@ uno::Any SAL_CALL IUnknownWrapper_Impl::directInvoke( const ::rtl::OUString& aNa static_cast<XWeak*>(this)), TypeClass_UNKNOWN, FailReason::OUT_OF_RANGE, uArgErr); break; case DISP_E_PARAMNOTFOUND: - throw IllegalArgumentException(OUSTR("[automation bridge]Call failed." - "Object returned DISP_E_PARAMNOTFOUND."), + throw IllegalArgumentException("[automation bridge]Call failed." + "Object returned DISP_E_PARAMNOTFOUND.", 0, ::sal::static_int_cast< sal_Int16, unsigned int >( uArgErr )); break; case DISP_E_TYPEMISMATCH: - throw CannotConvertException(OUSTR("[automation bridge] Call failed. " - "Object returned DISP_E_TYPEMISMATCH"), + throw CannotConvertException("[automation bridge] Call failed. " + "Object returned DISP_E_TYPEMISMATCH", static_cast<XInterface*>( static_cast<XWeak*>(this)) , TypeClass_UNKNOWN, FailReason::UNKNOWN, uArgErr); break; case DISP_E_UNKNOWNINTERFACE: - throw RuntimeException(OUSTR("[automation bridge] Call failed. " - "Object returned DISP_E_UNKNOWNINTERFACE."),0); + throw RuntimeException("[automation bridge] Call failed. " + "Object returned DISP_E_UNKNOWNINTERFACE.",0); break; case DISP_E_UNKNOWNLCID: - throw RuntimeException(OUSTR("[automation bridge] Call failed. " - "Object returned DISP_E_UNKNOWNLCID."),0); + throw RuntimeException("[automation bridge] Call failed. " + "Object returned DISP_E_UNKNOWNLCID.",0); break; case DISP_E_PARAMNOTOPTIONAL: - throw CannotConvertException(OUSTR("[automation bridge] Call failed." - "Object returned DISP_E_PARAMNOTOPTIONAL"), + throw CannotConvertException("[automation bridge] Call failed." + "Object returned DISP_E_PARAMNOTOPTIONAL", static_cast<XInterface*>(static_cast<XWeak*>(this)), TypeClass_UNKNOWN, FailReason::NO_DEFAULT_AVAILABLE, uArgErr); break; @@ -1573,7 +1572,7 @@ uno::Any SAL_CALL IUnknownWrapper_Impl::directInvoke( const ::rtl::OUString& aNa if ( ! m_spDispatch ) { throw RuntimeException( - OUSTR("[automation bridge] The object does not have an IDispatch interface"), + "[automation bridge] The object does not have an IDispatch interface", Reference<XInterface>()); } @@ -1867,13 +1866,13 @@ Any IUnknownWrapper_Impl::invokeWithDispIdComTlb(FuncDesc& aFuncDesc, else if (hr == DISP_E_UNKNOWNNAME) { throw IllegalArgumentException( - OUSTR("[automation bridge]One of the named arguments is wrong!"), + "[automation bridge]One of the named arguments is wrong!", Reference<XInterface>(), 0); } else { throw InvocationTargetException( - OUSTR("[automation bridge] ITypeInfo::GetIDsOfNames returned error ") + "[automation bridge] ITypeInfo::GetIDsOfNames returned error " + OUString::valueOf((sal_Int32) hr, 16), Reference<XInterface>(), Any()); } } @@ -2134,31 +2133,31 @@ Any IUnknownWrapper_Impl::invokeWithDispIdComTlb(FuncDesc& aFuncDesc, case S_OK: break; case DISP_E_BADPARAMCOUNT: - throw IllegalArgumentException(OUSTR("[automation bridge] Wrong " - "number of arguments. Object returned DISP_E_BADPARAMCOUNT."), + throw IllegalArgumentException("[automation bridge] Wrong " + "number of arguments. Object returned DISP_E_BADPARAMCOUNT.", 0, 0); break; case DISP_E_BADVARTYPE: - throw RuntimeException(OUSTR("[automation bridge] One or more " + throw RuntimeException("[automation bridge] One or more " "arguments have the wrong type. Object returned " - "DISP_E_BADVARTYPE."), 0); + "DISP_E_BADVARTYPE.", 0); break; case DISP_E_EXCEPTION: - message = OUSTR("[automation bridge]: "); + message = "[automation bridge]: "; message += OUString(reinterpret_cast<const sal_Unicode*>(excepinfo.bstrDescription), ::SysStringLen(excepinfo.bstrDescription)); throw InvocationTargetException(message, Reference<XInterface>(), Any()); break; case DISP_E_MEMBERNOTFOUND: - message = OUSTR("[automation bridge]: A function with the name \"") - + sFuncName + OUSTR("\" is not supported. Object returned " - "DISP_E_MEMBERNOTFOUND."); + message = "[automation bridge]: A function with the name \"" + + sFuncName + "\" is not supported. Object returned " + "DISP_E_MEMBERNOTFOUND."; throw IllegalArgumentException(message, 0, 0); break; case DISP_E_NONAMEDARGS: - throw IllegalArgumentException(OUSTR("[automation bridge] Object " - "returned DISP_E_NONAMEDARGS"),0, ::sal::static_int_cast< sal_Int16, unsigned int >( uArgErr )); + throw IllegalArgumentException("[automation bridge] Object " + "returned DISP_E_NONAMEDARGS",0, ::sal::static_int_cast< sal_Int16, unsigned int >( uArgErr )); break; case DISP_E_OVERFLOW: throw CannotConvertException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[automation bridge] Call failed.")), @@ -2166,27 +2165,27 @@ Any IUnknownWrapper_Impl::invokeWithDispIdComTlb(FuncDesc& aFuncDesc, static_cast<XWeak*>(this)), TypeClass_UNKNOWN, FailReason::OUT_OF_RANGE, uArgErr); break; case DISP_E_PARAMNOTFOUND: - throw IllegalArgumentException(OUSTR("[automation bridge]Call failed." - "Object returned DISP_E_PARAMNOTFOUND."), + throw IllegalArgumentException("[automation bridge]Call failed." + "Object returned DISP_E_PARAMNOTFOUND.", 0, ::sal::static_int_cast< sal_Int16, unsigned int >( uArgErr )); break; case DISP_E_TYPEMISMATCH: - throw CannotConvertException(OUSTR("[automation bridge] Call failed. " - "Object returned DISP_E_TYPEMISMATCH"), + throw CannotConvertException("[automation bridge] Call failed. " + "Object returned DISP_E_TYPEMISMATCH", static_cast<XInterface*>( static_cast<XWeak*>(this)) , TypeClass_UNKNOWN, FailReason::UNKNOWN, uArgErr); break; case DISP_E_UNKNOWNINTERFACE: - throw RuntimeException(OUSTR("[automation bridge] Call failed. " - "Object returned DISP_E_UNKNOWNINTERFACE."),0); + throw RuntimeException("[automation bridge] Call failed. " + "Object returned DISP_E_UNKNOWNINTERFACE.",0); break; case DISP_E_UNKNOWNLCID: - throw RuntimeException(OUSTR("[automation bridge] Call failed. " - "Object returned DISP_E_UNKNOWNLCID."),0); + throw RuntimeException("[automation bridge] Call failed. " + "Object returned DISP_E_UNKNOWNLCID.",0); break; case DISP_E_PARAMNOTOPTIONAL: - throw CannotConvertException(OUSTR("[automation bridge] Call failed." - "Object returned DISP_E_PARAMNOTOPTIONAL"), + throw CannotConvertException("[automation bridge] Call failed." + "Object returned DISP_E_PARAMNOTOPTIONAL", static_cast<XInterface*>(static_cast<XWeak*>(this)), TypeClass_UNKNOWN, FailReason::NO_DEFAULT_AVAILABLE, uArgErr); break; @@ -2223,7 +2222,7 @@ void IUnknownWrapper_Impl::getFuncDescForInvoke(const OUString & sFuncName, if ( ! aDescPut) { throw IllegalArgumentException( - OUSTR("[automation bridge] The object does not have a writeable property: ") + "[automation bridge] The object does not have a writeable property: " + sFuncName, Reference<XInterface>(), 0); } *pFuncDesc = aDescPut.Detach(); @@ -2243,8 +2242,8 @@ void IUnknownWrapper_Impl::getFuncDescForInvoke(const OUString & sFuncName, if ( ! aFuncDesc ) { throw IllegalArgumentException( - OUSTR("[automation bridge] The object does not have a function" - "or readable property \"") + "[automation bridge] The object does not have a function" + "or readable property \"" + sFuncName, Reference<XInterface>(), 0); } } @@ -2322,8 +2321,8 @@ void IUnknownWrapper_Impl::getFuncDesc(const OUString & sFuncName, FUNCDESC ** p } else { - throw BridgeRuntimeError(OUSTR("[automation bridge] Could not get " - "FUNCDESC for ") + sFuncName); + throw BridgeRuntimeError("[automation bridge] Could not get " + "FUNCDESC for " + sFuncName); } } //else no entry found for sFuncName, pFuncDesc will not be filled in @@ -2415,7 +2414,7 @@ VARTYPE IUnknownWrapper_Impl::getUserDefinedElementType( ITypeInfo* pTypeInfo, c // We use the type of the first enum value. if ( attr->cVars == 0 ) { - throw BridgeRuntimeError(OUSTR("[automation bridge] Could not obtain type description")); + throw BridgeRuntimeError("[automation bridge] Could not obtain type description"); } VarDesc var( spRefInfo ); spRefInfo->GetVarDesc( 0, &var ); @@ -2436,7 +2435,7 @@ VARTYPE IUnknownWrapper_Impl::getUserDefinedElementType( ITypeInfo* pTypeInfo, c } else { - throw BridgeRuntimeError( OUSTR("[automation bridge] Unhandled user defined type.") ); + throw BridgeRuntimeError( "[automation bridge] Unhandled user defined type." ); } } } @@ -2496,13 +2495,13 @@ void IUnknownWrapper_Impl::buildComTlbIndex() } else { - sError = OUSTR("[automation bridge] IUnknownWrapper_Impl::buildComTlbIndex, " \ - "ITypeInfo::GetNames failed."); + sError = "[automation bridge] IUnknownWrapper_Impl::buildComTlbIndex, " \ + "ITypeInfo::GetNames failed."; } } else - sError = OUSTR("[automation bridge] IUnknownWrapper_Impl::buildComTlbIndex, " \ - "ITypeInfo::GetFuncDesc failed."); + sError = "[automation bridge] IUnknownWrapper_Impl::buildComTlbIndex, " \ + "ITypeInfo::GetFuncDesc failed."; } //If we create an Object in JScript and a a property then it @@ -2525,19 +2524,19 @@ void IUnknownWrapper_Impl::buildComTlbIndex() } else { - sError = OUSTR("[automation bridge] IUnknownWrapper_Impl::buildComTlbIndex, " \ - "ITypeInfo::GetNames failed."); + sError = "[automation bridge] IUnknownWrapper_Impl::buildComTlbIndex, " \ + "ITypeInfo::GetNames failed.; } } else - sError = OUSTR("[automation bridge] IUnknownWrapper_Impl::buildComTlbIndex, " \ - "ITypeInfo::GetVarDesc failed."); + sError = "[automation bridge] IUnknownWrapper_Impl::buildComTlbIndex, " \ + "ITypeInfo::GetVarDesc failed."; } } else - sError = OUSTR("[automation bridge] IUnknownWrapper_Impl::buildComTlbIndex, " \ - "ITypeInfo::GetTypeAttr failed."); + sError = "[automation bridge] IUnknownWrapper_Impl::buildComTlbIndex, " \ + "ITypeInfo::GetTypeAttr failed."; if (sError.getLength()) { @@ -2554,7 +2553,7 @@ ITypeInfo* IUnknownWrapper_Impl::getTypeInfo() { if( !m_spDispatch) { - throw BridgeRuntimeError(OUSTR("The object has no IDispatch interface!")); + throw BridgeRuntimeError("The object has no IDispatch interface!"); } if( !m_spTypeInfo ) @@ -2586,8 +2585,8 @@ ITypeInfo* IUnknownWrapper_Impl::getTypeInfo() else { throw BridgeRuntimeError( - OUSTR("[automation bridge] Could not obtain type information " - "for dispatch interface." )); + "[automation bridge] Could not obtain type information " + "for dispatch interface." ); } } else if (typeAttr->typekind == TKIND_DISPATCH) @@ -2597,15 +2596,15 @@ ITypeInfo* IUnknownWrapper_Impl::getTypeInfo() else { throw BridgeRuntimeError( - OUSTR("[automation bridge] Automation object does not " - "provide type information.")); + "[automation bridge] Automation object does not " + "provide type information."); } } } else { - throw BridgeRuntimeError(OUSTR("[automation bridge]The dispatch object does not " - "support ITypeInfo!")); + throw BridgeRuntimeError("[automation bridge]The dispatch object does not " + "support ITypeInfo!"); } } } diff --git a/extensions/source/ole/unoconversionutilities.hxx b/extensions/source/ole/unoconversionutilities.hxx index 5e3fcf0b5455..e38f4003cf87 100644 --- a/extensions/source/ole/unoconversionutilities.hxx +++ b/extensions/source/ole/unoconversionutilities.hxx @@ -252,8 +252,8 @@ bool convertSelfToCom( T& unoInterface, VARIANT * pVar) HRESULT hr; if (FAILED(hr = VariantCopy(pVar, pvariant))) throw BridgeRuntimeError( - OUSTR("[automation bridge] convertSelfToCom\n" - "VariantCopy failed! Error: ") + + "[automation bridge] convertSelfToCom\n" + "VariantCopy failed! Error: " + OUString::valueOf(hr)); VariantClear( pvariant); CoTaskMemFree( pvariant); @@ -309,8 +309,8 @@ void UnoConversionUtilities<T>::variantToAny( const VARIANTARG* pArg, Any& rAny, // There is no need to support indirect values, since they're not supported by UNO if( FAILED(hr= VariantCopyInd( &var, const_cast<VARIANTARG*>(pArg)))) // remove VT_BYREF throw BridgeRuntimeError( - OUSTR("[automation bridge] UnoConversionUtilities<T>::variantToAny \n" - "VariantCopyInd failed for reason : ") + OUString::valueOf(hr)); + "[automation bridge] UnoConversionUtilities<T>::variantToAny \n" + "VariantCopyInd failed for reason : " + OUString::valueOf(hr)); bool bHandled = convertValueObject( & var, rAny); if( bHandled) OSL_ENSURE( rAny.getValueType() == ptype, "type in Value Object must match the type parameter"); @@ -386,15 +386,15 @@ void UnoConversionUtilities<T>::variantToAny( const VARIANTARG* pArg, Any& rAny, catch (const IllegalArgumentException& e) { throw BridgeRuntimeError( - OUSTR("[automation bridge]com.sun.star.lang.IllegalArgumentException " - "in UnoConversionUtilities<T>::variantToAny! Message: ") + + "[automation bridge]com.sun.star.lang.IllegalArgumentException " + "in UnoConversionUtilities<T>::variantToAny! Message: " + e.Message); } catch (const CannotConvertException& e) { throw BridgeRuntimeError( - OUSTR("[automation bridge]com.sun.star.script.CannotConvertException " - "in UnoConversionUtilities<T>::variantToAny! Message: ") + + "[automation bridge]com.sun.star.script.CannotConvertException " + "in UnoConversionUtilities<T>::variantToAny! Message: " + e.Message); } } @@ -560,18 +560,18 @@ void UnoConversionUtilities<T>::variantToAny( const VARIANTARG* pArg, Any& rAny, } if (bCannotConvert) throw CannotConvertException( - OUSTR("[automation bridge]UnoConversionUtilities<T>::variantToAny \n" - "Cannot convert the value of vartype :\"") + + "[automation bridge]UnoConversionUtilities<T>::variantToAny \n" + "Cannot convert the value of vartype :\"" + OUString::valueOf((sal_Int32) var.vt) + - OUSTR("\" to the expected UNO type of type class: ") + + "\" to the expected UNO type of type class: " + OUString::valueOf((sal_Int32) ptype.getTypeClass()), 0, TypeClass_UNKNOWN, FailReason::TYPE_NOT_SUPPORTED,0); if (bFail) throw IllegalArgumentException( - OUSTR("[automation bridge]UnoConversionUtilities<T>:variantToAny\n" - "The provided VARIANT of type\" ") + OUString::valueOf((sal_Int32) var.vt) + - OUSTR("\" is unappropriate for conversion!"), Reference<XInterface>(), -1); + "[automation bridge]UnoConversionUtilities<T>:variantToAny\n" + "The provided VARIANT of type\" " + OUString::valueOf((sal_Int32) var.vt) + + "\" is unappropriate for conversion!", Reference<XInterface>(), -1); } catch (const CannotConvertException &) { @@ -587,15 +587,15 @@ void UnoConversionUtilities<T>::variantToAny( const VARIANTARG* pArg, Any& rAny, } catch (const Exception & e) { - throw BridgeRuntimeError(OUSTR("[automation bridge] unexpected exception in " - "UnoConversionUtilities<T>::variantToAny ! Message : \n") + + throw BridgeRuntimeError("[automation bridge] unexpected exception in " + "UnoConversionUtilities<T>::variantToAny ! Message : \n" + e.Message); } catch(...) { throw BridgeRuntimeError( - OUSTR("[automation bridge] unexpected exception in " - "UnoConversionUtilities<T>::variantToAny !")); + "[automation bridge] unexpected exception in " + "UnoConversionUtilities<T>::variantToAny !"); } } @@ -634,26 +634,26 @@ void UnoConversionUtilities<T>::anyToVariant(VARIANT* pVariant, const Any& rAny, { if (hr == DISP_E_TYPEMISMATCH) throw CannotConvertException( - OUSTR("[automation bridge]UnoConversionUtilities<T>::anyToVariant \n" - "Cannot convert the value of type :\"") + + "[automation bridge]UnoConversionUtilities<T>::anyToVariant \n" + "Cannot convert the value of type :\"" + rAny.getValueTypeName() + - OUSTR("\" to the expected Automation type of VARTYPE: ") + + "\" to the expected Automation type of VARTYPE: " + OUString::valueOf((sal_Int32)type), 0, TypeClass_UNKNOWN, FailReason::TYPE_NOT_SUPPORTED,0); throw BridgeRuntimeError( - OUSTR("[automation bridge]UnoConversionUtilities<T>::anyToVariant \n" - "Conversion of any with ") + + "[automation bridge]UnoConversionUtilities<T>::anyToVariant \n" + "Conversion of any with + rAny.getValueType().getTypeName() + - OUSTR(" to VARIANT with type: ") + OUString::valueOf((sal_Int32) type) + - OUSTR(" failed! Error code: ") + OUString::valueOf(hr)); + " to VARIANT with type: " + OUString::valueOf((sal_Int32) type) + + " failed! Error code: " + OUString::valueOf(hr)); } if(FAILED(hr = VariantCopy(pVariant, &var))) { throw BridgeRuntimeError( - OUSTR("[automation bridge]UnoConversionUtilities<T>::anyToVariant \n" - "VariantCopy failed for reason: ") + OUString::valueOf(hr)); + "[automation bridge]UnoConversionUtilities<T>::anyToVariant \n" + "VariantCopy failed for reason: " + OUString::valueOf(hr)); } } } @@ -672,14 +672,14 @@ void UnoConversionUtilities<T>::anyToVariant(VARIANT* pVariant, const Any& rAny, catch(const Exception & e) { throw BridgeRuntimeError( - OUSTR("[automation bridge]UnoConversionUtilities<T>::anyToVariant \n" - "Unexpected exception occurred. Message: ") + e.Message); + "[automation bridge]UnoConversionUtilities<T>::anyToVariant \n" + "Unexpected exception occurred. Message: " + e.Message); } catch(...) { throw BridgeRuntimeError( - OUSTR("[automation bridge]UnoConversionUtilities<T>::anyToVariant \n" - "Unexpected exception occurred.")); + "[automation bridge]UnoConversionUtilities<T>::anyToVariant \n" + "Unexpected exception occurred."); } } @@ -788,8 +788,8 @@ void UnoConversionUtilities<T>::anyToVariant(VARIANT* pVariant, const Any& rAny) if (FAILED(hr = VariantClear(pVariant))) { throw BridgeRuntimeError( - OUSTR("[automation bridge]UnoConversionUtilities<T>::anyToVariant\n" - "VariantClear failed with error:") + OUString::valueOf(hr)); + "[automation bridge]UnoConversionUtilities<T>::anyToVariant\n" + "VariantClear failed with error:" + OUString::valueOf(hr)); } break; } @@ -945,13 +945,13 @@ void UnoConversionUtilities<T>::anyToVariant(VARIANT* pVariant, const Any& rAny) CComVariant var; if (createUnoTypeWrapper(type.getTypeName(), & var) == false) throw BridgeRuntimeError( - OUSTR("[automation bridge] UnoConversionUtilities<T>::anyToVariant \n" - "Error during conversion of UNO type to Automation object!")); + "[automation bridge] UnoConversionUtilities<T>::anyToVariant \n" + "Error during conversion of UNO type to Automation object!"); if (FAILED(VariantCopy(pVariant, &var))) throw BridgeRuntimeError( - OUSTR("[automation bridge] UnoConversionUtilities<T>::anyToVariant \n" - "Unexpected error!")); + "[automation bridge] UnoConversionUtilities<T>::anyToVariant \n" + "Unexpected error!"); break; } default: @@ -970,10 +970,10 @@ void UnoConversionUtilities<T>::anyToVariant(VARIANT* pVariant, const Any& rAny) // TypeClass_UNSIGNED_BYTE: // TypeClass_MODULE: throw CannotConvertException( - OUSTR("[automation bridge]UnoConversionUtilities<T>::anyToVariant\n" + "[automation bridge]UnoConversionUtilities<T>::anyToVariant\n" "There is no conversion for this UNO type to a Automation type." "The destination type class is the type class of the UNO " - "argument which was to be converted."), + "argument which was to be converted.", Reference<XInterface>(), rAny.getValueTypeClass(), FailReason::TYPE_NOT_SUPPORTED, 0); @@ -982,9 +982,9 @@ void UnoConversionUtilities<T>::anyToVariant(VARIANT* pVariant, const Any& rAny) if (bIllegal) { throw IllegalArgumentException( - OUSTR("[automation bridge]UnoConversionUtilities<T>::anyToVariant\n" - "The provided any of type\" ") + rAny.getValueType().getTypeName() + - OUSTR("\" is unappropriate for conversion!"), Reference<XInterface>(), -1); + "[automation bridge]UnoConversionUtilities<T>::anyToVariant\n" + "The provided any of type\" " + rAny.getValueType().getTypeName() + + "\" is unappropriate for conversion!", Reference<XInterface>(), -1); } } @@ -1003,14 +1003,14 @@ void UnoConversionUtilities<T>::anyToVariant(VARIANT* pVariant, const Any& rAny) catch(const Exception & e) { throw BridgeRuntimeError( - OUSTR("[automation bridge]UnoConversionUtilities<T>::anyToVariant \n" - "Unexpected exception occurred. Message: ") + e.Message); + "[automation bridge]UnoConversionUtilities<T>::anyToVariant \n" + "Unexpected exception occurred. Message: " + e.Message); } catch(...) { throw BridgeRuntimeError( - OUSTR("[automation bridge]UnoConversionUtilities<T>::anyToVariant \n" - "Unexpected exception occurred. ") ); + "[automation bridge]UnoConversionUtilities<T>::anyToVariant \n" + "Unexpected exception occurred. " ); } } @@ -1022,12 +1022,12 @@ SAFEARRAY* UnoConversionUtilities<T>::createUnoSequenceWrapper(const Any& rSeq, { if (rSeq.getValueTypeClass() != TypeClass_SEQUENCE) throw IllegalArgumentException( - OUSTR("[automation bridge]UnoConversionUtilities<T>::createUnoSequenceWrapper \n" - "The any does not contain a sequence!"), 0, 0); + "[automation bridge]UnoConversionUtilities<T>::createUnoSequenceWrapper \n" + "The any does not contain a sequence!", 0, 0); if (elemtype == VT_NULL || elemtype == VT_EMPTY) throw IllegalArgumentException( - OUSTR("[automation bridge]UnoConversionUtilities<T>::createUnoSequenceWrapper \n" - "No element type supplied!"),0, -1); + "[automation bridge]UnoConversionUtilities<T>::createUnoSequenceWrapper \n" + "No element type supplied!",0, -1); SAFEARRAY* pArray= NULL; // Get the dimensions. This is done by examining the type name string // The count of brackets determines the dimensions. @@ -1293,8 +1293,8 @@ SAFEARRAY* UnoConversionUtilities<T>::createUnoSequenceWrapper(const Any& rSeq) if( rSeq.getValueTypeClass() != TypeClass_SEQUENCE ) throw IllegalArgumentException( - OUSTR("[automation bridge]UnoConversionUtilities<T>::createUnoSequenceWrapper\n" - "The UNO argument is not a sequence"), 0, -1); + "[automation bridge]UnoConversionUtilities<T>::createUnoSequenceWrapper\n" + "The UNO argument is not a sequence", 0, -1); uno_Sequence * punoSeq= *(uno_Sequence**) rSeq.getValue(); @@ -1358,16 +1358,16 @@ void UnoConversionUtilities<T>::createUnoObjectWrapper(const Any & rObj, VARIANT TypeClass tc = rObj.getValueTypeClass(); if (tc != TypeClass_INTERFACE && tc != TypeClass_STRUCT) throw IllegalArgumentException( - OUSTR("[automation bridge]UnoConversionUtilities<T>::createUnoObjectWrapper \n" + "[automation bridge]UnoConversionUtilities<T>::createUnoObjectWrapper \n" "Cannot create an Automation interface for a UNO type which is not " - "a struct or interface!"), 0, -1); + "a struct or interface!", 0, -1); if (rObj.getValueTypeClass() == TypeClass_INTERFACE) { if (! (rObj >>= xInt)) throw IllegalArgumentException( - OUSTR("[automation bridge] UnoConversionUtilities<T>::createUnoObjectWrapper\n " - "Could not create wrapper object for UNO object!"), 0, -1); + "[automation bridge] UnoConversionUtilities<T>::createUnoObjectWrapper\n " + "Could not create wrapper object for UNO object!", 0, -1); //If XInterface is NULL, which is a valid value, then simply return NULL. if ( ! xInt.is()) { @@ -1470,8 +1470,8 @@ void UnoConversionUtilities<T>::variantToAny( const VARIANT* pVariant, Any& rAny // There is no need to support indirect values, since they're not supported by UNO if( FAILED(hr= VariantCopyInd( &var, const_cast<VARIANTARG*>(pVariant)))) // remove VT_BYREF throw BridgeRuntimeError( - OUSTR("[automation bridge] UnoConversionUtilities<T>::variantToAny \n" - "VariantCopyInd failed for reason : ") + OUString::valueOf(hr)); + "[automation bridge] UnoConversionUtilities<T>::variantToAny \n" + "VariantCopyInd failed for reason : " + OUString::valueOf(hr)); if ( ! convertValueObject( & var, rAny)) { @@ -1539,15 +1539,15 @@ void UnoConversionUtilities<T>::variantToAny( const VARIANT* pVariant, Any& rAny CComBSTR sName; if (FAILED(spType->get_Name(&sName))) throw BridgeRuntimeError( - OUSTR("[automation bridge]UnoConversionUtilities<T>::variantToAny \n" - "Failed to get the type name from a UnoTypeWrapper!")); + "[automation bridge]UnoConversionUtilities<T>::variantToAny \n" + "Failed to get the type name from a UnoTypeWrapper!"); Type type; if (getType(sName, type) == false) { throw CannotConvertException( - OUSTR("[automation bridge]UnoConversionUtilities<T>::variantToAny \n" - "A UNO type with the name: ") + OUString(reinterpret_cast<const sal_Unicode*>(LPCOLESTR(sName))) + - OUSTR("does not exist!"), + "[automation bridge]UnoConversionUtilities<T>::variantToAny \n" + "A UNO type with the name: " + OUString(reinterpret_cast<const sal_Unicode*>(LPCOLESTR(sName))) + + "does not exist!", 0, TypeClass_UNKNOWN, FailReason::TYPE_NOT_SUPPORTED,0); } rAny <<= type; @@ -1623,15 +1623,15 @@ void UnoConversionUtilities<T>::variantToAny( const VARIANT* pVariant, Any& rAny } catch (const Exception & e) { - throw BridgeRuntimeError(OUSTR("[automation bridge] unexpected exception in " - "UnoConversionUtilities<T>::variantToAny ! Message : \n") + + throw BridgeRuntimeError("[automation bridge] unexpected exception in " + "UnoConversionUtilities<T>::variantToAny ! Message : \n" + e.Message); } catch(...) { throw BridgeRuntimeError( - OUSTR("[automation bridge] unexpected exception in " - "UnoConversionUtilities<T>::variantToAny !")); + "[automation bridge] unexpected exception in " + "UnoConversionUtilities<T>::variantToAny !"); } } @@ -1668,8 +1668,8 @@ Any UnoConversionUtilities<T>::createOleObjectWrapper(VARIANT* pVar, const Type& //To allow passing "Nothing" in VS 2008 we need to accept VT_EMPTY if (pVar->vt != VT_UNKNOWN && pVar->vt != VT_DISPATCH && pVar->vt != VT_EMPTY) throw IllegalArgumentException( - OUSTR("[automation bridge]UnoConversionUtilities<T>::createOleObjectWrapper \n" - "The VARIANT does not contain an object type! "), 0, -1); + "[automation bridge]UnoConversionUtilities<T>::createOleObjectWrapper \n" + "The VARIANT does not contain an object type! ", 0, -1); MutexGuard guard( getBridgeMutex()); @@ -1794,8 +1794,8 @@ Any UnoConversionUtilities<T>::createOleObjectWrapper(VARIANT* pVar, const Type& ret = xIntWrapper->queryInterface(desiredType); if ( ! ret.hasValue()) throw IllegalArgumentException( - OUSTR("[automation bridge]UnoConversionUtilities<T>::createOleObjectWrapper \n" - "The COM object is not suitable for the UNO type: ") + + "[automation bridge]UnoConversionUtilities<T>::createOleObjectWrapper \n" + "The COM object is not suitable for the UNO type: " + desiredType.getTypeName(), 0, -1); } else @@ -1805,8 +1805,8 @@ Any UnoConversionUtilities<T>::createOleObjectWrapper(VARIANT* pVar, const Type& ret = xIntAdapter->queryInterface( desiredType); if ( ! ret.hasValue()) throw IllegalArgumentException( - OUSTR("[automation bridge]UnoConversionUtilities<T>::createOleObjectWrapper \n" - "The COM object is not suitable for the UNO type: ") + + "[automation bridge]UnoConversionUtilities<T>::createOleObjectWrapper \n" + "The COM object is not suitable for the UNO type: " + desiredType.getTypeName(), 0, -1); } @@ -1825,8 +1825,8 @@ Any UnoConversionUtilities<T>::createOleObjectWrapper(VARIANT* pVar, const Type& Reference<XInterface> xIntNewProxy= createComWrapperInstance(); if ( ! xIntNewProxy.is()) throw BridgeRuntimeError( - OUSTR("[automation bridge]UnoConversionUtilities<T>::createOleObjectWrapper \n" - "Could not create proxy object for COM object!")); + "[automation bridge]UnoConversionUtilities<T>::createOleObjectWrapper \n" + "Could not create proxy object for COM object!"); // initialize the COM wrapper Reference<XInitialization> xInit( xIntNewProxy, UNO_QUERY); @@ -1893,8 +1893,8 @@ Reference<XInterface> UnoConversionUtilities<T>::createAdapter(const Sequence<Ty else { throw BridgeRuntimeError( - OUSTR("[automation bridge]UnoConversionUtilities<T>::createOleObjectWrapper \n" - "Could not create a proxy for COM object! Creation of adapter failed.")); + "[automation bridge]UnoConversionUtilities<T>::createOleObjectWrapper \n" + "Could not create a proxy for COM object! Creation of adapter failed."); } return xIntAdapted; } @@ -1953,7 +1953,7 @@ bool UnoConversionUtilities<T>::convertValueObject( const VARIANTARG *var, Any& if (bFail) throw BridgeRuntimeError( - OUSTR("[automation bridge] Conversion of ValueObject failed ")); + "[automation bridge] Conversion of ValueObject failed "); } catch (const BridgeRuntimeError &) { @@ -1961,15 +1961,15 @@ bool UnoConversionUtilities<T>::convertValueObject( const VARIANTARG *var, Any& } catch (const Exception & e) { - throw BridgeRuntimeError(OUSTR("[automation bridge] unexpected exception in " - "UnoConversionUtilities<T>::convertValueObject ! Message : \n") + + throw BridgeRuntimeError("[automation bridge] unexpected exception in " + "UnoConversionUtilities<T>::convertValueObject ! Message : \n" + e.Message); } catch(...) { throw BridgeRuntimeError( - OUSTR("[automation bridge] unexpected exception in " - "UnoConversionUtilities<T>::convertValueObject !")); + "[automation bridge] unexpected exception in " + "UnoConversionUtilities<T>::convertValueObject !"); } return ret; } @@ -1981,14 +1981,14 @@ void UnoConversionUtilities<T>::dispatchExObject2Sequence( const VARIANTARG* pva { bool bFail = false; if( pvar->vt != VT_DISPATCH) - throw BridgeRuntimeError(OUSTR("[automation bridge] UnoConversionUtilities<T>::dispatchExObject2Sequence \n" - "Conversion of dispatch object to Sequence failed!")); + throw BridgeRuntimeError("[automation bridge] UnoConversionUtilities<T>::dispatchExObject2Sequence \n" + "Conversion of dispatch object to Sequence failed!"); IDispatchEx* pdispEx; HRESULT hr; if( FAILED( hr= pvar->pdispVal->QueryInterface( IID_IDispatchEx, reinterpret_cast<void**>( &pdispEx)))) - throw BridgeRuntimeError(OUSTR("[automation bridge] UnoConversionUtilities<T>::dispatchExObject2Sequence \n" - "Conversion of dispatch object to Sequence failed!")); + throw BridgeRuntimeError("[automation bridge] UnoConversionUtilities<T>::dispatchExObject2Sequence \n" + "Conversion of dispatch object to Sequence failed!"); DISPID dispid; OUString sindex; @@ -2000,15 +2000,15 @@ void UnoConversionUtilities<T>::dispatchExObject2Sequence( const VARIANTARG* pva // Get the length of the array. Can also be obtained throu GetNextDispID. The // method only returns DISPIDs of the array data. Their names are like "0", "1" etc. if( FAILED( hr= pdispEx->GetIDsOfNames(IID_NULL, &sLength , 1, LOCALE_USER_DEFAULT, &dispid))) - throw BridgeRuntimeError(OUSTR("[automation bridge] UnoConversionUtilities<T>::dispatchExObject2Sequence \n" - "Conversion of dispatch object to Sequence failed!")); + throw BridgeRuntimeError("[automation bridge] UnoConversionUtilities<T>::dispatchExObject2Sequence \n" + "Conversion of dispatch object to Sequence failed!"); if( FAILED( hr= pdispEx->InvokeEx(dispid, LOCALE_USER_DEFAULT, DISPATCH_PROPERTYGET, ¶m, &result, NULL, NULL))) - throw BridgeRuntimeError(OUSTR("[automation bridge] UnoConversionUtilities<T>::dispatchExObject2Sequence \n" - "Conversion of dispatch object to Sequence failed!")); + throw BridgeRuntimeError("[automation bridge] UnoConversionUtilities<T>::dispatchExObject2Sequence \n" + "Conversion of dispatch object to Sequence failed!"); if( FAILED( VariantChangeType( &result, &result, 0, VT_I4))) - throw BridgeRuntimeError(OUSTR("[automation bridge] UnoConversionUtilities<T>::dispatchExObject2Sequence \n" - "Conversion of dispatch object to Sequence failed!")); + throw BridgeRuntimeError("[automation bridge] UnoConversionUtilities<T>::dispatchExObject2Sequence \n" + "Conversion of dispatch object to Sequence failed!"); long length= result.lVal; result.Clear(); @@ -2042,14 +2042,14 @@ void UnoConversionUtilities<T>::dispatchExObject2Sequence( const VARIANTARG* pva if( FAILED( hr= pdispEx->GetIDsOfNames(IID_NULL, &sindex , 1, LOCALE_USER_DEFAULT, &dispid))) { - throw BridgeRuntimeError(OUSTR("[automation bridge] UnoConversionUtilities<T>::dispatchExObject2Sequence \n" - "Conversion of dispatch object to Sequence failed!")); + throw BridgeRuntimeError("[automation bridge] UnoConversionUtilities<T>::dispatchExObject2Sequence \n" + "Conversion of dispatch object to Sequence failed!"); } if( FAILED( hr= pdispEx->InvokeEx(dispid, LOCALE_USER_DEFAULT, DISPATCH_PROPERTYGET, ¶m, &result, NULL, NULL))) { - throw BridgeRuntimeError(OUSTR("[automation bridge] UnoConversionUtilities<T>::dispatchExObject2Sequence \n" - "Conversion of dispatch object to Sequence failed!")); + throw BridgeRuntimeError("[automation bridge] UnoConversionUtilities<T>::dispatchExObject2Sequence \n" + "Conversion of dispatch object to Sequence failed!"); } // If the result is VT_DISPATCH than the Sequence's element type could be Sequence @@ -2094,7 +2094,7 @@ void UnoConversionUtilities<T>::dispatchExObject2Sequence( const VARIANTARG* pva if (bFail) throw BridgeRuntimeError( - OUSTR("[automation bridge] Conversion of ValueObject failed ")); + "[automation bridge] Conversion of ValueObject failed "); } catch (const BridgeRuntimeError &) { @@ -2102,15 +2102,15 @@ void UnoConversionUtilities<T>::dispatchExObject2Sequence( const VARIANTARG* pva } catch (const Exception & e) { - throw BridgeRuntimeError(OUSTR("[automation bridge] unexpected exception in " - "UnoConversionUtilities<T>::convertValueObject ! Message : \n") + + throw BridgeRuntimeError("[automation bridge] unexpected exception in " + "UnoConversionUtilities<T>::convertValueObject ! Message : \n" + e.Message); } catch(...) { throw BridgeRuntimeError( - OUSTR("[automation bridge] unexpected exception in " - "UnoConversionUtilities<T>::convertValueObject !")); + "[automation bridge] unexpected exception in " + "UnoConversionUtilities<T>::convertValueObject !"); } } @@ -2367,7 +2367,7 @@ Reference<XTypeConverter> UnoConversionUtilities<T>::getTypeConverter() if ( ! m_typeConverter.is()) { Reference<XInterface> xIntConverter = - m_smgr->createInstance(OUSTR("com.sun.star.script.Converter")); + m_smgr->createInstance("com.sun.star.script.Converter"); if (xIntConverter.is()) m_typeConverter = Reference<XTypeConverter>(xIntConverter, UNO_QUERY); } diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx index a391d64a907d..b4cacc970e10 100644 --- a/extensions/source/ole/unoobjw.cxx +++ b/extensions/source/ole/unoobjw.cxx @@ -358,8 +358,8 @@ void InterfaceOleWrapper_Impl::convertDispparamsArgs(DISPID id, InvocationInfo info; if( ! getInvocationInfoForCall( id, info)) throw BridgeRuntimeError( - OUSTR("[automation bridge]InterfaceOleWrapper_Impl::convertDispparamsArgs \n" - "Could not obtain type information for current call.")); + "[automation bridge]InterfaceOleWrapper_Impl::convertDispparamsArgs \n" + "Could not obtain type information for current call."); for (int i = 0; i < countArgs; i++) { @@ -401,8 +401,8 @@ void InterfaceOleWrapper_Impl::convertDispparamsArgs(DISPID id, if( FAILED( hr)) { throw BridgeRuntimeError( - OUSTR("[automation bridge] Could not determine " - "if the object has a member \"0\". Error: ") + + "[automation bridge] Could not determine " + + "if the object has a member \"0\". Error: " + OUString::valueOf(hr)); } } @@ -878,15 +878,15 @@ STDMETHODIMP InterfaceOleWrapper_Impl::Invoke(DISPID dispidMember, } catch(const Exception& e) { - OUString message= OUSTR("InterfaceOleWrapper_Impl::Invoke : \n") + + OUString message= "InterfaceOleWrapper_Impl::Invoke : \n" + e.Message; writeExcepinfo(pexcepinfo, message); ret = DISP_E_EXCEPTION; } catch(...) { - OUString message= OUSTR("InterfaceOleWrapper_Impl::Invoke : \n" - "Unexpected exception"); + OUString message= "InterfaceOleWrapper_Impl::Invoke : \n" + + "Unexpected exception"; writeExcepinfo(pexcepinfo, message); ret = DISP_E_EXCEPTION; } @@ -955,7 +955,7 @@ HRESULT InterfaceOleWrapper_Impl::doInvoke( DISPPARAMS * pdispparams, VARIANT * Exception excTarget; org >>= excTarget; OUString message= - org.getValueType().getTypeName() + OUSTR(": ") + excTarget.Message; + org.getValueType().getTypeName() + ": " + excTarget.Message; writeExcepinfo(pexcepinfo, message); ret = DISP_E_EXCEPTION; } @@ -971,15 +971,15 @@ HRESULT InterfaceOleWrapper_Impl::doInvoke( DISPPARAMS * pdispparams, VARIANT * } catch(const Exception & e) { - OUString message= OUSTR("InterfaceOleWrapper_Impl::doInvoke : \n") + + OUString message= "InterfaceOleWrapper_Impl::doInvoke : \n" + e.Message; writeExcepinfo(pexcepinfo, message); ret = DISP_E_EXCEPTION; } catch( ... ) { - OUString message= OUSTR("InterfaceOleWrapper_Impl::doInvoke : \n" - "Unexpected exception"); + OUString message= "InterfaceOleWrapper_Impl::doInvoke : \n" + + "Unexpected exception"; writeExcepinfo(pexcepinfo, message); ret = DISP_E_EXCEPTION; } @@ -1011,14 +1011,14 @@ HRESULT InterfaceOleWrapper_Impl::doGetProperty( DISPPARAMS * /*pdispparams*/, V } catch(const Exception& e) { - OUString message= OUSTR("InterfaceOleWrapper_Impl::doGetProperty : \n") + + OUString message= "InterfaceOleWrapper_Impl::doGetProperty : \n" + e.Message; writeExcepinfo(pexcepinfo, message); } catch( ... ) { - OUString message= OUSTR("InterfaceOleWrapper_Impl::doInvoke : \n" - "Unexpected exception"); + OUString message= "InterfaceOleWrapper_Impl::doInvoke : \n" + + "Unexpected exception"); writeExcepinfo(pexcepinfo, message); ret = DISP_E_EXCEPTION; } @@ -1151,15 +1151,15 @@ HRESULT InterfaceOleWrapper_Impl::InvokeGeneral( DISPID dispidMember, unsigned s if (getType(arg.bstrVal, type) == false) { writeExcepinfo(pexcepinfo,OUString( - OUSTR("[automation bridge] A UNO type with the name ") + - OUString(reinterpret_cast<const sal_Unicode*>(arg.bstrVal)) + OUSTR(" does not exist!"))); + "[automation bridge] A UNO type with the name " + + OUString(reinterpret_cast<const sal_Unicode*>(arg.bstrVal)) + " does not exist!")); return DISP_E_EXCEPTION; } if (createUnoTypeWrapper(arg.bstrVal, pvarResult) == false) { - writeExcepinfo(pexcepinfo,OUSTR("[automation bridge] InterfaceOleWrapper_Impl::InvokeGeneral\n" - "Could not initialize UnoTypeWrapper object!")); + writeExcepinfo(pexcepinfo, "[automation bridge] InterfaceOleWrapper_Impl::InvokeGeneral\n" + + "Could not initialize UnoTypeWrapper object!"); return DISP_E_EXCEPTION; } } @@ -1171,15 +1171,15 @@ HRESULT InterfaceOleWrapper_Impl::InvokeGeneral( DISPID dispidMember, unsigned s } catch(const Exception & e) { - OUString message= OUSTR("InterfaceOleWrapper_Impl::InvokeGeneral : \n") + + OUString message= "InterfaceOleWrapper_Impl::InvokeGeneral : \n" + e.Message; writeExcepinfo(pexcepinfo, message); ret = DISP_E_EXCEPTION; } catch( ... ) { - OUString message= OUSTR("InterfaceOleWrapper_Impl::InvokeGeneral : \n" - "Unexpected exception"); + OUString message= "InterfaceOleWrapper_Impl::InvokeGeneral : \n" + + "Unexpected exception"; writeExcepinfo(pexcepinfo, message); ret = DISP_E_EXCEPTION; } @@ -1572,15 +1572,15 @@ STDMETHODIMP UnoObjectWrapperRemoteOpt::Invoke ( DISPID dispidMember, REFIID /* } catch(const Exception& e) { - OUString message= OUSTR("UnoObjectWrapperRemoteOpt::Invoke : \n") + + OUString message= "UnoObjectWrapperRemoteOpt::Invoke : \n" + e.Message; writeExcepinfo(pexcepinfo, message); ret = DISP_E_EXCEPTION; } catch(...) { - OUString message= OUSTR("UnoObjectWrapperRemoteOpt::Invoke : \n" - "Unexpected exception"); + OUString message= "UnoObjectWrapperRemoteOpt::Invoke : \n" + + "Unexpected exception"; writeExcepinfo(pexcepinfo, message); ret = DISP_E_EXCEPTION; } diff --git a/extensions/test/ole/OleClient/clientTest.cxx b/extensions/test/ole/OleClient/clientTest.cxx index 05b47d1b951f..6aca362f9c65 100644 --- a/extensions/test/ole/OleClient/clientTest.cxx +++ b/extensions/test/ole/OleClient/clientTest.cxx @@ -40,7 +40,6 @@ CComModule _Module; #include <cppuhelper/servicefactory.hxx> #include <rtl/string.h> -#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) BEGIN_OBJECT_MAP(ObjectMap) END_OBJECT_MAP() @@ -607,15 +606,15 @@ bool doPropertyWithArgumentTest(const Reference<XInvocation> & inv) //hasProperty, hasMethod - if (inv->hasProperty(OUSTR("prpMultiArg1"))) + if (inv->hasProperty("prpMultiArg1")) return false; - if ( ! inv->hasMethod(OUSTR("prpMultiArg1"))) + if ( ! inv->hasMethod("prpMultiArg1")) return false; - if ( ! inv->hasProperty(OUSTR("prprefLong"))) + if ( ! inv->hasProperty("prprefLong")) return false; - if (inv->hasMethod(OUSTR("prprefLong"))) + if (inv->hasMethod("prprefLong")) return false; - if ( ! inv->hasMethod(OUSTR("inLong"))) + if ( ! inv->hasMethod("inLong")) return false; return true; diff --git a/filter/source/msfilter/msocximex.cxx b/filter/source/msfilter/msocximex.cxx index 09f25e03872b..abf8b26a47e1 100644 --- a/filter/source/msfilter/msocximex.cxx +++ b/filter/source/msfilter/msocximex.cxx @@ -30,7 +30,7 @@ using namespace ::com::sun::star; using namespace ::rtl; -#define C2U(cChar) OUString(cChar) +#define cChar OUString(cChar) OUString sWW8_form( "WW-Standard" ); @@ -121,15 +121,15 @@ const uno::Reference< container::XIndexContainer >& return xFormComps; uno::Reference< uno::XInterface > xCreate = - rServiceFactory->createInstance( C2U( - "com.sun.star.form.component.Form") ); + rServiceFactory->createInstance( + "com.sun.star.form.component.Form" ); if( xCreate.is() ) { uno::Reference< beans::XPropertySet > xFormPropSet( xCreate, uno::UNO_QUERY ); uno::Any aTmp(&sName,getCppuType((OUString *)0)); - xFormPropSet->setPropertyValue( C2U("Name"), aTmp ); + xFormPropSet->setPropertyValue( "Name", aTmp ); uno::Reference< form::XForm > xForm( xCreate, uno::UNO_QUERY ); OSL_ENSURE(xForm.is(), "no Form?"); diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index 4d04490a17fd..36d66b47f712 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -71,7 +71,7 @@ static const char aOOOAttrMasterObjectsVisibility[] = NSPREFIX "master-object static const char aOOOAttrPageNumberVisibility[] = NSPREFIX "page-number-visibility"; static const char aOOOAttrDateTimeVisibility[] = NSPREFIX "date-time-visibility"; static const char aOOOAttrFooterVisibility[] = NSPREFIX "footer-visibility"; -static const char aOOOAttrDateTimeField[] = NSPREFIX "date-time-field"; +static const OUString aOOOAttrDateTimeField = NSPREFIX "date-time-field"; static const char aOOOAttrFooterField[] = NSPREFIX "footer-field"; static const char aOOOAttrHeaderField[] = NSPREFIX "header-field"; static const char aOOOAttrHasTransition[] = NSPREFIX "has-transition"; @@ -99,7 +99,7 @@ static const char aOOOAttrTextAdjust[] = NSPREFIX "text-adjust"; virtual ::rtl::OUString getClassName() const \ { \ static const char className[] = #class_name; \ - return B2UCONST( className ); \ + return OUString( className ); \ } @@ -168,8 +168,7 @@ public: TEXT_FIELD_GET_CLASS_NAME_METHOD( FixedDateTimeField ) virtual void growCharSet( SVGFilter::UCharSetMapMap & aTextFieldCharSets ) const { - static const ::rtl::OUString sFieldId = B2UCONST( aOOOAttrDateTimeField ); - implGrowCharSet( aTextFieldCharSets, text, sFieldId ); + implGrowCharSet( aTextFieldCharSets, text, aOOOAttrDateTimeField ); } virtual ~FixedDateTimeField() {} }; @@ -181,7 +180,7 @@ public: TEXT_FIELD_GET_CLASS_NAME_METHOD( FooterField ) virtual void growCharSet( SVGFilter::UCharSetMapMap & aTextFieldCharSets ) const { - static const ::rtl::OUString sFieldId = B2UCONST( aOOOAttrFooterField ); + static const OUString sFieldId = aOOOAttrFooterField; implGrowCharSet( aTextFieldCharSets, text, sFieldId ); } virtual ~FooterField() {} @@ -194,7 +193,7 @@ public: TEXT_FIELD_GET_CLASS_NAME_METHOD( HeaderField ) virtual void growCharSet( SVGFilter::UCharSetMapMap & aTextFieldCharSets ) const { - static const ::rtl::OUString sFieldId = B2UCONST( aOOOAttrHeaderField ); + static const OUString sFieldId = aOOOAttrHeaderField; implGrowCharSet( aTextFieldCharSets, text, sFieldId ); } virtual ~HeaderField() {} @@ -233,25 +232,25 @@ public: { case SVXDATEFORMAT_STDSMALL: ; case SVXDATEFORMAT_A: // 13.02.96 - sDateFormat = B2UCONST( "" ); + sDateFormat = ""; break; case SVXDATEFORMAT_C: // 13.Feb 1996 - sDateFormat = B2UCONST( "" ); + sDateFormat = ""; break; case SVXDATEFORMAT_D: // 13.February 1996 - sDateFormat = B2UCONST( "" ); + sDateFormat = ""; break; case SVXDATEFORMAT_E: // Tue, 13.February 1996 - sDateFormat = B2UCONST( "" ); + sDateFormat = ""; break; case SVXDATEFORMAT_STDBIG: ; case SVXDATEFORMAT_F: // Tuesday, 13.February 1996 - sDateFormat = B2UCONST( "" ); + sDateFormat = ""; break; // default case case SVXDATEFORMAT_B: ; // 13.02.1996 default: - sDateFormat = B2UCONST( "" ); + sDateFormat = ""; break; } } @@ -262,27 +261,25 @@ public: switch( eTimeFormat ) { case SVXTIMEFORMAT_24_HMS: // 13:49:38 - sTimeFormat = B2UCONST( "" ); + sTimeFormat = ""; break; case SVXTIMEFORMAT_AM_HM: ; // 01:49 PM case SVXTIMEFORMAT_12_HM: - sTimeFormat = B2UCONST( "" ); + sTimeFormat = ""; break; case SVXTIMEFORMAT_AM_HMS: ; // 01:49:38 PM case SVXTIMEFORMAT_12_HMS: - sTimeFormat = B2UCONST( "" ); + sTimeFormat = ""; break; // default case case SVXTIMEFORMAT_24_HM: ; // 13:49 default: - sTimeFormat = B2UCONST( "" ); + sTimeFormat = ""; break; } } - OUString sDateTimeFormat = sDateFormat; - sDateTimeFormat += OUString::valueOf( sal_Unicode(' ') ); - sDateTimeFormat += sTimeFormat; + OUString sDateTimeFormat = sDateFormat + " " + sTimeFormat; pSVGExport->AddAttribute( XML_NAMESPACE_NONE, aOOOAttrDateTimeFormat, sDateTimeFormat ); SvXMLElementExport aExp( *pSVGExport, XML_NAMESPACE_NONE, "g", sal_True, sal_True ); @@ -291,7 +288,7 @@ public: { // we use the unicode char set in an improper way: we put in the date/time fortat // in order to pass it to the CalcFieldValue method - static const ::rtl::OUString sFieldId = B2UCONST( aOOOAttrDateTimeField ) + B2UCONST( "-variable" ); + static const OUString sFieldId = aOOOAttrDateTimeField + "-variable"; SVGFilter::ObjectSet::const_iterator aMasterPageIt = mMasterPageSet.begin(); for( ; aMasterPageIt != mMasterPageSet.end(); ++aMasterPageIt ) { @@ -584,7 +581,7 @@ sal_Bool SVGFilter::implExport( const Sequence< PropertyValue >& rDescriptor ) { maFilterData.realloc( 6 ); - maFilterData[ 0 ].Name = B2UCONST( SVG_PROP_TINYPROFILE ); + maFilterData[ 0 ].Name = SVG_PROP_TINYPROFILE; maFilterData[ 0 ].Value <<= (sal_Bool) sal_True; // font embedding @@ -595,29 +592,29 @@ sal_Bool SVGFilter::implExport( const Sequence< PropertyValue >& rDescriptor ) const bool bEmbedFonts=pSVGDisableFontEmbedding ? false : ( aEmbedFontEnv.getLength() ? false : true); - maFilterData[ 1 ].Name = B2UCONST( SVG_PROP_EMBEDFONTS ); + maFilterData[ 1 ].Name = SVG_PROP_EMBEDFONTS; maFilterData[ 1 ].Value <<= (sal_Bool) (bEmbedFonts); // Native decoration - maFilterData[ 2 ].Name = B2UCONST( SVG_PROP_NATIVEDECORATION ); + maFilterData[ 2 ].Name = SVG_PROP_NATIVEDECORATION; maFilterData[ 2 ].Value <<= (sal_Bool) sal_False; // glyph placement const char* pSVGGlyphPlacement = getenv( "SVG_GLYPH_PLACEMENT" ); - maFilterData[ 3 ].Name = B2UCONST( SVG_PROP_GLYPHPLACEMENT ); + maFilterData[ 3 ].Name = SVG_PROP_GLYPHPLACEMENT; if( pSVGGlyphPlacement ) maFilterData[ 3 ].Value <<= ::rtl::OUString::createFromAscii( pSVGGlyphPlacement ); else - maFilterData[ 3 ].Value <<= B2UCONST( "xlist" ); + maFilterData[ 3 ].Value <<= OUString("xlist"); // Tiny Opacity - maFilterData[ 4 ].Name = B2UCONST( SVG_PROP_OPACITY ); + maFilterData[ 4 ].Name = SVG_PROP_OPACITY; maFilterData[ 4 ].Value <<= (sal_Bool) sal_True; // Tiny Gradient - maFilterData[ 5 ].Name = B2UCONST( SVG_PROP_GRADIENT ); + maFilterData[ 5 ].Name = SVG_PROP_GRADIENT; maFilterData[ 5 ].Value <<= (sal_Bool) sal_False; } @@ -732,7 +729,7 @@ sal_Bool SVGFilter::implLookForFirstVisiblePage() sal_Bool bVisible = sal_False; if( !mbPresentation || mbSinglePage || - ( ( xPropSet->getPropertyValue( B2UCONST( "Visible" ) ) >>= bVisible ) && bVisible ) ) + ( ( xPropSet->getPropertyValue( "Visible" ) >>= bVisible ) && bVisible ) ) { mnVisiblePage = nCurPage; } @@ -763,8 +760,8 @@ sal_Bool SVGFilter::implExportDocument() if( xDefaultPagePropertySet.is() ) { - xDefaultPagePropertySet->getPropertyValue( B2UCONST( "Width" ) ) >>= nDocWidth; - xDefaultPagePropertySet->getPropertyValue( B2UCONST( "Height" ) ) >>= nDocHeight; + xDefaultPagePropertySet->getPropertyValue( "Width" ) >>= nDocWidth; + xDefaultPagePropertySet->getPropertyValue( "Height" ) >>= nDocHeight; } if( xExtDocHandler.is() && !mpSVGExport->IsUseTinyProfile() ) @@ -772,10 +769,10 @@ sal_Bool SVGFilter::implExportDocument() xExtDocHandler->unknown( SVG_DTD_STRING ); } - mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "version", B2UCONST( "1.2" ) ); + mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "version", "1.2" ); if( mpSVGExport->IsUseTinyProfile() ) - mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "baseProfile", B2UCONST( "tiny" ) ); + mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "baseProfile", "tiny" ); // enabling _SVG_WRITE_EXTENTS means that the slide size is not adapted // to the size of the browser window, moreover the slide is top left aligned @@ -784,47 +781,42 @@ sal_Bool SVGFilter::implExportDocument() #ifdef _SVG_WRITE_EXTENTS if( mbSinglePage ) { - aAttr = OUString::valueOf( nDocWidth * 0.01 ); - aAttr += B2UCONST( "mm" ); + aAttr = OUString::valueOf( nDocWidth * 0.01 ) + "mm"; mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "width", aAttr ); - aAttr = OUString::valueOf( nDocHeight * 0.01 ); - aAttr += B2UCONST( "mm" ); + aAttr = OUString::valueOf( nDocHeight * 0.01 ) + "mm"; mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "height", aAttr ); } #endif - aAttr = B2UCONST( "0 0 " ); - aAttr += OUString::valueOf( nDocWidth ); - aAttr += B2UCONST( " " ); - aAttr += OUString::valueOf( nDocHeight ); + aAttr = "0 0 " + OUString::valueOf( nDocWidth ) + " " + OUString::valueOf( nDocHeight ); - msClipPathId = B2UCONST( "presentation_clip_path" ); - OUString sClipPathAttrValue = B2UCONST( "url(#" ) + msClipPathId + B2UCONST( ")" ); + msClipPathId = "presentation_clip_path"; + OUString sClipPathAttrValue = "url(#" + msClipPathId + ")"; mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "viewBox", aAttr ); - mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "preserveAspectRatio", B2UCONST( "xMidYMid" ) ); - mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "fill-rule", B2UCONST( "evenodd" ) ); + mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "preserveAspectRatio", "xMidYMid" ); + mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "fill-rule", "evenodd" ); mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "clip-path", sClipPathAttrValue ); // standard line width is based on 1 pixel on a 90 DPI device (0.28222mmm) mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "stroke-width", OUString::valueOf( 28.222 ) ); - mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "stroke-linejoin", B2UCONST( "round" ) ); - mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "xmlns", B2UCONST( "http://www.w3.org/2000/svg" ) ); - mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "xmlns:ooo", B2UCONST( "http://xml.openoffice.org/svg/export" ) ); - mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "xmlns:xlink", B2UCONST( "http://www.w3.org/1999/xlink" ) ); - mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "xml:space", B2UCONST( "preserve" ) ); + mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "stroke-linejoin", "round" ); + mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "xmlns", "http://www.w3.org/2000/svg" ); + mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "xmlns:ooo", "http://xml.openoffice.org/svg/export" ); + mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "xmlns:xlink", "http://www.w3.org/1999/xlink" ); + mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "xml:space", "preserve" ); mpSVGDoc = new SvXMLElementExport( *mpSVGExport, XML_NAMESPACE_NONE, "svg", sal_True, sal_True ); // Create a ClipPath element that will be used for cutting bitmaps and other elements that could exceed the page margins. { - mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "class", B2UCONST( "ClipPathGroup" ) ); + mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "class", "ClipPathGroup" ); SvXMLElementExport aDefsElem( *mpSVGExport, XML_NAMESPACE_NONE, "defs", sal_True, sal_True ); { mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "id", msClipPathId ); - mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "clipPathUnits", B2UCONST( "userSpaceOnUse" ) ); + mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "clipPathUnits", "userSpaceOnUse" ); SvXMLElementExport aClipPathElem( *mpSVGExport, XML_NAMESPACE_NONE, "clipPath", sal_True, sal_True ); { mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "x", OUString::valueOf( sal_Int32(0) ) ); @@ -936,7 +928,7 @@ sal_Bool SVGFilter::implGenerateMetaData() // we wrap all meta presentation info into a svg:defs element SvXMLElementExport aDefsElem( *mpSVGExport, XML_NAMESPACE_NONE, "defs", sal_True, sal_True ); - mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "id", B2UCONST( aOOOElemMetaSlides ) ); + mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "id", aOOOElemMetaSlides ); mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, aOOOAttrNumberOfSlides, OUString::valueOf( nCount ) ); mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, aOOOAttrStartSlideNumber, OUString::valueOf( mnVisiblePage ) ); @@ -963,16 +955,16 @@ sal_Bool SVGFilter::implGenerateMetaData() switch( nPageNumberingType ) { case SVX_CHARS_UPPER_LETTER: - sNumberingType = B2UCONST( "alpha-upper" ); + sNumberingType = "alpha-upper"; break; case SVX_CHARS_LOWER_LETTER: - sNumberingType = B2UCONST( "alpha-lower" ); + sNumberingType = "alpha-lower"; break; case SVX_ROMAN_UPPER: - sNumberingType = B2UCONST( "roman-upper" ); + sNumberingType = "roman-upper"; break; case SVX_ROMAN_LOWER: - sNumberingType = B2UCONST( "roman-lower" ); + sNumberingType = "roman-lower"; break; // arabic numbering type is the default, so we do not append any attribute for it case SVX_ARABIC: ; @@ -987,8 +979,8 @@ sal_Bool SVGFilter::implGenerateMetaData() { SvXMLElementExport aExp( *mpSVGExport, XML_NAMESPACE_NONE, "g", sal_True, sal_True ); - const OUString aId( B2UCONST( aOOOElemMetaSlide ) ); - const OUString aElemTextFieldId( B2UCONST( aOOOElemTextField ) ); + const OUString aId( aOOOElemMetaSlide ); + const OUString aElemTextFieldId( aOOOElemTextField ); std::vector< TextField* > aFieldSet; for( sal_Int32 i = 0; i < nCount; ++i ) @@ -1022,35 +1014,35 @@ sal_Bool SVGFilter::implGenerateMetaData() VariableDateTimeField aVariableDateTimeField; FooterField aFooterField; - xPropSet->getPropertyValue( B2UCONST( "IsBackgroundVisible" ) ) >>= bBackgroundVisibility; + xPropSet->getPropertyValue( "IsBackgroundVisible" ) >>= bBackgroundVisibility; // in case the attribute is set to its default value it is not appended to the meta-slide element if( !bBackgroundVisibility ) // visibility default value: 'visible' - mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, aOOOAttrBackgroundVisibility, B2UCONST( "hidden" ) ); + mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, aOOOAttrBackgroundVisibility, "hidden" ); // Page Number, Date/Time, Footer and Header Fields are regarded as background objects. // So bBackgroundObjectsVisibility overrides visibility of master page text fields. - xPropSet->getPropertyValue( B2UCONST( "IsBackgroundObjectsVisible" ) ) >>= bBackgroundObjectsVisibility; + xPropSet->getPropertyValue( "IsBackgroundObjectsVisible" ) >>= bBackgroundObjectsVisibility; if( bBackgroundObjectsVisibility ) // visibility default value: 'visible' { /* * Page Number Field */ - xPropSet->getPropertyValue( B2UCONST( "IsPageNumberVisible" ) ) >>= bPageNumberVisibility; + xPropSet->getPropertyValue( "IsPageNumberVisible" ) >>= bPageNumberVisibility; bPageNumberVisibility = bPageNumberVisibility && ( nPageNumberingType != SVX_NUMBER_NONE ); if( bPageNumberVisibility ) // visibility default value: 'hidden' { - mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, aOOOAttrPageNumberVisibility, B2UCONST( "visible" ) ); + mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, aOOOAttrPageNumberVisibility, "visible" ); } /* * Date/Time Field */ - xPropSet->getPropertyValue( B2UCONST( "IsDateTimeVisible" ) ) >>= bDateTimeVisibility; + xPropSet->getPropertyValue( "IsDateTimeVisible" ) >>= bDateTimeVisibility; if( bDateTimeVisibility ) // visibility default value: 'visible' { - xPropSet->getPropertyValue( B2UCONST( "IsDateTimeFixed" ) ) >>= bDateTimeFixed; + xPropSet->getPropertyValue( "IsDateTimeFixed" ) >>= bDateTimeFixed; if( bDateTimeFixed ) // we are interested only in the field text not in the date/time format { - xPropSet->getPropertyValue( B2UCONST( "DateTimeText" ) ) >>= aFixedDateTimeField.text; + xPropSet->getPropertyValue( "DateTimeText" ) >>= aFixedDateTimeField.text; if( !aFixedDateTimeField.text.isEmpty() ) { OUString sFieldId = implGenerateFieldId( aFieldSet, aFixedDateTimeField, aElemTextFieldId, xMasterPage ); @@ -1059,22 +1051,22 @@ sal_Bool SVGFilter::implGenerateMetaData() } else // the inverse applies: we are interested only in the date/time format not in the field text { - xPropSet->getPropertyValue( B2UCONST( "DateTimeFormat" ) ) >>= aVariableDateTimeField.format; + xPropSet->getPropertyValue( "DateTimeFormat" ) >>= aVariableDateTimeField.format; OUString sFieldId = implGenerateFieldId( aFieldSet, aVariableDateTimeField, aElemTextFieldId, xMasterPage ); mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, aOOOAttrDateTimeField, sFieldId ); } } else { - mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, aOOOAttrDateTimeVisibility, B2UCONST( "hidden" ) ); + mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, aOOOAttrDateTimeVisibility, "hidden" ); } /* * Footer Field */ - xPropSet->getPropertyValue( B2UCONST( "IsFooterVisible" ) ) >>= bFooterVisibility; + xPropSet->getPropertyValue( "IsFooterVisible" ) >>= bFooterVisibility; if( bFooterVisibility ) // visibility default value: 'visible' { - xPropSet->getPropertyValue( B2UCONST( "FooterText" ) ) >>= aFooterField.text; + xPropSet->getPropertyValue( "FooterText" ) >>= aFooterField.text; if( !aFooterField.text.isEmpty() ) { OUString sFieldId = implGenerateFieldId( aFieldSet, aFooterField, aElemTextFieldId, xMasterPage ); @@ -1083,12 +1075,12 @@ sal_Bool SVGFilter::implGenerateMetaData() } else { - mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, aOOOAttrFooterVisibility, B2UCONST( "hidden" ) ); + mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, aOOOAttrFooterVisibility, "hidden" ); } } else { - mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, aOOOAttrMasterObjectsVisibility, B2UCONST( "hidden" ) ); + mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, aOOOAttrMasterObjectsVisibility, "hidden" ); } // We look for a slide transition. @@ -1098,9 +1090,9 @@ sal_Bool SVGFilter::implGenerateMetaData() (xPropSet->getPropertyValue( "TransitionType" ) >>= nTransitionType) ) { sal_Int16 nTransitionSubType(0); - if( xPropSet->getPropertyValue( B2UCONST( "TransitionSubtype" ) ) >>= nTransitionSubType ) + if( xPropSet->getPropertyValue( "TransitionSubtype" ) >>= nTransitionSubType ) { - mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, aOOOAttrHasTransition, B2UCONST( "true" ) ); + mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, aOOOAttrHasTransition, "true" ); } } @@ -1117,9 +1109,7 @@ sal_Bool SVGFilter::implGenerateMetaData() { for( sal_Int32 i = 0, nSize = aFieldSet.size(); i < nSize; ++i ) { - OUString sElemId = B2UCONST( aOOOElemTextField ); - sElemId += OUString::valueOf( sal_Unicode('_') ); - sElemId += OUString::valueOf( i ); + OUString sElemId = OUString(aOOOElemTextField) + "_" + OUString::number( i ); mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "id", sElemId ); aFieldSet[i]->elementExport( mpSVGExport ); } @@ -1152,7 +1142,7 @@ sal_Bool SVGFilter::implExportAnimations() { sal_Bool bRet = sal_False; - mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "id", B2UCONST( "presentation-animations" ) ); + mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "id", "presentation-animations" ); SvXMLElementExport aDefsContainerElem( *mpSVGExport, XML_NAMESPACE_NONE, "defs", sal_True, sal_True ); for( sal_Int32 i = 0; i < mSelectedPages.getLength(); ++i ) @@ -1162,7 +1152,7 @@ sal_Bool SVGFilter::implExportAnimations() if( xProps.is() && xProps->getPropertySetInfo()->hasPropertyByName( "TransitionType" ) ) { sal_Int16 nTransition = 0; - xProps->getPropertyValue( B2UCONST( "TransitionType" ) ) >>= nTransition; + xProps->getPropertyValue( "TransitionType" ) >>= nTransition; // we have a slide transition ? sal_Bool bHasEffects = ( nTransition != 0 ); @@ -1193,9 +1183,9 @@ sal_Bool SVGFilter::implExportAnimations() { OUString sId = implGetValidIDFromInterface( mSelectedPages[i] ); mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, aOOOAttrSlide, sId ); - sId += B2UCONST( "-animations" ); + sId += "-animations"; mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "id", sId ); - mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "class", B2UCONST( "Animations" ) ); + mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "class", "Animations" ); SvXMLElementExport aDefsElem( *mpSVGExport, XML_NAMESPACE_NONE, "defs", sal_True, sal_True ); UniReference< xmloff::AnimationsExporter > xAnimationsExporter; @@ -1216,7 +1206,7 @@ sal_Bool SVGFilter::implExportAnimations() void SVGFilter::implExportTextShapeIndex() { - mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "class", B2UCONST( "TextShapeIndex" ) ); + mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "class", "TextShapeIndex" ); SvXMLElementExport aDefsContainerElem( *mpSVGExport, XML_NAMESPACE_NONE, "defs", sal_True, sal_True ); sal_Int32 nCount = mSelectedPages.getLength(); @@ -1243,26 +1233,26 @@ void SVGFilter::implExportTextShapeIndex() void SVGFilter::implEmbedBulletGlyphs() { - mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "class", B2UCONST( "EmbeddedBulletChars" ) ); + mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "class", "EmbeddedBulletChars" ); SvXMLElementExport aDefsContainerElem( *mpSVGExport, XML_NAMESPACE_NONE, "defs", sal_True, sal_True ); - OUString sPathData = B2UCONST( "M 580,1141 L 1163,571 580,0 -4,571 580,1141 Z" ); + OUString sPathData = "M 580,1141 L 1163,571 580,0 -4,571 580,1141 Z"; implEmbedBulletGlyph( 57356, sPathData ); - sPathData = B2UCONST( "M 8,1128 L 1137,1128 1137,0 8,0 8,1128 Z" ); + sPathData = "M 8,1128 L 1137,1128 1137,0 8,0 8,1128 Z"; implEmbedBulletGlyph( 57354, sPathData ); - sPathData = B2UCONST( "M 174,0 L 602,739 174,1481 1456,739 174,0 Z M 1358,739 L 309,1346 659,739 1358,739 Z" ); + sPathData = "M 174,0 L 602,739 174,1481 1456,739 174,0 Z M 1358,739 L 309,1346 659,739 1358,739 Z"; implEmbedBulletGlyph( 10146, sPathData ); - sPathData = B2UCONST( "M 2015,739 L 1276,0 717,0 1260,543 174,543 174,936 1260,936 717,1481 1274,1481 2015,739 Z" ); + sPathData = "M 2015,739 L 1276,0 717,0 1260,543 174,543 174,936 1260,936 717,1481 1274,1481 2015,739 Z"; implEmbedBulletGlyph( 10132, sPathData ); - sPathData = B2UCONST( "M 0,-2 C -7,14 -16,27 -25,37 L 356,567 C 262,823 215,952 215,954 215,979 228,992 255,992 264,992 276,990 289,987 310,991 331,999 354,1012 L 381,999 492,748 772,1049 836,1024 860,1049 C 881,1039 901,1025 922,1006 886,937 835,863 770,784 769,783 710,716 594,584 L 774,223 C 774,196 753,168 711,139 L 727,119 C 717,90 699,76 672,76 641,76 570,178 457,381 L 164,-76 C 142,-110 111,-127 72,-127 30,-127 9,-110 8,-76 1,-67 -2,-52 -2,-32 -2,-23 -1,-13 0,-2 Z" ); + sPathData = "M 0,-2 C -7,14 -16,27 -25,37 L 356,567 C 262,823 215,952 215,954 215,979 228,992 255,992 264,992 276,990 289,987 310,991 331,999 354,1012 L 381,999 492,748 772,1049 836,1024 860,1049 C 881,1039 901,1025 922,1006 886,937 835,863 770,784 769,783 710,716 594,584 L 774,223 C 774,196 753,168 711,139 L 727,119 C 717,90 699,76 672,76 641,76 570,178 457,381 L 164,-76 C 142,-110 111,-127 72,-127 30,-127 9,-110 8,-76 1,-67 -2,-52 -2,-32 -2,-23 -1,-13 0,-2 Z"; implEmbedBulletGlyph( 10007, sPathData ); - sPathData = B2UCONST( "M 285,-33 C 182,-33 111,30 74,156 52,228 41,333 41,471 41,549 55,616 82,672 116,743 169,778 240,778 293,778 328,747 346,684 L 369,508 C 377,444 397,411 428,410 L 1163,1116 C 1174,1127 1196,1133 1229,1133 1271,1133 1292,1118 1292,1087 L 1292,965 C 1292,929 1282,901 1262,881 L 442,47 C 390,-6 338,-33 285,-33 Z" ); + sPathData = "M 285,-33 C 182,-33 111,30 74,156 52,228 41,333 41,471 41,549 55,616 82,672 116,743 169,778 240,778 293,778 328,747 346,684 L 369,508 C 377,444 397,411 428,410 L 1163,1116 C 1174,1127 1196,1133 1229,1133 1271,1133 1292,1118 1292,1087 L 1292,965 C 1292,929 1282,901 1262,881 L 442,47 C 390,-6 338,-33 285,-33 Z"; implEmbedBulletGlyph( 10004, sPathData ); - sPathData = B2UCONST( "M 813,0 C 632,0 489,54 383,161 276,268 223,411 223,592 223,773 276,916 383,1023 489,1130 632,1184 813,1184 992,1184 1136,1130 1245,1023 1353,916 1407,772 1407,592 1407,412 1353,268 1245,161 1136,54 992,0 813,0 Z" ); + sPathData = "M 813,0 C 632,0 489,54 383,161 276,268 223,411 223,592 223,773 276,916 383,1023 489,1130 632,1184 813,1184 992,1184 1136,1130 1245,1023 1353,916 1407,772 1407,592 1407,412 1353,268 1245,161 1136,54 992,0 813,0 Z"; implEmbedBulletGlyph( 9679, sPathData ); - sPathData = B2UCONST( "M 346,457 C 273,457 209,483 155,535 101,586 74,649 74,723 74,796 101,859 155,911 209,963 273,989 346,989 419,989 480,963 531,910 582,859 608,796 608,723 608,648 583,586 532,535 482,483 420,457 346,457 Z" ); + sPathData = "M 346,457 C 273,457 209,483 155,535 101,586 74,649 74,723 74,796 101,859 155,911 209,963 273,989 346,989 419,989 480,963 531,910 582,859 608,796 608,723 608,648 583,586 532,535 482,483 420,457 346,457 Z"; implEmbedBulletGlyph( 8226, sPathData ); - sPathData = B2UCONST( "M -4,459 L 1135,459 1135,606 -4,606 -4,459 Z" ); + sPathData = "M -4,459 L 1135,459 1135,606 -4,606 -4,459 Z"; implEmbedBulletGlyph( 8211, sPathData ); } @@ -1270,16 +1260,12 @@ void SVGFilter::implEmbedBulletGlyphs() void SVGFilter::implEmbedBulletGlyph( sal_Unicode cBullet, const ::rtl::OUString & sPathData ) { - OUString sId = B2UCONST( "bullet-char-template(" ); - sId += OUString::valueOf( (sal_Int32)cBullet ); - sId += B2UCONST( ")" ); + OUString sId = "bullet-char-template(" + OUString::number( (sal_Int32)cBullet ) + ")"; mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "id", sId ); double fFactor = 1.0 / 2048; OUString sFactor = OUString::valueOf( fFactor ); - OUString sTransform = B2UCONST( "scale(" ); - sTransform += sFactor; sTransform += B2UCONST( ",-" ); sTransform += sFactor; - sTransform += B2UCONST( ")" ); + OUString sTransform = "scale(" + sFactor + ",-" + sFactor + ")"; mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "transform", sTransform ); SvXMLElementExport aGElem( *mpSVGExport, XML_NAMESPACE_NONE, "g", sal_True, sal_True ); @@ -1297,7 +1283,7 @@ void SVGFilter::implEmbedBulletGlyph( sal_Unicode cBullet, const ::rtl::OUString */ sal_Bool SVGFilter::implExportTextEmbeddedBitmaps() { - mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "class", B2UCONST( "TextEmbeddedBitmaps" ) ); + mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "class", "TextEmbeddedBitmaps" ); SvXMLElementExport aDefsContainerElem( *mpSVGExport, XML_NAMESPACE_NONE, "defs", sal_True, sal_True ); OUString sId; @@ -1314,15 +1300,13 @@ sal_Bool SVGFilter::implExportTextEmbeddedBitmaps() if( pAction ) { sal_uLong nId = GetBitmapChecksum( pAction ); - sId = B2UCONST( "bitmap(" ); - sId += OUString::valueOf( (sal_Int64)nId ); - sId += B2UCONST( ")" ); + sId = "bitmap(" + OUString::valueOf( (sal_Int64)nId ) + ")"; mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "id", sId ); const Reference< XShape >& rxShape = (const Reference< XShape >&)( it->GetObject() ); Reference< XPropertySet > xShapePropSet( rxShape, UNO_QUERY ); ::com::sun::star::awt::Rectangle aBoundRect; - if( xShapePropSet.is() && ( xShapePropSet->getPropertyValue( B2UCONST( "BoundRect" ) ) >>= aBoundRect ) ) + if( xShapePropSet.is() && ( xShapePropSet->getPropertyValue( "BoundRect" ) >>= aBoundRect ) ) { // Origin of the coordinate device must be (0,0). const Point aTopLeft; @@ -1369,7 +1353,7 @@ sal_Bool SVGFilter::implExportTextEmbeddedBitmaps() sal_Bool SVGFilter::implGenerateScript() { - mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "type", B2UCONST( "text/ecmascript" ) ); + mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "type", "text/ecmascript" ); { SvXMLElementExport aExp( *mpSVGExport, XML_NAMESPACE_NONE, "script", sal_True, sal_True ); @@ -1431,19 +1415,19 @@ sal_Bool SVGFilter::implGetPagePropSet( const Reference< XDrawPage > & rxPage ) Reference< XPropertySetInfo > xPropSetInfo( xPropSet->getPropertySetInfo() ); if( xPropSetInfo.is() ) { - implSafeGetPagePropSet( B2UCONST( "IsBackgroundVisible" ), xPropSet, xPropSetInfo ) >>= mVisiblePagePropSet.bIsBackgroundVisible; - implSafeGetPagePropSet( B2UCONST( "IsBackgroundObjectsVisible" ), xPropSet, xPropSetInfo ) >>= mVisiblePagePropSet.bAreBackgroundObjectsVisible; - implSafeGetPagePropSet( B2UCONST( "IsPageNumberVisible" ), xPropSet, xPropSetInfo ) >>= mVisiblePagePropSet.bIsPageNumberFieldVisible; - implSafeGetPagePropSet( B2UCONST( "IsHeaderVisible" ), xPropSet, xPropSetInfo ) >>= mVisiblePagePropSet.bIsHeaderFieldVisible; - implSafeGetPagePropSet( B2UCONST( "IsFooterVisible" ), xPropSet, xPropSetInfo ) >>= mVisiblePagePropSet.bIsFooterFieldVisible; - implSafeGetPagePropSet( B2UCONST( "IsDateTimeVisible" ), xPropSet, xPropSetInfo ) >>= mVisiblePagePropSet.bIsDateTimeFieldVisible; - - implSafeGetPagePropSet( B2UCONST( "IsDateTimeFixed" ), xPropSet, xPropSetInfo ) >>= mVisiblePagePropSet.bIsDateTimeFieldFixed; - implSafeGetPagePropSet( B2UCONST( "DateTimeFormat" ), xPropSet, xPropSetInfo ) >>= mVisiblePagePropSet.nDateTimeFormat; - implSafeGetPagePropSet( B2UCONST( "Number" ), xPropSet, xPropSetInfo ) >>= mVisiblePagePropSet.nPageNumber; - implSafeGetPagePropSet( B2UCONST( "DateTimeText" ), xPropSet, xPropSetInfo ) >>= mVisiblePagePropSet.sDateTimeText; - implSafeGetPagePropSet( B2UCONST( "FooterText" ), xPropSet, xPropSetInfo ) >>= mVisiblePagePropSet.sFooterText; - implSafeGetPagePropSet( B2UCONST( "HeaderText" ), xPropSet, xPropSetInfo ) >>= mVisiblePagePropSet.sHeaderText; + implSafeGetPagePropSet( "IsBackgroundVisible", xPropSet, xPropSetInfo ) >>= mVisiblePagePropSet.bIsBackgroundVisible; + implSafeGetPagePropSet( "IsBackgroundObjectsVisible", xPropSet, xPropSetInfo ) >>= mVisiblePagePropSet.bAreBackgroundObjectsVisible; + implSafeGetPagePropSet( "IsPageNumberVisible", xPropSet, xPropSetInfo ) >>= mVisiblePagePropSet.bIsPageNumberFieldVisible; + implSafeGetPagePropSet( "IsHeaderVisible", xPropSet, xPropSetInfo ) >>= mVisiblePagePropSet.bIsHeaderFieldVisible; + implSafeGetPagePropSet( "IsFooterVisible", xPropSet, xPropSetInfo ) >>= mVisiblePagePropSet.bIsFooterFieldVisible; + implSafeGetPagePropSet( "IsDateTimeVisible", xPropSet, xPropSetInfo ) >>= mVisiblePagePropSet.bIsDateTimeFieldVisible; + + implSafeGetPagePropSet( "IsDateTimeFixed", xPropSet, xPropSetInfo ) >>= mVisiblePagePropSet.bIsDateTimeFieldFixed; + implSafeGetPagePropSet( "DateTimeFormat", xPropSet, xPropSetInfo ) >>= mVisiblePagePropSet.nDateTimeFormat; + implSafeGetPagePropSet( "Number", xPropSet, xPropSetInfo ) >>= mVisiblePagePropSet.nPageNumber; + implSafeGetPagePropSet( "DateTimeText", xPropSet, xPropSetInfo ) >>= mVisiblePagePropSet.sDateTimeText; + implSafeGetPagePropSet( "FooterText", xPropSet, xPropSetInfo ) >>= mVisiblePagePropSet.sFooterText; + implSafeGetPagePropSet( "HeaderText", xPropSet, xPropSetInfo ) >>= mVisiblePagePropSet.sHeaderText; if( mVisiblePagePropSet.bIsPageNumberFieldVisible ) { @@ -1474,7 +1458,7 @@ sal_Bool SVGFilter::implExportMasterPages( const SVGFilter::XDrawPageSequence & // When the exported slides are more than one we wrap master page elements // with a svg <defs> element. - OUString aContainerTag = (mbSinglePage) ? B2UCONST( "g" ) : B2UCONST( "defs" ); + OUString aContainerTag = (mbSinglePage) ? OUString( "g" ) : OUString( "defs" ); SvXMLElementExport aContainerElement( *mpSVGExport, XML_NAMESPACE_NONE, aContainerTag, sal_True, sal_True ); sal_Bool bRet = sal_False; @@ -1506,7 +1490,7 @@ sal_Bool SVGFilter::implExportDrawPages( const SVGFilter::XDrawPageSequence & rx "SVGFilter::implExportPages: nFirstPage > nLastPage" ); // We wrap all slide in a group element with class name "SlideGroup". - mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "class", B2UCONST( "SlideGroup" ) ); + mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "class", "SlideGroup" ); SvXMLElementExport aExp( *mpSVGExport, XML_NAMESPACE_NONE, "g", sal_True, sal_True ); sal_Bool bRet = sal_False; @@ -1522,7 +1506,7 @@ sal_Bool SVGFilter::implExportDrawPages( const SVGFilter::XDrawPageSequence & rx // visibility of each slide is set to 'hidden'. if( !mbSinglePage ) { - mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "visibility", B2UCONST( "hidden" ) ); + mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "visibility", "hidden" ); } SvXMLElementExport aGElement( *mpSVGExport, XML_NAMESPACE_NONE, "g", sal_True, sal_True ); @@ -1531,12 +1515,12 @@ sal_Bool SVGFilter::implExportDrawPages( const SVGFilter::XDrawPageSequence & rx const OUString & sPageId = implGetValidIDFromInterface( rxPages[i] ); mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "id", sPageId ); - mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "class", B2UCONST( "Slide" ) ); + mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "class", "Slide" ); // Adding a clip path to each exported slide , so in case // bitmaps or other elements exceed the slide margins, they are // trimmed, even when they are shown inside a thumbnail view. - OUString sClipPathAttrValue = B2UCONST( "url(#" ) + msClipPathId + B2UCONST( ")" ); + OUString sClipPathAttrValue = "url(#" + msClipPathId + ")"; mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "clip-path", sClipPathAttrValue ); SvXMLElementExport aSlideElement( *mpSVGExport, XML_NAMESPACE_NONE, "g", sal_True, sal_True ); @@ -1570,9 +1554,9 @@ sal_Bool SVGFilter::implExportPage( const ::rtl::OUString & sPageId, OUString aDesc; if( bMaster ) - aDesc = B2UCONST( "Master_Slide" ); + aDesc = "Master_Slide"; else - aDesc = B2UCONST( "Page" ); + aDesc = "Page"; mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "class", aDesc ); } @@ -1588,7 +1572,7 @@ sal_Bool SVGFilter::implExportPage( const ::rtl::OUString & sPageId, if( rMtf.GetActionSize() ) { // background id = "bg-" + page id - OUString sBackgroundId = B2UCONST( "bg-" ); + OUString sBackgroundId = "bg-"; sBackgroundId += sPageId; mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "id", sBackgroundId ); @@ -1603,11 +1587,11 @@ sal_Bool SVGFilter::implExportPage( const ::rtl::OUString & sPageId, { if( !mVisiblePagePropSet.bIsBackgroundVisible ) { - mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "visibility", B2UCONST( "hidden" ) ); + mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "visibility", "hidden" ); } } - mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "class", B2UCONST( "Background" ) ); + mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "class", "Background" ); // insert the <g> open tag related to the Background SvXMLElementExport aExp2( *mpSVGExport, XML_NAMESPACE_NONE, "g", sal_True, sal_True ); @@ -1623,17 +1607,17 @@ sal_Bool SVGFilter::implExportPage( const ::rtl::OUString & sPageId, if( bMaster ) { // background objects id = "bo-" + page id - OUString sBackgroundObjectsId = B2UCONST( "bo-" ); + OUString sBackgroundObjectsId = "bo-"; sBackgroundObjectsId += sPageId; mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "id", sBackgroundObjectsId ); if( mbSinglePage ) { if( !mVisiblePagePropSet.bAreBackgroundObjectsVisible ) { - mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "visibility", B2UCONST( "hidden" ) ); + mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "visibility", "hidden" ); } } - mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "class", B2UCONST( "BackgroundObjects" ) ); + mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "class", "BackgroundObjects" ); // insert the <g> open tag related to the Background Objects SvXMLElementExport aExp2( *mpSVGExport, XML_NAMESPACE_NONE, "g", sal_True, sal_True ); @@ -1684,18 +1668,18 @@ sal_Bool SVGFilter::implExportShape( const Reference< XShape >& rxShape ) if( mbPresentation ) { - xShapePropSet->getPropertyValue( B2UCONST( "IsEmptyPresentationObject" ) ) >>= bHideObj; + xShapePropSet->getPropertyValue( "IsEmptyPresentationObject" ) >>= bHideObj; } if( !bHideObj ) { - if( aShapeType.lastIndexOf( B2UCONST( "drawing.GroupShape" ) ) != -1 ) + if( aShapeType.lastIndexOf( "drawing.GroupShape" ) != -1 ) { Reference< XShapes > xShapes( rxShape, UNO_QUERY ); if( xShapes.is() ) { - mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "class", B2UCONST( "Group" ) ); + mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "class", "Group" ); SvXMLElementExport aExp( *mpSVGExport, XML_NAMESPACE_NONE, "g", sal_True, sal_True ); bRet = implExportShapes( xShapes ); @@ -1709,7 +1693,7 @@ sal_Bool SVGFilter::implExportShape( const Reference< XShape >& rxShape ) ::com::sun::star::awt::Rectangle aBoundRect; const GDIMetaFile& rMtf = (*mpObjects)[ rxShape ].GetRepresentation(); - xShapePropSet->getPropertyValue( B2UCONST( "BoundRect" ) ) >>= aBoundRect; + xShapePropSet->getPropertyValue( "BoundRect" ) >>= aBoundRect; const Point aTopLeft( aBoundRect.X, aBoundRect.Y ); const Size aSize( aBoundRect.Width, aBoundRect.Height ); @@ -1731,22 +1715,22 @@ sal_Bool SVGFilter::implExportShape( const Reference< XShape >& rxShape ) // that we are dealing with a placeholder shape pElementId = &sPlaceholderTag; - mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "visibility", B2UCONST( "hidden" ) ); + mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "visibility", "hidden" ); sal_uInt16 nTextAdjust = ParagraphAdjust_LEFT; OUString sTextAdjust; - xShapePropSet->getPropertyValue( B2UCONST( "ParaAdjust" ) ) >>= nTextAdjust; + xShapePropSet->getPropertyValue( "ParaAdjust" ) >>= nTextAdjust; switch( nTextAdjust ) { case ParagraphAdjust_LEFT: - sTextAdjust = B2UCONST( "left" ); + sTextAdjust = "left"; break; case ParagraphAdjust_CENTER: - sTextAdjust = B2UCONST( "center" ); + sTextAdjust = "center"; break; case ParagraphAdjust_RIGHT: - sTextAdjust = B2UCONST( "right" ); + sTextAdjust = "right"; break; default: break; @@ -1760,7 +1744,7 @@ sal_Bool SVGFilter::implExportShape( const Reference< XShape >& rxShape ) ( bIsDateTime && !mVisiblePagePropSet.bIsDateTimeFieldVisible ) || ( bIsFooter && !mVisiblePagePropSet.bIsFooterFieldVisible ) ) ) { - mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "visibility", B2UCONST( "hidden" ) ); + mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "visibility", "hidden" ); } } } @@ -1771,7 +1755,7 @@ sal_Bool SVGFilter::implExportShape( const Reference< XShape >& rxShape ) Reference< XExtendedDocumentHandler > xExtDocHandler( mpSVGExport->GetDocHandler(), UNO_QUERY ); OUString aTitle; - xShapePropSet->getPropertyValue( B2UCONST( "Title" ) ) >>= aTitle; + xShapePropSet->getPropertyValue( "Title" ) >>= aTitle; if( !aTitle.isEmpty() ) { SvXMLElementExport aExp2( *mpSVGExport, XML_NAMESPACE_NONE, "title", sal_True, sal_True ); @@ -1779,7 +1763,7 @@ sal_Bool SVGFilter::implExportShape( const Reference< XShape >& rxShape ) } OUString aDescription; - xShapePropSet->getPropertyValue( B2UCONST( "Description" ) ) >>= aDescription; + xShapePropSet->getPropertyValue( "Description" ) >>= aDescription; if( !aDescription.isEmpty() ) { SvXMLElementExport aExp2( *mpSVGExport, XML_NAMESPACE_NONE, "desc", sal_True, sal_True ); @@ -1857,11 +1841,11 @@ sal_Bool SVGFilter::implCreateObjects() // this is really too expensive! Reference< XPropertySet > xPropSet( xDrawPage, UNO_QUERY ); Reference< XPropertySet > xBackground; - xPropSet->getPropertyValue( B2UCONST( "Background" ) ) >>= xBackground; + xPropSet->getPropertyValue( "Background" ) >>= xBackground; if( xBackground.is() ) { drawing::FillStyle aFillStyle; - sal_Bool assigned = ( xBackground->getPropertyValue( B2UCONST( "FillStyle" ) ) >>= aFillStyle ); + sal_Bool assigned = ( xBackground->getPropertyValue( "FillStyle" ) >>= aFillStyle ); if( assigned && aFillStyle != drawing::FillStyle_NONE ) { implCreateObjectsFromBackground( xDrawPage ); @@ -1900,7 +1884,7 @@ sal_Bool SVGFilter::implCreateObjectsFromShapes( const Reference< XDrawPage > & sal_Bool SVGFilter::implCreateObjectsFromShape( const Reference< XDrawPage > & rxPage, const Reference< XShape >& rxShape ) { sal_Bool bRet = sal_False; - if( rxShape->getShapeType().lastIndexOf( B2UCONST( "drawing.GroupShape" ) ) != -1 ) + if( rxShape->getShapeType().lastIndexOf( "drawing.GroupShape" ) != -1 ) { Reference< XShapes > xShapes( rxShape, UNO_QUERY ); @@ -1946,7 +1930,7 @@ sal_Bool SVGFilter::implCreateObjectsFromShape( const Reference< XDrawPage > & r if( mbPresentation ) { - xShapePropSet->getPropertyValue( B2UCONST( "IsEmptyPresentationObject" ) ) >>= bHideObj; + xShapePropSet->getPropertyValue( "IsEmptyPresentationObject" ) >>= bHideObj; } if( !bHideObj ) @@ -1958,7 +1942,7 @@ sal_Bool SVGFilter::implCreateObjectsFromShape( const Reference< XDrawPage > & r if( !rShapeId.isEmpty() ) { mTextShapeIdListMap[rxPage] += rShapeId; - mTextShapeIdListMap[rxPage] += B2UCONST( " " ); + mTextShapeIdListMap[rxPage] += " "; } // We create a set of bitmaps embedded into text shape. @@ -2018,7 +2002,7 @@ sal_Bool SVGFilter::implCreateObjectsFromShape( const Reference< XDrawPage > & r sal_Bool SVGFilter::implCreateObjectsFromBackground( const Reference< XDrawPage >& rxDrawPage ) { - Reference< XExporter > xExporter( mxContext->getServiceManager()->createInstanceWithContext( B2UCONST( "com.sun.star.drawing.GraphicExportFilter" ), mxContext ), UNO_QUERY ); + Reference< XExporter > xExporter( mxContext->getServiceManager()->createInstanceWithContext( "com.sun.star.drawing.GraphicExportFilter", mxContext ), UNO_QUERY ); sal_Bool bRet = sal_False; if( xExporter.is() ) @@ -2030,11 +2014,11 @@ sal_Bool SVGFilter::implCreateObjectsFromBackground( const Reference< XDrawPage aFile.EnableKillingFile(); Sequence< PropertyValue > aDescriptor( 3 ); - aDescriptor[0].Name = B2UCONST( "FilterName" ); - aDescriptor[0].Value <<= B2UCONST( "SVM" ); - aDescriptor[1].Name = B2UCONST( "URL" ); + aDescriptor[0].Name = "FilterName"; + aDescriptor[0].Value <<= OUString( "SVM" ); + aDescriptor[1].Name = "URL"; aDescriptor[1].Value <<= OUString( aFile.GetURL() ); - aDescriptor[2].Name = B2UCONST( "ExportOnlyBackground" ); + aDescriptor[2].Name = "ExportOnlyBackground"; aDescriptor[2].Value <<= (sal_Bool) sal_True; xExporter->setSourceDocument( Reference< XComponent >( rxDrawPage, UNO_QUERY ) ); @@ -2056,23 +2040,22 @@ OUString SVGFilter::implGetClassFromShape( const Reference< XShape >& rxShape ) OUString aRet; const OUString aShapeType( rxShape->getShapeType() ); - if( aShapeType.lastIndexOf( B2UCONST( "drawing.GroupShape" ) ) != -1 ) - aRet = B2UCONST( "Group" ); - else if( aShapeType.lastIndexOf( B2UCONST( "drawing.GraphicObjectShape" ) ) != -1 ) - aRet = B2UCONST( "Graphic" ); - else if( aShapeType.lastIndexOf( B2UCONST( "drawing.OLE2Shape" ) ) != -1 ) - aRet = B2UCONST( "OLE2" ); - else if( aShapeType.lastIndexOf( B2UCONST( "presentation.HeaderShape" ) ) != -1 ) - aRet = B2UCONST( "Header" ); - else if( aShapeType.lastIndexOf( B2UCONST( "presentation.FooterShape" ) ) != -1 ) - aRet = B2UCONST( "Footer" ); - else if( aShapeType.lastIndexOf( B2UCONST( "presentation.DateTimeShape" ) ) != -1 ) - aRet = B2UCONST( "Date/Time" ); - else if( aShapeType.lastIndexOf( B2UCONST( "presentation.SlideNumberShape" ) ) != -1 ) - aRet = B2UCONST( "Slide_Number" ); + if( aShapeType.lastIndexOf( "drawing.GroupShape" ) != -1 ) + aRet = "Group"; + else if( aShapeType.lastIndexOf( "drawing.GraphicObjectShape" ) != -1 ) + aRet = "Graphic"; + else if( aShapeType.lastIndexOf( "drawing.OLE2Shape" ) != -1 ) + aRet = "OLE2"; + else if( aShapeType.lastIndexOf( "presentation.HeaderShape" ) != -1 ) + aRet = "Header"; + else if( aShapeType.lastIndexOf( "presentation.FooterShape" ) != -1 ) + aRet = "Footer"; + else if( aShapeType.lastIndexOf( "presentation.DateTimeShape" ) != -1 ) + aRet = "Date/Time"; + else if( aShapeType.lastIndexOf( "presentation.SlideNumberShape" ) != -1 ) + aRet = "Slide_Number"; else aRet = aShapeType; - //aRet = B2UCONST( "Drawing" ); return aRet; } @@ -2113,7 +2096,7 @@ IMPL_LINK( SVGFilter, CalcFieldHdl, EditFieldInfo*, pInfo ) if( pInfo && mbPresentation ) { bFieldProcessed = true; - OUString aRepresentation = B2UCONST(""); + OUString aRepresentation; if( !mbSinglePage ) { if( mpSVGExport->IsEmbedFonts() && mpSVGExport->IsUsePositionedCharacters() ) @@ -2129,10 +2112,10 @@ IMPL_LINK( SVGFilter, CalcFieldHdl, EditFieldInfo*, pInfo ) } sal_Bool bHasCharSetMap = !( mTextFieldCharSets.find( mCreateOjectsCurrentMasterPage ) == mTextFieldCharSets.end() ); - static const ::rtl::OUString aHeaderId( B2UCONST( aOOOAttrHeaderField ) ); - static const ::rtl::OUString aFooterId( B2UCONST( aOOOAttrFooterField ) ); - static const ::rtl::OUString aDateTimeId( B2UCONST( aOOOAttrDateTimeField ) ); - static const ::rtl::OUString aVariableDateTimeId( B2UCONST( aOOOAttrDateTimeField ) + B2UCONST( "-variable" ) ); + static const OUString aHeaderId( aOOOAttrHeaderField ); + static const OUString aFooterId( aOOOAttrFooterField ); + static const OUString aDateTimeId( aOOOAttrDateTimeField ); + static const OUString aVariableDateTimeId( aOOOAttrDateTimeField + "-variable" ); const UCharSet * pCharSet = NULL; UCharSetMap * pCharSetMap = NULL; @@ -2200,7 +2183,7 @@ IMPL_LINK( SVGFilter, CalcFieldHdl, EditFieldInfo*, pInfo ) } // Independently of the date format, we always put all these characters by default. // They should be enough to cover every time format. - aRepresentation += B2UCONST( "0123456789.:/-APM" ); + aRepresentation += "0123456789.:/-APM"; if( eDateFormat ) { @@ -2246,22 +2229,22 @@ IMPL_LINK( SVGFilter, CalcFieldHdl, EditFieldInfo*, pInfo ) switch( mVisiblePagePropSet.nPageNumberingType ) { case SVX_CHARS_UPPER_LETTER: - aRepresentation += B2UCONST( "QWERTYUIOPASDFGHJKLZXCVBNM" ); + aRepresentation += "QWERTYUIOPASDFGHJKLZXCVBNM"; break; case SVX_CHARS_LOWER_LETTER: - aRepresentation += B2UCONST( "qwertyuiopasdfghjklzxcvbnm" ); + aRepresentation += "qwertyuiopasdfghjklzxcvbnm"; break; case SVX_ROMAN_UPPER: - aRepresentation += B2UCONST( "IVXLCDM" ); + aRepresentation += "IVXLCDM"; break; case SVX_ROMAN_LOWER: - aRepresentation += B2UCONST( "ivxlcdm" ); + aRepresentation += "ivxlcdm"; break; // arabic numbering type is the default case SVX_ARABIC: ; // in case the numbering type is not handled we fall back on arabic numbering default: - aRepresentation += B2UCONST( "0123456789" ); + aRepresentation += "0123456789"; break; } } diff --git a/filter/source/svg/svgfontexport.cxx b/filter/source/svg/svgfontexport.cxx index d9e6272db7ad..46b038f2d191 100644 --- a/filter/source/svg/svgfontexport.cxx +++ b/filter/source/svg/svgfontexport.cxx @@ -182,7 +182,7 @@ void SVGFontExport::implEmbedFont( const Font& rFont ) if( !rGlyphSet.empty() ) { GlyphSet::const_iterator aIter( rGlyphSet.begin() ); - const ::rtl::OUString aEmbeddedFontStr( B2UCONST( "EmbeddedFont_" ) ); + const OUString aEmbeddedFontStr( "EmbeddedFont_" ); { SvXMLElementExport aExp( mrExport, XML_NAMESPACE_NONE, "defs", sal_True, sal_True ); @@ -208,15 +208,15 @@ void SVGFontExport::implEmbedFont( const Font& rFont ) // Font Weight if( aFont.GetWeight() != WEIGHT_NORMAL ) - aFontWeight = B2UCONST( "bold" ); + aFontWeight = "bold"; else - aFontWeight = B2UCONST( "normal" ); + aFontWeight = "normal"; // Font Italic if( aFont.GetItalic() != ITALIC_NONE ) - aFontStyle = B2UCONST( "italic" ); + aFontStyle = "italic"; else - aFontStyle = B2UCONST( "normal" ); + aFontStyle = "normal"; mrExport.AddAttribute( XML_NAMESPACE_NONE, "font-family", GetMappedFontName( rFont.GetName() ) ); mrExport.AddAttribute( XML_NAMESPACE_NONE, "units-per-em", aUnitsPerEM ); @@ -334,7 +334,7 @@ void SVGFontExport::EmbedFonts() ::rtl::OUString aRet( rFontName.getToken( 0, ';', nNextTokenPos ) ); if( mnCurFontId ) - aRet += B2UCONST( " embedded" ); + aRet += " embedded"; return aRet; } diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx index 332ff7ef58d2..36fc03f42a46 100644 --- a/filter/source/svg/svgwriter.cxx +++ b/filter/source/svg/svgwriter.cxx @@ -135,7 +135,7 @@ double SVGAttributeWriter::ImplRound( double fValue, sal_Int32 nDecs ) void SVGAttributeWriter::ImplGetColorStr( const Color& rColor, ::rtl::OUString& rColorStr ) { if( rColor.GetTransparency() == 255 ) - rColorStr = B2UCONST( "none" ); + rColorStr = "none"; else { ::rtl::OUStringBuffer aStyle; @@ -183,8 +183,8 @@ void SVGAttributeWriter::AddPaintAttr( const Color& rLineColor, const Color& rFi if( !aGradientId.isEmpty() ) { - ::rtl::OUString aGradientURL( B2UCONST( "url(#" ) ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrFill, ( aGradientURL += aGradientId ) += B2UCONST( ")" ) ); + OUString aGradientURL = "url(#" + aGradientId + ")"; + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrFill, aGradientURL ); } } else @@ -222,7 +222,7 @@ void SVGAttributeWriter::AddGradientDef( const Rectangle& rObjRect, const Gradie aEndColor.SetBlue( (sal_uInt8)( (long) aEndColor.GetBlue() * rGradient.GetEndIntensity() ) / 100 ); mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrId, - ( rGradientId = B2UCONST( "Gradient_" ) ) += ::rtl::OUString::valueOf( nCurGradientId++ ) ); + ( rGradientId = "Gradient_" ) += OUString::valueOf( nCurGradientId++ ) ); { ::std::auto_ptr< SvXMLElementExport > apGradient; @@ -237,7 +237,7 @@ void SVGAttributeWriter::AddGradientDef( const Rectangle& rObjRect, const Gradie aLinePoly.Rotate( aObjRectCenter, nAngle ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrGradientUnits, B2UCONST( "userSpaceOnUse" ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrGradientUnits, "userSpaceOnUse" ); mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX1, ::rtl::OUString::valueOf( aLinePoly[ 0 ].X() ) ); mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY1, ::rtl::OUString::valueOf( aLinePoly[ 0 ].Y() ) ); mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX2, ::rtl::OUString::valueOf( aLinePoly[ 1 ].X() ) ); @@ -286,7 +286,7 @@ void SVGAttributeWriter::AddGradientDef( const Rectangle& rObjRect, const Gradie const double fRadius = sqrt( static_cast< double >( rObjRect.GetWidth() ) * rObjRect.GetWidth() + rObjRect.GetHeight() * rObjRect.GetHeight() ) * 0.5; - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrGradientUnits, B2UCONST( "userSpaceOnUse" ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrGradientUnits, "userSpaceOnUse" ); mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrCX, ::rtl::OUString::valueOf( ImplRound( fCenterX ) ) ); mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrCY, ::rtl::OUString::valueOf( ImplRound( fCenterY ) ) ); mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrR, ::rtl::OUString::valueOf( ImplRound( fRadius ) ) ); @@ -333,18 +333,18 @@ void SVGAttributeWriter::SetFontAttr( const Font& rFont ) // Font Size mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrFontSize, - ::rtl::OUString::valueOf( rFont.GetHeight() ) + B2UCONST( "px" ) ); + OUString::valueOf( rFont.GetHeight() ) + "px" ); // Font Style if( rFont.GetItalic() != ITALIC_NONE ) { if( rFont.GetItalic() == ITALIC_OBLIQUE ) - aFontStyle = B2UCONST( "oblique" ); + aFontStyle = "oblique"; else - aFontStyle = B2UCONST( "italic" ); + aFontStyle = "italic"; } else - aFontStyle = B2UCONST( "normal" ); + aFontStyle = "normal"; mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrFontStyle, aFontStyle ); @@ -371,13 +371,13 @@ void SVGAttributeWriter::SetFontAttr( const Font& rFont ) if( rFont.GetUnderline() != UNDERLINE_NONE || rFont.GetStrikeout() != STRIKEOUT_NONE ) { if( rFont.GetUnderline() != UNDERLINE_NONE ) - aTextDecoration = B2UCONST( "underline " ); + aTextDecoration = "underline "; if( rFont.GetStrikeout() != STRIKEOUT_NONE ) - aTextDecoration += B2UCONST( "line-through " ); + aTextDecoration += "line-through "; } else - aTextDecoration = B2UCONST( "none" ); + aTextDecoration = "none"; mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrTextDecoration, aTextDecoration ); } @@ -422,15 +422,15 @@ void SVGAttributeWriter::setFontFamily() FontPitch ePitch = maCurFont.GetPitch(); if( ePitch == PITCH_FIXED ) { - sFontFamily += B2UCONST( ", monospace" ); + sFontFamily += ", monospace"; } else { FontFamily eFamily = maCurFont.GetFamily(); if( eFamily == FAMILY_ROMAN ) - sFontFamily += B2UCONST( ", serif" ); + sFontFamily += ", serif"; else if( eFamily == FAMILY_SWISS ) - sFontFamily += B2UCONST( ", sans-serif" ); + sFontFamily += ", sans-serif"; } mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrFontFamily, sFontFamily ); } @@ -808,7 +808,7 @@ void SVGTextWriter::addFontAttributes( sal_Bool bIsTextContainer ) if( nCurFontSize != nParFontSize ) { mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrFontSize, - ::rtl::OUString::valueOf( nCurFontSize ) + B2UCONST( "px" ) ); + OUString::valueOf( nCurFontSize ) + "px" ); } // Font Style @@ -818,13 +818,13 @@ void SVGTextWriter::addFontAttributes( sal_Bool bIsTextContainer ) if( eCurFontItalic != ITALIC_NONE ) { if( eCurFontItalic == ITALIC_OBLIQUE ) - sFontStyle = B2UCONST( "oblique" ); + sFontStyle = "oblique"; else - sFontStyle = B2UCONST( "italic" ); + sFontStyle = "italic"; } else { - sFontStyle = B2UCONST( "normal" ); + sFontStyle = "normal"; } mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrFontStyle, sFontStyle ); } @@ -867,12 +867,12 @@ void SVGTextWriter::addFontAttributes( sal_Bool bIsTextContainer ) if( eCurFontUnderline != eParFontUnderline ) { if( eCurFontUnderline != UNDERLINE_NONE ) - sTextDecoration = B2UCONST( "underline " ); + sTextDecoration = "underline "; } if( eCurFontStrikeout != eParFontStrikeout ) { if( eCurFontStrikeout != STRIKEOUT_NONE ) - sTextDecoration += B2UCONST( "line-through " ); + sTextDecoration += "line-through "; } if( !sTextDecoration.isEmpty() ) mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrTextDecoration, sTextDecoration ); @@ -889,15 +889,15 @@ void SVGTextWriter::implSetFontFamily() FontPitch ePitch = maCurrentFont.GetPitch(); if( ePitch == PITCH_FIXED ) { - sFontFamily += B2UCONST( ", monospace" ); + sFontFamily += ", monospace"; } else { FontFamily eFamily = maCurrentFont.GetFamily(); if( eFamily == FAMILY_ROMAN ) - sFontFamily += B2UCONST( ", serif" ); + sFontFamily += ", serif"; else if( eFamily == FAMILY_SWISS ) - sFontFamily += B2UCONST( ", sans-serif" ); + sFontFamily += ", sans-serif"; } mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrFontFamily, sFontFamily ); } @@ -949,25 +949,24 @@ sal_Bool SVGTextWriter::nextParagraph() if( xServiceInfo.is() ) { OUString sInfo; - if( xServiceInfo->supportsService( B2UCONST( "com.sun.star.text.Paragraph" ) ) ) + if( xServiceInfo->supportsService( "com.sun.star.text.Paragraph" ) ) { mrCurrentTextParagraph.set( xTextContent ); Reference< XPropertySet > xPropSet( xTextContent, UNO_QUERY_THROW ); Reference< XPropertySetInfo > xPropSetInfo = xPropSet->getPropertySetInfo(); - if( xPropSetInfo->hasPropertyByName( B2UCONST( "NumberingLevel" ) ) ) + if( xPropSetInfo->hasPropertyByName( "NumberingLevel" ) ) { sal_Int16 nListLevel = 0; - if( xPropSet->getPropertyValue( B2UCONST( "NumberingLevel" ) ) >>= nListLevel ) + if( xPropSet->getPropertyValue( "NumberingLevel" ) >>= nListLevel ) { mbIsNewListItem = sal_True; - sInfo = B2UCONST( "NumberingLevel: " ); - sInfo += OUString::valueOf( (sal_Int32)nListLevel ); + sInfo = "NumberingLevel: " + OUString::valueOf( (sal_Int32)nListLevel ); mrExport.AddAttribute( XML_NAMESPACE_NONE, "style", sInfo ); Reference< XIndexReplace > xNumRules; - if( xPropSetInfo->hasPropertyByName( B2UCONST( "NumberingRules" ) ) ) + if( xPropSetInfo->hasPropertyByName( "NumberingRules" ) ) { - xPropSet->getPropertyValue( B2UCONST( "NumberingRules" ) ) >>= xNumRules; + xPropSet->getPropertyValue( "NumberingRules" ) >>= xNumRules; } if( xNumRules.is() && ( nListLevel < xNumRules->getCount() ) ) { @@ -982,7 +981,7 @@ sal_Bool SVGTextWriter::nextParagraph() } if( bIsNumbered ) { - sInfo = B2UCONST( "true" ); + sInfo = "true"; mrExport.AddAttribute( XML_NAMESPACE_NONE, "is-numbered", sInfo ); } } @@ -1043,12 +1042,12 @@ sal_Bool SVGTextWriter::nextParagraph() { mrTextPortionEnumeration.set( xEnumeration ); } - sInfo = B2UCONST( "Paragraph" ); + sInfo = "Paragraph"; } - else if( xServiceInfo->supportsService( B2UCONST( "com.sun.star.text.Table" ) ) ) + else if( xServiceInfo->supportsService( "com.sun.star.text.Table" ) ) { OSL_FAIL( "SVGTextWriter::nextParagraph: text tables are not handled." ); - sInfo = B2UCONST( "Table" ); + sInfo = "Table"; } else { @@ -1082,22 +1081,22 @@ sal_Bool SVGTextWriter::nextParagraph() Reference< XServiceInfo > xServiceInfo( xTextContent, UNO_QUERY_THROW ); if( xServiceInfo.is() ) { - if( xServiceInfo->supportsService( B2UCONST( "com.sun.star.text.Paragraph" ) ) ) + if( xServiceInfo->supportsService( "com.sun.star.text.Paragraph" ) ) { mrCurrentTextParagraph.set( xTextContent ); Reference< XPropertySet > xPropSet( xTextContent, UNO_QUERY_THROW ); Reference< XPropertySetInfo > xPropSetInfo = xPropSet->getPropertySetInfo(); - if( xPropSetInfo->hasPropertyByName( B2UCONST( "NumberingLevel" ) ) ) + if( xPropSetInfo->hasPropertyByName( "NumberingLevel" ) ) { sal_Int16 nListLevel = 0; - if( xPropSet->getPropertyValue( B2UCONST( "NumberingLevel" ) ) >>= nListLevel ) + if( xPropSet->getPropertyValue( "NumberingLevel" ) >>= nListLevel ) { mbIsNewListItem = sal_True; Reference< XIndexReplace > xNumRules; - if( xPropSetInfo->hasPropertyByName( B2UCONST( "NumberingRules" ) ) ) + if( xPropSetInfo->hasPropertyByName( "NumberingRules" ) ) { - xPropSet->getPropertyValue( B2UCONST( "NumberingRules" ) ) >>= xNumRules; + xPropSet->getPropertyValue( "NumberingRules" ) >>= xNumRules; } if( xNumRules.is() && ( nListLevel < xNumRules->getCount() ) ) { @@ -1167,7 +1166,7 @@ sal_Bool SVGTextWriter::nextParagraph() mrTextPortionEnumeration.set( xEnumeration ); } } - else if( xServiceInfo->supportsService( B2UCONST( "com.sun.star.text.Table" ) ) ) + else if( xServiceInfo->supportsService( "com.sun.star.text.Table" ) ) { OSL_FAIL( "SVGTextWriter::nextParagraph: text tables are not handled." ); } @@ -1211,27 +1210,23 @@ sal_Bool SVGTextWriter::nextTextPortion() Reference< XPropertySetInfo > xPortionPropInfo( xPortionPropSet->getPropertySetInfo() ); Reference < XTextRange > xPortionTextRange( xPortionPropSet, UNO_QUERY); if( xPortionPropSet.is() && xPortionPropInfo.is() - && xPortionPropInfo->hasPropertyByName( B2UCONST( "TextPortionType" ) ) ) + && xPortionPropInfo->hasPropertyByName( "TextPortionType" ) ) { ::rtl::OUString sPortionType; - if( xPortionPropSet->getPropertyValue( B2UCONST( "TextPortionType" ) ) >>= sPortionType ) + if( xPortionPropSet->getPropertyValue( "TextPortionType" ) >>= sPortionType ) { - sInfo = B2UCONST( "type: " ); - sInfo += sPortionType; - sInfo += B2UCONST( "; " ); + sInfo = "type: " + sPortionType + "; "; } if( xPortionTextRange.is() ) { - sInfo += B2UCONST( "content: " ); - sInfo += xPortionTextRange->getString(); - sInfo += B2UCONST( "; " ); + sInfo += "content: " + xPortionTextRange->getString() + "; "; mrCurrentTextPortion.set( xPortionTextRange ); Reference < XPropertySet > xRangePropSet( xPortionTextRange, UNO_QUERY ); - if( xRangePropSet.is() && xRangePropSet->getPropertySetInfo()->hasPropertyByName( B2UCONST( "TextField" ) ) ) + if( xRangePropSet.is() && xRangePropSet->getPropertySetInfo()->hasPropertyByName( "TextField" ) ) { - Reference < XTextField > xTextField( xRangePropSet->getPropertyValue( B2UCONST( "TextField" ) ), UNO_QUERY ); + Reference < XTextField > xTextField( xRangePropSet->getPropertyValue( "TextField" ), UNO_QUERY ); if( xTextField.is() ) { const ::rtl::OUString sServicePrefix( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.textfield.") ); @@ -1264,13 +1259,8 @@ sal_Bool SVGTextWriter::nextTextPortion() ++pNames; } - sInfo += B2UCONST( "text field type: " ); - sInfo += sFieldName; - sInfo += B2UCONST( "; " ); - - sInfo += B2UCONST( "content: " ); - sInfo += xTextField->getPresentation( /* show command: */ sal_False ); - sInfo += B2UCONST( "; " ); + sInfo += "text field type: " + sFieldName + "; " + + "content: " + xTextField->getPresentation( /* show command: */ sal_False ) + "; "; if( sFieldName.equalsAscii( "DateTime" ) || sFieldName.equalsAscii( "Header" ) || sFieldName.equalsAscii( "Footer" ) || sFieldName.equalsAscii( "PageNumber" ) ) @@ -1289,7 +1279,7 @@ sal_Bool SVGTextWriter::nextTextPortion() OUString sURL; if( ( xTextFieldPropSet->getPropertyValue( sFieldName ) ) >>= sURL ) { - sInfo += B2UCONST( "url: " ); + sInfo += "url: "; sInfo += mrExport.GetRelativeReference( sURL ); msUrl = mrExport.GetRelativeReference( sURL ); @@ -1302,7 +1292,7 @@ sal_Bool SVGTextWriter::nextTextPortion() if( !rTextPortionId.isEmpty() ) { msHyperlinkIdList += rTextPortionId; - msHyperlinkIdList += B2UCONST( " " ); + msHyperlinkIdList += " "; } } } @@ -1312,7 +1302,7 @@ sal_Bool SVGTextWriter::nextTextPortion() } } } - mrExport.AddAttribute( XML_NAMESPACE_NONE, "class", B2UCONST( "TextPortion" ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, "class", "TextPortion" ); SvXMLElementExport aPortionElem( mrExport, XML_NAMESPACE_NONE, "desc", mbIWS, mbIWS ); mrExport.GetDocHandler()->characters( sInfo ); return sal_True; @@ -1326,16 +1316,16 @@ sal_Bool SVGTextWriter::nextTextPortion() Reference< XPropertySetInfo > xPortionPropInfo( xPortionPropSet->getPropertySetInfo() ); Reference < XTextRange > xPortionTextRange( xPortionPropSet, UNO_QUERY); if( xPortionPropSet.is() && xPortionPropInfo.is() - && xPortionPropInfo->hasPropertyByName( B2UCONST( "TextPortionType" ) ) ) + && xPortionPropInfo->hasPropertyByName( "TextPortionType" ) ) { if( xPortionTextRange.is() ) { mrCurrentTextPortion.set( xPortionTextRange ); Reference < XPropertySet > xRangePropSet( xPortionTextRange, UNO_QUERY ); - if( xRangePropSet.is() && xRangePropSet->getPropertySetInfo()->hasPropertyByName( B2UCONST( "TextField" ) ) ) + if( xRangePropSet.is() && xRangePropSet->getPropertySetInfo()->hasPropertyByName( "TextField" ) ) { - Reference < XTextField > xTextField( xRangePropSet->getPropertyValue( B2UCONST( "TextField" ) ), UNO_QUERY ); + Reference < XTextField > xTextField( xRangePropSet->getPropertyValue( "TextField" ), UNO_QUERY ); if( xTextField.is() ) { const ::rtl::OUString sServicePrefix( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.textfield.") ); @@ -1394,7 +1384,7 @@ sal_Bool SVGTextWriter::nextTextPortion() if( !rTextPortionId.isEmpty() ) { msHyperlinkIdList += rTextPortionId; - msHyperlinkIdList += B2UCONST( " " ); + msHyperlinkIdList += " "; } } } @@ -1423,7 +1413,7 @@ void SVGTextWriter::startTextShape() { mbIsTextShapeStarted = sal_True; maParentFont = Font(); - mrExport.AddAttribute( XML_NAMESPACE_NONE, "class", B2UCONST( "TextShape" ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, "class", "TextShape" ); mpTextShapeElem = new SvXMLElementExport( mrExport, XML_NAMESPACE_NONE, aXMLElemText, sal_True, mbIWS ); startTextParagraph(); } @@ -1465,21 +1455,21 @@ void SVGTextWriter::startTextParagraph() switch( meNumberingType ) { case( NumberingType::CHAR_SPECIAL ): - sNumberingType = B2UCONST( "bullet-style" ); + sNumberingType = "bullet-style"; break; case( NumberingType::BITMAP ): - sNumberingType = B2UCONST( "image-style" ); + sNumberingType = "image-style"; break; default: - sNumberingType = B2UCONST( "number-style" ); + sNumberingType = "number-style"; break; } mrExport.AddAttribute( XML_NAMESPACE_NONE, aOOOAttrNumberingType, sNumberingType ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, "class", B2UCONST( "ListItem" ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, "class", "ListItem" ); } else { - mrExport.AddAttribute( XML_NAMESPACE_NONE, "class", B2UCONST( "TextParagraph" ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, "class", "TextParagraph" ); } maParentFont = Font(); addFontAttributes( /* isTexTContainer: */ true ); @@ -1514,7 +1504,7 @@ void SVGTextWriter::startTextPosition( sal_Bool bExportX, sal_Bool bExportY ) { endTextPosition(); mnTextWidth = 0; - mrExport.AddAttribute( XML_NAMESPACE_NONE, "class", B2UCONST( "TextPosition" ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, "class", "TextPosition" ); if( bExportX ) mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX, ::rtl::OUString::valueOf( maTextPos.X() ) ); if( bExportY ) @@ -1525,17 +1515,12 @@ void SVGTextWriter::startTextPosition( sal_Bool bExportX, sal_Bool bExportY ) if( rFont.GetOrientation() ) { Point aRot( maTextPos ); - OUString aTransform( "translate(" ); - aTransform += OUString::valueOf( aRot.X() ) + ","; - aTransform += OUString::valueOf( aRot.Y() ) + ")"; - - aTransform += " rotate("; - aTransform += OUString::valueOf( rFont.GetOrientation() * -0.1 ); - aTransform += ")"; - - aTransform += " translate("; - aTransform += OUString::valueOf( -aRot.X() ) + ","; - aTransform += OUString::valueOf( -aRot.Y() ) + ")"; + OUString aTransform = + OUString("translate(") + OUString::valueOf( aRot.X() ) + + "," + OUString::valueOf( aRot.Y() ) + ")" + + " rotate(" + OUString::valueOf( rFont.GetOrientation() * -0.1 ) + + ")" + " translate(" + OUString::valueOf( -aRot.X() ) + + "," + OUString::valueOf( -aRot.Y() ) + ")"; mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrTransform, aTransform ); } @@ -1560,7 +1545,7 @@ void SVGTextWriter::implExportHyperlinkIds() { if( !msHyperlinkIdList.isEmpty() ) { - mrExport.AddAttribute( XML_NAMESPACE_NONE, "class", B2UCONST( "HyperlinkIdList" ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, "class", "HyperlinkIdList" ); SvXMLElementExport aDescElem( mrExport, XML_NAMESPACE_NONE, "desc", sal_True, sal_False ); mrExport.GetDocHandler()->characters( msHyperlinkIdList.trim() ); msHyperlinkIdList = OUString(); @@ -1574,7 +1559,7 @@ void SVGTextWriter::implWriteBulletChars() if( maBulletListItemMap.empty() ) return; - mrExport.AddAttribute( XML_NAMESPACE_NONE, "class", B2UCONST( "BulletChars" ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, "class", "BulletChars" ); SvXMLElementExport aGroupElem( mrExport, XML_NAMESPACE_NONE, aXMLElemG, sal_True, sal_True ); BulletListItemInfoMap::const_iterator it = maBulletListItemMap.begin(); @@ -1586,11 +1571,9 @@ void SVGTextWriter::implWriteBulletChars() { // As id we use the id of the text portion placeholder wrapped // by bullet-char(*) - sId = B2UCONST( "bullet-char(" ); - sId += it->first; - sId += B2UCONST( ")" ); + sId = "bullet-char(" + it->first+ ")"; mrExport.AddAttribute( XML_NAMESPACE_NONE, "id", sId ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, "class", B2UCONST( "BulletChar" ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, "class", "BulletChar" ); SvXMLElementExport aBulletCharElem( mrExport, XML_NAMESPACE_NONE, aXMLElemG, sal_True, sal_True ); // <g transform="translate(x,y)" > @@ -1598,11 +1581,9 @@ void SVGTextWriter::implWriteBulletChars() const BulletListItemInfo& rInfo = it->second; // Add positioning attribute through a translation - sPosition = B2UCONST( "translate(" ); - sPosition += OUString::valueOf( rInfo.aPos.X() ); - sPosition += B2UCONST( "," ); - sPosition += OUString::valueOf( rInfo.aPos.Y() ); - sPosition += B2UCONST( ")" ); + sPosition = OUString("translate(") + + OUString::valueOf( rInfo.aPos.X() ) + + "," + OUString::valueOf( rInfo.aPos.Y() ) + ")"; mrExport.AddAttribute( XML_NAMESPACE_NONE, "transform", sPosition ); mpContext->AddPaintAttr( COL_TRANSPARENT, rInfo.aColor ); @@ -1612,17 +1593,14 @@ void SVGTextWriter::implWriteBulletChars() // <use transform="scale(font-size)" xlink:ref="/" > { // Add size attribute through a scaling - sScaling = B2UCONST( "scale(" ); - sScaling += OUString::valueOf( rInfo.nFontSize ); - sScaling += B2UCONST( "," ); - sScaling += OUString::valueOf( rInfo.nFontSize ); - sScaling += B2UCONST( ")" ); + sScaling = "scale(" + OUString::valueOf( rInfo.nFontSize ) + + "," + OUString::valueOf( rInfo.nFontSize )+ ")"; mrExport.AddAttribute( XML_NAMESPACE_NONE, "transform", sScaling ); // Add ref attribute - sRefId = B2UCONST( "#bullet-char-template(" ); - sRefId += OUString::valueOf( (sal_Int32)( rInfo.cBulletChar ) ); - sRefId += B2UCONST( ")" ); + sRefId = "#bullet-char-template(" + + OUString::valueOf( (sal_Int32)( rInfo.cBulletChar ) ) + + ")"; mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrXLinkHRef, sRefId ); SvXMLElementExport aRefElem( mrExport, XML_NAMESPACE_NONE, "use", sal_True, sal_True ); @@ -1654,15 +1632,12 @@ void SVGTextWriter::writeBitmapPlaceholder( const MetaBitmapActionType* pAction // bitmap placeholder element sal_uLong nId = SVGActionWriter::GetChecksum( pAction ); - OUString sId = B2UCONST( "bitmap-placeholder(" ); - sId += msShapeId; - sId += B2UCONST( "." ); - sId += OUString::valueOf( (sal_Int64)nId ); - sId += B2UCONST( ")" ); + OUString sId = "bitmap-placeholder(" + msShapeId + "." + + OUString::valueOf( (sal_Int64)nId ) + ")"; { mrExport.AddAttribute( XML_NAMESPACE_NONE, "id", sId ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, "class", B2UCONST( "BitmapPlaceholder" ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, "class", "BitmapPlaceholder" ); SvXMLElementExport aSVGTspanElem( mrExport, XML_NAMESPACE_NONE, aXMLElemTspan, mbIWS, mbIWS ); } endTextPosition(); @@ -1674,7 +1649,7 @@ void SVGTextWriter::implWriteEmbeddedBitmaps() { if( mpTextEmbeddedBitmapMtf && mpTextEmbeddedBitmapMtf->GetActionSize() ) { - mrExport.AddAttribute( XML_NAMESPACE_NONE, "class", B2UCONST( "EmbeddedBitmaps" ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, "class", "EmbeddedBitmaps" ); SvXMLElementExport aEmbBitmapGroupElem( mrExport, XML_NAMESPACE_NONE, aXMLElemG, sal_True, sal_True ); const GDIMetaFile& rMtf = *mpTextEmbeddedBitmapMtf; @@ -1714,22 +1689,22 @@ void SVGTextWriter::implWriteEmbeddedBitmaps() { // embedded bitmap id nId = SVGActionWriter::GetChecksum( pAction ); - sId = B2UCONST( "embedded-bitmap(" ); + sId = "embedded-bitmap("; sId += msShapeId; - sId += B2UCONST( "." ); + sId += "."; sId += OUString::valueOf( (sal_Int64)nId ); - sId += B2UCONST( ")" ); + sId += ")"; mrExport.AddAttribute( XML_NAMESPACE_NONE, "id", sId ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, "class", B2UCONST( "EmbeddedBitmap" ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, "class", "EmbeddedBitmap" ); SvXMLElementExport aEmbBitmapElem( mrExport, XML_NAMESPACE_NONE, aXMLElemG, sal_True, sal_True ); // <use x="?" y="?" xlink:ref="?" > { // referenced bitmap template - sRefId = B2UCONST( "#bitmap(" ); + sRefId = "#bitmap("; sRefId += OUString::valueOf( (sal_Int64)nChecksum ); - sRefId += B2UCONST( ")" ); + sRefId += ")"; Point aPoint; Size aSize; @@ -1775,7 +1750,7 @@ void SVGTextWriter::writeTextPortion( const Point& rPos, if( mbIsURLField && sContent.isEmpty() ) { Reference < XPropertySet > xPropSet( mrCurrentTextPortion, UNO_QUERY ); - Reference < XTextField > xTextField( xPropSet->getPropertyValue( B2UCONST( "TextField" ) ), UNO_QUERY ); + Reference < XTextField > xTextField( xPropSet->getPropertyValue( "TextField" ), UNO_QUERY ); sContent = xTextField->getPresentation( /* show command: */ sal_False ); if( sContent.isEmpty() ) OSL_FAIL( "SVGTextWriter::writeTextPortion: content of URL TextField is empty." ); @@ -1893,7 +1868,7 @@ void SVGTextWriter::implWriteTextPortion( const Point& rPos, // Make this text portion a bullet placeholder mrExport.AddAttribute( XML_NAMESPACE_NONE, "id", sId ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, "class", B2UCONST( "BulletPlaceholder" ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, "class", "BulletPlaceholder" ); SvXMLElementExport aSVGTspanElem( mrExport, XML_NAMESPACE_NONE, aXMLElemTspan, mbIWS, mbIWS ); return; } @@ -1909,12 +1884,12 @@ void SVGTextWriter::implWriteTextPortion( const Point& rPos, if( mbIsPlacehlolderShape ) { - mrExport.AddAttribute( XML_NAMESPACE_NONE, "class", B2UCONST( "PlaceholderText" ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, "class", "PlaceholderText" ); mbIsPlacehlolderShape = sal_False; } else if( mbIsURLField && !msUrl.isEmpty() ) { - mrExport.AddAttribute( XML_NAMESPACE_NONE, "class", B2UCONST( "UrlField" ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, "class", "UrlField" ); mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrXLinkHRef, msUrl ); mbIsURLField = sal_False; } @@ -2027,9 +2002,9 @@ PolyPolygon& SVGActionWriter::ImplMap( const PolyPolygon& rPolyPoly, PolyPolygon ::rtl::OUString SVGActionWriter::GetPathString( const PolyPolygon& rPolyPoly, sal_Bool bLine ) { - ::rtl::OUString aPathData; - const ::rtl::OUString aBlank( B2UCONST( " " ) ); - const ::rtl::OUString aComma( B2UCONST( "," ) ); + OUString aPathData; + const OUString aBlank( " " ); + const OUString aComma( "," ); Point aPolyPoint; for( long i = 0, nCount = rPolyPoly.Count(); i < nCount; i++ ) @@ -2039,7 +2014,7 @@ PolyPolygon& SVGActionWriter::ImplMap( const PolyPolygon& rPolyPoly, PolyPolygon if( nSize > 1 ) { - aPathData += B2UCONST( "M " ); + aPathData += "M "; aPathData += ::rtl::OUString::valueOf( ( aPolyPoint = rPoly[ 0 ] ).X() ); aPathData += aComma; aPathData += ::rtl::OUString::valueOf( aPolyPoint.Y() ); @@ -2055,7 +2030,7 @@ PolyPolygon& SVGActionWriter::ImplMap( const PolyPolygon& rPolyPoly, PolyPolygon if ( nCurrentMode != 'C' ) { nCurrentMode = 'C'; - aPathData += B2UCONST( "C " ); + aPathData += "C "; } for ( int j = 0; j < 3; j++ ) { @@ -2071,7 +2046,7 @@ PolyPolygon& SVGActionWriter::ImplMap( const PolyPolygon& rPolyPoly, PolyPolygon if ( nCurrentMode != 'L' ) { nCurrentMode = 'L'; - aPathData += B2UCONST( "L " ); + aPathData += "L "; } aPathData += ::rtl::OUString::valueOf( ( aPolyPoint = rPoly[ n++ ] ).X() ); aPathData += aComma; @@ -2080,7 +2055,7 @@ PolyPolygon& SVGActionWriter::ImplMap( const PolyPolygon& rPolyPoly, PolyPolygon } if(bClose) - aPathData += B2UCONST( " Z" ); + aPathData += " Z"; if( i < ( nCount - 1 ) ) aPathData += aBlank; @@ -2278,8 +2253,8 @@ void SVGActionWriter::ImplWriteShape( const SVGShapeDescriptor& rShape, sal_Bool if( rShape.maDashArray.size() ) { - const ::rtl::OUString aComma( B2UCONST( "," ) ); - ::rtl::OUString aDashArrayStr; + const OUString aComma( "," ); + OUString aDashArrayStr; for( unsigned int k = 0; k < rShape.maDashArray.size(); ++k ) { @@ -2310,9 +2285,7 @@ void SVGActionWriter::ImplWritePattern( const PolyPolygon& rPolyPoly, { SvXMLElementExport aElemG( mrExport, XML_NAMESPACE_NONE, aXMLElemG, sal_True, sal_True ); - ::rtl::OUString aPatternId; - aPatternId += B2UCONST( "pattern" ); - aPatternId += OUString::valueOf( mnCurPatternId++ ); + OUString aPatternId = "pattern" + OUString::valueOf( mnCurPatternId++ ); { SvXMLElementExport aElemDefs( mrExport, XML_NAMESPACE_NONE, aXMLElemDefs, sal_True, sal_True ); @@ -2334,13 +2307,10 @@ void SVGActionWriter::ImplWritePattern( const PolyPolygon& rPolyPoly, // The origin of a pattern is positioned at (aRect.Left(), aRect.Top()). // So we need to adjust the pattern coordinate. - ::rtl::OUString aTransform; - aTransform += B2UCONST( "translate" ); - aTransform += B2UCONST( "(" ); - aTransform += OUString::valueOf( -aRect.Left() ); - aTransform += B2UCONST( "," ); - aTransform += OUString::valueOf( -aRect.Top() ); - aTransform += B2UCONST( ")" ); + OUString aTransform = OUString("translate") + + "(" + OUString::valueOf( -aRect.Left() ) + + "," + OUString::valueOf( -aRect.Top() ) + + ")"; mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrTransform, aTransform ); { @@ -2356,10 +2326,7 @@ void SVGActionWriter::ImplWritePattern( const PolyPolygon& rPolyPoly, } } - ::rtl::OUString aPatternStyle; - aPatternStyle += B2UCONST( "fill:url(#" ); - aPatternStyle += aPatternId; - aPatternStyle += B2UCONST( ")" ); + OUString aPatternStyle = "fill:url(#" + aPatternId + ")"; mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStyle, aPatternStyle ); ImplWritePolyPolygon( rPolyPoly, sal_False ); @@ -2398,9 +2365,7 @@ void SVGActionWriter::ImplWriteGradientLinear( const PolyPolygon& rPolyPoly, { SvXMLElementExport aElemG( mrExport, XML_NAMESPACE_NONE, aXMLElemG, sal_True, sal_True ); - ::rtl::OUString aGradientId; - aGradientId += B2UCONST( "gradient" ); - aGradientId += OUString::valueOf( mnCurGradientId++ ); + OUString aGradientId = "gradient" + OUString::valueOf( mnCurGradientId++ ); { SvXMLElementExport aElemDefs( mrExport, XML_NAMESPACE_NONE, aXMLElemDefs, sal_True, sal_True ); @@ -2493,11 +2458,7 @@ void SVGActionWriter::ImplWriteGradientLinear( const PolyPolygon& rPolyPoly, } } - ::rtl::OUString aGradientStyle; - aGradientStyle += B2UCONST( "fill:" ); - aGradientStyle += B2UCONST( "url(#" ); - aGradientStyle += aGradientId; - aGradientStyle += B2UCONST( ")" ); + OUString aGradientStyle = "fill:url(#" + aGradientId + ")"; mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStyle, aGradientStyle ); ImplWritePolyPolygon( rPolyPoly, sal_False ); @@ -2509,7 +2470,7 @@ void SVGActionWriter::ImplWriteGradientStop( const Color& rColor, double fOffset mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrOffset, rtl::OUString::valueOf( fOffset ) ); ::rtl::OUString aStyle, aColor; - aStyle += B2UCONST( "stop-color:" ); + aStyle += "stop-color:"; SVGAttributeWriter::ImplGetColorStr ( rColor, aColor ); aStyle += aColor; @@ -2572,9 +2533,7 @@ void SVGActionWriter::ImplWriteMask( GDIMetaFile& rMtf, if( nMoveX || nMoveY ) rMtf.Move( nMoveX, nMoveY ); - ::rtl::OUString aMaskId; - aMaskId += B2UCONST( "mask" ); - aMaskId += OUString::valueOf( mnCurMaskId++ ); + OUString aMaskId = "mask" + OUString::valueOf( mnCurMaskId++ ); { SvXMLElementExport aElemDefs( mrExport, XML_NAMESPACE_NONE, aXMLElemDefs, sal_True, sal_True ); @@ -2598,10 +2557,7 @@ void SVGActionWriter::ImplWriteMask( GDIMetaFile& rMtf, } } - ::rtl::OUString aMaskStyle; - aMaskStyle += B2UCONST( "mask:url(#" ); - aMaskStyle += aMaskId; - aMaskStyle += B2UCONST( ")" ); + OUString aMaskStyle = "mask:url(#" + aMaskId + ")"; mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStyle, aMaskStyle ); { @@ -2743,26 +2699,15 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const String& rText, if( rFont.GetOrientation() ) { Point aRot( aPos ); - String aTransform; - - aTransform = String( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "translate" ) ) ); - aTransform += '('; - aTransform += String( ::rtl::OUString::valueOf( aRot.X() ) ); - aTransform += ','; - aTransform += String( ::rtl::OUString::valueOf( aRot.Y() ) ); - aTransform += ')'; - - aTransform += String( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " rotate" ) ) ); - aTransform += '('; - aTransform += String( ::rtl::OUString::valueOf( rFont.GetOrientation() * -0.1 ) ); - aTransform += ')'; - - aTransform += String( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " translate" ) ) ); - aTransform += '('; - aTransform += String( ::rtl::OUString::valueOf( -aRot.X() ) ); - aTransform += ','; - aTransform += String( ::rtl::OUString::valueOf( -aRot.Y() ) ); - aTransform += ')'; + OUString aTransform = + OUString("translate") + + "(" + OUString::valueOf( aRot.X() ) + + "," + OUString::valueOf( aRot.Y() ) + ")" + + " rotate" + + "(" + OUString::valueOf( rFont.GetOrientation() * -0.1 ) + ")" + + " translate" + + "(" + OUString::valueOf( -aRot.X() ) + + "," + OUString::valueOf( -aRot.Y() ) + ")"; mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrTransform, aTransform ); } @@ -2788,7 +2733,7 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const String& rText, { sCleanTextContent = sTextContent.copy( nFrom ); } - mrExport.AddAttribute( XML_NAMESPACE_NONE, "class", B2UCONST( "PlaceholderText" ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, "class", "PlaceholderText" ); mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX, ::rtl::OUString::valueOf( aPos.X() ) ); mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY, ::rtl::OUString::valueOf( aPos.Y() ) ); { @@ -3345,7 +3290,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, if( pElementId ) { - mapCurShape->maId = *pElementId + B2UCONST("_") + ::rtl::OUString::valueOf(nEntryCount++); + mapCurShape->maId = *pElementId + "_" + OUString::valueOf(nEntryCount++); } mapCurShape->maShapePolyPoly = aShapePolyPoly; @@ -3434,7 +3379,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, if( pElementId ) { - mapCurShape->maId = *pElementId + B2UCONST("_") + ::rtl::OUString::valueOf(nEntryCount++); + mapCurShape->maId = *pElementId + "_" + OUString::valueOf(nEntryCount++); } aStroke.getPath( aPoly ); diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx index ce2e441ce8b1..e8032fe58071 100644 --- a/filter/source/svg/svgwriter.hxx +++ b/filter/source/svg/svgwriter.hxx @@ -80,9 +80,8 @@ using namespace ::com::sun::star::style; #define REF( _def_Obj ) NMSP_UNO::Reference< _def_Obj > #define SEQ( _def_Obj ) NMSP_UNO::Sequence< _def_Obj > -#define B2UCONST( _def_pChar ) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(_def_pChar ))) -#define SVG_DTD_STRING B2UCONST( "<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">" ) -#define SVG_TINY_DTD_STRING B2UCONST( "<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG Tiny 1.1//EN\" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd\">" ) +#define SVG_DTD_STRING OUString( "<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">" ) +#define SVG_TINY_DTD_STRING OUString( "<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG Tiny 1.1//EN\" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd\">" ) #define SVGWRITER_WRITE_NONE 0x00000000 #define SVGWRITER_WRITE_FILL 0x00000001 diff --git a/forms/source/xforms/binding.cxx b/forms/source/xforms/binding.cxx index a97ac8e245b4..dfcbe0d95d05 100644 --- a/forms/source/xforms/binding.cxx +++ b/forms/source/xforms/binding.cxx @@ -103,7 +103,7 @@ using com::sun::star::xsd::XDataType; -#define EXCEPT(msg) OUSTRING(msg),static_cast<XValueBinding*>(this) +#define EXCEPT(msg) OUString(msg),static_cast<XValueBinding*>(this) #define HANDLE_BindingID 0 #define HANDLE_BindingExpression 1 @@ -473,7 +473,7 @@ bool Binding::getExternalData() const { Reference< XPropertySet > xModelProps( mxModel, UNO_QUERY_THROW ); OSL_VERIFY( - xModelProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ExternalData" ) ) ) >>= bExternalData ); + xModelProps->getPropertyValue( "ExternalData" ) >>= bExternalData ); } catch( const Exception& ) { @@ -524,17 +524,17 @@ static void lcl_addListenerToNode( Reference<XNode> xNode, Reference<XEventTarget> xTarget( xNode, UNO_QUERY ); if( xTarget.is() ) { - xTarget->addEventListener( OUSTRING("DOMCharacterDataModified"), + xTarget->addEventListener( "DOMCharacterDataModified", xListener, false ); - xTarget->addEventListener( OUSTRING("DOMCharacterDataModified"), + xTarget->addEventListener( "DOMCharacterDataModified", xListener, true ); - xTarget->addEventListener( OUSTRING("DOMAttrModified"), + xTarget->addEventListener( "DOMAttrModified", xListener, false ); - xTarget->addEventListener( OUSTRING("DOMAttrModified"), + xTarget->addEventListener( "DOMAttrModified", xListener, true ); - xTarget->addEventListener( OUSTRING("DOMAttrModified"), + xTarget->addEventListener( "DOMAttrModified", xListener, true ); - xTarget->addEventListener( OUSTRING("xforms-generic"), + xTarget->addEventListener( "xforms-generic", xListener, true ); } } @@ -545,15 +545,15 @@ static void lcl_removeListenerFromNode( Reference<XNode> xNode, Reference<XEventTarget> xTarget( xNode, UNO_QUERY ); if( xTarget.is() ) { - xTarget->removeEventListener( OUSTRING("DOMCharacterDataModified"), + xTarget->removeEventListener( "DOMCharacterDataModified", xListener, false ); - xTarget->removeEventListener( OUSTRING("DOMCharacterDataModified"), + xTarget->removeEventListener( "DOMCharacterDataModified", xListener, true ); - xTarget->removeEventListener( OUSTRING("DOMAttrModified"), + xTarget->removeEventListener( "DOMAttrModified", xListener, false ); - xTarget->removeEventListener( OUSTRING("DOMAttrModified"), + xTarget->removeEventListener( "DOMAttrModified", xListener, true ); - xTarget->removeEventListener( OUSTRING("xforms-generic"), + xTarget->removeEventListener( "xforms-generic", xListener, true ); } } @@ -1018,8 +1018,7 @@ void Binding::_checkBindingID() if( msBindingID.isEmpty() ) { // no binding ID? then make one up! - OUString sIDPrefix = getResource( RID_STR_XFORMS_BINDING_UI_NAME ); - sIDPrefix += rtl::OUString(" "); + OUString sIDPrefix = getResource( RID_STR_XFORMS_BINDING_UI_NAME ) + " "; sal_Int32 nNumber = 0; OUString sName; do diff --git a/forms/source/xforms/computedexpression.cxx b/forms/source/xforms/computedexpression.cxx index f23a54613d81..362921c8808e 100644 --- a/forms/source/xforms/computedexpression.cxx +++ b/forms/source/xforms/computedexpression.cxx @@ -195,22 +195,22 @@ Reference<XXPathAPI> ComputedExpression::_getXPathAPI(const xforms::EvaluationCo { // create XPath API, then register namespaces Reference<XXPathAPI> xXPath( createInstance( - OUSTRING( "com.sun.star.xml.xpath.XPathAPI" ) ), + "com.sun.star.xml.xpath.XPathAPI" ), UNO_QUERY_THROW ); OSL_ENSURE( xXPath.is(), "cannot get XPath API" ); // register xforms extension# Sequence< Any > aSequence(2); NamedValue aValue; - aValue.Name = OUSTRING("Model"); + aValue.Name = "Model"; aValue.Value <<= aContext.mxModel; aSequence[0] <<= aValue; - aValue.Name = OUSTRING("ContextNode"); + aValue.Name = "ContextNode"; aValue.Value <<= aContext.mxContextNode; aSequence[1] <<= aValue; Reference<XMultiServiceFactory> aFactory = comphelper::getProcessServiceFactory(); Reference< XXPathExtension > aExtension( aFactory->createInstanceWithArguments( - OUSTRING( "com.sun.star.comp.xml.xpath.XFormsExtension"), aSequence), UNO_QUERY_THROW); + "com.sun.star.comp.xml.xpath.XFormsExtension", aSequence), UNO_QUERY_THROW); xXPath->registerExtensionInstance(aExtension); // register namespaces diff --git a/forms/source/xforms/convert.cxx b/forms/source/xforms/convert.cxx index 8ac5265fe721..2cf40983b873 100644 --- a/forms/source/xforms/convert.cxx +++ b/forms/source/xforms/convert.cxx @@ -209,12 +209,12 @@ namespace // ------------------------------------------------------------------------ OUString lcl_toXSD_bool( const Any& rAny ) - { bool b = false; rAny >>= b; return b ? OUSTRING("true") : OUSTRING("false"); } + { bool b = false; rAny >>= b; return b ? OUString("true") : OUString("false"); } // ------------------------------------------------------------------------ Any lcl_toAny_bool( const OUString& rStr ) { - bool b = ( rStr == OUSTRING("true") || rStr == OUSTRING("1") ); + bool b = ( rStr == "true" || rStr == "1" ); return makeAny( b ); } diff --git a/forms/source/xforms/model.cxx b/forms/source/xforms/model.cxx index 34f1ab2a29b4..bce0c0368b9c 100644 --- a/forms/source/xforms/model.cxx +++ b/forms/source/xforms/model.cxx @@ -160,7 +160,7 @@ EvaluationContext Model::getEvaluationContext() if( ! xElement.is() ) { xElement = Reference<XNode>( - xInstance->createElement( OUSTRING("instanceData") ), + xInstance->createElement( "instanceData" ), UNO_QUERY_THROW ); Reference<XNode>( xInstance, UNO_QUERY_THROW)->appendChild( xElement ); } diff --git a/forms/source/xforms/model_helper.hxx b/forms/source/xforms/model_helper.hxx index 2ccb15c21b81..35fa556af8af 100644 --- a/forms/source/xforms/model_helper.hxx +++ b/forms/source/xforms/model_helper.hxx @@ -119,7 +119,7 @@ public: virtual bool isValid( const T& t ) const { const com::sun::star::beans::PropertyValue* pValues = t.getConstArray(); - rtl::OUString sInstance( OUSTRING("Instance") ); + rtl::OUString sInstance( "Instance" ); sal_Bool bFound = sal_False; for( sal_Int32 i = 0; ( ! bFound ) && ( i < t.getLength() ); i++ ) { diff --git a/forms/source/xforms/model_ui.cxx b/forms/source/xforms/model_ui.cxx index d6bceaeeb89a..d0bfb79ec265 100644 --- a/forms/source/xforms/model_ui.cxx +++ b/forms/source/xforms/model_ui.cxx @@ -77,7 +77,7 @@ OUString Model::getDefaultServiceNameForNode( const XNode_t& xNode ) throw( RuntimeException ) { // determine service for control. string/text field is default. - OUString sService = OUSTRING("com.sun.star.form.component.TextField"); + OUString sService = "com.sun.star.form.component.TextField"; // query repository for suitable type OSL_ENSURE( mxDataTypes.is(), "no type repository?" ); @@ -90,12 +90,12 @@ OUString Model::getDefaultServiceNameForNode( const XNode_t& xNode ) switch( mxDataTypes->getDataType( sTypeName )->getTypeClass() ) { case com::sun::star::xsd::DataTypeClass::BOOLEAN: - sService = OUSTRING("com.sun.star.form.component.CheckBox"); + sService = "com.sun.star.form.component.CheckBox"; break; case com::sun::star::xsd::DataTypeClass::DOUBLE: case com::sun::star::xsd::DataTypeClass::DECIMAL: case com::sun::star::xsd::DataTypeClass::FLOAT: - sService = OUSTRING("com.sun.star.form.component.NumericField"); + sService = "com.sun.star.form.component.NumericField"; break; case com::sun::star::xsd::DataTypeClass::STRING: @@ -178,7 +178,7 @@ static void lcl_OutInstance( OUStringBuffer& rBuffer, if( xDoc != pModel->getDefaultInstance() ) { - rBuffer.insert( 0, OUSTRING("')") ); + rBuffer.insert( 0, "')" ); // iterate over instances, and find the right one OUString sInstanceName; @@ -200,7 +200,7 @@ static void lcl_OutInstance( OUStringBuffer& rBuffer, } rBuffer.insert( 0, sInstanceName ); - rBuffer.insert( 0, OUSTRING("instance('") ); + rBuffer.insert( 0, "instance('" ); } } @@ -231,7 +231,7 @@ OUString Model::getDefaultBindingExpressionForNode( case NodeType_TEXT_NODE: lcl_OutPosition( aBuffer, xCurrent ); - aBuffer.insert( 0, OUSTRING("text()") ); + aBuffer.insert( 0, "text()" ); break; case NodeType_ATTRIBUTE_NODE: @@ -356,17 +356,17 @@ OUString Model::getBindingName( const XPropertySet_t& xBinding, throw( RuntimeException ) { OUString sID; - xBinding->getPropertyValue( OUSTRING("BindingID" ) ) >>= sID; + xBinding->getPropertyValue( "BindingID" ) >>= sID; OUString sExpression; - xBinding->getPropertyValue( OUSTRING("BindingExpression" ) ) >>= sExpression; + xBinding->getPropertyValue( "BindingExpression" ) >>= sExpression; OUStringBuffer aBuffer; if( !sID.isEmpty() ) { aBuffer.append( sID ); - aBuffer.append( OUSTRING(" (" )); + aBuffer.append( " (" ); aBuffer.append( sExpression ); - aBuffer.append( OUSTRING(")" )); + aBuffer.append( ")" ); } else aBuffer.append( sExpression ); @@ -379,7 +379,7 @@ OUString Model::getSubmissionName( const XPropertySet_t& xSubmission, throw( RuntimeException ) { OUString sID; - xSubmission->getPropertyValue( OUSTRING("ID") ) >>= sID; + xSubmission->getPropertyValue( "ID" ) >>= sID; return sID; } @@ -421,7 +421,7 @@ Model::XDocument_t Model::newInstance( const rtl::OUString& sName, DBG_ASSERT( xInstance.is(), "failed to create DOM instance" ); Reference<XNode>( xInstance, UNO_QUERY_THROW )->appendChild( - Reference<XNode>( xInstance->createElement( OUSTRING("instanceData") ), + Reference<XNode>( xInstance->createElement( "instanceData" ), UNO_QUERY_THROW ) ); Sequence<PropertyValue> aSequence; @@ -474,13 +474,13 @@ void Model::renameInstance( const rtl::OUString& sFrom, PropertyValue* pSeq = aSeq.getArray(); sal_Int32 nLength = aSeq.getLength(); - sal_Int32 nProp = lcl_findProp( pSeq, nLength, OUSTRING("ID") ); + sal_Int32 nProp = lcl_findProp( pSeq, nLength, "ID" ); if( nProp == -1 ) { // add name property aSeq.realloc( nLength + 1 ); pSeq = aSeq.getArray(); - pSeq[ nLength ].Name = OUSTRING("ID"); + pSeq[ nLength ].Name = "ID"; nProp = nLength; } @@ -488,12 +488,12 @@ void Model::renameInstance( const rtl::OUString& sFrom, pSeq[ nProp ].Value <<= sTo; // change url - nProp = lcl_findProp( pSeq, nLength, OUSTRING("URL") ); + nProp = lcl_findProp( pSeq, nLength, "URL" ); if(nProp != -1) pSeq[ nProp ].Value <<= sURL; // change urlonce - nProp = lcl_findProp( pSeq, nLength, OUSTRING("URLOnce") ); + nProp = lcl_findProp( pSeq, nLength, "URLOnce" ); if(nProp != -1) pSeq[ nProp ].Value <<= bURLOnce; @@ -839,7 +839,7 @@ static OUString lcl_serializeForDisplay( const Reference<XNodeList>& xNodes ) // copy stream into buffer Reference<XTextInputStream> xTextInputStream( - createInstance( OUSTRING("com.sun.star.io.TextInputStream") ), + createInstance( "com.sun.star.io.TextInputStream" ), UNO_QUERY ); Reference<XActiveDataSink>( xTextInputStream, UNO_QUERY_THROW ) ->setInputStream( aSerialization.getInputStream() ); @@ -884,8 +884,8 @@ static OUString lcl_serializeForDisplay( const Reference<XXPathObject>& xResult { case XPathObjectType_XPATH_BOOLEAN: aBuffer.append( xResult->getBoolean() - ? OUSTRING("true") - : OUSTRING("false") ); + ? OUString("true") + : OUString("false") ); break; case XPathObjectType_XPATH_STRING: @@ -1044,7 +1044,7 @@ void xforms::setInstanceData( #define PROP(NAME) \ if( p##NAME != NULL ) \ { \ - pSequence[ nIndex ].Name = OUSTRING(#NAME); \ + pSequence[ nIndex ].Name = OUString(#NAME); \ pSequence[ nIndex ].Value <<= *p##NAME; \ nIndex++; \ } diff --git a/forms/source/xforms/pathexpression.cxx b/forms/source/xforms/pathexpression.cxx index 028cabe58f46..256f11ce895c 100644 --- a/forms/source/xforms/pathexpression.cxx +++ b/forms/source/xforms/pathexpression.cxx @@ -93,7 +93,7 @@ const rtl::OUString PathExpression::_getExpressionForEvaluation() const { OUString sExpr = ComputedExpression::_getExpressionForEvaluation(); if( sExpr.isEmpty()) - sExpr = OUSTRING("."); + sExpr = "."; return sExpr; } diff --git a/forms/source/xforms/resourcehelper.cxx b/forms/source/xforms/resourcehelper.cxx index 2a16c509647e..a39f767e7fa6 100644 --- a/forms/source/xforms/resourcehelper.cxx +++ b/forms/source/xforms/resourcehelper.cxx @@ -26,8 +26,6 @@ using rtl::OUString; -#define OUSTRING(x) rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(x)) - namespace xforms { @@ -59,11 +57,11 @@ OUString getResource( sal_uInt16 nResourceId, // use old style String class for search and replace, so we don't have to // code this again. - String sString( sResource ); - sString.SearchAndReplaceAll( String(OUSTRING("$1")), String(rInfo1) ); - sString.SearchAndReplaceAll( String(OUSTRING("$2")), String(rInfo2) ); - sString.SearchAndReplaceAll( String(OUSTRING("$3")), String(rInfo3) ); - return OUString( sString ); + OUString sString( sResource ); + sString.replaceAll( "$1", rInfo1 ); + sString.replaceAll( "$2", rInfo2 ); + sString.replaceAll( "$3", rInfo3 ); + return sString; } } // namespace xforms diff --git a/forms/source/xforms/submission.cxx b/forms/source/xforms/submission.cxx index 08485811dac3..305045b355a9 100644 --- a/forms/source/xforms/submission.cxx +++ b/forms/source/xforms/submission.cxx @@ -97,7 +97,7 @@ Submission::Submission() : mbOmitXmlDeclaration(), mbStandalone(), msCDataSectionElement(), - msReplace( OUSTRING("none") ), + msReplace( "none" ), msSeparator(), msIncludeNamespacePrefixes(), m_aFactory(comphelper::getProcessServiceFactory()) @@ -293,7 +293,7 @@ bool Submission::doSubmit( const Reference< XInteractionHandler >& xHandler ) } else { - aExpression.setExpression( OUSTRING( "/" ) ); + aExpression.setExpression( "/" ); aEvalContext = Model::getModel( mxModel )->getEvaluationContext(); } aExpression.evaluate( aEvalContext ); @@ -482,11 +482,11 @@ sal_Int64 SAL_CALL Submission::getSomething( static OUString lcl_message( const OUString& rID, const OUString& rText ) { OUStringBuffer aMessage; - aMessage.append( OUSTRING("XForms submission '") ); + aMessage.append( "XForms submission '" ); aMessage.append( rID ); - aMessage.append( OUSTRING("' failed") ); + aMessage.append( "' failed" ); aMessage.append( rText ); - aMessage.append( OUSTRING(".") ); + aMessage.append( "." ); return aMessage.makeStringAndClear(); } @@ -516,7 +516,7 @@ void SAL_CALL Submission::submitWithInteraction( if( ! bValid ) { InvalidDataOnSubmitException aInvalidDataException( - lcl_message(sID, OUSTRING(" due to invalid data") ), *this ); + lcl_message(sID, " due to invalid data" ), *this ); if( _rxHandler.is() ) { @@ -567,7 +567,7 @@ void SAL_CALL Submission::submitWithInteraction( { // exception caught: re-throw as wrapped target exception throw WrappedTargetException( - lcl_message( sID, OUSTRING(" due to exception being thrown") ), + lcl_message( sID, " due to exception being thrown" ), *this, makeAny( e ) ); } diff --git a/forms/source/xforms/unohelper.hxx b/forms/source/xforms/unohelper.hxx index a6b4e0c4e510..41e78fde5b9c 100644 --- a/forms/source/xforms/unohelper.hxx +++ b/forms/source/xforms/unohelper.hxx @@ -32,8 +32,6 @@ namespace com { namespace sun { namespace star { } } } -#define OUSTRING(msg) rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( msg ) ) - namespace xforms { diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx index bf335e55075d..cda62635b8eb 100644 --- a/i18npool/source/localedata/localedata.cxx +++ b/i18npool/source/localedata/localedata.cxx @@ -1262,11 +1262,6 @@ LocaleData::getReservedWord( const Locale& rLocale ) throw(RuntimeException) } -inline OUString C2U( const char* s ) -{ - return OUString::createFromAscii( s ); -} - Sequence< Sequence<beans::PropertyValue> > SAL_CALL LocaleData::getContinuousNumberingLevels( const lang::Locale& rLocale ) throw(RuntimeException) { @@ -1304,23 +1299,23 @@ LocaleData::getContinuousNumberingLevels( const lang::Locale& rLocale ) throw(Ru switch( j ) { case 0: - rVal.Name = C2U("Prefix"); + rVal.Name = "Prefix"; rVal.Value <<= sVal; break; case 1: - rVal.Name = C2U("NumberingType"); + rVal.Name = "NumberingType"; rVal.Value <<= (sal_Int16) sVal.toInt32(); break; case 2: - rVal.Name = C2U("Suffix"); + rVal.Name = "Suffix"; rVal.Value <<= sVal; break; case 3: - rVal.Name = C2U("Transliteration"); + rVal.Name = "Transliteration"; rVal.Value <<= sVal; break; case 4: - rVal.Name = C2U("NatNum"); + rVal.Name = "NatNum"; rVal.Value <<= (sal_Int16) sVal.toInt32(); break; default: @@ -1598,29 +1593,29 @@ Any OutlineNumbering::getByIndex( sal_Int32 nIndex ) Sequence<PropertyValue> aOutlineNumbering(12); PropertyValue* pValues = aOutlineNumbering.getArray(); - pValues[0].Name = C2U( "Prefix"); + pValues[0].Name = "Prefix"; pValues[0].Value <<= pTemp->sPrefix; - pValues[1].Name = C2U("NumberingType"); + pValues[1].Name = "NumberingType"; pValues[1].Value <<= pTemp->nNumType; - pValues[2].Name = C2U("Suffix"); + pValues[2].Name = "Suffix"; pValues[2].Value <<= pTemp->sSuffix; - pValues[3].Name = C2U("BulletChar"); + pValues[3].Name = "BulletChar"; pValues[3].Value <<= OUString(&pTemp->cBulletChar, 1); - pValues[4].Name = C2U("BulletFontName"); - pValues[4].Value <<= C2U(pTemp->sBulletFontName); - pValues[5].Name = C2U("ParentNumbering"); - pValues[5].Value <<= pTemp->nParentNumbering; - pValues[6].Name = C2U("LeftMargin"); + pValues[4].Name = "BulletFontName"; + pValues[4].Value <<= OUString::createFromAscii(pTemp->sBulletFontName); + pValues[5].Name = "ParentNumbering"; + pValues[5].Value <<= OUString::number(pTemp->nParentNumbering); + pValues[6].Name = "LeftMargin"; pValues[6].Value <<= pTemp->nLeftMargin; - pValues[7].Name = C2U("SymbolTextDistance"); + pValues[7].Name = "SymbolTextDistance"; pValues[7].Value <<= pTemp->nSymbolTextDistance; - pValues[8].Name = C2U("FirstLineOffset"); + pValues[8].Name = "FirstLineOffset"; pValues[8].Value <<= pTemp->nFirstLineOffset; - pValues[9].Name = C2U("Adjust"); + pValues[9].Name = "Adjust"; pValues[9].Value <<= (sal_Int16)HoriOrientation::LEFT; - pValues[10].Name = C2U("Transliteration"); + pValues[10].Name = "Transliteration"; pValues[10].Value <<= pTemp->sTransliteration; - pValues[11].Name = C2U("NatNum"); + pValues[11].Name = "NatNum"; pValues[11].Value <<= pTemp->nNatNum; aRet <<= aOutlineNumbering; return aRet; diff --git a/javaunohelper/source/bootstrap.cxx b/javaunohelper/source/bootstrap.cxx index 558a853e6f53..323cc8011eca 100644 --- a/javaunohelper/source/bootstrap.cxx +++ b/javaunohelper/source/bootstrap.cxx @@ -38,8 +38,6 @@ #include "vm.hxx" -#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -83,7 +81,7 @@ extern "C" SAL_JNI_EXPORT jobject JNICALL Java_com_sun_star_comp_helper_Bootstra { jni_env->ExceptionClear(); throw RuntimeException( - OUSTR("index out of bounds?!"), Reference< XInterface >() ); + "index out of bounds?!", Reference< XInterface >() ); } if (0 != jstr) { @@ -94,7 +92,7 @@ extern "C" SAL_JNI_EXPORT jobject JNICALL Java_com_sun_star_comp_helper_Bootstra { jni_env->ExceptionClear(); throw RuntimeException( - OUSTR("index out of bounds?!"), Reference< XInterface >() ); + "index out of bounds?!", Reference< XInterface >() ); } if (0 != jstr) { @@ -127,8 +125,8 @@ extern "C" SAL_JNI_EXPORT jobject JNICALL Java_com_sun_star_comp_helper_Bootstra xContext = ::javaunohelper::install_vm_singleton( xContext, vm_access ); // get uno envs - OUString cpp_env_name = OUSTR(CPPU_CURRENT_LANGUAGE_BINDING_NAME); - OUString java_env_name = OUSTR(UNO_LB_JAVA); + OUString cpp_env_name = CPPU_CURRENT_LANGUAGE_BINDING_NAME; + OUString java_env_name = UNO_LB_JAVA; Environment java_env, cpp_env; uno_getEnvironment((uno_Environment **)&cpp_env, cpp_env_name.pData, NULL); uno_getEnvironment( (uno_Environment **)&java_env, java_env_name.pData, vm_access.get() ); @@ -141,7 +139,7 @@ extern "C" SAL_JNI_EXPORT jobject JNICALL Java_com_sun_star_comp_helper_Bootstra if (xComp.is()) xComp->dispose(); throw RuntimeException( - OUSTR("cannot get mapping C++ <-> Java!"), + "cannot get mapping C++ <-> Java!", Reference< XInterface >() ); } diff --git a/javaunohelper/source/javaunohelper.cxx b/javaunohelper/source/javaunohelper.cxx index c1afc4aba720..02af62e67b3a 100644 --- a/javaunohelper/source/javaunohelper.cxx +++ b/javaunohelper/source/javaunohelper.cxx @@ -37,8 +37,6 @@ #include "vm.hxx" -#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -91,7 +89,7 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo( // create vm access ::rtl::Reference< ::jvmaccess::UnoVirtualMachine > vm_access( ::javaunohelper::create_vm_access( pJEnv, loader ) ); - OUString java_env_name = OUSTR(UNO_LB_JAVA); + OUString java_env_name = UNO_LB_JAVA; uno_getEnvironment( (uno_Environment **)&java_env, java_env_name.pData, vm_access.get() ); @@ -185,7 +183,7 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory( // create vm access ::rtl::Reference< ::jvmaccess::UnoVirtualMachine > vm_access( ::javaunohelper::create_vm_access( pJEnv, loader ) ); - OUString java_env_name = OUSTR(UNO_LB_JAVA); + OUString java_env_name = UNO_LB_JAVA; uno_getEnvironment( (uno_Environment **)&java_env, java_env_name.pData, vm_access.get() ); diff --git a/javaunohelper/source/preload.cxx b/javaunohelper/source/preload.cxx index c188d82a4ea7..aa34d33c7df9 100644 --- a/javaunohelper/source/preload.cxx +++ b/javaunohelper/source/preload.cxx @@ -27,8 +27,6 @@ // probably because java.lang.System.loadLibrary uses RTLD_LOCAL, so uniqueness // of GCC RTTI symbols needed for exception handling would not be guaranteed. -#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) - #if ! defined SAL_DLLPREFIX #define SAL_DLLPREFIX "" #endif @@ -59,7 +57,7 @@ static bool inited_juhx( JNIEnv * jni_env ) { if (s_inited) return true; - OUString lib_name = OUSTR(SAL_DLLPREFIX "juhx" SAL_DLLEXTENSION); + OUString lib_name = SAL_DLLPREFIX "juhx" SAL_DLLEXTENSION; oslModule hModule = osl_loadModuleRelative( &thisModule, lib_name.pData, SAL_LOADMODULE_LAZY | SAL_LOADMODULE_GLOBAL ); if (0 == hModule) @@ -72,20 +70,20 @@ static bool inited_juhx( JNIEnv * jni_env ) else { OUString symbol = - OUSTR("Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo"); + "Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo"; s_writeInfo = (fptr_writeInfo)osl_getFunctionSymbol( hModule, symbol.pData ); symbol = - OUSTR("Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory"); + "Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory"; s_getFactory = (fptr_getFactory)osl_getFunctionSymbol( hModule, symbol.pData ); symbol = - OUSTR("Java_com_sun_star_comp_helper_RegistryServiceFactory_createRegistryServiceFactory"); + "Java_com_sun_star_comp_helper_RegistryServiceFactory_createRegistryServiceFactory"; s_createRegistryServiceFactory = (fptr_createRegistryServiceFactory)osl_getFunctionSymbol( hModule, symbol.pData ); symbol = - OUSTR("Java_com_sun_star_comp_helper_Bootstrap_cppuhelper_1bootstrap"); + "Java_com_sun_star_comp_helper_Bootstrap_cppuhelper_1bootstrap"; s_bootstrap = (fptr_bootstrap)osl_getFunctionSymbol( hModule, symbol.pData ); diff --git a/jvmaccess/workbench/javainfo/javainfotest.cxx b/jvmaccess/workbench/javainfo/javainfotest.cxx index ddfd94db17ca..26d86dc2cf47 100644 --- a/jvmaccess/workbench/javainfo/javainfotest.cxx +++ b/jvmaccess/workbench/javainfo/javainfotest.cxx @@ -35,8 +35,6 @@ using ::rtl::OUString; using ::rtl::OUStringToOString; using ::rtl::OString; -#define OUSTR( x ) ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( x )) - #define JAVA_VERSION "1.4.1_01" bool test_constructor1(); @@ -77,9 +75,9 @@ bool test_constructor1() printf("\ntest JavaInfo::JavaInfo(const OUString& usJavaHome\n" \ "!Check output for correctness\n\n"); try{ - JavaInfo info(OUSTR("file:///d:/java/j2sdk1.4.1_01")); -// JavaInfo info(OUSTR("file:///local/jl/java/j2sdk1.4.0")); -// JavaInfo info(OUSTR("file:///usr/local2/jl/java/j2sdk1.4.0")); + JavaInfo info("file:///d:/java/j2sdk1.4.1_01"); +// JavaInfo info("file:///local/jl/java/j2sdk1.4.0"); +// JavaInfo info("file:///usr/local2/jl/java/j2sdk1.4.0"); printInfo(info); }catch( JavaInfo::InitException& ) @@ -97,11 +95,11 @@ bool test_constructor2() bool arRet[20]; int i= 0; - JavaInfo a(OUSTR("file:///d:/java/j2sdk1.4.1_01")); + JavaInfo a("file:///d:/java/j2sdk1.4.1_01"); // ----------------------------------------------------- -// JavaInfo a(OUSTR("file:///usr/local2/jl/java/j2sdk1.4.0")); +// JavaInfo a("file:///usr/local2/jl/java/j2sdk1.4.0"); //------------------------------------------------------------ -// JavaInfo a(OUSTR("file:///local/jl/java/j2sdk1.4.0")); +// JavaInfo a("file:///local/jl/java/j2sdk1.4.0"); try{ JavaInfo info= JavaInfo(OUString(), 0); arRet[i++]= true; @@ -119,14 +117,14 @@ bool test_constructor2() } try{ - JavaInfo info(OUString(OUSTR(JAVA_VERSION)), JavaInfo::EqualVersion); + JavaInfo info(OUString(JAVA_VERSION), JavaInfo::EqualVersion); arRet[i++]= info.compareVersions(a) == 0; } catch( ...) { arRet[i++]= false; } try{ - JavaInfo info(OUString(OUSTR(JAVA_VERSION)), 0); + JavaInfo info(OUString(JAVA_VERSION), 0); arRet[i++]= info.compareVersions(a) == 0; } catch( ...) { @@ -134,28 +132,28 @@ bool test_constructor2() } try{ - JavaInfo info(OUString(OUSTR(JAVA_VERSION)), JavaInfo::EqualVersion | JavaInfo::GreaterVersion); + JavaInfo info(OUString(JAVA_VERSION), JavaInfo::EqualVersion | JavaInfo::GreaterVersion); arRet[i++]= info.compareVersions(a) >= 0; } catch( ...) { arRet[i++]= false; } try{ - JavaInfo info(OUString(OUSTR(JAVA_VERSION)), JavaInfo::EqualVersion | JavaInfo::SmallerVersion); + JavaInfo info(OUString(JAVA_VERSION), JavaInfo::EqualVersion | JavaInfo::SmallerVersion); arRet[i++]= info.compareVersions(a) <= 0; } catch( ...) { arRet[i++]= false; } try{ - JavaInfo info(OUString(OUSTR(JAVA_VERSION)), JavaInfo::SmallerVersion); + JavaInfo info(OUString(JAVA_VERSION), JavaInfo::SmallerVersion); arRet[i++]= info.compareVersions(a) < 0; } catch( ...) { arRet[i++]= false; } try{ - JavaInfo info(OUString(OUSTR(JAVA_VERSION)), JavaInfo::GreaterVersion); + JavaInfo info(OUString(JAVA_VERSION), JavaInfo::GreaterVersion); arRet[i++]= info.compareVersions(a) > 0; } catch( ...) { @@ -163,7 +161,7 @@ bool test_constructor2() } try{ - JavaInfo info(OUString(OUSTR(JAVA_VERSION)), JavaInfo::EqualVersion | JavaInfo::SmallerVersion + JavaInfo info(OUString(JAVA_VERSION), JavaInfo::EqualVersion | JavaInfo::SmallerVersion | JavaInfo::Accessibility); arRet[i++]= info.compareVersions(a) <= 0 && info.supportsAccessibility(); } @@ -171,7 +169,7 @@ bool test_constructor2() arRet[i++]= false; } try{ - JavaInfo info(OUString(OUSTR(JAVA_VERSION)), JavaInfo::GreaterVersion | JavaInfo::Accessibility); + JavaInfo info(OUString(JAVA_VERSION), JavaInfo::GreaterVersion | JavaInfo::Accessibility); arRet[i++]= info.compareVersions(a) > 0 && info.supportsAccessibility(); } catch( ...) { @@ -208,25 +206,25 @@ bool test_compareVersions() "! Check output for correctness\n\n"); - JavaInfo a(OUSTR("file:///C:/Program%20Files/JavaSoft/JRE/1.3.1")); - JavaInfo b(OUSTR("file:///C:/Program%20Files/JavaSoft/JRE/1.3.1_04")); - JavaInfo c(OUSTR("file:///C:/Program%20Files/Java/j2re1.4.0_03")); - JavaInfo d(OUSTR("file:///C:/Program%20Files/Java/j2re1.4.2_04")); -// JavaInfo e(OUSTR("file:///d:/java/j2sdk1.4.0_01")); -// JavaInfo f(OUSTR("file:///d:/java/j2sdk1.4.0_02")); -// JavaInfo g(OUSTR("file:///d:/java/j2sdk1.4.1")); -// JavaInfo h(OUSTR("file:///d:/java/j2sdk1.4.1_01")); - -// JavaInfo a(OUSTR("file:///usr/local2/jl/java/j2re1_3_1_02")); -// JavaInfo b(OUSTR("file:///usr/local2/jl/java/j2sdk1.4.0")); -// JavaInfo c(OUSTR("file:///usr/local2/jl/java/j2sdk1.4.1")); -// JavaInfo d(OUSTR("file:///usr/local2/jl/java/j2re1.4.1_01")); - -// JavaInfo a(OUSTR("file:///local/jl/java/jre1.3.1")); -// JavaInfo b(OUSTR("file:///local/jl/java/jdk1.3.1_04")); -// JavaInfo c(OUSTR("file:///local/jl/java/j2sdk1.4.0")); -// JavaInfo d(OUSTR("file:///local/jl/java/j2sdk1.4.1")); -// JavaInfo e(OUSTR("file:///local/jl/java/j2re1.4.1_01")); + JavaInfo a("file:///C:/Program%20Files/JavaSoft/JRE/1.3.1"); + JavaInfo b("file:///C:/Program%20Files/JavaSoft/JRE/1.3.1_04"); + JavaInfo c("file:///C:/Program%20Files/Java/j2re1.4.0_03"); + JavaInfo d("file:///C:/Program%20Files/Java/j2re1.4.2_04"); +// JavaInfo e("file:///d:/java/j2sdk1.4.0_01"); +// JavaInfo f("file:///d:/java/j2sdk1.4.0_02"); +// JavaInfo g("file:///d:/java/j2sdk1.4.1"); +// JavaInfo h("file:///d:/java/j2sdk1.4.1_01"); + +// JavaInfo a("file:///usr/local2/jl/java/j2re1_3_1_02"); +// JavaInfo b("file:///usr/local2/jl/java/j2sdk1.4.0"); +// JavaInfo c("file:///usr/local2/jl/java/j2sdk1.4.1"); +// JavaInfo d("file:///usr/local2/jl/java/j2re1.4.1_01"); + +// JavaInfo a("file:///local/jl/java/jre1.3.1"); +// JavaInfo b("file:///local/jl/java/jdk1.3.1_04"); +// JavaInfo c("file:///local/jl/java/j2sdk1.4.0"); +// JavaInfo d("file:///local/jl/java/j2sdk1.4.1"); +// JavaInfo e("file:///local/jl/java/j2re1.4.1_01"); // fprintf(stderr,"###ok1"); if( (a.compareVersions(a) == 0 @@ -300,22 +298,22 @@ bool test_createBestInfo() bool test_isEqual() { printf("\ntest JavaInfo::isEqual\n"); - JavaInfo a(OUSTR(JAVA_VERSION)); // accessible - JavaInfo b(OUSTR(JAVA_VERSION)); + JavaInfo a(JAVA_VERSION); // accessible + JavaInfo b(JAVA_VERSION); - JavaInfo c(OUSTR("file:///c:/local/r/j2sdk1.4.0"));// not Accessible - JavaInfo d(OUSTR("file:///d:/java/copy_j2sdk1.4.0")); + JavaInfo c("file:///c:/local/r/j2sdk1.4.0");// not Accessible + JavaInfo d("file:///d:/java/copy_j2sdk1.4.0"); //------------------------------------------------------------------- -// JavaInfo a(OUSTR("file:///usr/local2/jl/java/j2re1_3_1_02")); -// JavaInfo b(OUSTR("file:///usr/local2/jl/java/j2re1_3_1_02")); +// JavaInfo a("file:///usr/local2/jl/java/j2re1_3_1_02"); +// JavaInfo b("file:///usr/local2/jl/java/j2re1_3_1_02"); -// JavaInfo c(OUSTR("file:///usr/local2/jl/java/j2sdk1.4.1")); -// JavaInfo d(OUSTR("file:///usr/local2/jl/java/copyj2sdk1.4.1")); +// JavaInfo c("file:///usr/local2/jl/java/j2sdk1.4.1"); +// JavaInfo d("file:///usr/local2/jl/java/copyj2sdk1.4.1"); -// JavaInfo a(OUSTR("file:///local/jl/java/jre1.3.1")); -// JavaInfo b(OUSTR("file:///local/jl/java/jre1.3.1")); -// JavaInfo c(OUSTR("file:///local/jl/java/j2sdk1.4.1")); -// JavaInfo d(OUSTR("file:///local/jl/java/copyj2sdk1.4.1")); +// JavaInfo a("file:///local/jl/java/jre1.3.1"); +// JavaInfo b("file:///local/jl/java/jre1.3.1"); +// JavaInfo c("file:///local/jl/java/j2sdk1.4.1"); +// JavaInfo d("file:///local/jl/java/copyj2sdk1.4.1"); bool arRet[20]; int i= 0; @@ -336,8 +334,8 @@ bool test_isEqual() bool test_getJarFilePath() { printf("\ntest JavaInfo::getJarFilePath\n"); - JavaInfo info(OUString(OUSTR("1.3.1")), JavaInfo::GreaterVersion | JavaInfo::EqualVersion ); - OUString s= info.getJarFilePath(OUSTR("javaplugin.jar")); + JavaInfo info(OUString("1.3.1"), JavaInfo::GreaterVersion | JavaInfo::EqualVersion ); + OUString s= info.getJarFilePath("javaplugin.jar"); printf("check if this URL is correct:\n"); OString oPath= OUStringToOString(s, osl_getThreadTextEncoding()); diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx index fbc4eeb9a3d8..f8267c6bcc80 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx @@ -65,7 +65,6 @@ #define RUNNING_ON_VALGRIND 0 #endif -#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) #define SUN_MICRO "Sun Microsystems Inc." using namespace osl; @@ -109,7 +108,7 @@ OString getPluginJarPath( } if (!sName.isEmpty()) { - sName = sLocation + OUSTR("/lib/") + sName; + sName = sLocation + "/lib/" + sName; OSL_VERIFY( osl_getSystemPathFromFileURL(sName.pData, & sPath.pData) == osl_File_E_None); @@ -118,13 +117,13 @@ OString getPluginJarPath( else { char sep[] = {SAL_PATHSEPARATOR, 0}; - OUString sName(sLocation + OUSTR("/lib/") + sName1); + OUString sName(sLocation + "/lib/" + sName1); OUString sPath1; OUString sPath2; if (osl_getSystemPathFromFileURL(sName.pData, & sPath1.pData) == osl_File_E_None) { - sName = sLocation + OUSTR("/lib/") + sName2; + sName = sLocation + "/lib/" + sName2; if (osl_getSystemPathFromFileURL(sName.pData, & sPath2.pData) == osl_File_E_None) { @@ -260,9 +259,9 @@ javaPluginError jfw_plugin_getAllJavaInfos( { //The minVersion was not recognized as valid for this vendor. JFW_ENSURE( - 0,OUSTR("[Java framework]sunjavaplugin does not know version: ") - + ouMinVer + OUSTR(" for vendor: ") + cur->getVendor() - + OUSTR(" .Check minimum Version.") ); + 0,"[Java framework]sunjavaplugin does not know version: " + + ouMinVer + " for vendor: " + cur->getVendor() + + " .Check minimum Version." ); return JFW_PLUGIN_E_WRONG_VERSION_FORMAT; } } @@ -278,9 +277,9 @@ javaPluginError jfw_plugin_getAllJavaInfos( { //The maxVersion was not recognized as valid for this vendor. JFW_ENSURE( - 0,OUSTR("[Java framework]sunjavaplugin does not know version: ") - + ouMaxVer + OUSTR(" for vendor: ") + cur->getVendor() - + OUSTR(" .Check maximum Version.") ); + 0,"[Java framework]sunjavaplugin does not know version: " + + ouMaxVer + " for vendor: " + cur->getVendor() + + " .Check maximum Version." ); return JFW_PLUGIN_E_WRONG_VERSION_FORMAT; } } @@ -301,9 +300,9 @@ javaPluginError jfw_plugin_getAllJavaInfos( { //The excluded version was not recognized as valid for this vendor. JFW_ENSURE( - 0,OUSTR("[Java framework]sunjavaplugin does not know version: ") - + sExVer + OUSTR(" for vendor: ") + cur->getVendor() - + OUSTR(" .Check excluded versions.") ); + 0,"[Java framework]sunjavaplugin does not know version: " + + sExVer + " for vendor: " + cur->getVendor() + + " .Check excluded versions." ); return JFW_PLUGIN_E_WRONG_VERSION_FORMAT; } } @@ -384,9 +383,9 @@ javaPluginError jfw_plugin_getJavaInfoByPath( { //The minVersion was not recognized as valid for this vendor. JFW_ENSURE( - 0,OUSTR("[Java framework]sunjavaplugin does not know version: ") - + ouMinVer + OUSTR(" for vendor: ") + aVendorInfo->getVendor() - + OUSTR(" .Check minimum Version.") ); + 0,"[Java framework]sunjavaplugin does not know version: " + + ouMinVer + " for vendor: " + aVendorInfo->getVendor() + + " .Check minimum Version." ); return JFW_PLUGIN_E_WRONG_VERSION_FORMAT; } if (nRes < 0) @@ -404,9 +403,9 @@ javaPluginError jfw_plugin_getJavaInfoByPath( { //The maxVersion was not recognized as valid for this vendor. JFW_ENSURE( - 0,OUSTR("[Java framework]sunjavaplugin does not know version: ") - + ouMaxVer + OUSTR(" for vendor: ") + aVendorInfo->getVendor() - + OUSTR(" .Check maximum Version.") ); + 0,"[Java framework]sunjavaplugin does not know version: " + + ouMaxVer + " for vendor: " + aVendorInfo->getVendor() + + " .Check maximum Version." ); return JFW_PLUGIN_E_WRONG_VERSION_FORMAT; } if (nRes > 0) @@ -425,9 +424,9 @@ javaPluginError jfw_plugin_getJavaInfoByPath( { //The excluded version was not recognized as valid for this vendor. JFW_ENSURE( - 0,OUSTR("[Java framework]sunjavaplugin does not know version: ") - + sExVer + OUSTR(" for vendor: ") + aVendorInfo->getVendor() - + OUSTR(" .Check excluded versions.") ); + 0,"[Java framework]sunjavaplugin does not know version: " + + sExVer + " for vendor: " + aVendorInfo->getVendor() + + " .Check excluded versions." ); return JFW_PLUGIN_E_WRONG_VERSION_FORMAT; } if (nRes == 0) @@ -571,8 +570,8 @@ javaPluginError jfw_plugin_startJavaVirtualMachine( if ( ! isVendorSupported(pInfo->sVendor)) return JFW_PLUGIN_E_WRONG_VENDOR; rtl::OUString sRuntimeLib = getRuntimeLib(pInfo->arVendorData); - JFW_TRACE2(OUSTR("[Java framework] Using Java runtime library: ") - + sRuntimeLib + OUSTR(".\n")); + JFW_TRACE2("[Java framework] Using Java runtime library: " + + sRuntimeLib + ".\n"); #ifndef ANDROID // On linux we load jvm with RTLD_GLOBAL. This is necessary for debugging, because @@ -589,12 +588,12 @@ javaPluginError jfw_plugin_startJavaVirtualMachine( if ((moduleRt = osl_loadModule(sRuntimeLib.pData, SAL_LOADMODULE_DEFAULT)) == 0) #endif { - JFW_ENSURE(0, OUSTR("[Java framework]sunjavaplugin" SAL_DLLEXTENSION - " could not load Java runtime library: \n") - + sRuntimeLib + OUSTR("\n")); - JFW_TRACE0(OUSTR("[Java framework]sunjavaplugin" SAL_DLLEXTENSION - " could not load Java runtime library: \n") - + sRuntimeLib + OUSTR("\n")); + JFW_ENSURE(0, "[Java framework]sunjavaplugin" SAL_DLLEXTENSION + " could not load Java runtime library: \n" + + sRuntimeLib + "\n"); + JFW_TRACE0("[Java framework]sunjavaplugin" SAL_DLLEXTENSION + " could not load Java runtime library: \n" + + sRuntimeLib + "\n"); return JFW_PLUGIN_E_VM_CREATION_FAILED; } @@ -784,28 +783,28 @@ javaPluginError jfw_plugin_existJRE(const JavaInfo *pInfo, sal_Bool *exist) if (ret == JFW_PLUGIN_E_NONE && *exist == sal_True) { rtl::OUString sRuntimeLib = getRuntimeLib(pInfo->arVendorData); - JFW_TRACE2(OUSTR("[Java framework] Checking existence of Java runtime library.\n")); + JFW_TRACE2("[Java framework] Checking existence of Java runtime library.\n"); ::osl::DirectoryItem itemRt; ::osl::File::RC rc_itemRt = ::osl::DirectoryItem::get(sRuntimeLib, itemRt); if (::osl::File::E_None == rc_itemRt) { *exist = sal_True; - JFW_TRACE2(OUSTR("[Java framework] Java runtime library exist: ") - + sRuntimeLib + OUSTR("\n")); + JFW_TRACE2("[Java framework] Java runtime library exist: " + + sRuntimeLib + "\n"); } else if (::osl::File::E_NOENT == rc_itemRt) { *exist = sal_False; - JFW_TRACE2(OUSTR("[Java framework] Java runtime library does not exist: ") - + sRuntimeLib + OUSTR("\n")); + JFW_TRACE2("[Java framework] Java runtime library does not exist: " + + sRuntimeLib + "\n"); } else { ret = JFW_PLUGIN_E_ERROR; - JFW_TRACE2(OUSTR("[Java framework] Error while looking for Java runtime library: ") - + sRuntimeLib + OUSTR(" \n")); + JFW_TRACE2("[Java framework] Error while looking for Java runtime library: " + + sRuntimeLib + " \n"); } } #endif diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx index 6c2bc0f6d82d..a4ff38cdaf52 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx @@ -25,7 +25,6 @@ using namespace std; -#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) namespace jfw_plugin { @@ -92,9 +91,9 @@ int SunInfo::compareVersions(const rtl::OUString& sSecond) const rtl::OUString sFirst = getVersion(); SunVersion version1(sFirst); - JFW_ENSURE(version1, OUSTR("[Java framework] sunjavaplugin" SAL_DLLEXTENSION - " does not know the version: ") - + sFirst + OUSTR(" as valid for a SUN/Oracle JRE.")); + JFW_ENSURE(version1, "[Java framework] sunjavaplugin" SAL_DLLEXTENSION + " does not know the version: " + + sFirst + " as valid for a SUN/Oracle JRE."); SunVersion version2(sSecond); if ( ! version2) throw MalformedVersionException(); diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx index 463159cc3955..4eaff7ba6fff 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx @@ -33,8 +33,6 @@ using ::rtl::OString; namespace jfw_plugin { //stoc_javadetect -#define OUSTR( x ) ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( x )) - #if OSL_DEBUG_LEVEL >= 2 class SelfTest { diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx index 1f266f1ef0f2..662f66d6f2d2 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx @@ -59,7 +59,6 @@ using ::rtl::OString; using ::rtl::OUStringBuffer; using ::rtl::OUStringToOString; -#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) #ifdef WNT #define HKEY_SUN_JRE L"Software\\JavaSoft\\Java Runtime Environment" #define HKEY_SUN_SDK L"Software\\JavaSoft\\Java Development Kit" @@ -158,8 +157,8 @@ namespace buf.append( getLibraryLocation()); buf.appendAscii( SAL_CONFIGFILE("/sunjavaplugin") ); sIni = buf.makeStringAndClear(); - JFW_TRACE2(OUSTR("[Java framework] sunjavaplugin: " - "Using configuration file \n") + sIni); + JFW_TRACE2("[Java framework] sunjavaplugin: " + "Using configuration file \n" + sIni); return sIni; } }; @@ -391,14 +390,14 @@ bool getJavaProps(const OUString & exePath, //"noaccessibility" to JREProperties.class. This will prevent //that it calls java.awt.Toolkit.getDefaultToolkit(); OUString sValue; - getBootstrap()->getFrom(OUSTR("JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY"), sValue); + getBootstrap()->getFrom("JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY", sValue); //prepare the arguments sal_Int32 cArgs = 3; OUString arg1 = OUString(RTL_CONSTASCII_USTRINGPARAM("-classpath"));// + sClassPath; OUString arg2 = sClassPath; OUString arg3(RTL_CONSTASCII_USTRINGPARAM("JREProperties")); - OUString arg4 = OUSTR("noaccessibility"); + OUString arg4 = "noaccessibility"; rtl_uString *args[4] = {arg1.pData, arg2.pData, arg3.pData}; // Only add the fourth param if the bootstrap parameter is set. @@ -415,7 +414,7 @@ bool getJavaProps(const OUString & exePath, FileHandleReader stdoutReader(fileOut); rtl::Reference< AsynchReader > stderrReader(new AsynchReader(fileErr)); - JFW_TRACE2(OUSTR("\n[Java framework] Executing: ") + exePath + OUSTR(".\n")); + JFW_TRACE2("\n[Java framework] Executing: " + exePath + ".\n"); oslProcessError procErr = osl_executeProcess_WithRedirectedIO( exePath.pData,//usExe.pData, args, @@ -874,9 +873,10 @@ rtl::Reference<VendorBase> getJREInfoByPath( SameOrSubDirJREMap(sResolvedDir)); if (entry2 != mapJREs.end()) { - JFW_TRACE2(OUSTR("[Java framework] sunjavaplugin" SAL_DLLEXTENSION ": ") - + OUSTR("JRE found again (detected before): ") + sResolvedDir - + OUSTR(".\n")); + JFW_TRACE2(OUString("[Java framework] sunjavaplugin") + + SAL_DLLEXTENSION + ": " + + "JRE found again (detected before): " + sResolvedDir + + ".\n"); return entry2->second; } @@ -925,9 +925,10 @@ rtl::Reference<VendorBase> getJREInfoByPath( MapIt entry = mapJREs.find(sFilePath); if (entry != mapJREs.end()) { - JFW_TRACE2(OUSTR("[Java framework] sunjavaplugin" SAL_DLLEXTENSION ": ") - + OUSTR("JRE found again (detected before): ") + sFilePath - + OUSTR(".\n")); + JFW_TRACE2(OUString("[Java framework] sunjavaplugin") + + SAL_DLLEXTENSION + ": " + + "JRE found again (detected before): " + sFilePath + + ".\n"); return entry->second; } @@ -1021,9 +1022,10 @@ rtl::Reference<VendorBase> getJREInfoByPath( vecBadPaths.push_back(sFilePath); else { - JFW_TRACE2(OUSTR("[Java framework] sunjavaplugin" SAL_DLLEXTENSION ": ") - + OUSTR("Found JRE: ") + sResolvedDir - + OUSTR(" \n at: ") + path + OUSTR(".\n")); + JFW_TRACE2(OUString("[Java framework] sunjavaplugin") + + SAL_DLLEXTENSION + ": " + + "Found JRE: " + sResolvedDir + + " \n at: " + path + ".\n"); mapJREs.insert(MAPJRE::value_type(sResolvedDir, ret)); mapJREs.insert(MAPJRE::value_type(sFilePath, ret)); @@ -1135,15 +1137,15 @@ bool makeDriveLetterSame(OUString * fileURL) void createJavaInfoDirScan(vector<rtl::Reference<VendorBase> >& vecInfos) { - JFW_TRACE2(OUSTR("\n[Java framework] Checking \"/usr/jdk/latest\"\n")); - getJREInfoByPath(OUSTR("file:////usr/jdk/latest"), vecInfos); + JFW_TRACE2("\n[Java framework] Checking \"/usr/jdk/latest\"\n"); + getJREInfoByPath("file:////usr/jdk/latest", vecInfos); } #else void createJavaInfoDirScan(vector<rtl::Reference<VendorBase> >& vecInfos) { - OUString excMessage = OUSTR("[Java framework] sunjavaplugin: " - "Error in function createJavaInfoDirScan in util.cxx."); + OUString excMessage = "[Java framework] sunjavaplugin: " + "Error in function createJavaInfoDirScan in util.cxx."; int cJavaNames= sizeof(g_arJavaNames) / sizeof(char*); boost::scoped_array<OUString> sarJavaNames(new OUString[cJavaNames]); OUString *arNames = sarJavaNames.get(); @@ -1193,14 +1195,14 @@ void createJavaInfoDirScan(vector<rtl::Reference<VendorBase> >& vecInfos) case File::E_NOTDIR: continue; case File::E_ACCES: - JFW_TRACE2(OUSTR("[Java framework] sunjavaplugin: " - "Could not read directory ") + usDir2 + - OUSTR(" because of missing access rights.")); + JFW_TRACE2(OUString("[Java framework] sunjavaplugin: ") + + "Could not read directory " + usDir2 + + " because of missing access rights."); continue; default: - JFW_TRACE2(OUSTR("[Java framework] sunjavaplugin: " - "Could not read directory ") - + usDir2 + OUSTR(". Osl file error: ") + JFW_TRACE2(OUString("[Java framework] sunjavaplugin: ") + + "Could not read directory " + + usDir2 + ". Osl file error: " + OUString::valueOf((sal_Int32) openErr)); continue; } @@ -1213,21 +1215,21 @@ void createJavaInfoDirScan(vector<rtl::Reference<VendorBase> >& vecInfos) File::RC errStatus = File::E_None; if ((errStatus = curIt.getFileStatus(aStatus)) != File::E_None) { - JFW_TRACE2(excMessage + OUSTR("getFileStatus failed with error ") + JFW_TRACE2(excMessage + "getFileStatus failed with error " + OUString::valueOf((sal_Int32) errStatus)); continue; } - JFW_TRACE2(OUSTR("[Java framework] sunjavaplugin: " - "Checking if directory: ") + aStatus.getFileURL() + - OUSTR(" is a Java. \n")); + JFW_TRACE2(OUString("[Java framework] sunjavaplugin: ") + + "Checking if directory: " + aStatus.getFileURL() + + " is a Java. \n"); getJREInfoByPath(aStatus.getFileURL(),vecInfos); } JFW_ENSURE(errNext == File::E_None || errNext == File::E_NOENT, - OUSTR("[Java framework] sunjavaplugin: " - "Error while iterating over contens of ") - + usDir2 + OUSTR(". Osl file error: ") + OUString("[Java framework] sunjavaplugin: ") + + "Error while iterating over contens of " + + usDir2 + ". Osl file error: " + OUString::valueOf((sal_Int32) openErr)); } else diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx index cc9bfb70f5d6..98f7e96c24fa 100644 --- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx +++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx @@ -123,8 +123,8 @@ Sequence< Locale > SAL_CALL Hyphenator::getLocales() // new configuration entries). std::list< SvtLinguConfigDictionaryEntry > aDics; uno::Sequence< rtl::OUString > aFormatList; - aLinguCfg.GetSupportedDictionaryFormatsFor( A2OU("Hyphenators"), - A2OU("org.openoffice.lingu.LibHnjHyphenator"), aFormatList ); + aLinguCfg.GetSupportedDictionaryFormatsFor( "Hyphenators", + "org.openoffice.lingu.LibHnjHyphenator", aFormatList ); sal_Int32 nLen = aFormatList.getLength(); for (sal_Int32 i = 0; i < nLen; ++i) { @@ -291,7 +291,7 @@ Reference< XHyphenatedWord > SAL_CALL Hyphenator::hyphenate( const ::rtl::OUStri // if this dictinary has not been loaded yet do that if (!aDicts[k].aPtr) { - OUString DictFN = aDicts[k].aName + A2OU(".dic"); + OUString DictFN = aDicts[k].aName + ".dic"; OUString dictpath; osl::FileBase::getSystemPathFromFileURL( DictFN, dictpath ); @@ -552,7 +552,7 @@ Reference< XPossibleHyphens > SAL_CALL Hyphenator::createPossibleHyphens( const // if this dictioanry has not been loaded yet do that if (!aDicts[k].aPtr) { - OUString DictFN = aDicts[k].aName + A2OU(".dic"); + OUString DictFN = aDicts[k].aName + ".dic"; OUString dictpath; osl::FileBase::getSystemPathFromFileURL( DictFN, dictpath ); @@ -777,7 +777,7 @@ OUString SAL_CALL Hyphenator::getServiceDisplayName( const Locale& /*rLocale*/ ) throw(RuntimeException) { MutexGuard aGuard( GetLinguMutex() ); - return A2OU( "Libhyphen Hyphenator" ); + return OUString( "Libhyphen Hyphenator" ); } @@ -891,7 +891,7 @@ Sequence< OUString > Hyphenator::getSupportedServiceNames_Static() MutexGuard aGuard( GetLinguMutex() ); Sequence< OUString > aSNS( 1 ); // auch mehr als 1 Service moeglich - aSNS.getArray()[0] = A2OU( SN_HYPHENATOR ); + aSNS.getArray()[0] = SN_HYPHENATOR; return aSNS; } diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx index 73010fbfbf90..373d79a6248b 100644 --- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx +++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx @@ -139,7 +139,7 @@ private: inline OUString Hyphenator::getImplementationName_Static() throw() { - return A2OU( "org.openoffice.lingu.LibHnjHyphenator" ); + return OUString( "org.openoffice.lingu.LibHnjHyphenator" ); } diff --git a/lingucomponent/source/languageguessing/guesslang.cxx b/lingucomponent/source/languageguessing/guesslang.cxx index 981de86baf84..c675b1c8bcf5 100644 --- a/lingucomponent/source/languageguessing/guesslang.cxx +++ b/lingucomponent/source/languageguessing/guesslang.cxx @@ -56,21 +56,19 @@ using namespace ::com::sun::star::linguistic2; //================================================================================================== -#define A2OU(x) ::rtl::OUString::createFromAscii( x ) - #define SERVICENAME "com.sun.star.linguistic2.LanguageGuessing" #define IMPLNAME "com.sun.star.lingu2.LanguageGuessing" static Sequence< OUString > getSupportedServiceNames_LangGuess_Impl() { Sequence<OUString> names(1); - names[0] = A2OU( SERVICENAME ); + names[0] = SERVICENAME; return names; } static OUString getImplementationName_LangGuess_Impl() { - return A2OU( IMPLNAME ); + return OUString( IMPLNAME ); } static osl::Mutex & GetLangGuessMutex() @@ -200,8 +198,8 @@ Locale SAL_CALL LangGuess_Impl::guessPrimaryLanguage( { OString o( OUStringToOString( rText.copy(nStartPos, nLen), RTL_TEXTENCODING_UTF8 ) ); Guess g = m_aGuesser.GuessPrimaryLanguage(o.getStr()); - aRes.Language = OUString::createFromAscii(g.GetLanguage().c_str()); - aRes.Country = OUString::createFromAscii(g.GetCountry().c_str()); + aRes.Language = OUString::createFromAscii( g.GetLanguage().c_str() ); + aRes.Country = OUString::createFromAscii( g.GetCountry().c_str() ); } else throw lang::IllegalArgumentException(); @@ -241,8 +239,8 @@ uno::Sequence< Locale > SAL_CALL LangGuess_Impl::getAvailableLanguages( ) for(size_t i = 0; i < gs.size() ; i++ ){ com::sun::star::lang::Locale current_aRes; - current_aRes.Language = A2OU( gs[i].GetLanguage().c_str() ); - current_aRes.Country = A2OU( gs[i].GetCountry().c_str() ); + current_aRes.Language = OUString::createFromAscii( gs[i].GetLanguage().c_str() ); + current_aRes.Country = OUString::createFromAscii( gs[i].GetCountry().c_str() ); pRes[i] = current_aRes; } @@ -265,8 +263,8 @@ uno::Sequence< Locale > SAL_CALL LangGuess_Impl::getEnabledLanguages( ) for(size_t i = 0; i < gs.size() ; i++ ){ com::sun::star::lang::Locale current_aRes; - current_aRes.Language = A2OU( gs[i].GetLanguage().c_str() ); - current_aRes.Country = A2OU( gs[i].GetCountry().c_str() ); + current_aRes.Language = OUString::createFromAscii( gs[i].GetLanguage().c_str() ); + current_aRes.Country = OUString::createFromAscii( gs[i].GetCountry().c_str() ); pRes[i] = current_aRes; } @@ -289,8 +287,8 @@ uno::Sequence< Locale > SAL_CALL LangGuess_Impl::getDisabledLanguages( ) for(size_t i = 0; i < gs.size() ; i++ ){ com::sun::star::lang::Locale current_aRes; - current_aRes.Language = A2OU( gs[i].GetLanguage().c_str() ); - current_aRes.Country = A2OU( gs[i].GetCountry().c_str() ); + current_aRes.Language = OUString::createFromAscii( gs[i].GetLanguage().c_str() ); + current_aRes.Country = OUString::createFromAscii( gs[i].GetCountry().c_str() ); pRes[i] = current_aRes; } @@ -354,7 +352,7 @@ OUString SAL_CALL LangGuess_Impl::getImplementationName( ) throw(RuntimeException) { osl::MutexGuard aGuard( GetLangGuessMutex() ); - return A2OU( IMPLNAME ); + return OUString( IMPLNAME ); } //************************************************************************* @@ -381,7 +379,7 @@ Sequence<OUString> SAL_CALL LangGuess_Impl::getSupportedServiceNames( ) //************************************************************************* Sequence<OUString> SAL_CALL LangGuess_Impl::getSupportedServiceNames_Static( ) { - OUString aName( A2OU( SERVICENAME ) ); + OUString aName( SERVICENAME ); return Sequence< OUString >( &aName, 1 ); } diff --git a/lingucomponent/source/lingutil/lingutil.cxx b/lingucomponent/source/lingutil/lingutil.cxx index 8754442e471f..fc3818f219b6 100644 --- a/lingucomponent/source/lingutil/lingutil.cxx +++ b/lingucomponent/source/lingutil/lingutil.cxx @@ -91,31 +91,31 @@ std::vector< SvtLinguConfigDictionaryEntry > GetOldStyleDics( const char *pDicTy #endif if (strcmp( pDicType, "DICT" ) == 0) { - aFormatName = A2OU("DICT_SPELL"); - aDicExtension = rtl::OUString( ".dic" ); + aFormatName = "DICT_SPELL"; + aDicExtension = ".dic"; #ifdef SYSTEM_DICTS - aSystemDir = A2OU( DICT_SYSTEM_DIR ); - aSystemSuffix = aDicExtension; + aSystemDir = DICT_SYSTEM_DIR; + aSystemSuffix = aDicExtension; #endif } else if (strcmp( pDicType, "HYPH" ) == 0) { - aFormatName = A2OU("DICT_HYPH"); - aDicExtension = rtl::OUString( ".dic" ); + aFormatName = "DICT_HYPH"; + aDicExtension = ".dic"; #ifdef SYSTEM_DICTS - aSystemDir = A2OU( HYPH_SYSTEM_DIR ); - aSystemPrefix = A2OU( "hyph_" ); - aSystemSuffix = aDicExtension; + aSystemDir = HYPH_SYSTEM_DIR; + aSystemPrefix = "hyph_"; + aSystemSuffix = aDicExtension; #endif } else if (strcmp( pDicType, "THES" ) == 0) { - aFormatName = A2OU("DICT_THES"); - aDicExtension = rtl::OUString( ".dat" ); + aFormatName = "DICT_THES"; + aDicExtension = ".dat"; #ifdef SYSTEM_DICTS - aSystemDir = A2OU( THES_SYSTEM_DIR ); - aSystemPrefix = A2OU( "th_" ); - aSystemSuffix = A2OU( "_v2.dat" ); + aSystemDir = THES_SYSTEM_DIR; + aSystemPrefix = "th_"; + aSystemSuffix = "_v2.dat"; #endif } diff --git a/lingucomponent/source/lingutil/lingutil.hxx b/lingucomponent/source/lingutil/lingutil.hxx index 3f1c998906a1..1e6a3de79f7b 100644 --- a/lingucomponent/source/lingutil/lingutil.hxx +++ b/lingucomponent/source/lingutil/lingutil.hxx @@ -30,10 +30,6 @@ #include <list> -#ifndef A2OU -# define A2OU(x) ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( x )) -#endif - #define OU2ENC(rtlOUString, rtlEncoding) \ ::rtl::OString((rtlOUString).getStr(), (rtlOUString).getLength(), \ rtlEncoding, RTL_UNICODETOTEXT_FLAGS_UNDEFINED_QUESTIONMARK).getStr() diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx b/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx index cc5bc426efeb..135b1b278ac6 100644 --- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx +++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx @@ -132,7 +132,7 @@ public: inline OUString MacSpellChecker::getImplementationName_Static() throw() { - return A2OU( "org.openoffice.lingu.MacOSXSpellChecker" ); + return OUString( "org.openoffice.lingu.MacOSXSpellChecker" ); } diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx b/lingucomponent/source/spellcheck/spell/sspellimp.cxx index 273743b57057..6ed090764f04 100644 --- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx +++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx @@ -126,8 +126,8 @@ Sequence< Locale > SAL_CALL SpellChecker::getLocales() // new configuration entries). std::list< SvtLinguConfigDictionaryEntry > aDics; uno::Sequence< rtl::OUString > aFormatList; - aLinguCfg.GetSupportedDictionaryFormatsFor( A2OU("SpellCheckers"), - A2OU("org.openoffice.lingu.MySpellSpellChecker"), aFormatList ); + aLinguCfg.GetSupportedDictionaryFormatsFor( "SpellCheckers", + "org.openoffice.lingu.MySpellSpellChecker", aFormatList ); sal_Int32 nLen = aFormatList.getLength(); for (sal_Int32 i = 0; i < nLen; ++i) { @@ -295,8 +295,8 @@ sal_Int16 SpellChecker::GetSpellFailure( const OUString &rWord, const Locale &rL { if (!aDicts[i]) { - OUString dicpath = aDNames[i] + A2OU(".dic"); - OUString affpath = aDNames[i] + A2OU(".aff"); + OUString dicpath = aDNames[i] + ".dic"; + OUString affpath = aDNames[i] + ".aff"; OUString dict; OUString aff; osl::FileBase::getSystemPathFromFileURL(dicpath,dict); @@ -360,7 +360,7 @@ sal_Bool SAL_CALL SpellChecker::isValid( const OUString& rWord, const Locale& rL return sal_True; // return sal_False to process SPELLML requests (they are longer than the header) - if (rWord.match(A2OU(SPELLML_HEADER), 0) && (rWord.getLength() > 10)) return sal_False; + if (rWord.match(SPELLML_HEADER, 0) && (rWord.getLength() > 10)) return sal_False; // Get property values to be used. // These are be the default values set in the SN_LINGU_PROPERTIES @@ -373,7 +373,7 @@ sal_Bool SAL_CALL SpellChecker::isValid( const OUString& rWord, const Locale& rL rHelper.SetTmpPropVals( rProperties ); sal_Int16 nFailure = GetSpellFailure( rWord, rLocale ); - if (nFailure != -1 && !rWord.match(A2OU(SPELLML_HEADER), 0)) + if (nFailure != -1 && !rWord.match(SPELLML_HEADER, 0)) { sal_Int16 nLang = LinguLocaleToLanguage( rLocale ); // postprocess result for errors that should be ignored @@ -529,7 +529,7 @@ OUString SAL_CALL SpellChecker::getServiceDisplayName( const Locale& /*rLocale*/ throw(RuntimeException) { MutexGuard aGuard( GetLinguMutex() ); - return A2OU( "Hunspell SpellChecker" ); + return OUString( "Hunspell SpellChecker" ); } @@ -643,7 +643,7 @@ Sequence< OUString > SpellChecker::getSupportedServiceNames_Static() MutexGuard aGuard( GetLinguMutex() ); Sequence< OUString > aSNS( 1 ); // auch mehr als 1 Service moeglich - aSNS.getArray()[0] = A2OU( SN_SPELLCHECKER ); + aSNS.getArray()[0] = SN_SPELLCHECKER; return aSNS; } diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.hxx b/lingucomponent/source/spellcheck/spell/sspellimp.hxx index e19e06814081..c04cc01587e9 100644 --- a/lingucomponent/source/spellcheck/spell/sspellimp.hxx +++ b/lingucomponent/source/spellcheck/spell/sspellimp.hxx @@ -122,7 +122,7 @@ public: inline OUString SpellChecker::getImplementationName_Static() throw() { - return A2OU( "org.openoffice.lingu.MySpellSpellChecker" ); + return OUString( "org.openoffice.lingu.MySpellSpellChecker" ); } diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx index c4d0a7610b84..96cc46b8f208 100644 --- a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx +++ b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx @@ -147,8 +147,8 @@ Sequence< Locale > SAL_CALL Thesaurus::getLocales() // get list of dictionaries-to-use std::list< SvtLinguConfigDictionaryEntry > aDics; uno::Sequence< rtl::OUString > aFormatList; - aLinguCfg.GetSupportedDictionaryFormatsFor( A2OU("Thesauri"), - A2OU("org.openoffice.lingu.new.Thesaurus"), aFormatList ); + aLinguCfg.GetSupportedDictionaryFormatsFor( "Thesauri", + "org.openoffice.lingu.new.Thesaurus", aFormatList ); sal_Int32 nLen = aFormatList.getLength(); for (sal_Int32 i = 0; i < nLen; ++i) { @@ -334,8 +334,8 @@ Sequence < Reference < ::com::sun::star::linguistic2::XMeaning > > SAL_CALL Thes // open up and intialize this thesaurus if need be if (!aThes[i]) { - OUString datpath = aTNames[i] + A2OU(".dat"); - OUString idxpath = aTNames[i] + A2OU(".idx"); + OUString datpath = aTNames[i] + ".dat"; + OUString idxpath = aTNames[i] + ".idx"; OUString ndat; OUString nidx; osl::FileBase::getSystemPathFromFileURL(datpath,ndat); @@ -391,8 +391,8 @@ Sequence < Reference < ::com::sun::star::linguistic2::XMeaning > > SAL_CALL Thes if (stem) { - xTmpRes2 = xSpell->spell( A2OU("<?xml?><query type='analyze'><word>") + - pTerm + A2OU("</word></query>"), nLanguage, rProperties ); + xTmpRes2 = xSpell->spell( "<?xml?><query type='analyze'><word>" + + pTerm + "</word></query>", nLanguage, rProperties ); if (xTmpRes2.is()) { Sequence<OUString>seq = xTmpRes2->getAlternatives(); @@ -422,7 +422,7 @@ Sequence < Reference < ::com::sun::star::linguistic2::XMeaning > > SAL_CALL Thes if (catpos > 2) { // remove category name for affixation and casing - catst = A2OU(" ") + sTerm.copy(catpos); + catst = " " + sTerm.copy(catpos); sTerm = sTerm.copy(0, catpos); sTerm = sTerm.trim(); } @@ -430,8 +430,8 @@ Sequence < Reference < ::com::sun::star::linguistic2::XMeaning > > SAL_CALL Thes if (stem && stem2) { Reference< XSpellAlternatives > xTmpRes; - xTmpRes = xSpell->spell( A2OU("<?xml?><query type='generate'><word>") + - sTerm + A2OU("</word>") + codeTerm + A2OU("</query>"), nLanguage, rProperties ); + xTmpRes = xSpell->spell( "<?xml?><query type='generate'><word>" + + sTerm + "</word>" + codeTerm + "</query>", nLanguage, rProperties ); if (xTmpRes.is()) { Sequence<OUString>seq = xTmpRes->getAlternatives(); @@ -485,11 +485,11 @@ Sequence < Reference < ::com::sun::star::linguistic2::XMeaning > > SAL_CALL Thes stem = 1; xSpell = uno::Reference< XSpellChecker1 >( xLngSvcMgr->getSpellChecker(), UNO_QUERY ); - if (!xSpell.is() || !xSpell->isValid( A2OU(SPELLML_SUPPORT), nLanguage, rProperties )) + if (!xSpell.is() || !xSpell->isValid( SPELLML_SUPPORT, nLanguage, rProperties )) return noMeanings; Reference< XSpellAlternatives > xTmpRes; - xTmpRes = xSpell->spell( A2OU("<?xml?><query type='stem'><word>") + - rTerm + A2OU("</word></query>"), nLanguage, rProperties ); + xTmpRes = xSpell->spell( "<?xml?><query type='stem'><word>" + + rTerm + "</word></query>", nLanguage, rProperties ); if (xTmpRes.is()) { Sequence<OUString>seq = xTmpRes->getAlternatives(); @@ -505,8 +505,8 @@ Sequence < Reference < ::com::sun::star::linguistic2::XMeaning > > SAL_CALL Thes sal_Int32 pos = rTerm.lastIndexOf(' '); if (!pos) return noMeanings; - xTmpRes = xSpell->spell( A2OU("<?xml?><query type='stem'><word>") + - rTerm.copy(pos + 1) + A2OU("</word></query>"), nLanguage, rProperties ); + xTmpRes = xSpell->spell( "<?xml?><query type='stem'><word>" + + rTerm.copy(pos + 1) + "</word></query>", nLanguage, rProperties ); if (xTmpRes.is()) { Sequence<OUString>seq = xTmpRes->getAlternatives(); @@ -543,7 +543,7 @@ OUString SAL_CALL Thesaurus::getServiceDisplayName( const Locale& /*rLocale*/ ) throw(RuntimeException) { MutexGuard aGuard( GetLinguMutex() ); - return A2OU( "OpenOffice.org New Thesaurus" ); + return OUString( "OpenOffice.org New Thesaurus" ); } @@ -689,7 +689,7 @@ Sequence< OUString > Thesaurus::getSupportedServiceNames_Static() MutexGuard aGuard( GetLinguMutex() ); Sequence< OUString > aSNS( 1 ); // auch mehr als 1 Service moeglich - aSNS.getArray()[0] = A2OU( SN_THESAURUS ); + aSNS.getArray()[0] = SN_THESAURUS; return aSNS; } diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.hxx b/lingucomponent/source/thesaurus/libnth/nthesimp.hxx index b3d4c5f5da41..c12ea6993e2d 100644 --- a/lingucomponent/source/thesaurus/libnth/nthesimp.hxx +++ b/lingucomponent/source/thesaurus/libnth/nthesimp.hxx @@ -149,7 +149,7 @@ private: inline OUString Thesaurus::getImplementationName_Static() throw() { - return A2OU( "org.openoffice.lingu.new.Thesaurus" ); + return OUString( "org.openoffice.lingu.new.Thesaurus" ); } diff --git a/linguistic/inc/linguistic/misc.hxx b/linguistic/inc/linguistic/misc.hxx index 8b54d2889d4f..df5e1eedc78c 100644 --- a/linguistic/inc/linguistic/misc.hxx +++ b/linguistic/inc/linguistic/misc.hxx @@ -64,9 +64,6 @@ class LocaleDataWrapper; namespace linguistic { -// ascii to OUString conversion -#define A2OU(x) ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( x )) - /// Flags to be used with the multi-path related functions /// @see GetDictionaryPaths #define PATH_FLAG_INTERNAL 0x01 diff --git a/linguistic/source/convdic.hxx b/linguistic/source/convdic.hxx index 13729687f2d3..5beb83f859b7 100644 --- a/linguistic/source/convdic.hxx +++ b/linguistic/source/convdic.hxx @@ -155,7 +155,7 @@ public: inline ::rtl::OUString ConvDic::getImplementationName_Static() throw() { - return A2OU( "com.sun.star.lingu2.ConvDic" ); + return OUString( "com.sun.star.lingu2.ConvDic" ); } diff --git a/linguistic/source/convdiclist.hxx b/linguistic/source/convdiclist.hxx index bc526facc5c3..437c0a153078 100644 --- a/linguistic/source/convdiclist.hxx +++ b/linguistic/source/convdiclist.hxx @@ -102,7 +102,7 @@ public: inline ::rtl::OUString ConvDicList::getImplementationName_Static() throw() { - return A2OU( "com.sun.star.lingu2.ConvDicList" ); + return OUString( "com.sun.star.lingu2.ConvDicList" ); } diff --git a/linguistic/source/convdicxml.cxx b/linguistic/source/convdicxml.cxx index 2daa2c88537f..7b6f71ea6e48 100644 --- a/linguistic/source/convdicxml.cxx +++ b/linguistic/source/convdicxml.cxx @@ -67,9 +67,9 @@ static const OUString ConversionTypeToText( sal_Int16 nConversionType ) { OUString aRes; if (nConversionType == ConversionDictionaryType::HANGUL_HANJA) - aRes = A2OU( CONV_TYPE_HANGUL_HANJA ); + aRes = CONV_TYPE_HANGUL_HANJA; else if (nConversionType == ConversionDictionaryType::SCHINESE_TCHINESE) - aRes = A2OU( CONV_TYPE_SCHINESE_TCHINESE ); + aRes = CONV_TYPE_SCHINESE_TCHINESE; return aRes; } @@ -317,8 +317,8 @@ sal_Bool ConvDicXMLExport::Export() sal_uInt32 ConvDicXMLExport::exportDoc( enum ::xmloff::token::XMLTokenEnum /*eClass*/ ) { - _GetNamespaceMap().Add( A2OU( "tcd" ), - A2OU( XML_NAMESPACE_TCD_STRING ), XML_NAMESPACE_TCD ); + _GetNamespaceMap().Add( "tcd", + XML_NAMESPACE_TCD_STRING, XML_NAMESPACE_TCD ); GetDocHandler()->startDocument(); @@ -389,7 +389,7 @@ void ConvDicXMLExport::_ExportContent() ::rtl::OUString SAL_CALL ConvDicXMLExport::getImplementationName() throw( uno::RuntimeException ) { - return A2OU( "com.sun.star.lingu2.ConvDicXMLExport" ); + return OUString( "com.sun.star.lingu2.ConvDicXMLExport" ); } @@ -397,8 +397,8 @@ void SAL_CALL ConvDicXMLImport::startDocument(void) throw( xml::sax::SAXException, uno::RuntimeException ) { // register namespace at first possible opportunity - GetNamespaceMap().Add( A2OU( "tcd" ), - A2OU( XML_NAMESPACE_TCD_STRING ), XML_NAMESPACE_TCD ); + GetNamespaceMap().Add( "tcd", + XML_NAMESPACE_TCD_STRING, XML_NAMESPACE_TCD ); SvXMLImport::startDocument(); } @@ -425,7 +425,7 @@ SvXMLImportContext * ConvDicXMLImport::CreateContext( OUString SAL_CALL ConvDicXMLImport::getImplementationName() throw( uno::RuntimeException ) { - return A2OU( "com.sun.star.lingu2.ConvDicXMLImport" ); + return OUString( "com.sun.star.lingu2.ConvDicXMLImport" ); } diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx index 231779b8e7dd..1adb901b74e9 100644 --- a/linguistic/source/dicimp.cxx +++ b/linguistic/source/dicimp.cxx @@ -1059,7 +1059,7 @@ void DicEntry::splitDicFileWord(const OUString &rDicFileWord, { MutexGuard aGuard( GetLinguMutex() ); - static const OUString aDelim( A2OU( "==" ) ); + static const OUString aDelim( "==" ); sal_Int32 nDelimPos = rDicFileWord.indexOf( aDelim ); if (-1 != nDelimPos) diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx index 5e1b1ffe35b0..ba9c6a34a004 100644 --- a/linguistic/source/dlistimp.cxx +++ b/linguistic/source/dlistimp.cxx @@ -667,7 +667,7 @@ void DicList::_CreateDicList() // create IgnoreAllList dictionary with empty URL (non persistent) // and add it to list - rtl::OUString aDicName( A2OU( "IgnoreAllList" ) ); + rtl::OUString aDicName( "IgnoreAllList" ); uno::Reference< XDictionary > xIgnAll( createDictionary( aDicName, LinguLanguageToLocale( LANGUAGE_NONE ), DictionaryType_POSITIVE, rtl::OUString() ) ); @@ -772,7 +772,7 @@ uno::Sequence< rtl::OUString > DicList::getSupportedServiceNames_Static() throw( osl::MutexGuard aGuard( GetLinguMutex() ); uno::Sequence< rtl::OUString > aSNS( 1 ); // more than 1 service possible - aSNS.getArray()[0] = A2OU( SN_DICTIONARY_LIST ); + aSNS.getArray()[0] = SN_DICTIONARY_LIST; return aSNS; } diff --git a/linguistic/source/dlistimp.hxx b/linguistic/source/dlistimp.hxx index a058f41e8357..f00c20337043 100644 --- a/linguistic/source/dlistimp.hxx +++ b/linguistic/source/dlistimp.hxx @@ -132,7 +132,7 @@ public: inline ::rtl::OUString DicList::getImplementationName_Static() throw() { - return A2OU( "com.sun.star.lingu2.DicList" ); + return OUString( "com.sun.star.lingu2.DicList" ); } diff --git a/linguistic/source/hhconvdic.cxx b/linguistic/source/hhconvdic.cxx index 2f5a54934fda..96cdc7e28524 100644 --- a/linguistic/source/hhconvdic.cxx +++ b/linguistic/source/hhconvdic.cxx @@ -143,8 +143,8 @@ uno::Sequence< OUString > HHConvDic::getSupportedServiceNames_Static() throw() { uno::Sequence< OUString > aSNS( 2 ); - aSNS.getArray()[0] = A2OU( SN_CONV_DICTIONARY ); - aSNS.getArray()[1] = A2OU( SN_HH_CONV_DICTIONARY ); + aSNS.getArray()[0] = SN_CONV_DICTIONARY; + aSNS.getArray()[1] = SN_HH_CONV_DICTIONARY; return aSNS; } diff --git a/linguistic/source/hhconvdic.hxx b/linguistic/source/hhconvdic.hxx index b3717f8ac7c3..0a1257b4e302 100644 --- a/linguistic/source/hhconvdic.hxx +++ b/linguistic/source/hhconvdic.hxx @@ -60,7 +60,7 @@ public: inline ::rtl::OUString HHConvDic::getImplementationName_Static() throw() { - return A2OU( "com.sun.star.lingu2.HHConvDic" ); + return OUString( "com.sun.star.lingu2.HHConvDic" ); } diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx index 856866165b06..aff53c3171d3 100644 --- a/linguistic/source/lngopt.cxx +++ b/linguistic/source/lngopt.cxx @@ -459,7 +459,7 @@ uno::Sequence< OUString > LinguProps::getSupportedServiceNames_Static() MutexGuard aGuard( GetLinguMutex() ); uno::Sequence< OUString > aSNS( 1 ); // more than 1 service possible - aSNS.getArray()[0] = A2OU( SN_LINGU_PROPERTIES ); + aSNS.getArray()[0] = SN_LINGU_PROPERTIES; return aSNS; } diff --git a/linguistic/source/lngopt.hxx b/linguistic/source/lngopt.hxx index 7d109e231b99..949692e24388 100644 --- a/linguistic/source/lngopt.hxx +++ b/linguistic/source/lngopt.hxx @@ -151,7 +151,7 @@ public: inline ::rtl::OUString LinguProps::getImplementationName_Static() throw() { - return A2OU( "com.sun.star.lingu2.LinguProps" ); + return OUString( "com.sun.star.lingu2.LinguProps" ); } diff --git a/linguistic/source/lngsvcmgr.hxx b/linguistic/source/lngsvcmgr.hxx index 91de15e7f5c7..192b98ef6ad8 100644 --- a/linguistic/source/lngsvcmgr.hxx +++ b/linguistic/source/lngsvcmgr.hxx @@ -185,7 +185,7 @@ public: inline ::rtl::OUString LngSvcMgr::getImplementationName_Static() { - return A2OU( "com.sun.star.lingu2.LngSvcMgr" ); + return OUString( "com.sun.star.lingu2.LngSvcMgr" ); } diff --git a/linguistic/source/misc.cxx b/linguistic/source/misc.cxx index cf590d5119f7..266013188728 100644 --- a/linguistic/source/misc.cxx +++ b/linguistic/source/misc.cxx @@ -425,7 +425,7 @@ sal_Bool IsReadOnly( const String &rURL, sal_Bool *pbExist ) bExists = aContent.isDocument(); if (bExists) { - Any aAny( aContent.getPropertyValue( A2OU( "IsReadOnly" ) ) ); + Any aAny( aContent.getPropertyValue( "IsReadOnly" ) ); aAny >>= bRes; } } @@ -790,7 +790,7 @@ uno::Reference< XDictionary > GetIgnoreAllList() uno::Reference< XDictionary > xRes; uno::Reference< XDictionaryList > xDL( GetDictionaryList() ); if (xDL.is()) - xRes = xDL->getDictionaryByName( A2OU("IgnoreAllList") ); + xRes = xDL->getDictionaryByName( "IgnoreAllList" ); return xRes; } diff --git a/linguistic/source/misc2.cxx b/linguistic/source/misc2.cxx index f7e1794a457e..a4ef6d9dbb74 100644 --- a/linguistic/source/misc2.cxx +++ b/linguistic/source/misc2.cxx @@ -84,7 +84,7 @@ static uno::Sequence< rtl::OUString > GetMultiPaths_Impl( aWriteable.AppendAscii( "_writable" ); uno::Reference< beans::XPropertySet > xPathSettings( xMgr->createInstance( - A2OU( "com.sun.star.util.PathSettings" ) ), uno::UNO_QUERY_THROW ); + "com.sun.star.util.PathSettings" ), uno::UNO_QUERY_THROW ); xPathSettings->getPropertyValue( aInternal ) >>= aInternalPaths; xPathSettings->getPropertyValue( aUser ) >>= aUserPaths; xPathSettings->getPropertyValue( aWriteable ) >>= aWritablePath; @@ -128,7 +128,7 @@ static uno::Sequence< rtl::OUString > GetMultiPaths_Impl( rtl::OUString GetDictionaryWriteablePath() { - uno::Sequence< rtl::OUString > aPaths( GetMultiPaths_Impl( A2OU("Dictionary"), PATH_FLAG_WRITABLE ) ); + uno::Sequence< rtl::OUString > aPaths( GetMultiPaths_Impl( "Dictionary", PATH_FLAG_WRITABLE ) ); DBG_ASSERT( aPaths.getLength() == 1, "Dictionary_writable path corrupted?" ); String aRes; if (aPaths.getLength() > 0) @@ -138,7 +138,7 @@ rtl::OUString GetDictionaryWriteablePath() uno::Sequence< rtl::OUString > GetDictionaryPaths( sal_Int16 nPathFlags ) { - return GetMultiPaths_Impl( A2OU("Dictionary"), nPathFlags ); + return GetMultiPaths_Impl( "Dictionary", nPathFlags ); } String GetWritableDictionaryURL( const String &rDicName ) diff --git a/linguistic/workben/sprophelp.cxx b/linguistic/workben/sprophelp.cxx index 7360aebc92c4..636866fd2deb 100644 --- a/linguistic/workben/sprophelp.cxx +++ b/linguistic/workben/sprophelp.cxx @@ -40,8 +40,6 @@ using namespace linguistic; using ::rtl::OUString; -#define A2OU(x) ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( x )) - PropertyChgHelper::PropertyChgHelper( @@ -191,32 +189,32 @@ PropertyHelper_Spell::PropertyHelper_Spell( sal_Bool *pbVal = NULL, *pbResVal = NULL; - if (A2OU( UPN_IS_GERMAN_PRE_REFORM ) == pPropName[i]) + if (OUString( UPN_IS_GERMAN_PRE_REFORM ) == pPropName[i]) { pbVal = &bIsGermanPreReform; pbResVal = &bResIsGermanPreReform; } - else if (A2OU( UPN_IS_IGNORE_CONTROL_CHARACTERS ) == pPropName[i]) + else if (OUString( UPN_IS_IGNORE_CONTROL_CHARACTERS ) == pPropName[i]) { pbVal = &bIsIgnoreControlCharacters; pbResVal = &bResIsIgnoreControlCharacters; } - else if (A2OU( UPN_IS_USE_DICTIONARY_LIST ) == pPropName[i]) + else if (OUString( UPN_IS_USE_DICTIONARY_LIST ) == pPropName[i]) { pbVal = &bIsUseDictionaryList; pbResVal = &bResIsUseDictionaryList; } - else if (A2OU( UPN_IS_SPELL_UPPER_CASE ) == pPropName[i]) + else if (OUString( UPN_IS_SPELL_UPPER_CASE ) == pPropName[i]) { pbVal = &bIsSpellUpperCase; pbResVal = &bResIsSpellUpperCase; } - else if (A2OU( UPN_IS_SPELL_WITH_DIGITS ) == pPropName[i]) + else if (OUString( UPN_IS_SPELL_WITH_DIGITS ) == pPropName[i]) { pbVal = &bIsSpellWithDigits; pbResVal = &bResIsSpellWithDigits; } - else if (A2OU( UPN_IS_SPELL_CAPITALIZATION ) == pPropName[i]) + else if (OUString( UPN_IS_SPELL_CAPITALIZATION ) == pPropName[i]) { pbVal = &bIsSpellCapitalization; pbResVal = &bResIsSpellCapitalization; diff --git a/linguistic/workben/sspellimp.cxx b/linguistic/workben/sspellimp.cxx index 003ceab5021a..067f9b60f71d 100644 --- a/linguistic/workben/sspellimp.cxx +++ b/linguistic/workben/sspellimp.cxx @@ -90,9 +90,9 @@ Sequence< Locale > SAL_CALL SpellChecker::getLocales() { aSuppLocales.realloc( 3 ); Locale *pLocale = aSuppLocales.getArray(); - pLocale[0] = Locale( A2OU("en"), A2OU("US"), OUString() ); - pLocale[1] = Locale( A2OU("de"), A2OU("DE"), OUString() ); - pLocale[2] = Locale( A2OU("de"), A2OU("CH"), OUString() ); + pLocale[0] = Locale( "en", "US", OUString() ); + pLocale[1] = Locale( "de", "DE", OUString() ); + pLocale[2] = Locale( "de", "CH"), OUString() ); } return aSuppLocales; @@ -218,7 +218,7 @@ Reference< XSpellAlternatives > if (STRING_NOTFOUND != aTmp.SearchAscii( "liss" )) { - aTmp.SearchAndReplaceAllAscii( "liss", A2OU("liz") ); + aTmp.SearchAndReplaceAllAscii( "liss", "liz" ); xRes = new SpellAlternatives( aTmp, nLang, SpellFailure::IS_NEGATIVE_WORD, ::com::sun::star::uno::Sequence< ::rtl::OUString >() ); } @@ -334,7 +334,7 @@ OUString SAL_CALL throw(RuntimeException) { MutexGuard aGuard( GetLinguMutex() ); - return A2OU( "OpenOffice example spellchecker" ); + return OUString( "OpenOffice example spellchecker" ); } @@ -441,7 +441,7 @@ Sequence< OUString > SpellChecker::getSupportedServiceNames_Static() MutexGuard aGuard( GetLinguMutex() ); Sequence< OUString > aSNS( 1 ); // more than 1 service possible - aSNS.getArray()[0] = A2OU( SN_SPELLCHECKER ); + aSNS.getArray()[0] = SN_SPELLCHECKER; return aSNS; } diff --git a/sccomp/source/solver/solver.cxx b/sccomp/source/solver/solver.cxx index 8e92c9ab9c96..660a8060ea6e 100644 --- a/sccomp/source/solver/solver.cxx +++ b/sccomp/source/solver/solver.cxx @@ -62,7 +62,7 @@ using namespace com::sun::star; using ::rtl::OUString; -#define C2U(constAsciiStr) (::rtl::OUString( constAsciiStr )) +#define constAsciiStr (::rtl::OUString( constAsciiStr )) #define STR_NONNEGATIVE "NonNegative" #define STR_INTEGER "Integer" @@ -161,11 +161,11 @@ SolverComponent::SolverComponent( const uno::Reference<uno::XComponentContext>& mfResultValue( 0.0 ) { // for XPropertySet implementation: - registerProperty( C2U(STR_NONNEGATIVE), PROP_NONNEGATIVE, 0, &mbNonNegative, getCppuType( &mbNonNegative ) ); - registerProperty( C2U(STR_INTEGER), PROP_INTEGER, 0, &mbInteger, getCppuType( &mbInteger ) ); - registerProperty( C2U(STR_TIMEOUT), PROP_TIMEOUT, 0, &mnTimeout, getCppuType( &mnTimeout ) ); - registerProperty( C2U(STR_EPSILONLEVEL), PROP_EPSILONLEVEL, 0, &mnEpsilonLevel, getCppuType( &mnEpsilonLevel ) ); - registerProperty( C2U(STR_LIMITBBDEPTH), PROP_LIMITBBDEPTH, 0, &mbLimitBBDepth, getCppuType( &mbLimitBBDepth ) ); + registerProperty( STR_NONNEGATIVE, PROP_NONNEGATIVE, 0, &mbNonNegative, getCppuType( &mbNonNegative ) ); + registerProperty( STR_INTEGER, PROP_INTEGER, 0, &mbInteger, getCppuType( &mbInteger ) ); + registerProperty( STR_TIMEOUT, PROP_TIMEOUT, 0, &mnTimeout, getCppuType( &mnTimeout ) ); + registerProperty( STR_EPSILONLEVEL, PROP_EPSILONLEVEL, 0, &mnEpsilonLevel, getCppuType( &mnEpsilonLevel ) ); + registerProperty( STR_LIMITBBDEPTH, PROP_LIMITBBDEPTH, 0, &mbLimitBBDepth, getCppuType( &mbLimitBBDepth ) ); } SolverComponent::~SolverComponent() diff --git a/scripting/source/basprov/basprov.cxx b/scripting/source/basprov/basprov.cxx index 750394524161..30743ec0fb7a 100644 --- a/scripting/source/basprov/basprov.cxx +++ b/scripting/source/basprov/basprov.cxx @@ -258,7 +258,7 @@ namespace basprov ); } - ::rtl::OUString sDoc = OUSTR("vnd.sun.star.tdoc"); + ::rtl::OUString sDoc = "vnd.sun.star.tdoc"; if ( m_sScriptingContext.indexOf( sDoc ) == 0 ) { xModel = MiscUtils::tDocUrlToModel( m_sScriptingContext ); @@ -330,7 +330,7 @@ namespace basprov errorMsg = errorMsg.concat( scriptURI ); throw provider::ScriptFrameworkErrorException( errorMsg, Reference< XInterface >(), - scriptURI, OUSTR("Basic"), + scriptURI, "Basic", provider::ScriptFrameworkErrorType::MALFORMED_URL ); } @@ -422,7 +422,7 @@ namespace basprov throw provider::ScriptFrameworkErrorException( aMessage.makeStringAndClear(), Reference< XInterface >(), - scriptURI, OUSTR("Basic"), + scriptURI, "Basic", provider::ScriptFrameworkErrorType::NO_SUCH_SCRIPT ); } diff --git a/scripting/source/inc/util/MiscUtils.hxx b/scripting/source/inc/util/MiscUtils.hxx index 657355c9aaf5..e78071c18eee 100644 --- a/scripting/source/inc/util/MiscUtils.hxx +++ b/scripting/source/inc/util/MiscUtils.hxx @@ -55,7 +55,7 @@ public: return result; } css::uno::Reference < css::ucb::XSimpleFileAccess3 > xSFA( css::ucb::SimpleFileAccess::create(xCtx) ); - result = xSFA->getFolderContents( OUSTR("vnd.sun.star.tdoc:/"), true ); + result = xSFA->getFolderContents( "vnd.sun.star.tdoc:/", true ); } catch ( css::uno::Exception& ) { @@ -111,7 +111,7 @@ public: try { ::ucbhelper::Content root( url, NULL, comphelper::getProcessComponentContext() ); - ::rtl::OUString propName = OUSTR("DocumentModel"); + ::rtl::OUString propName = "DocumentModel"; result = getUCBProperty( root, propName ); } catch ( css::ucb::ContentCreationException& ) diff --git a/scripting/source/inc/util/util.hxx b/scripting/source/inc/util/util.hxx index a6afecca8b02..5dd38b86c85c 100644 --- a/scripting/source/inc/util/util.hxx +++ b/scripting/source/inc/util/util.hxx @@ -21,8 +21,6 @@ #ifndef _COM_SUN_STAR_SCRIPTING_UTIL_UTIL_HXX_ #define _COM_SUN_STAR_SCRIPTING_UTIL_UTIL_HXX_ -#define OUSTR(x) ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(x) ) - #endif //_COM_SUN_STAR_SCRIPTING_UTIL_UTIL_HXX_ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/scripting/source/protocolhandler/scripthandler.cxx b/scripting/source/protocolhandler/scripthandler.cxx index 36ca322e932e..91565ac23975 100644 --- a/scripting/source/protocolhandler/scripthandler.cxx +++ b/scripting/source/protocolhandler/scripthandler.cxx @@ -84,7 +84,7 @@ void SAL_CALL ScriptProtocolHandler::initialize( if ( aArguments.getLength() && sal_False == ( aArguments[ 0 ] >>= m_xFrame ) ) { - ::rtl::OUString temp = OUSTR( "ScriptProtocolHandler::initialize: could not extract reference to the frame" ); + ::rtl::OUString temp = "ScriptProtocolHandler::initialize: could not extract reference to the frame"; throw RuntimeException( temp, Reference< XInterface >() ); } @@ -396,12 +396,12 @@ void ScriptProtocolHandler::createScriptProvider() } catch ( const RuntimeException & e ) { - ::rtl::OUString temp = OUSTR( "ScriptProtocolHandler::createScriptProvider(), " ); + ::rtl::OUString temp = "ScriptProtocolHandler::createScriptProvider(), "; throw RuntimeException( temp.concat( e.Message ), Reference< XInterface >() ); } catch ( const Exception & e ) { - ::rtl::OUString temp = OUSTR( "ScriptProtocolHandler::createScriptProvider: " ); + ::rtl::OUString temp = "ScriptProtocolHandler::createScriptProvider: "; throw RuntimeException( temp.concat( e.Message ), Reference< XInterface >() ); } } diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.cxx b/scripting/source/provider/BrowseNodeFactoryImpl.cxx index 978a44c64138..5b3191625d4f 100644 --- a/scripting/source/provider/BrowseNodeFactoryImpl.cxx +++ b/scripting/source/provider/BrowseNodeFactoryImpl.cxx @@ -312,7 +312,7 @@ Sequence< Reference< browse::XBrowseNode > > getAllBrowseNodes( const Reference< { xFac.set( xCtx->getValueByName( - OUSTR("/singletons/com.sun.star.script.provider.theMasterScriptProviderFactory") ), UNO_QUERY_THROW ); + "/singletons/com.sun.star.script.provider.theMasterScriptProviderFactory" ), UNO_QUERY_THROW ); locnBNs[ mspIndex++ ] = Reference< browse::XBrowseNode >( xFac->createScriptProvider( makeAny( ::rtl::OUString("user") ) ), UNO_QUERY_THROW ); locnBNs[ mspIndex++ ] = Reference< browse::XBrowseNode >( xFac->createScriptProvider( makeAny( ::rtl::OUString("share") ) ), UNO_QUERY_THROW ); @@ -687,7 +687,7 @@ BrowseNodeFactoryImpl::createView( sal_Int16 viewType ) case browse::BrowseNodeFactoryViewTypes::MACROORGANIZER: return getOrganizerHierarchy(); default: - throw RuntimeException( OUSTR("Unknown view type" ), Reference< XInterface >() ); + throw RuntimeException( "Unknown view type", Reference< XInterface >() ); } } diff --git a/scripting/source/provider/MasterScriptProvider.cxx b/scripting/source/provider/MasterScriptProvider.cxx index 4362330c7b6b..ff7a13844e31 100644 --- a/scripting/source/provider/MasterScriptProvider.cxx +++ b/scripting/source/provider/MasterScriptProvider.cxx @@ -116,7 +116,7 @@ throw ( Exception, RuntimeException ) if ( len > 1 ) { throw RuntimeException( - OUSTR( "MasterScriptProvider::initialize: invalid number of arguments" ), + "MasterScriptProvider::initialize: invalid number of arguments", Reference< XInterface >() ); } @@ -185,7 +185,7 @@ throw ( Exception, RuntimeException ) invokeArgs[ 0 ] <<= m_sCtxString; } - ::rtl::OUString pkgSpec = OUSTR("uno_packages"); + ::rtl::OUString pkgSpec = "uno_packages"; sal_Int32 indexOfPkgSpec = m_sCtxString.lastIndexOf( pkgSpec ); // if contex string ends with "uno_packages" @@ -221,12 +221,12 @@ void MasterScriptProvider::createPkgProvider() try { Any location; - ::rtl::OUString sPkgCtx = m_sCtxString.concat( OUSTR(":uno_packages") ); + ::rtl::OUString sPkgCtx = m_sCtxString.concat( ":uno_packages" ); location <<= sPkgCtx; Reference< provider::XScriptProviderFactory > xFac( m_xContext->getValueByName( - OUSTR( "/singletons/com.sun.star.script.provider.theMasterScriptProviderFactory") ), UNO_QUERY_THROW ); + "/singletons/com.sun.star.script.provider.theMasterScriptProviderFactory" ), UNO_QUERY_THROW ); m_xMSPPkg.set( xFac->createScriptProvider( location ), UNO_QUERY_THROW ); @@ -252,8 +252,8 @@ throw ( provider::ScriptFrameworkErrorException, if ( !isValid() ) { throw provider::ScriptFrameworkErrorException( - OUSTR( "MasterScriptProvider not initialised" ), Reference< XInterface >(), - scriptURI, OUSTR(""), + "MasterScriptProvider not initialised", Reference< XInterface >(), + scriptURI, "", provider::ScriptFrameworkErrorType::UNKNOWN ); } @@ -268,11 +268,11 @@ throw ( provider::ScriptFrameworkErrorException, if ( !uriRef.is() || !sfUri.is() ) { - ::rtl::OUString errorMsg = OUSTR( "Incorrect format for Script URI: " ); + ::rtl::OUString errorMsg = "Incorrect format for Script URI: "; errorMsg = errorMsg.concat( scriptURI ); throw provider::ScriptFrameworkErrorException( errorMsg, Reference< XInterface >(), - scriptURI, OUSTR(""), + scriptURI, "", provider::ScriptFrameworkErrorType::UNKNOWN ); } @@ -283,11 +283,11 @@ throw ( provider::ScriptFrameworkErrorException, sfUri->hasParameter( locKey ) == sal_False || ( sfUri->getName().isEmpty() ) ) { - ::rtl::OUString errorMsg = OUSTR( "Incorrect format for Script URI: " ); + ::rtl::OUString errorMsg = "Incorrect format for Script URI: "; errorMsg = errorMsg.concat( scriptURI ); throw provider::ScriptFrameworkErrorException( errorMsg, Reference< XInterface >(), - scriptURI, OUSTR(""), + scriptURI, "", provider::ScriptFrameworkErrorType::UNKNOWN ); } @@ -322,11 +322,11 @@ throw ( provider::ScriptFrameworkErrorException, // ** Special case is BASIC, all calls to getScript will be handled // by the language script provider in the current location context // even if its different - if ( ( location.equals( OUSTR( "document" ) ) + if ( ( location.equals( "document" ) && m_xModel.is() ) || ( endsWith( m_sCtxString, location ) ) - || ( language.equals( OUSTR( "Basic" ) ) ) + || ( language.equals( "Basic" ) ) ) { Reference< provider::XScriptProvider > xScriptProvider; @@ -353,7 +353,7 @@ throw ( provider::ScriptFrameworkErrorException, else { throw provider::ScriptFrameworkErrorException( - OUSTR( "No LanguageProviders detected" ), + "No LanguageProviders detected", Reference< XInterface >(), sfUri->getName(), language, provider::ScriptFrameworkErrorType::NOTSUPPORTED ); @@ -364,7 +364,7 @@ throw ( provider::ScriptFrameworkErrorException, { Reference< provider::XScriptProviderFactory > xFac_( m_xContext->getValueByName( - OUSTR( "/singletons/com.sun.star.script.provider.theMasterScriptProviderFactory") ), UNO_QUERY_THROW ); + "/singletons/com.sun.star.script.provider.theMasterScriptProviderFactory" ), UNO_QUERY_THROW ); Reference< provider::XScriptProvider > xSP( xFac_->createScriptProvider( makeAny( location ) ), UNO_QUERY_THROW ); @@ -389,7 +389,7 @@ MasterScriptProvider::providerCache() ::osl::MutexGuard aGuard( m_mutex ); if ( !m_pPCache ) { - ::rtl::OUString serviceName1 = OUSTR("com.sun.star.script.provider.ScriptProviderForBasic"); + ::rtl::OUString serviceName1 = "com.sun.star.script.provider.ScriptProviderForBasic"; Sequence< ::rtl::OUString > blacklist(1); blacklist[ 0 ] = serviceName1; @@ -415,7 +415,7 @@ MasterScriptProvider::getName() if ( !isPkgProvider() ) { ::rtl::OUString sCtx = getContextString(); - if ( sCtx.indexOf( OUSTR( "vnd.sun.star.tdoc" ) ) == 0 ) + if ( sCtx.indexOf( "vnd.sun.star.tdoc" ) == 0 ) { Reference< frame::XModel > xModel = m_xModel; if ( !xModel.is() ) @@ -432,7 +432,7 @@ MasterScriptProvider::getName() } else { - m_sNodeName = OUSTR("uno_packages"); + m_sNodeName = "uno_packages"; } return m_sNodeName; } @@ -510,14 +510,14 @@ MasterScriptProvider::insertByName( const ::rtl::OUString& aName, const Any& aEl if ( !xCont.is() ) { throw RuntimeException( - OUSTR("PackageMasterScriptProvider doesn't implement XNameContainer"), + "PackageMasterScriptProvider doesn't implement XNameContainer", Reference< XInterface >() ); } xCont->insertByName( aName, aElement ); } else { - throw RuntimeException( OUSTR("PackageMasterScriptProvider is unitialised"), + throw RuntimeException( "PackageMasterScriptProvider is unitialised", Reference< XInterface >() ); } @@ -527,12 +527,12 @@ MasterScriptProvider::insertByName( const ::rtl::OUString& aName, const Any& aEl Reference< deployment::XPackage > xPkg( aElement, UNO_QUERY ); if ( !xPkg.is() ) { - throw lang::IllegalArgumentException( OUSTR("Couldn't convert to XPackage"), + throw lang::IllegalArgumentException( "Couldn't convert to XPackage", Reference < XInterface > (), 2 ); } if ( aName.isEmpty() ) { - throw lang::IllegalArgumentException( OUSTR("Name not set!!"), + throw lang::IllegalArgumentException( "Name not set!!", Reference < XInterface > (), 1 ); } // TODO for library pacakge parse the language, for the moment will try @@ -541,8 +541,8 @@ MasterScriptProvider::insertByName( const ::rtl::OUString& aName, const Any& aEl if ( !providerCache() ) { throw RuntimeException( - OUSTR("insertByName cannot instantiate " - "child script providers."), + "insertByName cannot instantiate " + "child script providers.", Reference< XInterface >() ); } Sequence < Reference< provider::XScriptProvider > > xSProviders = @@ -569,7 +569,7 @@ MasterScriptProvider::insertByName( const ::rtl::OUString& aName, const Any& aEl if ( index == xSProviders.getLength() ) { // No script providers could process the package - ::rtl::OUString message = OUSTR("Failed to register package for "); + ::rtl::OUString message = "Failed to register package for "; message = message.concat( aName ); throw lang::IllegalArgumentException( message, Reference < XInterface > (), 2 ); @@ -590,14 +590,14 @@ MasterScriptProvider::removeByName( const ::rtl::OUString& Name ) throw ( contai if ( !xCont.is() ) { throw RuntimeException( - OUSTR("PackageMasterScriptProvider doesn't implement XNameContainer"), + "PackageMasterScriptProvider doesn't implement XNameContainer", Reference< XInterface >() ); } xCont->removeByName( Name ); } else { - throw RuntimeException( OUSTR("PackageMasterScriptProvider is unitialised"), + throw RuntimeException( "PackageMasterScriptProvider is unitialised", Reference< XInterface >() ); } @@ -606,7 +606,7 @@ MasterScriptProvider::removeByName( const ::rtl::OUString& Name ) throw ( contai { if ( Name.isEmpty() ) { - throw lang::IllegalArgumentException( OUSTR("Name not set!!"), + throw lang::IllegalArgumentException( "Name not set!!", Reference < XInterface > (), 1 ); } // TODO for Script library pacakge url parse the language, @@ -616,8 +616,8 @@ MasterScriptProvider::removeByName( const ::rtl::OUString& Name ) throw ( contai if ( !providerCache() ) { throw RuntimeException( - OUSTR("removeByName() cannot instantiate " - "child script providers."), + "removeByName() cannot instantiate " + "child script providers.", Reference< XInterface >() ); } Sequence < Reference< provider::XScriptProvider > > xSProviders = @@ -643,7 +643,7 @@ MasterScriptProvider::removeByName( const ::rtl::OUString& Name ) throw ( contai if ( index == xSProviders.getLength() ) { // No script providers could process the package - ::rtl::OUString message = OUSTR("Failed to revoke package for "); + ::rtl::OUString message = "Failed to revoke package for "; message = message.concat( Name ); throw lang::IllegalArgumentException( message, Reference < XInterface > (), 1 ); @@ -662,7 +662,7 @@ MasterScriptProvider::replaceByName( const ::rtl::OUString& aName, const Any& aE // TODO needs implementing if ( true ) { - throw RuntimeException( OUSTR("replaceByName not implemented!!!!") , + throw RuntimeException( "replaceByName not implemented!!!!" , Reference< XInterface >() ); } } @@ -676,7 +676,7 @@ MasterScriptProvider::getByName( const ::rtl::OUString& aName ) throw ( containe Any result; if ( true ) { - throw RuntimeException( OUSTR("getByName not implemented!!!!") , + throw RuntimeException( "getByName not implemented!!!!" , Reference< XInterface >() ); } return result; @@ -694,7 +694,7 @@ MasterScriptProvider::hasByName( const ::rtl::OUString& aName ) throw (RuntimeEx if ( !xCont.is() ) { throw RuntimeException( - OUSTR("PackageMasterScriptProvider doesn't implement XNameContainer"), + "PackageMasterScriptProvider doesn't implement XNameContainer", Reference< XInterface >() ); } @@ -702,7 +702,7 @@ MasterScriptProvider::hasByName( const ::rtl::OUString& aName ) throw (RuntimeEx } else { - throw RuntimeException( OUSTR("PackageMasterScriptProvider is unitialised"), + throw RuntimeException( "PackageMasterScriptProvider is unitialised", Reference< XInterface >() ); } @@ -711,7 +711,7 @@ MasterScriptProvider::hasByName( const ::rtl::OUString& aName ) throw (RuntimeEx { if ( aName.isEmpty() ) { - throw lang::IllegalArgumentException( OUSTR("Name not set!!"), + throw lang::IllegalArgumentException( "Name not set!!", Reference < XInterface > (), 1 ); } // TODO for Script library pacakge url parse the language, @@ -722,8 +722,8 @@ MasterScriptProvider::hasByName( const ::rtl::OUString& aName ) throw (RuntimeEx if ( !providerCache() ) { throw RuntimeException( - OUSTR("removeByName() cannot instantiate " - "child script providers."), + "removeByName() cannot instantiate " + "child script providers.", Reference< XInterface >() ); } Sequence < Reference< provider::XScriptProvider > > xSProviders = @@ -760,7 +760,7 @@ MasterScriptProvider::getElementNames( ) throw ( RuntimeException) Sequence< ::rtl::OUString > names; if ( true ) { - throw RuntimeException( OUSTR("getElementNames not implemented!!!!") , + throw RuntimeException( "getElementNames not implemented!!!!" , Reference< XInterface >() ); } return names; @@ -779,7 +779,7 @@ sal_Bool SAL_CALL MasterScriptProvider::hasElements( ) throw ( RuntimeException // TODO needs implementing if ( true ) { - throw RuntimeException( OUSTR("hasElements not implemented!!!!") , + throw RuntimeException( "hasElements not implemented!!!!" , Reference< XInterface >() ); } return false; diff --git a/scripting/source/provider/ProviderCache.cxx b/scripting/source/provider/ProviderCache.cxx index 09e760e0e9bd..510597adeaf5 100644 --- a/scripting/source/provider/ProviderCache.cxx +++ b/scripting/source/provider/ProviderCache.cxx @@ -174,9 +174,9 @@ ProviderCache::populateCache() throw ( RuntimeException ) } catch ( const Exception &e ) { - ::rtl::OUString temp = OUSTR( - "ProviderCache::populateCache: couldn't obtain XSingleComponentFactory for " ); - temp = temp.concat( serviceName ); + OUString temp = + "ProviderCache::populateCache: couldn't obtain XSingleComponentFactory for " + + serviceName; throw RuntimeException( temp.concat( e.Message ), Reference< XInterface >() ); } } diff --git a/scripting/source/provider/ScriptImpl.cxx b/scripting/source/provider/ScriptImpl.cxx index b6cd9c15b038..d1c70c5e914d 100644 --- a/scripting/source/provider/ScriptImpl.cxx +++ b/scripting/source/provider/ScriptImpl.cxx @@ -68,14 +68,14 @@ throw ( lang::IllegalArgumentException, script::CannotConvertException, } catch ( const lang::IllegalArgumentException & iae ) { - ::rtl::OUString temp = OUSTR( "ScriptImpl::invoke IllegalArgumentException : " ); + ::rtl::OUString temp = "ScriptImpl::invoke IllegalArgumentException : "; throw lang::IllegalArgumentException( temp.concat( iae.Message ), Reference< XInterface > (), iae.ArgumentPosition ); } catch ( const script::CannotConvertException & cce ) { - ::rtl::OUString temp = OUSTR( "ScriptImpl::invoke CannotConvertException : " ); + ::rtl::OUString temp = "ScriptImpl::invoke CannotConvertException : "; throw script::CannotConvertException( temp.concat( cce.Message ), Reference< XInterface > (), cce.DestinationTypeClass, @@ -84,14 +84,14 @@ throw ( lang::IllegalArgumentException, script::CannotConvertException, } catch ( const reflection::InvocationTargetException & ite ) { - ::rtl::OUString temp = OUSTR( "ScriptImpl::invoke InvocationTargetException : " ); + ::rtl::OUString temp = "ScriptImpl::invoke InvocationTargetException : "; throw reflection::InvocationTargetException( temp.concat( ite.Message ), Reference< XInterface > (), ite.TargetException ); } catch ( const RuntimeException & re ) { - ::rtl::OUString temp = OUSTR( "ScriptImpl::invoke RuntimeException : " ); + ::rtl::OUString temp = "ScriptImpl::invoke RuntimeException : "; throw RuntimeException( temp.concat( re.Message ), Reference< XInterface > () ); } @@ -99,7 +99,7 @@ throw ( lang::IllegalArgumentException, script::CannotConvertException, catch ( ... ) { throw RuntimeException( - OUSTR( "ScriptImpl::invoke Unknown Exception caught - RuntimeException rethrown" ), + "ScriptImpl::invoke Unknown Exception caught - RuntimeException rethrown", Reference< XInterface > () ); } #endif diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx index 9bf043454a58..59d2396c6117 100644 --- a/sdext/source/presenter/PresenterAccessibility.cxx +++ b/sdext/source/presenter/PresenterAccessibility.cxx @@ -48,8 +48,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; using ::rtl::OUString; -#define A2S(s) (::rtl::OUString(s)) - //===== PresenterAccessibleObject ============================================= namespace sdext { namespace presenter { @@ -432,12 +430,12 @@ public: const css::uno::Reference<css::uno::XComponentContext>& rxContext, const lang::Locale aLocale) { - OUString sName (A2S("Presenter Console")); + OUString sName ("Presenter Console"); PresenterConfigurationAccess aConfiguration ( rxContext, OUString("/org.openoffice.Office.PresenterScreen/"), PresenterConfigurationAccess::READ_ONLY); - aConfiguration.GetConfigurationNode(A2S("Presenter/Accessibility/Console/String")) + aConfiguration.GetConfigurationNode("Presenter/Accessibility/Console/String") >>= sName; rtl::Reference<PresenterAccessible::AccessibleObject> pObject ( @@ -461,13 +459,13 @@ public: const Reference<awt::XWindow>& rxContentWindow, const Reference<awt::XWindow>& rxBorderWindow) { - OUString sName (A2S("Presenter Notes Window")); + OUString sName ("Presenter Notes Window"); { PresenterConfigurationAccess aConfiguration ( rxContext, OUString("/org.openoffice.Office.PresenterScreen/"), PresenterConfigurationAccess::READ_ONLY); - aConfiguration.GetConfigurationNode(A2S("Presenter/Accessibility/Preview/String")) + aConfiguration.GetConfigurationNode("Presenter/Accessibility/Preview/String") >>= sName; } @@ -1376,7 +1374,7 @@ void PresenterAccessible::AccessibleObject::ThrowException ( const sal_Char* pMessage, const ExceptionType eExceptionType) const { - const OUString sMessage (OUString(A2S("PresenterAccessible: ")) + OUString::createFromAscii(pMessage)); + const OUString sMessage ("PresenterAccessible: " + OUString::createFromAscii(pMessage)); const Reference<XInterface> xObject ( const_cast<uno::XWeak*>(static_cast<const uno::XWeak*>(this))); switch (eExceptionType) @@ -1407,7 +1405,7 @@ sal_uInt32 AccessibleStateSet::GetStateMask (const sal_Int16 nState) { if (nState<0 || nState>=sal_Int16(sizeof(sal_uInt32)*8)) { - throw RuntimeException(A2S("AccessibleStateSet::GetStateMask: invalid state"), NULL); + throw RuntimeException("AccessibleStateSet::GetStateMask: invalid state", NULL); } return 1<<nState; @@ -1882,13 +1880,13 @@ rtl::Reference<PresenterAccessible::AccessibleObject> AccessibleNotes::Create ( const Reference<awt::XWindow>& rxBorderWindow, const ::boost::shared_ptr<PresenterTextView>& rpTextView) { - OUString sName (A2S("Presenter Notes Text")); + OUString sName ("Presenter Notes Text"); { PresenterConfigurationAccess aConfiguration ( rxContext, OUString("/org.openoffice.Office.PresenterScreen/"), PresenterConfigurationAccess::READ_ONLY); - aConfiguration.GetConfigurationNode(A2S("Presenter/Accessibility/Notes/String")) + aConfiguration.GetConfigurationNode("Presenter/Accessibility/Notes/String") >>= sName; } @@ -1931,7 +1929,7 @@ void AccessibleNotes::SetTextView ( new PresenterAccessible::AccessibleParagraph( css::lang::Locale(), AccessibleRole::PARAGRAPH, - A2S("Paragraph")+OUString::valueOf(nIndex), + "Paragraph"+OUString::valueOf(nIndex), rpTextView->GetParagraph(nIndex), nIndex)); pParagraph->LateInitialization(); diff --git a/sdext/source/presenter/PresenterBitmapContainer.cxx b/sdext/source/presenter/PresenterBitmapContainer.cxx index 30e4eaf25ff9..66d0cf86a25a 100644 --- a/sdext/source/presenter/PresenterBitmapContainer.cxx +++ b/sdext/source/presenter/PresenterBitmapContainer.cxx @@ -33,8 +33,6 @@ using namespace ::com::sun::star::uno; using namespace ::std; using ::rtl::OUString; -#define A2S(pString) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(pString))) - namespace sdext { namespace presenter { //===== PresenterBitmapContainer ============================================== @@ -55,7 +53,7 @@ PresenterBitmapContainer::PresenterBitmapContainer ( // Get access to the configuration. PresenterConfigurationAccess aConfiguration ( rxComponentContext, - A2S("org.openoffice.Office.PresenterScreen"), + "org.openoffice.Office.PresenterScreen", PresenterConfigurationAccess::READ_ONLY); Reference<container::XNameAccess> xBitmapList ( aConfiguration.GetConfigurationNode(rsConfigurationBase), @@ -93,7 +91,7 @@ void PresenterBitmapContainer::Initialize ( return; mxPresenterHelper = Reference<drawing::XPresenterHelper>( xFactory->createInstanceWithContext( - A2S("com.sun.star.drawing.PresenterHelper"), + "com.sun.star.drawing.PresenterHelper", rxComponentContext), UNO_QUERY_THROW); } @@ -178,7 +176,7 @@ void PresenterBitmapContainer::ProcessBitmap ( const Reference<beans::XPropertySet>& rxProperties) { OUString sName; - if ( ! (PresenterConfigurationAccess::GetProperty(rxProperties, A2S("Name")) >>= sName)) + if ( ! (PresenterConfigurationAccess::GetProperty(rxProperties, "Name") >>= sName)) sName = rsKey; maIconContainer[sName] = LoadBitmap( @@ -205,7 +203,7 @@ SharedBitmapDescriptor PresenterBitmapContainer::LoadBitmap ( OUString sFileName; // Load bitmaps. - if (PresenterConfigurationAccess::GetProperty(rxProperties, A2S("NormalFileName")) >>= sFileName) + if (PresenterConfigurationAccess::GetProperty(rxProperties, "NormalFileName") >>= sFileName) try { pBitmap->SetBitmap( @@ -214,7 +212,7 @@ SharedBitmapDescriptor PresenterBitmapContainer::LoadBitmap ( } catch (Exception&) {} - if (PresenterConfigurationAccess::GetProperty(rxProperties, A2S("MouseOverFileName")) >>= sFileName) + if (PresenterConfigurationAccess::GetProperty(rxProperties, "MouseOverFileName") >>= sFileName) try { pBitmap->SetBitmap( @@ -223,7 +221,7 @@ SharedBitmapDescriptor PresenterBitmapContainer::LoadBitmap ( } catch (Exception&) {} - if (PresenterConfigurationAccess::GetProperty(rxProperties, A2S("ButtonDownFileName")) >>= sFileName) + if (PresenterConfigurationAccess::GetProperty(rxProperties, "ButtonDownFileName") >>= sFileName) try { pBitmap->SetBitmap( @@ -232,7 +230,7 @@ SharedBitmapDescriptor PresenterBitmapContainer::LoadBitmap ( } catch (Exception&) {} - if (PresenterConfigurationAccess::GetProperty(rxProperties, A2S("DisabledFileName")) >>= sFileName) + if (PresenterConfigurationAccess::GetProperty(rxProperties, "DisabledFileName") >>= sFileName) try { pBitmap->SetBitmap( @@ -241,7 +239,7 @@ SharedBitmapDescriptor PresenterBitmapContainer::LoadBitmap ( } catch (Exception&) {} - if (PresenterConfigurationAccess::GetProperty(rxProperties, A2S("MaskFileName")) >>= sFileName) + if (PresenterConfigurationAccess::GetProperty(rxProperties, "MaskFileName") >>= sFileName) try { pBitmap->SetBitmap( @@ -251,18 +249,18 @@ SharedBitmapDescriptor PresenterBitmapContainer::LoadBitmap ( catch (Exception&) {} - PresenterConfigurationAccess::GetProperty(rxProperties, A2S("XOffset")) >>= pBitmap->mnXOffset; - PresenterConfigurationAccess::GetProperty(rxProperties, A2S("YOffset")) >>= pBitmap->mnYOffset; + PresenterConfigurationAccess::GetProperty(rxProperties, "XOffset") >>= pBitmap->mnXOffset; + PresenterConfigurationAccess::GetProperty(rxProperties, "YOffset") >>= pBitmap->mnYOffset; - PresenterConfigurationAccess::GetProperty(rxProperties, A2S("XHotSpot")) >>= pBitmap->mnXHotSpot; - PresenterConfigurationAccess::GetProperty(rxProperties, A2S("YHotSpot")) >>= pBitmap->mnYHotSpot; + PresenterConfigurationAccess::GetProperty(rxProperties, "XHotSpot") >>= pBitmap->mnXHotSpot; + PresenterConfigurationAccess::GetProperty(rxProperties, "YHotSpot") >>= pBitmap->mnYHotSpot; - PresenterConfigurationAccess::GetProperty(rxProperties, A2S("ReplacementColor")) >>= pBitmap->maReplacementColor; + PresenterConfigurationAccess::GetProperty(rxProperties, "ReplacementColor") >>= pBitmap->maReplacementColor; OUString sTexturingMode; - if (PresenterConfigurationAccess::GetProperty(rxProperties, A2S("HorizontalTexturingMode")) >>= sTexturingMode) + if (PresenterConfigurationAccess::GetProperty(rxProperties, "HorizontalTexturingMode") >>= sTexturingMode) pBitmap->meHorizontalTexturingMode = StringToTexturingMode(sTexturingMode); - if (PresenterConfigurationAccess::GetProperty(rxProperties, A2S("VerticalTexturingMode")) >>= sTexturingMode) + if (PresenterConfigurationAccess::GetProperty(rxProperties, "VerticalTexturingMode") >>= sTexturingMode) pBitmap->meVerticalTexturingMode = StringToTexturingMode(sTexturingMode); return pBitmap; @@ -271,11 +269,11 @@ SharedBitmapDescriptor PresenterBitmapContainer::LoadBitmap ( PresenterBitmapContainer::BitmapDescriptor::TexturingMode PresenterBitmapContainer::StringToTexturingMode (const OUString& rsTexturingMode) { - if (rsTexturingMode == A2S("Once")) + if (rsTexturingMode == "Once") return PresenterBitmapContainer::BitmapDescriptor::Once; - else if (rsTexturingMode == A2S("Repeat")) + else if (rsTexturingMode == "Repeat") return PresenterBitmapContainer::BitmapDescriptor::Repeat; - else if (rsTexturingMode == A2S("Stretch")) + else if (rsTexturingMode == "Stretch") return PresenterBitmapContainer::BitmapDescriptor::Stretch; else return PresenterBitmapContainer::BitmapDescriptor::Once; diff --git a/sdext/source/presenter/PresenterButton.cxx b/sdext/source/presenter/PresenterButton.cxx index b7415a538243..bc9a1274a4d0 100644 --- a/sdext/source/presenter/PresenterButton.cxx +++ b/sdext/source/presenter/PresenterButton.cxx @@ -35,8 +35,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using ::rtl::OUString; -#define A2S(pString) (::rtl::OUString(pString)) - namespace sdext { namespace presenter { const static double gnHorizontalBorder (15); @@ -57,16 +55,16 @@ const static double gnVerticalBorder (5); { OUString sText; OUString sAction; - PresenterConfigurationAccess::GetProperty(xProperties, A2S("Text")) >>= sText; - PresenterConfigurationAccess::GetProperty(xProperties, A2S("Action")) >>= sAction; + PresenterConfigurationAccess::GetProperty(xProperties, "Text") >>= sText; + PresenterConfigurationAccess::GetProperty(xProperties, "Action") >>= sAction; PresenterTheme::SharedFontDescriptor pFont; if (rpTheme.get() != NULL) - pFont = rpTheme->GetFont(A2S("ButtonFont")); + pFont = rpTheme->GetFont("ButtonFont"); PresenterTheme::SharedFontDescriptor pMouseOverFont; if (rpTheme.get() != NULL) - pMouseOverFont = rpTheme->GetFont(A2S("ButtonMouseOverFont")); + pMouseOverFont = rpTheme->GetFont("ButtonMouseOverFont"); rtl::Reference<PresenterButton> pButton ( new PresenterButton( @@ -450,9 +448,9 @@ void PresenterButton::SetupButtonBitmaps (void) return; // Get the bitmaps for the button border. - SharedBitmapDescriptor pLeftBitmap (mpTheme->GetBitmap(A2S("ButtonFrameLeft"))); - SharedBitmapDescriptor pCenterBitmap(mpTheme->GetBitmap(A2S("ButtonFrameCenter"))); - SharedBitmapDescriptor pRightBitmap(mpTheme->GetBitmap(A2S("ButtonFrameRight"))); + SharedBitmapDescriptor pLeftBitmap (mpTheme->GetBitmap("ButtonFrameLeft")); + SharedBitmapDescriptor pCenterBitmap(mpTheme->GetBitmap("ButtonFrameCenter")); + SharedBitmapDescriptor pRightBitmap(mpTheme->GetBitmap("ButtonFrameRight")); maButtonSize = CalculateButtonSize(); @@ -497,11 +495,11 @@ Reference<beans::XPropertySet> PresenterButton::GetConfigurationProperties ( return Reference<beans::XPropertySet>( PresenterConfigurationAccess::Find ( Reference<container::XNameAccess>( - aConfiguration.GetConfigurationNode(A2S("PresenterScreenSettings/Buttons")), + aConfiguration.GetConfigurationNode("PresenterScreenSettings/Buttons"), UNO_QUERY), ::boost::bind(&PresenterConfigurationAccess::IsStringPropertyEqual, rsConfgurationName, - A2S("Name"), + OUString::createFromAscii("Name"), _2)), UNO_QUERY); } diff --git a/sdext/source/presenter/PresenterConfigurationAccess.cxx b/sdext/source/presenter/PresenterConfigurationAccess.cxx index 5fdb8bc5d026..be5d839af0bf 100644 --- a/sdext/source/presenter/PresenterConfigurationAccess.cxx +++ b/sdext/source/presenter/PresenterConfigurationAccess.cxx @@ -29,12 +29,10 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using ::rtl::OUString; -#define A2S(pString) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(pString))) - namespace sdext { namespace presenter { const ::rtl::OUString PresenterConfigurationAccess::msPresenterScreenRootName = - A2S("/org.openoffice.Office.PresenterScreen/"); + "/org.openoffice.Office.PresenterScreen/"; PresenterConfigurationAccess::PresenterConfigurationAccess ( const Reference<XComponentContext>& rxContext, @@ -49,26 +47,26 @@ PresenterConfigurationAccess::PresenterConfigurationAccess ( { Sequence<Any> aCreationArguments(3); aCreationArguments[0] = makeAny(beans::PropertyValue( - A2S("nodepath"), + "nodepath", 0, makeAny(rsRootName), beans::PropertyState_DIRECT_VALUE)); aCreationArguments[1] = makeAny(beans::PropertyValue( - A2S("depth"), + "depth", 0, makeAny((sal_Int32)-1), beans::PropertyState_DIRECT_VALUE)); aCreationArguments[2] = makeAny(beans::PropertyValue( - A2S("lazywrite"), + "lazywrite", 0, makeAny(true), beans::PropertyState_DIRECT_VALUE)); OUString sAccessService; if (eMode == READ_ONLY) - sAccessService = A2S("com.sun.star.configuration.ConfigurationAccess"); + sAccessService = "com.sun.star.configuration.ConfigurationAccess"; else - sAccessService = A2S("com.sun.star.configuration.ConfigurationUpdateAccess"); + sAccessService = "com.sun.star.configuration.ConfigurationUpdateAccess"; Reference<lang::XMultiServiceFactory> xProvider = configuration::theDefaultProvider::get( rxContext ); diff --git a/sdext/source/presenter/PresenterController.cxx b/sdext/source/presenter/PresenterController.cxx index 14820da65c3e..18d0aa943f17 100644 --- a/sdext/source/presenter/PresenterController.cxx +++ b/sdext/source/presenter/PresenterController.cxx @@ -69,8 +69,6 @@ namespace { const sal_Int32 ConfigurationUpdateEndEventType = 2; } -#define A2S(pString) (::rtl::OUString(pString)) - namespace sdext { namespace presenter { PresenterController::InstanceContainer PresenterController::maInstances; @@ -120,7 +118,7 @@ PresenterController::PresenterController ( if ( ! mxSlideShowController.is()) throw new lang::IllegalArgumentException( - A2S("missing slide show controller"), + "missing slide show controller", static_cast<XWeak*>(this), 2); @@ -133,15 +131,15 @@ PresenterController::PresenterController ( { mxConfigurationController->addConfigurationChangeListener( this, - A2S("ResourceActivation"), + "ResourceActivation", Any(ResourceActivationEventType)); mxConfigurationController->addConfigurationChangeListener( this, - A2S("ResourceDeactivation"), + "ResourceDeactivation", Any(ResourceDeactivationEventType)); mxConfigurationController->addConfigurationChangeListener( this, - A2S("ConfigurationUpdateEnd"), + "ConfigurationUpdateEnd", Any(ConfigurationUpdateEndEventType)); } @@ -162,7 +160,7 @@ PresenterController::PresenterController ( return; mxPresenterHelper = Reference<drawing::XPresenterHelper>( xFactory->createInstanceWithContext( - A2S("com.sun.star.drawing.PresenterHelper"), + "com.sun.star.drawing.PresenterHelper", rxContext), UNO_QUERY_THROW); @@ -173,7 +171,7 @@ PresenterController::PresenterController ( if (xProperties.is()) { Reference<awt::XWindow> xWindow ( - xProperties->getPropertyValue(A2S("ParentWindow")), UNO_QUERY); + xProperties->getPropertyValue("ParentWindow"), UNO_QUERY); if (xWindow.is()) xWindow->addKeyListener(this); } @@ -328,12 +326,12 @@ void PresenterController::UpdatePaneTitles (void) return; // Get placeholders and their values. - const OUString sCurrentSlideNumberPlaceholder (A2S("CURRENT_SLIDE_NUMBER")); - const OUString sCurrentSlideNamePlaceholder (A2S("CURRENT_SLIDE_NAME")); - const OUString sSlideCountPlaceholder (A2S("SLIDE_COUNT")); + const OUString sCurrentSlideNumberPlaceholder ("CURRENT_SLIDE_NUMBER"); + const OUString sCurrentSlideNamePlaceholder ("CURRENT_SLIDE_NAME"); + const OUString sSlideCountPlaceholder ("SLIDE_COUNT"); // Get string for slide count. - OUString sSlideCount (A2S("---")); + OUString sSlideCount ("---"); Reference<container::XIndexAccess> xIndexAccess(mxSlideShowController, UNO_QUERY); if (xIndexAccess.is()) sSlideCount = OUString::valueOf(xIndexAccess->getCount()); @@ -352,7 +350,7 @@ void PresenterController::UpdatePaneTitles (void) try { OUString sName; - if (xSlideProperties->getPropertyValue(A2S("LinkDisplayName")) >>= sName) + if (xSlideProperties->getPropertyValue("LinkDisplayName") >>= sName) { // Find out whether the name of the current slide has been // automatically created or has been set by the user. @@ -436,7 +434,7 @@ SharedBitmapDescriptor if (mpTheme.get() != NULL) { const OUString sStyleName (mpTheme->GetStyleName(rsViewURL)); - return mpTheme->GetBitmap(sStyleName, A2S("Background")); + return mpTheme->GetBitmap(sStyleName, "Background"); } return SharedBitmapDescriptor(); } @@ -1137,7 +1135,7 @@ void PresenterController::UpdatePendingSlideNumber (const sal_Int32 nPendingSlid return; PresenterTheme::SharedFontDescriptor pFont ( - mpTheme->GetFont(A2S("PendingSlideNumberFont"))); + mpTheme->GetFont("PendingSlideNumberFont")); if (pFont.get() == NULL) return; diff --git a/sdext/source/presenter/PresenterFrameworkObserver.cxx b/sdext/source/presenter/PresenterFrameworkObserver.cxx index dff6046580b3..0c318463a198 100644 --- a/sdext/source/presenter/PresenterFrameworkObserver.cxx +++ b/sdext/source/presenter/PresenterFrameworkObserver.cxx @@ -26,8 +26,6 @@ using namespace ::com::sun::star::drawing::framework; using ::rtl::OUString; -#define A2S(pString) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(pString))) - namespace sdext { namespace presenter { PresenterFrameworkObserver::PresenterFrameworkObserver ( @@ -54,7 +52,7 @@ PresenterFrameworkObserver::PresenterFrameworkObserver ( } mxConfigurationController->addConfigurationChangeListener( this, - A2S("ConfigurationUpdateEnd"), + "ConfigurationUpdateEnd", Any()); } else @@ -124,7 +122,7 @@ void SAL_CALL PresenterFrameworkObserver::notifyConfigurationChange ( Action aAction (maAction); Predicate aPredicate (maPredicate); - if (rEvent.Type.equals(A2S("ConfigurationUpdateEnd"))) + if (rEvent.Type.equals("ConfigurationUpdateEnd")) { Shutdown(); aAction(aPredicate); diff --git a/sdext/source/presenter/PresenterHelpView.cxx b/sdext/source/presenter/PresenterHelpView.cxx index d0293b24c3e7..638b72855964 100644 --- a/sdext/source/presenter/PresenterHelpView.cxx +++ b/sdext/source/presenter/PresenterHelpView.cxx @@ -40,8 +40,6 @@ using namespace ::com::sun::star::drawing::framework; using ::rtl::OUString; using ::std::vector; -#define A2S(pString) (::rtl::OUString(pString)) - namespace sdext { namespace presenter { namespace { @@ -171,7 +169,7 @@ PresenterHelpView::PresenterHelpView ( mpPresenterController->GetTheme(), mxWindow, mxCanvas, - A2S("HelpViewCloser")); + "HelpViewCloser"); ReadHelpStrings(); Resize(); @@ -363,7 +361,7 @@ void PresenterHelpView::ReadHelpStrings (void) OUString("/org.openoffice.Office.PresenterScreen/"), PresenterConfigurationAccess::READ_ONLY); Reference<container::XNameAccess> xStrings ( - aConfiguration.GetConfigurationNode(A2S("PresenterScreenSettings/HelpView/HelpStrings")), + aConfiguration.GetConfigurationNode("PresenterScreenSettings/HelpView/HelpStrings"), UNO_QUERY); PresenterConfigurationAccess::ForAll( xStrings, @@ -377,9 +375,9 @@ void PresenterHelpView::ProcessString ( return; OUString sLeftText; - PresenterConfigurationAccess::GetProperty(rsProperties, A2S("Left")) >>= sLeftText; + PresenterConfigurationAccess::GetProperty(rsProperties, "Left") >>= sLeftText; OUString sRightText; - PresenterConfigurationAccess::GetProperty(rsProperties, A2S("Right")) >>= sRightText; + PresenterConfigurationAccess::GetProperty(rsProperties, "Right") >>= sRightText; mpTextContainer->push_back( ::boost::shared_ptr<Block>( new Block(sLeftText, sRightText, mpFont->mxFont, mnMaximalWidth))); @@ -730,16 +728,16 @@ void LineDescriptorList::FormatText ( } } else if (PresenterCanvasHelper::GetTextSize( - rxFont, aLineDescriptor.msLine+A2S(", ")+*iPart).Width > nMaximalWidth) + rxFont, aLineDescriptor.msLine+", "+*iPart).Width > nMaximalWidth) { - aLineDescriptor.AddPart(A2S(","), rxFont); + aLineDescriptor.AddPart(",", rxFont); mpLineDescriptors->push_back(aLineDescriptor); aLineDescriptor = LineDescriptor(); continue; } else { - aLineDescriptor.AddPart(A2S(", ")+*iPart, rxFont); + aLineDescriptor.AddPart(", "+*iPart, rxFont); } ++iPart; } diff --git a/sdext/source/presenter/PresenterNotesView.cxx b/sdext/source/presenter/PresenterNotesView.cxx index f3dbdbe432fc..deb248f6485f 100644 --- a/sdext/source/presenter/PresenterNotesView.cxx +++ b/sdext/source/presenter/PresenterNotesView.cxx @@ -47,8 +47,6 @@ 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))) - static const sal_Int32 gnSpaceBelowSeparator (10); static const sal_Int32 gnSpaceAboveSeparator (10); static const sal_Int32 gnPartHeight (128); @@ -111,7 +109,7 @@ PresenterNotesView::PresenterNotesView ( mpPresenterController->GetTheme(), mxParentWindow, mxCanvas, - A2S("NotesViewCloser")); + "NotesViewCloser"); if (mxParentWindow.is()) { @@ -223,15 +221,15 @@ void PresenterNotesView::CreateToolBar ( rpPresenterController, PresenterToolBar::Left); mpToolBar->Initialize( - A2S("PresenterScreenSettings/ToolBars/NotesToolBar")); + "PresenterScreenSettings/ToolBars/NotesToolBar"); } void PresenterNotesView::SetSlide (const Reference<drawing::XDrawPage>& rxNotesPage) { static const ::rtl::OUString sNotesShapeName ( - A2S("com.sun.star.presentation.NotesShape")); + "com.sun.star.presentation.NotesShape"); static const ::rtl::OUString sTextShapeName ( - A2S("com.sun.star.drawing.TextShape")); + "com.sun.star.drawing.TextShape"); Reference<container::XIndexAccess> xIndexAccess (rxNotesPage, UNO_QUERY); if (xIndexAccess.is()) @@ -660,8 +658,8 @@ void PresenterNotesView::ChangeFontSize (const sal_Int32 nSizeChange) if (pConfiguration.get()==NULL || ! pConfiguration->IsValid()) return; - pConfiguration->GoToChild(A2S("Font")); - pConfiguration->SetProperty(A2S("Size"), Any((sal_Int32)(nNewSize+0.5))); + pConfiguration->GoToChild(OUString("Font")); + pConfiguration->SetProperty("Size", Any((sal_Int32)(nNewSize+0.5))); pConfiguration->CommitChanges(); } catch (Exception&) @@ -703,7 +701,7 @@ void PresenterNotesView::ThrowIfDisposed (void) if (rBHelper.bDisposed || rBHelper.bInDispose) { throw lang::DisposedException ( - A2S("PresenterNotesView object has already been disposed"), + "PresenterNotesView 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 f683ce1da178..bcee08161b8e 100644 --- a/sdext/source/presenter/PresenterPaneBorderPainter.cxx +++ b/sdext/source/presenter/PresenterPaneBorderPainter.cxx @@ -44,8 +44,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using ::rtl::OUString; -#define A2S(s) (::rtl::OUString(s)) - namespace sdext { namespace presenter { namespace { @@ -842,16 +840,16 @@ RendererPaneStyle::RendererPaneStyle ( { if (rpTheme.get() != NULL) { - mpTopLeft = GetBitmap(rpTheme, rsStyleName, A2S("TopLeft")); - mpTop = GetBitmap(rpTheme, rsStyleName, A2S("Top")); - mpTopRight = GetBitmap(rpTheme, rsStyleName, A2S("TopRight")); - mpLeft = GetBitmap(rpTheme, rsStyleName, A2S("Left")); - mpRight = GetBitmap(rpTheme, rsStyleName, A2S("Right")); - mpBottomLeft = GetBitmap(rpTheme, rsStyleName, A2S("BottomLeft")); - mpBottom = GetBitmap(rpTheme, rsStyleName, A2S("Bottom")); - mpBottomRight = GetBitmap(rpTheme, rsStyleName, A2S("BottomRight")); - mpBottomCallout = GetBitmap(rpTheme, rsStyleName, A2S("BottomCallout")); - mpBackground = GetBitmap(rpTheme, OUString(), A2S("Background")); + mpTopLeft = GetBitmap(rpTheme, rsStyleName, "TopLeft"); + mpTop = GetBitmap(rpTheme, rsStyleName, "Top"); + mpTopRight = GetBitmap(rpTheme, rsStyleName, "TopRight"); + mpLeft = GetBitmap(rpTheme, rsStyleName,"Left"); + mpRight = GetBitmap(rpTheme, rsStyleName, "Right"); + mpBottomLeft = GetBitmap(rpTheme, rsStyleName, "BottomLeft"); + mpBottom = GetBitmap(rpTheme, rsStyleName, "Bottom"); + mpBottomRight = GetBitmap(rpTheme, rsStyleName, "BottomRight"); + mpBottomCallout = GetBitmap(rpTheme, rsStyleName, "BottomCallout"); + mpBackground = GetBitmap(rpTheme, OUString(), "Background"); // Get font description. mpFont = rpTheme->GetFont(rsStyleName); diff --git a/sdext/source/presenter/PresenterProtocolHandler.cxx b/sdext/source/presenter/PresenterProtocolHandler.cxx index 34da2bd17fb2..4df8067ba64f 100644 --- a/sdext/source/presenter/PresenterProtocolHandler.cxx +++ b/sdext/source/presenter/PresenterProtocolHandler.cxx @@ -42,8 +42,6 @@ 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))) - namespace sdext { namespace presenter { namespace { @@ -243,7 +241,7 @@ OUString PresenterProtocolHandler::getImplementationName_static (void) Sequence<OUString> PresenterProtocolHandler::getSupportedServiceNames_static (void) { - static const ::rtl::OUString sServiceName(A2S("com.sun.star.frame.ProtocolHandler")); + static const ::rtl::OUString sServiceName("com.sun.star.frame.ProtocolHandler"); return Sequence<rtl::OUString>(&sServiceName, 1); } @@ -375,29 +373,29 @@ Command* PresenterProtocolHandler::Dispatch::CreateCommand ( if (rsURLPath.getLength() <= 5) return NULL; - if (rsURLPath == A2S("CloseNotes")) + if (rsURLPath == "CloseNotes") return new SetNotesViewCommand(false, rpPresenterController); - if (rsURLPath == A2S("CloseSlideSorter")) + if (rsURLPath == "CloseSlideSorter") return new SetSlideSorterCommand(false, rpPresenterController); - if (rsURLPath == A2S("CloseHelp")) + if (rsURLPath == "CloseHelp") return new SetHelpViewCommand(false, rpPresenterController); - if (rsURLPath == A2S("GrowNotesFont")) + if (rsURLPath == "GrowNotesFont") return new NotesFontSizeCommand(rpPresenterController, +1); - if (rsURLPath == A2S("NextEffect")) + if (rsURLPath == "NextEffect") return new GotoNextEffectCommand(rpPresenterController); - if (rsURLPath == A2S("NextSlide")) + if (rsURLPath == "NextSlide") return new GotoNextSlideCommand(rpPresenterController); - if (rsURLPath == A2S("PrevSlide")) + if (rsURLPath == "PrevSlide") return new GotoPreviousSlideCommand(rpPresenterController); - if (rsURLPath == A2S("SwitchMonitor")) + if (rsURLPath == "SwitchMonitor") return new SwitchMonitorCommand(rpPresenterController); - if (rsURLPath == A2S("ShowNotes")) + if (rsURLPath == "ShowNotes") return new SetNotesViewCommand(true, rpPresenterController); - if (rsURLPath == A2S("ShowSlideSorter")) + if (rsURLPath == "ShowSlideSorter") return new SetSlideSorterCommand(true, rpPresenterController); - if (rsURLPath == A2S("ShowHelp")) + if (rsURLPath == "ShowHelp") return new SetHelpViewCommand(true, rpPresenterController); - if (rsURLPath == A2S("ShrinkNotesFont")) + if (rsURLPath == "ShrinkNotesFont") return new NotesFontSizeCommand(rpPresenterController, -1); return NULL; diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx index 41133a1c0863..1ac293386d3f 100644 --- a/sdext/source/presenter/PresenterScreen.cxx +++ b/sdext/source/presenter/PresenterScreen.cxx @@ -48,8 +48,6 @@ using namespace ::com::sun::star::presentation; using namespace ::com::sun::star::drawing::framework; using ::rtl::OUString; -#define A2S(s) (::rtl::OUString(s)) - namespace sdext { namespace presenter { namespace { @@ -434,7 +432,7 @@ void PresenterScreen::SwitchMonitors() Reference<beans::XPropertySet> xProperties (xPresentation, UNO_QUERY_THROW); uno::Any aDisplay; aDisplay <<= nNewScreen; - xProperties->setPropertyValue(A2S("Display"), aDisplay); + xProperties->setPropertyValue("Display", aDisplay); } catch (const uno::Exception &) { } } @@ -456,7 +454,7 @@ sal_Int32 PresenterScreen::GetPresenterScreenNumber ( // Determine the screen on which the full screen presentation is being // displayed. sal_Int32 nDisplayNumber (-1); - if ( ! (xProperties->getPropertyValue(A2S("Display")) >>= nDisplayNumber)) + if ( ! (xProperties->getPropertyValue("Display") >>= nDisplayNumber)) return -1; if (nDisplayNumber == -1) { @@ -550,7 +548,7 @@ Reference<drawing::framework::XResourceId> PresenterScreen::GetMainPaneId ( return ResourceId::create( Reference<XComponentContext>(mxContextWeak), PresenterHelper::msFullScreenPaneURL - +A2S("?FullScreen=true&ScreenNumber=") + + "?FullScreen=true&ScreenNumber=" + OUString::valueOf(nScreen)); } @@ -714,7 +712,7 @@ void PresenterScreen::ProcessViewDescriptions ( try { Reference<container::XNameAccess> xViewDescriptionsNode ( - rConfiguration.GetConfigurationNode(A2S("Presenter/Views")), + rConfiguration.GetConfigurationNode("Presenter/Views"), UNO_QUERY_THROW); ::std::vector<rtl::OUString> aProperties (4); diff --git a/sdext/source/presenter/PresenterScrollBar.cxx b/sdext/source/presenter/PresenterScrollBar.cxx index cb87d61f4166..bed4fccbb55f 100644 --- a/sdext/source/presenter/PresenterScrollBar.cxx +++ b/sdext/source/presenter/PresenterScrollBar.cxx @@ -40,8 +40,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using ::rtl::OUString; -#define A2S(pString) (::rtl::OUString(pString)) - const static double gnScrollBarGap (10); namespace sdext { namespace presenter { @@ -777,14 +775,14 @@ void PresenterVerticalScrollBar::UpdateBitmaps (void) { if (mpBitmaps.get() != NULL) { - mpPrevButtonDescriptor = mpBitmaps->GetBitmap(A2S("Up")); - mpNextButtonDescriptor = mpBitmaps->GetBitmap(A2S("Down")); - mpPagerStartDescriptor = mpBitmaps->GetBitmap(A2S("PagerTop")); - mpPagerCenterDescriptor = mpBitmaps->GetBitmap(A2S("PagerVertical")); - mpPagerEndDescriptor = mpBitmaps->GetBitmap(A2S("PagerBottom")); - mpThumbStartDescriptor = mpBitmaps->GetBitmap(A2S("ThumbTop")); - mpThumbCenterDescriptor = mpBitmaps->GetBitmap(A2S("ThumbVertical")); - mpThumbEndDescriptor = mpBitmaps->GetBitmap(A2S("ThumbBottom")); + mpPrevButtonDescriptor = mpBitmaps->GetBitmap("Up"); + mpNextButtonDescriptor = mpBitmaps->GetBitmap("Down"); + mpPagerStartDescriptor = mpBitmaps->GetBitmap("PagerTop"); + mpPagerCenterDescriptor = mpBitmaps->GetBitmap("PagerVertical"); + mpPagerEndDescriptor = mpBitmaps->GetBitmap("PagerBottom"); + mpThumbStartDescriptor = mpBitmaps->GetBitmap("ThumbTop"); + mpThumbCenterDescriptor = mpBitmaps->GetBitmap("ThumbVertical"); + mpThumbEndDescriptor = mpBitmaps->GetBitmap("ThumbBottom"); mnScrollBarWidth = 0; UpdateWidthOrHeight(mnScrollBarWidth, mpPrevButtonDescriptor); diff --git a/sdext/source/presenter/PresenterSlideShowView.cxx b/sdext/source/presenter/PresenterSlideShowView.cxx index be99fa56c18e..0a7920a34b57 100644 --- a/sdext/source/presenter/PresenterSlideShowView.cxx +++ b/sdext/source/presenter/PresenterSlideShowView.cxx @@ -1,3 +1,4 @@ + /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* * This file is part of the LibreOffice project. @@ -45,8 +46,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; using ::rtl::OUString; -#define A2S(pString) (::rtl::OUString(pString)) - namespace sdext { namespace presenter { //===== PresenterSlideShowView ================================================ @@ -167,12 +166,12 @@ void PresenterSlideShowView::LateInit (void) PresenterConfigurationAccess::msPresenterScreenRootName, PresenterConfigurationAccess::READ_ONLY); aConfiguration.GetConfigurationNode( - A2S("Presenter/Views/CurrentSlidePreview/" - "Strings/ClickToExitPresentationText/String")) + "Presenter/Views/CurrentSlidePreview/" + "Strings/ClickToExitPresentationText/String") >>= msClickToExitPresentationText; aConfiguration.GetConfigurationNode( - A2S("Presenter/Views/CurrentSlidePreview/" - "Strings/ClickToExitPresentationTitle/String")) + "Presenter/Views/CurrentSlidePreview/" + "Strings/ClickToExitPresentationTitle/String") >>= msClickToExitPresentationTitle; } @@ -1006,7 +1005,7 @@ void PresenterSlideShowView::impl_addAndConfigureView() // Prevent embeded sounds being played twice at the same time by // disabling sound for the new slide show view. beans::PropertyValue aProperty; - aProperty.Name = A2S("IsSoundEnabled"); + aProperty.Name = "IsSoundEnabled"; Sequence<Any> aValues (2); aValues[0] <<= xView; aValues[1] <<= sal_False; diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx index 414815256d3a..bdffca4327bc 100644 --- a/sdext/source/presenter/PresenterSlideSorter.cxx +++ b/sdext/source/presenter/PresenterSlideSorter.cxx @@ -49,8 +49,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; using ::rtl::OUString; -#define A2S(pString) (::rtl::OUString(pString)) - namespace { const static sal_Int32 gnVerticalGap (10); const static sal_Int32 gnVerticalBorder (10); @@ -316,12 +314,12 @@ PresenterSlideSorter::PresenterSlideSorter ( mpPresenterController->GetTheme(), mxWindow, mxCanvas, - A2S("SlideSorterCloser")); + "SlideSorterCloser"); if (mpPresenterController->GetTheme().get() != NULL) { PresenterTheme::SharedFontDescriptor pFont ( - mpPresenterController->GetTheme()->GetFont(A2S("ButtonFont"))); + mpPresenterController->GetTheme()->GetFont("ButtonFont")); if (pFont.get() != NULL) maSeparatorColor = pFont->mnColor; } @@ -1433,12 +1431,12 @@ PresenterSlideSorter::MouseOverManager::MouseOverManager ( ::boost::shared_ptr<PresenterBitmapContainer> pBitmaps (rpTheme->GetBitmapContainer()); if (pBitmaps.get() != NULL) { - mpLeftLabelBitmap = pBitmaps->GetBitmap(A2S("LabelLeft")); - mpCenterLabelBitmap = pBitmaps->GetBitmap(A2S("LabelCenter")); - mpRightLabelBitmap = pBitmaps->GetBitmap(A2S("LabelRight")); + mpLeftLabelBitmap = pBitmaps->GetBitmap("LabelLeft"); + mpCenterLabelBitmap = pBitmaps->GetBitmap("LabelCenter"); + mpRightLabelBitmap = pBitmaps->GetBitmap("LabelRight"); } - mpFont = rpTheme->GetFont(A2S("SlideSorterLabelFont")); + mpFont = rpTheme->GetFont("SlideSorterLabelFont"); } } @@ -1510,10 +1508,10 @@ void PresenterSlideSorter::MouseOverManager::SetSlide ( Reference<beans::XPropertySet> xSlideProperties(mxSlides->getByIndex(nSlideIndex), UNO_QUERY); if (xSlideProperties.is()) - xSlideProperties->getPropertyValue(A2S("LinkDisplayName")) >>= msText; + xSlideProperties->getPropertyValue("LinkDisplayName") >>= msText; if (msText.isEmpty()) - msText = A2S("Slide ") + OUString::valueOf(nSlideIndex + 1); + msText = "Slide " + OUString::valueOf(nSlideIndex + 1); } } else @@ -1607,7 +1605,7 @@ OUString PresenterSlideSorter::MouseOverManager::GetFittingText ( double nBestWidth (0); OUString sBestCandidate; sal_Int32 nLength (round(rsText.getLength() * nMaximalWidth / nTextWidth)); - const OUString sEllipses (A2S("...")); + const OUString sEllipses ("..."); while (true) { const OUString sCandidate (rsText.copy(0,nLength) + sEllipses); @@ -1726,25 +1724,25 @@ PresenterSlideSorter::CurrentSlideFrameRenderer::CurrentSlideFrameRenderer ( PresenterConfigurationAccess::READ_ONLY); Reference<container::XHierarchicalNameAccess> xBitmaps ( aConfiguration.GetConfigurationNode( - A2S("PresenterScreenSettings/SlideSorter/CurrentSlideBorderBitmaps")), + "PresenterScreenSettings/SlideSorter/CurrentSlideBorderBitmaps"), UNO_QUERY); if ( ! xBitmaps.is()) return; PresenterBitmapContainer aContainer ( - A2S("PresenterScreenSettings/SlideSorter/CurrentSlideBorderBitmaps"), + "PresenterScreenSettings/SlideSorter/CurrentSlideBorderBitmaps", ::boost::shared_ptr<PresenterBitmapContainer>(), rxContext, rxCanvas); - mpTopLeft = aContainer.GetBitmap(A2S("TopLeft")); - mpTop = aContainer.GetBitmap(A2S("Top")); - mpTopRight = aContainer.GetBitmap(A2S("TopRight")); - mpLeft = aContainer.GetBitmap(A2S("Left")); - mpRight = aContainer.GetBitmap(A2S("Right")); - mpBottomLeft = aContainer.GetBitmap(A2S("BottomLeft")); - mpBottom = aContainer.GetBitmap(A2S("Bottom")); - mpBottomRight = aContainer.GetBitmap(A2S("BottomRight")); + mpTopLeft = aContainer.GetBitmap("TopLeft"); + mpTop = aContainer.GetBitmap("Top"); + mpTopRight = aContainer.GetBitmap("TopRight"); + mpLeft = aContainer.GetBitmap("Left"); + mpRight = aContainer.GetBitmap("Right"); + mpBottomLeft = aContainer.GetBitmap("BottomLeft"); + mpBottom = aContainer.GetBitmap("Bottom"); + mpBottomRight = aContainer.GetBitmap("BottomRight"); // Determine size of frame. if (mpTop.get() != NULL) diff --git a/sdext/source/presenter/PresenterTextView.cxx b/sdext/source/presenter/PresenterTextView.cxx index 6599f4fbfa81..f06169c93625 100644 --- a/sdext/source/presenter/PresenterTextView.cxx +++ b/sdext/source/presenter/PresenterTextView.cxx @@ -41,8 +41,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; using namespace ::com::sun::star::uno; -#define A2S(pString) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(pString))) - const static sal_Int64 CaretBlinkIntervall = 500 * 1000 * 1000; //#define SHOW_CHARACTER_BOXES @@ -97,7 +95,7 @@ PresenterTextView::PresenterTextView ( // portions of the same text direction. mxScriptTypeDetector = Reference<i18n::XScriptTypeDetector>( xFactory->createInstanceWithContext( - A2S("com.sun.star.i18n.ScriptTypeDetector"), + "com.sun.star.i18n.ScriptTypeDetector", rxContext), UNO_QUERY_THROW); } @@ -487,7 +485,7 @@ PresenterTextParagraph::PresenterTextParagraph ( lang::Locale aLocale; try { - xProperties->getPropertyValue(A2S("CharLocale")) >>= aLocale; + xProperties->getPropertyValue("CharLocale") >>= aLocale; } catch(beans::UnknownPropertyException&) { @@ -495,7 +493,7 @@ PresenterTextParagraph::PresenterTextParagraph ( } try { - xProperties->getPropertyValue(A2S("ParaAdjust")) >>= meAdjust; + xProperties->getPropertyValue("ParaAdjust") >>= meAdjust; } catch(beans::UnknownPropertyException&) { @@ -503,7 +501,7 @@ PresenterTextParagraph::PresenterTextParagraph ( } try { - xProperties->getPropertyValue(A2S("WritingMode")) >>= mnWritingMode; + xProperties->getPropertyValue("WritingMode") >>= mnWritingMode; } catch(beans::UnknownPropertyException&) { diff --git a/sdext/source/presenter/PresenterTheme.cxx b/sdext/source/presenter/PresenterTheme.cxx index 5decc57dfd50..58ee37b4ecb9 100644 --- a/sdext/source/presenter/PresenterTheme.cxx +++ b/sdext/source/presenter/PresenterTheme.cxx @@ -38,8 +38,6 @@ using namespace ::com::sun::star::uno; using namespace ::std; using ::rtl::OUString; -#define A2S(s) (::rtl::OUString(s)) - namespace sdext { namespace presenter { namespace { @@ -388,7 +386,7 @@ bool PresenterTheme::ConvertToColor ( pConfiguration->GoToChild( ::boost::bind(&PresenterConfigurationAccess::IsStringPropertyEqual, rsStyleName, - A2S("StyleName"), + OUString::createFromAscii("StyleName"), _2)); } return pConfiguration; @@ -402,7 +400,7 @@ SharedBitmapDescriptor PresenterTheme::GetBitmap ( { if (rsStyleName.isEmpty()) { - if (rsBitmapName == A2S("Background")) + if (rsBitmapName == "Background") { ::boost::shared_ptr<Theme> pTheme (mpTheme); while (pTheme.get()!=NULL && pTheme->mpBackground.get()==NULL) @@ -441,7 +439,7 @@ SharedBitmapDescriptor PresenterTheme::GetBitmap ( { if (mpTheme.get() != NULL) { - if (rsBitmapName == A2S("Background")) + if (rsBitmapName == "Background") { ::boost::shared_ptr<Theme> pTheme (mpTheme); while (pTheme.get()!=NULL && pTheme->mpBackground.get()==NULL) @@ -542,13 +540,13 @@ Reference<rendering::XCanvasFont> PresenterTheme::FontDescriptor::CreateFont ( rendering::FontRequest aFontRequest; aFontRequest.FontDescription.FamilyName = msFamilyName; if (msFamilyName.isEmpty()) - aFontRequest.FontDescription.FamilyName = A2S("Tahoma"); + aFontRequest.FontDescription.FamilyName = "Tahoma"; aFontRequest.FontDescription.StyleName = msStyleName; aFontRequest.CellSize = nCellSize; // Make an attempt at translating the style name(s)into a corresponding // font description. - if (msStyleName == A2S("Bold")) + if (msStyleName == "Bold") aFontRequest.FontDescription.FontDescription.Weight = rendering::PanoseWeight::HEAVY; return rxCanvas->createFont( @@ -576,7 +574,7 @@ double PresenterTheme::FontDescriptor::GetCellSizeForDesignSize ( if ( ! xFont.is()) return nDesignSize; - geometry::RealRectangle2D aBox (PresenterCanvasHelper::GetTextBoundingBox (xFont, A2S("X"))); + geometry::RealRectangle2D aBox (PresenterCanvasHelper::GetTextBoundingBox (xFont, "X")); const double nAscent (-aBox.Y1); const double nDescent (aBox.Y2); @@ -609,12 +607,12 @@ void PresenterTheme::Theme::Read ( PresenterConfigurationAccess& rConfiguration, ReadContext& rReadContext) { - PresenterConfigurationAccess::GetConfigurationNode(mxThemeRoot, A2S("ThemeName")) + PresenterConfigurationAccess::GetConfigurationNode(mxThemeRoot, "ThemeName") >>= msThemeName; // Parent theme name. OUString sParentThemeName; - if ((PresenterConfigurationAccess::GetConfigurationNode(mxThemeRoot, A2S("ParentTheme")) + if ((PresenterConfigurationAccess::GetConfigurationNode(mxThemeRoot, "ParentTheme") >>= sParentThemeName) && !sParentThemeName.isEmpty()) { @@ -624,7 +622,7 @@ void PresenterTheme::Theme::Read ( // Background. mpBackground = PresenterBitmapContainer::LoadBitmap( mxThemeRoot, - A2S("Background"), + "Background", rReadContext.mxPresenterHelper, rReadContext.mxCanvas, SharedBitmapDescriptor()); @@ -642,7 +640,7 @@ void PresenterTheme::Theme::Read ( mpIconContainer.reset( new PresenterBitmapContainer( Reference<container::XNameAccess>( - PresenterConfigurationAccess::GetConfigurationNode(mxThemeRoot, A2S("Bitmaps")), + PresenterConfigurationAccess::GetConfigurationNode(mxThemeRoot, "Bitmaps"), UNO_QUERY), mpParentTheme.get()!=NULL ? mpParentTheme->mpIconContainer @@ -652,7 +650,7 @@ void PresenterTheme::Theme::Read ( // Read fonts. Reference<container::XNameAccess> xFontNode( - PresenterConfigurationAccess::GetConfigurationNode(mxThemeRoot, A2S("Fonts")), + PresenterConfigurationAccess::GetConfigurationNode(mxThemeRoot, "Fonts"), UNO_QUERY); PresenterConfigurationAccess::ForAll( xFontNode, @@ -751,15 +749,15 @@ PresenterTheme::SharedFontDescriptor ReadContext::ReadFont ( ::boost::shared_ptr<PresenterTheme::FontDescriptor> pDescriptor ( new PresenterTheme::FontDescriptor(rpDefault)); - PresenterConfigurationAccess::GetProperty(rxProperties, A2S("FamilyName")) >>= pDescriptor->msFamilyName; - PresenterConfigurationAccess::GetProperty(rxProperties, A2S("Style")) >>= pDescriptor->msStyleName; - PresenterConfigurationAccess::GetProperty(rxProperties, A2S("Size")) >>= pDescriptor->mnSize; + PresenterConfigurationAccess::GetProperty(rxProperties, "FamilyName") >>= pDescriptor->msFamilyName; + PresenterConfigurationAccess::GetProperty(rxProperties, "Style") >>= pDescriptor->msStyleName; + PresenterConfigurationAccess::GetProperty(rxProperties, "Size") >>= pDescriptor->mnSize; PresenterTheme::ConvertToColor( - PresenterConfigurationAccess::GetProperty(rxProperties, A2S("Color")), + PresenterConfigurationAccess::GetProperty(rxProperties, "Color"), pDescriptor->mnColor); - PresenterConfigurationAccess::GetProperty(rxProperties, A2S("Anchor")) >>= pDescriptor->msAnchor; - PresenterConfigurationAccess::GetProperty(rxProperties, A2S("XOffset")) >>= pDescriptor->mnXOffset; - PresenterConfigurationAccess::GetProperty(rxProperties, A2S("YOffset")) >>= pDescriptor->mnYOffset; + PresenterConfigurationAccess::GetProperty(rxProperties, "Anchor") >>= pDescriptor->msAnchor; + PresenterConfigurationAccess::GetProperty(rxProperties, "XOffset") >>= pDescriptor->mnXOffset; + PresenterConfigurationAccess::GetProperty(rxProperties, "YOffset") >>= pDescriptor->mnYOffset; return pDescriptor; } @@ -785,16 +783,16 @@ Any ReadContext::GetByName ( if (sCurrentThemeName.isEmpty()) { // No theme name given. Look up the CurrentTheme property. - rConfiguration.GetConfigurationNode(A2S("Presenter/CurrentTheme")) >>= sCurrentThemeName; + rConfiguration.GetConfigurationNode("Presenter/CurrentTheme") >>= sCurrentThemeName; if (sCurrentThemeName.isEmpty()) { // Still no name. Use "DefaultTheme". - sCurrentThemeName = A2S("DefaultTheme"); + sCurrentThemeName = "DefaultTheme"; } } Reference<container::XNameAccess> xThemes ( - rConfiguration.GetConfigurationNode(A2S("Presenter/Themes")), + rConfiguration.GetConfigurationNode("Presenter/Themes"), UNO_QUERY); if (xThemes.is()) { @@ -808,7 +806,7 @@ Any ReadContext::GetByName ( if (xTheme.is()) { OUString sThemeName; - PresenterConfigurationAccess::GetConfigurationNode(xTheme, A2S("ThemeName")) + PresenterConfigurationAccess::GetConfigurationNode(xTheme, "ThemeName") >>= sThemeName; if (sThemeName == sCurrentThemeName) { @@ -833,10 +831,10 @@ BorderSize ReadContext::ReadBorderSize (const Reference<container::XNameAccess>& if (rxNode.is()) { - GetByName(rxNode, A2S("Left")) >>= aBorderSize.mnLeft; - GetByName(rxNode, A2S("Top")) >>= aBorderSize.mnTop; - GetByName(rxNode, A2S("Right")) >>= aBorderSize.mnRight; - GetByName(rxNode, A2S("Bottom")) >>= aBorderSize.mnBottom; + GetByName(rxNode, "Left") >>= aBorderSize.mnLeft; + GetByName(rxNode, "Top") >>= aBorderSize.mnTop; + GetByName(rxNode, "Right") >>= aBorderSize.mnRight; + GetByName(rxNode, "Bottom") >>= aBorderSize.mnBottom; } return aBorderSize; @@ -851,18 +849,18 @@ void PaneStyleContainer::Read ( Reference<container::XNameAccess> xPaneStyleList ( PresenterConfigurationAccess::GetConfigurationNode( rxThemeRoot, - A2S("PaneStyles")), + "PaneStyles"), UNO_QUERY); if (xPaneStyleList.is()) { ::std::vector<rtl::OUString> aProperties; aProperties.reserve(6); - aProperties.push_back(A2S("StyleName")); - aProperties.push_back(A2S("ParentStyle")); - aProperties.push_back(A2S("TitleFont")); - aProperties.push_back(A2S("InnerBorderSize")); - aProperties.push_back(A2S("OuterBorderSize")); - aProperties.push_back(A2S("BorderBitmapList")); + aProperties.push_back("StyleName"); + aProperties.push_back("ParentStyle"); + aProperties.push_back("TitleFont"); + aProperties.push_back("InnerBorderSize"); + aProperties.push_back("OuterBorderSize"); + aProperties.push_back("BorderBitmapList"); PresenterConfigurationAccess::ForAll( xPaneStyleList, aProperties, @@ -900,7 +898,7 @@ void PaneStyleContainer::ProcessPaneStyle( Reference<container::XHierarchicalNameAccess> xFontNode (rValues[2], UNO_QUERY); pStyle->mpFont = rReadContext.ReadFont( - xFontNode, A2S(""), PresenterTheme::SharedFontDescriptor()); + xFontNode, "", PresenterTheme::SharedFontDescriptor()); Reference<container::XNameAccess> xInnerBorderSizeNode (rValues[3], UNO_QUERY); pStyle->maInnerBorderSize = rReadContext.ReadBorderSize(xInnerBorderSizeNode); @@ -1006,7 +1004,7 @@ void ViewStyleContainer::Read ( Reference<container::XNameAccess> xViewStyleList ( PresenterConfigurationAccess::GetConfigurationNode( rxThemeRoot, - A2S("ViewStyles")), + "ViewStyles"), UNO_QUERY); if (xViewStyleList.is()) { @@ -1023,11 +1021,11 @@ void ViewStyleContainer::ProcessViewStyle( { ::boost::shared_ptr<ViewStyle> pStyle (new ViewStyle()); - PresenterConfigurationAccess::GetProperty(rxProperties, A2S("StyleName")) + PresenterConfigurationAccess::GetProperty(rxProperties, "StyleName") >>= pStyle->msStyleName; OUString sParentStyleName; - if (PresenterConfigurationAccess::GetProperty(rxProperties, A2S("ParentStyle")) + if (PresenterConfigurationAccess::GetProperty(rxProperties, "ParentStyle") >>= sParentStyleName) { // Find parent style. @@ -1044,14 +1042,14 @@ void ViewStyleContainer::ProcessViewStyle( const OUString sPathToFont; // empty string Reference<container::XHierarchicalNameAccess> xFontNode ( - PresenterConfigurationAccess::GetProperty(rxProperties, A2S("Font")), UNO_QUERY); + PresenterConfigurationAccess::GetProperty(rxProperties, "Font"), UNO_QUERY); PresenterTheme::SharedFontDescriptor pFont ( rReadContext.ReadFont(xFontNode, sPathToFont, PresenterTheme::SharedFontDescriptor())); if (pFont.get() != NULL) pStyle->mpFont = pFont; Reference<container::XHierarchicalNameAccess> xBackgroundNode ( - PresenterConfigurationAccess::GetProperty(rxProperties, A2S("Background")), + PresenterConfigurationAccess::GetProperty(rxProperties, "Background"), UNO_QUERY); SharedBitmapDescriptor pBackground (PresenterBitmapContainer::LoadBitmap( xBackgroundNode, @@ -1090,7 +1088,7 @@ ViewStyle::~ViewStyle (void) const SharedBitmapDescriptor ViewStyle::GetBitmap (const OUString& rsBitmapName) const { - if (rsBitmapName == A2S("Background")) + if (rsBitmapName == "Background") return mpBackground; else return SharedBitmapDescriptor(); @@ -1115,13 +1113,13 @@ void StyleAssociationContainer::Read ( Reference<container::XNameAccess> xStyleAssociationList ( PresenterConfigurationAccess::GetConfigurationNode( rxThemeRoot, - A2S("StyleAssociations")), + "StyleAssociations"), UNO_QUERY); if (xStyleAssociationList.is()) { ::std::vector<rtl::OUString> aProperties (2); - aProperties[0] = A2S("ResourceURL"); - aProperties[1] = A2S("StyleName"); + aProperties[0] = "ResourceURL"; + aProperties[1] = "StyleName"; PresenterConfigurationAccess::ForAll( xStyleAssociationList, aProperties, diff --git a/sdext/source/presenter/PresenterTimer.cxx b/sdext/source/presenter/PresenterTimer.cxx index 41d896237732..e27d05539266 100644 --- a/sdext/source/presenter/PresenterTimer.cxx +++ b/sdext/source/presenter/PresenterTimer.cxx @@ -29,8 +29,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -#define A2S(pString) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(pString))) - namespace sdext { namespace presenter { namespace { @@ -388,7 +386,7 @@ PresenterClockTimer::PresenterClockTimer (const Reference<XComponentContext>& rx if (xFactory.is()) mxRequestCallback = Reference<awt::XRequestCallback>( xFactory->createInstanceWithContext( - A2S("com.sun.star.awt.AsyncCallback"), + "com.sun.star.awt.AsyncCallback", rxContext), UNO_QUERY_THROW); } diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx index 34dfb7e0b01c..76aaa7ca4fec 100644 --- a/sdext/source/presenter/PresenterToolBar.cxx +++ b/sdext/source/presenter/PresenterToolBar.cxx @@ -58,8 +58,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; using ::rtl::OUString; -#define A2S(pString) (::rtl::OUString(pString)) - namespace sdext { namespace presenter { static const sal_Int32 gnGapSize (20); @@ -644,7 +642,7 @@ void PresenterToolBar::CreateControls ( if (xToolBarNode.is()) { Reference<container::XNameAccess> xEntries ( - PresenterConfigurationAccess::GetConfigurationNode(xToolBarNode, A2S("Entries")), + PresenterConfigurationAccess::GetConfigurationNode(xToolBarNode, "Entries"), UNO_QUERY); Context aContext; aContext.mxPresenterHelper = mpPresenterController->GetPresenterHelper(); @@ -669,21 +667,21 @@ void PresenterToolBar::ProcessEntry ( // Type has to be present. OUString sType; - if ( ! (PresenterConfigurationAccess::GetProperty(rxProperties, A2S("Type")) >>= sType)) + if ( ! (PresenterConfigurationAccess::GetProperty(rxProperties, "Type") >>= sType)) return; OUString sName; - PresenterConfigurationAccess::GetProperty(rxProperties, A2S("Name")) >>= sName; + PresenterConfigurationAccess::GetProperty(rxProperties, "Name") >>= sName; // Read mode specific values. SharedElementMode pNormalMode (new ElementMode()); SharedElementMode pMouseOverMode (new ElementMode()); SharedElementMode pSelectedMode (new ElementMode()); SharedElementMode pDisabledMode (new ElementMode()); - pNormalMode->ReadElementMode(rxProperties, A2S("Normal"), pNormalMode, rContext); - pMouseOverMode->ReadElementMode(rxProperties, A2S("MouseOver"), pNormalMode, rContext); - pSelectedMode->ReadElementMode(rxProperties, A2S("Selected"), pNormalMode, rContext); - pDisabledMode->ReadElementMode(rxProperties, A2S("Disabled"), pNormalMode, rContext); + pNormalMode->ReadElementMode(rxProperties, "Normal", pNormalMode, rContext); + pMouseOverMode->ReadElementMode(rxProperties, "MouseOver", pNormalMode, rContext); + pSelectedMode->ReadElementMode(rxProperties, "Selected", pNormalMode, rContext); + pDisabledMode->ReadElementMode(rxProperties, "Disabled", pNormalMode, rContext); // Create new element. ::rtl::Reference<Element> pElement; @@ -1093,7 +1091,7 @@ PresenterToolBarView::PresenterToolBarView ( mxCanvas, rpPresenterController, PresenterToolBar::Center); - mpToolBar->Initialize(A2S("PresenterScreenSettings/ToolBars/ToolBar")); + mpToolBar->Initialize("PresenterScreenSettings/ToolBars/ToolBar"); if (mxWindow.is()) { @@ -1439,18 +1437,18 @@ void ElementMode::ReadElementMode ( } // Read action. - if ( ! (PresenterConfigurationAccess::GetProperty(xProperties, A2S("Action")) >>= msAction)) + if ( ! (PresenterConfigurationAccess::GetProperty(xProperties, "Action") >>= msAction)) if (rpDefaultMode.get()!=NULL) msAction = rpDefaultMode->msAction; // Read text and font OUString sText (rpDefaultMode.get()!=NULL ? rpDefaultMode->maText.GetText() : OUString()); - PresenterConfigurationAccess::GetProperty(xProperties, A2S("Text")) >>= sText; + PresenterConfigurationAccess::GetProperty(xProperties, "Text") >>= sText; Reference<container::XHierarchicalNameAccess> xFontNode ( - PresenterConfigurationAccess::GetProperty(xProperties, A2S("Font")), UNO_QUERY); + PresenterConfigurationAccess::GetProperty(xProperties, "Font"), UNO_QUERY); PresenterTheme::SharedFontDescriptor pFont (PresenterTheme::ReadFont( xFontNode, - A2S(""), + "", rpDefaultMode.get()!=NULL ? rpDefaultMode->maText.GetFont() : PresenterTheme::SharedFontDescriptor())); @@ -1458,10 +1456,10 @@ void ElementMode::ReadElementMode ( // Read bitmaps to display as icons. Reference<container::XHierarchicalNameAccess> xIconNode ( - PresenterConfigurationAccess::GetProperty(xProperties, A2S("Icon")), UNO_QUERY); + PresenterConfigurationAccess::GetProperty(xProperties, "Icon"), UNO_QUERY); mpIcon = PresenterBitmapContainer::LoadBitmap( xIconNode, - A2S(""), + "", rContext.mxPresenterHelper, rContext.mxCanvas, rpDefaultMode.get()!=NULL ? rpDefaultMode->mpIcon : SharedBitmapDescriptor()); @@ -1820,29 +1818,29 @@ OUString TimeFormatter::FormatTime (const oslDateTime& rTime) sText.append(OUString::valueOf( sal::static_int_cast<sal_Int32>(nHours>12 ? nHours-12 : nHours))); - sText.append(A2S(":")); + sText.append(":"); // Minutes const OUString sMinutes (OUString::valueOf(nMinutes)); if (sMinutes.getLength() == 1) - sText.append(A2S("0")); + sText.append("0"); sText.append(sMinutes); // Seconds if (mbIsShowSeconds) { - sText.append(A2S(":")); + sText.append(":"); const OUString sSeconds (OUString::valueOf(nSeconds)); if (sSeconds.getLength() == 1) - sText.append(A2S("0")); + sText.append("0"); sText.append(sSeconds); } if (mbIsAmPmFormat) { if (rTime.Hours < 12) - sText.append(A2S("am")); + sText.append("am"); else - sText.append(A2S("pm")); + sText.append("pm"); } return sText.makeStringAndClear(); } diff --git a/sdext/source/presenter/PresenterViewFactory.cxx b/sdext/source/presenter/PresenterViewFactory.cxx index fd5d341a5d82..bb5ec1aa5bcb 100644 --- a/sdext/source/presenter/PresenterViewFactory.cxx +++ b/sdext/source/presenter/PresenterViewFactory.cxx @@ -43,22 +43,20 @@ 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))) - namespace sdext { namespace presenter { const ::rtl::OUString PresenterViewFactory::msCurrentSlidePreviewViewURL( - A2S("private:resource/view/Presenter/CurrentSlidePreview")); + "private:resource/view/Presenter/CurrentSlidePreview"); const ::rtl::OUString PresenterViewFactory::msNextSlidePreviewViewURL( - A2S("private:resource/view/Presenter/NextSlidePreview")); + "private:resource/view/Presenter/NextSlidePreview"); const ::rtl::OUString PresenterViewFactory::msNotesViewURL( - A2S("private:resource/view/Presenter/Notes")); + "private:resource/view/Presenter/Notes"); const ::rtl::OUString PresenterViewFactory::msToolBarViewURL( - A2S("private:resource/view/Presenter/ToolBar")); + "private:resource/view/Presenter/ToolBar"); const ::rtl::OUString PresenterViewFactory::msSlideSorterURL( - A2S("private:resource/view/Presenter/SlideSorter")); + "private:resource/view/Presenter/SlideSorter"); const ::rtl::OUString PresenterViewFactory::msHelpViewURL( - A2S("private:resource/view/Presenter/Help")); + "private:resource/view/Presenter/Help"); //===== SimpleView ============================================================ diff --git a/sdext/source/presenter/PresenterWindowManager.cxx b/sdext/source/presenter/PresenterWindowManager.cxx index 9f1e8d074318..c195c5b4bc44 100644 --- a/sdext/source/presenter/PresenterWindowManager.cxx +++ b/sdext/source/presenter/PresenterWindowManager.cxx @@ -58,8 +58,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; using ::rtl::OUString; -#define A2S(pString) (::rtl::OUString(pString)) - namespace sdext { namespace presenter { //===== PresenterWindowManager ================================================ @@ -167,7 +165,7 @@ void PresenterWindowManager::SetTheme (const ::boost::shared_ptr<PresenterTheme> if (mpTheme.get() != NULL) { - mpBackgroundBitmap = mpTheme->GetBitmap(OUString(), A2S("Background")); + mpBackgroundBitmap = mpTheme->GetBitmap(OUString(), "Background"); } } @@ -536,7 +534,7 @@ void PresenterWindowManager::RestoreViewMode (void) mxComponentContext, OUString("/org.openoffice.Office.PresenterScreen/"), PresenterConfigurationAccess::READ_ONLY); - aConfiguration.GetConfigurationNode(A2S("Presenter/InitialViewMode")) >>= nMode; + aConfiguration.GetConfigurationNode("Presenter/InitialViewMode") >>= nMode; switch (nMode) { default: @@ -562,7 +560,7 @@ void PresenterWindowManager::StoreViewMode (const ViewMode eViewMode) mxComponentContext, OUString("/org.openoffice.Office.PresenterScreen/"), PresenterConfigurationAccess::READ_WRITE); - aConfiguration.GoToChild(A2S("Presenter")); + aConfiguration.GoToChild(OUString("Presenter")); Any aValue; switch (eViewMode) { @@ -580,7 +578,7 @@ void PresenterWindowManager::StoreViewMode (const ViewMode eViewMode) break; } - aConfiguration.SetProperty (A2S("InitialViewMode"), aValue); + aConfiguration.SetProperty ("InitialViewMode", aValue); aConfiguration.CommitChanges(); } catch (Exception&) diff --git a/slideshow/source/engine/shapes/drawinglayeranimation.cxx b/slideshow/source/engine/shapes/drawinglayeranimation.cxx index ced759233ad5..1d8ef74dcd1b 100644 --- a/slideshow/source/engine/shapes/drawinglayeranimation.cxx +++ b/slideshow/source/engine/shapes/drawinglayeranimation.cxx @@ -798,14 +798,14 @@ ActivityImpl::ActivityImpl( uno::Reference<drawing::XShape> const xShape( mpDrawShape->getXShape() ); uno::Reference<beans::XPropertySet> const xProps( xShape, uno::UNO_QUERY_THROW ); - getPropertyValue( meAnimKind, xProps, OUSTR("TextAnimationKind") ); + getPropertyValue( meAnimKind, xProps, "TextAnimationKind" ); OSL_ASSERT( meAnimKind != drawing::TextAnimationKind_NONE ); mbAlternate = (meAnimKind == drawing::TextAnimationKind_ALTERNATE); mbScrollIn = (meAnimKind == drawing::TextAnimationKind_SLIDE); // adopted from in AInfoBlinkText::ImplInit(): sal_Int16 nRepeat(0); - getPropertyValue( nRepeat, xProps, OUSTR("TextAnimationCount") ); + getPropertyValue( nRepeat, xProps, "TextAnimationCount" ); mnRepeat = nRepeat; if(mbAlternate) @@ -817,20 +817,20 @@ ActivityImpl::ActivityImpl( else { getPropertyValue( mbVisibleWhenStarted, xProps, - OUSTR("TextAnimationStartInside") ); + "TextAnimationStartInside" ); } // set visible when stopped getPropertyValue( mbVisibleWhenStopped, xProps, - OUSTR("TextAnimatiogonStopInside") ); + "TextAnimatiogonStopInside" ); // rotation: getPropertyValue( mfRotationAngle, xProps, - OUSTR("RotateAngle") ); + "RotateAngle" ); mfRotationAngle /= -100.0; // (switching direction) // set frequency sal_Int16 nDelay(0); - getPropertyValue( nDelay, xProps, OUSTR("TextAnimationDelay") ); + getPropertyValue( nDelay, xProps, "TextAnimationDelay" ); // set delay if not automatic mnFrequency = (nDelay ? nDelay : // default: @@ -850,10 +850,10 @@ ActivityImpl::ActivityImpl( } // Get animation direction - getPropertyValue( meDirection, xProps, OUSTR("TextAnimationDirection") ); + getPropertyValue( meDirection, xProps, "TextAnimationDirection" ); // Get step width. Negative means pixel, positive logical units - getPropertyValue( mnStepWidth, xProps, OUSTR("TextAnimationAmount") ); + getPropertyValue( mnStepWidth, xProps, "TextAnimationAmount" ); maContext.mpSubsettableShapeManager->addIntrinsicAnimationHandler( mpListener ); diff --git a/slideshow/source/engine/shapes/drawshape.cxx b/slideshow/source/engine/shapes/drawshape.cxx index e10882aec601..79c6d4ab672c 100644 --- a/slideshow/source/engine/shapes/drawshape.cxx +++ b/slideshow/source/engine/shapes/drawshape.cxx @@ -411,7 +411,7 @@ namespace slideshow uno::UNO_QUERY ); if( xPropSet.is() ) getPropertyValue( eKind, xPropSet, - OUSTR("TextAnimationKind") ); + "TextAnimationKind" ); mbDrawingLayerAnim = (eKind != drawing::TextAnimationKind_NONE); // must NOT be called from within initializer list, uses diff --git a/slideshow/source/engine/shapes/gdimtftools.cxx b/slideshow/source/engine/shapes/gdimtftools.cxx index 6292ec585056..10e65b3c5a09 100644 --- a/slideshow/source/engine/shapes/gdimtftools.cxx +++ b/slideshow/source/engine/shapes/gdimtftools.cxx @@ -199,7 +199,7 @@ bool getMetaFile( const uno::Reference< lang::XComponent >& xSource, // creating the graphic exporter uno::Reference< document::XExporter > xExporter( xFactory->createInstanceWithContext( - OUSTR("com.sun.star.drawing.GraphicExportFilter"), + "com.sun.star.drawing.GraphicExportFilter", rxContext), uno::UNO_QUERY ); uno::Reference< document::XFilter > xFilter( xExporter, uno::UNO_QUERY ); @@ -209,27 +209,27 @@ bool getMetaFile( const uno::Reference< lang::XComponent >& xSource, return false; uno::Sequence< beans::PropertyValue > aProps(3); - aProps[0].Name = OUSTR("FilterName"); - aProps[0].Value <<= OUSTR("SVM"); + aProps[0].Name = "FilterName"; + aProps[0].Value <<= OUString("SVM"); - aProps[1].Name = OUSTR("GraphicRenderer"); + aProps[1].Name = "GraphicRenderer"; aProps[1].Value <<= xRenderer; uno::Sequence< beans::PropertyValue > aFilterData(4); - aFilterData[0].Name = OUSTR("ScrollText"); + aFilterData[0].Name = "ScrollText"; aFilterData[0].Value <<= ((mtfLoadFlags & MTF_LOAD_SCROLL_TEXT_MTF) != 0); - aFilterData[1].Name = OUSTR("ExportOnlyBackground"); + aFilterData[1].Name = "ExportOnlyBackground"; aFilterData[1].Value <<= ((mtfLoadFlags & MTF_LOAD_BACKGROUND_ONLY) != 0); - aFilterData[2].Name = OUSTR("Version"); + aFilterData[2].Name = "Version"; aFilterData[2].Value <<= static_cast<sal_Int32>( SOFFICE_FILEFORMAT_50 ); - aFilterData[3].Name = OUSTR("CurrentPage"); + aFilterData[3].Name = "CurrentPage"; aFilterData[3].Value <<= uno::Reference< uno::XInterface >( xContainingPage, uno::UNO_QUERY_THROW ); - aProps[2].Name = OUSTR("FilterData"); + aProps[2].Name = "FilterData"; aProps[2].Value <<= aFilterData; xExporter->setSourceDocument( xSource ); diff --git a/slideshow/source/engine/shapes/shapeimporter.cxx b/slideshow/source/engine/shapes/shapeimporter.cxx index 1cead4b58d6f..1aef0501601a 100644 --- a/slideshow/source/engine/shapes/shapeimporter.cxx +++ b/slideshow/source/engine/shapes/shapeimporter.cxx @@ -78,7 +78,7 @@ bool importShapeGraphic( uno::Reference<beans::XPropertySet> const& xPropSet ) { rtl::OUString aURL; - if( !getPropertyValue( aURL, xPropSet, OUSTR("GraphicURL")) || + if( !getPropertyValue( aURL, xPropSet, "GraphicURL") || aURL.isEmpty() ) { // no or empty property - cannot import shape graphic @@ -198,7 +198,7 @@ ShapeOfGroup::ShapeOfGroup( ShapeSharedPtr const& pGroupSha mnPrio(nPrio) { // read bound rect - uno::Any const aTmpRect_( xPropSet->getPropertyValue( OUSTR("BoundRect") )); + uno::Any const aTmpRect_( xPropSet->getPropertyValue( "BoundRect" )); awt::Rectangle const aTmpRect( aTmpRect_.get<awt::Rectangle>() ); basegfx::B2DRectangle const groupPosSize( pGroupShape->getBounds() ); maPosOffset = basegfx::B2DPoint( aTmpRect.X - groupPosSize.getMinX(), @@ -378,15 +378,15 @@ ShapeSharedPtr ShapeImporter::createShape( sal_Int16 nTransparency(0); sal_Int32 nRotation(0); - getPropertyValue( eColorMode, xPropSet, OUSTR("GraphicColorMode") ); - getPropertyValue( nLuminance, xPropSet, OUSTR("AdjustLuminance") ); - getPropertyValue( nContrast, xPropSet, OUSTR("AdjustContrast") ); - getPropertyValue( nRed, xPropSet, OUSTR("AdjustRed") ); - getPropertyValue( nGreen, xPropSet, OUSTR("AdjustGreen") ); - getPropertyValue( nBlue, xPropSet, OUSTR("AdjustBlue") ); - getPropertyValue( nGamma, xPropSet, OUSTR("Gamma") ); - getPropertyValue( nTransparency, xPropSet, OUSTR("Transparency") ); - getPropertyValue( nRotation, xPropSet, OUSTR("RotateAngle") ); + getPropertyValue( eColorMode, xPropSet, "GraphicColorMode" ); + getPropertyValue( nLuminance, xPropSet, "AdjustLuminance" ); + getPropertyValue( nContrast, xPropSet, "AdjustContrast" ); + getPropertyValue( nRed, xPropSet, "AdjustRed" ); + getPropertyValue( nGreen, xPropSet, "AdjustGreen" ); + getPropertyValue( nBlue, xPropSet, "AdjustBlue" ); + getPropertyValue( nGamma, xPropSet, "Gamma" ); + getPropertyValue( nTransparency, xPropSet, "Transparency" ); + getPropertyValue( nRotation, xPropSet, "RotateAngle" ); GraphicAttr aGraphAttrs; aGraphAttrs.SetDrawMode( (GraphicDrawMode)eColorMode ); @@ -400,7 +400,7 @@ ShapeSharedPtr ShapeImporter::createShape( aGraphAttrs.SetRotation( static_cast<sal_uInt16>(nRotation*10) ); text::GraphicCrop aGraphCrop; - if( getPropertyValue( aGraphCrop, xPropSet, OUSTR("GraphicCrop") )) + if( getPropertyValue( aGraphCrop, xPropSet, "GraphicCrop" )) { aGraphAttrs.SetCrop( aGraphCrop.Left, aGraphCrop.Top, @@ -443,7 +443,7 @@ bool ShapeImporter::isSkip( bool bEmpty = false; if( getPropertyValue( bEmpty, xPropSet, - OUSTR("IsEmptyPresentationObject")) && + "IsEmptyPresentationObject") && bEmpty ) { return true; @@ -487,9 +487,9 @@ void ShapeImporter::importPolygons(uno::Reference<beans::XPropertySet> const& xP drawing::PointSequenceSequence aRetval; sal_Int32 nLineColor=0; double fLineWidth; - getPropertyValue( aRetval, xPropSet, OUSTR("PolyPolygon") ); - getPropertyValue( nLineColor, xPropSet, OUSTR("LineColor") ); - getPropertyValue( fLineWidth, xPropSet, OUSTR("LineWidth") ); + getPropertyValue( aRetval, xPropSet, "PolyPolygon" ); + getPropertyValue( nLineColor, xPropSet, "LineColor" ); + getPropertyValue( fLineWidth, xPropSet, "LineWidth" ); drawing::PointSequence* pOuterSequence = aRetval.getArray(); awt::Point* pInnerSequence = pOuterSequence->getArray(); diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx index cf672ae296ac..f64f68136da4 100644 --- a/slideshow/source/engine/slideshowimpl.cxx +++ b/slideshow/source/engine/slideshowimpl.cxx @@ -767,7 +767,7 @@ ActivitySharedPtr SlideShowImpl::createSlideTransition( sal_Int16 nTransitionType(0); if( !getPropertyValue( nTransitionType, xPropSet, - OUSTR("TransitionType" )) ) + "TransitionType") ) { OSL_TRACE( "createSlideTransition(): " "Could not extract slide transition type from XDrawPage - assuming no transition\n" ); @@ -777,7 +777,7 @@ ActivitySharedPtr SlideShowImpl::createSlideTransition( sal_Int16 nTransitionSubType(0); if( !getPropertyValue( nTransitionSubType, xPropSet, - OUSTR("TransitionSubtype" )) ) + "TransitionSubtype") ) { OSL_TRACE( "createSlideTransition(): " "Could not extract slide transition subtype from XDrawPage - assuming no transition\n" ); @@ -787,7 +787,7 @@ ActivitySharedPtr SlideShowImpl::createSlideTransition( bool bTransitionDirection(false); if( !getPropertyValue( bTransitionDirection, xPropSet, - OUSTR("TransitionDirection")) ) + "TransitionDirection") ) { OSL_TRACE( "createSlideTransition(): " "Could not extract slide transition direction from XDrawPage - assuming default direction\n" ); @@ -796,7 +796,7 @@ ActivitySharedPtr SlideShowImpl::createSlideTransition( sal_Int32 aUnoColor(0); if( !getPropertyValue( aUnoColor, xPropSet, - OUSTR("TransitionFadeColor")) ) + "TransitionFadeColor") ) { OSL_TRACE( "createSlideTransition(): " "Could not extract slide transition fade color from XDrawPage - assuming black\n" ); @@ -807,10 +807,10 @@ ActivitySharedPtr SlideShowImpl::createSlideTransition( uno::Any aSound; sal_Bool bLoopSound = sal_False; - if( !getPropertyValue( aSound, xPropSet, OUSTR("Sound")) ) + if( !getPropertyValue( aSound, xPropSet, "Sound") ) OSL_TRACE( "createSlideTransition(): Could not determine transition sound effect URL from XDrawPage - using no sound" ); - if( !getPropertyValue( bLoopSound, xPropSet, OUSTR("LoopSound") ) ) + if( !getPropertyValue( bLoopSound, xPropSet, "LoopSound" ) ) OSL_TRACE( "createSlideTransition(): Could not get slide property 'LoopSound' - using no sound" ); NumberAnimationSharedPtr pTransition( @@ -836,7 +836,7 @@ ActivitySharedPtr SlideShowImpl::createSlideTransition( double nTransitionDuration(0.0); if( !getPropertyValue( nTransitionDuration, xPropSet, - OUSTR("TransitionDuration")) ) + "TransitionDuration") ) { OSL_TRACE( "createSlideTransition(): " "Could not extract slide transition duration from XDrawPage - assuming no transition\n" ); @@ -846,7 +846,7 @@ ActivitySharedPtr SlideShowImpl::createSlideTransition( sal_Int32 nMinFrames(5); if( !getPropertyValue( nMinFrames, xPropSet, - OUSTR("MinimalFrameNumber")) ) + "MinimalFrameNumber") ) { OSL_TRACE( "createSlideTransition(): " "No minimal number of frames given - assuming 5\n" ); @@ -2310,10 +2310,10 @@ void SlideShowImpl::notifySlideEnded (const bool bReverse) if (xPropSet.is()) { xPropSet->setPropertyValue( - OUSTR("Change"), + "Change", uno::Any( static_cast<sal_Int32>(1) ) ); xPropSet->setPropertyValue( - OUSTR("Duration"), + "Duration", uno::Any( static_cast<sal_Int32>(time) ) ); } } diff --git a/slideshow/source/inc/tools.hxx b/slideshow/source/inc/tools.hxx index 15d723b09fa2..9aefb98857b8 100644 --- a/slideshow/source/inc/tools.hxx +++ b/slideshow/source/inc/tools.hxx @@ -39,8 +39,6 @@ #include <algorithm> -#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) - namespace com { namespace sun { namespace star { namespace beans { struct NamedValue; diff --git a/stoc/source/implementationregistration/implreg.cxx b/stoc/source/implementationregistration/implreg.cxx index f5d435f238e5..07b4129726cb 100644 --- a/stoc/source/implementationregistration/implreg.cxx +++ b/stoc/source/implementationregistration/implreg.cxx @@ -51,8 +51,6 @@ #include <io.h> #endif -#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) - using namespace com::sun::star; using namespace com::sun::star::uno; @@ -797,7 +795,7 @@ static void delete_all_singleton_entries( { Reference< registry::XRegistryKey > const & xSingleton = subkeys[ nPos ]; Reference< registry::XRegistryKey > xRegisteredImplNames( - xSingleton->openKey( OUSTR("REGISTERED_BY") ) ); + xSingleton->openKey( "REGISTERED_BY" ) ); if (xRegisteredImplNames.is() && xRegisteredImplNames->isValid()) { Sequence< OUString > registered_implnames; @@ -833,7 +831,7 @@ static void delete_all_singleton_entries( { // remove whole entry xRegisteredImplNames->closeKey(); - xSingleton->deleteKey( OUSTR("REGISTERED_BY") ); + xSingleton->deleteKey( "REGISTERED_BY" ); // registry key cannot provide its relative name, only absolute :( OUString abs( xSingleton->getKeyName() ); xSingletons_section->deleteKey( abs.copy( abs.lastIndexOf( '/' ) +1 ) ); @@ -953,7 +951,7 @@ static void insert_singletons( // throw( registry::InvalidRegistryException, registry::CannotRegisterImplementationException, RuntimeException ) { // singletons - Reference< registry::XRegistryKey > xKey( xImplKey->openKey( OUSTR("UNO/SINGLETONS") ) ); + Reference< registry::XRegistryKey > xKey( xImplKey->openKey( "UNO/SINGLETONS" ) ); if (xKey.is() && xKey->isValid()) { OUString implname( xImplKey->getKeyName().copy( sizeof ("/IMPLEMENTATIONS/") -1 ) ); @@ -968,7 +966,7 @@ static void insert_singletons( implname.getLength() + sizeof ("/IMPLEMENTATIONS//UNO/SINGLETONS/") -1 ) ); OUString service_name( xSingleton->getStringValue() ); - OUString keyname( OUSTR("/SINGLETONS/") + singleton_name ); + OUString keyname( "/SINGLETONS/" + singleton_name ); Reference< registry::XRegistryKey > xKey2( xDest->getRootKey()->openKey( keyname ) ); if (xKey2.is() && xKey2->isValid()) { @@ -979,12 +977,12 @@ static void insert_singletons( { Reference< container::XHierarchicalNameAccess > xTDMgr; OUString the_tdmgr = - OUSTR("/singletons/com.sun.star.reflection.theTypeDescriptionManager"); + "/singletons/com.sun.star.reflection.theTypeDescriptionManager"; xContext->getValueByName( the_tdmgr ) >>= xTDMgr; if (! xTDMgr.is()) { throw RuntimeException( - OUSTR("cannot get singleton ") + the_tdmgr, + "cannot get singleton " + the_tdmgr, Reference< XInterface >() ); } try @@ -994,7 +992,7 @@ static void insert_singletons( if (! xExistingService_td.is()) { throw RuntimeException( - OUSTR("cannot get service type description: ") + existing_name, + "cannot get service type description: " + existing_name, Reference< XInterface >() ); } @@ -1018,7 +1016,7 @@ static void insert_singletons( catch (const container::NoSuchElementException & exc) { throw RuntimeException( - OUSTR("cannot get service type description: ") + exc.Message, + "cannot get service type description: " + exc.Message, Reference< XInterface >() ); } } @@ -1037,11 +1035,11 @@ static void insert_singletons( } Reference< registry::XRegistryKey > xRegisteredImplNames( - xKey2->openKey( OUSTR("REGISTERED_BY") ) ); + xKey2->openKey( "REGISTERED_BY" ) ); if (!xRegisteredImplNames.is() || !xRegisteredImplNames->isValid()) { // create - xRegisteredImplNames = xKey2->createKey( OUSTR("REGISTERED_BY") ); + xRegisteredImplNames = xKey2->createKey( "REGISTERED_BY" ); } Sequence< OUString > implnames; @@ -1776,7 +1774,7 @@ void ImplementationRegistration::doRevoke( } } - xKey = xRootKey->openKey( OUSTR("/SINGLETONS") ); + xKey = xRootKey->openKey( "/SINGLETONS" ); if (xKey.is() && xKey->isValid()) { delete_all_singleton_entries( xKey, aNames ); diff --git a/stoc/source/implementationregistration/mergekeys.cxx b/stoc/source/implementationregistration/mergekeys.cxx index 5ebb2ddbdf39..489a27b4b37c 100644 --- a/stoc/source/implementationregistration/mergekeys.cxx +++ b/stoc/source/implementationregistration/mergekeys.cxx @@ -25,8 +25,6 @@ #include "mergekeys.hxx" -#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) - using namespace ::rtl; using namespace ::osl; using namespace ::com::sun::star::uno; @@ -56,12 +54,12 @@ static void mergeKeys( { if (!xSource.is() || !xSource->isValid()) { throw registry::InvalidRegistryException( - OUSTR("source key is null or invalid!"), + "source key is null or invalid!", Reference<XInterface>() ); } if (!xDest.is() || !xDest->isValid()) { throw registry::InvalidRegistryException( - OUSTR("destination key is null or invalid!"), + "destination key is null or invalid!", Reference<XInterface>() ); } @@ -151,7 +149,7 @@ void mergeKeys( { if (!xDest.is() || !xDest->isValid()) { throw registry::InvalidRegistryException( - OUSTR("destination key is null or invalid!"), + "destination key is null or invalid!", Reference<XInterface>() ); } if (xDest->isReadOnly()) diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx b/stoc/source/invocation_adapterfactory/iafactory.cxx index cd53f327054f..5e49a5e22c10 100644 --- a/stoc/source/invocation_adapterfactory/iafactory.cxx +++ b/stoc/source/invocation_adapterfactory/iafactory.cxx @@ -46,8 +46,6 @@ #include <com/sun/star/reflection/InvocationTargetException.hpp> #include "com/sun/star/uno/RuntimeException.hpp" -#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) - #define SERVICENAME "com.sun.star.script.InvocationAdapterFactory" #define IMPLNAME "com.sun.star.comp.stoc.InvocationAdapterFactory" @@ -291,7 +289,7 @@ bool AdapterImpl::coerce_assign( { // set runtime exception constructRuntimeException( - pOutExc, OUSTR("type coercion failed: ") + + pOutExc, "type coercion failed: " + reinterpret_cast< Exception const * >( p_exc->pData )->Message ); } @@ -311,8 +309,8 @@ bool AdapterImpl::coerce_assign( // set runtime exception constructRuntimeException( pOutExc, - OUSTR("type coercion failed: " - "conversion succeeded, but assignment failed?!") ); + "type coercion failed: " + "conversion succeeded, but assignment failed?!" ); } return succ; } @@ -362,7 +360,7 @@ static void handleInvokExc( uno_Any * pDest, uno_Any * pSource ) else { constructRuntimeException( - pDest, OUSTR("no exception has been thrown via invocation?!") ); + pDest, "no exception has been thrown via invocation?!" ); } } } @@ -555,7 +553,7 @@ void AdapterImpl::invoke( // set runtime exception constructRuntimeException( *ppException, - OUSTR("out params lengths differ after invocation call!") ); + "out params lengths differ after invocation call!" ); } // cleanup invok out params ::uno_destructData( &pOutIndices, m_pFactory->m_pShortSeqTD, 0 ); @@ -679,7 +677,7 @@ AdapterImpl::AdapterImpl( } delete [] m_pInterfaces; throw RuntimeException( - OUSTR("cannot retrieve all interface type infos!"), + "cannot retrieve all interface type infos!", Reference< XInterface >() ); } } @@ -691,7 +689,7 @@ AdapterImpl::AdapterImpl( if (! m_pReceiver) { throw RuntimeException( - OUSTR("cannot map receiver!"), Reference< XInterface >() ); + "cannot map receiver!", Reference< XInterface >() ); } m_pFactory->acquire(); @@ -708,8 +706,8 @@ FactoryImpl::FactoryImpl( Reference< XComponentContext > const & xContext ) m_pConvertToTD( 0 ) { // C++/UNO bridge - OUString aCppEnvTypeName = OUSTR(CPPU_CURRENT_LANGUAGE_BINDING_NAME); - OUString aUnoEnvTypeName = OUSTR(UNO_LB_UNO); + OUString aCppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; + OUString aUnoEnvTypeName = UNO_LB_UNO; m_aUno2Cpp = Mapping( aUnoEnvTypeName, aCppEnvTypeName ); m_aCpp2Uno = Mapping( aCppEnvTypeName, aUnoEnvTypeName ); OSL_ENSURE( @@ -763,7 +761,7 @@ FactoryImpl::FactoryImpl( Reference< XComponentContext > const & xContext ) !m_pAnySeqTD || !m_pShortSeqTD) { throw RuntimeException( - OUSTR("missing type descriptions!"), Reference< XInterface >() ); + "missing type descriptions!", Reference< XInterface >() ); } g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt ); @@ -888,7 +886,7 @@ Reference< XInterface > FactoryImpl::createAdapter( if (! xRet.is()) { throw RuntimeException( - OUSTR("mapping UNO to C++ failed!"), + "mapping UNO to C++ failed!", Reference< XInterface >() ); } } diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx index a8e85748a15a..e0ac281de0c6 100644 --- a/stoc/source/javavm/javavm.cxx +++ b/stoc/source/javavm/javavm.cxx @@ -80,7 +80,6 @@ #include <vector> #include "boost/noncopyable.hpp" #include "boost/scoped_array.hpp" -#define OUSTR(x) rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( x )) // Properties of the javavm can be put // as a komma separated list in this @@ -372,15 +371,15 @@ void getINetPropsFromConfig(stoc_javavm::JVM * pjvm, } // read socks settings -/* Reference<XRegistryKey> socksProxy_name = xRegistryRootKey->openKey(OUSTR("Settings/ooInetSOCKSProxyName")); +/* Reference<XRegistryKey> socksProxy_name = xRegistryRootKey->openKey("Settings/ooInetSOCKSProxyName"); if (socksProxy_name.is() && httpProxy_name->getStringValue().getLength()) { - OUString socksHost = OUSTR("socksProxyHost="); + OUString socksHost = "socksProxyHost="; socksHost += socksProxy_name->getStringValue(); // read http proxy port - Reference<XRegistryKey> socksProxy_port = xRegistryRootKey->openKey(OUSTR("Settings/ooInetSOCKSProxyPort")); + Reference<XRegistryKey> socksProxy_port = xRegistryRootKey->openKey("Settings/ooInetSOCKSProxyPort"); if (socksProxy_port.is() && socksProxy_port->getLongValue()) { - OUString socksPort = OUSTR("socksProxyPort="); + OUString socksPort = "socksProxyPort="; socksPort += OUString::valueOf(socksProxy_port->getLongValue()); pjvm->pushProp(socksHost); @@ -1329,7 +1328,7 @@ void SAL_CALL JavaVirtualMachine::elementReplaced( // this code was executed. Maybe it is a security feature. However, all attempts to debug the // SandboxSecurity class (maybe the VM invokes checkPackageAccess) failed. // jclass jcSandboxSec= pJNIEnv->FindClass("com.sun.star.lib.sandbox.SandboxSecurity"); -// if(pJNIEnv->ExceptionOccurred()) throw RuntimeException(OUSTR("JNI:FindClass com.sun.star.lib.sandbox.SandboxSecurity"), Reference<XInterface>()); +// if(pJNIEnv->ExceptionOccurred()) throw RuntimeException("JNI:FindClass com.sun.star.lib.sandbox.SandboxSecurity", Reference<XInterface>()); // jboolean bIsSand= pJNIEnv->IsInstanceOf( joSecur, jcSandboxSec); // The SecurityManagers class Name must be com.sun.star.lib.sandbox.SandboxSecurity jclass jcSec= pJNIEnv->GetObjectClass( joSecur); diff --git a/stoc/source/loader/dllcomponentloader.cxx b/stoc/source/loader/dllcomponentloader.cxx index bc7f8e03ea08..038fc3cfcccb 100644 --- a/stoc/source/loader/dllcomponentloader.cxx +++ b/stoc/source/loader/dllcomponentloader.cxx @@ -45,8 +45,6 @@ #define SERVICENAME "com.sun.star.loader.SharedLibrary" #define IMPLNAME "com.sun.star.comp.stoc.DLLComponentLoader" -#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) - using namespace com::sun::star; using namespace com::sun::star::uno; @@ -204,7 +202,7 @@ Reference<XInterface> SAL_CALL DllComponentLoader::activate( { aPrefix = xPrefixKey->getAsciiValue(); if( !aPrefix.isEmpty() ) - aPrefix = aPrefix + OUSTR("_"); + aPrefix = aPrefix + "_"; } } } diff --git a/stoc/source/proxy_factory/proxyfac.cxx b/stoc/source/proxy_factory/proxyfac.cxx index cf211e017b85..34d060c95371 100644 --- a/stoc/source/proxy_factory/proxyfac.cxx +++ b/stoc/source/proxy_factory/proxyfac.cxx @@ -37,7 +37,6 @@ #include "com/sun/star/reflection/XProxyFactory.hpp" #include "com/sun/star/uno/RuntimeException.hpp" -#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) #define SERVICE_NAME "com.sun.star.reflection.ProxyFactory" #define IMPL_NAME "com.sun.star.comp.reflection.ProxyFactory" @@ -54,12 +53,12 @@ static rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT; static OUString proxyfac_getImplementationName() { - return OUSTR(IMPL_NAME); + return OUString(IMPL_NAME); } static Sequence< OUString > proxyfac_getSupportedServiceNames() { - OUString str_name = OUSTR(SERVICE_NAME); + OUString str_name = SERVICE_NAME; return Sequence< OUString >( &str_name, 1 ); } @@ -402,8 +401,8 @@ Any ProxyRoot::queryAggregation( Type const & rType ) //______________________________________________________________________________ FactoryImpl::FactoryImpl() { - OUString uno = OUSTR(UNO_LB_UNO); - OUString cpp = OUSTR(CPPU_CURRENT_LANGUAGE_BINDING_NAME); + OUString uno = UNO_LB_UNO; + OUString cpp = CPPU_CURRENT_LANGUAGE_BINDING_NAME; uno_getEnvironment( reinterpret_cast< uno_Environment ** >( &m_uno_env ), uno.pData, 0 ); diff --git a/stoc/source/security/access_controller.cxx b/stoc/source/security/access_controller.cxx index 09ffc70cfb32..987d6ec6c57f 100644 --- a/stoc/source/security/access_controller.cxx +++ b/stoc/source/security/access_controller.cxx @@ -50,7 +50,6 @@ #include "bootstrapservices.hxx" -#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) #define SERVICE_NAME "com.sun.star.security.AccessController" #define IMPL_NAME "com.sun.star.security.comp.stoc.AccessController" #define USER_CREDS "access-control.user-credentials" @@ -70,7 +69,7 @@ extern ::rtl_StandardModuleCount g_moduleCount; namespace stoc_sec { // static stuff initialized when loading lib -static OUString s_envType = OUSTR(CPPU_CURRENT_LANGUAGE_BINDING_NAME); +static OUString s_envType = CPPU_CURRENT_LANGUAGE_BINDING_NAME; const char s_acRestriction[] = "access-control.restriction"; //################################################################################################## @@ -477,7 +476,7 @@ AccessController::AccessController( Reference< XComponentContext > const & xComp // to something other than "off" depending on various UNO_AC* bootstrap // variables that are no longer supported, so this is mostly dead code now: OUString mode; - if (m_xComponentContext->getValueByName( OUSTR("/services/" SERVICE_NAME "/mode") ) >>= mode) + if (m_xComponentContext->getValueByName( "/services/" SERVICE_NAME "/mode" ) >>= mode) { if ( mode == "off" ) { @@ -494,12 +493,12 @@ AccessController::AccessController( Reference< XComponentContext > const & xComp else if ( mode == "single-user" ) { m_xComponentContext->getValueByName( - OUSTR("/services/" SERVICE_NAME "/single-user-id") ) >>= m_singleUserId; + "/services/" SERVICE_NAME "/single-user-id" ) >>= m_singleUserId; if (m_singleUserId.isEmpty()) { throw RuntimeException( - OUSTR("expected a user id in component context entry " - "\"/services/" SERVICE_NAME "/single-user-id\"!"), + "expected a user id in component context entry " + "\"/services/" SERVICE_NAME "/single-user-id\"!", (OWeakObject *)this ); } m_mode = SINGLE_USER; @@ -515,7 +514,7 @@ AccessController::AccessController( Reference< XComponentContext > const & xComp { sal_Int32 cacheSize = 0; // multi-user cache size if (! (m_xComponentContext->getValueByName( - OUSTR("/services/" SERVICE_NAME "/user-cache-size") ) >>= cacheSize)) + "/services/" SERVICE_NAME "/user-cache-size" ) >>= cacheSize)) { cacheSize = 128; // reasonable default? } @@ -550,14 +549,14 @@ void AccessController::initialize( if (SINGLE_USER != m_mode) // only if in single-user mode { throw RuntimeException( - OUSTR("invalid call: ac must be in \"single-user\" mode!"), (OWeakObject *)this ); + "invalid call: ac must be in \"single-user\" mode!", (OWeakObject *)this ); } OUString userId; arguments[ 0 ] >>= userId; if ( userId.isEmpty() ) { throw RuntimeException( - OUSTR("expected a user-id as first argument!"), (OWeakObject *)this ); + "expected a user-id as first argument!", (OWeakObject *)this ); } // assured that no sync is necessary: no check happens at this forking time m_singleUserId = userId; @@ -573,7 +572,7 @@ Reference< security::XPolicy > const & AccessController::getPolicy() { Reference< security::XPolicy > xPolicy; m_xComponentContext->getValueByName( - OUSTR("/singletons/com.sun.star.security.thePolicy") ) >>= xPolicy; + "/singletons/com.sun.star.security.thePolicy" ) >>= xPolicy; if (xPolicy.is()) { MutexGuard guard( m_mutex ); @@ -585,7 +584,7 @@ Reference< security::XPolicy > const & AccessController::getPolicy() else { throw SecurityException( - OUSTR("cannot get policy singleton!"), (OWeakObject *)this ); + "cannot get policy singleton!", (OWeakObject *)this ); } } return m_xPolicy; @@ -719,12 +718,12 @@ PermissionCollection AccessController::getEffectivePermissions( { if (xContext.is()) { - xContext->getValueByName( OUSTR(USER_CREDS ".id") ) >>= userId; + xContext->getValueByName( USER_CREDS ".id" ) >>= userId; } if ( userId.isEmpty() ) { throw SecurityException( - OUSTR("cannot determine current user in multi-user ac!"), (OWeakObject *)this ); + "cannot determine current user in multi-user ac!", (OWeakObject *)this ); } // lookup policy for user @@ -880,7 +879,7 @@ void AccessController::checkPermission( if (rBHelper.bDisposed) { throw lang::DisposedException( - OUSTR("checkPermission() call on disposed AccessController!"), (OWeakObject *)this ); + "checkPermission() call on disposed AccessController!", (OWeakObject *)this ); } if (OFF == m_mode) @@ -910,7 +909,7 @@ Any AccessController::doRestricted( if (rBHelper.bDisposed) { throw lang::DisposedException( - OUSTR("doRestricted() call on disposed AccessController!"), (OWeakObject *)this ); + "doRestricted() call on disposed AccessController!", (OWeakObject *)this ); } if (OFF == m_mode) // optimize this way, because no dynamic check will be performed @@ -943,7 +942,7 @@ Any AccessController::doPrivileged( if (rBHelper.bDisposed) { throw lang::DisposedException( - OUSTR("doPrivileged() call on disposed AccessController!"), (OWeakObject *)this ); + "doPrivileged() call on disposed AccessController!", (OWeakObject *)this ); } if (OFF == m_mode) // no dynamic check will be performed @@ -978,7 +977,7 @@ Reference< security::XAccessControlContext > AccessController::getContext() if (rBHelper.bDisposed) { throw lang::DisposedException( - OUSTR("getContext() call on disposed AccessController!"), (OWeakObject *)this ); + "getContext() call on disposed AccessController!", (OWeakObject *)this ); } if (OFF == m_mode) // optimize this way, because no dynamic check will be performed @@ -1042,7 +1041,7 @@ Sequence< OUString > ac_getSupportedServiceNames() SAL_THROW(()) //-------------------------------------------------------------------------------------------------- OUString ac_getImplementationName() SAL_THROW(()) { - return OUSTR(IMPL_NAME); + return OUString(IMPL_NAME); } //-------------------------------------------------------------------------------------------------- Reference< XInterface > SAL_CALL filepolicy_create( diff --git a/stoc/source/security/file_policy.cxx b/stoc/source/security/file_policy.cxx index d7fa8c4899d6..c05bd884733c 100644 --- a/stoc/source/security/file_policy.cxx +++ b/stoc/source/security/file_policy.cxx @@ -40,7 +40,6 @@ #include "bootstrapservices.hxx" -#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) #define SERVICE_NAME "com.sun.star.security.Policy" #define IMPL_NAME "com.sun.star.security.comp.stoc.FilePolicy" @@ -236,7 +235,7 @@ OUString PolicyReader::assureQuotedToken() { OUString token( getQuotedToken() ); if (token.isEmpty()) - error( OUSTR("unexpected end of file!") ); + error( "unexpected end of file!" ); return token; } //__________________________________________________________________________________________________ @@ -247,7 +246,7 @@ OUString PolicyReader::getQuotedToken() OUStringBuffer buf( 32 ); sal_Unicode c = get(); if ('\"' != c) - error( OUSTR("expected quoting >\"< character!") ); + error( "expected quoting >\"< character!" ); c = get(); while ('\0' != c && '\"' != c) { @@ -262,7 +261,7 @@ OUString PolicyReader::assureToken() { OUString token( getToken() ); if ( token.isEmpty()) - error( OUSTR("unexpected end of file!") ); + error( "unexpected end of file!" ); return token; } //__________________________________________________________________________________________________ @@ -326,7 +325,7 @@ void PolicyReader::skipWhiteSpace() } else { - error( OUSTR("expected C/C++ like comment!") ); + error( "expected C/C++ like comment!" ); } } else if ('#' == c) // script like comment @@ -364,13 +363,13 @@ sal_Unicode PolicyReader::get() sal_Bool eof; oslFileError rc = ::osl_isEndOfFile( m_file, &eof ); if (osl_File_E_None != rc) - error( OUSTR("checking eof failed!") ); + error( "checking eof failed!" ); if (eof) return '\0'; rc = ::osl_readLine( m_file, reinterpret_cast< sal_Sequence ** >( &m_line ) ); if (osl_File_E_None != rc) - error( OUSTR("read line failed!") ); + error( "read line failed!" ); ++m_linepos; if (! m_line.getLength()) // empty line read { @@ -404,7 +403,7 @@ PolicyReader::PolicyReader( OUString const & fileName, AccessControl & ac ) , m_pos( 1 ) // force readline , m_back( '\0' ) { - ac.checkFilePermission( m_fileName, OUSTR("read") ); + ac.checkFilePermission( m_fileName, "read" ); if (osl_File_E_None != ::osl_openFile( m_fileName.pData, &m_file, osl_File_OpenFlag_Read )) { OUStringBuffer buf( 32 ); @@ -444,11 +443,11 @@ void FilePolicy::refresh() // supported, so this is effectively dead code): OUString fileName; m_xComponentContext->getValueByName( - OUSTR("/implementations/" IMPL_NAME "/file-name") ) >>= fileName; + "/implementations/" IMPL_NAME "/file-name" ) >>= fileName; if ( fileName.isEmpty() ) { throw RuntimeException( - OUSTR("name of policy file unknown!"), + "name of policy file unknown!", (OWeakObject *)this ); } @@ -462,7 +461,7 @@ void FilePolicy::refresh() while (!token.isEmpty()) { if ( token != s_grant ) - reader.error( OUSTR("expected >grant< token!") ); + reader.error( "expected >grant< token!" ); OUString userId; token = reader.assureToken(); if ( token == s_user ) // next token is user-id @@ -471,13 +470,13 @@ void FilePolicy::refresh() token = reader.assureToken(); } if ( token != s_openBrace ) - reader.error( OUSTR("expected opening brace >{<!") ); + reader.error( "expected opening brace >{<!" ); token = reader.assureToken(); // permissions list while ( token != s_closingBrace ) { if ( token != s_permission ) - reader.error( OUSTR("expected >permission< or closing brace >}<!") ); + reader.error( "expected >permission< or closing brace >}<!" ); token = reader.assureToken(); // permission type Any perm; @@ -506,7 +505,7 @@ void FilePolicy::refresh() } else { - reader.error( OUSTR("expected permission type!") ); + reader.error( "expected permission type!" ); } reader.assureToken( ';' ); @@ -588,7 +587,7 @@ Sequence< OUString > filepolicy_getSupportedServiceNames() SAL_THROW(()) //-------------------------------------------------------------------------------------------------- OUString filepolicy_getImplementationName() SAL_THROW(()) { - return OUSTR(IMPL_NAME); + return OUString(IMPL_NAME); } } diff --git a/stoc/source/security/permissions.cxx b/stoc/source/security/permissions.cxx index 704158b3e1d8..e97e379ef56a 100644 --- a/stoc/source/security/permissions.cxx +++ b/stoc/source/security/permissions.cxx @@ -35,8 +35,6 @@ #include "permissions.h" -#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) - using namespace ::std; using namespace ::osl; @@ -353,7 +351,7 @@ FilePermission::FilePermission( // correct win drive letters if (9 < m_url.getLength() && '|' == m_url[ 9 ]) // file:///X| { - static OUString s_colon = OUSTR(":"); + static OUString s_colon = ":"; // common case in API is a ':' (sal), so convert '|' to ':' m_url = m_url.replaceAt( 9, 1, s_colon ); } @@ -483,7 +481,7 @@ bool AllPermission::implies( Permission const & ) const SAL_THROW(()) //__________________________________________________________________________________________________ OUString AllPermission::toString() const SAL_THROW(()) { - return OUSTR("com.sun.star.security.AllPermission"); + return OUString("com.sun.star.security.AllPermission"); } //################################################################################################## diff --git a/stoc/source/servicemanager/servicemanager.cxx b/stoc/source/servicemanager/servicemanager.cxx index abcbffa498bd..c58e065ae69b 100644 --- a/stoc/source/servicemanager/servicemanager.cxx +++ b/stoc/source/servicemanager/servicemanager.cxx @@ -59,8 +59,6 @@ #include <bootstrapservices.hxx> -#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) - using namespace com::sun::star; using namespace com::sun::star::uno; @@ -284,7 +282,7 @@ beans::Property PropertySetInfo_Impl::getPropertyByName( OUString const & name ) return p[ nPos ]; } throw beans::UnknownPropertyException( - OUSTR("unknown property: ") + name, Reference< XInterface >() ); + "unknown property: " + name, Reference< XInterface >() ); } //__________________________________________________________________________________________________ sal_Bool PropertySetInfo_Impl::hasPropertyByName( OUString const & name ) @@ -574,7 +572,7 @@ inline void OServiceManager::check_undisposed() const if (is_disposed()) { throw lang::DisposedException( - OUSTR("service manager instance has already been disposed!"), + "service manager instance has already been disposed!", (OWeakObject *)this ); } } @@ -597,7 +595,7 @@ class OServiceManagerWrapper : public OServiceManagerMutex, public t_OServiceMan if (! m_root.is()) { throw lang::DisposedException( - OUSTR("service manager instance has already been disposed!"), + "service manager instance has already been disposed!", Reference< XInterface >() ); } return m_root; @@ -954,7 +952,7 @@ Reference<XPropertySetInfo > OServiceManager::getPropertySetInfo() { Sequence< beans::Property > seq( 1 ); seq[ 0 ] = beans::Property( - OUSTR("DefaultContext"), -1, ::getCppuType( &m_xContext ), 0 ); + "DefaultContext", -1, ::getCppuType( &m_xContext ), 0 ); Reference< beans::XPropertySetInfo > xInfo( new PropertySetInfo_Impl( seq ) ); MutexGuard aGuard( m_mutex ); @@ -1835,9 +1833,9 @@ Reference<XPropertySetInfo > ORegistryServiceManager::getPropertySetInfo() { Sequence< beans::Property > seq( 2 ); seq[ 0 ] = beans::Property( - OUSTR("DefaultContext"), -1, ::getCppuType( &m_xContext ), 0 ); + "DefaultContext", -1, ::getCppuType( &m_xContext ), 0 ); seq[ 1 ] = beans::Property( - OUSTR("Registry"), -1, ::getCppuType( &m_xRegistry ), + "Registry", -1, ::getCppuType( &m_xRegistry ), beans::PropertyAttribute::READONLY ); Reference< beans::XPropertySetInfo > xInfo( new PropertySetInfo_Impl( seq ) ); diff --git a/stoc/source/tdmanager/tdmgr.cxx b/stoc/source/tdmanager/tdmgr.cxx index 2047f4a69042..b1c5976ba77c 100644 --- a/stoc/source/tdmanager/tdmgr.cxx +++ b/stoc/source/tdmanager/tdmgr.cxx @@ -463,7 +463,7 @@ void SAL_CALL ManagerImpl::insert( const Any & rElement ) catch (const container::NoSuchElementException & exc) { throw lang::IllegalArgumentException( - OUSTR("NoSuchElementException occurred: ") + + "NoSuchElementException occurred: " + exc.Message, static_cast<OWeakObject *>(this), -1 /* unknown */ ); } @@ -484,8 +484,8 @@ void SAL_CALL ManagerImpl::insert( const Any & rElement ) catch (const IncompatibleTypeException & exc) { throw lang::IllegalArgumentException( - OUSTR("Rejecting types due to " - "incompatibility! ") + exc.m_cause, + "Rejecting types due to " + "incompatibility! " + exc.m_cause, static_cast<OWeakObject *>(this), 0 ); } } @@ -499,13 +499,13 @@ void SAL_CALL ManagerImpl::insert( const Any & rElement ) catch (const reflection::NoSuchTypeNameException & exc) { throw lang::IllegalArgumentException( - OUSTR("NoSuchTypeNameException occurred: ") + exc.Message, + "NoSuchTypeNameException occurred: " + exc.Message, static_cast<OWeakObject *>(this), -1 /* unknown */ ); } catch (const reflection::InvalidTypeNameException & exc) { throw lang::IllegalArgumentException( - OUSTR("InvalidTypeNameException occurred: ") + exc.Message, + "InvalidTypeNameException occurred: " + exc.Message, static_cast<OWeakObject *>(this), -1 /* unknown */ ); } } diff --git a/stoc/source/tdmanager/tdmgr_check.cxx b/stoc/source/tdmanager/tdmgr_check.cxx index 416cd0340166..c9679dd22bdf 100644 --- a/stoc/source/tdmanager/tdmgr_check.cxx +++ b/stoc/source/tdmanager/tdmgr_check.cxx @@ -44,12 +44,12 @@ namespace { OUString getTypeClassName( TypeClass tc ) { typelib_EnumTypeDescription * typeDescr = 0; - OUString name = OUSTR("com.sun.star.uno.TypeClass"); + OUString name = "com.sun.star.uno.TypeClass"; typelib_typedescription_getByName( reinterpret_cast<typelib_TypeDescription **>(&typeDescr), name.pData ); OSL_ASSERT( typeDescr != 0 ); if (typeDescr == 0) - return OUSTR("Cannot get type description of ") + name; + return "Cannot get type description of " + name; typelib_typedescription_complete( reinterpret_cast<typelib_TypeDescription **>(&typeDescr) ); @@ -63,7 +63,7 @@ OUString getTypeClassName( TypeClass tc ) if (nPos >= 0) name = typeDescr->ppEnumNames[ nPos ]; else - name = OUSTR("unknown TypeClass value: ") + + name = "unknown TypeClass value: " + OUString::valueOf( (sal_Int32) tc ); typelib_typedescription_release( @@ -119,7 +119,7 @@ void checkSeq( Sequence< Reference<T> > const & newTypes, if (len != existingTypes.getLength()) { if (!optionalMode || len < newTypes.getLength()) - typeError( OUSTR("Different number of types!"), context ); + typeError( "Different number of types!", context ); len = existingTypes.getLength(); } @@ -141,9 +141,9 @@ void checkEnum( Reference<reflection::XEnumTypeDescription> const & xExistingTD ) { if (xNewTD->getEnumNames() != xExistingTD->getEnumNames()) - typeError( OUSTR("ENUM names don't match!"), xNewTD->getName() ); + typeError( "ENUM names don't match!", xNewTD->getName() ); if (xNewTD->getEnumValues() != xExistingTD->getEnumValues()) - typeError( OUSTR("ENUM values don't match!"), xNewTD->getName() ); + typeError( "ENUM values don't match!", xNewTD->getName() ); } void checkStruct( @@ -151,12 +151,12 @@ void checkStruct( Reference<reflection::XCompoundTypeDescription> const & xExistingTD ) { check( xNewTD->getBaseType(), xExistingTD->getBaseType(), - xNewTD->getName() + OUSTR(", base type") ); + xNewTD->getName() + ", base type" ); checkSeq( xNewTD->getMemberTypes(), xExistingTD->getMemberTypes(), - xNewTD->getName() + OUSTR(", member types") ); + xNewTD->getName() + ", member types" ); if (xNewTD->getMemberNames() != xExistingTD->getMemberNames()) - typeError( OUSTR("Different member names!"), xNewTD->getName() ); + typeError( "Different member names!", xNewTD->getName() ); if (xNewTD->getTypeClass() == TypeClass_STRUCT) { @@ -168,15 +168,15 @@ void checkStruct( { if (xNewStructTD->getTypeParameters() != xExistingStructTD->getTypeParameters()) - typeError( OUSTR("Different type parameters of instantiated " - "polymorphic STRUCT!"), xNewTD->getName() ); + typeError( "Different type parameters of instantiated " + "polymorphic STRUCT!", xNewTD->getName() ); checkSeq( xNewStructTD->getTypeArguments(), xExistingStructTD->getTypeArguments(), - xNewTD->getName() + OUSTR(", argument types") ); + xNewTD->getName() + ", argument types" ); } else if (xNewStructTD.is() || xExistingStructTD.is()) - typeError( OUSTR("Mixing polymorphic STRUCT types " - "with non-polymorphic!"), xNewTD->getName() ); + typeError( "Mixing polymorphic STRUCT types " + "with non-polymorphic!", xNewTD->getName() ); } } @@ -185,11 +185,11 @@ void checkInterface( Reference<reflection::XInterfaceTypeDescription2> const & xExistingTD ) { checkSeq( xNewTD->getBaseTypes(), xExistingTD->getBaseTypes(), - xNewTD->getName() + OUSTR(", base types") ); + xNewTD->getName() + ", base types" ); checkSeq(xNewTD->getOptionalBaseTypes(),xExistingTD->getOptionalBaseTypes(), - xNewTD->getName() + OUSTR(", optional base types") ); + xNewTD->getName() + ", optional base types" ); checkSeq( xNewTD->getMembers(), xExistingTD->getMembers(), - xNewTD->getName() + OUSTR(", members") ); + xNewTD->getName() + ", members" ); } void checkRestParam( Reference<reflection::XParameter> const & xNewParam, @@ -197,7 +197,7 @@ void checkRestParam( Reference<reflection::XParameter> const & xNewParam, OUString const & context ) { if (xNewParam->isRestParameter() != xExistingParam->isRestParameter()) - typeError( OUSTR("Different ... parameters specified!"), context ); + typeError( "Different ... parameters specified!", context ); } void checkRestParam( @@ -213,7 +213,7 @@ void checkParameters( Sequence< Reference<T> > const & newParams, { sal_Int32 len = newParams.getLength(); if (len != existingParams.getLength()) - typeError( OUSTR("Different number of parameters!"), context_ ); + typeError( "Different number of parameters!", context_ ); Reference<T> const * pNewParams = newParams.getConstArray(); Reference<T> const * pExistingParams = existingParams.getConstArray(); for ( sal_Int32 pos = 0; pos < len; ++pos ) @@ -240,9 +240,9 @@ void checkParameters( Sequence< Reference<T> > const & newParams, check( xNewParam->getType(), xExistingParam->getType(), context ); if (xNewParam->isIn() != xExistingParam->isIn()) - typeError( OUSTR("IN attribute differs!"), context ); + typeError( "IN attribute differs!", context ); if (xNewParam->isOut() != xExistingParam->isOut()) - typeError( OUSTR("OUT attribute differs!"), context ); + typeError( "OUT attribute differs!", context ); checkRestParam( xNewParam, xExistingParam, context ); } } @@ -255,14 +255,14 @@ static void checkMethod( xNewTD->getName() ); if (xNewTD->isOneway() != xExistingTD->isOneway()) - typeError( OUSTR("Methods have differing OneWay attribute!"), + typeError( "Methods have differing OneWay attribute!", xNewTD->getName() ); checkParameters( xNewTD->getParameters(), xExistingTD->getParameters(), xNewTD->getName() ); checkSeq( xNewTD->getExceptions(), xExistingTD->getExceptions(), - xNewTD->getName() + OUSTR(", declared exceptions") ); + xNewTD->getName() + ", declared exceptions" ); } void checkAttribute( @@ -271,18 +271,18 @@ void checkAttribute( const & xExistingTD ) { if (xNewTD->isReadOnly() != xExistingTD->isReadOnly()) - typeError( OUSTR("ReadOnly attribute differs!"), xNewTD->getName() ); + typeError( "ReadOnly attribute differs!", xNewTD->getName() ); check( xNewTD->getType(), xExistingTD->getType(), - xNewTD->getName() + OUSTR(", attribute type") ); + xNewTD->getName() + ", attribute type" ); if (xNewTD->isBound() != xExistingTD->isBound()) - typeError( OUSTR("Bound attribute differs!"), xNewTD->getName() ); + typeError( "Bound attribute differs!", xNewTD->getName() ); checkSeq( xNewTD->getGetExceptions(), xExistingTD->getGetExceptions(), - xNewTD->getName() + OUSTR(", getter exceptions") ); + xNewTD->getName() + ", getter exceptions" ); checkSeq( xNewTD->getSetExceptions(), xExistingTD->getSetExceptions(), - xNewTD->getName() + OUSTR(", setter exceptions") ); + xNewTD->getName() + ", setter exceptions" ); } void checkProperty( @@ -315,7 +315,7 @@ void checkSingleton( sal_Bool ifaceBased = xNewTD->isInterfaceBased(); if (ifaceBased != xExistingTD->isInterfaceBased()) typeError( - OUSTR("Mixing interface and NON-interface based singletons!"), + "Mixing interface and NON-interface based singletons!", xNewTD->getName() ); if (ifaceBased) check( xNewTD->getInterface(), xExistingTD->getInterface(), @@ -331,7 +331,7 @@ void checkService( { sal_Bool singleIfaceBased = xNewTD->isSingleInterfaceBased(); if (singleIfaceBased != xExistingTD->isSingleInterfaceBased()) - typeError( OUSTR("Mixing interface and NON-interface based services!"), + typeError( "Mixing interface and NON-interface based services!", xNewTD->getName() ); if (singleIfaceBased) { @@ -343,7 +343,7 @@ void checkService( existingCtors( xExistingTD->getConstructors() ); sal_Int32 len = newCtors.getLength(); if (len != existingCtors.getLength()) - typeError( OUSTR("Different number of service constructors!"), + typeError( "Different number of service constructors!", xNewTD->getName() ); Reference<reflection::XServiceConstructorDescription> const * pNewCtors = newCtors.getConstArray(); @@ -377,24 +377,24 @@ void checkService( xExistingCtor->getParameters(), context ); checkSeq( xNewCtor->getExceptions(), xExistingCtor->getExceptions(), - context + OUSTR(", exceptions") ); + context + ", exceptions" ); } } else // old-style service descriptions: { checkSeq( xNewTD->getMandatoryServices(), xExistingTD->getMandatoryServices(), - xNewTD->getName() + OUSTR(", mandatory services") ); + xNewTD->getName() + ", mandatory services" ); checkSeq( xNewTD->getOptionalServices(), xExistingTD->getOptionalServices(), - xNewTD->getName() + OUSTR(", optional services"), + xNewTD->getName() + ", optional services", true /* optionalMode */ ); checkSeq( xNewTD->getMandatoryInterfaces(), xExistingTD->getMandatoryInterfaces(), - xNewTD->getName() + OUSTR(", mandatory interfaces") ); + xNewTD->getName() + ", mandatory interfaces" ); checkSeq( xNewTD->getOptionalInterfaces(), xExistingTD->getOptionalInterfaces(), - xNewTD->getName() + OUSTR(", optional interfaces"), + xNewTD->getName() + ", optional interfaces", true /* optionalMode */ ); Sequence< Reference<reflection::XPropertyTypeDescription> > @@ -402,7 +402,7 @@ void checkService( Sequence< Reference<reflection::XPropertyTypeDescription> > existingProperties( xExistingTD->getProperties() ); checkSeq( newProperties, existingProperties, - xNewTD->getName() + OUSTR(", properties"), + xNewTD->getName() + ", properties", true /* optionalMode */ ); if (newProperties.getLength() > existingProperties.getLength()) { @@ -414,7 +414,7 @@ void checkService( { if ((pNewProperties[pos]->getPropertyFlags() & beans::PropertyAttribute::OPTIONAL) == 0) - typeError( OUSTR("New property is not OPTIONAL!"), + typeError( "New property is not OPTIONAL!", pNewProperties[pos]->getName() ); } } @@ -521,7 +521,7 @@ void check( Reference<reflection::XTypeDescription> const & xNewTD, xNewTD, UNO_QUERY_THROW )->getConstantValue() != Reference<reflection::XConstantTypeDescription>( xExistingTD, UNO_QUERY_THROW )->getConstantValue()) - typeError( OUSTR("Different constant value!"), xNewTD->getName() ); + typeError( "Different constant value!", xNewTD->getName() ); break; case TypeClass_CONSTANTS: checkSeq( Reference<reflection::XConstantsTypeDescription>( diff --git a/stoc/source/tdmanager/tdmgr_common.hxx b/stoc/source/tdmanager/tdmgr_common.hxx index a4830a70d1a9..33f1a2ad307b 100644 --- a/stoc/source/tdmanager/tdmgr_common.hxx +++ b/stoc/source/tdmanager/tdmgr_common.hxx @@ -24,7 +24,6 @@ #include "com/sun/star/reflection/XTypeDescription.hpp" -#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) #define ARLEN(x) (sizeof (x) / sizeof *(x)) diff --git a/stoc/test/javavm/jvm_interaction/interactionhandler.cxx b/stoc/test/javavm/jvm_interaction/interactionhandler.cxx index 51771e07df25..5fca937a54f1 100644 --- a/stoc/test/javavm/jvm_interaction/interactionhandler.cxx +++ b/stoc/test/javavm/jvm_interaction/interactionhandler.cxx @@ -62,7 +62,6 @@ using ::rtl::OUString; using ::rtl::OUStringToOString; using ::rtl::OString; -#define OUSTR( x ) OUString(RTL_CONSTASCII_USTRINGPARAM( x )) #define INTERACTION_HANDLER_NAME "java-vm.interaction-handler" class Context: public WeakImplHelper1<XCurrentContext> @@ -79,7 +78,7 @@ class InteractionHandler: public WeakImplHelper1<XInteractionHandler> Any SAL_CALL Context::getValueByName( const OUString& Name) throw (RuntimeException) { Any retVal; - if( Name.equals( OUSTR(INTERACTION_HANDLER_NAME))) + if( Name.equals( INTERACTION_HANDLER_NAME)) { Reference<XInteractionHandler> handler( static_cast<XWeak*>(new InteractionHandler()), UNO_QUERY); diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx index 5389f10e528f..c75a61bb6cc2 100644 --- a/svtools/source/config/colorcfg.cxx +++ b/svtools/source/config/colorcfg.cxx @@ -48,7 +48,7 @@ using ::rtl::OUString; namespace svtools { -#define C2U(cChar) OUString::createFromAscii(cChar) +#define cChar OUString::createFromAscii(cChar) static const sal_Char cColor[] = "/Color"; static const sal_Char cColorSchemes[] = "ColorSchemes/"; sal_Int32 nColorRefCount_Impl = 0; @@ -161,8 +161,8 @@ uno::Sequence< OUString> ColorConfig_Impl::GetPropertyNames(const rtl::OUString& { RTL_CONSTASCII_USTRINGPARAM("/SQLComment"), sal_False } }; int nIndex = 0; - OUString sColor = C2U(cColor); - OUString sBase(C2U(cColorSchemes)); + OUString sColor = cColor; + OUString sBase(cColorSchemes); sBase += utl::wrapConfigurationElementName(rScheme); const int nCount = ColorConfigEntryCount; for(sal_Int32 i = 0; i < 4 * nCount; i+= 4) @@ -183,9 +183,9 @@ uno::Sequence< OUString> ColorConfig_Impl::GetPropertyNames(const rtl::OUString& } ColorConfig_Impl::ColorConfig_Impl(sal_Bool bEditMode) : - ConfigItem(C2U("Office.UI/ColorScheme")), + ConfigItem("Office.UI/ColorScheme"), m_bEditMode(bEditMode), - m_sIsVisible(C2U("/IsVisible")) + m_sIsVisible("/IsVisible") { if(!m_bEditMode) { @@ -215,7 +215,7 @@ void ColorConfig_Impl::Load(const rtl::OUString& rScheme) { //detect current scheme name uno::Sequence < ::rtl::OUString > aCurrent(1); - aCurrent.getArray()[0] = C2U("CurrentColorScheme"); + aCurrent.getArray()[0] = "CurrentColorScheme"; uno::Sequence< uno::Any > aCurrentVal = GetProperties( aCurrent ); aCurrentVal.getConstArray()[0] >>= sScheme; } @@ -274,7 +274,7 @@ void ColorConfig_Impl::Commit() nIndex++; } } - rtl::OUString sNode(C2U("ColorSchemes")); + rtl::OUString sNode("ColorSchemes"); SetSetProperties(sNode, aPropValues); CommitCurrentSchemeName(); @@ -284,7 +284,7 @@ void ColorConfig_Impl::CommitCurrentSchemeName() { //save current scheme name uno::Sequence < ::rtl::OUString > aCurrent(1); - aCurrent.getArray()[0] = C2U("CurrentColorScheme"); + aCurrent.getArray()[0] = "CurrentColorScheme"; uno::Sequence< uno::Any > aCurrentVal(1); aCurrentVal.getArray()[0] <<= m_sLoadedScheme; PutProperties(aCurrent, aCurrentVal); @@ -301,12 +301,12 @@ void ColorConfig_Impl::SetColorConfigValue(ColorConfigEntry eValue, const ColorC uno::Sequence< ::rtl::OUString> ColorConfig_Impl::GetSchemeNames() { - return GetNodeNames(C2U("ColorSchemes")); + return GetNodeNames("ColorSchemes"); } sal_Bool ColorConfig_Impl::AddScheme(const rtl::OUString& rScheme) { - if(ConfigItem::AddNode(C2U("ColorSchemes"), rScheme)) + if(ConfigItem::AddNode("ColorSchemes", rScheme)) { m_sLoadedScheme = rScheme; Commit(); @@ -319,7 +319,7 @@ sal_Bool ColorConfig_Impl::RemoveScheme(const rtl::OUString& rScheme) { uno::Sequence< rtl::OUString > aElements(1); aElements.getArray()[0] = rScheme; - return ClearNodeElements(C2U("ColorSchemes"), aElements); + return ClearNodeElements("ColorSchemes", aElements); } void ColorConfig_Impl::SettingsChanged() diff --git a/svtools/source/config/fontsubstconfig.cxx b/svtools/source/config/fontsubstconfig.cxx index 8f3cc2d7f18a..b70ebffea546 100644 --- a/svtools/source/config/fontsubstconfig.cxx +++ b/svtools/source/config/fontsubstconfig.cxx @@ -34,7 +34,7 @@ using namespace com::sun::star::beans; using ::rtl::OUString; -#define C2U(cChar) OUString::createFromAscii(cChar) +#define cChar OUString::createFromAscii(cChar) const sal_Char cReplacement[] = "Replacement"; const sal_Char cFontPairs[] = "FontPairs"; @@ -59,13 +59,13 @@ SvtFontSubstConfig::SvtFontSubstConfig() : RTL_LOGFILE_CONTEXT(aLog, "svtools SvtFontSubstConfig::SvtFontSubstConfig()"); Sequence<OUString> aNames(1); - aNames.getArray()[0] = C2U(cReplacement); + aNames.getArray()[0] = cReplacement; Sequence<Any> aValues = GetProperties(aNames); DBG_ASSERT(aValues.getConstArray()[0].hasValue(), "no value available"); if(aValues.getConstArray()[0].hasValue()) bIsEnabled = *(sal_Bool*)aValues.getConstArray()[0].getValue(); - OUString sPropPrefix(C2U(cFontPairs)); + OUString sPropPrefix(cFontPairs); Sequence<OUString> aNodeNames = GetNodeNames(sPropPrefix, CONFIG_NAME_LOCAL_PATH); const OUString* pNodeNames = aNodeNames.getConstArray(); Sequence<OUString> aPropNames(aNodeNames.getLength() * 4); @@ -78,10 +78,10 @@ SvtFontSubstConfig::SvtFontSubstConfig() : OUString sStart(sPropPrefix); sStart += pNodeNames[nNode]; sStart += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); - pNames[nName] = sStart; pNames[nName++] += C2U(cReplaceFont); - pNames[nName] = sStart; pNames[nName++] += C2U(cSubstituteFont); - pNames[nName] = sStart; pNames[nName++] += C2U(cAlways); - pNames[nName] = sStart; pNames[nName++] += C2U(cOnScreenOnly); + pNames[nName] = sStart; pNames[nName++] += cReplaceFont; + pNames[nName] = sStart; pNames[nName++] += cSubstituteFont; + pNames[nName] = sStart; pNames[nName++] += cAlways; + pNames[nName] = sStart; pNames[nName++] += cOnScreenOnly; } Sequence<Any> aNodeValues = GetProperties(aPropNames); const Any* pNodeValues = aNodeValues.getConstArray(); @@ -109,12 +109,12 @@ void SvtFontSubstConfig::Notify( const com::sun::star::uno::Sequence< rtl::OUStr void SvtFontSubstConfig::Commit() { Sequence<OUString> aNames(1); - aNames.getArray()[0] = C2U(cReplacement); + aNames.getArray()[0] = cReplacement; Sequence<Any> aValues(1); aValues.getArray()[0].setValue(&bIsEnabled, ::getBooleanCppuType()); PutProperties(aNames, aValues); - OUString sNode(C2U(cFontPairs)); + OUString sNode(cFontPairs); if(pImpl->aSubstArr.empty()) ClearNodeSet(sNode); else @@ -123,18 +123,18 @@ void SvtFontSubstConfig::Commit() PropertyValue* pSetValues = aSetValues.getArray(); sal_Int32 nSetValue = 0; - const OUString sReplaceFont(C2U(cReplaceFont)); - const OUString sSubstituteFont(C2U(cSubstituteFont)); - const OUString sAlways(C2U(cAlways)); - const OUString sOnScreenOnly(C2U(cOnScreenOnly)); + const OUString sReplaceFont(cReplaceFont); + const OUString sSubstituteFont(cSubstituteFont); + const OUString sAlways(cAlways); + const OUString sOnScreenOnly(cOnScreenOnly); const uno::Type& rBoolType = ::getBooleanCppuType(); for(size_t i = 0; i < pImpl->aSubstArr.size(); i++) { OUString sPrefix(sNode); - sPrefix += C2U("/_"); + sPrefix += "/_"; sPrefix += OUString::valueOf((sal_Int32)i); - sPrefix += C2U("/"); + sPrefix += "/"; SubstitutionStruct& pSubst = pImpl->aSubstArr[i]; pSetValues[nSetValue].Name = sPrefix; pSetValues[nSetValue].Name += sReplaceFont; diff --git a/svtools/source/config/htmlcfg.cxx b/svtools/source/config/htmlcfg.cxx index 1002ccc9cfc6..de0232010d29 100644 --- a/svtools/source/config/htmlcfg.cxx +++ b/svtools/source/config/htmlcfg.cxx @@ -43,7 +43,7 @@ using namespace com::sun::star::uno; using ::rtl::OUString; -#define C2U(cChar) OUString::createFromAscii(cChar) +#define cChar OUString::createFromAscii(cChar) struct HtmlOptions_Impl { @@ -98,13 +98,13 @@ const Sequence<OUString>& SvxHtmlOptions::GetPropertyNames() aNames.realloc(nCount); OUString* pNames = aNames.getArray(); for(int i = 0; i < nCount; i++) - pNames[i] = C2U(aPropNames[i]); + pNames[i] = OUString::createFromAscii(aPropNames[i]); } return aNames; } // ----------------------------------------------------------------------- SvxHtmlOptions::SvxHtmlOptions() : - ConfigItem(C2U("Office.Common/Filter/HTML")) + ConfigItem("Office.Common/Filter/HTML") { pImp = new HtmlOptions_Impl; Load( GetPropertyNames() ); diff --git a/svtools/source/misc/bindablecontrolhelper.cxx b/svtools/source/misc/bindablecontrolhelper.cxx index 9c577477aad7..217272d24477 100644 --- a/svtools/source/misc/bindablecontrolhelper.cxx +++ b/svtools/source/misc/bindablecontrolhelper.cxx @@ -36,11 +36,7 @@ namespace svt { //........................................................................ -#ifndef C2U -#define C2U(cChar) rtl::OUString::createFromAscii(cChar) -#endif - - using namespace ::com::sun::star; +using namespace ::com::sun::star; bool lcl_isNamedRange( const rtl::OUString& sAddress, const uno::Reference< frame::XModel >& xModel, table::CellRangeAddress& aAddress ) { @@ -85,24 +81,24 @@ BindableControlHelper::ApplyListSourceAndBindableData( const com::sun::star::uno // RefCell - convert from XL // pretend we converted the imported string address into the // appropriate address structure - uno::Reference< beans::XPropertySet > xConvertor( xFac->createInstance( C2U( "com.sun.star.table.CellAddressConversion" )), uno::UNO_QUERY ); + uno::Reference< beans::XPropertySet > xConvertor( xFac->createInstance( "com.sun.star.table.CellAddressConversion"), uno::UNO_QUERY ); table::CellAddress aAddress; if ( xConvertor.is() ) { // we need this service to properly convert XL notation also // Should be easy to extend - xConvertor->setPropertyValue( C2U( "XL_A1_Representation" ), uno::makeAny( rsCtrlSource ) ); - xConvertor->getPropertyValue( C2U( "Address" ) ) >>= aAddress; + xConvertor->setPropertyValue( "XL_A1_Representation", uno::makeAny( rsCtrlSource ) ); + xConvertor->getPropertyValue( "Address" ) >>= aAddress; } beans::NamedValue aArg1; - aArg1.Name = C2U("BoundCell"); + aArg1.Name = "BoundCell"; aArg1.Value <<= aAddress; uno::Sequence< uno::Any > aArgs(1); aArgs[ 0 ] <<= aArg1; - uno::Reference< form::binding::XValueBinding > xBinding( xFac->createInstanceWithArguments( C2U("com.sun.star.table.CellValueBinding" ), aArgs ), uno::UNO_QUERY ); + uno::Reference< form::binding::XValueBinding > xBinding( xFac->createInstanceWithArguments( "com.sun.star.table.CellValueBinding", aArgs ), uno::UNO_QUERY ); xBindable->setValueBinding( xBinding ); } else if ( xBindable.is() ) // reset it @@ -115,7 +111,7 @@ BindableControlHelper::ApplyListSourceAndBindableData( const com::sun::star::uno // RefCell - convert from XL // pretend we converted the imported string address into the // appropriate address structure - uno::Reference< beans::XPropertySet > xConvertor( xFac->createInstance( C2U( "com.sun.star.table.CellRangeAddressConversion" )), uno::UNO_QUERY ); + uno::Reference< beans::XPropertySet > xConvertor( xFac->createInstance( "com.sun.star.table.CellRangeAddressConversion"), uno::UNO_QUERY ); table::CellRangeAddress aAddress; if ( xConvertor.is() ) { @@ -123,19 +119,19 @@ BindableControlHelper::ApplyListSourceAndBindableData( const com::sun::star::uno { // we need this service to properly convert XL notation also // Should be easy to extend - xConvertor->setPropertyValue( C2U( "XL_A1_Representation" ), uno::makeAny( rsRowSource ) ); - xConvertor->getPropertyValue( C2U( "Address" ) ) >>= aAddress; + xConvertor->setPropertyValue( "XL_A1_Representation", uno::makeAny( rsRowSource ) ); + xConvertor->getPropertyValue( "Address" ) >>= aAddress; } } beans::NamedValue aArg1; - aArg1.Name = C2U("CellRange"); + aArg1.Name = "CellRange"; aArg1.Value <<= aAddress; uno::Sequence< uno::Any > aArgs(1); aArgs[ 0 ] <<= aArg1; - uno::Reference< form::binding::XListEntrySource > xSource( xFac->createInstanceWithArguments( C2U("com.sun.star.table.CellRangeListSource" ), aArgs ), uno::UNO_QUERY ); + uno::Reference< form::binding::XListEntrySource > xSource( xFac->createInstanceWithArguments( "com.sun.star.table.CellRangeListSource", aArgs ), uno::UNO_QUERY ); xListEntrySink->setListEntrySource( xSource ); } else if ( xListEntrySink.is() ) // reset diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx index c36517d553f3..f8bbd9e99699 100644 --- a/svx/source/dialog/langbox.cxx +++ b/svx/source/dialog/langbox.cxx @@ -227,17 +227,17 @@ void SvxLanguageBox::SetLanguageList( sal_Int16 nLangList, if (LANG_LIST_SPELL_AVAIL & nLangList) { - aTmp = xAvail->getAvailableLocales( A2OU( SN_SPELLCHECKER ) ); + aTmp = xAvail->getAvailableLocales( SN_SPELLCHECKER ); aSpellAvailLang = lcl_LocaleSeqToLangSeq( aTmp ); } if (LANG_LIST_HYPH_AVAIL & nLangList) { - aTmp = xAvail->getAvailableLocales( A2OU( SN_HYPHENATOR ) ); + aTmp = xAvail->getAvailableLocales( SN_HYPHENATOR ); aHyphAvailLang = lcl_LocaleSeqToLangSeq( aTmp ); } if (LANG_LIST_THES_AVAIL & nLangList) { - aTmp = xAvail->getAvailableLocales( A2OU( SN_THESAURUS ) ); + aTmp = xAvail->getAvailableLocales( SN_THESAURUS ); aThesAvailLang = lcl_LocaleSeqToLangSeq( aTmp ); } } diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index 7f0fd525c9ed..6b1e52352ba6 100644 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -51,7 +51,7 @@ using namespace com::sun::star::lang; using namespace com::sun::star::container; using rtl::OUString; -#define C2U(cChar) rtl::OUString::createFromAscii(cChar) +#define cChar rtl::OUString::createFromAscii(cChar) SFX_IMPL_CHILDWINDOW( SvxRubyChildWindow, SID_RUBY_DIALOG ); @@ -186,11 +186,11 @@ void SvxRubyData_Impl::AssertOneEntry() Sequence<PropertyValue>& rValues = aRubyValues.getArray()[0]; rValues.realloc(5); PropertyValue* pValues = rValues.getArray(); - pValues[0].Name = C2U(cRubyBaseText); - pValues[1].Name = C2U(cRubyText); - pValues[2].Name = C2U(cRubyAdjust); - pValues[3].Name = C2U(cRubyIsAbove); - pValues[4].Name = C2U(cRubyCharStyleName); + pValues[0].Name = cRubyBaseText; + pValues[1].Name = cRubyText; + pValues[2].Name = cRubyAdjust; + pValues[3].Name = cRubyIsAbove; + pValues[4].Name = cRubyCharStyleName; } } @@ -317,13 +317,13 @@ void SvxRubyDialog::Activate() try { Reference<XNameAccess> xFam = xSupplier->getStyleFamilies(); - Any aChar = xFam->getByName(C2U(cCharacterStyles)); + Any aChar = xFam->getByName(cCharacterStyles); Reference<XNameContainer> xChar; aChar >>= xChar; Reference<XIndexAccess> xCharIdx(xChar, UNO_QUERY); if(xCharIdx.is()) { - OUString sUIName(C2U(cDisplayName)); + OUString sUIName(cDisplayName); for(sal_Int32 nStyle = 0; nStyle < xCharIdx->getCount(); nStyle++) { Any aStyle = xCharIdx->getByIndex(nStyle); @@ -488,7 +488,7 @@ void SvxRubyDialog::Update() if(nPosition > -1) m_pPositionLB->SelectEntryPos(nPosition ? 1 : 0); if(!nLen || (bCharStyleEqual && sCharStyleName.isEmpty())) - sCharStyleName = C2U(cRubies); + sCharStyleName = cRubies; if(!sCharStyleName.isEmpty()) { for(sal_uInt16 i = 0; i < m_pCharStyleLB->GetEntryCount(); i++) diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx index 38cdd3a7e5c2..05be4aa986c9 100644 --- a/svx/source/dialog/svxbmpnumvalueset.cxx +++ b/svx/source/dialog/svxbmpnumvalueset.cxx @@ -64,7 +64,7 @@ using namespace com::sun::star::container; using namespace com::sun::star::style; using rtl::OUString; -#define C2U(cChar) OUString::createFromAscii(cChar) +#define cChar OUString::createFromAscii(cChar) #define NUM_PAGETYPE_BULLET 0 #define NUM_PAGETYPE_SINGLENUM 1 #define NUM_PAGETYPE_NUM 2 @@ -211,7 +211,7 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) aOrgRect.TopLeft(), aRectSize, *pVDev ); // Now comes the text - const OUString sValue(C2U(cValue)); + const OUString sValue(cValue); if( NUM_PAGETYPE_SINGLENUM == nPageType || NUM_PAGETYPE_BULLET == nPageType ) { @@ -333,7 +333,7 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) for(sal_Int32 nParentLevel = i - nStartLevel; nParentLevel < i; nParentLevel++) { OUString sTmp(sLevelTexts[nParentLevel]); - sTmp += C2U("."); + sTmp += "."; lcl_PaintLevel(pVDev, aNumberingTypes[nParentLevel], sBulletChars[nParentLevel], diff --git a/svx/source/smarttags/SmartTagMgr.cxx b/svx/source/smarttags/SmartTagMgr.cxx index 229214f19616..a5eb25d39963 100644 --- a/svx/source/smarttags/SmartTagMgr.cxx +++ b/svx/source/smarttags/SmartTagMgr.cxx @@ -48,7 +48,7 @@ using namespace com::sun::star; using namespace com::sun::star::uno; using namespace com::sun::star::i18n; -#define C2U(cChar) rtl::OUString::createFromAscii(cChar) +#define cChar rtl::OUString::createFromAscii(cChar) SmartTagMgr::SmartTagMgr( const rtl::OUString& rApplicationName ) @@ -199,7 +199,7 @@ void SmartTagMgr::WriteConfiguration( const bool* pIsLabelTextWithSmartTags, try { - mxConfigurationSettings->setPropertyValue( C2U("RecognizeSmartTags"), aEnabled ); + mxConfigurationSettings->setPropertyValue( "RecognizeSmartTags", aEnabled ); bCommit = true; } catch ( ::com::sun::star::uno::Exception& ) @@ -221,7 +221,7 @@ void SmartTagMgr::WriteConfiguration( const bool* pIsLabelTextWithSmartTags, try { - mxConfigurationSettings->setPropertyValue( C2U("ExcludedSmartTagTypes"), aNewTypes ); + mxConfigurationSettings->setPropertyValue( "ExcludedSmartTagTypes", aNewTypes ); bCommit = true; } catch ( ::com::sun::star::uno::Exception& ) @@ -296,9 +296,9 @@ void SmartTagMgr::changesOccurred( const util::ChangesEvent& rEvent ) throw( Run rtl::OUString sTemp; pElementChanges[i].Accessor >>= sTemp; - if ( sTemp == C2U( "ExcludedSmartTagTypes" ) ) + if ( sTemp == "ExcludedSmartTagTypes" ) bExcludedTypes = true; - else if ( sTemp == C2U( "RecognizeSmartTags" ) ) + else if ( sTemp == "RecognizeSmartTags" ) bRecognize = true; } @@ -316,7 +316,7 @@ void SmartTagMgr::LoadLibraries() return; // load recognizers: No recognizers -> nothing to do. - Reference < container::XEnumeration > rEnum = rContent->createContentEnumeration( C2U("com.sun.star.smarttags.SmartTagRecognizer")); + Reference < container::XEnumeration > rEnum = rContent->createContentEnumeration( "com.sun.star.smarttags.SmartTagRecognizer"); if ( !rEnum.is() || !rEnum->hasMoreElements() ) return; @@ -343,7 +343,7 @@ void SmartTagMgr::LoadLibraries() } // load actions: No actions -> nothing to do. - rEnum = rContent->createContentEnumeration( C2U("com.sun.star.smarttags.SmartTagAction")); + rEnum = rContent->createContentEnumeration( "com.sun.star.smarttags.SmartTagAction"); if ( !rEnum.is() ) return; @@ -377,9 +377,9 @@ void SmartTagMgr::LoadLibraries() */ void SmartTagMgr::PrepareConfiguration( const rtl::OUString& rConfigurationGroupName ) { - Any aAny = makeAny( C2U( "/org.openoffice.Office.Common/SmartTags/" ) + rConfigurationGroupName ); + Any aAny = makeAny( "/org.openoffice.Office.Common/SmartTags/" + rConfigurationGroupName ); beans::PropertyValue aPathArgument; - aPathArgument.Name = C2U( "nodepath" ); + aPathArgument.Name = "nodepath"; aPathArgument.Value = aAny; Sequence< Any > aArguments( 1 ); aArguments[ 0 ] <<= aPathArgument; @@ -390,7 +390,7 @@ void SmartTagMgr::PrepareConfiguration( const rtl::OUString& rConfigurationGroup try { xConfigurationAccess = xConfProv->createInstanceWithArguments( - C2U("com.sun.star.configuration.ConfigurationUpdateAccess" ), aArguments ); + "com.sun.star.configuration.ConfigurationUpdateAccess", aArguments ); } catch ( uno::Exception& ) { @@ -402,7 +402,7 @@ void SmartTagMgr::PrepareConfiguration( const rtl::OUString& rConfigurationGroup try { xConfigurationAccess = xConfProv->createInstanceWithArguments( - C2U("com.sun.star.configuration.ConfigurationAccess" ), aArguments ); + "com.sun.star.configuration.ConfigurationAccess", aArguments ); } catch ( uno::Exception& ) { @@ -424,7 +424,7 @@ void SmartTagMgr::ReadConfiguration( bool bExcludedTypes, bool bRecognize ) { maDisabledSmartTagTypes.clear(); - Any aAny = mxConfigurationSettings->getPropertyValue( C2U("ExcludedSmartTagTypes") ); + Any aAny = mxConfigurationSettings->getPropertyValue( "ExcludedSmartTagTypes" ); Sequence< rtl::OUString > aValues; aAny >>= aValues; @@ -436,7 +436,7 @@ void SmartTagMgr::ReadConfiguration( bool bExcludedTypes, bool bRecognize ) if ( bRecognize ) { - Any aAny = mxConfigurationSettings->getPropertyValue( C2U("RecognizeSmartTags") ); + Any aAny = mxConfigurationSettings->getPropertyValue( "RecognizeSmartTags" ); sal_Bool bValue = sal_True; aAny >>= bValue; diff --git a/svx/source/table/accessibletableshape.cxx b/svx/source/table/accessibletableshape.cxx index b362b144664e..00ca92be5a14 100644 --- a/svx/source/table/accessibletableshape.cxx +++ b/svx/source/table/accessibletableshape.cxx @@ -47,7 +47,7 @@ using namespace ::com::sun::star::drawing; using namespace ::com::sun::star::table; using namespace ::com::sun::star::container; -#define C2U(x) OUString(RTL_CONSTASCII_USTRINGPARAM(x)) +#define x OUString(RTL_CONSTASCII_USTRINGPARAM(x)) namespace accessibility { @@ -259,7 +259,7 @@ void AccessibleTableShape::Init() { Reference< XPropertySet > xSet( mxShape, UNO_QUERY_THROW ); - Reference< XTable > xTable( xSet->getPropertyValue(C2U("Model")), UNO_QUERY_THROW ); + Reference< XTable > xTable( xSet->getPropertyValue("Model"), UNO_QUERY_THROW ); mxImpl->init( this, xTable ); } diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx index b766059962cc..119fdd3be16e 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx @@ -43,7 +43,7 @@ using namespace ::com::sun::star; #define SERVICE_IMPLEMENTATION_NAME ::rtl::OUString("com.sun.star.comp.linguistic2.ChineseTranslationDialog") #define SERVICE_NAME ::rtl::OUString("com.sun.star.linguistic2.ChineseTranslationDialog") -#define C2U(cChar) rtl::OUString::createFromAscii(cChar) +#define cChar rtl::OUString::createFromAscii(cChar) ChineseTranslation_UnoDialog::ChineseTranslation_UnoDialog( const uno::Reference< uno::XComponentContext >& xContext ) : m_xCC( xContext ) @@ -233,15 +233,15 @@ uno::Any SAL_CALL ChineseTranslation_UnoDialog::getPropertyValue( const ::rtl::O m_pDialog->getSettings( bDirectionToSimplified, bTranslateCommonTerms ); } - if( rPropertyName.equals( C2U("IsDirectionToSimplified") ) ) + if( rPropertyName.equals( "IsDirectionToSimplified" ) ) { aRet <<= bDirectionToSimplified; } - else if( rPropertyName.equals( C2U("IsUseCharacterVariants") ) ) + else if( rPropertyName.equals( "IsUseCharacterVariants" ) ) { aRet <<= bUseCharacterVariants; } - else if( rPropertyName.equals( C2U("IsTranslateCommonTerms") ) ) + else if( rPropertyName.equals( "IsTranslateCommonTerms" ) ) { aRet <<= bTranslateCommonTerms; } diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx index 28234df6f529..51bd22c699ae 100644 --- a/sw/source/ui/lingu/olmenu.cxx +++ b/sw/source/ui/lingu/olmenu.cxx @@ -797,7 +797,7 @@ void SwSpellPopup::Execute( sal_uInt16 nId ) { if (bGrammarResults) { - SvtLinguConfig().SetProperty( A2OU( UPN_IS_GRAMMAR_INTERACTIVE ), uno::makeAny( sal_True )); + SvtLinguConfig().SetProperty( UPN_IS_GRAMMAR_INTERACTIVE, uno::makeAny( sal_True )); } pSh->Left(CRSR_SKIP_CHARS, sal_False, 1, sal_False ); { diff --git a/testtools/source/bridgetest/bridgetest.cxx b/testtools/source/bridgetest/bridgetest.cxx index ff57fe7a6bb6..f14a641f1af7 100644 --- a/testtools/source/bridgetest/bridgetest.cxx +++ b/testtools/source/bridgetest/bridgetest.cxx @@ -66,7 +66,6 @@ using ::rtl::OUStringToOString; #define SERVICENAME "com.sun.star.test.bridge.BridgeTest" #define IMPLNAME "com.sun.star.comp.bridge.BridgeTest" -#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) #define STRING_TEST_CONSTANT "\" paco\' chorizo\\\' \"\'" namespace bridge_test @@ -384,7 +383,7 @@ static sal_Bool performTest( (TestElement &) aData, true, '@', 17, 0x1234, 0xFEDC, 0x12345678, 0xFEDCBA98, SAL_CONST_INT64(0x123456789ABCDEF0), SAL_CONST_UINT64(0xFEDCBA9876543210), 17.0815f, 3.1415926359, - TestEnum_LOLA, OUSTR(STRING_TEST_CONSTANT), xI, + TestEnum_LOLA, STRING_TEST_CONSTANT, xI, Any(&xI, getCppuType((Reference< XInterface > const *) 0))); bRet &= check(aData.Any == xI, "### unexpected any!"); bRet &= check(!(aData.Any != xI), "### unexpected any!"); @@ -679,19 +678,19 @@ static sal_Bool performTest( _arStruct[0], true, '@', 17, 0x1234, 0xFEDC, 0x12345678, 0xFEDCBA98, SAL_CONST_INT64(0x123456789ABCDEF0), SAL_CONST_UINT64(0xFEDCBA9876543210), 17.0815f, 3.1415926359, - TestEnum_LOLA, OUSTR(STRING_TEST_CONSTANT), _arObj[0], + TestEnum_LOLA, STRING_TEST_CONSTANT, _arObj[0], Any(&_arObj[0], getCppuType((Reference< XInterface > const *) 0))); assign( _arStruct[1], true, 'A', 17, 0x1234, 0xFEDC, 0x12345678, 0xFEDCBA98, SAL_CONST_INT64(0x123456789ABCDEF0), SAL_CONST_UINT64(0xFEDCBA9876543210), 17.0815f, 3.1415926359, - TestEnum_TWO, OUSTR(STRING_TEST_CONSTANT), _arObj[1], + TestEnum_TWO, STRING_TEST_CONSTANT, _arObj[1], Any(&_arObj[1], getCppuType((Reference< XInterface > const *) 0))); assign( _arStruct[2], true, 'B', 17, 0x1234, 0xFEDC, 0x12345678, 0xFEDCBA98, SAL_CONST_INT64(0x123456789ABCDEF0), SAL_CONST_UINT64(0xFEDCBA9876543210), 17.0815f, 3.1415926359, - TestEnum_CHECK, OUSTR(STRING_TEST_CONSTANT), _arObj[2], + TestEnum_CHECK, STRING_TEST_CONSTANT, _arObj[2], Any(&_arObj[2], getCppuType((Reference< XInterface > const *) 0))); { Sequence<sal_Bool> arBool(_arBool, 3); @@ -932,7 +931,7 @@ static sal_Bool performTest( static sal_Bool raiseOnewayException( const Reference < XBridgeTest > & xLBT ) { sal_Bool bReturn = sal_True; - OUString sCompare = OUSTR(STRING_TEST_CONSTANT); + OUString sCompare = STRING_TEST_CONSTANT; Reference<XInterface> const x(xLBT->getInterface()); try { @@ -965,7 +964,7 @@ static sal_Bool raiseException( const Reference< XBridgeTest > & xLBT ) { TestData aRet, aRet2; xLBT->raiseException( - 5, OUSTR(STRING_TEST_CONSTANT), + 5, STRING_TEST_CONSTANT, xLBT->getInterface() ); } catch (const IllegalArgumentException &rExc) @@ -1118,7 +1117,7 @@ inline bool makeSurrogate( if (!cpp2uno.is() || !uno2cpp.is()) { throw RuntimeException( - OUSTR("cannot get C++-UNO mappings!"), + "cannot get C++-UNO mappings!", Reference< XInterface >() ); } cpp2uno.mapInterface( @@ -1127,7 +1126,7 @@ inline bool makeSurrogate( if (! unoI.is()) { throw RuntimeException( - OUSTR("mapping C++ to binary UNO failed!"), + "mapping C++ to binary UNO failed!", Reference< XInterface >() ); } uno2cpp.mapInterface( @@ -1136,7 +1135,7 @@ inline bool makeSurrogate( if (! rOut.is()) { throw RuntimeException( - OUSTR("mapping binary UNO to C++ failed!"), + "mapping binary UNO to C++ failed!", Reference< XInterface >() ); } diff --git a/ucb/source/ucp/expand/ucpexpand.cxx b/ucb/source/ucp/expand/ucpexpand.cxx index e41e5b2ddfa9..bf6846823f56 100644 --- a/ucb/source/ucp/expand/ucpexpand.cxx +++ b/ucb/source/ucp/expand/ucpexpand.cxx @@ -33,7 +33,6 @@ #include "com/sun/star/ucb/XContentProvider.hpp" #define EXPAND_PROTOCOL "vnd.sun.star.expand" -#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) #define ARLEN(x) sizeof (x) / sizeof *(x) @@ -70,7 +69,7 @@ public: m_xComponentContext( xComponentContext ), m_xMacroExpander( xComponentContext->getValueByName( - OUSTR("/singletons/com.sun.star.util.theMacroExpander") ), + "/singletons/com.sun.star.util.theMacroExpander" ), uno::UNO_QUERY_THROW ) {} virtual ~ExpandContentProviderImpl() throw (); @@ -101,8 +100,8 @@ inline void ExpandContentProviderImpl::check() const if (rBHelper.bInDispose || rBHelper.bDisposed) { throw lang::DisposedException( - OUSTR("expand content provider instance has " - "already been disposed!"), + "expand content provider instance has " + "already been disposed!", static_cast< OWeakObject * >( const_cast< ExpandContentProviderImpl * >(this) ) ); } @@ -130,15 +129,15 @@ static uno::Reference< uno::XInterface > SAL_CALL create( //============================================================================== static OUString SAL_CALL implName() { - return OUSTR("com.sun.star.comp.ucb.ExpandContentProvider"); + return OUString("com.sun.star.comp.ucb.ExpandContentProvider"); } //============================================================================== static uno::Sequence< OUString > SAL_CALL supportedServices() { OUString names [] = { - OUSTR("com.sun.star.ucb.ExpandContentProvider"), - OUSTR("com.sun.star.ucb.ContentProvider") + OUString("com.sun.star.ucb.ExpandContentProvider"), + OUString("com.sun.star.ucb.ContentProvider") }; return uno::Sequence< OUString >( names, ARLEN(names) ); } @@ -185,7 +184,7 @@ OUString ExpandContentProviderImpl::expandUri( RTL_CONSTASCII_STRINGPARAM(EXPAND_PROTOCOL ":") ) != 0) { throw ucb::IllegalIdentifierException( - OUSTR("expected protocol " EXPAND_PROTOCOL "!"), + "expected protocol " EXPAND_PROTOCOL "!", static_cast< OWeakObject * >( const_cast< ExpandContentProviderImpl * >(this) ) ); } diff --git a/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx index 7c1893b2a778..45fc0a7ac0f7 100644 --- a/unotools/source/config/lingucfg.cxx +++ b/unotools/source/config/lingucfg.cxx @@ -45,7 +45,6 @@ using namespace com::sun::star; using ::rtl::OUString; using ::rtl::Uri; -#define A2OU(x) ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( x )) #define EXPAND_PROTOCOL "vnd.sun.star.expand:" #define FILE_PROTOCOL "file:///" @@ -1185,8 +1184,8 @@ rtl::OUString SvtLinguConfig::GetSpellAndGrammarContextSuggestionImage( rtl::OUString aRes; if (!rServiceImplName.isEmpty()) { - rtl::OUString aImageName( A2OU( "SpellAndGrammarContextMenuSuggestionImage" )); - rtl::OUString aPath( GetVendorImageUrl_Impl( rServiceImplName, aImageName ) ); + OUString aImageName( "SpellAndGrammarContextMenuSuggestionImage" ); + OUString aPath( GetVendorImageUrl_Impl( rServiceImplName, aImageName ) ); aRes = aPath; } return aRes; @@ -1200,8 +1199,8 @@ rtl::OUString SvtLinguConfig::GetSpellAndGrammarContextDictionaryImage( rtl::OUString aRes; if (!rServiceImplName.isEmpty()) { - rtl::OUString aImageName( A2OU( "SpellAndGrammarContextMenuDictionaryImage" )); - rtl::OUString aPath( GetVendorImageUrl_Impl( rServiceImplName, aImageName ) ); + OUString aImageName( "SpellAndGrammarContextMenuDictionaryImage" ); + OUString aPath( GetVendorImageUrl_Impl( rServiceImplName, aImageName ) ); aRes = aPath; } return aRes; @@ -1214,8 +1213,8 @@ rtl::OUString SvtLinguConfig::GetSpellAndGrammarContextDictionaryImage( rtl::OUString aRes; if (!rServiceImplName.isEmpty()) { - rtl::OUString aImageName( A2OU( "SynonymsContextMenuImage" )); - rtl::OUString aPath( GetVendorImageUrl_Impl( rServiceImplName, aImageName ) ); + OUString aImageName( "SynonymsContextMenuImage" ); + OUString aPath( GetVendorImageUrl_Impl( rServiceImplName, aImageName ) ); aRes = aPath; } return aRes; diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx b/xmlsecurity/source/component/documentdigitalsignatures.cxx index b4fbde86ef52..ed17c86f531b 100644 --- a/xmlsecurity/source/component/documentdigitalsignatures.cxx +++ b/xmlsecurity/source/component/documentdigitalsignatures.cxx @@ -53,8 +53,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) - DocumentDigitalSignatures::DocumentDigitalSignatures( const Reference< XComponentContext >& rxCtx ): mxCtx(rxCtx), m_sODFVersion(ODFVER_012_TEXT), @@ -68,7 +66,7 @@ void DocumentDigitalSignatures::initialize( const Sequence< Any >& aArguments) { if (aArguments.getLength() > 2) throw css::lang::IllegalArgumentException( - OUSTR("DocumentDigitalSignatures::initialize requires zero, one, or two arguments"), + "DocumentDigitalSignatures::initialize requires zero, one, or two arguments", Reference<XInterface>(static_cast<XInitialization*>(this), UNO_QUERY), 0); m_nArgumentsCount = aArguments.getLength(); @@ -77,13 +75,13 @@ void DocumentDigitalSignatures::initialize( const Sequence< Any >& aArguments) { if (!(aArguments[0] >>= m_sODFVersion)) throw css::lang::IllegalArgumentException( - OUSTR("DocumentDigitalSignatures::initialize: the first arguments must be a string"), + "DocumentDigitalSignatures::initialize: the first arguments must be a string", Reference<XInterface>(static_cast<XInitialization*>(this), UNO_QUERY), 0); if (aArguments.getLength() == 2 && !(aArguments[1] >>= m_bHasDocumentSignature)) throw css::lang::IllegalArgumentException( - OUSTR("DocumentDigitalSignatures::initialize: the second arguments must be a bool"), + "DocumentDigitalSignatures::initialize: the second arguments must be a bool", Reference<XInterface>(static_cast<XInitialization*>(this), UNO_QUERY), 1); //the Version is supported as of ODF1.2, so for and 1.1 document or older we will receive the diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx index cf8f692b8ecc..03b8fbfdff46 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx @@ -58,8 +58,6 @@ #include <unotools/configitem.hxx> #include <comphelper/componentcontext.hxx> -#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) - /* HACK: disable some warnings for MS-C */ #ifdef _MSC_VER @@ -146,7 +144,7 @@ bool DigitalSignaturesDialog::isXML(const rtl::OUString& rURI ) } if (DocumentSignatureHelper::equalsReferenceUriManifestPath(rURI, sPath)) { - bIsXML = sMediaType.equals(OUSTR("text/xml")) && ! bEncrypted; + bIsXML = sMediaType.equals("text/xml") && ! bEncrypted; bPropsAvailable = true; break; } @@ -272,10 +270,10 @@ void DigitalSignaturesDialog::SetStorage( const com::sun::star::uno::Reference < //Get the manifest.xml Reference < css::embed::XStorage > xSubStore(rxStore->openStorageElement( - OUSTR("META-INF"), css::embed::ElementModes::READ), UNO_QUERY_THROW); + "META-INF", css::embed::ElementModes::READ), UNO_QUERY_THROW); Reference< css::io::XInputStream > xStream( - xSubStore->openStreamElement(OUSTR("manifest.xml"), css::embed::ElementModes::READ), + xSubStore->openStreamElement("manifest.xml", css::embed::ElementModes::READ), UNO_QUERY_THROW); m_manifest = xReader->readManifestSequence(xStream); diff --git a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx index 23363e7cc829..bf9b518cfc2b 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx @@ -39,8 +39,6 @@ using ::rtl::OUString ; using ::com::sun::star::security::XCertificate ; using ::com::sun::star::util::DateTime ; -#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) - /*Resturns the index withing rRawString where sTypeName starts and where it ends. The starting index is pair.first. The ending index in pair.second points one char after the last character of the type. @@ -153,12 +151,12 @@ findTypeInDN(const OUString& rRawString, const OUString& sTypeName) OUString replaceTagSWithTagST(OUString oldDN) { - std::pair<sal_Int32, sal_Int32 > pairIndex = findTypeInDN(oldDN, OUSTR("S")); + std::pair<sal_Int32, sal_Int32 > pairIndex = findTypeInDN(oldDN, "S"); if (pairIndex.first != -1) { OUString newDN = oldDN.copy(0, pairIndex.first); - newDN += OUSTR("ST"); + newDN += "ST"; newDN += oldDN.copy(pairIndex.second); return newDN; } |