Skip to content

C
core
Kaydet (Commit) 55528ca8 authored tarafından Noel Grandin's avatar Noel Grandin
Dosyalara gözat
Seçenekler

convert vcl/toolbox.hxx from XubString->OUString 

Change-Id: I352dbb85ccbff46571c417b45249f548f5da8b97
üst fab6c804
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
include/vcl/toolbox.hxx
Dosyayı görüntüle @ 55528ca8
...@@ -230,7 +230,7 @@ private: ...@@ -230,7 +230,7 @@ private:
using Window::ImplInvalidate; using Window::ImplInvalidate;
SAL_DLLPRIVATE void ImplInvalidate( sal_Bool bNewCalc = sal_False, sal_Bool bFullPaint = sal_False ); SAL_DLLPRIVATE void ImplInvalidate( sal_Bool bNewCalc = sal_False, sal_Bool bFullPaint = sal_False );
SAL_DLLPRIVATE void ImplUpdateItem( sal_uInt16 nIndex = 0xFFFF ); SAL_DLLPRIVATE void ImplUpdateItem( sal_uInt16 nIndex = 0xFFFF );
SAL_DLLPRIVATE const OUString ImplConvertMenuString( const XubString& rStr ); SAL_DLLPRIVATE const OUString ImplConvertMenuString( const OUString& rStr );
SAL_DLLPRIVATE sal_Bool ImplHandleMouseMove( const MouseEvent& rMEvt, sal_Bool bRepeat = sal_False ); SAL_DLLPRIVATE sal_Bool ImplHandleMouseMove( const MouseEvent& rMEvt, sal_Bool bRepeat = sal_False );
SAL_DLLPRIVATE sal_Bool ImplHandleMouseButtonUp( const MouseEvent& rMEvt, sal_Bool bCancel = sal_False ); SAL_DLLPRIVATE sal_Bool ImplHandleMouseButtonUp( const MouseEvent& rMEvt, sal_Bool bCancel = sal_False );
SAL_DLLPRIVATE void ImplChangeHighlight( ImplToolItem* pItem, sal_Bool bNoGrabFocus = sal_False ); SAL_DLLPRIVATE void ImplChangeHighlight( ImplToolItem* pItem, sal_Bool bNoGrabFocus = sal_False );
...@@ -349,10 +349,10 @@ public: ...@@ -349,10 +349,10 @@ public:
ToolBoxItemBits nBits = 0, ToolBoxItemBits nBits = 0,
sal_uInt16 nPos = TOOLBOX_APPEND ); sal_uInt16 nPos = TOOLBOX_APPEND );
void InsertItem( sal_uInt16 nItemId, const Image& rImage, void InsertItem( sal_uInt16 nItemId, const Image& rImage,
const XubString& rText, const OUString& rText,
ToolBoxItemBits nBits = 0, ToolBoxItemBits nBits = 0,
sal_uInt16 nPos = TOOLBOX_APPEND ); sal_uInt16 nPos = TOOLBOX_APPEND );
void InsertItem( sal_uInt16 nItemId, const XubString& rText, void InsertItem( sal_uInt16 nItemId, const OUString& rText,
ToolBoxItemBits nBits = 0, ToolBoxItemBits nBits = 0,
sal_uInt16 nPos = TOOLBOX_APPEND ); sal_uInt16 nPos = TOOLBOX_APPEND );
void InsertWindow( sal_uInt16 nItemId, Window* pWindow, void InsertWindow( sal_uInt16 nItemId, Window* pWindow,
......
vcl/source/window/toolbox2.cxx
Dosyayı görüntüle @ 55528ca8
...@@ -367,7 +367,7 @@ sal_Bool ImplToolItem::IsClipped() const ...@@ -367,7 +367,7 @@ sal_Bool ImplToolItem::IsClipped() const
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
const OUString ToolBox::ImplConvertMenuString( const XubString& rStr ) const OUString ToolBox::ImplConvertMenuString( const OUString& rStr )
{ {
OUString aCvtStr( rStr ); OUString aCvtStr( rStr );
if ( mbMenuStrings ) if ( mbMenuStrings )
...@@ -629,7 +629,7 @@ void ToolBox::InsertItem( sal_uInt16 nItemId, const Image& rImage, ...@@ -629,7 +629,7 @@ void ToolBox::InsertItem( sal_uInt16 nItemId, const Image& rImage,
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
void ToolBox::InsertItem( sal_uInt16 nItemId, const Image& rImage, void ToolBox::InsertItem( sal_uInt16 nItemId, const Image& rImage,
const XubString& rText, const OUString& rText,
ToolBoxItemBits nBits, sal_uInt16 nPos ) ToolBoxItemBits nBits, sal_uInt16 nPos )
{ {
DBG_ASSERT( nItemId, "ToolBox::InsertItem(): ItemId == 0" ); DBG_ASSERT( nItemId, "ToolBox::InsertItem(): ItemId == 0" );
...@@ -649,7 +649,7 @@ void ToolBox::InsertItem( sal_uInt16 nItemId, const Image& rImage, ...@@ -649,7 +649,7 @@ void ToolBox::InsertItem( sal_uInt16 nItemId, const Image& rImage,
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
void ToolBox::InsertItem( sal_uInt16 nItemId, const XubString& rText, void ToolBox::InsertItem( sal_uInt16 nItemId, const OUString& rText,
ToolBoxItemBits nBits, sal_uInt16 nPos ) ToolBoxItemBits nBits, sal_uInt16 nPos )
{ {
DBG_ASSERT( nItemId, "ToolBox::InsertItem(): ItemId == 0" ); DBG_ASSERT( nItemId, "ToolBox::InsertItem(): ItemId == 0" );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment