reportdesign/source/filter/xml/xmlComponent.cxx | 1 - reportdesign/source/filter/xml/xmlExport.cxx | 1 - reportdesign/source/ui/report/SectionWindow.cxx | 3 --- reportdesign/source/ui/report/ViewsWindow.cxx | 7 ------- writerfilter/source/rtftok/rtfdocumentimpl.hxx | 8 ++++---- 5 files changed, 4 insertions(+), 16 deletions(-)
New commits: commit 3149d338fc2d766f7e0e974ecf1993b42f32e98d Author: Caolán McNamara <[email protected]> Date: Sat Oct 27 16:26:43 2012 +0100 usual int == sal_Int32 on 64bit and long == sal_Int32 on 32bit woes Change-Id: I879ed580de72df91e269d38add23cddd29c71982 diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx index 43dc748..c0956f7 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx @@ -251,10 +251,10 @@ namespace writerfilter { public: RTFShape(); std::vector< std::pair<rtl::OUString, rtl::OUString> > aProperties; - int nLeft; - int nTop; - int nRight; - int nBottom; + sal_Int32 nLeft; + sal_Int32 nTop; + sal_Int32 nRight; + sal_Int32 nBottom; sal_Int16 nHoriOrientRelation; sal_Int16 nVertOrientRelation; int nWrap; commit 6df1405b6891ec8f3280e61a3cded41c7f048041 Author: Caolán McNamara <[email protected]> Date: Sat Oct 27 16:22:35 2012 +0100 loplugin: various objects that are never used Change-Id: I379540dcce5cd0adae0f0f670821af92ab6432f4 diff --git a/reportdesign/source/filter/xml/xmlComponent.cxx b/reportdesign/source/filter/xml/xmlComponent.cxx index 47c8556..dfc8b75 100644 --- a/reportdesign/source/filter/xml/xmlComponent.cxx +++ b/reportdesign/source/filter/xml/xmlComponent.cxx @@ -61,7 +61,6 @@ OXMLComponent::OXMLComponent( ORptFilter& _rImport const SvXMLTokenMap& rTokenMap = _rImport.GetComponentElemTokenMap(); const sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0; - static const ::rtl::OUString s_sTRUE = ::xmloff::token::GetXMLToken(XML_TRUE); for(sal_Int16 i = 0; i < nLength; ++i) { diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx index 18b71bd..9df73c0 100644 --- a/reportdesign/source/filter/xml/xmlExport.cxx +++ b/reportdesign/source/filter/xml/xmlExport.cxx @@ -447,7 +447,6 @@ void ORptExport::exportComponent(const Reference<XReportComponent>& _xReportComp void ORptExport::exportFormatConditions(const Reference<XReportControlModel>& _xReportElement) { OSL_ENSURE(_xReportElement.is(),"_xReportElement is NULL -> GPF"); - ::rtl::OUString sDataField = convertFormula(_xReportElement->getDataField()); const sal_Int32 nCount = _xReportElement->getCount(); try { diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx index 66381a2..842f360 100644 --- a/reportdesign/source/ui/report/ViewsWindow.cxx +++ b/reportdesign/source/ui/report/ViewsWindow.cxx @@ -241,14 +241,7 @@ void OViewsWindow::resize(const OSectionWindow& _rSectionWindow) pSectionWindow->getEndMarker().Invalidate( nIn ); } } - Fraction aStartWidth(long(REPORT_STARTMARKER_WIDTH)); - aStartWidth *= GetMapMode().GetScaleX(); - Size aOut = GetOutputSizePixel(); - aOut.Width() = aStartWidth; - aOut = PixelToLogic(aOut); m_pParent->notifySizeChanged(); - - Rectangle aRect(PixelToLogic(Point(0,0)),aOut); } //------------------------------------------------------------------------------ void OViewsWindow::Resize() commit 850b4ce0418766d084a97d8850187faed7fdba84 Author: Caolán McNamara <[email protected]> Date: Sat Oct 27 16:17:08 2012 +0100 t4 is always true, probably some debugging thing Change-Id: I8038174c64d2ed5eb3cae503dbde49be96dd7d5c diff --git a/reportdesign/source/ui/report/SectionWindow.cxx b/reportdesign/source/ui/report/SectionWindow.cxx index eefc892..4030f8e 100644 --- a/reportdesign/source/ui/report/SectionWindow.cxx +++ b/reportdesign/source/ui/report/SectionWindow.cxx @@ -122,13 +122,10 @@ void OSectionWindow::_propertyChanged(const beans::PropertyChangeEvent& _rEvent) const uno::Reference< report::XSection> xCurrentSection = m_aReportSection.getSection(); if ( _rEvent.PropertyName.equals(PROPERTY_HEIGHT) ) { - static bool t4 = true; - if ( t4 ) m_pParent->getView()->SetUpdateMode(sal_False); //Resize(); m_pParent->getView()->notifySizeChanged(); m_pParent->resize(*this); - if ( t4 ) m_pParent->getView()->SetUpdateMode(sal_True); // getViewsWindow()->getView()->getReportView()->getController().resetZoomType(); }
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
