summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2009-12-01 07:03:58 +0000
committerOliver Bolte <obo@openoffice.org>2009-12-01 07:03:58 +0000
commit7e4efabeecb6fba8ba86f36b00d9d229a1dfdc1c (patch)
tree06e941b558402a7ef0f7437cd7c7b162fe652605
parent6ab695f7f9040a44c35bc6d1a4d68b457a544542 (diff)
CWS-TOOLING: integrate CWS hb32showstoppers2
2009-11-05 14:28:58 +0100 hbrinkm r277370 : CWS-TOOLING: rebase CWS hb32showstoppers2 to branches/OOO320@277262 (milestone: OOO320:m3) 2009-11-04 16:04:47 +0100 hbrinkm r277357 : #i102434# write background color/shadow like WW8 does 2009-11-03 12:22:27 +0100 os r277319 : #i106515# call to LeaveDrawCreate() moved from SwWrtShell::UnSelectFrame() to SwPostItMgr::AssureStdModeAtShell() 2009-10-30 14:58:39 +0100 hbrinkm r277272 : #i103374# set default style on table row ends 2009-10-30 13:19:38 +0100 hbrinkm r277265 : #i106057# applied here because otherwise saving DOCs crashes 2009-10-28 13:50:44 +0100 hbrinkm r277240 : applied patch for OOO320_m2 #i105052# debugging code #i102420# rewritten debug output for SwNodes. #i105052# debugging code sw/source/filter/ww8/wrtww8.cxx: MSWordExportBase::WriteText: Keep track of nodes already exported and assert when a node is exported for the second time. sw/source/filter/ww8/WW8TableInfo.cxx: WW8TableNodeInfo::setNext: Announce from where to where the next pointer points. #i105052# save pointer to next SwNode in WW8TableNodeInfo merged DEV300_m60 #i105653# applied patch #i105941# crash on initialization fixed merged changes from hb32showstoppers 2009-10-27 16:39:40 +0100 mst r277223 : #i106349#: SwBaseShell::ExecUndo(): do not access members after dying
-rw-r--r--svx/source/dialog/hyperdlg.cxx6
1 files changed, 4 insertions, 2 deletions
diff --git a/svx/source/dialog/hyperdlg.cxx b/svx/source/dialog/hyperdlg.cxx
index 3bb5f0b6b1..efbe2e850b 100644
--- a/svx/source/dialog/hyperdlg.cxx
+++ b/svx/source/dialog/hyperdlg.cxx
@@ -78,9 +78,11 @@ SvxHlinkDlgWrapper::SvxHlinkDlgWrapper( Window* _pParent, USHORT nId,
pWindow = mpDlg->GetWindow();
((MyStruct*)pImp)->bVisible = FALSE;
- if ( pInfo->aSize.Width() != 0 && pInfo->aSize.Height() != 0 )
+ Window* pTopWindow = 0;
+ if ( pInfo->aSize.Width() != 0 && pInfo->aSize.Height() != 0 &&
+ (0 != (pTopWindow = SFX_APP()->GetTopWindow())))
{
- Size aParentSize( SFX_APP()->GetTopWindow()->GetSizePixel() );
+ Size aParentSize( pTopWindow->GetSizePixel() );
Size aDlgSize ( GetSizePixel () );
if( aParentSize.Width() < pInfo->aPos.X() )