mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

targeted string re-work

Browse Source 
Change-Id: I03f894f52cd4115f4871a82eb6e481c5642362da
This commit is contained in:
Norbert Thiebaud
2012-05-28 11:37:45 -05:00
parent f9598738a6
commit c927e5ed4d
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
sysui/source/win32/misc/WinImplHelper.cxx
View File

@@ -133,9 +133,9 @@ void SAL_CALL ListboxAddItem( HWND hwnd, const Any& aItem, const Reference< XInt
if ( !aItem.hasValue( ) || if ( !aItem.hasValue( ) ||
aItem.getValueType( ) != getCppuType((OUString*)0) ) aItem.getValueType( ) != getCppuType((OUString*)0) )
throw IllegalArgumentException( throw IllegalArgumentException(
OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid value type or any has no value" )), "invalid value type or any has no value",
rXInterface, rXInterface,
aArgPos ); aArgPos );
OUString cbItem; OUString cbItem;
aItem >>= cbItem; aItem >>= cbItem;
@@ -155,9 +155,9 @@ void SAL_CALL ListboxAddItems( HWND hwnd, const Any& aItemList, const Reference<
if ( !aItemList.hasValue( ) || if ( !aItemList.hasValue( ) ||
aItemList.getValueType( ) != getCppuType((Sequence<OUString>*)0) ) aItemList.getValueType( ) != getCppuType((Sequence<OUString>*)0) )
throw IllegalArgumentException( throw IllegalArgumentException(
OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid value type or any has no value" )), "invalid value type or any has no value",
rXInterface, rXInterface,
aArgPos ); aArgPos );
Sequence< OUString > aStringList; Sequence< OUString > aStringList;
aItemList >>= 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_Int16*)0)) &&
(aPosition.getValueType( ) != getCppuType((sal_Int8*)0)) ) ) (aPosition.getValueType( ) != getCppuType((sal_Int8*)0)) ) )
throw IllegalArgumentException( throw IllegalArgumentException(
OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid value type or any has no value" )), "invalid value type or any has no value",
rXInterface, rXInterface,
aArgPos ); aArgPos );
sal_Int32 nPos; sal_Int32 nPos;
aPosition >>= nPos; aPosition >>= nPos;
@@ -196,7 +196,7 @@ void SAL_CALL ListboxDeleteItem( HWND hwnd, const Any& aPosition, const Referenc
// index was not correct // index was not correct
if ( CB_ERR == lRet ) if ( CB_ERR == lRet )
throw IllegalArgumentException( throw IllegalArgumentException(
OUString(RTL_CONSTASCII_USTRINGPARAM( "inavlid item position" )), "inavlid item position",
rXInterface, rXInterface,
aArgPos ); 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_Int16*)0)) &&
(aPosition.getValueType( ) != getCppuType((sal_Int8*)0)) ) ) (aPosition.getValueType( ) != getCppuType((sal_Int8*)0)) ) )
throw IllegalArgumentException( throw IllegalArgumentException(
OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid value type or any has no value" )), "invalid value type or any has no value",
rXInterface, rXInterface,
aArgPos ); aArgPos );
sal_Int32 nPos; sal_Int32 nPos;
aPosition >>= nPos; aPosition >>= nPos;
if ( nPos < -1 ) if ( nPos < -1 )
throw IllegalArgumentException( throw IllegalArgumentException(
OUString(RTL_CONSTASCII_USTRINGPARAM("invalid index")), "invalid index",
rXInterface, rXInterface,
aArgPos ); aArgPos );
@@ -252,7 +252,7 @@ void SAL_CALL ListboxSetSelectedItem( HWND hwnd, const Any& aPosition, const Ref
if ( (CB_ERR == lRet) && (-1 != nPos) ) if ( (CB_ERR == lRet) && (-1 != nPos) )
throw IllegalArgumentException( throw IllegalArgumentException(
OUString(RTL_CONSTASCII_USTRINGPARAM("invalid index")), "invalid index",
rXInterface, rXInterface,
aArgPos ); aArgPos );
} }
@@ -329,9 +329,9 @@ void SAL_CALL CheckboxSetState(
if ( !aState.hasValue( ) || if ( !aState.hasValue( ) ||
aState.getValueType( ) != getCppuType((sal_Bool*)0) ) aState.getValueType( ) != getCppuType((sal_Bool*)0) )
throw IllegalArgumentException( throw IllegalArgumentException(
OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid value type or any has no value" )), "invalid value type or any has no value",
rXInterface, rXInterface,
aArgPos ); aArgPos );
sal_Bool bCheckState = *reinterpret_cast< const sal_Bool* >( aState.getValue( ) ); sal_Bool bCheckState = *reinterpret_cast< const sal_Bool* >( aState.getValue( ) );
WPARAM wParam = bCheckState ? BST_CHECKED : BST_UNCHECKED; WPARAM wParam = bCheckState ? BST_CHECKED : BST_UNCHECKED;

2
sysui/source/win32/misc/resourceprovider.cxx
View File

@@ -58,7 +58,7 @@ using namespace ::com::sun::star::ui::dialogs::CommonFilePickerElementIds;
// id + 100 // id + 100
#define LB_LABEL_OFFSET 100 #define LB_LABEL_OFFSET 100
const rtl::OUString TILDE = OUString(RTL_CONSTASCII_USTRINGPARAM( "~" )); const rtl::OUString TILDE( "~" );
const sal_Unicode TILDE_SIGN = L'~'; const sal_Unicode TILDE_SIGN = L'~';
#define FOLDERPICKER_TITLE 500 #define FOLDERPICKER_TITLE 500