diff options
-rw-r--r-- | avmedia/source/macavf/framegrabber.mm | 4 | ||||
-rw-r--r-- | avmedia/source/macavf/manager.mm | 4 | ||||
-rw-r--r-- | include/vcl/opengl/OpenGLContext.hxx | 2 | ||||
-rw-r--r-- | offapi/com/sun/star/i18n/XCharacterClassification.idl | 2 | ||||
-rw-r--r-- | sc/source/ui/view/viewdata.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/unoidl/DrawController.cxx | 4 | ||||
-rw-r--r-- | svtools/source/control/accessibleruler.cxx | 5 | ||||
-rw-r--r-- | svx/source/accessibility/svxpixelctlaccessiblecontext.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/unocore/unostyle.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/style/PageMasterImportContext.cxx | 6 | ||||
-rw-r--r-- | xmloff/source/style/prstylei.cxx | 66 |
12 files changed, 51 insertions, 52 deletions
diff --git a/avmedia/source/macavf/framegrabber.mm b/avmedia/source/macavf/framegrabber.mm index 2cbe8cb5593b..15c70a7532c6 100644 --- a/avmedia/source/macavf/framegrabber.mm +++ b/avmedia/source/macavf/framegrabber.mm @@ -108,14 +108,14 @@ uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMe ::rtl::OUString SAL_CALL FrameGrabber::getImplementationName( ) throw (uno::RuntimeException) { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_MACAVF_FRAMEGRABBER_IMPLEMENTATIONNAME ) ); + return ::rtl::OUString( AVMEDIA_MACAVF_FRAMEGRABBER_IMPLEMENTATIONNAME ); } sal_Bool SAL_CALL FrameGrabber::supportsService( const ::rtl::OUString& ServiceName ) throw (uno::RuntimeException) { - return ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( AVMEDIA_MACAVF_FRAMEGRABBER_SERVICENAME ) ); + return ServiceName.equalsAsciiL( AVMEDIA_MACAVF_FRAMEGRABBER_SERVICENAME ); } diff --git a/avmedia/source/macavf/manager.mm b/avmedia/source/macavf/manager.mm index 3e413a36232e..5ba5006f85a2 100644 --- a/avmedia/source/macavf/manager.mm +++ b/avmedia/source/macavf/manager.mm @@ -56,14 +56,14 @@ uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const ::rtl::OU ::rtl::OUString SAL_CALL Manager::getImplementationName( ) throw (uno::RuntimeException) { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_MACAVF_MANAGER_IMPLEMENTATIONNAME ) ); + return ::rtl::OUString( AVMEDIA_MACAVF_MANAGER_IMPLEMENTATIONNAME ); } sal_Bool SAL_CALL Manager::supportsService( const ::rtl::OUString& ServiceName ) throw (uno::RuntimeException) { - return ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( AVMEDIA_MACAVF_MANAGER_SERVICENAME ) ); + return ServiceName.equalsAsciiL( AVMEDIA_MACAVF_MANAGER_SERVICENAME ); } diff --git a/include/vcl/opengl/OpenGLContext.hxx b/include/vcl/opengl/OpenGLContext.hxx index 686346763944..dbe0ec66c280 100644 --- a/include/vcl/opengl/OpenGLContext.hxx +++ b/include/vcl/opengl/OpenGLContext.hxx @@ -145,7 +145,7 @@ private: protected: bool InitGLEW(); - void InitGLEWDebugging(); + static void InitGLEWDebugging(); static void InitChildWindow(SystemChildWindow *pChildWindow); static void BuffersSwapped(); virtual GLWindow& getModifiableOpenGLWindow() = 0; diff --git a/offapi/com/sun/star/i18n/XCharacterClassification.idl b/offapi/com/sun/star/i18n/XCharacterClassification.idl index 9540f7c44076..1bc8c7c2af22 100644 --- a/offapi/com/sun/star/i18n/XCharacterClassification.idl +++ b/offapi/com/sun/star/i18n/XCharacterClassification.idl @@ -245,7 +245,7 @@ published interface XCharacterClassification : com::sun::star::uno::XInterface // Continuing characters may be any alphanumeric or underscore. sal_Int32 nContFlags = nStartFlags; // Additionally, continuing characters may contain a blank. - OUString aContChars( RTL_CONSTASCII_USTRINGPARAM(" ") ); + OUString aContChars( " " ); // Parse predefined (must be an IDENTNAME) token. ParseResult rRes = xCC->parsePredefinedToken( KParseType::IDENTNAME, rName, 0, aLocale, nStartFlags, aEmptyString, nContFlags, aContChars ); diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx index 85dbb4627f52..aa0d3a5ec492 100644 --- a/sc/source/ui/view/viewdata.cxx +++ b/sc/source/ui/view/viewdata.cxx @@ -2708,7 +2708,7 @@ void ScViewData::WriteUserDataSequence(uno::Sequence <beans::PropertyValue>& rSe pSettings[SC_SHEETTABS].Value <<= pOptions->GetOption( VOPT_TABCONTROLS ); pSettings[SC_OUTLSYMB].Name = SC_UNO_OUTLSYMB; pSettings[SC_OUTLSYMB].Value <<= pOptions->GetOption( VOPT_OUTLINER ); - pSettings[SC_VALUE_HIGHLIGHTING].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_VALUEHIGH ) ); + pSettings[SC_VALUE_HIGHLIGHTING].Name = SC_UNO_VALUEHIGH; pSettings[SC_VALUE_HIGHLIGHTING].Value <<= pOptions->GetOption( VOPT_SYNTAX ); const ScGridOptions& aGridOpt = pOptions->GetGridOptions(); diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx index 1731248eef7e..c5fb81b7e424 100644 --- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx +++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx @@ -339,11 +339,11 @@ void SAL_CALL IAccessibleViewForwarderListener::VISIBLE_AREA, &maViewForwarder); } - else if (rEventObject.PropertyName == OUString (RTL_CONSTASCII_USTRINGPARAM("ActiveLayer"))) + else if (rEventObject.PropertyName == "ActiveLayer") { CommitChange(AccessibleEventId::PAGE_CHANGED,rEventObject.NewValue,rEventObject.OldValue); } - else if (rEventObject.PropertyName == OUString (RTL_CONSTASCII_USTRINGPARAM("UpdateAcc"))) + else if (rEventObject.PropertyName == "UpdateAcc") { OSL_TRACE (" acc on current page should be updated"); diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx index 42d7c4fb0e31..8f9c46e92470 100644 --- a/sd/source/ui/unoidl/DrawController.cxx +++ b/sd/source/ui/unoidl/DrawController.cxx @@ -658,12 +658,12 @@ void DrawController::FillPropertyTable ( beans::PropertyAttribute::BOUND|beans::PropertyAttribute::READONLY|beans::PropertyAttribute::MAYBEVOID )); // add new property to update current page's acc information rProperties.push_back( - beans::Property( OUString( RTL_CONSTASCII_USTRINGPARAM("UpdateAcc") ), + beans::Property( "UpdateAcc", PROPERTY_UPDATEACC, ::cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::BOUND )); rProperties.push_back( - beans::Property( OUString( RTL_CONSTASCII_USTRINGPARAM("PageChange") ), + beans::Property( "PageChange", PROPERTY_PAGE_CHANGE, ::cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::BOUND )); diff --git a/svtools/source/control/accessibleruler.cxx b/svtools/source/control/accessibleruler.cxx index ccc7e7e1561f..3753d4580d5c 100644 --- a/svtools/source/control/accessibleruler.cxx +++ b/svtools/source/control/accessibleruler.cxx @@ -309,7 +309,7 @@ sal_Int32 SvtRulerAccessible::getBackground( ) // XServiceInfo OUString SAL_CALL SvtRulerAccessible::getImplementationName() throw( RuntimeException, std::exception ) { - return OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.ui.SvtRulerAccessible" ) ); + return OUString( "com.sun.star.comp.ui.SvtRulerAccessible" ); } sal_Bool SAL_CALL SvtRulerAccessible::supportsService( const OUString& sServiceName ) throw( RuntimeException, std::exception ) @@ -319,8 +319,7 @@ sal_Bool SAL_CALL SvtRulerAccessible::supportsService( const OUString& sServiceN Sequence< OUString > SAL_CALL SvtRulerAccessible::getSupportedServiceNames() throw( RuntimeException, std::exception ) { - const OUString sServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.accessibility.AccessibleContext" ) ); - return Sequence< OUString >( &sServiceName, 1 ); + return Sequence< OUString > { OUString("com.sun.star.accessibility.AccessibleContext") }; } //===== XTypeProvider ======================================================= diff --git a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx index 64caf6459d3b..230cc6ebfd4a 100644 --- a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx +++ b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx @@ -770,7 +770,7 @@ void SAL_CALL SvxPixelCtlAccessibleChild::removeAccessibleEventListener( const u // XServiceInfo OUString SAL_CALL SvxPixelCtlAccessibleChild::getImplementationName() throw( RuntimeException, std::exception ) { - return OUString( RTL_CONSTASCII_USTRINGPARAM( "SvxPixelCtlAccessibleChild" ) ); + return OUString( "SvxPixelCtlAccessibleChild" ); } sal_Bool SAL_CALL SvxPixelCtlAccessibleChild::supportsService( const OUString& rServiceName ) throw( RuntimeException, std::exception ) diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index 5a11ce589880..07c0c5180638 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -3092,7 +3092,7 @@ uno::Sequence<uno::Any> SwXPageStyle::GetPropertyValues_Impl(const uno::Sequence case SID_ATTR_PAGE_SHARED_FIRST: case SID_ATTR_PAGE_ON: case RES_HEADER_FOOTER_EAT_SPACING: - throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropName, static_cast < cppu::OWeakObject * > ( this ) ); + throw beans::UnknownPropertyException( "Unknown property: " + rPropName, static_cast < cppu::OWeakObject * > ( this ) ); case FN_UNO_HEADER: case FN_UNO_HEADER_LEFT: case FN_UNO_HEADER_FIRST: diff --git a/xmloff/source/style/PageMasterImportContext.cxx b/xmloff/source/style/PageMasterImportContext.cxx index 8b93b7b5cf88..1aaee2640818 100644 --- a/xmloff/source/style/PageMasterImportContext.cxx +++ b/xmloff/source/style/PageMasterImportContext.cxx @@ -164,9 +164,9 @@ void PageStyleContext::FillPropertySet(const uno::Reference<beans::XPropertySet // ones are used when a FillStyle is defined if(!m_bIsFillStyleAlreadyConverted && GetProperties().size()) { - static ::rtl::OUString s_FillStyle(RTL_CONSTASCII_USTRINGPARAM("FillStyle")); - static ::rtl::OUString s_HeaderFillStyle(RTL_CONSTASCII_USTRINGPARAM("HeaderFillStyle")); - static ::rtl::OUString s_FooterFillStyle(RTL_CONSTASCII_USTRINGPARAM("FooterFillStyle")); + static ::rtl::OUString s_FillStyle("FillStyle"); + static ::rtl::OUString s_HeaderFillStyle("HeaderFillStyle"); + static ::rtl::OUString s_FooterFillStyle("FooterFillStyle"); if(doNewDrawingLayerFillStyleDefinitionsExist(s_FillStyle)) { diff --git a/xmloff/source/style/prstylei.cxx b/xmloff/source/style/prstylei.cxx index 5f03fd31d48c..e246be5f64dc 100644 --- a/xmloff/source/style/prstylei.cxx +++ b/xmloff/source/style/prstylei.cxx @@ -94,13 +94,13 @@ const OldFillStyleDefinitionSet& XMLPropStyleContext::getStandardSet() { if(maStandardSet.empty()) { - maStandardSet.insert(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BackColorRGB"))); - maStandardSet.insert(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BackTransparent"))); - maStandardSet.insert(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BackColorTransparency"))); - maStandardSet.insert(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BackGraphicURL"))); - maStandardSet.insert(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BackGraphicFilter"))); - maStandardSet.insert(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BackGraphicLocation"))); - maStandardSet.insert(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BackGraphicTransparency"))); + maStandardSet.insert("BackColorRGB"); + maStandardSet.insert("BackTransparent"); + maStandardSet.insert("BackColorTransparency"); + maStandardSet.insert("BackGraphicURL"); + maStandardSet.insert("BackGraphicFilter"); + maStandardSet.insert("BackGraphicLocation"); + maStandardSet.insert("BackGraphicTransparency"); } return maStandardSet; @@ -110,13 +110,13 @@ const OldFillStyleDefinitionSet& XMLPropStyleContext::getHeaderSet() { if(maHeaderSet.empty()) { - maHeaderSet.insert(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HeaderBackColorRGB"))); - maHeaderSet.insert(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HeaderBackTransparent"))); - maHeaderSet.insert(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HeaderBackColorTransparency"))); - maHeaderSet.insert(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HeaderBackGraphicURL"))); - maHeaderSet.insert(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HeaderBackGraphicFilter"))); - maHeaderSet.insert(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HeaderBackGraphicLocation"))); - maHeaderSet.insert(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HeaderBackGraphicTransparency"))); + maHeaderSet.insert("HeaderBackColorRGB"); + maHeaderSet.insert("HeaderBackTransparent"); + maHeaderSet.insert("HeaderBackColorTransparency"); + maHeaderSet.insert("HeaderBackGraphicURL"); + maHeaderSet.insert("HeaderBackGraphicFilter"); + maHeaderSet.insert("HeaderBackGraphicLocation"); + maHeaderSet.insert("HeaderBackGraphicTransparency"); } return maHeaderSet; @@ -126,13 +126,13 @@ const OldFillStyleDefinitionSet& XMLPropStyleContext::getFooterSet() { if(maFooterSet.empty()) { - maFooterSet.insert(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FooterBackColorRGB"))); - maFooterSet.insert(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FooterBackTransparent"))); - maFooterSet.insert(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FooterBackColorTransparency"))); - maFooterSet.insert(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FooterBackGraphicURL"))); - maFooterSet.insert(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FooterBackGraphicFilter"))); - maFooterSet.insert(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FooterBackGraphicLocation"))); - maFooterSet.insert(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FooterBackGraphicTransparency"))); + maFooterSet.insert("FooterBackColorRGB"); + maFooterSet.insert("FooterBackTransparent"); + maFooterSet.insert("FooterBackColorTransparency"); + maFooterSet.insert("FooterBackGraphicURL"); + maFooterSet.insert("FooterBackGraphicFilter"); + maFooterSet.insert("FooterBackGraphicLocation"); + maFooterSet.insert("FooterBackGraphicTransparency"); } return maFooterSet; @@ -144,15 +144,15 @@ const OldFillStyleDefinitionSet& XMLPropStyleContext::getParaSet() { // Caution: here it is *not* 'ParaBackColorRGB' as it should be, but indeed // 'ParaBackColor' is used, see aXMLParaPropMap definition (line 313) - maParaSet.insert(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaBackColor"))); - maParaSet.insert(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaBackTransparent"))); - maParaSet.insert(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaBackGraphicLocation"))); - maParaSet.insert(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaBackGraphicFilter"))); - maParaSet.insert(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaBackGraphicURL"))); + maParaSet.insert("ParaBackColor"); + maParaSet.insert("ParaBackTransparent"); + maParaSet.insert("ParaBackGraphicLocation"); + maParaSet.insert("ParaBackGraphicFilter"); + maParaSet.insert("ParaBackGraphicURL"); // These are not used in aXMLParaPropMap definition, thus not needed here - // maParaSet.insert(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaBackColorTransparency"))); - // maParaSet.insert(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaBackGraphicTransparency"))); + // maParaSet.insert("ParaBackColorTransparency"); + // maParaSet.insert("ParaBackGraphicTransparency"); } return maParaSet; @@ -262,7 +262,7 @@ void XMLPropStyleContext::CreateAndInsert( bool bOverwrite ) if(bTakeCareOfDrawingLayerFillStyle) { // check if new FillStyles are used and if so mark old ones with -1 - static ::rtl::OUString s_FillStyle(RTL_CONSTASCII_USTRINGPARAM("FillStyle")); + static ::rtl::OUString s_FillStyle("FillStyle"); if(doNewDrawingLayerFillStyleDefinitionsExist(s_FillStyle)) { @@ -593,10 +593,10 @@ void XMLPropStyleContext::translateNameBasedDrawingLayerFillStyleDefinitionsToSt if(rMapper.is()) { - static OUString s_FillGradientName(RTL_CONSTASCII_USTRINGPARAM("FillGradientName")); - static OUString s_FillHatchName(RTL_CONSTASCII_USTRINGPARAM("FillHatchName")); - static OUString s_FillBitmapName(RTL_CONSTASCII_USTRINGPARAM("FillBitmapName")); - static OUString s_FillTransparenceGradientName(RTL_CONSTASCII_USTRINGPARAM("FillTransparenceGradientName")); + static OUString s_FillGradientName("FillGradientName"); + static OUString s_FillHatchName("FillHatchName"); + static OUString s_FillBitmapName("FillBitmapName"); + static OUString s_FillTransparenceGradientName("FillTransparenceGradientName"); for(::std::vector< XMLPropertyState >::iterator a = maProperties.begin(); a != maProperties.end(); ++a) { |