summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2012-05-28 11:37:45 -0500
committerNorbert Thiebaud <nthiebaud@gmail.com>2012-05-28 11:47:45 -0500
commitc927e5ed4d358465f91ec4f28734af42d72a0f9c (patch)
treea3c15ebcb67c68695d245e7e76b32b5899cbfefe
parentf9598738a6f8625b6908d0e25603f00ace4da7f9 (diff)
targeted string re-work
Change-Id: I03f894f52cd4115f4871a82eb6e481c5642362da
-rw-r--r--sysui/source/win32/misc/WinImplHelper.cxx36
-rw-r--r--sysui/source/win32/misc/resourceprovider.cxx2
2 files changed, 19 insertions, 19 deletions
diff --git a/sysui/source/win32/misc/WinImplHelper.cxx b/sysui/source/win32/misc/WinImplHelper.cxx
index 8f62008ba76e..3999a52319b7 100644
--- a/sysui/source/win32/misc/WinImplHelper.cxx
+++ b/sysui/source/win32/misc/WinImplHelper.cxx
@@ -133,9 +133,9 @@ void SAL_CALL ListboxAddItem( HWND hwnd, const Any& aItem, const Reference< XInt
if ( !aItem.hasValue( ) ||
aItem.getValueType( ) != getCppuType((OUString*)0) )
throw IllegalArgumentException(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid value type or any has no value" )),
- rXInterface,
- aArgPos );
+ "invalid value type or any has no value",
+ rXInterface,
+ aArgPos );
OUString cbItem;
aItem >>= cbItem;
@@ -155,9 +155,9 @@ void SAL_CALL ListboxAddItems( HWND hwnd, const Any& aItemList, const Reference<
if ( !aItemList.hasValue( ) ||
aItemList.getValueType( ) != getCppuType((Sequence<OUString>*)0) )
throw IllegalArgumentException(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid value type or any has no value" )),
- rXInterface,
- aArgPos );
+ "invalid value type or any has no value",
+ rXInterface,
+ aArgPos );
Sequence< OUString > aStringList;
aItemList >>= aStringList;
@@ -183,9 +183,9 @@ void SAL_CALL ListboxDeleteItem( HWND hwnd, const Any& aPosition, const Referenc
(aPosition.getValueType( ) != getCppuType((sal_Int16*)0)) &&
(aPosition.getValueType( ) != getCppuType((sal_Int8*)0)) ) )
throw IllegalArgumentException(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid value type or any has no value" )),
- rXInterface,
- aArgPos );
+ "invalid value type or any has no value",
+ rXInterface,
+ aArgPos );
sal_Int32 nPos;
aPosition >>= nPos;
@@ -196,7 +196,7 @@ void SAL_CALL ListboxDeleteItem( HWND hwnd, const Any& aPosition, const Referenc
// index was not correct
if ( CB_ERR == lRet )
throw IllegalArgumentException(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "inavlid item position" )),
+ "inavlid item position",
rXInterface,
aArgPos );
}
@@ -235,16 +235,16 @@ void SAL_CALL ListboxSetSelectedItem( HWND hwnd, const Any& aPosition, const Ref
(aPosition.getValueType( ) != getCppuType((sal_Int16*)0)) &&
(aPosition.getValueType( ) != getCppuType((sal_Int8*)0)) ) )
throw IllegalArgumentException(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid value type or any has no value" )),
- rXInterface,
- aArgPos );
+ "invalid value type or any has no value",
+ rXInterface,
+ aArgPos );
sal_Int32 nPos;
aPosition >>= nPos;
if ( nPos < -1 )
throw IllegalArgumentException(
- OUString(RTL_CONSTASCII_USTRINGPARAM("invalid index")),
+ "invalid index",
rXInterface,
aArgPos );
@@ -252,7 +252,7 @@ void SAL_CALL ListboxSetSelectedItem( HWND hwnd, const Any& aPosition, const Ref
if ( (CB_ERR == lRet) && (-1 != nPos) )
throw IllegalArgumentException(
- OUString(RTL_CONSTASCII_USTRINGPARAM("invalid index")),
+ "invalid index",
rXInterface,
aArgPos );
}
@@ -329,9 +329,9 @@ void SAL_CALL CheckboxSetState(
if ( !aState.hasValue( ) ||
aState.getValueType( ) != getCppuType((sal_Bool*)0) )
throw IllegalArgumentException(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid value type or any has no value" )),
- rXInterface,
- aArgPos );
+ "invalid value type or any has no value",
+ rXInterface,
+ aArgPos );
sal_Bool bCheckState = *reinterpret_cast< const sal_Bool* >( aState.getValue( ) );
WPARAM wParam = bCheckState ? BST_CHECKED : BST_UNCHECKED;
diff --git a/sysui/source/win32/misc/resourceprovider.cxx b/sysui/source/win32/misc/resourceprovider.cxx
index 8a8de8dbdd40..0188f9a64aeb 100644
--- a/sysui/source/win32/misc/resourceprovider.cxx
+++ b/sysui/source/win32/misc/resourceprovider.cxx
@@ -58,7 +58,7 @@ using namespace ::com::sun::star::ui::dialogs::CommonFilePickerElementIds;
// id + 100
#define LB_LABEL_OFFSET 100
-const rtl::OUString TILDE = OUString(RTL_CONSTASCII_USTRINGPARAM( "~" ));
+const rtl::OUString TILDE( "~" );
const sal_Unicode TILDE_SIGN = L'~';
#define FOLDERPICKER_TITLE 500