diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:12:08 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:12:08 +0200 |
commit | 49ac1b530b440d4fa3ec0bff9cd3d4e70bef838a (patch) | |
tree | d432fa8e42251e69e95f7d56cca7fc1b03f18f2c /sd/source/ui/unoidl/SdUnoDrawView.cxx | |
parent | 315eec9e4dbdd27063f4b970c25e9c719e86bcd8 (diff) |
recreated tag libreoffice-3.3.3.1 which had these commits:
commit a74d3413eb0220f6c35f38a8ce955098b9fb6eb6 (tag: refs/tags/libreoffice-3.3.3.1)
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue May 31 17:39:06 2011 +0200
Version 3.3.3.1, tag libreoffice-3.3.3.1 (3.3.3-rc1)
commit 64665cb6c5b6ace06e81d3c98c424b6cf2beb49c
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue May 31 16:35:37 2011 +0200
Remove extra bracket to fix build
build breakage added by the previous commit
sd/source/filter/eppt/pptx-epptbase.cxx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 9dd7ef585a463bafa8750e5b30acb38949bbf1ce
Author: Tor Lillqvist <tlillqvist@novell.com>
Date: Fri May 20 11:00:26 2011 +0300
Add sanity check before dereference, bnc#694119
Signed-off-by: Petr Mladek <pmladek@suse.cz>
sd/source/filter/eppt/pptx-epptbase.cxx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit d53f1f6ee9f02d3d77c76910023986f7f346fc30
Author: Caolán McNamara <caolanm@redhat.com>
Date: Fri Mar 18 13:19:59 2011 +0100
Fix fdo#33947 crash in Impress after printing
Fixes lifetime issue with DrawViewShell - solved by not handing
one in to the print preview DocumentRenderer
Signed-off-by: Thorsten Behrens <tbehrens@novell.com>
sd/source/ui/view/DocumentRenderer.cxx | 2 +-
sd/source/ui/view/drawview.cxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Notes
split repo tag: impress_libreoffice-3.3.3.1
split repo tag: impress_libreoffice-3.3.4.1
Diffstat (limited to 'sd/source/ui/unoidl/SdUnoDrawView.cxx')
-rw-r--r-- | sd/source/ui/unoidl/SdUnoDrawView.cxx | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/sd/source/ui/unoidl/SdUnoDrawView.cxx b/sd/source/ui/unoidl/SdUnoDrawView.cxx index d711b5a497aa..c9552c406efb 100644 --- a/sd/source/ui/unoidl/SdUnoDrawView.cxx +++ b/sd/source/ui/unoidl/SdUnoDrawView.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,7 +68,7 @@ SdUnoDrawView::SdUnoDrawView( DrawController& rController, DrawViewShell& rViewShell, View& rView) throw() - : DrawSubControllerInterfaceBase(m_aMutex), + : DrawSubControllerInterfaceBase(m_aMutex), mrController(rController), mrDrawViewShell(rViewShell), mrView(rView) @@ -141,7 +141,7 @@ Reference<drawing::XLayer> SdUnoDrawView::getActiveLayer (void) throw () SdDrawDocument* pSdModel = pModel->GetDoc(); if (pSdModel == NULL) break; - + // From the model get the current SdrLayer object via the layer admin. SdrLayerAdmin& rLayerAdmin = pSdModel->GetLayerAdmin (); SdrLayer* pLayer = rLayerAdmin.GetLayer (mrView.GetActiveLayer(), TRUE); @@ -213,7 +213,7 @@ sal_Bool SAL_CALL SdUnoDrawView::select( const Any& aSelection ) { bOk = false; } - } + } else { Reference< drawing::XShapes > xShapes; @@ -307,18 +307,18 @@ Any SAL_CALL SdUnoDrawView::getSelection() SdrMark *pMark = rMarkList.GetMark(nNum); if(pMark==NULL) continue; - + SdrObject *pObj = pMark->GetMarkedSdrObj(); if(pObj==NULL || pObj->GetPage() == NULL) continue; Reference< drawing::XDrawPage > xPage( pObj->GetPage()->getUnoPage(), UNO_QUERY); - + if(!xPage.is()) continue; SvxDrawPage* pDrawPage = SvxDrawPage::getImplementation( xPage ); - + if(pDrawPage==NULL) continue; @@ -343,7 +343,7 @@ void SAL_CALL SdUnoDrawView::addSelectionChangeListener ( { (void)rxListener; } - + @@ -358,7 +358,7 @@ void SAL_CALL SdUnoDrawView::removeSelectionChangeListener ( void SdUnoDrawView::setFastPropertyValue ( - sal_Int32 nHandle, + sal_Int32 nHandle, const Any& rValue) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, @@ -507,7 +507,7 @@ Reference< drawing::XDrawPage > SAL_CALL SdUnoDrawView::getCurrentPage() SdrPageView *pPV = mrView.GetSdrPageView(); SdrPage* pPage = pPV ? pPV->GetPage() : NULL; - + if(pPage) xPage = Reference< drawing::XDrawPage >::query( pPage->getUnoPage() ); @@ -574,12 +574,12 @@ void SdUnoDrawView::SetZoomType ( sal_Int16 nType ) case com::sun::star::view::DocumentZoomType::OPTIMAL: eZoomType = SVX_ZOOM_OPTIMAL; break; - + case com::sun::star::view::DocumentZoomType::PAGE_WIDTH: case com::sun::star::view::DocumentZoomType::PAGE_WIDTH_EXACT: eZoomType = SVX_ZOOM_PAGEWIDTH; break; - + case com::sun::star::view::DocumentZoomType::ENTIRE_PAGE: eZoomType = SVX_ZOOM_WHOLEPAGE; break; @@ -612,7 +612,7 @@ Any SdUnoDrawView::getDrawViewMode() const Any aRet; switch( mrDrawViewShell.GetPageKind() ) { - case PK_NOTES: aRet <<= DrawViewMode_NOTES; break; + case PK_NOTES: aRet <<= DrawViewMode_NOTES; break; case PK_HANDOUT: aRet <<= DrawViewMode_HANDOUT; break; case PK_STANDARD: aRet <<= DrawViewMode_DRAW; break; } |