diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:02:56 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:02:56 +0200 |
commit | fdc4da32a09265b19470ab09db998ea28936106e (patch) | |
tree | 960b32cda2755f988d0d34e568f1019ad2bce0d2 /reportdesign/source/ui/report/ReportWindow.cxx | |
parent | aa20084bd041208841d5ad3ca50b1e963eb5986e (diff) |
recreated tag libreoffice-3.3.0.4 which had these commits:
commit e082905e4ce8c9018a2a38035e212eb45e9f70b1 (tag: refs/tags/libreoffice-3.3.0.4, refs/remotes/origin/libreoffice-3-3-0)
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 18 19:01:14 2011 +0100
Version 3.3.0.4, tag libreoffice-3.3.0.4 (3.3-rc4)
commit 35131d5a73dd02924bf4b404c55d0dbeb324db1f
Author: Lionel Elie Mamane <lionel@mamane.lu>
Date: Sat Jan 15 05:39:40 2011 +0100
i#116187: report left/right page margin setting ignored on Unix 64 bit
(cherry picked from commit 51a9333217687ff16df40ea3bd8983faaf5e425a)
Signed-off-by: Michael Meeks <michael.meeks@novell.com>
reportdesign/source/ui/report/ReportController.cxx | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
commit ae3903b548d8d05807cc7f3a029495388de5e302
Author: Kohei Yoshida <kyoshida@novell.com>
Date: Fri Jan 14 11:24:43 2011 -0500
Remove the Registration... menu item which we don't want. (fdo#33112)
dbaccess/uiconfig/dbtdata/menubar/menubar.xml | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
commit c71822d4eb36b43cdb08c25d207cae5e3c1660cd
Author: Noel Power <noel.power@novell.com>
Date: Wed Jan 12 11:09:51 2011 +0000
fix for fdo#32742#
reportdesign/source/ui/inspection/metadata.cxx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 66d25b635de422a4a811710cb3289266d9a11a84
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 11 22:59:35 2011 +0100
Branch libreoffice-3-3-0
This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release.
Only very safe changes, reviewed by three people are allowed.
If you want to commit more complicated fix for the next 3.3.x release,
please use the 'libreoffice-3-3' branch.
If you want to build something cool, unstable, and risky, use master.
Notes
split repo tag: base_libreoffice-3.3.0.4
Diffstat (limited to 'reportdesign/source/ui/report/ReportWindow.cxx')
-rw-r--r-- | reportdesign/source/ui/report/ReportWindow.cxx | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/reportdesign/source/ui/report/ReportWindow.cxx b/reportdesign/source/ui/report/ReportWindow.cxx index cd9363e05d57..ddbeea74a9a9 100644 --- a/reportdesign/source/ui/report/ReportWindow.cxx +++ b/reportdesign/source/ui/report/ReportWindow.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 @@ -54,7 +54,7 @@ #include <toolkit/helper/vclunohelper.hxx> -#define SECTION_OFFSET 3 +#define SECTION_OFFSET 3 namespace rptui { using namespace ::com::sun::star; @@ -64,7 +64,7 @@ using namespace ::comphelper; //================================================================== DBG_NAME( rpt_OReportWindow ) //------------------------------------------------------------------------------ -OReportWindow::OReportWindow(OScrollWindowHelper* _pParent,ODesignView* _pView) +OReportWindow::OReportWindow(OScrollWindowHelper* _pParent,ODesignView* _pView) : Window(_pParent,WB_DIALOGCONTROL) ,m_aHRuler(this) ,m_pView(_pView) @@ -78,7 +78,7 @@ OReportWindow::OReportWindow(OScrollWindowHelper* _pParent,ODesignView* _pView) m_aViewsWindow.Show(); - m_aHRuler.Show(); + m_aHRuler.Show(); m_aHRuler.Activate(); m_aHRuler.SetPagePos(0); m_aHRuler.SetBorders(); @@ -103,7 +103,7 @@ void OReportWindow::initialize() //---------------------------------------------------------------------------- void OReportWindow::SetInsertObj( USHORT eObj,const ::rtl::OUString& _sShapeType ) { - m_aViewsWindow.SetInsertObj( eObj,_sShapeType); + m_aViewsWindow.SetInsertObj( eObj,_sShapeType); } //---------------------------------------------------------------------------- @@ -114,7 +114,7 @@ rtl::OUString OReportWindow::GetInsertObjString() const //------------------------------------------------------------------------------ void OReportWindow::SetMode( DlgEdMode eNewMode ) { - m_aViewsWindow.SetMode(eNewMode); + m_aViewsWindow.SetMode(eNewMode); } //---------------------------------------------------------------------------- void OReportWindow::removeSection(USHORT _nPosition) @@ -129,9 +129,9 @@ void OReportWindow::addSection(const uno::Reference< report::XSection >& _xSecti { if ( !_xSection.is() ) return; - - m_aViewsWindow.addSection(_xSection,_sColorEntry,_nPosition); - + + m_aViewsWindow.addSection(_xSection,_sColorEntry,_nPosition); + m_pParent->setTotalSize(GetTotalWidth(),GetTotalHeight()); } //------------------------------------------------------------------------------ @@ -143,7 +143,7 @@ void OReportWindow::toggleGrid(sal_Bool _bVisible) void OReportWindow::showRuler(sal_Bool _bShow) { m_aHRuler.Show(_bShow); - + m_aViewsWindow.showRuler(_bShow); } //------------------------------------------------------------------------------ @@ -157,7 +157,7 @@ sal_Int32 OReportWindow::getMaxMarkerWidth(sal_Bool _bWithEnd) const } //------------------------------------------------------------------------------ sal_Int32 OReportWindow::GetTotalWidth() const -{ +{ sal_Int32 nWidth = 0; if ( !m_aViewsWindow.empty() ) { @@ -170,7 +170,7 @@ sal_Int32 OReportWindow::GetTotalWidth() const const Size aPageSize = LogicToPixel(Size(aPaperWidth,0)); nWidth = aPageSize.Width() + long(aStartWidth); } - return nWidth; + return nWidth; } //------------------------------------------------------------------------------ void OReportWindow::Resize() @@ -200,12 +200,12 @@ void OReportWindow::Resize() m_aHRuler.SetNullOffset(nLeftMargin); m_aHRuler.SetMargin1(0); m_aHRuler.SetMargin2(aPageSize.Width() - nLeftMargin - nRightMargin); - + aStartPoint.Y() += aPageSize.Height(); nSectionsHeight -= aStartPoint.Y(); aStartPoint.X() = aOffset.X(); - + m_aViewsWindow.SetPosSizePixel(aStartPoint,Size(aTotalOutputSize.Width(),nSectionsHeight)); } } @@ -227,7 +227,7 @@ void OReportWindow::DataChanged( const DataChangedEvent& rDCEvt ) if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) ) { - ImplInitSettings(); + ImplInitSettings(); Invalidate(); } } @@ -269,19 +269,19 @@ BOOL OReportWindow::HasSelection() const //---------------------------------------------------------------------------- void OReportWindow::Delete() { - + m_aViewsWindow.Delete(); } //---------------------------------------------------------------------------- void OReportWindow::Copy() -{ - +{ + m_aViewsWindow.Copy(); } //---------------------------------------------------------------------------- void OReportWindow::Paste() { - + m_aViewsWindow.Paste(); } //---------------------------------------------------------------------------- @@ -292,13 +292,13 @@ BOOL OReportWindow::IsPasteAllowed() const //----------------------------------------------------------------------------- void OReportWindow::SelectAll(const sal_uInt16 _nObjectType) { - + m_aViewsWindow.SelectAll(_nObjectType); } //----------------------------------------------------------------------------- void OReportWindow::unmarkAllObjects(OSectionView* _pSectionView) { - + m_aViewsWindow.unmarkAllObjects(_pSectionView); } //----------------------------------------------------------------------------- @@ -321,13 +321,13 @@ void OReportWindow::setMarked(OSectionView* _pSectionView,sal_Bool _bMark) //------------------------------------------------------------------------ void OReportWindow::setMarked(const uno::Reference< report::XSection>& _xSection,sal_Bool _bMark) { - + m_aViewsWindow.setMarked(_xSection,_bMark); } //------------------------------------------------------------------------ void OReportWindow::setMarked(const uno::Sequence< uno::Reference< report::XReportComponent> >& _xShape,sal_Bool _bMark) { - + m_aViewsWindow.setMarked(_xShape,_bMark); } //----------------------------------------------------------------------------- @@ -341,33 +341,33 @@ void OReportWindow::setMarked(const uno::Sequence< uno::Reference< report::XRepo return m_aViewsWindow.getSectionWindow(_xSection); } // ------------------------------------------------------------------------- -void OReportWindow::markSection(const sal_uInt16 _nPos) +void OReportWindow::markSection(const sal_uInt16 _nPos) { - + m_aViewsWindow.markSection(_nPos); } // ----------------------------------------------------------------------------- void OReportWindow::fillCollapsedSections(::std::vector<sal_uInt16>& _rCollapsedPositions) const { - + m_aViewsWindow.fillCollapsedSections(_rCollapsedPositions); } // ----------------------------------------------------------------------------- void OReportWindow::collapseSections(const uno::Sequence< ::com::sun::star::beans::PropertyValue>& _aCollpasedSections) { - + m_aViewsWindow.collapseSections(_aCollpasedSections); } // ----------------------------------------------------------------------------- void OReportWindow::alignMarkedObjects(sal_Int32 _nControlModification,bool _bAlignAtSection, bool bBoundRects) { - + m_aViewsWindow.alignMarkedObjects(_nControlModification, _bAlignAtSection, bBoundRects); } // ----------------------------------------------------------------------------- void OReportWindow::setGridSnap(BOOL bOn) { - + m_aViewsWindow.setGridSnap(bOn); } // ----------------------------------------------------------------------------- @@ -388,13 +388,13 @@ void OReportWindow::zoom(const Fraction& _aZoom) //setZoomFactor(_aZoom,*this); // if this will be include the H - ruler has the wrong size m_aViewsWindow.zoom(_aZoom); - + notifySizeChanged(); const Point aNewThumbPos( m_pParent->getThumbPos() ); ScrollChildren( aNewThumbPos ); Resize(); - + Invalidate(INVALIDATE_NOERASE | INVALIDATE_NOCHILDREN | INVALIDATE_TRANSPARENT); } // ----------------------------------------------------------------------------- @@ -437,10 +437,10 @@ sal_uInt16 OReportWindow::getZoomFactor(SvxZoomType _eType) const break; } - return nZoom; + return nZoom; } //================================================================== -} //rptui +} //rptui //================================================================== /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |