tbxitem.cxx (595fd105) tbxitem.cxx (2df387e6)
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 114 unchanged lines hidden (view full) ---

123SFX_IMPL_TOOLBOX_CONTROL_ARG(SfxToolBoxControl, SfxStringItem, sal_True);
124
125static Window* GetTopMostParentSystemWindow( Window* pWindow )
126{
127 OSL_ASSERT( pWindow );
128 if ( pWindow )
129 {
130 // ->manually search topmost system window
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 114 unchanged lines hidden (view full) ---

123SFX_IMPL_TOOLBOX_CONTROL_ARG(SfxToolBoxControl, SfxStringItem, sal_True);
124
125static Window* GetTopMostParentSystemWindow( Window* pWindow )
126{
127 OSL_ASSERT( pWindow );
128 if ( pWindow )
129 {
130 // ->manually search topmost system window
131 // required because their might be another system window between this and the top window
131 // required because there might be another system window between this and the top window
132 pWindow = pWindow->GetParent();
133 SystemWindow* pTopMostSysWin = NULL;
134 while ( pWindow )
135 {
136 if ( pWindow->IsSystemWindow() )
137 pTopMostSysWin = (SystemWindow*)pWindow;
138 pWindow = pWindow->GetParent();
139 }

--- 729 unchanged lines hidden (view full) ---

869 Reference< ::com::sun::star::awt::XWindow > xSubToolBar( xUIElement->getRealInterface(), UNO_QUERY );
870 if ( xSubToolBar.is() )
871 {
872 Reference< ::com::sun::star::awt::XDockableWindow > xDockWindow( xSubToolBar, UNO_QUERY );
873 xDockWindow->addDockableWindowListener( Reference< ::com::sun::star::awt::XDockableWindowListener >(
874 static_cast< OWeakObject * >( this ), UNO_QUERY ));
875 xDockWindow->enableDocking( sal_True );
876
132 pWindow = pWindow->GetParent();
133 SystemWindow* pTopMostSysWin = NULL;
134 while ( pWindow )
135 {
136 if ( pWindow->IsSystemWindow() )
137 pTopMostSysWin = (SystemWindow*)pWindow;
138 pWindow = pWindow->GetParent();
139 }

--- 729 unchanged lines hidden (view full) ---

869 Reference< ::com::sun::star::awt::XWindow > xSubToolBar( xUIElement->getRealInterface(), UNO_QUERY );
870 if ( xSubToolBar.is() )
871 {
872 Reference< ::com::sun::star::awt::XDockableWindow > xDockWindow( xSubToolBar, UNO_QUERY );
873 xDockWindow->addDockableWindowListener( Reference< ::com::sun::star::awt::XDockableWindowListener >(
874 static_cast< OWeakObject * >( this ), UNO_QUERY ));
875 xDockWindow->enableDocking( sal_True );
876
877 // keep refererence to UIElement to avoid its destruction
877 // keep reference to UIElement to avoid its destruction
878 if ( pImpl->mxUIElement.is() )
879 {
880 Reference< XComponent > xComponent( pImpl->mxUIElement, UNO_QUERY );
881 xComponent->dispose();
882 }
883 pImpl->mxUIElement = xUIElement;
884
885 Window* pParentTbxWindow( pImpl->pBox );

--- 626 unchanged lines hidden ---
878 if ( pImpl->mxUIElement.is() )
879 {
880 Reference< XComponent > xComponent( pImpl->mxUIElement, UNO_QUERY );
881 xComponent->dispose();
882 }
883 pImpl->mxUIElement = xUIElement;
884
885 Window* pParentTbxWindow( pImpl->pBox );

--- 626 unchanged lines hidden ---