diff options
author | Noel Grandin <noel@peralex.com> | 2013-11-15 11:05:19 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-11-19 10:29:31 +0200 |
commit | 610b2b94b33b0fc2d79cd515f9e293ca1c2610e8 (patch) | |
tree | 6eab2639cb8104ca54daa3f7a2ebd83ef1566cf0 /forms | |
parent | remove most use of RTL_CONSTASCII_USTRINGPARAM macro (diff) | |
download | core-610b2b94b33b0fc2d79cd515f9e293ca1c2610e8.tar.gz core-610b2b94b33b0fc2d79cd515f9e293ca1c2610e8.zip |
remove unnecessary use of OUString constructor when assigning
change code like
aStr = OUString("xxxx");
to
aStr = "xxxx";
Change-Id: Ib981a5cc735677ec5dba76ef9279a107d22e99d4
Diffstat (limited to 'forms')
-rw-r--r-- | forms/source/component/Columns.cxx | 20 | ||||
-rw-r--r-- | forms/source/component/ImageControl.cxx | 2 | ||||
-rw-r--r-- | forms/source/component/navigationbar.cxx | 2 | ||||
-rw-r--r-- | forms/source/richtext/clipboarddispatcher.cxx | 6 | ||||
-rw-r--r-- | forms/source/richtext/richtextcontrol.cxx | 4 | ||||
-rw-r--r-- | forms/source/runtime/formoperations.cxx | 2 | ||||
-rw-r--r-- | forms/source/solar/component/navbarcontrol.cxx | 4 | ||||
-rw-r--r-- | forms/source/xforms/datatypes.cxx | 4 |
8 files changed, 22 insertions, 22 deletions
diff --git a/forms/source/component/Columns.cxx b/forms/source/component/Columns.cxx index 05bc70cc02f5..1064ea051712 100644 --- a/forms/source/component/Columns.cxx +++ b/forms/source/component/Columns.cxx @@ -70,16 +70,16 @@ const StringSequence& getColumnTypes() if (aColumnTypes.getConstArray()[0].isEmpty()) { OUString* pNames = aColumnTypes.getArray(); - pNames[TYPE_CHECKBOX] = OUString( "CheckBox" ); - pNames[TYPE_COMBOBOX] = OUString( "ComboBox" ); - pNames[TYPE_CURRENCYFIELD] = OUString( "CurrencyField" ); - pNames[TYPE_DATEFIELD] = OUString( "DateField" ); - pNames[TYPE_FORMATTEDFIELD] = OUString( "FormattedField" ); - pNames[TYPE_LISTBOX] = OUString( "ListBox" ); - pNames[TYPE_NUMERICFIELD] = OUString( "NumericField" ); - pNames[TYPE_PATTERNFIELD] = OUString( "PatternField" ); - pNames[TYPE_TEXTFIELD] = OUString( "TextField" ); - pNames[TYPE_TIMEFIELD] = OUString( "TimeField" ); + pNames[TYPE_CHECKBOX] = "CheckBox"; + pNames[TYPE_COMBOBOX] = "ComboBox"; + pNames[TYPE_CURRENCYFIELD] = "CurrencyField"; + pNames[TYPE_DATEFIELD] = "DateField"; + pNames[TYPE_FORMATTEDFIELD] = "FormattedField"; + pNames[TYPE_LISTBOX] = "ListBox"; + pNames[TYPE_NUMERICFIELD] = "NumericField"; + pNames[TYPE_PATTERNFIELD] = "PatternField"; + pNames[TYPE_TEXTFIELD] = "TextField"; + pNames[TYPE_TIMEFIELD] = "TimeField"; } return aColumnTypes; } diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx index 8cfdb4967550..4e37fc229a66 100644 --- a/forms/source/component/ImageControl.cxx +++ b/forms/source/component/ImageControl.cxx @@ -295,7 +295,7 @@ void OImageControlModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, con OUString sNewImageURL; if ( m_xGraphicObject.is() ) { - sNewImageURL = OUString( "vnd.sun.star.GraphicObject:" ); + sNewImageURL = "vnd.sun.star.GraphicObject:"; sNewImageURL = sNewImageURL + m_xGraphicObject->getUniqueID(); } m_sImageURL = sNewImageURL; diff --git a/forms/source/component/navigationbar.cxx b/forms/source/component/navigationbar.cxx index d7979c74ff0a..9baeea7ff3c8 100644 --- a/forms/source/component/navigationbar.cxx +++ b/forms/source/component/navigationbar.cxx @@ -184,7 +184,7 @@ namespace frm aSupported.realloc( aSupported.getLength() + 2 ); OUString* pArray = aSupported.getArray(); - pArray[ aSupported.getLength() - 2 ] = OUString( "com.sun.star.awt.UnoControlModel" ); + pArray[ aSupported.getLength() - 2 ] = "com.sun.star.awt.UnoControlModel"; pArray[ aSupported.getLength() - 1 ] = FRM_SUN_COMPONENT_NAVTOOLBAR; return aSupported; } diff --git a/forms/source/richtext/clipboarddispatcher.cxx b/forms/source/richtext/clipboarddispatcher.cxx index 7f299b855ca1..61881550647f 100644 --- a/forms/source/richtext/clipboarddispatcher.cxx +++ b/forms/source/richtext/clipboarddispatcher.cxx @@ -44,13 +44,13 @@ namespace frm switch ( _eFunc ) { case OClipboardDispatcher::eCut: - aURL.Complete = OUString( ".uno:Cut" ); + aURL.Complete = ".uno:Cut"; break; case OClipboardDispatcher::eCopy: - aURL.Complete = OUString( ".uno:Copy" ); + aURL.Complete = ".uno:Copy"; break; case OClipboardDispatcher::ePaste: - aURL.Complete = OUString( ".uno:Paste" ); + aURL.Complete = ".uno:Paste"; break; } return aURL; diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx index 942253209681..468676200413 100644 --- a/forms/source/richtext/richtextcontrol.cxx +++ b/forms/source/richtext/richtextcontrol.cxx @@ -273,8 +273,8 @@ namespace frm Sequence< OUString > SAL_CALL ORichTextControl::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 3 ); - aServices[ 0 ] = OUString( "com.sun.star.awt.UnoControl" ); - aServices[ 1 ] = OUString( "com.sun.star.awt.UnoControlEdit" ); + aServices[ 0 ] = "com.sun.star.awt.UnoControl"; + aServices[ 1 ] = "com.sun.star.awt.UnoControlEdit"; aServices[ 2 ] = FRM_SUN_CONTROL_RICHTEXTCONTROL; return aServices; } diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx index c8109ed06c6f..083844e7f215 100644 --- a/forms/source/runtime/formoperations.cxx +++ b/forms/source/runtime/formoperations.cxx @@ -152,7 +152,7 @@ namespace frm Sequence< OUString > FormOperations::getSupportedServiceNames_Static( ) throw(RuntimeException) { Sequence< OUString > aNames(1); - aNames[0] = OUString( "com.sun.star.form.runtime.FormOperations" ); + aNames[0] = "com.sun.star.form.runtime.FormOperations"; return aNames; } diff --git a/forms/source/solar/component/navbarcontrol.cxx b/forms/source/solar/component/navbarcontrol.cxx index 58c0c44e6b20..71eb891c5234 100644 --- a/forms/source/solar/component/navbarcontrol.cxx +++ b/forms/source/solar/component/navbarcontrol.cxx @@ -201,8 +201,8 @@ namespace frm Sequence< OUString > SAL_CALL ONavigationBarControl::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 2 ); - aServices[ 0 ] = OUString( "com.sun.star.awt.UnoControl" ); - aServices[ 1 ] = OUString( "com.sun.star.form.control.NavigationToolBar" ); + aServices[ 0 ] = "com.sun.star.awt.UnoControl"; + aServices[ 1 ] = "com.sun.star.form.control.NavigationToolBar"; return aServices; } diff --git a/forms/source/xforms/datatypes.cxx b/forms/source/xforms/datatypes.cxx index 0c24ace5525b..5b4811865a49 100644 --- a/forms/source/xforms/datatypes.cxx +++ b/forms/source/xforms/datatypes.cxx @@ -286,7 +286,7 @@ namespace xforms RegexMatcher aMatcher( aIcuPattern, 0, nMatchStatus ); if ( U_FAILURE( nMatchStatus ) ) { - _rErrorMessage = OUString( "This is no valid pattern." ); + _rErrorMessage = "This is no valid pattern."; return false; } } @@ -544,7 +544,7 @@ namespace xforms sal_Int32 nValue( 0 ); OSL_VERIFY( _rNewValue >>= nValue ); if ( nValue <= 0 ) - _rErrorMessage = OUString( "Length limits must denote positive integer values." ); + _rErrorMessage = "Length limits must denote positive integer values."; // TODO/eforms: localize the error message } break; |