diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 16:45:18 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 16:45:18 +0000 |
| commit | aad10d688c0b50ee27ce67863b9277fa6b285125 (patch) | |
| tree | cdc857afafaf703f8b0ed91a064f5cd291d49f26 /basic | |
| parent | 5b38074483b71a696d666d79105c0af04c163d22 (diff) | |
INTEGRATION: CWS warnings01 (1.6.30); FILE MERGED
2006/05/23 19:09:58 sb 1.6.30.3: RESYNC: (1.6-1.7); FILE MERGED
2005/12/01 14:56:09 ab 1.6.30.2: #i53898# Removed warnings for unxlngi6
2005/11/07 12:02:49 ab 1.6.30.1: #i53898# Removed warnings
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/source/runtime/inputbox.cxx | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/basic/source/runtime/inputbox.cxx b/basic/source/runtime/inputbox.cxx index d958ba4d5e72..c63c51853918 100644 --- a/basic/source/runtime/inputbox.cxx +++ b/basic/source/runtime/inputbox.cxx @@ -4,9 +4,9 @@ * * $RCSfile: inputbox.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: vg $ $Date: 2006-04-07 14:02:53 $ + * last change: $Author: hr $ $Date: 2006-06-19 17:45:18 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -48,9 +48,7 @@ #ifndef _SV_SVAPP_HXX #include <vcl/svapp.hxx> #endif -#include <sbx.hxx> #include "runtime.hxx" -#pragma hdrstop #include "stdobj.hxx" #include "rtlproto.hxx" @@ -134,10 +132,10 @@ void SvRTLInputBox::PositionPrompt(const String& rPrompt,const Size& rDlgSize) { if ( rPrompt.Len() == 0 ) return; - String aText( rPrompt ); - aText.ConvertLineEnd( LINEEND_CR ); + String aText_( rPrompt ); + aText_.ConvertLineEnd( LINEEND_CR ); aPromptText.SetPosPixel( LogicToPixel(Point(5,5))); - aPromptText.SetText( aText ); + aPromptText.SetText( aText_ ); Size aSize( rDlgSize ); aSize.Width() -= 70; aSize.Height() -= 50; @@ -147,6 +145,8 @@ void SvRTLInputBox::PositionPrompt(const String& rPrompt,const Size& rDlgSize) IMPL_LINK_INLINE_START( SvRTLInputBox, OkHdl, Button *, pButton ) { + (void)pButton; + aText = aEdit.GetText(); EndDialog( 1 ); return 0; @@ -155,6 +155,8 @@ IMPL_LINK_INLINE_END( SvRTLInputBox, OkHdl, Button *, pButton ) IMPL_LINK_INLINE_START( SvRTLInputBox, CancelHdl, Button *, pButton ) { + (void)pButton; + aText.Erase(); EndDialog( 0 ); return 0; @@ -170,6 +172,9 @@ IMPL_LINK_INLINE_END( SvRTLInputBox, CancelHdl, Button *, pButton ) RTLFUNC(InputBox) { + (void)pBasic; + (void)bWrite; + ULONG nArgCount = rPar.Count(); if ( nArgCount < 2 ) StarBASIC::Error( SbERR_BAD_ARGUMENT ); |