[Libreoffice-commits] .: 3 commits - dtrans/source i18npool/inc svl/source sysui/source tools/inc
Norbert Thiebaud
nthiebaud at kemper.freedesktop.org
Mon May 28 09:47:51 PDT 2012
dtrans/source/win32/dtobj/MimeAttrib.hxx | 8 +++---
i18npool/inc/transliterationImpl.hxx | 2 -
svl/source/inc/passwordcontainer.hxx | 2 -
sysui/source/win32/misc/WinImplHelper.cxx | 36 +++++++++++++--------------
sysui/source/win32/misc/resourceprovider.cxx | 2 -
tools/inc/tools/solar.h | 1
6 files changed, 25 insertions(+), 26 deletions(-)
New commits:
commit bb059d9dd38f1dc5d0075f6c703154d4c6b50bd2
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Mon May 28 11:42:43 2012 -0500
targetted string re-work
Change-Id: I0d0712f441fcecb7a165173da7174e8f254cf39a
diff --git a/dtrans/source/win32/dtobj/MimeAttrib.hxx b/dtrans/source/win32/dtobj/MimeAttrib.hxx
index fd62793..8f39d3f 100644
--- a/dtrans/source/win32/dtobj/MimeAttrib.hxx
+++ b/dtrans/source/win32/dtobj/MimeAttrib.hxx
@@ -42,10 +42,10 @@
const rtl::OUString TEXTPLAIN_PARAM_CHARSET = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("charset"));
-const rtl::OUString PRE_WINDOWS_CODEPAGE (RTL_CONSTASCII_USTRINGPARAM("windows"));
-const rtl::OUString PRE_OEM_CODEPAGE (RTL_CONSTASCII_USTRINGPARAM("cp"));
-const rtl::OUString CHARSET_UTF16 (RTL_CONSTASCII_USTRINGPARAM("utf-16"));
-const rtl::OUString CHARSET_UNICODE (RTL_CONSTASCII_USTRINGPARAM("unicode"));
+const rtl::OUString PRE_WINDOWS_CODEPAGE ("windows");
+const rtl::OUString PRE_OEM_CODEPAGE ("cp");
+const rtl::OUString CHARSET_UTF16 ("utf-16");
+const rtl::OUString CHARSET_UNICODE ("unicode");
#endif
diff --git a/i18npool/inc/transliterationImpl.hxx b/i18npool/inc/transliterationImpl.hxx
index cb06d0e..64da175 100644
--- a/i18npool/inc/transliterationImpl.hxx
+++ b/i18npool/inc/transliterationImpl.hxx
@@ -38,7 +38,7 @@
namespace com { namespace sun { namespace star { namespace i18n {
#if OSL_DEBUG_LEVEL > 1
-#define RETURN_DEBUG_STRING (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("return from transliterationImpl")));
+#define RETURN_DEBUG_STRING ("return from transliterationImpl");
#define RETURN_DEBUG_NUMBER 'TRAN'
#else
#define RETURN_DEBUG_STRING
diff --git a/svl/source/inc/passwordcontainer.hxx b/svl/source/inc/passwordcontainer.hxx
index bcbd51b..c2aba84 100644
--- a/svl/source/inc/passwordcontainer.hxx
+++ b/svl/source/inc/passwordcontainer.hxx
@@ -216,7 +216,7 @@ public:
{
::com::sun::star::uno::Sequence< ::rtl::OUString > aNode( 1 );
*aNode.getArray() = path;
- *aNode.getArray() += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/Store"));
+ *aNode.getArray() += "/Store";
EnableNotification( aNode );
}
commit c927e5ed4d358465f91ec4f28734af42d72a0f9c
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Mon May 28 11:37:45 2012 -0500
targeted string re-work
Change-Id: I03f894f52cd4115f4871a82eb6e481c5642362da
diff --git a/sysui/source/win32/misc/WinImplHelper.cxx b/sysui/source/win32/misc/WinImplHelper.cxx
index 8f62008..3999a52 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 8a8de8d..0188f9a 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
commit f9598738a6f8625b6908d0e25603f00ace4da7f9
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sun May 27 10:53:42 2012 -0500
we really should not have any FASTBOOL left, remove the typedef
Change-Id: Ia3b0ba6d7ba91218c42abf1368a110b325f5794e
diff --git a/tools/inc/tools/solar.h b/tools/inc/tools/solar.h
index 0f0b123..926dc0f 100644
--- a/tools/inc/tools/solar.h
+++ b/tools/inc/tools/solar.h
@@ -51,7 +51,6 @@ typedef sal_uIntPtr sal_uLong; /* Replaces type ULONG */
/*** misc. macros to leverage platform and compiler differences ********/
-typedef int FASTBOOL;
#define DELETEZ( p ) ( delete p,p = 0 )
#ifdef WNT
More information about the Libreoffice-commits
mailing list