Tag: cws_dev300_dba31c User: oj Date: 2008-10-17 12:40:01+0000 Modified: dba/reportdesign/source/ui/inc/DesignView.hxx dba/reportdesign/source/ui/inc/ReportController.hxx dba/reportdesign/source/ui/inc/ReportWindow.hxx dba/reportdesign/source/ui/inc/ScrollHelper.hxx dba/reportdesign/source/ui/misc/statusbarcontroller.cxx dba/reportdesign/source/ui/report/DesignView.cxx dba/reportdesign/source/ui/report/ReportController.cxx dba/reportdesign/source/ui/report/ReportSection.cxx dba/reportdesign/source/ui/report/ReportWindow.cxx dba/reportdesign/source/ui/report/ScrollHelper.cxx dba/reportdesign/source/ui/report/SectionWindow.cxx
Log: #i77916# zooming and scrolling File Changes: Directory: /dba/reportdesign/source/ui/inc/ =========================================== File [changed]: DesignView.hxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/inc/DesignView.hxx?r1=1.8.2.1&r2=1.8.2.2 Delta lines: +18 -8 -------------------- --- DesignView.hxx 2008-10-16 09:45:50+0000 1.8.2.1 +++ DesignView.hxx 2008-10-17 12:39:53+0000 1.8.2.2 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: DesignView.hxx,v $ - * $Revision: 1.8.2.1 $ + * $Revision: 1.8.2.2 $ * * This file is part of OpenOffice.org. * @@ -34,23 +34,28 @@ #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/report/XSection.hpp> #include <com/sun/star/report/XReportComponent.hpp> -#include <vcl/split.hxx> -#include <vcl/scrbar.hxx> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/datatransfer/DataFlavor.hpp> #include <tools/link.hxx> #include <tools/gen.hxx> + #include <vcl/timer.hxx> +#include <vcl/tabpage.hxx> +#include <vcl/splitwin.hxx> +#include <vcl/split.hxx> +#include <vcl/scrbar.hxx> + #include <svtools/hint.hxx> #include <svtools/brdcst.hxx> -#include <comphelper/stl_types.hxx> -#include "ReportDefines.hxx" #include <svtools/colorcfg.hxx> #include <boost/shared_ptr.hpp> #include <svx/svdedtv.hxx> -#include <vcl/tabpage.hxx> -#include <vcl/splitwin.hxx> -#include <MarkedSection.hxx> +#include <svx/zoomitem.hxx> + +#include <comphelper/stl_types.hxx> + +#include "ReportDefines.hxx" +#include "MarkedSection.hxx" #include "ScrollHelper.hxx" class KeyEvent; @@ -279,6 +284,11 @@ /param _rSelection The vector will be filled and will not be cleared before. */ void fillControlModelSelection(::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > >& _rSelection) const; + + /** calculates the zoom factor. + @param _eType which kind of zoom is needed + */ + sal_uInt16 getZoomFactor(SvxZoomType _eType) const; }; //================================================================== } //rptui File [changed]: ReportController.hxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/inc/ReportController.hxx?r1=1.11.2.1&r2=1.11.2.2 Delta lines: +6 -4 ------------------- --- ReportController.hxx 2008-10-16 09:45:50+0000 1.11.2.1 +++ ReportController.hxx 2008-10-17 12:39:53+0000 1.11.2.2 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ReportController.hxx,v $ - * $Revision: 1.11.2.1 $ + * $Revision: 1.11.2.2 $ * * This file is part of OpenOffice.org. * @@ -53,6 +53,7 @@ #include <svtools/transfer.hxx> #include <svtools/lstner.hxx> #include <svx/svdedtv.hxx> +#include <svx/zoomitem.hxx> #include "ModuleHelper.hxx" #include <comphelper/uno3.hxx> @@ -116,8 +117,8 @@ ::rtl::OUString m_sMode; /// the current mode of the controller sal_Int32 m_nSplitPos; /// the position of the splitter sal_Int32 m_nPageNum; /// the page number from the restoreView call - //sal_Int32 m_nExecuteReportEvent; - sal_Int16 m_nZoomValue; + sal_uInt16 m_nZoomValue; + SvxZoomType m_eZoomType; sal_Bool m_bShowRuler; sal_Bool m_bGridVisible; sal_Bool m_bGridUse; @@ -423,7 +424,8 @@ ::boost::shared_ptr<rptui::OReportModel> getSdrModel(); inline ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > getContext() const { return m_xContext; } - inline sal_Int16 getZoomValue() const { return m_nZoomValue; } + inline sal_uInt16 getZoomValue() const { return m_nZoomValue; } + inline void resetZoomType() { m_eZoomType = SVX_ZOOM_PERCENT; } // com::sun::star::beans::XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException) File [changed]: ReportWindow.hxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/inc/ReportWindow.hxx?r1=1.6.2.1&r2=1.6.2.2 Delta lines: +8 -1 ------------------- --- ReportWindow.hxx 2008-10-16 09:45:50+0000 1.6.2.1 +++ ReportWindow.hxx 2008-10-17 12:39:53+0000 1.6.2.2 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ReportWindow.hxx,v $ - * $Revision: 1.6.2.1 $ + * $Revision: 1.6.2.2 $ * * This file is part of OpenOffice.org. * @@ -35,6 +35,7 @@ #include "StartMarker.hxx" #include <svtools/ruler.hxx> #include <svx/svdedtv.hxx> +#include <svx/zoomitem.hxx> #include <vector> #include <boost/shared_ptr.hpp> @@ -68,6 +69,7 @@ void ImplInitSettings(); sal_Int32 GetTotalHeight() const; + sal_Int32 impl_getRealPixelWidth() const; OReportWindow(OReportWindow&); void operator =(OReportWindow&); @@ -226,6 +228,11 @@ /param _rSelection The vector will be filled and will not be cleared before. */ void fillControlModelSelection(::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > >& _rSelection) const; + + /** calculates the zoom factor. + @param _eType which kind of zoom is needed + */ + sal_uInt16 getZoomFactor(SvxZoomType _eType) const; }; //================================================================== } //rptui File [changed]: ScrollHelper.hxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/inc/ScrollHelper.hxx?r1=1.7.2.1&r2=1.7.2.2 Delta lines: +6 -1 ------------------- --- ScrollHelper.hxx 2008-10-16 09:45:50+0000 1.7.2.1 +++ ScrollHelper.hxx 2008-10-17 12:39:53+0000 1.7.2.2 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ScrollHelper.hxx,v $ - * $Revision: 1.7.2.1 $ + * $Revision: 1.7.2.2 $ * * This file is part of OpenOffice.org. * @@ -222,6 +222,11 @@ /param _rSelection The vector will be filled and will not be cleared before. */ void fillControlModelSelection(::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > >& _rSelection) const; + + /** calculates the zoom factor. + @param _eType which kind of zoom is needed + */ + sal_uInt16 getZoomFactor(SvxZoomType _eType) const; }; } #endif // RPTUI_SCROLLHELPER_HXX Directory: /dba/reportdesign/source/ui/misc/ ============================================ File [changed]: statusbarcontroller.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/misc/statusbarcontroller.cxx?r1=1.2&r2=1.2.2.1 Delta lines: +2 -2 ------------------- --- statusbarcontroller.cxx 2008-08-19 10:15:54+0000 1.2 +++ statusbarcontroller.cxx 2008-10-17 12:39:53+0000 1.2.2.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: statusbarcontroller.cxx,v $ - * $Revision: 1.2 $ + * $Revision: 1.2.2.1 $ * * This file is part of OpenOffice.org. * @@ -142,7 +142,7 @@ Sequence< PropertyValue > aSeq; if ( (_aEvent.State >>= aSeq) && aSeq.getLength() == 2 ) { - SvxZoomSliderItem aZoomSlider(100); + SvxZoomSliderItem aZoomSlider(100,20,400); aZoomSlider.PutValue(_aEvent.State); static_cast<SvxZoomSliderControl*>(m_pController.get())->StateChanged(m_nSlotId,SFX_ITEM_AVAILABLE,&aZoomSlider); } Directory: /dba/reportdesign/source/ui/report/ ============================================== File [changed]: DesignView.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/report/DesignView.cxx?r1=1.8.2.1&r2=1.8.2.2 Delta lines: +6 -1 ------------------- --- DesignView.cxx 2008-10-16 09:45:51+0000 1.8.2.1 +++ DesignView.cxx 2008-10-17 12:39:54+0000 1.8.2.2 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: DesignView.cxx,v $ - * $Revision: 1.8.2.1 $ + * $Revision: 1.8.2.2 $ * * This file is part of OpenOffice.org. * @@ -753,6 +753,11 @@ { m_aScrollWindow.zoom(_aZoom); } +// ----------------------------------------------------------------------------- +sal_uInt16 ODesignView::getZoomFactor(SvxZoomType _eType) const +{ + return m_aScrollWindow.getZoomFactor(_eType); +} //============================================================================ } // rptui //============================================================================ File [changed]: ReportController.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/report/ReportController.cxx?r1=1.20.2.3&r2=1.20.2.4 Delta lines: +18 -12 --------------------- --- ReportController.cxx 2008-10-16 09:45:51+0000 1.20.2.3 +++ ReportController.cxx 2008-10-17 12:39:55+0000 1.20.2.4 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ReportController.cxx,v $ - * $Revision: 1.20.2.3 $ + * $Revision: 1.20.2.4 $ * * This file is part of OpenOffice.org. * @@ -291,6 +291,7 @@ ,m_nSplitPos(-1) ,m_nPageNum(-1) ,m_nZoomValue(100) +,m_eZoomType(SVX_ZOOM_PERCENT) ,m_bShowRuler(sal_True) ,m_bGridVisible(sal_True) ,m_bGridUse(sal_True) @@ -302,7 +303,7 @@ { m_sMode = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("normal")); DBG_CTOR( rpt_OReportController,NULL); - registerProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ZoomValue")),PROPERTY_ID_ZOOMVALUE,beans::PropertyAttribute::BOUND| beans::PropertyAttribute::TRANSIENT, &m_nZoomValue, ::getCppuType(reinterpret_cast< sal_Int16*>(NULL))); + registerProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ZoomValue")),PROPERTY_ID_ZOOMVALUE,beans::PropertyAttribute::BOUND| beans::PropertyAttribute::TRANSIENT,&m_nZoomValue,::getCppuType(reinterpret_cast< sal_Int16*>(NULL))); } // ----------------------------------------------------------------------------- OReportController::~OReportController() @@ -897,8 +898,8 @@ case SID_ATTR_ZOOM: aReturn.bEnabled = sal_True; { - SvxZoomItem aZoom(SVX_ZOOM_PERCENT,m_nZoomValue); - aZoom.SetValueSet(SVX_ZOOM_ENABLE_50|SVX_ZOOM_ENABLE_75|SVX_ZOOM_ENABLE_100|SVX_ZOOM_ENABLE_150|SVX_ZOOM_ENABLE_200); + SvxZoomItem aZoom(m_eZoomType,m_nZoomValue); + aZoom.SetValueSet(SVX_ZOOM_ENABLE_50|SVX_ZOOM_ENABLE_75|SVX_ZOOM_ENABLE_100|SVX_ZOOM_ENABLE_200); aZoom.QueryValue(aReturn.aValue); //aReturn.sTitle = ::rtl::OUString::valueOf((sal_Int32)m_nZoomValue); } @@ -906,11 +907,10 @@ case SID_ATTR_ZOOMSLIDER: aReturn.bEnabled = sal_True; { - SvxZoomSliderItem aZoomSlider(m_nZoomValue); + SvxZoomSliderItem aZoomSlider(m_nZoomValue,20,400); aZoomSlider.AddSnappingPoint(50); aZoomSlider.AddSnappingPoint(75); aZoomSlider.AddSnappingPoint(100); - aZoomSlider.AddSnappingPoint(150); aZoomSlider.AddSnappingPoint(200); aZoomSlider.QueryValue(aReturn.aValue); //aReturn.sTitle = ::rtl::OUString::valueOf((sal_Int32)m_nZoomValue); @@ -1606,6 +1606,7 @@ SvxZoomItem aZoomItem; aZoomItem.PutValue(aArgs[0].Value); m_nZoomValue = aZoomItem.GetValue(); + m_eZoomType = aZoomItem.GetType(); impl_zoom_nothrow(); } // if ( aArgs.getLength() == 1 && aArgs[0].Name.equalsAscii("Zoom") ) break; @@ -1615,6 +1616,7 @@ SvxZoomSliderItem aZoomSlider; aZoomSlider.PutValue(aArgs[0].Value); m_nZoomValue = aZoomSlider.GetValue(); + m_eZoomType = SVX_ZOOM_PERCENT; impl_zoom_nothrow(); } break; @@ -2381,6 +2383,7 @@ uno::Any aValue; static_cast<const SvxSizeItem*>(pItem)->QueryValue(aValue,MID_SIZE_SIZE); xProp->setPropertyValue(PROPERTY_PAPERSIZE,aValue); + resetZoomType(); } if ( SFX_ITEM_SET == pSet->GetItemState( RPTUI_ID_LRSPACE,sal_True,&pItem)) @@ -2401,6 +2404,7 @@ uno::Any aValue; pPageItem->QueryValue(aValue,MID_PAGE_LAYOUT); xProp->setPropertyValue(PROPERTY_PAGESTYLELAYOUT,aValue); + resetZoomType(); } if ( SFX_ITEM_SET == pSet->GetItemState( RPTUI_ID_BRUSH,sal_True,&pItem)) { @@ -3948,20 +3952,22 @@ ::std::auto_ptr<SfxItemSet> pDescriptor(new SfxItemSet(*pPool, pRanges)); // fill it - pDescriptor->Put(SvxZoomItem( SVX_ZOOM_PERCENT, m_nZoomValue, SID_ATTR_ZOOM )); + SvxZoomItem aZoomItem( m_eZoomType, m_nZoomValue, SID_ATTR_ZOOM ); + aZoomItem.SetValueSet(SVX_ZOOM_ENABLE_100|SVX_ZOOM_ENABLE_WHOLEPAGE|SVX_ZOOM_ENABLE_PAGEWIDTH); + pDescriptor->Put(aZoomItem); ::std::auto_ptr<AbstractSvxZoomDialog> pDlg( pFact->CreateSvxZoomDialog(NULL, *pDescriptor.get(), RID_SVXDLG_ZOOM) ); - DBG_ASSERT(pDlg.get(), "Dialogdiet fail!");//CHINA001 pDlg->SetLimits( 20, 400 ); - pDlg->HideButton( ZOOMBTN_OPTIMAL ); - pDlg->HideButton( ZOOMBTN_PAGEWIDTH ); - pDlg->HideButton( ZOOMBTN_WHOLEPAGE ); bool bCancel = ( RET_CANCEL == pDlg->Execute() ); if ( !bCancel ) { const SvxZoomItem& rZoomItem = (const SvxZoomItem&)pDlg->GetOutputItemSet()->Get( SID_ATTR_ZOOM ); + m_eZoomType = rZoomItem.GetType(); m_nZoomValue = rZoomItem.GetValue(); + if ( m_eZoomType != SVX_ZOOM_PERCENT ) + m_nZoomValue = m_pMyOwnView->getZoomFactor( m_eZoomType ); + impl_zoom_nothrow(); } // if ( !bCancel ) } File [changed]: ReportSection.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/report/ReportSection.cxx?r1=1.12.2.1&r2=1.12.2.2 Delta lines: +2 -2 ------------------- --- ReportSection.cxx 2008-10-16 09:45:51+0000 1.12.2.1 +++ ReportSection.cxx 2008-10-17 12:39:56+0000 1.12.2.2 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ReportSection.cxx,v $ - * $Revision: 1.12.2.1 $ + * $Revision: 1.12.2.2 $ * * This file is part of OpenOffice.org. * @@ -176,7 +176,7 @@ void OReportSection::Resize() { Window::Resize(); - if ( false && m_xSection.is() && m_pPage && m_pView ) + if ( m_xSection.is() && m_pPage && m_pView ) { uno::Reference<report::XReportDefinition> xReportDefinition = m_xSection->getReportDefinition(); m_pPage->SetSize( Size( getStyleProperty<awt::Size>(xReportDefinition,PROPERTY_PAPERSIZE).Width,5*m_xSection->getHeight()) ); File [changed]: ReportWindow.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/report/ReportWindow.cxx?r1=1.9.2.2&r2=1.9.2.3 Delta lines: +38 -9 -------------------- --- ReportWindow.cxx 2008-10-16 12:16:51+0000 1.9.2.2 +++ ReportWindow.cxx 2008-10-17 12:39:57+0000 1.9.2.3 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ReportWindow.cxx,v $ - * $Revision: 1.9.2.2 $ + * $Revision: 1.9.2.3 $ * * This file is part of OpenOffice.org. * @@ -181,9 +181,7 @@ if ( !m_aViewsWindow.empty() ) { const Size aTotalOutputSize = GetOutputSizePixel(); - Fraction aStartWidth(long(REPORT_STARTMARKER_WIDTH)); - const Fraction aZoom(m_pView->getController().getZoomValue(),100); - aStartWidth *= aZoom; + Fraction aStartWidth(long(REPORT_STARTMARKER_WIDTH)*m_pView->getController().getZoomValue(),100); const Point aOffset = LogicToPixel( Point( SECTION_OFFSET, 0 ), MAP_APPFONT ); Point aStartPoint((long)aStartWidth + aOffset.X(),0); @@ -239,11 +237,6 @@ sal_Int32 OReportWindow::GetTotalHeight() const { return m_aViewsWindow.getTotalHeight(); - /*Size aHeight(PixelToLogic(Size(0,m_aViewsWindow.getTotalHeight()))); - Fraction aH(aHeight.Height()); - const Fraction aZoom(m_pView->getController().getZoomValue(),100); - aH *= aZoom; - return aH;*/ } //------------------------------------------------------------------------------ void OReportWindow::ScrollChildren(const Point& _aThumbPos) @@ -411,7 +404,43 @@ { m_aViewsWindow.fillControlModelSelection(_rSelection); } +// ----------------------------------------------------------------------------- +sal_Int32 OReportWindow::impl_getRealPixelWidth() const +{ + const sal_Int32 nPaperWidth = getStyleProperty<awt::Size>(m_pView->getController().getReportDefinition(),PROPERTY_PAPERSIZE).Width; + MapMode aMap( MAP_100TH_MM ); + const Size aPageSize = LogicToPixel(Size(nPaperWidth,0),aMap); + return aPageSize.Width() + REPORT_ENDMARKER_WIDTH + REPORT_STARTMARKER_WIDTH + SECTION_OFFSET; +} +// ----------------------------------------------------------------------------- +sal_uInt16 OReportWindow::getZoomFactor(SvxZoomType _eType) const +{ + sal_uInt16 nZoom(100); + const Size aSize( GetSizePixel() ); + switch( _eType) + { + case SVX_ZOOM_PERCENT: + nZoom = m_pView->getController().getZoomValue(); + break; + case SVX_ZOOM_OPTIMAL: + break; + case SVX_ZOOM_WHOLEPAGE: + { + nZoom = (USHORT)(long)Fraction(aSize.Width()*100,impl_getRealPixelWidth()); + MapMode aMap( MAP_100TH_MM ); + const Size aHeight = m_aViewsWindow.LogicToPixel(m_aViewsWindow.PixelToLogic(Size(0,GetTotalHeight() + m_aHRuler.GetSizePixel().Height())),aMap); + nZoom = ::std::min(nZoom,(USHORT)(long)Fraction(aSize.Height()*100,aHeight.Height())); + } + break; + case SVX_ZOOM_PAGEWIDTH: + nZoom = (USHORT)(long)Fraction(aSize.Width()*100,impl_getRealPixelWidth()); + break; + default: + break; + } + return nZoom; +} //================================================================== } //rptui //================================================================== File [changed]: ScrollHelper.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/report/ScrollHelper.cxx?r1=1.9.2.1&r2=1.9.2.2 Delta lines: +7 -6 ------------------- --- ScrollHelper.cxx 2008-10-16 09:45:51+0000 1.9.2.1 +++ ScrollHelper.cxx 2008-10-17 12:39:58+0000 1.9.2.2 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ScrollHelper.cxx,v $ - * $Revision: 1.9.2.1 $ + * $Revision: 1.9.2.2 $ * * This file is part of OpenOffice.org. * @@ -178,10 +178,7 @@ const Point aOffset = LogicToPixel( Point( SECTION_OFFSET, SECTION_OFFSET ), MAP_APPFONT ); // resize scrollbars and set their ranges { - Fraction aStartWidth(long(REPORT_STARTMARKER_WIDTH)); - const Fraction aZoom(m_pParent->getController().getZoomValue(),100); - aStartWidth *= aZoom; - + Fraction aStartWidth(long(REPORT_STARTMARKER_WIDTH*m_pParent->getController().getZoomValue()),100); const sal_Int32 nNewWidth = aOutPixSz.Width() - aOffset.X() - (long)aStartWidth; lcl_setScrollBar(nNewWidth,Point( (long)aStartWidth + aOffset.X(), aOutPixSz.Height() ),Size( nNewWidth, nScrSize ),m_aHScroll); } @@ -412,7 +409,11 @@ { m_aReportWindow.fillControlModelSelection(_rSelection); } - +// ----------------------------------------------------------------------------- +sal_uInt16 OScrollWindowHelper::getZoomFactor(SvxZoomType _eType) const +{ + return m_aReportWindow.getZoomFactor(_eType); +} //============================================================================== } // rptui //============================================================================== File [changed]: SectionWindow.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/report/SectionWindow.cxx?r1=1.3.2.1&r2=1.3.2.2 Delta lines: +2 -1 ------------------- --- SectionWindow.cxx 2008-10-16 09:45:51+0000 1.3.2.1 +++ SectionWindow.cxx 2008-10-17 12:39:58+0000 1.3.2.2 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: SectionWindow.cxx,v $ - * $Revision: 1.3.2.1 $ + * $Revision: 1.3.2.2 $ * * This file is part of OpenOffice.org. * @@ -144,6 +144,7 @@ m_aStartMarker.Invalidate(INVALIDATE_NOERASE); m_aEndMarker.Invalidate(INVALIDATE_NOERASE); m_aReportSection.Invalidate(/*INVALIDATE_NOERASE*/); + getViewsWindow()->getView()->getReportView()->getController().resetZoomType(); // Invalidate(INVALIDATE_NOCHILDREN | INVALIDATE_TRANSPARENT); // m_pParent->Invalidate(INVALIDATE_NOCHILDREN|INVALIDATE_NOERASE|INVALIDATE_TRANSPARENT); // m_pParent->Invalidate(/*INVALIDATE_NOCHILDREN | INVALIDATE_NOERASE |*/ INVALIDATE_NOCHILDREN | INVALIDATE_TRANSPARENT); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
