summaryrefslogtreecommitdiff
path: root/basic/source/app
diff options
context:
space:
mode:
Diffstat (limited to 'basic/source/app')
-rw-r--r--basic/source/app/app.cxx6
-rw-r--r--basic/source/app/appwin.cxx8
-rw-r--r--basic/source/app/brkpnts.cxx1
-rw-r--r--basic/source/app/dialogs.cxx2
-rw-r--r--basic/source/app/dialogs.hxx1
-rw-r--r--basic/source/app/msgedit.cxx13
-rw-r--r--basic/source/app/process.cxx5
-rw-r--r--basic/source/app/processw.hxx4
-rw-r--r--basic/source/app/textedit.cxx4
9 files changed, 21 insertions, 23 deletions
diff --git a/basic/source/app/app.cxx b/basic/source/app/app.cxx
index 7cb4f2ab5751..e82261084a70 100644
--- a/basic/source/app/app.cxx
+++ b/basic/source/app/app.cxx
@@ -74,13 +74,15 @@
using namespace comphelper;
using namespace cppu;
-using namespace rtl;
using namespace com::sun::star;
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
using namespace com::sun::star::ucb;
using namespace com::sun::star::beans;
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+
#endif /* _USE_UNO */
IMPL_GEN_RES_STR;
@@ -237,7 +239,7 @@ int BasicApp::Main( )
DBG_INSTOUTERROR( DBG_OUT_TESTTOOL );
if ( osl_setDebugMessageFunc( osl_TestToolDebugMessageFilter ) )
- DBG_ERROR("osl_setDebugMessageFunc returns non NULL pointer");
+ OSL_FAIL("osl_setDebugMessageFunc returns non NULL pointer");
#endif
ResMgr::SetReadStringHook( ReplaceStringHookProc );
diff --git a/basic/source/app/appwin.cxx b/basic/source/app/appwin.cxx
index 120feafb7fb0..e39d6c8e95b3 100644
--- a/basic/source/app/appwin.cxx
+++ b/basic/source/app/appwin.cxx
@@ -390,7 +390,7 @@ BOOL AppWin::DiskFileChanged( USHORT nWhat )
// uncomment to avoid compiler warning
// break;
default:
- DBG_ERROR("Not Implemented in AppWin::DiskFileChanged");
+ OSL_FAIL("Not Implemented in AppWin::DiskFileChanged");
}
return TRUE;
}
@@ -415,7 +415,7 @@ void AppWin::UpdateFileInfo( USHORT nWhat )
}
break;
default:
- DBG_ERROR("Not Implemented in AppWin::UpdateFileInfo");
+ OSL_FAIL("Not Implemented in AppWin::UpdateFileInfo");
}
}
@@ -590,7 +590,7 @@ USHORT AppWin::QuerySave( QueryBits nBits )
nReturn = SAVE_RES_CANCEL;
break;
default:
- DBG_ERROR("switch default where no default should be: Internal error");
+ OSL_FAIL("switch default where no default should be: Internal error");
nReturn = SAVE_RES_CANCEL;
}
SkipReload( FALSE );
@@ -619,7 +619,7 @@ BOOL AppWin::Close()
// uncomment to avoid compiler warning
// break;
default:
- DBG_ERROR("Not Implemented in AppWin::Close");
+ OSL_FAIL("Not Implemented in AppWin::Close");
return FALSE;
}
}
diff --git a/basic/source/app/brkpnts.cxx b/basic/source/app/brkpnts.cxx
index 86176a764345..a09480c80dc3 100644
--- a/basic/source/app/brkpnts.cxx
+++ b/basic/source/app/brkpnts.cxx
@@ -28,7 +28,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_basic.hxx"
-#include <tools/list.hxx>
#include <basic/sbx.hxx>
#include <basic/sbmod.hxx>
#include <basic/sbstar.hxx>
diff --git a/basic/source/app/dialogs.cxx b/basic/source/app/dialogs.cxx
index ba2a523944aa..178455cb9e77 100644
--- a/basic/source/app/dialogs.cxx
+++ b/basic/source/app/dialogs.cxx
@@ -301,7 +301,7 @@ IMPL_LINK( OptionsDialog, ActivatePageHdl, TabControl *, pTabCtrl )
case RID_TP_FON:
pNewTabPage = new FontOptions( pTabCtrl, aConfig );
break;
- default: DBG_ERROR( "PageHdl: Unbekannte ID!" );
+ default: OSL_FAIL( "PageHdl: Unbekannte ID!" );
}
DBG_ASSERT( pNewTabPage, "Keine Page!" );
pTabCtrl->SetTabPage( nId, pNewTabPage );
diff --git a/basic/source/app/dialogs.hxx b/basic/source/app/dialogs.hxx
index 743949b64898..677bef1962be 100644
--- a/basic/source/app/dialogs.hxx
+++ b/basic/source/app/dialogs.hxx
@@ -38,7 +38,6 @@
#include <vcl/tabctrl.hxx>
#include <vcl/tabpage.hxx>
#include <tools/config.hxx>
-#include <tools/list.hxx>
#include <vcl/lstbox.hxx>
#include <vcl/floatwin.hxx>
#include <vcl/toolbox.hxx>
diff --git a/basic/source/app/msgedit.cxx b/basic/source/app/msgedit.cxx
index 16e8639c7430..34b59d50ed9b 100644
--- a/basic/source/app/msgedit.cxx
+++ b/basic/source/app/msgedit.cxx
@@ -167,7 +167,7 @@ void MsgEdit::AddAnyMsg( TTLogMsg *LogMsg )
case LOG_ASSERTION: AddAssertion( aUILogMsg, LogMsg->aDebugData ); break;
case LOG_ASSERTION_STACK: AddAssertionStack( aUILogMsg, LogMsg->aDebugData ); break;
case LOG_QA_ERROR: AddQAError( aUILogMsg, LogMsg->aDebugData ); break;
- default:DBG_ERROR("Unbekannter Typ in ResultFile. Speichern des ResultFile resultiert in Informationsverlust");
+ default:OSL_FAIL("Unbekannter Typ in ResultFile. Speichern des ResultFile resultiert in Informationsverlust");
}
if ( !bFileLoading )
@@ -486,7 +486,7 @@ String MsgEdit::Impl_MakeText( SvLBoxEntry *pEntry ) const
case LOG_ASSERTION: break;
case LOG_ASSERTION_STACK:aRet.AppendAscii("--> "); break;
case LOG_QA_ERROR: break;
- default:DBG_ERROR("Unknown type in ResultWindow!");
+ default:OSL_FAIL("Unknown type in ResultWindow!");
}
aRet += aEditTree.GetEntryText( pEntry );
return aRet;
@@ -543,10 +543,9 @@ String MsgEdit::GetSelected()
TextSelection MsgEdit::GetSelection() const
{
- ULONG nStart=0,nEnd=0;
-
if ( aEditTree.FirstSelected() )
{
+ ULONG nStart=0,nEnd=0;
nStart = aEditTree.GetModel()->GetAbsPos(aEditTree.FirstSelected() );
if ( aEditTree.LastSelected() )
nEnd = aEditTree.GetModel()->GetAbsPos(aEditTree.LastSelected() );
@@ -585,7 +584,7 @@ void MsgEdit::ReplaceSelected( const String& rStr )
{
(void) rStr; /* avoid warning about unused parameter */
Sound::Beep();
- DBG_ERROR("Not Implemented");
+ OSL_FAIL("Not Implemented");
}
BOOL MsgEdit::IsModified(){ return bModified; }
@@ -609,7 +608,7 @@ void MsgEdit::SetText( const String& rStr )
{
(void) rStr; /* avoid warning about unused parameter */
Sound::Beep();
- DBG_ERROR("Not Implemented");
+ OSL_FAIL("Not Implemented");
}
BOOL MsgEdit::HasText() const
@@ -917,7 +916,7 @@ TTFeatures TTTreeListBox::GetFeatures( SvLBoxEntry* pEntry )
case LOG_QA_ERROR:
return HasQAError;
default:
- DBG_ERROR("Unknown type in ResultWindow");
+ OSL_FAIL("Unknown type in ResultWindow");
}
return HasNothing;
}
diff --git a/basic/source/app/process.cxx b/basic/source/app/process.cxx
index 397eaadbdfee..91e28de22a6a 100644
--- a/basic/source/app/process.cxx
+++ b/basic/source/app/process.cxx
@@ -31,9 +31,8 @@
#ifdef WNT
-#include <tools/prewin.h>
-#include "winbase.h"
-#include <tools/postwin.h>
+#include <prewin.h>
+#include <postwin.h>
#endif
#include <tools/errcode.hxx>
#include <basic/sbxcore.hxx>
diff --git a/basic/source/app/processw.hxx b/basic/source/app/processw.hxx
index 0972ed3f5269..32e486b0ffd8 100644
--- a/basic/source/app/processw.hxx
+++ b/basic/source/app/processw.hxx
@@ -39,12 +39,12 @@ class ProcessWrapper : public SbxObject
using SbxVariable::GetInfo;
// Definition of a table entry. This is done here because
// through this methods and property can declared as private.
-#if defined ( ICC ) || defined ( HPUX ) || defined ( C50 ) || defined ( C52 )
+#if defined ( ICC ) || defined ( C50 ) || defined ( C52 )
public:
#endif
typedef void( ProcessWrapper::*pMeth )
( SbxVariable* pThis, SbxArray* pArgs, BOOL bWrite );
-#if defined ( ICC ) || defined ( HPUX )
+#if defined ( ICC )
private:
#endif
diff --git a/basic/source/app/textedit.cxx b/basic/source/app/textedit.cxx
index 30d1f7a24038..2891cf5e7a16 100644
--- a/basic/source/app/textedit.cxx
+++ b/basic/source/app/textedit.cxx
@@ -201,7 +201,7 @@ void TextEditImp::ImpDoHighlight( const String& rSource, ULONG nLineOff )
if ( rLast.nStart > rLast.nEnd ) // Only up to the bug of MD repaired
{
#if OSL_DEBUG_LEVEL > 1
- DBG_ERROR( "MD-Bug is not repaired!" );
+ OSL_FAIL( "MD-Bug is not repaired!" );
#endif
nCount--;
aPortionList.Remove( nCount);
@@ -324,7 +324,7 @@ void TextEditImp::ImpDoHighlight( const String& rSource, ULONG nLineOff )
default:
{
aColor = Color( RGB_COLORDATA( 0xff, 0x80, 0x80 ) );
- DBG_ERROR( "Unknown syntax color" );
+ OSL_FAIL( "Unknown syntax color" );
}
}
pTextEngine->SetAttrib( TextAttribFontColor( aColor ), nLine, r.nStart, r.nEnd+1 );
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-03 14:52:29 +0000