diff options
-rw-r--r-- | scripting/source/basprov/basmethnode.cxx | 2 | ||||
-rw-r--r-- | scripting/source/dlgprov/dlgprov.cxx | 4 | ||||
-rw-r--r-- | sdext/source/minimizer/fileopendialog.cxx | 2 | ||||
-rw-r--r-- | sdext/source/minimizer/informationdialog.cxx | 8 | ||||
-rw-r--r-- | sdext/source/presenter/PresenterPaneBorderPainter.cxx | 4 | ||||
-rw-r--r-- | starmath/source/unomodel.cxx | 2 | ||||
-rw-r--r-- | stoc/source/inspect/introspection.cxx | 2 | ||||
-rw-r--r-- | stoc/source/javavm/javavm.cxx | 2 | ||||
-rw-r--r-- | svtools/source/contnr/fileview.cxx | 4 | ||||
-rw-r--r-- | svx/source/fmcomp/fmgridif.cxx | 2 | ||||
-rw-r--r-- | svx/source/form/fmdmod.cxx | 34 | ||||
-rw-r--r-- | svx/source/xml/xmlgrhlp.cxx | 2 |
12 files changed, 18 insertions, 50 deletions
diff --git a/scripting/source/basprov/basmethnode.cxx b/scripting/source/basprov/basmethnode.cxx index b07720c50606..507915ac0221 100644 --- a/scripting/source/basprov/basmethnode.cxx +++ b/scripting/source/basprov/basmethnode.cxx @@ -234,7 +234,7 @@ namespace basprov for ( sal_Int32 i = 0; i < nProps; ++i ) { // TODO: according to MBA the property 'Title' may change in future - if ( pProps[i].Name == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title")) ) + if ( pProps[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Title")) ) { pProps[i].Value >>= sDocURL; break; diff --git a/scripting/source/dlgprov/dlgprov.cxx b/scripting/source/dlgprov/dlgprov.cxx index 3a4ceef7a2ec..1c137c0a97ca 100644 --- a/scripting/source/dlgprov/dlgprov.cxx +++ b/scripting/source/dlgprov/dlgprov.cxx @@ -379,11 +379,11 @@ static ::rtl::OUString aResourceResolverPropName(RTL_CONSTASCII_USTRINGPARAM("Re // TODO: dialogs in packages Reference< XLibraryContainer > xLibContainer; - if ( sLocation == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("application")) ) + if ( sLocation.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("application")) ) { xLibContainer = Reference< XLibraryContainer >( SFX_APP()->GetDialogContainer(), UNO_QUERY ); } - else if ( sLocation == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("document")) ) + else if ( sLocation.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("document")) ) { Reference< XEmbeddedScripts > xDocumentScripts( m_xModel, UNO_QUERY ); if ( xDocumentScripts.is() ) diff --git a/sdext/source/minimizer/fileopendialog.cxx b/sdext/source/minimizer/fileopendialog.cxx index 830e40959bad..a012ff87e0bb 100644 --- a/sdext/source/minimizer/fileopendialog.cxx +++ b/sdext/source/minimizer/fileopendialog.cxx @@ -109,7 +109,7 @@ FileOpenDialog::FileOpenDialog( const Reference< XComponentContext >& rxMSF ) : { rtl::OUString sDocumentService; rProperty.Value >>= sDocumentService; - if ( sDocumentService == OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.PresentationDocument" ) ) ) + if ( sDocumentService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.PresentationDocument")) ) bImpressFilter = sal_True; else j = aFilterProperties.getLength(); diff --git a/sdext/source/minimizer/informationdialog.cxx b/sdext/source/minimizer/informationdialog.cxx index 6f283d88b542..09db8b223fbc 100644 --- a/sdext/source/minimizer/informationdialog.cxx +++ b/sdext/source/minimizer/informationdialog.cxx @@ -336,11 +336,11 @@ void InformationDialog::InitDialog() aInfoString = aInfoString.replaceAt( k, aTitlePlaceholder.getLength(), aTitle ); com::sun::star::uno::Reference< com::sun::star::awt::XItemListener > xItemListener; - InsertImage( *this, rtl::OUString( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("aboutimage")) ), ImpGetStandardImage( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:standardimage/query")) ), 5, 5, 25, 25 ); - InsertFixedText( *this, rtl::OUString( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("fixedtext")) ), aInfoString, PAGE_POS_X, 6, PAGE_WIDTH, 24, sal_True, 0 ); + InsertImage( *this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("aboutimage")), ImpGetStandardImage( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:standardimage/query")) ), 5, 5, 25, 25 ); + InsertFixedText( *this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("fixedtext")), aInfoString, PAGE_POS_X, 6, PAGE_WIDTH, 24, sal_True, 0 ); if ( !maSaveAsURL.isEmpty() ) InsertCheckBox( *this, TKGet( TK_OpenNewDocument ), xItemListener, getString( STR_AUTOMATICALLY_OPEN ), PAGE_POS_X, 42, PAGE_WIDTH, 8, 1 ); - InsertButton( *this, rtl::OUString( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("button")) ), mxActionListener, DIALOG_WIDTH / 2 - 25, nDialogHeight - 20, 50, 14, 2, STR_OK ); + InsertButton( *this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("button")), mxActionListener, DIALOG_WIDTH / 2 - 25, nDialogHeight - 20, 50, 14, 2, STR_OK ); sal_Bool bOpenNewDocument = mrbOpenNewDocument; setControlProperty( TKGet( TK_OpenNewDocument ), TKGet( TK_State ), Any( (sal_Int16)bOpenNewDocument ) ); @@ -398,7 +398,7 @@ sal_Bool InformationDialog::execute() void OKActionListener::actionPerformed( const ActionEvent& rEvent ) throw ( com::sun::star::uno::RuntimeException ) { - if ( rEvent.ActionCommand == rtl::OUString( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("button")) ) ) + if ( rEvent.ActionCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("button")) ) { mrInformationDialog.endExecute( sal_True ); } diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.cxx b/sdext/source/presenter/PresenterPaneBorderPainter.cxx index 5d8ec96cd076..689bb9d8b4d7 100644 --- a/sdext/source/presenter/PresenterPaneBorderPainter.cxx +++ b/sdext/source/presenter/PresenterPaneBorderPainter.cxx @@ -873,9 +873,9 @@ RendererPaneStyle::RendererPaneStyle ( mnFontYOffset = mpFont->mnYOffset; } - if (sAnchor == OUString(RTL_CONSTASCII_USTRINGPARAM("Left"))) + if (sAnchor.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Left"))) meFontAnchor = AnchorLeft; - else if (sAnchor == OUString(RTL_CONSTASCII_USTRINGPARAM("Right"))) + else if (sAnchor.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Right"))) meFontAnchor = AnchorRight; else meFontAnchor = AnchorCenter; diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx index 0e1ba83559c1..c6759b9bfc27 100644 --- a/starmath/source/unomodel.cxx +++ b/starmath/source/unomodel.cxx @@ -1033,7 +1033,7 @@ void SAL_CALL SmModel::render( uno::Reference< awt::XDevice > xRenderDevice; for (sal_Int32 i = 0, nCount = rxOptions.getLength(); i < nCount; ++i) { - if( rxOptions[i].Name == OUString( RTL_CONSTASCII_USTRINGPARAM( "RenderDevice" ) ) ) + if( rxOptions[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("RenderDevice")) ) rxOptions[i].Value >>= xRenderDevice; } diff --git a/stoc/source/inspect/introspection.cxx b/stoc/source/inspect/introspection.cxx index 2d4d13bbdf31..a1f239f84084 100644 --- a/stoc/source/inspect/introspection.cxx +++ b/stoc/source/inspect/introspection.cxx @@ -2346,7 +2346,7 @@ rtl::Reference< IntrospectionAccessStatic_Impl > ImplIntrospection::implInspect( } else { - if( aMethName != OUString( RTL_CONSTASCII_USTRINGPARAM("queryInterface")) ) + if( !aMethName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("queryInterface")) ) { rMethodConcept_i |= MethodConcept::DANGEROUS; continue; diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx index 2c900d27c2db..25d0000fea0d 100644 --- a/stoc/source/javavm/javavm.cxx +++ b/stoc/source/javavm/javavm.cxx @@ -1347,7 +1347,7 @@ void SAL_CALL JavaVirtualMachine::elementReplaced( const jchar* jcharName= pJNIEnv->GetStringChars( jsClass, NULL); rtl::OUString sName( jcharName); jboolean bIsSandbox; - if (sName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.lib.sandbox.SandboxSecurity"))) + if (sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.lib.sandbox.SandboxSecurity"))) bIsSandbox= JNI_TRUE; else bIsSandbox= JNI_FALSE; diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index 495d86bea84f..dc3f727ce175 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -96,7 +96,7 @@ using ::rtl::OUString; #define COLUMN_SIZE 3 #define COLUMN_DATE 4 -#define aSeparatorStr "----------------------------------" +#define SEPARATOR_STR "----------------------------------" #define ROW_HEIGHT 17 // the height of a row has to be a little higher than the bitmap #define QUICK_SEARCH_TIMEOUT 1500 // time in mSec before the quicksearch string will be reseted @@ -2329,7 +2329,7 @@ void SvtFileView_Impl::CreateVector_Impl( const Sequence < OUString > &rList ) pEntry->maDisplayText = aDisplayText; // detect the image - if( aValue != rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(aSeparatorStr) ) ) + if( !aValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(SEPARATOR_STR)) ) { INetURLObject aObj( !pEntry->maImageURL.isEmpty() ? pEntry->maImageURL : pEntry->maTargetURL ); pEntry->maImage = SvFileInformationManager::GetImage( aObj, sal_False ); diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index 4b334ab81245..df609e587c9a 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -2460,7 +2460,7 @@ void FmXGridPeer::setMode(const ::rtl::OUString& Mode) throw( NoSupportException m_aMode = Mode; FmGridControl* pGrid = (FmGridControl*) GetWindow(); - if ( Mode == ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterMode" ) ) ) + if ( Mode.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FilterMode")) ) pGrid->SetFilterMode(sal_True); else { diff --git a/svx/source/form/fmdmod.cxx b/svx/source/form/fmdmod.cxx index f5bc3ad49ef9..fbc4b5a53607 100644 --- a/svx/source/form/fmdmod.cxx +++ b/svx/source/form/fmdmod.cxx @@ -44,7 +44,7 @@ using namespace ::svxform; { xRet = ::comphelper::getProcessServiceFactory()->createInstance(ServiceSpecifier); } - else if ( ServiceSpecifier == ::rtl::OUString( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ControlShape")) ) ) + else if ( ServiceSpecifier.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.ControlShape")) ) { SdrObject* pObj = new FmFormObj(OBJ_FM_CONTROL); xRet = static_cast<cppu::OWeakObject*>(static_cast<SvxShape_UnoImplHelper*>(new SvxShapeControl(pObj))); @@ -97,36 +97,4 @@ using namespace ::svxform; return concatServiceNames( aParentSeq, aSeq ); } -/* -// XServiceManager -::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SvxFmDrawModel::createInstance(const ::rtl::OUString& ServiceName) - const throw( ::com::sun::star::lang::ServiceNotRegisteredException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ) -{ - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xRet; - sal_uInt16 nTokenCount = ServiceName.getTokenCount('.'); - if (nTokenCount == 5 && - ServiceName.getToken( 0, '.' ) == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("stardiv")) && - ServiceName.getToken( 1, '.' ) == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("one")) && - ServiceName.getToken( 2, '.' ) == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("form")) && - ServiceName.getToken( 3, '.' ) == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("component")) ) - { - xRet = ::comphelper::getProcessServiceFactory()->createInstance(ServiceName); - } - else - if (nTokenCount == 4 && - ServiceName.getToken( 0, '.' ) == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("stardiv")) && - ServiceName.getToken( 1, '.' ) == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("one")) && - ServiceName.getToken( 2, '.' ) == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("drawing")) && - ServiceName.getToken( 3, '.' ) == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ControlShape")) ) - { - SdrObject* pObj = new FmFormObj(); - xRet = *new SvxShapeControl(pObj); - } - if (!xRet.is()) - xRet = SvxUnoDrawModel::createInstance(ServiceName); - return xRet; -} -*/ - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx index d73c19e475d3..d8a5fdfbb488 100644 --- a/svx/source/xml/xmlgrhlp.cxx +++ b/svx/source/xml/xmlgrhlp.cxx @@ -597,7 +597,7 @@ sal_Bool SvXMLGraphicHelper::ImplWriteGraphic( const ::rtl::OUString& rPictureSt xProps->setPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "MediaType" ) ), aAny ); } - const sal_Bool bCompressed = aMimeType.isEmpty() || ( aMimeType == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("image/tiff")) ) ; + const sal_Bool bCompressed = aMimeType.isEmpty() || ( aMimeType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("image/tiff")) ) ; aAny <<= bCompressed; xProps->setPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "Compressed" ) ), aAny ); |