Modified: openoffice/branches/rejuvenate01/main/svtools/source/brwbox/brwbox3.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/svtools/source/brwbox/brwbox3.cxx?rev=1550072&r1=1550071&r2=1550072&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/svtools/source/brwbox/brwbox3.cxx (original) +++ openoffice/branches/rejuvenate01/main/svtools/source/brwbox/brwbox3.cxx Wed Dec 11 08:49:16 2013 @@ -256,7 +256,6 @@ OUString BrowseBox::GetAccessibleObjectN sal_Int32 rowId = _nPosition + 1; aRetText = OUString::valueOf( rowId ); } - //aRetText = OUString( RTL_CONSTASCII_USTRINGPARAM( "RowHeaderCell" ) ); #if OSL_DEBUG_LEVEL > 1 aRetText += OUString( RTL_CONSTASCII_USTRINGPARAM( " [" ) ); aRetText += OUString::valueOf(sal_Int32(GetCurRow())); @@ -266,7 +265,6 @@ OUString BrowseBox::GetAccessibleObjectN #endif break; case ::svt::BBTYPE_COLUMNHEADERCELL: - //aRetText = OUString( RTL_CONSTASCII_USTRINGPARAM( "ColumnHeaderCell" ) ); aRetText = OUString( GetColumnDescription( sal_Int16( _nPosition ) ) ); #if OSL_DEBUG_LEVEL > 1 aRetText += OUString( RTL_CONSTASCII_USTRINGPARAM( " [" ) );
Modified: openoffice/branches/rejuvenate01/main/svtools/source/brwbox/editbrowsebox.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/svtools/source/brwbox/editbrowsebox.cxx?rev=1550072&r1=1550071&r2=1550072&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/svtools/source/brwbox/editbrowsebox.cxx (original) +++ openoffice/branches/rejuvenate01/main/svtools/source/brwbox/editbrowsebox.cxx Wed Dec 11 08:49:16 2013 @@ -1072,7 +1072,6 @@ namespace svt { commitTableEvent( ACTIVE_DESCENDANT_CHANGED, - //makeAny( CreateAccessibleCell( nRow, GetColumnPos( nCol ) ) ), makeAny( CreateAccessibleCell( nRow, GetColumnPos( nCol -1) ) ), Any() ); Modified: openoffice/branches/rejuvenate01/main/svtools/source/contnr/svtreebx.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/svtools/source/contnr/svtreebx.cxx?rev=1550072&r1=1550071&r2=1550072&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/svtools/source/contnr/svtreebx.cxx (original) +++ openoffice/branches/rejuvenate01/main/svtools/source/contnr/svtreebx.cxx Wed Dec 11 08:49:16 2013 @@ -907,7 +907,6 @@ void SvTreeListBox::GetFocus() pEntry = pImp->pCursor; } if ( pEntry ) - //pImp->CallEventListeners( VCLEVENT_LISTBOX_SELECT, pEntry ); pImp->CallEventListeners( VCLEVENT_LISTBOX_TREEFOCUS, pEntry ); } @@ -2763,13 +2762,6 @@ void SvTreeListBox::FillAccessibleEntryS rStateSet.AddState( AccessibleStateType::EXPANDABLE ); if ( IsExpanded( pEntry ) ) rStateSet.AddState( (sal_Int16)AccessibleStateType::EXPANDED ); - /* - else - { - // MT: COLLAPSE == EXPANDABLE & !EXPANDED - rStateSet.AddState( (sal_Int16)AccessibleStateType::COLLAPSE ); - } - */ } if ( GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED ) Modified: openoffice/branches/rejuvenate01/main/svtools/source/control/valueacc.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/svtools/source/control/valueacc.cxx?rev=1550072&r1=1550071&r2=1550072&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/svtools/source/control/valueacc.cxx (original) +++ openoffice/branches/rejuvenate01/main/svtools/source/control/valueacc.cxx Wed Dec 11 08:49:16 2013 @@ -788,7 +788,6 @@ ValueSetItem* ValueSetAcc::getItem (sal_ nIndex -= 1; } if (pItem == NULL) - //pItem = mpParent->ImplGetVisibleItem (static_cast<sal_uInt16>(nIndex)); pItem = mpParent->ImplGetItem (static_cast<sal_uInt16>(nIndex)); return pItem; @@ -973,7 +972,6 @@ sal_Int32 SAL_CALL ValueItemAcc::getAcce // just in case the number of children changes in the mean time. try { - //pItem = mpParent->mrParent.ImplGetVisibleItem (i); pItem = mpParent->mrParent.ImplGetItem(i); } catch (lang::IndexOutOfBoundsException aException) Modified: openoffice/branches/rejuvenate01/main/svtools/source/control/valueset.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/svtools/source/control/valueset.cxx?rev=1550072&r1=1550071&r2=1550072&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/svtools/source/control/valueset.cxx (original) +++ openoffice/branches/rejuvenate01/main/svtools/source/control/valueset.cxx Wed Dec 11 08:49:16 2013 @@ -1220,7 +1220,6 @@ sal_uInt16 ValueSet::ImplGetVisibleItemC ValueSetItem* pItem = mpImpl->mpItemList->GetObject( n ); //IAccessible2 implementation - also count empty rectangles as visible... - // if( pItem->meType != VALUESETITEM_SPACE && !pItem->maRect.IsEmpty() ) if( pItem->meType != VALUESETITEM_SPACE ) nRet++; } Modified: openoffice/branches/rejuvenate01/main/svx/source/accessibility/AccessibleGraphicShape.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/svx/source/accessibility/AccessibleGraphicShape.cxx?rev=1550072&r1=1550071&r2=1550072&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/svx/source/accessibility/AccessibleGraphicShape.cxx (original) +++ openoffice/branches/rejuvenate01/main/svx/source/accessibility/AccessibleGraphicShape.cxx Wed Dec 11 08:49:16 2013 @@ -209,7 +209,6 @@ uno::Sequence<uno::Type> SAL_CALL throw (::com::sun::star::uno::RuntimeException) { //Solution: Don't use the same information for accessible name and accessible description. - //return CreateAccessibleName (); ::rtl::OUString sDesc; if(m_pShape) sDesc = m_pShape->GetTitle(); @@ -225,7 +224,6 @@ sal_Int16 SAL_CALL AccessibleGraphicShap if( m_pShape->GetModel()->GetImageMapForObject(m_pShape) != NULL ) return AccessibleRole::IMAGE_MAP; else - //return AccessibleRole::SHAPE; return AccessibleShape::getAccessibleRole(); return nAccessibleRole; } Modified: openoffice/branches/rejuvenate01/main/svx/source/accessibility/AccessibleShape.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/svx/source/accessibility/AccessibleShape.cxx?rev=1550072&r1=1550071&r2=1550072&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/svx/source/accessibility/AccessibleShape.cxx (original) +++ openoffice/branches/rejuvenate01/main/svx/source/accessibility/AccessibleShape.cxx Wed Dec 11 08:49:16 2013 @@ -474,7 +474,6 @@ uno::Reference<XAccessibleStateSet> SAL_ if (rBHelper.bDisposed || mpText == NULL) // Return a minimal state set that only contains the DEFUNC state. - //xStateSet = AccessibleContextBase::getAccessibleStateSet (); { xStateSet = AccessibleContextBase::getAccessibleStateSet (); ::utl::AccessibleStateSetHelper* pStateSet = Modified: openoffice/branches/rejuvenate01/main/svx/source/accessibility/AccessibleTextHelper.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/svx/source/accessibility/AccessibleTextHelper.cxx?rev=1550072&r1=1550071&r2=1550072&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/svx/source/accessibility/AccessibleTextHelper.cxx (original) +++ openoffice/branches/rejuvenate01/main/svx/source/accessibility/AccessibleTextHelper.cxx Wed Dec 11 08:49:16 2013 @@ -917,10 +917,7 @@ namespace accessibility // convert to screen coordinates aParaBB = ::accessibility::AccessibleEditableTextPara::LogicToPixel( aTmpBB, rCacheTF.GetMapMode(), rCacheVF ); - /* - if( aParaBB.IsOver( aViewArea ) ) - { - */ + // at least partially visible if( bFirstChild ) { @@ -941,21 +938,6 @@ namespace accessibility mxFrontEnd, GetEditSource(), nCurrPara ).first ), AccessibleEventId::CHILD ); } - /* - } - else - { - // not or no longer visible - if( maParaManager.IsReferencable( nCurrPara ) ) - { - if( bBroadcastEvents ) - LostPropertyEvent( uno::makeAny( maParaManager.GetChild( nCurrPara ).first.get().getRef() ), - AccessibleEventId::CHILD ); - - // clear reference - maParaManager.Release( nCurrPara ); - } - }*/ } } catch( const uno::Exception& ) Modified: openoffice/branches/rejuvenate01/main/svx/source/accessibility/ChildrenManagerImpl.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/svx/source/accessibility/ChildrenManagerImpl.cxx?rev=1550072&r1=1550071&r2=1550072&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/svx/source/accessibility/ChildrenManagerImpl.cxx (original) +++ openoffice/branches/rejuvenate01/main/svx/source/accessibility/ChildrenManagerImpl.cxx Wed Dec 11 08:49:16 2013 @@ -998,7 +998,6 @@ void ChildrenManagerImpl::UpdateSelectio // Set or reset the SELECTED state. if (bShapeIsSelected) - //pAccessibleShape->SetState (AccessibleStateType::SELECTED); { if (pAccessibleShape->SetState (AccessibleStateType::SELECTED)) { @@ -1014,7 +1013,6 @@ void ChildrenManagerImpl::UpdateSelectio } } else - //pAccessibleShape->ResetState (AccessibleStateType::SELECTED); { if(pAccessibleShape->ResetState (AccessibleStateType::SELECTED)) { @@ -1054,7 +1052,6 @@ void ChildrenManagerImpl::UpdateSelectio { if (pCurrentlyFocusedShape != NULL) pCurrentlyFocusedShape->ResetState (AccessibleStateType::FOCUSED); - //if (pNewFocusedShape != NULL) if (pNewFocusedShape != NULL && bShapeActive) pNewFocusedShape->SetState (AccessibleStateType::FOCUSED); } Modified: openoffice/branches/rejuvenate01/main/svx/source/accessibility/charmapacc.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/svx/source/accessibility/charmapacc.cxx?rev=1550072&r1=1550071&r2=1550072&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/svx/source/accessibility/charmapacc.cxx (original) +++ openoffice/branches/rejuvenate01/main/svx/source/accessibility/charmapacc.cxx Wed Dec 11 08:49:16 2013 @@ -166,24 +166,6 @@ Reference< XAccessible > SAL_CALL SvxSho // ----------------------------------------------------------------------------- ::com::sun::star::awt::Rectangle SAL_CALL SvxShowCharSetVirtualAcc::implGetBounds( ) throw (RuntimeException) { -/* const Point aOutPos( mpParent->GetPosPixel() ); - Size aOutSize( mpParent->GetOutputSizePixel() ); - if ( mpParent->getScrollBar()->IsVisible() ) - { - const Size aScrollBar = mpParent->getScrollBar()->GetOutputSizePixel(); - aOutSize.Width() -= aScrollBar.Width(); - aOutSize.Height() -= aScrollBar.Height(); - } - - awt::Rectangle aRet; - - aRet.X = aOutPos.X(); - aRet.Y = aOutPos.Y(); - aRet.Width = aOutSize.Width(); - aRet.Height = aOutSize.Height(); - - return aRet; -*/ ::com::sun::star::awt::Rectangle aBounds ( 0, 0, 0, 0 ); Window* pWindow = mpParent; if ( pWindow ) @@ -711,7 +693,6 @@ uno::Reference< accessibility::XAccessib sal_Int16 SAL_CALL SvxShowCharSetItemAcc::getAccessibleRole() throw (uno::RuntimeException) { - //return accessibility::AccessibleRole::LABEL; return accessibility::AccessibleRole::TABLE_CELL; } @@ -727,20 +708,11 @@ sal_Int16 SAL_CALL SvxShowCharSetItemAcc sal_Unicode c = mpParent->maText.GetChar(0); char buf[16] = "0x0000"; sal_Unicode c_Shifted = c; -/* - for( int i = 0; i < 4; ++i ) - { - char h = (char)(c_Shifted & 0x0F); - buf[5-i] = (h > 9) ? (h - 10 + 'A') : (h + '0'); - c_Shifted >>= 4; - } -*/ int tmp_len = 4; if(c_Shifted>0xFFFF) tmp_len = 8; for( int i = 0; i < tmp_len; ++i ) { char h = c_Shifted & 0x0F; - //buf[9-i] = (h > 9) ? (h - 10 + 'A') : (h + '0'); buf[tmp_len+1-i] = (h > 9) ? (h - 10 + 'A') : (h + '0'); c_Shifted >>= 4; } Modified: openoffice/branches/rejuvenate01/main/svx/source/accessibility/svxrectctaccessiblecontext.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/svx/source/accessibility/svxrectctaccessiblecontext.cxx?rev=1550072&r1=1550071&r2=1550072&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/svx/source/accessibility/svxrectctaccessiblecontext.cxx (original) +++ openoffice/branches/rejuvenate01/main/svx/source/accessibility/svxrectctaccessiblecontext.cxx Wed Dec 11 08:49:16 2013 @@ -367,7 +367,6 @@ sal_Int16 SAL_CALL SvxRectCtlAccessibleC ::rtl::OUString SAL_CALL SvxRectCtlAccessibleContext::getAccessibleDescription( void ) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); - //return msDescription; return msDescription +::rtl::OUString::createFromAscii(" Please use arrow key to selection."); } @@ -382,7 +381,6 @@ sal_Int16 SAL_CALL SvxRectCtlAccessibleC */ Reference< XAccessibleRelationSet > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleRelationSet( void ) throw( RuntimeException ) { - //return Reference< XAccessibleRelationSet >(); utl::AccessibleRelationSetHelper* pRelationSetHelper = new utl::AccessibleRelationSetHelper; uno::Reference< accessibility::XAccessibleRelationSet > xSet = pRelationSetHelper; Window* pWindow = mpRepr; Modified: openoffice/branches/rejuvenate01/main/sw/source/core/access/acccontext.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sw/source/core/access/acccontext.cxx?rev=1550072&r1=1550071&r2=1550072&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/sw/source/core/access/acccontext.cxx (original) +++ openoffice/branches/rejuvenate01/main/sw/source/core/access/acccontext.cxx Wed Dec 11 08:49:16 2013 @@ -588,7 +588,8 @@ SwAccessibleContext::SwAccessibleContext SwAccessibleContext::~SwAccessibleContext() { - vos::OGuard aGuard(Application::GetSolarMutex()); + if(Application::GetUnoWrapper()) + vos::OGuard aGuard(Application::GetSolarMutex()); DBG_MSG_CD( "destructed" ) RemoveFrmFromAccessibleMap(); Modified: openoffice/branches/rejuvenate01/main/sw/source/core/access/accpara.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sw/source/core/access/accpara.cxx?rev=1550072&r1=1550071&r2=1550072&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/sw/source/core/access/accpara.cxx (original) +++ openoffice/branches/rejuvenate01/main/sw/source/core/access/accpara.cxx Wed Dec 11 08:49:16 2013 @@ -594,7 +594,8 @@ SwAccessibleParagraph::SwAccessibleParag SwAccessibleParagraph::~SwAccessibleParagraph() { - vos::OGuard aGuard(Application::GetSolarMutex()); + if(Application::GetUnoWrapper()) + vos::OGuard aGuard(Application::GetSolarMutex()); delete pPortionData; delete pHyperTextData; Modified: openoffice/branches/rejuvenate01/main/sw/source/core/crsr/swcrsr.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sw/source/core/crsr/swcrsr.cxx?rev=1550072&r1=1550071&r2=1550072&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/sw/source/core/crsr/swcrsr.cxx (original) +++ openoffice/branches/rejuvenate01/main/sw/source/core/crsr/swcrsr.cxx Wed Dec 11 08:49:16 2013 @@ -471,8 +471,8 @@ sal_Bool SwCursor::IsSelOvr( int eFlags } } - const SwTableNode* pPtNd = pNd->FindTableNode(); - const SwTableNode* pMrkNd = pNd->FindTableNode(); + const SwTableNode* pPtNd = GetPoint()->nNode.GetNode().FindTableNode(); + const SwTableNode* pMrkNd = GetMark()->nNode.GetNode().FindTableNode(); // beide in keinem oder beide im gleichen TableNode if( ( !pMrkNd && !pPtNd ) || pPtNd == pMrkNd ) return sal_False; Modified: openoffice/branches/rejuvenate01/main/toolkit/source/awt/vclxsystemdependentwindow.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/toolkit/source/awt/vclxsystemdependentwindow.cxx?rev=1550072&r1=1550071&r2=1550072&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/toolkit/source/awt/vclxsystemdependentwindow.cxx (original) +++ openoffice/branches/rejuvenate01/main/toolkit/source/awt/vclxsystemdependentwindow.cxx Wed Dec 11 08:49:16 2013 @@ -100,7 +100,7 @@ IMPL_XTYPEPROVIDER_END #elif (defined QUARTZ) if( SystemType == ::com::sun::star::lang::SystemDependent::SYSTEM_MAC ) { - aRet <<= (sal_IntPtr)pSysData->pView; + aRet <<= (sal_IntPtr)pSysData->mpNSView; } #elif (defined UNX) if( SystemType == ::com::sun::star::lang::SystemDependent::SYSTEM_XWINDOW ) Modified: openoffice/branches/rejuvenate01/main/toolkit/source/awt/vclxtopwindow.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/toolkit/source/awt/vclxtopwindow.cxx?rev=1550072&r1=1550071&r2=1550072&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/toolkit/source/awt/vclxtopwindow.cxx (original) +++ openoffice/branches/rejuvenate01/main/toolkit/source/awt/vclxtopwindow.cxx Wed Dec 11 08:49:16 2013 @@ -113,7 +113,7 @@ Sequence< Type > VCLXTopWindow_Base::get #elif (defined QUARTZ) if( SystemType == ::com::sun::star::lang::SystemDependent::SYSTEM_MAC ) { - aRet <<= (sal_IntPtr)pSysData->pView; + aRet <<= (sal_IntPtr)pSysData->mpNSView; } #elif (defined UNX) if( SystemType == ::com::sun::star::lang::SystemDependent::SYSTEM_XWINDOW ) Modified: openoffice/branches/rejuvenate01/main/tools/inc/tools/debug.hxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/tools/inc/tools/debug.hxx?rev=1550072&r1=1550071&r2=1550072&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/tools/inc/tools/debug.hxx (original) +++ openoffice/branches/rejuvenate01/main/tools/inc/tools/debug.hxx Wed Dec 11 08:49:16 2013 @@ -345,23 +345,11 @@ TOOLS_DLLPUBLIC void DbgOutTypef( sal_uI TOOLS_DLLPUBLIC void DbgOutf( const sal_Char* pFStr, ... ); TOOLS_DLLPUBLIC void ImpDbgOutfBuf( sal_Char* pBuf, const sal_Char* pFStr, ... ); -inline void DbgTrace( const sal_Char* pMsg, - const sal_Char* pFile = NULL, sal_uInt16 nLine = 0 ) -{ - DbgOut( pMsg, DBG_OUT_TRACE, pFile, nLine ); -} +#define DbgTrace( msg) do{ DbgOut( msg, DBG_OUT_TRACE, __FILE__, __LINE__ ); } while(0) -inline void DbgWarning( const sal_Char* pMsg, - const sal_Char* pFile = NULL, sal_uInt16 nLine = 0 ) -{ - DbgOut( pMsg, DBG_OUT_WARNING, pFile, nLine ); -} +#define DbgWarning( msg) do{ DbgOut( msg, DBG_OUT_WARNING, __FILE__, __LINE__ ); } while(0) -inline void DbgError( const sal_Char* pMsg, - const sal_Char* pFile = NULL, sal_uInt16 nLine = 0 ) -{ - DbgOut( pMsg, DBG_OUT_ERROR, pFile, nLine ); -} +#define DbgError( msg) do{ DbgOut( msg, DBG_OUT_ERROR, __FILE__, __LINE__ ); } while(0) // --- Dbg-Test-Functions --- @@ -473,8 +461,7 @@ do { \ if ( !( sCon ) ) \ { \ - DbgWarning( aWarning, __FILE__, \ - __LINE__ ); \ + DbgWarning( aWarning); \ } \ } \ } while(0) @@ -486,8 +473,7 @@ do { \ if ( !( sCon ) ) \ { \ - DbgError( aError, \ - __FILE__, __LINE__ ); \ + DbgError( aError); \ } \ } \ } while(0) @@ -498,8 +484,7 @@ do { \ if ( !( sCon ) ) \ { \ - DbgError( aError, \ - __FILE__, __LINE__ ); \ + DbgError( aError); \ } \ } while(0) #else @@ -561,7 +546,7 @@ do do \ { \ if ( DbgIsTraceOut() ) \ - DbgTrace( aTrace, __FILE__, __LINE__ ); \ + DbgTrace( aTrace ); \ } while(0) #define DBG_WARNING( aWarning ) \ @@ -619,7 +604,7 @@ do do \ { \ if ( DbgIsWarningOut() ) \ - DbgWarning( aWarning, __FILE__, __LINE__ ); \ + DbgWarning( aWarning ); \ } while(0) #define DBG_ERROR( aError ) \ @@ -677,7 +662,7 @@ do do \ { \ if ( DbgIsErrorOut() ) \ - DbgError( aError, __FILE__, __LINE__ ); \ + DbgError( aError ); \ } while(0) #define DBG_TESTSOLARMUTEX() \ Modified: openoffice/branches/rejuvenate01/main/vcl/aqua/source/app/vclnsapp.mm URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/aqua/source/app/vclnsapp.mm?rev=1550072&r1=1550071&r2=1550072&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/vcl/aqua/source/app/vclnsapp.mm (original) +++ openoffice/branches/rejuvenate01/main/vcl/aqua/source/app/vclnsapp.mm Wed Dec 11 08:49:16 2013 @@ -79,7 +79,7 @@ if( nModMask == NSCommandKeyMask && [[pEvent charactersIgnoringModifiers] isEqualToString: @"w"] ) { - [pFrame->getWindow() windowShouldClose: nil]; + [pFrame->getNSWindow() windowShouldClose: nil]; return; } } @@ -89,9 +89,9 @@ */ if( [[pEvent charactersIgnoringModifiers] isEqualToString: @"m"] ) { - if ( nModMask == NSCommandKeyMask && ([pFrame->getWindow() styleMask] & NSMiniaturizableWindowMask) ) + if ( nModMask == NSCommandKeyMask && ([pFrame->getNSWindow() styleMask] & NSMiniaturizableWindowMask) ) { - [pFrame->getWindow() performMiniaturize: nil]; + [pFrame->getNSWindow() performMiniaturize: nil]; return; } @@ -220,7 +220,7 @@ if( (*it)->mpDockMenuEntry != NULL && (*it)->mbShown ) { - [(*it)->getWindow() makeKeyAndOrderFront: NSApp]; + [(*it)->getNSWindow() makeKeyAndOrderFront: NSApp]; return; } } @@ -232,7 +232,7 @@ if( (*it)->mpDockMenuEntry != NULL && (*it)->mbShown ) { - [(*it)->getWindow() makeKeyAndOrderFront: NSApp]; + [(*it)->getNSWindow() makeKeyAndOrderFront: NSApp]; return; } ++it; @@ -260,7 +260,7 @@ if( (*it)->mpDockMenuEntry != NULL && (*it)->mbShown ) { - [(*it)->getWindow() makeKeyAndOrderFront: NSApp]; + [(*it)->getNSWindow() makeKeyAndOrderFront: NSApp]; return; } } @@ -272,7 +272,7 @@ if( (*it)->mpDockMenuEntry != NULL && (*it)->mbShown ) { - [(*it)->getWindow() makeKeyAndOrderFront: NSApp]; + [(*it)->getNSWindow() makeKeyAndOrderFront: NSApp]; return; } ++it; @@ -466,9 +466,10 @@ for( std::list< AquaSalFrame* >::const_iterator it = pSalData->maPresentationFrames.begin(); it != pSalData->maPresentationFrames.end(); ++it ) { - [(*it)->mpNSWindow setLevel: NSPopUpMenuWindowLevel]; - if( [(*it)->mpNSWindow isVisible] ) - [(*it)->mpNSWindow orderFront: NSApp]; + NSWindow* pNSWindow = (*it)->getNSWindow(); + [pNSWindow setLevel: NSPopUpMenuWindowLevel]; + if( [pNSWindow isVisible] ) + [pNSWindow orderFront: NSApp]; } } @@ -492,7 +493,7 @@ for( std::list< AquaSalFrame* >::const_iterator it = pSalData->maPresentationFrames.begin(); it != pSalData->maPresentationFrames.end(); ++it ) { - [(*it)->mpNSWindow setLevel: NSNormalWindowLevel]; + [(*it)->getNSWindow() setLevel: NSNormalWindowLevel]; } } Modified: openoffice/branches/rejuvenate01/main/vcl/aqua/source/gdi/aquaprintaccessoryview.mm URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/aqua/source/gdi/aquaprintaccessoryview.mm?rev=1550072&r1=1550071&r2=1550072&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/vcl/aqua/source/gdi/aquaprintaccessoryview.mm (original) +++ openoffice/branches/rejuvenate01/main/vcl/aqua/source/gdi/aquaprintaccessoryview.mm Wed Dec 11 08:49:16 2013 @@ -145,30 +145,14 @@ class ControllerProperties mnLastPageCount = nPages; if( mpState->bNeedRestart ) { - #if 0 // Warning: bad hack ahead // Apple does not give us a chance of changing the page count, // and they don't let us cancel the dialog either // hack: send a cancel message to the window displaying our views. // this is ugly. - for( std::vector< NSObject* >::iterator it = maViews.begin(); it != maViews.end(); ++it ) - { - if( [*it isKindOfClass: [NSView class]] ) - { - NSView* pView = (NSView*)*it; - NSWindow* pWindow = [pView window]; - if( pWindow ) - { - [pWindow cancelOperation: nil]; - break; - } - } - } - #else - NSWindow* pWindow = [NSApp modalWindow]; - if( pWindow ) - [pWindow cancelOperation: nil]; - #endif + NSWindow* pNSWindow = [NSApp modalWindow]; + if( pNSWindow ) + [pNSWindow cancelOperation: nil]; [[mpOp printInfo] setJobDisposition: NSPrintCancelJob]; } else @@ -597,7 +581,7 @@ struct ColumnItem } }; -static void adjustViewAndChildren( NSView* pView, NSSize& rMaxSize, +static void adjustViewAndChildren( NSView* pNSView, NSSize& rMaxSize, std::vector< ColumnItem >& rLeftColumn, std::vector< ColumnItem >& rRightColumn ) @@ -657,7 +641,7 @@ static void adjustViewAndChildren( NSVie } } - NSArray* pSubViews = [pView subviews]; + NSArray* pSubViews = [pNSView subviews]; unsigned int nViews = [pSubViews count]; NSRect aUnion = { { 0, 0 }, { 0, 0 } }; @@ -680,7 +664,7 @@ static void adjustViewAndChildren( NSVie // resize the view itself aUnion.size.height += 10; aUnion.size.width += 20; - [pView setFrameSize: aUnion.size]; + [pNSView setFrameSize: aUnion.size]; if( aUnion.size.width > rMaxSize.width ) rMaxSize.width = aUnion.size.width; @@ -696,15 +680,15 @@ static void adjustTabViews( NSTabView* p for( int i = 0; i < nViews; i++ ) { NSTabViewItem* pItem = (NSTabViewItem*)[pTabbedViews objectAtIndex: i]; - NSView* pView = [pItem view]; - if( pView ) + NSView* pNSView = [pItem view]; + if( pNSView ) { - NSRect aRect = [pView frame]; + NSRect aRect = [pNSView frame]; double nDiff = aTabSize.height - aRect.size.height; aRect.size = aTabSize; - [pView setFrame: aRect]; + [pNSView setFrame: aRect]; - NSArray* pSubViews = [pView subviews]; + NSArray* pSubViews = [pNSView subviews]; unsigned int nSubViews = [pSubViews count]; // move everything up Modified: openoffice/branches/rejuvenate01/main/vcl/aqua/source/gdi/salgdi.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/aqua/source/gdi/salgdi.cxx?rev=1550072&r1=1550071&r2=1550072&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/vcl/aqua/source/gdi/salgdi.cxx (original) +++ openoffice/branches/rejuvenate01/main/vcl/aqua/source/gdi/salgdi.cxx Wed Dec 11 08:49:16 2013 @@ -328,7 +328,7 @@ void AquaSalGraphics::updateResolution() { DBG_ASSERT( mbWindow, "updateResolution on inappropriate graphics" ); - initResolution( (mbWindow && mpFrame) ? mpFrame->mpNSWindow : nil ); + initResolution( (mbWindow && mpFrame) ? mpFrame->getNSWindow() : nil ); } void AquaSalGraphics::initResolution( NSWindow* ) @@ -423,7 +423,7 @@ void AquaSalGraphics::initResolution( NS void AquaSalGraphics::GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ) { if( !mnRealDPIY ) - initResolution( (mbWindow && mpFrame) ? mpFrame->mpNSWindow : nil ); + initResolution( (mbWindow && mpFrame) ? mpFrame->getNSWindow() : nil ); rDPIX = lrint( mfFakeDPIScale * mnRealDPIX); rDPIY = lrint( mfFakeDPIScale * mnRealDPIY); @@ -432,7 +432,7 @@ void AquaSalGraphics::GetResolution( sal void AquaSalGraphics::copyResolution( AquaSalGraphics& rGraphics ) { if( !rGraphics.mnRealDPIY && rGraphics.mbWindow && rGraphics.mpFrame ) - rGraphics.initResolution( rGraphics.mpFrame->mpNSWindow ); + rGraphics.initResolution( rGraphics.mpFrame->getNSWindow() ); mnRealDPIX = rGraphics.mnRealDPIX; mnRealDPIY = rGraphics.mnRealDPIY; Modified: openoffice/branches/rejuvenate01/main/vcl/aqua/source/gdi/salgdiutils.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/aqua/source/gdi/salgdiutils.cxx?rev=1550072&r1=1550071&r2=1550072&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/vcl/aqua/source/gdi/salgdiutils.cxx (original) +++ openoffice/branches/rejuvenate01/main/vcl/aqua/source/gdi/salgdiutils.cxx Wed Dec 11 08:49:16 2013 @@ -198,7 +198,7 @@ bool AquaSalGraphics::CheckContext() if( !mrContext ) { const CGSize aLayerSize = CGSizeMake( nWidth, nHeight); - NSGraphicsContext* pNSGContext = [NSGraphicsContext graphicsContextWithWindow: mpFrame->getWindow()]; + NSGraphicsContext* pNSGContext = [NSGraphicsContext graphicsContextWithWindow: mpFrame->getNSWindow()]; CGContextRef xCGContext = reinterpret_cast<CGContextRef>([pNSGContext graphicsPort]); mxLayer = CGLayerCreateWithContext( xCGContext, aLayerSize, NULL ); if( mxLayer ) Modified: openoffice/branches/rejuvenate01/main/vcl/aqua/source/gdi/salnativewidgets.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/aqua/source/gdi/salnativewidgets.cxx?rev=1550072&r1=1550071&r2=1550072&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/vcl/aqua/source/gdi/salnativewidgets.cxx (original) +++ openoffice/branches/rejuvenate01/main/vcl/aqua/source/gdi/salnativewidgets.cxx Wed Dec 11 08:49:16 2013 @@ -430,7 +430,7 @@ sal_Bool AquaSalGraphics::hitTestNativeC */ UInt32 AquaSalGraphics::getState( ControlState nState ) { - bool bDrawActive = mpFrame ? ([mpFrame->getWindow() isKeyWindow] ? true : false) : true; + const bool bDrawActive = mpFrame ? ([mpFrame->getNSWindow() isKeyWindow] ? true : false) : true; if( (nState & CTRL_STATE_ENABLED) == 0 || ! bDrawActive ) { if( (nState & CTRL_STATE_HIDDEN) == 0 ) @@ -450,7 +450,7 @@ UInt32 AquaSalGraphics::getState( Contro UInt32 AquaSalGraphics::getTrackState( ControlState nState ) { - bool bDrawActive = mpFrame ? ([mpFrame->getWindow() isKeyWindow] ? true : false) : true; + const bool bDrawActive = mpFrame ? ([mpFrame->getNSWindow() isKeyWindow] ? true : false) : true; if( (nState & CTRL_STATE_ENABLED) == 0 || ! bDrawActive ) return kThemeTrackInactive; Modified: openoffice/branches/rejuvenate01/main/vcl/aqua/source/gdi/salvd.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/aqua/source/gdi/salvd.cxx?rev=1550072&r1=1550071&r2=1550072&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/vcl/aqua/source/gdi/salvd.cxx (original) +++ openoffice/branches/rejuvenate01/main/vcl/aqua/source/gdi/salvd.cxx Wed Dec 11 08:49:16 2013 @@ -203,10 +203,10 @@ sal_Bool AquaSalVirtualDevice::SetSize( if( pSalFrame ) { // #i91990# - NSWindow* pWindow = pSalFrame->getWindow(); - if ( pWindow ) + NSWindow* pNSWindow = pSalFrame->getNSWindow(); + if ( pNSWindow ) { - NSGraphicsContext* pNSContext = [NSGraphicsContext graphicsContextWithWindow: pWindow]; + NSGraphicsContext* pNSContext = [NSGraphicsContext graphicsContextWithWindow: pNSWindow]; if( pNSContext ) xCGContext = reinterpret_cast<CGContextRef>([pNSContext graphicsPort]); } Modified: openoffice/branches/rejuvenate01/main/vcl/aqua/source/window/salframe.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/aqua/source/window/salframe.cxx?rev=1550072&r1=1550071&r2=1550072&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/vcl/aqua/source/window/salframe.cxx (original) +++ openoffice/branches/rejuvenate01/main/vcl/aqua/source/window/salframe.cxx Wed Dec 11 08:49:16 2013 @@ -142,13 +142,13 @@ void AquaSalFrame::initWindowAndView() { // initialize mirroring parameters // FIXME: screens changing - NSScreen * pScreen = [mpNSWindow screen]; - if( pScreen == nil ) - pScreen = [NSScreen mainScreen]; - maScreenRect = [pScreen frame]; + NSScreen* pNSScreen = [mpNSWindow screen]; + if( pNSScreen == nil ) + pNSScreen = [NSScreen mainScreen]; + maScreenRect = [pNSScreen frame]; // calculate some default geometry - NSRect aVisibleRect = [pScreen visibleFrame]; + NSRect aVisibleRect = [pNSScreen visibleFrame]; CocoaToVCL( aVisibleRect ); maGeometry.nX = static_cast<int>(aVisibleRect.origin.x + aVisibleRect.size.width / 10); @@ -194,8 +194,8 @@ void AquaSalFrame::initWindowAndView() // #i91990# support GUI-less (daemon) execution @try { - mpNSWindow = [[SalFrameWindow alloc] initWithSalFrame: this]; - mpNSView = [[SalFrameView alloc] initWithSalFrame: this]; + mpNSWindow = [[SalFrameWindow alloc] initWithSalFrame: this]; + mpNSView = [[SalFrameView alloc] initWithSalFrame: this]; } @catch ( id exception ) { @@ -207,15 +207,15 @@ void AquaSalFrame::initWindowAndView() else [mpNSWindow setAcceptsMouseMovedEvents: YES]; [mpNSWindow setHasShadow: YES]; - [mpNSWindow setDelegate: (id<NSWindowDelegate>)mpNSWindow]; - + [mpNSWindow setDelegate: mpNSWindow]; + const NSRect aRect = NSMakeRect( 0,0, maGeometry.nWidth, maGeometry.nHeight ); mnTrackingRectTag = [mpNSView addTrackingRect: aRect owner: mpNSView userData: nil assumeInside: NO]; - - maSysData.pView = mpNSView; - + + maSysData.mpNSView = mpNSView; + UpdateFrameGeometry(); - + [mpNSWindow setContentView: mpNSView]; } Modified: openoffice/branches/rejuvenate01/main/vcl/aqua/source/window/salframeview.mm URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/aqua/source/window/salframeview.mm?rev=1550072&r1=1550071&r2=1550072&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/vcl/aqua/source/window/salframeview.mm (original) +++ openoffice/branches/rejuvenate01/main/vcl/aqua/source/window/salframeview.mm Wed Dec 11 08:49:16 2013 @@ -442,7 +442,7 @@ catch(NSException* e) -(id)initWithSalFrame: (AquaSalFrame*)pFrame { - if ((self = [super initWithFrame: [NSWindow contentRectForFrameRect: [pFrame->getWindow() frame] styleMask: pFrame->mnStyleMask]]) != nil) + if ((self = [super initWithFrame: [NSWindow contentRectForFrameRect: [pFrame->getNSWindow() frame] styleMask: pFrame->mnStyleMask]]) != nil) { mDraggingDestinationHandler = nil; mpFrame = pFrame; @@ -532,7 +532,7 @@ private: { mpFrame->mpGraphics->UpdateWindow( aRect ); if( mpFrame->getClipPath() ) - [mpFrame->getWindow() invalidateShadow]; + [mpFrame->getNSWindow() invalidateShadow]; } } } @@ -565,7 +565,7 @@ private: { // is this event actually inside that NSWindow ? NSPoint aPt = [NSEvent mouseLocation]; - NSRect aFrameRect = [pDispatchFrame->getWindow() frame]; + NSRect aFrameRect = [pDispatchFrame->getNSWindow() frame]; if ( ! NSPointInRect( aPt, aFrameRect ) ) { @@ -1704,7 +1704,7 @@ private: } -(id)parentAttribute { - return (NSView *) mpFrame -> mpNSWindow; + return mpFrame->getNSWindow(); } -(::com::sun::star::accessibility::XAccessibleContext *)accessibleContext @@ -1722,9 +1722,9 @@ private: return [ super accessibleContext ]; } --(NSView *)viewElementForParent +-(NSView*)viewElementForParent { - return (NSView *) mpFrame -> mpNSWindow; + return mpFrame->getNSView(); } -(void)registerMouseEventListener: (id)theListener Modified: openoffice/branches/rejuvenate01/main/vcl/aqua/source/window/salmenu.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/aqua/source/window/salmenu.cxx?rev=1550072&r1=1550071&r2=1550072&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/vcl/aqua/source/window/salmenu.cxx (original) +++ openoffice/branches/rejuvenate01/main/vcl/aqua/source/window/salmenu.cxx Wed Dec 11 08:49:16 2013 @@ -351,9 +351,9 @@ bool AquaSalMenu::ShowNativePopupMenu(Fl // get the pointers AquaSalFrame * pParentAquaSalFrame = (AquaSalFrame *) pWin->ImplGetWindowImpl()->mpRealParent->ImplGetFrame(); - NSWindow * pParentNSWindow = pParentAquaSalFrame->mpNSWindow; - NSView * pParentNSView = [pParentNSWindow contentView]; - NSView * pPopupNSView = ((AquaSalFrame *) pWin->ImplGetWindow()->ImplGetFrame())->mpNSView; + NSWindow* pParentNSWindow = pParentAquaSalFrame->mpNSWindow; + NSView* pParentNSView = [pParentNSWindow contentView]; + NSView* pPopupNSView = ((AquaSalFrame *) pWin->ImplGetWindow()->ImplGetFrame())->mpNSView; NSRect popupFrame = [pPopupNSView frame]; // since we manipulate the menu below (removing entries) @@ -800,9 +800,9 @@ void AquaSalMenu::statusLayout() { if( GetSalData()->mpStatusItem ) { - NSView* pView = [GetSalData()->mpStatusItem view]; - if( [pView isMemberOfClass: [OOStatusItemView class]] ) // well of course it is - [(OOStatusItemView*)pView layout]; + NSView* pNSView = [GetSalData()->mpStatusItem view]; + if( [pNSView isMemberOfClass: [OOStatusItemView class]] ) // well of course it is + [(OOStatusItemView*)pNSView layout]; else DBG_ERROR( "someone stole our status view" ); } @@ -883,15 +883,15 @@ Rectangle AquaSalMenu::GetMenuBarButtonR if( ! pItem ) return Rectangle(); - NSView* pView = [pItem view]; - if( ! pView ) + NSView* pNSView = [pItem view]; + if( ! pNSView ) return Rectangle(); - NSWindow* pWin = [pView window]; - if( ! pWin ) + NSWindow* pNSWin = [pNSView window]; + if( ! pNSWin ) return Rectangle(); - NSRect aRect = [pWin frame]; - aRect.origin = [pWin convertBaseToScreen: NSMakePoint( 0, 0 )]; + NSRect aRect = [pNSWin frame]; + aRect.origin = [pNSWin convertBaseToScreen: NSMakePoint( 0, 0 )]; // make coordinates relative to reference frame static_cast<AquaSalFrame*>(i_pReferenceFrame)->CocoaToVCL( aRect.origin ); Modified: openoffice/branches/rejuvenate01/main/vcl/aqua/source/window/salobj.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/aqua/source/window/salobj.cxx?rev=1550072&r1=1550071&r2=1550072&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/vcl/aqua/source/window/salobj.cxx (original) +++ openoffice/branches/rejuvenate01/main/vcl/aqua/source/window/salobj.cxx Wed Dec 11 08:49:16 2013 @@ -45,20 +45,20 @@ AquaSalObject::AquaSalObject( AquaSalFra mnHeight( 20 ) { maSysData.nSize = sizeof( maSysData ); - maSysData.pView = NULL; + maSysData.mpNSView = NULL; NSRect aInitFrame = { { 0, 0 }, { 20, 20 } }; mpClipView = [[NSClipView alloc] initWithFrame: aInitFrame ]; if( mpClipView ) { - [mpFrame->getView() addSubview: mpClipView]; + [mpFrame->getNSView() addSubview: mpClipView]; [mpClipView setHidden: YES]; } - maSysData.pView = [[NSView alloc] initWithFrame: aInitFrame]; - if( maSysData.pView ) + maSysData.mpNSView = [[NSView alloc] initWithFrame: aInitFrame]; + if( maSysData.mpNSView ) { if( mpClipView ) - [mpClipView setDocumentView: maSysData.pView]; + [mpClipView setDocumentView: maSysData.mpNSView]; } } @@ -66,9 +66,9 @@ AquaSalObject::AquaSalObject( AquaSalFra AquaSalObject::~AquaSalObject() { - if( maSysData.pView ) + if( maSysData.mpNSView ) { - NSView *pView = maSysData.pView; + NSView *pView = maSysData.mpNSView; [pView removeFromSuperview]; [pView release]; } @@ -169,10 +169,10 @@ void AquaSalObject::SetPosSize( long nX, void AquaSalObject::setClippedPosSize() { NSRect aViewRect = NSMakeRect( 0, 0, mnWidth, mnHeight); - if( maSysData.pView ) + if( maSysData.mpNSView ) { - NSView *pView = maSysData.pView; - [pView setFrame: aViewRect]; + NSView* pNSView = maSysData.mpNSView; + [pNSView setFrame: aViewRect]; } NSRect aClipViewRect = NSMakeRect( mnX, mnY, mnWidth, mnHeight); Modified: openoffice/branches/rejuvenate01/main/vcl/inc/aqua/salframe.h URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/inc/aqua/salframe.h?rev=1550072&r1=1550071&r2=1550072&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/vcl/inc/aqua/salframe.h (original) +++ openoffice/branches/rejuvenate01/main/vcl/inc/aqua/salframe.h Wed Dec 11 08:49:16 2013 @@ -54,8 +54,8 @@ typedef struct SalFrame::SalPointerState class AquaSalFrame : public SalFrame { public: - NSWindow* mpNSWindow; // Cocoa window - NSView* mpNSView; // Cocoa view (actually a custom view, see below + NSWindow* mpNSWindow; // Cocoa window + NSView* mpNSView; // Cocoa view (actually a custom view) NSMenuItem* mpDockMenuEntry; // entry in the dynamic dock menu NSRect maScreenRect; // for mirroring purposes AquaSalGraphics* mpGraphics; // current frame graphics @@ -175,8 +175,8 @@ public: static AquaSalFrame* GetCaptureFrame() { return s_pCaptureFrame; } - NSWindow* getWindow() const { return mpNSWindow; } - NSView* getView() const { return mpNSView; } + NSWindow* getNSWindow() const { return mpNSWindow; } + NSView* getNSView() const { return mpNSView; } unsigned int getStyleMask() const { return mnStyleMask; } void getResolution( sal_Int32& o_rDPIX, sal_Int32& o_rDPIY ); Modified: openoffice/branches/rejuvenate01/main/vcl/inc/vcl/msgbox.hxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/inc/vcl/msgbox.hxx?rev=1550072&r1=1550071&r2=1550072&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/vcl/inc/vcl/msgbox.hxx (original) +++ openoffice/branches/rejuvenate01/main/vcl/inc/vcl/msgbox.hxx Wed Dec 11 08:49:16 2013 @@ -120,6 +120,8 @@ private: public: InfoBox( Window* pParent, const XubString& rMessage ); InfoBox( Window* pParent, const ResId & rResId ); + InfoBox( Window* pParent, WinBits nStyle, + const XubString& rMessage ); static Image GetStandardImage(); static Image GetStandardImageHC(); Modified: openoffice/branches/rejuvenate01/main/vcl/inc/vcl/sysdata.hxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/inc/vcl/sysdata.hxx?rev=1550072&r1=1550071&r2=1550072&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/vcl/inc/vcl/sysdata.hxx (original) +++ openoffice/branches/rejuvenate01/main/vcl/inc/vcl/sysdata.hxx Wed Dec 11 08:49:16 2013 @@ -47,7 +47,7 @@ struct SystemEnvData #if defined( WNT ) || defined( OS2 ) HWND hWnd; // the window hwnd #elif defined( QUARTZ ) - NSView* pView; // the cocoa (NSView *) implementing this object + NSView* mpNSView; // the cocoa (NSView *) implementing this object #elif defined( UNX ) void* pDisplay; // the relevant display connection long aWindow; // the window of the object Modified: openoffice/branches/rejuvenate01/main/vcl/source/window/dockwin.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/source/window/dockwin.cxx?rev=1550072&r1=1550071&r2=1550072&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/vcl/source/window/dockwin.cxx (original) +++ openoffice/branches/rejuvenate01/main/vcl/source/window/dockwin.cxx Wed Dec 11 08:49:16 2013 @@ -864,6 +864,11 @@ void DockingWindow::SetFloatingMode( sal // BorderWindow den Parent umsetzen if ( mpOldBorderWin ) mpOldBorderWin->SetParent( pWin ); + + // #123765# reset the buffered DropTargets when undocking, else it may not + // be correctly initialized + mpWindowImpl->mxDNDListenerContainer.clear(); + SetParent( pWin ); SetPosPixel( Point() ); mpWindowImpl->mpBorderWindow = pWin; Modified: openoffice/branches/rejuvenate01/main/vcl/source/window/msgbox.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/source/window/msgbox.cxx?rev=1550072&r1=1550071&r2=1550072&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/vcl/source/window/msgbox.cxx (original) +++ openoffice/branches/rejuvenate01/main/vcl/source/window/msgbox.cxx Wed Dec 11 08:49:16 2013 @@ -515,6 +515,14 @@ InfoBox::InfoBox( Window* pParent, const // ----------------------------------------------------------------------- +InfoBox::InfoBox( Window* pParent, WinBits nStyle, const XubString& rMessage ) : + MessBox( pParent, nStyle, ImplGetSVEmptyStr(), rMessage ) +{ + ImplInitInfoBoxData(); +} + +// ----------------------------------------------------------------------- + Image InfoBox::GetStandardImage() { ImplInitMsgBoxImageList(); Modified: openoffice/branches/rejuvenate01/main/vcl/source/window/syschild.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/source/window/syschild.cxx?rev=1550072&r1=1550071&r2=1550072&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/vcl/source/window/syschild.cxx (original) +++ openoffice/branches/rejuvenate01/main/vcl/source/window/syschild.cxx Wed Dec 11 08:49:16 2013 @@ -244,7 +244,7 @@ sal_IntPtr SystemChildWindow::GetParentW nRet = reinterpret_cast< sal_IntPtr >( GetSystemData()->hWnd ); #elif defined QUARTZ // FIXME: this is wrong - nRet = reinterpret_cast< sal_IntPtr >( GetSystemData()->pView ); + nRet = reinterpret_cast< sal_IntPtr >( GetSystemData()->mpNSView ); #elif defined UNX if( !bUseJava ) { Modified: openoffice/branches/rejuvenate01/main/vcl/source/window/window.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/source/window/window.cxx?rev=1550072&r1=1550071&r2=1550072&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/vcl/source/window/window.cxx (original) +++ openoffice/branches/rejuvenate01/main/vcl/source/window/window.cxx Wed Dec 11 08:49:16 2013 @@ -8621,8 +8621,8 @@ uno::Reference< XDragSource > Window::Ge * Using Windows based dnd as a temporary solution */ aDragSourceSN = OUString::createFromAscii( "com.sun.star.datatransfer.dnd.OleDragSource" ); aDropTargetSN = OUString::createFromAscii( "com.sun.star.datatransfer.dnd.OleDropTarget" ); - aDragSourceAL[ 1 ] = makeAny( static_cast<sal_uInt64>( reinterpret_cast<sal_IntPtr>(pEnvData->pView) ) ); - aDropTargetAL[ 0 ] = makeAny( static_cast<sal_uInt64>( reinterpret_cast<sal_IntPtr>(pEnvData->pView) ) ); + aDragSourceAL[ 1 ] = makeAny( static_cast<sal_uInt64>( reinterpret_cast<sal_IntPtr>(pEnvData->mpNSView) ) ); + aDropTargetAL[ 0 ] = makeAny( static_cast<sal_uInt64>( reinterpret_cast<sal_IntPtr>(pEnvData->mpNSView) ) ); #elif defined UNX aDropTargetAL.realloc( 3 ); aDragSourceAL.realloc( 3 ); Modified: openoffice/branches/rejuvenate01/main/writerfilter/source/dmapper/DomainMapper_Impl.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/writerfilter/source/dmapper/DomainMapper_Impl.cxx?rev=1550072&r1=1550071&r2=1550072&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/writerfilter/source/dmapper/DomainMapper_Impl.cxx (original) +++ openoffice/branches/rejuvenate01/main/writerfilter/source/dmapper/DomainMapper_Impl.cxx Wed Dec 11 08:49:16 2013 @@ -1267,6 +1267,7 @@ void DomainMapper_Impl::PushAnnotation() -----------------------------------------------------------------------*/ void DomainMapper_Impl::PopFootOrEndnote() { + RemoveLastParagraph(); m_aTextAppendStack.pop(); } /*-- 22.12.2008 13:45:15--------------------------------------------------- Modified: openoffice/branches/rejuvenate01/main/xmlhelp/source/com/sun/star/help/HelpSearch.java URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/xmlhelp/source/com/sun/star/help/HelpSearch.java?rev=1550072&r1=1550071&r2=1550072&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/xmlhelp/source/com/sun/star/help/HelpSearch.java (original) +++ openoffice/branches/rejuvenate01/main/xmlhelp/source/com/sun/star/help/HelpSearch.java Wed Dec 11 08:49:16 2013 @@ -273,7 +273,7 @@ public class HelpSearch // Perform search TopDocs aHits = searcher.search( aQuery, 100 ); - int nHitCount = aHits.totalHits; + int nHitCount = aHits.scoreDocs.length; String aDocs[] = new String[nHitCount]; float aScores[] = null; Propchange: openoffice/branches/rejuvenate01/test/ ------------------------------------------------------------------------------ Merged /openoffice/trunk/test:r1543014-1550068 Propchange: openoffice/branches/rejuvenate01/test/testcommon/source/org/openoffice/test/vcl/ ------------------------------------------------------------------------------ Merged /openoffice/trunk/test/testcommon/source/org/openoffice/test/vcl:r1543014-1550068
