diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2008-07-17 11:43:02 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2008-07-17 11:43:02 +0000 |
| commit | 51a578e2f122f883596299428525f3a05fabb8df (patch) | |
| tree | eb26393f70257b660746536cab68069aa9126e41 /sw/source/ui/uno/unotxvw.cxx | |
| parent | f1dad6a678cbc7a94c06ab32b2c05630fc944097 (diff) | |
INTEGRATION: CWS mav34 (1.70.118); FILE MERGED
2008/07/04 15:57:12 mba 1.70.118.1: #158188#: missing SolarMutex
Diffstat (limited to 'sw/source/ui/uno/unotxvw.cxx')
| -rw-r--r-- | sw/source/ui/uno/unotxvw.cxx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx index d7f6fe7375..4476dd02eb 100644 --- a/sw/source/ui/uno/unotxvw.cxx +++ b/sw/source/ui/uno/unotxvw.cxx @@ -1,13 +1,13 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: unotxvw.cxx,v $ - * $Revision: 1.70 $ + * $Revision: 1.71 $ * * This file is part of OpenOffice.org. * @@ -1245,11 +1245,11 @@ awt::Point SwXTextViewCursor::getPosition(void) throw( uno::RuntimeException ) const SwRect aCharRect(rSh.GetCharRect()); const SwFrmFmt& rMaster = rSh.GetPageDesc( rSh.GetCurPageDesc() ).GetMaster(); - - const SvxULSpaceItem& rUL = rMaster.GetULSpace(); + + const SvxULSpaceItem& rUL = rMaster.GetULSpace(); const long nY = aCharRect.Top() - (rUL.GetUpper() + DOCUMENTBORDER); aRet.Y = TWIP_TO_MM100(nY); - + const SvxLRSpaceItem& rLR = rMaster.GetLRSpace(); const long nX = aCharRect.Left() - (rLR.GetLeft() + DOCUMENTBORDER); aRet.X = TWIP_TO_MM100(nX); @@ -2194,6 +2194,8 @@ uno::Reference< datatransfer::XTransferable > SAL_CALL SwXTextView::getTransfera void SAL_CALL SwXTextView::insertTransferable( const uno::Reference< datatransfer::XTransferable >& xTrans ) throw (datatransfer::UnsupportedFlavorException, uno::RuntimeException) { + ::vos::OGuard aGuard(Application::GetSolarMutex()); + //force immediat shell update GetView()->StopShellTimer(); SwWrtShell& rSh = GetView()->GetWrtShell(); |