Attachment #55596 for issue #92372

View | Details | Raw Unified | Return to issue 92372
Collapse All | Expand All




class VCLXWindow;
class SalFrame;
class SalObject;
class TaskPaneList;

namespace com {
namespace sun {

                        mbSuppressAccessibilityEvents:1,
                        mbMenuFloatingWindow:1,
                        mbDrawSelectionBackground:1,
                        mbIsInTaskPaneList:1,
                        mbToolbarFloatingWindow:1,
                        mbCallHandlersDuringInputDisabled:1;

    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxDNDListenerContainer;
	TaskPaneList       *mpTaskPaneList;
};

// -----------------

Lines 124-129 class UNOWindowData; Link Here

(-)../../../ooh680-m17/vcl/inc/vcl/window.hxx (-1 / +2 lines)
124	struct IDataObject;	124	struct IDataObject;
125	class VCLXWindow;	125	class VCLXWindow;
126	struct ImplAccessibleInfos;	126	struct ImplAccessibleInfos;
		127	class TaskPaneList;
127		128
128	namespace com {	129	namespace com {
129	namespace sun {	130	namespace sun {
Lines 596-602 public: Link Here
596	SAL_DLLPRIVATE void ImplPaintToMetaFile( GDIMetaFile* pMtf, OutputDevice* pTargetOutDev, const Region* pOuterClip = NULL );	597	SAL_DLLPRIVATE void ImplPaintToMetaFile( GDIMetaFile* pMtf, OutputDevice* pTargetOutDev, const Region* pOuterClip = NULL );
597		598
598	SAL_DLLPRIVATE BOOL ImplIsInTaskPaneList();	599	SAL_DLLPRIVATE BOOL ImplIsInTaskPaneList();
599	SAL_DLLPRIVATE void ImplIsInTaskPaneList( BOOL mbIsInTaskList );	600	SAL_DLLPRIVATE void ImplIsInTaskPaneList( TaskPaneList *pTaskPaneList );
600	SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas >	601	SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas >
601	ImplGetCanvas( const Size& rFullscreenSize, bool bFullscreen ) const;	602	ImplGetCanvas( const Size& rFullscreenSize, bool bFullscreen ) const;
602	SAL_DLLPRIVATE void ImplMoveControlValue( ControlType, const ImplControlValue&, const Point& ) const;	603	SAL_DLLPRIVATE void ImplMoveControlValue( ControlType, const ImplControlValue&, const Point& ) const;




    mpWindowImpl->mbCreatedWithToolkit = FALSE;
    mpWindowImpl->mbSuppressAccessibilityEvents = FALSE; // TRUE: do not send any accessibility events
    mpWindowImpl->mbDrawSelectionBackground = FALSE;    // TRUE: draws transparent window background to indicate (toolbox) selection
    mpWindowImpl->mbIsInTaskPaneList = FALSE;           // TRUE: window was added to the taskpanelist in the topmost system window
    mpWindowImpl->mnNativeBackground  = 0;              // initialize later, depends on type
    mpWindowImpl->mbCallHandlersDuringInputDisabled = FALSE; // TRUE: call event handlers even if input is disabled
    mpWindowImpl->mpTaskPaneList      = NULL;           // non-NULL:  taskpanelist the window has been added to 

    mbEnableRTL         = TRUE;         // TRUE: this outdev will be mirrored if RTL window layout (UI mirroring) is globally active
}

    }
#endif

    if( mpWindowImpl->mpTaskPaneList != NULL )
    {
		mpWindowImpl->mpTaskPaneList->RemoveWindow( this );
        SystemWindow* pMySysWin = NULL;

        while ( pMyParent )
        {
            if ( pMyParent->IsSystemWindow() )
                pMySysWin = (SystemWindow*)pMyParent;
            pMyParent = pMyParent->GetParent();
        }
        if ( pMySysWin && pMySysWin->ImplIsInTaskPaneList( this ) )
        {
            pMySysWin->GetTaskPaneList()->RemoveWindow( this );
        }
        else
        {
            ByteString aTempStr( "Window (" );
            aTempStr += ByteString( GetText(), RTL_TEXTENCODING_UTF8 );
            aTempStr += ") not found in TaskPanelList!";
            DBG_ERROR( aTempStr.GetBuffer() );
        }
    }

    // Fenster hiden, um das entsprechende Paint-Handling auszuloesen

        if( pNewSysWin && pNewSysWin != pSysWin )
        {
            bChangeTaskPaneList = TRUE;
            mpWindowImpl->mpTaskPaneList->RemoveWindow( this );
        }
    }


}
BOOL Window::ImplIsInTaskPaneList()
{
    return mpWindowImpl->mpTaskPaneList != NULL;
}
void Window::ImplIsInTaskPaneList( TaskPaneList *pTaskPaneList )
{
    mpWindowImpl->mpTaskPaneList = pTaskPaneList;
}

void Window::ImplNotifyIconifiedState( BOOL bIconified )

Lines 173-179 void TaskPaneList::AddWindow( Window *pW Link Here

(-)../../../ooh680-m17/vcl/source/window/taskpanelist.cxx (-2 / +2 lines)
173	}	173	}
174		174
175	mTaskPanes.insert( insertionPos, pWindow );	175	mTaskPanes.insert( insertionPos, pWindow );
176	pWindow->ImplIsInTaskPaneList( TRUE );	176	pWindow->ImplIsInTaskPaneList( this );
177	}	177	}
178	}	178	}
179		179
Lines 186-192 void TaskPaneList::RemoveWindow( Window Link Here
186	if( p != mTaskPanes.end() )	186	if( p != mTaskPanes.end() )
187	{	187	{
188	mTaskPanes.erase( p );	188	mTaskPanes.erase( p );
189	pWindow->ImplIsInTaskPaneList( FALSE );	189	pWindow->ImplIsInTaskPaneList( NULL );
190	}	190	}
191	}	191	}
192		192

Return to issue 92372

Lines 770-778 void Window::ImplInitWindowData( WindowT Link Here

(-)../../../ooh680-m17/vcl/source/window/window.cxx (-26 / +7 lines)
770	mpWindowImpl->mbCreatedWithToolkit = FALSE;	770	mpWindowImpl->mbCreatedWithToolkit = FALSE;
771	mpWindowImpl->mbSuppressAccessibilityEvents = FALSE; // TRUE: do not send any accessibility events	771	mpWindowImpl->mbSuppressAccessibilityEvents = FALSE; // TRUE: do not send any accessibility events
772	mpWindowImpl->mbDrawSelectionBackground = FALSE; // TRUE: draws transparent window background to indicate (toolbox) selection	772	mpWindowImpl->mbDrawSelectionBackground = FALSE; // TRUE: draws transparent window background to indicate (toolbox) selection
773	mpWindowImpl->mbIsInTaskPaneList = FALSE; // TRUE: window was added to the taskpanelist in the topmost system window
774	mpWindowImpl->mnNativeBackground = 0; // initialize later, depends on type	773	mpWindowImpl->mnNativeBackground = 0; // initialize later, depends on type
775	mpWindowImpl->mbCallHandlersDuringInputDisabled = FALSE; // TRUE: call event handlers even if input is disabled	774	mpWindowImpl->mbCallHandlersDuringInputDisabled = FALSE; // TRUE: call event handlers even if input is disabled
		775	mpWindowImpl->mpTaskPaneList = NULL; // non-NULL: taskpanelist the window has been added to
776		776
777	mbEnableRTL = TRUE; // TRUE: this outdev will be mirrored if RTL window layout (UI mirroring) is globally active	777	mbEnableRTL = TRUE; // TRUE: this outdev will be mirrored if RTL window layout (UI mirroring) is globally active
778	}	778	}
Lines 4572-4599 Window::~Window() Link Here
4572	}	4570	}
4573	#endif	4571	#endif
4574		4572
4575	if( mpWindowImpl->mbIsInTaskPaneList )	4573	if( mpWindowImpl->mpTaskPaneList != NULL )
4576	{	4574	{
4577	Window* pMyParent = this;	4575	mpWindowImpl->mpTaskPaneList->RemoveWindow( this );
4578	SystemWindow* pMySysWin = NULL;
4579
4580	while ( pMyParent )
4581	{
4582	if ( pMyParent->IsSystemWindow() )
4583	pMySysWin = (SystemWindow*)pMyParent;
4584	pMyParent = pMyParent->GetParent();
4585	}
4586	if ( pMySysWin && pMySysWin->ImplIsInTaskPaneList( this ) )
4587	{
4588	pMySysWin->GetTaskPaneList()->RemoveWindow( this );
4589	}
4590	else
4591	{
4592	ByteString aTempStr( "Window (" );
4593	aTempStr += ByteString( GetText(), RTL_TEXTENCODING_UTF8 );
4594	aTempStr += ") not found in TaskPanelList!";
4595	DBG_ERROR( aTempStr.GetBuffer() );
4596	}
4597	}	4576	}
4598		4577
4599	// Fenster hiden, um das entsprechende Paint-Handling auszuloesen	4578	// Fenster hiden, um das entsprechende Paint-Handling auszuloesen
Lines 6260-6266 void Window::SetParent( Window* pNewPare Link Here
6260	if( pNewSysWin && pNewSysWin != pSysWin )	6249	if( pNewSysWin && pNewSysWin != pSysWin )
6261	{	6250	{
6262	bChangeTaskPaneList = TRUE;	6251	bChangeTaskPaneList = TRUE;
6263	pSysWin->GetTaskPaneList()->RemoveWindow( this );	6252	mpWindowImpl->mpTaskPaneList->RemoveWindow( this );
6264	}	6253	}
6265	}	6254	}
6266		6255
Lines 9437-9447 void Window::ImplDecModalCount() Link Here
9437	}	9426	}
9438	BOOL Window::ImplIsInTaskPaneList()	9427	BOOL Window::ImplIsInTaskPaneList()
9439	{	9428	{
9440	return mpWindowImpl->mbIsInTaskPaneList;	9429	return mpWindowImpl->mpTaskPaneList != NULL;
9441	}	9430	}
9442	void Window::ImplIsInTaskPaneList( BOOL mbIsInTaskList )	9431	void Window::ImplIsInTaskPaneList( TaskPaneList *pTaskPaneList )
9443	{	9432	{
9444	mpWindowImpl->mbIsInTaskPaneList = mbIsInTaskList;	9433	mpWindowImpl->mpTaskPaneList = pTaskPaneList;
9445	}	9434	}
9446		9435
9447	void Window::ImplNotifyIconifiedState( BOOL bIconified )	9436	void Window::ImplNotifyIconifiedState( BOOL bIconified )