summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/svtools/headbar.hxx4
-rw-r--r--include/vcl/status.hxx8
-rw-r--r--include/vcl/tabctrl.hxx6
-rw-r--r--include/vcl/toolbox.hxx6
-rw-r--r--include/vcl/window.hxx20
-rw-r--r--vcl/inc/window.h14
-rw-r--r--vcl/source/window/window.cxx36
-rw-r--r--vcl/source/window/window2.cxx6
8 files changed, 50 insertions, 50 deletions
diff --git a/include/svtools/headbar.hxx b/include/svtools/headbar.hxx
index 29bd35fe2804..5145231f1a1e 100644
--- a/include/svtools/headbar.hxx
+++ b/include/svtools/headbar.hxx
@@ -344,8 +344,8 @@ public:
Size CalcWindowSizePixel() const;
- inline void SetHelpText( const String& rText ) { Window::SetHelpText( rText ); }
- inline const String& GetHelpText() const { return Window::GetHelpText(); }
+ inline void SetHelpText( const OUString& rText ) { Window::SetHelpText( rText ); }
+ inline const OUString& GetHelpText() const { return Window::GetHelpText(); }
inline void SetHelpId( const OString& rId ) { Window::SetHelpId( rId ); }
inline const OString& GetHelpId() const { return Window::GetHelpId(); }
diff --git a/include/vcl/status.hxx b/include/vcl/status.hxx
index 2363cd179807..06c92b4e246a 100644
--- a/include/vcl/status.hxx
+++ b/include/vcl/status.hxx
@@ -176,7 +176,7 @@ public:
const XubString& GetQuickHelpText( sal_uInt16 nItemId ) const;
void SetHelpId( sal_uInt16 nItemId, const OString& rHelpId );
- OString GetHelpId( sal_uInt16 nItemId ) const;
+ OString GetHelpId( sal_uInt16 nItemId ) const;
void StartProgressMode( const XubString& rText );
void SetProgressValue( sal_uInt16 nPercent );
@@ -185,14 +185,14 @@ public:
void SetText( const OUString& rText );
- void SetHelpText( const XubString& rText )
+ void SetHelpText( const OUString& rText )
{ Window::SetHelpText( rText ); }
- const XubString& GetHelpText() const
+ const OUString& GetHelpText() const
{ return Window::GetHelpText(); }
void SetHelpId( const OString& rId )
{ Window::SetHelpId( rId ); }
- const OString& GetHelpId() const
+ const OString& GetHelpId() const
{ return Window::GetHelpId(); }
Size CalcWindowSizePixel() const;
diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx
index 05b8313b537b..8b4111a0d433 100644
--- a/include/vcl/tabctrl.hxx
+++ b/include/vcl/tabctrl.hxx
@@ -162,14 +162,14 @@ public:
void SetPageImage( sal_uInt16 nPageId, const Image& rImage );
- void SetHelpText( const XubString& rText )
+ void SetHelpText( const OUString& rText )
{ Control::SetHelpText( rText ); }
- const XubString& GetHelpText() const
+ const OUString& GetHelpText() const
{ return Control::GetHelpText(); }
void SetHelpId( const OString& rId )
{ Control::SetHelpId( rId ); }
- const OString& GetHelpId() const
+ const OString& GetHelpId() const
{ return Control::GetHelpId(); }
void SetActivatePageHdl( const Link& rLink ) { maActivateHdl = rLink; }
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index eee14856157f..46c3b926612b 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -502,14 +502,14 @@ public:
sal_Bool IsCustomize() { return mbCustomize; }
sal_Bool IsInCustomizeMode() const { return mbCustomizeMode; }
- void SetHelpText( const XubString& rText )
+ void SetHelpText( const OUString& rText )
{ DockingWindow::SetHelpText( rText ); }
- const XubString& GetHelpText() const
+ const OUString& GetHelpText() const
{ return DockingWindow::GetHelpText(); }
void SetHelpId( const OString& rId )
{ DockingWindow::SetHelpId( rId ); }
- const OString& GetHelpId() const
+ const OString& GetHelpId() const
{ return DockingWindow::GetHelpId(); }
void SetClickHdl( const Link& rLink ) { maClickHdl = rLink; }
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index d1c783bc0e69..4408adb98381 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -925,17 +925,17 @@ public:
// this may be a child's background color (e.g. ListBox)
virtual const Wallpaper& GetDisplayBackground() const;
- void SetHelpText( const XubString& rHelpText );
- const XubString& GetHelpText() const;
+ void SetHelpText( const OUString& rHelpText );
+ const OUString& GetHelpText() const;
- void SetQuickHelpText( const XubString& rHelpText );
- const XubString& GetQuickHelpText() const;
+ void SetQuickHelpText( const OUString& rHelpText );
+ const OUString& GetQuickHelpText() const;
void SetHelpId( const OString& );
- const OString& GetHelpId() const;
+ const OString& GetHelpId() const;
void SetUniqueId( const OString& );
- const OString& GetUniqueId() const;
+ const OString& GetUniqueId() const;
Window* FindWindow( const Point& rPos ) const;
@@ -1001,11 +1001,11 @@ public:
void SetAccessibleRole( sal_uInt16 nRole );
sal_uInt16 GetAccessibleRole() const;
- void SetAccessibleName( const String& rName );
- String GetAccessibleName() const;
+ void SetAccessibleName( const OUString& rName );
+ OUString GetAccessibleName() const;
- void SetAccessibleDescription( const String& rDescr );
- String GetAccessibleDescription() const;
+ void SetAccessibleDescription( const OUString& rDescr );
+ OUString GetAccessibleDescription() const;
void SetAccessibleRelationLabeledBy( Window* pLabeledBy );
Window* GetAccessibleRelationLabeledBy() const;
diff --git a/vcl/inc/window.h b/vcl/inc/window.h
index 230e1b07d068..092417b554d0 100644
--- a/vcl/inc/window.h
+++ b/vcl/inc/window.h
@@ -209,8 +209,8 @@ struct ImplFrameData
struct ImplAccessibleInfos
{
sal_uInt16 nAccessibleRole;
- String* pAccessibleName;
- String* pAccessibleDescription;
+ OUString* pAccessibleName;
+ OUString* pAccessibleDescription;
Window* pLabeledByWindow;
Window* pLabelForWindow;
Window* pMemberOfWindow;
@@ -263,7 +263,7 @@ public:
Cursor* mpCursor;
Pointer maPointer;
Fraction maZoom;
- XubString maText;
+ OUString maText;
Font* mpControlFont;
Color maControlForeground;
Color maControlBackground;
@@ -277,10 +277,10 @@ public:
long mnY;
long mnAbsScreenX;
Point maPos;
- OString maHelpId;
- OString maUniqId;
- XubString maHelpText;
- XubString maQuickHelpText;
+ OString maHelpId;
+ OString maUniqId;
+ OUString maHelpText;
+ OUString maQuickHelpText;
InputContext maInputContext;
::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > mxWindowPeer;
::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > mxAccessible;
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 2a7440ae16ef..aa3db23122f9 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -4906,18 +4906,18 @@ void Window::RequestHelp( const HelpEvent& rHEvt )
// with help text set
if ( rHEvt.GetMode() & HELPMODE_BALLOON )
{
- const XubString* pStr = &(GetHelpText());
- if ( !pStr->Len() )
- pStr = &(GetQuickHelpText());
- if ( !pStr->Len() && ImplGetParent() && !ImplIsOverlapWindow() )
+ OUString rStr = GetHelpText();
+ if ( rStr.isEmpty() )
+ rStr = GetQuickHelpText();
+ if ( rStr.isEmpty() && ImplGetParent() && !ImplIsOverlapWindow() )
ImplGetParent()->RequestHelp( rHEvt );
else
- Help::ShowBalloon( this, rHEvt.GetMousePosPixel(), *pStr );
+ Help::ShowBalloon( this, rHEvt.GetMousePosPixel(), rStr );
}
else if ( rHEvt.GetMode() & HELPMODE_QUICK )
{
- const XubString* pStr = &(GetQuickHelpText());
- if ( !pStr->Len() && ImplGetParent() && !ImplIsOverlapWindow() )
+ const OUString& rStr = GetQuickHelpText();
+ if ( rStr.isEmpty() && ImplGetParent() && !ImplIsOverlapWindow() )
ImplGetParent()->RequestHelp( rHEvt );
else
{
@@ -4926,9 +4926,9 @@ void Window::RequestHelp( const HelpEvent& rHEvt )
aPos = ImplGetParent()->OutputToScreenPixel( aPos );
Rectangle aRect( aPos, GetSizePixel() );
String aHelpText;
- if ( pStr->Len() )
+ if ( rStr.getLength() )
aHelpText = GetHelpText();
- Help::ShowQuickHelp( this, aRect, *pStr, aHelpText, QUICKHELP_CTRLTEXT );
+ Help::ShowQuickHelp( this, aRect, rStr, aHelpText, QUICKHELP_CTRLTEXT );
}
}
else
@@ -7989,14 +7989,14 @@ const Wallpaper& Window::GetDisplayBackground() const
// -----------------------------------------------------------------------
-const XubString& Window::GetHelpText() const
+const OUString& Window::GetHelpText() const
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
String aStrHelpId( OStringToOUString( GetHelpId(), RTL_TEXTENCODING_UTF8 ) );
bool bStrHelpId = (aStrHelpId.Len() > 0);
- if ( !mpWindowImpl->maHelpText.Len() && bStrHelpId )
+ if ( !mpWindowImpl->maHelpText.getLength() && bStrHelpId )
{
if ( !IsDialog() && (mpWindowImpl->mnType != WINDOW_TABPAGE) && (mpWindowImpl->mnType != WINDOW_FLOATINGWINDOW) )
{
@@ -8013,7 +8013,7 @@ const XubString& Window::GetHelpText() const
static const char* pEnv = getenv( "HELP_DEBUG" );
if( pEnv && *pEnv )
{
- OUStringBuffer aTxt( 64+mpWindowImpl->maHelpText.Len() );
+ OUStringBuffer aTxt( 64+mpWindowImpl->maHelpText.getLength() );
aTxt.append( mpWindowImpl->maHelpText );
aTxt.appendAscii( "\n------------------\n" );
aTxt.append( OUString( aStrHelpId ) );
@@ -8925,16 +8925,16 @@ sal_uInt16 Window::GetAccessibleRole() const
return nRole;
}
-void Window::SetAccessibleName( const String& rName )
+void Window::SetAccessibleName( const OUString& rName )
{
if ( !mpWindowImpl->mpAccessibleInfos )
mpWindowImpl->mpAccessibleInfos = new ImplAccessibleInfos;
delete mpWindowImpl->mpAccessibleInfos->pAccessibleName;
- mpWindowImpl->mpAccessibleInfos->pAccessibleName = new String( rName );
+ mpWindowImpl->mpAccessibleInfos->pAccessibleName = new OUString( rName );
}
-String Window::GetAccessibleName() const
+OUString Window::GetAccessibleName() const
{
if (mpWindowImpl->mpAccessibleInfos && mpWindowImpl->mpAccessibleInfos->pAccessibleName)
return *mpWindowImpl->mpAccessibleInfos->pAccessibleName;
@@ -8994,17 +8994,17 @@ OUString Window::getDefaultAccessibleName() const
return GetNonMnemonicString( aAccessibleName );
}
-void Window::SetAccessibleDescription( const String& rDescription )
+void Window::SetAccessibleDescription( const OUString& rDescription )
{
if ( ! mpWindowImpl->mpAccessibleInfos )
mpWindowImpl->mpAccessibleInfos = new ImplAccessibleInfos;
DBG_ASSERT( !mpWindowImpl->mpAccessibleInfos->pAccessibleDescription, "AccessibleDescription already set!" );
delete mpWindowImpl->mpAccessibleInfos->pAccessibleDescription;
- mpWindowImpl->mpAccessibleInfos->pAccessibleDescription = new String( rDescription );
+ mpWindowImpl->mpAccessibleInfos->pAccessibleDescription = new OUString( rDescription );
}
-String Window::GetAccessibleDescription() const
+OUString Window::GetAccessibleDescription() const
{
String aAccessibleDescription;
if ( mpWindowImpl->mpAccessibleInfos && mpWindowImpl->mpAccessibleInfos->pAccessibleDescription )
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 98d7559fde43..aa919519995c 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -1653,18 +1653,18 @@ sal_Bool Window::IsZoom() const
return mpWindowImpl->maZoom.GetNumerator() != mpWindowImpl->maZoom.GetDenominator();
}
-void Window::SetHelpText( const XubString& rHelpText )
+void Window::SetHelpText( const OUString& rHelpText )
{
mpWindowImpl->maHelpText = rHelpText;
mpWindowImpl->mbHelpTextDynamic = sal_True;
}
-void Window::SetQuickHelpText( const XubString& rHelpText )
+void Window::SetQuickHelpText( const OUString& rHelpText )
{
mpWindowImpl->maQuickHelpText = rHelpText;
}
-const XubString& Window::GetQuickHelpText() const
+const OUString& Window::GetQuickHelpText() const
{
return mpWindowImpl->maQuickHelpText;
}
generated by cgit (git 2.34.1) at 2025-02-28 09:18:06 +0000