Skip to content

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

convert XubString->OUString in vcl/window.hxx 

Change-Id: I556ad2df5cf1fb29aefb70a61a034d40a10340b1
üst 6dae1199
Show whitespace changes
Inline Side-by-side
Showing with 42 additions and 42 deletions
include/svtools/headbar.hxx
Dosyayı görüntüle @ d15ca2d8
......@@ -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(); }
......
include/vcl/status.hxx
Dosyayı görüntüle @ d15ca2d8
......@@ -185,9 +185,9 @@ 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 )
......
include/vcl/tabctrl.hxx
Dosyayı görüntüle @ d15ca2d8
......@@ -162,9 +162,9 @@ 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 )
......
include/vcl/toolbox.hxx
Dosyayı görüntüle @ d15ca2d8
......@@ -502,9 +502,9 @@ 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 )
......
include/vcl/window.hxx
Dosyayı görüntüle @ d15ca2d8
......@@ -925,11 +925,11 @@ 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;
......@@ -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;
......
vcl/inc/window.h
Dosyayı görüntüle @ d15ca2d8
......@@ -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;
......@@ -279,8 +279,8 @@ public:
Point maPos;
OString maHelpId;
OString maUniqId;
XubString maHelpText;
XubString maQuickHelpText;
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;
......
vcl/source/window/window.cxx
Dosyayı görüntüle @ d15ca2d8
......@@ -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 )
......
vcl/source/window/window2.cxx
Dosyayı görüntüle @ d15ca2d8
......@@ -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;
}
......
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