basctl/source/basicide/basidesh.cxx | 1 chart2/source/controller/dialogs/tp_PointGeometry.cxx | 1 chart2/source/controller/main/ChartController.cxx | 2 - chart2/source/controller/main/ChartController_Properties.cxx | 2 - chart2/source/view/main/ChartView.cxx | 1 cppcanvas/source/mtfrenderer/emfplus.cxx | 7 +++--- cppcanvas/source/mtfrenderer/implrenderer.cxx | 3 -- cui/source/tabpages/transfrm.cxx | 2 - dbaccess/source/ui/tabledesign/TEditControl.cxx | 1 editeng/source/editeng/impedit.hxx | 4 +-- editeng/source/editeng/impedit2.cxx | 1 editeng/source/editeng/impedit4.cxx | 10 +++------ filter/source/flash/swfexporter.cxx | 5 ---- filter/source/flash/swfwriter1.cxx | 4 --- filter/source/msfilter/svdfppt.cxx | 1 framework/source/layoutmanager/layoutmanager.cxx | 1 package/source/manifest/ManifestWriter.cxx | 2 - reportdesign/source/ui/dlg/Navigator.cxx | 1 reportdesign/source/ui/report/DesignView.cxx | 1 scp2/source/ooo/common_brand.scp | 3 -- svtools/source/edit/textview.cxx | 2 - svtools/source/filter/wmf/winwmf.cxx | 10 ++------- svx/source/customshapes/EnhancedCustomShapeFontWork.cxx | 1 svx/source/dialog/frmsel.cxx | 2 - svx/source/dialog/pagectrl.cxx | 4 --- svx/source/engine3d/scene3d.cxx | 4 --- svx/source/form/filtnav.cxx | 10 ++++----- svx/source/form/tabwin.cxx | 1 svx/source/gallery2/galbrws.cxx | 1 svx/source/inc/filtnav.hxx | 2 - svx/source/svdraw/svdograf.cxx | 4 --- svx/source/svdraw/svdopath.cxx | 2 - toolkit/inc/toolkit/controls/unocontrols.hxx | 3 +- toolkit/source/controls/unocontrols.cxx | 12 +++++++++++ 34 files changed, 38 insertions(+), 73 deletions(-)
New commits: commit 82cae18c0e0f787fd3efdd4531af6e5a90806e4d Author: Stephan Bergmann <sberg...@redhat.com> Date: Wed Jul 18 08:21:05 2012 +0200 Duplicate assignment of gid_Brand_Dir_Program Change-Id: Ia8d2d8683d9acf9c834cc431374406e22165cb85 diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 1de1e4b..beb8154 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -115,8 +115,7 @@ Module gid_Module_Langpack_Brand_Template Description = "gid_Module_Langpack_Brand_Template"; Styles = (TEMPLATEMODULE); InstallOrder = "1050"; - Dirs = (gid_Brand_Dir_Program, - gid_Brand_Dir_Program_Shell, + Dirs = (gid_Brand_Dir_Program_Shell, gid_Brand_Dir_Readme); Files = (gid_Brand_File_Res_Iso, gid_Brand_File_Res_Ooo, commit 15fd36440ce049fa7a577ff198649f782dad3c1f Author: Stephan Bergmann <sberg...@redhat.com> Date: Wed Jul 18 08:20:02 2012 +0200 Un-inline use of szServiceName2_UnoControlEdit ...as it is not marked SAL_DLLPUBLIC_EXPORT unlike the class it is used in so at least Clang would complain. Change-Id: I59886caead24bca4cd4c0e47edb0eaac349eb213 diff --git a/toolkit/inc/toolkit/controls/unocontrols.hxx b/toolkit/inc/toolkit/controls/unocontrols.hxx index a30ea6f..132297a 100644 --- a/toolkit/inc/toolkit/controls/unocontrols.hxx +++ b/toolkit/inc/toolkit/controls/unocontrols.hxx @@ -183,7 +183,8 @@ public: void SAL_CALL getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - DECLIMPL_SERVICEINFO_DERIVED( UnoEditControl, UnoControlBase, szServiceName2_UnoControlEdit ) + ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); sal_Bool SAL_CALL setModel(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& Model) throw ( ::com::sun::star::uno::RuntimeException ); }; diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx index 178e5ef..f0aeec8 100644 --- a/toolkit/source/controls/unocontrols.cxx +++ b/toolkit/source/controls/unocontrols.cxx @@ -484,6 +484,18 @@ void UnoEditControl::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) t Impl_getColumnsAndLines( nCols, nLines ); } +::rtl::OUString UnoEditControl::getImplementationName( ) throw(uno::RuntimeException) +{ + return ::rtl::OUString( "stardiv.Toolkit.UnoEditControl" ); +} + +uno::Sequence< ::rtl::OUString > UnoEditControl::getSupportedServiceNames() throw(uno::RuntimeException) +{ + uno::Sequence< ::rtl::OUString > aNames = UnoControlBase::getSupportedServiceNames( ); + aNames.realloc( aNames.getLength() + 1 ); + aNames[ aNames.getLength() - 1 ] = ::rtl::OUString::createFromAscii( szServiceName2_UnoControlEdit ); + return aNames; +} // ---------------------------------------------------- // class UnoControlFileControlModel commit 4dd7c0369d66aa7b30f2b9e547faa5fb2c7cd8dd Author: Stephan Bergmann <sberg...@redhat.com> Date: Tue Jul 17 17:00:14 2012 +0200 Various Clang 3.1 -Wunsued-variable, -Wconstant-conversion Change-Id: I0799f22685609201dfb524c373d065b6184ed53c diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx index 8144b17..b6cad4c 100644 --- a/basctl/source/basicide/basidesh.cxx +++ b/basctl/source/basicide/basidesh.cxx @@ -507,7 +507,6 @@ sal_Bool BasicIDEShell::NextPage( sal_Bool bPrev ) void BasicIDEShell::ArrangeTabBar() { - Size aSz( GetViewFrame()->GetWindow().GetOutputSizePixel() ); long nBoxPos = aScrollBarBox.GetPosPixel().X() - 1; long nPos = pTabBar->GetSplitSize(); if ( nPos <= nBoxPos ) diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.cxx b/chart2/source/controller/dialogs/tp_PointGeometry.cxx index b579fca..645ddc4 100644 --- a/chart2/source/controller/dialogs/tp_PointGeometry.cxx +++ b/chart2/source/controller/dialogs/tp_PointGeometry.cxx @@ -38,7 +38,6 @@ SchLayoutTabPage::SchLayoutTabPage(Window* pWindow,const SfxItemSet& rInAttrs) : SfxTabPage(pWindow, SchResId(TP_LAYOUT), rInAttrs) , m_pGeometryResources(0) { - Size aPageSize( this->GetSizePixel() ); Point aPos( this->LogicToPixel( Point(6,6), MapMode(MAP_APPFONT) ) ); m_pGeometryResources = new BarGeometryResources( this ); m_pGeometryResources->SetPosPixel( aPos ); diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx index 097c057..3b863dc 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -405,8 +405,6 @@ APPHELPER_XSERVICEINFO_IMPL(ChartController,CHART_CONTROLLER_SERVICE_IMPLEMENTAT m_apDropTargetHelper.reset(); } { - awt::Size aPageSize( ChartModelHelper::getPageSize(getModel()) ); - // calls to VCL SolarMutexGuard aSolarGuard; m_pChartWindow = new ChartWindow(this,pParent,pParent?pParent->GetStyle():0); diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx index 19f146a..8899dc8 100644 --- a/chart2/source/controller/main/ChartController_Properties.cxx +++ b/chart2/source/controller/main/ChartController_Properties.cxx @@ -757,8 +757,6 @@ bool ChartController::executeDlg_ObjectProperties_withoutUndoGuard( const ::rtl: //------------------------------------------------------------- //convert properties to ItemSet - awt::Size aPageSize( ChartModelHelper::getPageSize(getModel()) ); - SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr< ReferenceSizeProvider > pRefSizeProv( impl_createReferenceSizeProvider()); diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index b39691d..1881e07 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -1456,7 +1456,6 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer& bool bLessSpaceConsumedThanExpected = false; { - ::basegfx::B2IRectangle aOldRect( aConsumedOuterRect ); aConsumedOuterRect = ShapeFactory::getRectangleOfShape(xBoundingShape); if( aConsumedOuterRect.getMinX() > aAvailableOuterRect.getMinX() || aConsumedOuterRect.getMaxX() < aAvailableOuterRect.getMaxX() diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx index 7b2e8d7..8ce563b 100644 --- a/cppcanvas/source/mtfrenderer/emfplus.cxx +++ b/cppcanvas/source/mtfrenderer/emfplus.cxx @@ -176,9 +176,10 @@ namespace cppcanvas aPolygon.clear (); - // debug code - const ::basegfx::B2DRectangle aBounds (::basegfx::tools::getRange (GetPolygon (rR))); - EMFP_DEBUG (printf ("EMF+\tpolygon bounding box: %f,%f %fx%f (mapped)\n", aBounds.getMinX (), aBounds.getMinY (), aBounds.getWidth (), aBounds.getHeight ())); + (void) rR; // avoid warnings + EMFP_DEBUG ( + const ::basegfx::B2DRectangle aBounds (::basegfx::tools::getRange (GetPolygon (rR))); + printf ("EMF+\tpolygon bounding box: %f,%f %fx%f (mapped)\n", aBounds.getMinX (), aBounds.getMinY (), aBounds.getWidth (), aBounds.getHeight ())); } ::basegfx::B2DPolyPolygon& GetPolygon (ImplRenderer& rR, bool bMapIt = true) diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx index 8c25ee5..74f47ee 100644 --- a/cppcanvas/source/mtfrenderer/implrenderer.cxx +++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx @@ -2573,7 +2573,6 @@ namespace cppcanvas const OutDevState& rState( rStates.getState() ); const ::Size aBaselineOffset( tools::getBaselineOffset( rState, rVDev ) ); - const ::Point aStartPoint( pAct->GetStartPoint() ); const ::basegfx::B2DSize aSize( rState.mapModeTransform * ::basegfx::B2DSize(pAct->GetWidth(), 0 )); @@ -2980,8 +2979,6 @@ namespace cppcanvas const Size aMtfSize( rMtf.GetPrefSize() ); const Size aMtfSizePixPre( aVDev.LogicToPixel( aMtfSize, rMtf.GetPrefMapMode() ) ); - const Point aEmptyPt; - const Point aMtfOriginPix( aVDev.LogicToPixel( aEmptyPt ) ); // #i44110# correct null-sized output - there are shapes // which have zero size in at least one dimension diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index fcb9704..b9dc215 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -1515,8 +1515,6 @@ void SvxPositionSizeTabPage::PointChanged( Window* pWindow, RECT_POINT eRP ) else { meRP = eRP; - - Rectangle aTmpRect( GetRect() ); SetMinMaxPosition(); } } diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index 2bd52f7..2022d4c 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -373,7 +373,6 @@ void OTableEditorCtrl::PaintCell(OutputDevice& rDev, const Rectangle& rRect, { DBG_CHKTHIS(OTableEditorCtrl,NULL); const String aText( GetCellText( m_nCurrentPos, nColumnId )); - const Point aPos(rRect.TopLeft()); const Size TxtSize(GetDataWindow().GetTextWidth(aText), GetDataWindow().GetTextHeight()); rDev.Push( PUSH_CLIPREGION ); diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx index 9aefbe3..750b470 100644 --- a/editeng/source/editeng/impedit.hxx +++ b/editeng/source/editeng/impedit.hxx @@ -592,7 +592,7 @@ private: EditPaM StartOfWord( const EditPaM& rPaM, sal_Int16 nWordType = ::com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ); EditPaM EndOfWord( const EditPaM& rPaM, sal_Int16 nWordType = ::com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ); EditSelection SelectWord( const EditSelection& rCurSelection, sal_Int16 nWordType = ::com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES, sal_Bool bAcceptStartOfWord = sal_True ); - EditSelection SelectSentence( const EditSelection& rCurSel ); + EditSelection SelectSentence( const EditSelection& rCurSel ) const; EditPaM CursorVisualLeftRight( EditView* pEditView, const EditPaM& rPaM, sal_uInt16 nCharacterIteratorMode, sal_Bool bToLeft ); EditPaM CursorVisualStartEnd( EditView* pEditView, const EditPaM& rPaM, sal_Bool bStart ); @@ -670,7 +670,7 @@ private: ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XBreakIterator > ImplGetBreakIterator() const; ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XExtendedInputSequenceChecker > ImplGetInputSequenceChecker() const; - SpellInfo * CreateSpellInfo( const EditSelection &rSel, bool bMultipleDocs ); + SpellInfo * CreateSpellInfo( bool bMultipleDocs ); ImpEditEngine(); // disabled ImpEditEngine(EditEngine* pEditEngine, SfxItemPool* pPool); diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index 32eadcd..a85b163 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -1632,6 +1632,7 @@ EditSelection ImpEditEngine::SelectWord( const EditSelection& rCurSel, sal_Int16 } EditSelection ImpEditEngine::SelectSentence( const EditSelection& rCurSel ) + const { uno::Reference < i18n::XBreakIterator > _xBI( ImplGetBreakIterator() ); const EditPaM& rPaM = rCurSel.Min(); diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx index 1271860..f530670 100644 --- a/editeng/source/editeng/impedit4.cxx +++ b/editeng/source/editeng/impedit4.cxx @@ -1425,7 +1425,7 @@ Reference< XSpellChecker1 > ImpEditEngine::GetSpeller() } -SpellInfo * ImpEditEngine::CreateSpellInfo( const EditSelection &rSel, bool bMultipleDocs ) +SpellInfo * ImpEditEngine::CreateSpellInfo( bool bMultipleDocs ) { if (!pSpellInfo) pSpellInfo = new SpellInfo; @@ -1433,7 +1433,6 @@ SpellInfo * ImpEditEngine::CreateSpellInfo( const EditSelection &rSel, bool bMul *pSpellInfo = SpellInfo(); // reset to default values pSpellInfo->bMultipleDoc = bMultipleDocs; - EditSelection aSentenceSel( SelectSentence( rSel ) ); // always spell draw objects completely, startting at the top. // (spelling in only a selection or not starting with the top requires // further changes elsewehe to work properly) @@ -1459,7 +1458,7 @@ EESpellState ImpEditEngine::Spell( EditView* pEditView, sal_Bool bMultipleDoc ) } EditSelection aCurSel( pEditView->pImpEditView->GetEditSelection() ); - pSpellInfo = CreateSpellInfo( aCurSel, bMultipleDoc ); + pSpellInfo = CreateSpellInfo( bMultipleDoc ); sal_Bool bIsStart = sal_False; if ( bMultipleDoc ) @@ -1885,8 +1884,7 @@ void ImpEditEngine::StartSpelling(EditView& rEditView, sal_Bool bMultipleDoc) { DBG_ASSERT(!pSpellInfo, "pSpellInfo already set?"); rEditView.pImpEditView->SetEditSelection( aEditDoc.GetStartPaM() ); - EditSelection aCurSel( rEditView.pImpEditView->GetEditSelection() ); - pSpellInfo = CreateSpellInfo( aCurSel, bMultipleDoc ); + pSpellInfo = CreateSpellInfo( bMultipleDoc ); } Reference< XSpellAlternatives > ImpEditEngine::ImpFindNextError(EditSelection& rSelection) @@ -1942,7 +1940,7 @@ bool ImpEditEngine::SpellSentence(EditView& rEditView, bool bRet = false; EditSelection aCurSel( rEditView.pImpEditView->GetEditSelection() ); if(!pSpellInfo) - pSpellInfo = CreateSpellInfo( aCurSel, true ); + pSpellInfo = CreateSpellInfo( true ); pSpellInfo->aCurSentenceStart = aCurSel.Min(); DBG_ASSERT( xSpeller.is(), "No spell checker set!" ); pSpellInfo->aLastSpellPortions.clear(); diff --git a/filter/source/flash/swfexporter.cxx b/filter/source/flash/swfexporter.cxx index 5b9dbcd..e178f26 100644 --- a/filter/source/flash/swfexporter.cxx +++ b/filter/source/flash/swfexporter.cxx @@ -571,10 +571,7 @@ void FlashExporter::exportShape( Reference< XShape >& xShape, bool bMaster ) try { - com::sun::star::awt::Point aPosition( xShape->getPosition() ); - com::sun::star::awt::Size aSize( xShape->getSize() ); - - com::sun::star::awt::Rectangle aBoundRect;//(aPosition.X, aPosition.Y, aSize.Width, aSize.Height); + com::sun::star::awt::Rectangle aBoundRect; xPropSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("BoundRect") ) ) >>= aBoundRect; ShapeInfo* pShapeInfo = new ShapeInfo(); diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx index 0bff4ba..1352508 100644 --- a/filter/source/flash/swfwriter1.cxx +++ b/filter/source/flash/swfwriter1.cxx @@ -1202,12 +1202,8 @@ bool Writer::Impl_writeStroke( SvtGraphicStroke& rStroke ) rStroke.getPath( aPolygon ); PolyPolygon aPolyPolygon( aPolygon ); - Rectangle aOldRect( aPolyPolygon.GetBoundRect() ); - map( aPolyPolygon ); - Rectangle aNewRect( aPolyPolygon.GetBoundRect() ); - // as log as not LINESTYLE2 and DefineShape4 is used (which // added support for LineJoin), only round LineJoins are // supported. Fallback to META_POLYLINE_ACTION and META_LINE_ACTION diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 5575ef4..63dc372 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -7395,7 +7395,6 @@ SdrObject* SdrPowerPointImport::CreateTable( SdrObject* pGroup, sal_uInt32* pTab SdrObject* pObj( aGroupIter.Next() ); if ( !IsLine( pObj ) ) { - Rectangle aSnapRect( pObj->GetSnapRect() ); sal_Int32 nTableIndex = 0; sal_Int32 nRow = 0; sal_Int32 nRowCount = 0; diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index d302ab0..9bbd8d7 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -2740,7 +2740,6 @@ throw( uno::RuntimeException ) return; // Request to set docking area space again. - awt::Rectangle aDockingArea( m_aDockingArea ); Reference< XDockingAreaAcceptor > xDockingAreaAcceptor( m_xDockingAreaAcceptor ); Reference< awt::XWindow > xContainerWindow( m_xContainerWindow ); diff --git a/package/source/manifest/ManifestWriter.cxx b/package/source/manifest/ManifestWriter.cxx index edd13cf..e551278 100644 --- a/package/source/manifest/ManifestWriter.cxx +++ b/package/source/manifest/ManifestWriter.cxx @@ -59,7 +59,7 @@ void SAL_CALL ManifestWriter::writeManifestSequence( const Reference< XOutputStr Reference < XDocumentHandler > xHandler ( xSource, UNO_QUERY ); if (xHandler.is()) try { - ManifestExport aExporter ( xHandler, rSequence); + ManifestExport( xHandler, rSequence); } catch( SAXException& ) { diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx index c115440..b508dda 100644 --- a/reportdesign/source/ui/dlg/Navigator.cxx +++ b/reportdesign/source/ui/dlg/Navigator.cxx @@ -935,7 +935,6 @@ void ONavigator::Resize() { FloatingWindow::Resize(); - Point aPos(GetPosPixel()); Size aSize( GetOutputSizePixel() ); ////////////////////////////////////////////////////////////////////// diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx index 835c6d1..b83337c 100644 --- a/reportdesign/source/ui/report/DesignView.cxx +++ b/reportdesign/source/ui/report/DesignView.cxx @@ -256,7 +256,6 @@ void ODesignView::resizeDocumentView(Rectangle& _rPlayground) } } - Size aReportWindowSize(aPlaygroundSize); if ( m_aSplitWin.IsItemValid(TASKPANE_ID) ) { // normalize the split pos diff --git a/svtools/source/edit/textview.cxx b/svtools/source/edit/textview.cxx index 1b62541..289a844 100644 --- a/svtools/source/edit/textview.cxx +++ b/svtools/source/edit/textview.cxx @@ -1329,8 +1329,6 @@ TextSelection TextView::ImpMoveCursor( const KeyEvent& rKeyEvent ) { mpImpl->mpTextEngine->CursorMoved( aOldEnd.GetPara() ); - - TextSelection aOldSelection( mpImpl->maSelection ); TextSelection aNewSelection( mpImpl->maSelection ); aNewSelection.GetEnd() = aPaM; if ( bSelect ) diff --git a/svtools/source/filter/wmf/winwmf.cxx b/svtools/source/filter/wmf/winwmf.cxx index af15126..abcc09b 100644 --- a/svtools/source/filter/wmf/winwmf.cxx +++ b/svtools/source/filter/wmf/winwmf.cxx @@ -1306,20 +1306,16 @@ sal_Bool WMFReader::GetPlaceableBound( Rectangle& rPlaceableBound, SvStream* pSt break; case W_META_ROUNDRECT: - { - Size aSize( ReadYXExt() ); + ReadYXExt(); // size GetWinExtMax( ReadRectangle(), rPlaceableBound, nMapMode ); - } break; case W_META_ARC: case W_META_PIE: case W_META_CHORD: - { - Point aEnd( ReadYX() ); - Point aStart( ReadYX() ); + ReadYX(); // end + ReadYX(); // start GetWinExtMax( ReadRectangle(), rPlaceableBound, nMapMode ); - } break; case W_META_POLYGON: diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx index 0b60720..2f6833f 100644 --- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx @@ -853,7 +853,6 @@ SdrObject* EnhancedCustomShapeFontWork::CreateFontWork( const SdrObject* pShape2 { SdrObject* pRet = NULL; - Rectangle aLogicRect( pCustomShape->GetLogicRect() ); PolyPolygon aOutlines2d( GetOutlinesFromShape2d( pShape2d ) ); sal_uInt16 nOutlinesCount2d = aOutlines2d.Count(); if ( nOutlinesCount2d ) diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx index 75a7d7e..e877317 100644 --- a/svx/source/dialog/frmsel.cxx +++ b/svx/source/dialog/frmsel.cxx @@ -378,8 +378,6 @@ void FrameSelectorImpl::InitBorderGeometry() maArray.SetYOffset( mnLine1 ); maArray.SetAllRowHeights( (mbHor ? mnLine2 : mnLine3) - mnLine1 ); - Rectangle aTLRect( maArray.GetCellRect( 0, 0 ) ); - // Focus polygons --------------------------------------------------------- /* Width for focus rectangles from center of frame borders. */ diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx index 7eec077..db46a37 100644 --- a/svx/source/dialog/pagectrl.cxx +++ b/svx/source/dialog/pagectrl.cxx @@ -202,10 +202,6 @@ void SvxPageWindow::DrawPage( const Point& rOrg, const sal_Bool bSecond, const s SetFillColor( rFieldColor ); DrawRect( Rectangle( rOrg, aTempSize ) ); - // Border Top Bottom Left Right - Point aBegin( rOrg ); - Point aEnd( rOrg ); - long nL = nLeft; long nR = nRight; diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx index 76d6a89..732eb21 100644 --- a/svx/source/engine3d/scene3d.cxx +++ b/svx/source/engine3d/scene3d.cxx @@ -547,8 +547,6 @@ void E3dScene::RotateScene (const Point& rRef, long /*nWink*/, double sn, double long dyOutRectHalf = labs(UpperLeft.Y() - LowerRight.Y()); dyOutRectHalf /= 2; - Rectangle RectQuelle(aOutRect), RectZiel(aOutRect); - // Only the center is moved. The corners are moved by NbcMove. For the // rotation a cartesian coordinate system is used in which the pivot // point is the origin, and the y-axis increases upward, the X-axis to @@ -571,7 +569,7 @@ void E3dScene::RotateScene (const Point& rRef, long /*nWink*/, double sn, double // positive direction! { // xnew = x * cos(alpha) - y * sin(alpha) // ynew = x * sin(alpha) + y * cos(alpha) - // Bottom Right is not rotated: the pages of RectQuelle must + // Bottom Right is not rotated: the pages of aOutRect must // remain parallel to the coordinate axes. NewCenter.X() = (long) (Center.X() * cs - Center.Y() * sn); NewCenter.Y() = (long) (Center.X() * sn + Center.Y() * cs); diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index 24a0b87..270b956 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -249,15 +249,15 @@ TYPEINIT1( FmFilterHint, SfxHint ); //======================================================================== class FmFilterInsertedHint : public FmFilterHint { - sal_Int32 m_nPos; // Position relative to the parent of the data + sal_uLong m_nPos; // Position relative to the parent of the data public: TYPEINFO(); - FmFilterInsertedHint(FmFilterData* pData, sal_Int32 nRelPos) + FmFilterInsertedHint(FmFilterData* pData, sal_uLong nRelPos) :FmFilterHint(pData) ,m_nPos(nRelPos){} - sal_Int32 GetPos() const { return m_nPos; } + sal_uLong GetPos() const { return m_nPos; } }; TYPEINIT1( FmFilterInsertedHint, FmFilterHint ); @@ -793,7 +793,7 @@ void FmFilterModel::AppendFilterItems( FmFormItem& _rFormItem ) void FmFilterModel::Insert(const ::std::vector<FmFilterData*>::iterator& rPos, FmFilterData* pData) { ::std::vector<FmFilterData*>& rItems = pData->GetParent()->GetChildren(); - sal_Int32 nPos = rPos == rItems.end() ? LIST_APPEND : rPos - rItems.begin(); + sal_uLong nPos = rPos == rItems.end() ? LIST_APPEND : rPos - rItems.begin(); rItems.insert(rPos, pData); // UI benachrichtigen @@ -1548,7 +1548,7 @@ SvLBoxEntry* FmFilterNavigator::FindEntry(const FmFilterData* pItem) const } //------------------------------------------------------------------------ -void FmFilterNavigator::Insert(FmFilterData* pItem, sal_Int32 nPos) +void FmFilterNavigator::Insert(FmFilterData* pItem, sal_uLong nPos) { const FmParentData* pParent = pItem->GetParent() ? pItem->GetParent() : GetFilterModel(); diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx index 7948ad3..e5a8b38 100644 --- a/svx/source/form/tabwin.cxx +++ b/svx/source/form/tabwin.cxx @@ -424,7 +424,6 @@ void FmFieldWin::Resize() { SfxFloatingWindow::Resize(); - Point aPos(GetPosPixel()); Size aOutputSize( GetOutputSizePixel() ); ////////////////////////////////////////////////////////////////////// diff --git a/svx/source/gallery2/galbrws.cxx b/svx/source/gallery2/galbrws.cxx index 96df902..5442ef8 100644 --- a/svx/source/gallery2/galbrws.cxx +++ b/svx/source/gallery2/galbrws.cxx @@ -162,7 +162,6 @@ void GalleryBrowser::Resize() const long nFrameWidth = LogicToPixel( Size( 3, 0 ), MAP_APPFONT ).Width(); const long nFrameWidth2 = nFrameWidth << 1; - Size aMinSize( GetMinOutputSizePixel() ); Size aNewSize( GetOutputSizePixel() ); Point aSplitPos( mpSplitter->GetPosPixel() ); const Size aSplitSize( mpSplitter->GetOutputSizePixel() ); diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx index c694aaa..d1af0c9 100644 --- a/svx/source/inc/filtnav.hxx +++ b/svx/source/inc/filtnav.hxx @@ -296,7 +296,7 @@ protected: void DeleteSelection(); SvLBoxEntry* FindEntry(const FmFilterData* pItem) const; - void Insert(FmFilterData* pItem, sal_Int32 nPos); + void Insert(FmFilterData* pItem, sal_uLong nPos); void Remove(FmFilterData* pItem); DECL_LINK(OnRemove, SvLBoxEntry*); diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index e03a8d0..bc9d0f7 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -956,8 +956,6 @@ void SdrGrafObj::SaveGeoData(SdrObjGeoData& rGeo) const void SdrGrafObj::RestGeoData(const SdrObjGeoData& rGeo) { - Size aSizMerk( aRect.GetSize() ); - SdrRectObj::RestGeoData(rGeo); SdrGrafObjGeoData& rGGeo=(SdrGrafObjGeoData&)rGeo; bMirrored=rGGeo.bMirrored; @@ -1038,8 +1036,6 @@ SdrObject* SdrGrafObj::DoConvertToPolyObj(sal_Bool bBezier) const // Sort into group and return ONLY those objects that can be created from the MetaFile. SdrObjGroup* pGrp = new SdrObjGroup(); ImpSdrGDIMetaFileImport aFilter(*GetModel()); - Point aOutPos( aRect.TopLeft() ); - const Size aOutSiz( aRect.GetSize() ); aFilter.SetScaleRect(GetSnapRect()); aFilter.SetLayer(GetLayer()); diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx index 3ef20c8..c5f5c2a 100644 --- a/svx/source/svdraw/svdopath.cxx +++ b/svx/source/svdraw/svdopath.cxx @@ -1328,7 +1328,6 @@ bool ImpPathForDragAndCreate::MovCreate(SdrDragStat& rStat) bool bFreeHand=IsFreeHand(pU->eAktKind); rStat.SetNoSnap(bFreeHand); rStat.SetOrtho8Possible(pU->eAktKind!=OBJ_CARC && pU->eAktKind!=OBJ_RECT && (!pU->bMixedCreate || pU->eAktKind!=OBJ_LINE)); - Point aActMerk(rXPoly[nActPoint]); rXPoly[nActPoint]=rStat.Now(); if (!pU->bMixedCreate && pU->eStartKind==OBJ_LINE && rXPoly.GetPointCount()>=1) { Point aPt(rStat.Start()); @@ -1403,7 +1402,6 @@ bool ImpPathForDragAndCreate::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) bool bIncomp=pView!=NULL && pView->IsUseIncompatiblePathCreateInterface(); XPolygon& rXPoly=aPathPolygon[aPathPolygon.Count()-1]; sal_uInt16 nActPoint=rXPoly.GetPointCount()-1; - Point aAktMerk(rXPoly[nActPoint]); rXPoly[nActPoint]=rStat.Now(); if (!pU->bMixedCreate && pU->eStartKind==OBJ_LINE) { if (rStat.GetPointAnz()>=2) eCmd=SDRCREATE_FORCEEND; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits