summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--comphelper/source/misc/mediadescriptor.cxx28
-rw-r--r--dtrans/source/os2/clipb/Os2Clipboard.cxx1
-rw-r--r--dtrans/source/os2/clipb/Os2Transferable.hxx1
-rw-r--r--vcl/os2/source/gdi/os2layout.cxx4
-rw-r--r--vcl/os2/source/window/salframe.cxx89
-rw-r--r--vcl/os2/source/window/salobj.cxx5
6 files changed, 0 insertions, 128 deletions
diff --git a/comphelper/source/misc/mediadescriptor.cxx b/comphelper/source/misc/mediadescriptor.cxx
index 1aba6e820e10..8dbe084cd3f5 100644
--- a/comphelper/source/misc/mediadescriptor.cxx
+++ b/comphelper/source/misc/mediadescriptor.cxx
@@ -68,9 +68,6 @@ namespace css = ::com::sun::star;
//_______________________________________________
// definitions
-/*-----------------------------------------------
- 10.03.2004 07:35
------------------------------------------------*/
const ::rtl::OUString& MediaDescriptor::PROP_ABORTED()
{
static const ::rtl::OUString sProp(RTL_CONSTASCII_USTRINGPARAM("Aborted"));
@@ -390,33 +387,21 @@ MediaDescriptor::MediaDescriptor()
{
}
-/*-----------------------------------------------
- 10.03.2004 08:09
------------------------------------------------*/
MediaDescriptor::MediaDescriptor(const css::uno::Any& aSource)
: SequenceAsHashMap(aSource)
{
}
-/*-----------------------------------------------
- 10.03.2004 08:09
------------------------------------------------*/
MediaDescriptor::MediaDescriptor(const css::uno::Sequence< css::beans::PropertyValue >& lSource)
: SequenceAsHashMap(lSource)
{
}
-/*-----------------------------------------------
- 10.03.2004 08:09
------------------------------------------------*/
MediaDescriptor::MediaDescriptor(const css::uno::Sequence< css::beans::NamedValue >& lSource)
: SequenceAsHashMap(lSource)
{
}
-/*-----------------------------------------------
- 18.11.2004 13:37
------------------------------------------------*/
sal_Bool MediaDescriptor::isStreamReadOnly() const
{
static ::rtl::OUString CONTENTSCHEME_FILE( RTL_CONSTASCII_USTRINGPARAM( "file" ));
@@ -529,9 +514,6 @@ void MediaDescriptor::clearComponentDataEntry( const ::rtl::OUString& rName )
}
}
-/*-----------------------------------------------
- 10.03.2004 09:02
------------------------------------------------*/
sal_Bool MediaDescriptor::addInputStream()
{
return impl_addInputStream( sal_True );
@@ -614,9 +596,6 @@ sal_Bool MediaDescriptor::impl_addInputStream( sal_Bool bLockFile )
return sal_False;
}
-/*-----------------------------------------------
- 25.03.2004 12:38
------------------------------------------------*/
sal_Bool MediaDescriptor::impl_openStreamWithPostData( const css::uno::Reference< css::io::XInputStream >& _rxPostData )
throw(::com::sun::star::uno::RuntimeException)
{
@@ -688,10 +667,6 @@ sal_Bool MediaDescriptor::impl_openStreamWithPostData( const css::uno::Reference
}
/*-----------------------------------------------*/
-
-/*-----------------------------------------------
- 25.03.2004 12:29
------------------------------------------------*/
sal_Bool MediaDescriptor::impl_openStreamWithURL( const ::rtl::OUString& sURL, sal_Bool bLockFile )
throw(::com::sun::star::uno::RuntimeException)
{
@@ -827,9 +802,6 @@ sal_Bool MediaDescriptor::impl_openStreamWithURL( const ::rtl::OUString& sURL, s
return xInputStream.is();
}
-/*-----------------------------------------------
- 10.09.2004 10:51
------------------------------------------------*/
::rtl::OUString MediaDescriptor::impl_normalizeURL(const ::rtl::OUString& sURL)
{
/* Remove Jumpmarks (fragments) of an URL only here.
diff --git a/dtrans/source/os2/clipb/Os2Clipboard.cxx b/dtrans/source/os2/clipb/Os2Clipboard.cxx
index 0295616c0354..c57c394e420d 100644
--- a/dtrans/source/os2/clipb/Os2Clipboard.cxx
+++ b/dtrans/source/os2/clipb/Os2Clipboard.cxx
@@ -75,7 +75,6 @@ MRESULT EXPENTRY DtransObjWndProc( HWND hWnd, ULONG nMsg, MPARAM nMP1, MPARAM nM
Os2Clipboard* os2Clipboard = GetWindowPtr( hWnd);
if (os2Clipboard)
{
- //MutexGuard aGuard(os2Clipboard->m_aMutex);
debug_printf("WM_DRAWCLIPBOARD os2Clipboard %08x\n", os2Clipboard);
if (os2Clipboard->m_bInSetClipboardData)
{
diff --git a/dtrans/source/os2/clipb/Os2Transferable.hxx b/dtrans/source/os2/clipb/Os2Transferable.hxx
index 025f49544c42..39126e522280 100644
--- a/dtrans/source/os2/clipb/Os2Transferable.hxx
+++ b/dtrans/source/os2/clipb/Os2Transferable.hxx
@@ -42,7 +42,6 @@
#define CHAR_POINTER(THE_OUSTRING) ::rtl::OUStringToOString (THE_OUSTRING, RTL_TEXTENCODING_UTF8).pData->buffer
#if OSL_DEBUG_LEVEL > 1
-//extern "C" int debug_printf(const char *f, ...);
#define debug_printf( ...) { 1; }
#else
#define debug_printf( ...) { 1; }
diff --git a/vcl/os2/source/gdi/os2layout.cxx b/vcl/os2/source/gdi/os2layout.cxx
index b29a79386b21..8e56a464c4e8 100644
--- a/vcl/os2/source/gdi/os2layout.cxx
+++ b/vcl/os2/source/gdi/os2layout.cxx
@@ -953,9 +953,6 @@ SalLayout* Os2SalGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLe
}
#endif // GCP_KERN_HACK
- //BYTE eCharSet = ANSI_CHARSET;
- //if( mpLogFont )
- // eCharSet = mpLogFont->lfCharSet;
pLayout = new Os2SalLayout( mhPS, 0, rFontFace, rFontInstance );
}
@@ -1039,7 +1036,6 @@ ImplFontData* ImplOs2FontData::Clone() const
ImplFontEntry* ImplOs2FontData::CreateFontInstance( ImplFontSelectData& rFSD ) const
{
- //debug_printf("ImplOs2FontData::CreateFontInstance\n");
ImplFontEntry* pEntry = new ImplOs2FontEntry( rFSD );
return pEntry;
}
diff --git a/vcl/os2/source/window/salframe.cxx b/vcl/os2/source/window/salframe.cxx
index 29a3a5489728..f7fa3f645549 100644
--- a/vcl/os2/source/window/salframe.cxx
+++ b/vcl/os2/source/window/salframe.cxx
@@ -392,9 +392,6 @@ static void ImplSaveFrameState( Os2SalFrame* pFrame )
if ( bVisible )
pFrame->mnShowState = SWP_SHOWNORMAL;
pFrame->mbRestoreMaximize = FALSE;
- //debug_printf( "ImplSaveFrameState: window %08x at %d,%d (size %dx%d)\n",
- // pFrame->mhWndFrame,
- // pFrame->maState.mnX, pFrame->maState.mnY, pFrame->maState.mnWidth, pFrame->maState.mnHeight);
}
}
}
@@ -446,7 +443,6 @@ static void ImplSalCalcFrameSize( const Os2SalFrame* pFrame,
nCaptionY = 0;
#if OSL_DEBUG_LEVEL > 1
- //if (_bCapture)
debug_printf("ImplSalCalcFrameSize 0x%08x x=%d y=%d t=%d\n", pFrame->mhWndFrame, nFrameX, nFrameY, nCaptionY);
#endif
}
@@ -616,12 +612,8 @@ SalFrame* ImplSalCreateFrame( Os2SalInstance* pInst, HWND hWndParent, ULONG nSal
if ( nSalFrameStyle & SAL_FRAME_STYLE_FLOAT )
{
- //nExSysStyle |= WS_EX_TOOLWINDOW;
pFrame->mbFloatWin = TRUE;
}
- //if( nSalFrameStyle & SAL_FRAME_STYLE_TOOLTIP )
- // nExSysStyle |= WS_EX_TOPMOST;
-
// init frame data
pFrame->mnStyle = nSalFrameStyle;
@@ -762,7 +754,6 @@ Os2SalFrame::Os2SalFrame()
mbConversionMode = FALSE;
mbCandidateMode = FALSE;
mbCaption = FALSE;
- //mhDefIMEContext = 0;
mpGraphics = NULL;
mnShowState = SWP_SHOWNORMAL;
mnWidth = 0;
@@ -779,23 +770,16 @@ Os2SalFrame::Os2SalFrame()
mbFixBorder = FALSE;
mbSizeBorder = FALSE;
mbFullScreen = FALSE;
- //mbPresentation = FALSE;
mbInShow = FALSE;
mbRestoreMaximize = FALSE;
mbInMoveMsg = FALSE;
mbInSizeMsg = FALSE;
- //mbFullScreenToolWin = FALSE;
mbDefPos = TRUE;
mbOverwriteState = TRUE;
- //mbIME = FALSE;
mbHandleIME = FALSE;
- //mbSpezIME = FALSE;
- //mbAtCursorIME = FALSE;
mbCandidateMode = FALSE;
mbFloatWin = FALSE;
mbNoIcon = FALSE;
- //mSelectedhMenu = 0;
- //mLastActivatedhMenu = 0;
mpParentFrame = NULL;
memset( &maState, 0, sizeof( SalFrameState ) );
@@ -1025,7 +1009,6 @@ void Os2SalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight,
ULONG nPosFlags = 0;
#if OSL_DEBUG_LEVEL > 1
- //dumpWindowInfo( "-Os2SalFrame::SetPosSize", mhWndFrame);
debug_printf( ">Os2SalFrame::SetPosSize go to %d,%d (%dx%d) VCL\n",nX,nY,nWidth,nHeight);
#endif
@@ -1050,7 +1033,6 @@ void Os2SalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight,
#if OSL_DEBUG_LEVEL > 1
debug_printf( "-Os2SalFrame::SetPosSize MOVE to %d,%d\n", nX, nY);
#endif
- //DBG_ASSERT( nX && nY, " Windowposition of (0,0) requested!" );
nEvent = SALEVENT_MOVE;
}
@@ -1103,11 +1085,6 @@ void Os2SalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight,
nY = 0;
}
- // bring floating windows always to top
- // do not change zorder, otherwise tooltips will bring main window to top (ticket:14)
- //if( (mnStyle & SAL_FRAME_STYLE_FLOAT) )
- // nPosFlags |= SWP_ZORDER; // do not change z-order
-
// set new position
_WinSetWindowPos( this, HWND_TOP, nX, nY, nWidth, nHeight, nPosFlags); // | SWP_RESTORE
@@ -1134,8 +1111,6 @@ void Os2SalFrame::SetParent( SalFrame* pNewParent )
static_cast<Os2SalFrame*>(pNewParent)->mhWndClient);
#endif
Os2SalFrame::mbInReparent = TRUE;
- //rc = WinSetParent(static_cast<Os2SalFrame*>(this)->mhWndFrame,
- // static_cast<Os2SalFrame*>(pNewParent)->mhWndClient, TRUE);
rc = WinSetOwner(static_cast<Os2SalFrame*>(this)->mhWndFrame,
static_cast<Os2SalFrame*>(pNewParent)->mhWndClient);
mpParentFrame = static_cast<Os2SalFrame*>(pNewParent);
@@ -1251,9 +1226,6 @@ void Os2SalFrame::SetWindowState( const SalFrameState* pState )
// if it does not fit into the screen do nothing, ie default pos/size will be used
// if there is an overlap with the screen border move the window while keeping its size
- //if( nWidth > nScreenWidth || nHeight > nScreenHeight )
- // nPosSize |= (SWP_NOMOVE | SWP_NOSIZE);
-
if ( nX+nWidth > nScreenWidth )
nX = (nScreenWidth) - nWidth;
if ( nY+nHeight > nScreenHeight )
@@ -1296,8 +1268,6 @@ void Os2SalFrame::SetWindowState( const SalFrameState* pState )
{
if ( pState->mnState & SAL_FRAMESTATE_MINIMIZED )
{
- //if ( pState->mnState & SAL_FRAMESTATE_MAXIMIZED )
- // aPlacement.flags |= WPF_RESTORETOMAXIMIZED;
aPlacement.fl = SWP_SHOWMINIMIZED;
}
else if ( pState->mnState & SAL_FRAMESTATE_MAXIMIZED )
@@ -1349,9 +1319,6 @@ BOOL Os2SalFrame::GetWindowState( SalFrameState* pState )
if ( maState.mnWidth && maState.mnHeight )
{
*pState = maState;
- // #94144# allow Minimize again, should be masked out when read from configuration
- // 91625 - Don't save minimize
- //if ( !(pState->mnState & SAL_FRAMESTATE_MAXIMIZED) )
if ( !(pState->mnState & (SAL_FRAMESTATE_MINIMIZED | SAL_FRAMESTATE_MAXIMIZED)) )
pState->mnState |= SAL_FRAMESTATE_NORMAL;
return TRUE;
@@ -1412,7 +1379,6 @@ void Os2SalFrame::ShowFullScreen( BOOL bFullScreen, sal_Int32 nDisplay )
void Os2SalFrame::StartPresentation( BOOL bStart )
{
- // SysSetObjectData("<WP_DESKTOP>","Autolockup=no"); oder OS2.INI: PM_Lockup
}
// -----------------------------------------------------------------------
@@ -1587,8 +1553,6 @@ void Os2SalFrame::SetPointer( PointerStyle ePointerStyle )
#error New Pointer must be defined!
#endif
- //debug_printf("Os2SalFrame::SetPointer\n");
-
// Mousepointer loaded ?
if ( !aImplPtrTab[ePointerStyle].mhPointer )
{
@@ -1669,8 +1633,6 @@ void Os2SalFrame::SetInputContext( SalInputContext* pContext )
nInputMode &= ~IMI_IM_IME_DISABLE;
if ( pContext->mnOptions & SAL_INPUTCONTEXT_EXTTEXTINPUT_OFF )
nInputMode &= ~IMI_IM_IME_ON;
-// !!! Da derzeit ueber das OS2-IME-UI der IME-Mode nicht einschaltbar ist !!!
-// if ( SAL_INPUTCONTEXT_EXTTEXTINPUT_ON )
nInputMode |= IMI_IM_IME_ON;
}
else
@@ -2453,7 +2415,6 @@ static long ImplHandleMouseMsg( HWND hWnd,
return 0;
#if OSL_DEBUG_LEVEL > 1
- //if (_bCapture)
debug_printf("ImplHandleMouseMsg mouse %d,%d\n",aMouseEvt.mnX,aMouseEvt.mnY);
#endif
@@ -2462,10 +2423,6 @@ static long ImplHandleMouseMsg( HWND hWnd,
if ( nEvent == SALEVENT_MOUSEBUTTONDOWN )
WinUpdateWindow( pFrame->mhWndClient );
- // --- RTL --- (mirror mouse pos)
- //if( Application::GetSettings().GetLayoutRTL() )
- // aMouseEvt.mnX = pFrame->maGeometry.nWidth-1-aMouseEvt.mnX;
-
nRet = pFrame->CallCallback( nEvent, &aMouseEvt );
if ( nMsg == WM_MOUSEMOVE )
{
@@ -3038,7 +2995,6 @@ static int SalImplHandleProcessMenu( Os2SalFrame* pFrame, ULONG nMsg, MPARAM nMP
{
long nRet = 0;
debug_printf("SalImplHandleProcessMenu\n");
- //return (nRet != 0);
return (nRet == 0);
}
@@ -3088,28 +3044,6 @@ static long ImplHandleIMEStartConversion( Os2SalFrame* pFrame )
}
if ( pFrame->mbHandleIME )
{
-/* Windows-Code, der noch nicht angepasst wurde !!!
- // Cursor-Position ermitteln und aus der die Default-Position fuer
- // das Composition-Fenster berechnen
- SalCursorPosEvent aCursorPosEvt;
- pFrame->CallCallback( pFrame->mpInst, pFrame,
- SALEVENT_CURSORPOS, (void*)&aCursorPosEvt );
- COMPOSITIONFORM aForm;
- memset( &aForm, 0, sizeof( aForm ) );
- if ( !aCursorPosEvt.mnWidth || !aCursorPosEvt.mnHeight )
- aForm.dwStyle |= CFS_DEFAULT;
- else
- {
- aForm.dwStyle |= CFS_POINT;
- aForm.ptCurrentPos.x = aCursorPosEvt.mnX;
- aForm.ptCurrentPos.y = aCursorPosEvt.mnY;
- }
- ImmSetCompositionWindow( hIMC, &aForm );
-
- // Den InputContect-Font ermitteln und diesem dem Composition-Fenster
- // bekannt machen
-*/
-
pFrame->mbConversionMode = TRUE;
pFrame->CallCallback( SALEVENT_STARTEXTTEXTINPUT, (void*)NULL );
nRet = TRUE;
@@ -3182,24 +3116,6 @@ static long ImplHandleIMEConversion( Os2SalFrame* pFrame, MPARAM nMP2Param )
pIMEData->mpGetConversionString( hIMI, IMR_CONV_CONVERSIONATTR, pAttrBuf, &nAttrBufLen );
}
-/* !!! Wir bekommen derzeit nur falsche Daten, deshalb zeigen wir derzeit
- !!! auch keine Cursor an
- ULONG nTempBufLen;
- ULONG nCursorPos = 0;
- ULONG nCursorAttr = 0;
- ULONG nChangePos = 0;
- nTempBufLen = sizeof( ULONG );
- pIMEData->mpGetConversionString( hIMI, IMR_CONV_CURSORPOS, &nCursorPos, &nTempBufLen );
- nTempBufLen = sizeof( ULONG );
- pIMEData->mpGetConversionString( hIMI, IMR_CONV_CURSORATTR, &nCursorAttr, &nTempBufLen );
- nTempBufLen = sizeof( ULONG );
- pIMEData->mpGetConversionString( hIMI, IMR_CONV_CHANGESTART, &nChangePos, &nTempBufLen );
-
- aEvt.mnCursorPos = nCursorPos;
- aEvt.mnDeltaStart = nChangePos;
- if ( nCursorAttr & CP_CURSORATTR_INVISIBLE )
- aEvt.mbCursorVisible = FALSE;
-*/
aEvt.mnCursorPos = 0;
aEvt.mnDeltaStart = 0;
aEvt.mbCursorVisible = FALSE;
@@ -3291,11 +3207,6 @@ static void ImplHandleIMEOpenCandidate( Os2SalFrame* pFrame )
pIMEData->mpGetConversionString( hIMI, IMR_CONV_CONVERSIONSTRING, 0, &nBufLen );
if ( nBufLen > 0 )
{
-/* !!! Wir bekommen derzeit nur falsche Daten steht der Cursor immer bei 0
- ULONG nTempBufLen = sizeof( ULONG );
- ULONG nCursorPos = 0;
- pIMEData->mpGetConversionString( hIMI, IMR_CONV_CURSORPOS, &nCursorPos, &nTempBufLen );
-*/
ULONG nCursorPos = 0;
SalExtTextInputPosEvent aEvt;
diff --git a/vcl/os2/source/window/salobj.cxx b/vcl/os2/source/window/salobj.cxx
index 6efe7163a466..2017196cdf5f 100644
--- a/vcl/os2/source/window/salobj.cxx
+++ b/vcl/os2/source/window/salobj.cxx
@@ -202,11 +202,6 @@ MRESULT EXPENTRY SalSysObjChildWndProc( HWND hWnd, ULONG nMsg,
switch( nMsg )
{
case WM_ERASEBACKGROUND:
- // Wegen PlugIn's loeschen wir erstmal den Hintergrund
-/*
- nRet = (MRESULT)FALSE;
- bDef = FALSE;
-*/
break;
case WM_PAINT:
{
generated by cgit (git 2.34.1) at 2024-07-07 23:49:30 +0000