diff options
22 files changed, 10 insertions, 214 deletions
diff --git a/chart2/source/controller/inc/ChartDocumentWrapper.hxx b/chart2/source/controller/inc/ChartDocumentWrapper.hxx index f06c502dfd6c..e79aa1144b8f 100644 --- a/chart2/source/controller/inc/ChartDocumentWrapper.hxx +++ b/chart2/source/controller/inc/ChartDocumentWrapper.hxx @@ -28,7 +28,6 @@ #define CHART_CHARTDOCUMENTWRAPPER_HXX #include "WrappedPropertySet.hxx" -//#include "OPropertySet.hxx" #include "ServiceMacros.hxx" #include <com/sun/star/chart2/XChartDocument.hpp> #include <com/sun/star/chart/XChartDocument.hpp> diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx index bf8afc65e78f..e0da3b1fc5b0 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -49,7 +49,6 @@ #include "macros.hxx" #include "dlg_CreationWizard.hxx" #include "dlg_ChartType.hxx" -//#include "svx/ActionDescriptionProvider.hxx" #include "AccessibleChartView.hxx" #include "DrawCommandDispatch.hxx" #include "ShapeController.hxx" @@ -91,10 +90,6 @@ // react on this by rebuilding the view #define TEST_ENABLE_MODIFY_LISTENER -/* -#include <vcl/svapp.hxx> -*/ - //............................................................................. namespace chart { @@ -133,7 +128,6 @@ ChartController::ChartController(uno::Reference<uno::XComponentContext> const & , m_eDrawMode( CHARTDRAW_SELECT ) { DBG_CTOR(ChartController,NULL); -// m_aDispatchContainer.setUndoManager( m_xUndoManager ); m_aDoubleClickTimer.SetTimeoutHdl( LINK( this, ChartController, DoubleClickWaitingHdl ) ); } @@ -716,14 +710,6 @@ void SAL_CALL ChartController::modeChanged( const util::ModeChangeEvent& rEvent m_bSuspended = bSuspend; } return sal_True; - - - /* - if ( bSuspend ) - getFrame()->removeFrameActionListener( pImp ); - else - getFrame()->addFrameActionListener( pImp ); - */ } @@ -783,7 +769,6 @@ void ChartController::impl_deleteDrawViewController() { uno::Reference< frame::XController > xController( this ); uno::Reference< lang::XComponent > xComp( xController, uno::UNO_QUERY ); - //lang::EventObject aEvent( static_cast< lang::XComponent* >( this ) ); lang::EventObject aEvent( xComp ); xSelectionChangeListener->disposing( aEvent ); } @@ -1201,8 +1186,6 @@ bool lcl_isFormatObjectCommand( const rtl::OString& aCommand ) else if( lcl_isFormatObjectCommand(aCommand) ) this->executeDispatch_FormatObject(rURL.Path); //more format -//MENUCHANGE else if(aCommand.equals("SelectSourceRanges")) -//MENUCHANGE this->executeDispatch_SourceData(); else if( aCommand.equals("DiagramType")) this->executeDispatch_ChartType(); else if( aCommand.equals("View3D")) @@ -1262,11 +1245,6 @@ bool lcl_isFormatObjectCommand( const rtl::OString& aCommand ) } } } - - /* - case SID_TEXTEDIT: - this->executeDispatch_EditText(); - */ } void SAL_CALL ChartController @@ -1557,7 +1535,6 @@ void ChartController::impl_initializeAccessible( const uno::Reference< lang::XIn ( C2U("DeleteYErrorBars") ) ( C2U("DeleteDataLabels") ) ( C2U("DeleteDataLabel") ) //format objects -//MENUCHANGE ( C2U("SelectSourceRanges") ) ( C2U("FormatSelection") ) ( C2U("TransformDialog") ) ( C2U("DiagramType") ) ( C2U("View3D") ) ( C2U("Forward") ) ( C2U("Backward") ) diff --git a/chart2/source/view/charttypes/AreaChart.cxx b/chart2/source/view/charttypes/AreaChart.cxx index fd1aaa81c3a0..7c9a182cfc42 100644 --- a/chart2/source/view/charttypes/AreaChart.cxx +++ b/chart2/source/view/charttypes/AreaChart.cxx @@ -32,7 +32,6 @@ #include "AreaChart.hxx" #include "PlottingPositionHelper.hxx" #include "ShapeFactory.hxx" -//#include "chartview/servicenames_charttypes.hxx" #include "CommonConverters.hxx" #include "macros.hxx" #include "ViewDefines.hxx" @@ -169,32 +168,6 @@ uno::Any AreaChart::getExplicitSymbol( const VDataSeries& rSeries, sal_Int32 nPo return aRet; } -//----------------------------------------------------------------- -// lang::XServiceInfo -//----------------------------------------------------------------- -/* -APPHELPER_XSERVICEINFO_IMPL(AreaChart,CHART2_VIEW_AREACHART_SERVICE_IMPLEMENTATION_NAME) - - uno::Sequence< rtl::OUString > AreaChart -::getSupportedServiceNames_Static() -{ - uno::Sequence< rtl::OUString > aSNS( 1 ); - aSNS.getArray()[ 0 ] = CHART2_VIEW_AREACHART_SERVICE_NAME; - return aSNS; -} -*/ -/* -//----------------------------------------------------------------- -// chart2::XPlotter -//----------------------------------------------------------------- - - ::rtl::OUString SAL_CALL AreaChart -::getCoordinateSystemTypeID() - throw (uno::RuntimeException) -{ - return CHART2_COOSYSTEM_CARTESIAN_SERVICE_NAME; -} -*/ drawing::Direction3D AreaChart::getPreferredDiagramAspectRatio() const { if( m_nKeepAspectRatio == 1 ) diff --git a/chart2/source/view/charttypes/BarChart.cxx b/chart2/source/view/charttypes/BarChart.cxx index 0d7ef403f87d..ad921f2919e7 100755 --- a/chart2/source/view/charttypes/BarChart.cxx +++ b/chart2/source/view/charttypes/BarChart.cxx @@ -31,8 +31,6 @@ #include "BarChart.hxx" #include "ShapeFactory.hxx" -//#include "chartview/servicenames_charttypes.hxx" -//#include "servicenames_coosystems.hxx" #include "CommonConverters.hxx" #include "ObjectIdentifier.hxx" #include "LabelPositionHelper.hxx" @@ -167,33 +165,6 @@ double BarChart::getMaximumX() return VSeriesPlotter::getMaximumX(); } -//----------------------------------------------------------------- -// lang::XServiceInfo -//----------------------------------------------------------------- -/* -APPHELPER_XSERVICEINFO_IMPL(BarChart,CHART2_VIEW_BARCHART_SERVICE_IMPLEMENTATION_NAME) - - uno::Sequence< rtl::OUString > BarChart -::getSupportedServiceNames_Static() -{ - uno::Sequence< rtl::OUString > aSNS( 1 ); - aSNS.getArray()[ 0 ] = CHART2_VIEW_BARCHART_SERVICE_NAME; - return aSNS; -} -*/ -/* -//----------------------------------------------------------------- -// chart2::XPlotter -//----------------------------------------------------------------- - - ::rtl::OUString SAL_CALL BarChart -::getCoordinateSystemTypeID() - throw (uno::RuntimeException) -{ - return CHART2_COOSYSTEM_CARTESIAN_SERVICE_NAME; -} -*/ - awt::Point BarChart::getLabelScreenPositionAndAlignment( LabelAlignment& rAlignment, sal_Int32 nLabelPlacement , double fScaledX, double fScaledLowerYValue, double fScaledUpperYValue, double fScaledZ @@ -846,27 +817,6 @@ void BarChart::createShapes() } else //m_nDimension!=3 { - //if( bCreateLineInsteadOfComplexGeometryDueToMissingSpace ) - //{ - // drawing::PolyPolygonShape3D aPoly; - // drawing::Position3D aUpperPoint( fLogicX,fUpperYValue,fLogicZ ); - // drawing::Position3D aLowerPoint( fLogicX,fLowerYValue,fLogicZ ); - - // AddPointToPoly( aPoly, aUpperPoint ); - // AddPointToPoly( aPoly, aLowerPoint ); - - // VLineProperties aLineProperties; - // aLineProperties.initFromPropertySet( xDataPointProperties, true /*bUseSeriesPropertyNames*/ ); - // if( !aLineProperties.isLineVisible() ) - // { - // //todo - // //aLineProperties.Color = - // } - - // xShape = m_pShapeFactory->createLine2D( xPointGroupShape_Shapes - // , PolyToPointSequence(aPoly), &aLineProperties ); - //} - drawing::PolyPolygonShape3D aPoly; drawing::Position3D aLeftUpperPoint( fLogicX-fLogicBarWidth/2.0,fUpperYValue,fLogicZ ); drawing::Position3D aRightUpperPoint( fLogicX+fLogicBarWidth/2.0,fUpperYValue,fLogicZ ); @@ -927,9 +877,6 @@ void BarChart::createShapes() }//end iteration through partial points - //remove PointGroupShape if empty - // if(!xPointGroupShape_Shapes->getCount()) - // xSeriesGroupShape_Shapes->remove(xPointGroupShape_Shape); }//next series in x slot (next y slot) }//next x slot }//next z slot diff --git a/chart2/source/view/charttypes/CandleStickChart.cxx b/chart2/source/view/charttypes/CandleStickChart.cxx index ddfe50deed2f..bb1339d8d5e8 100644 --- a/chart2/source/view/charttypes/CandleStickChart.cxx +++ b/chart2/source/view/charttypes/CandleStickChart.cxx @@ -30,8 +30,6 @@ #include "CandleStickChart.hxx" #include "ShapeFactory.hxx" -//#include "chartview/servicenames_charttypes.hxx" -//#include "servicenames_coosystems.hxx" #include "CommonConverters.hxx" #include "ObjectIdentifier.hxx" #include "LabelPositionHelper.hxx" @@ -106,33 +104,6 @@ LegendSymbolStyle CandleStickChart::getLegendSymbolStyle() return chart2::LegendSymbolStyle_VERTICAL_LINE; } -//----------------------------------------------------------------- -// lang::XServiceInfo -//----------------------------------------------------------------- -/* -APPHELPER_XSERVICEINFO_IMPL(CandleStickChart,CHART2_VIEW_CANDLESTICKCHART_SERVICE_IMPLEMENTATION_NAME) - - uno::Sequence< rtl::OUString > CandleStickChart -::getSupportedServiceNames_Static() -{ - uno::Sequence< rtl::OUString > aSNS( 1 ); - aSNS.getArray()[ 0 ] = CHART2_VIEW_CANDLESTICKCHART_SERVICE_NAME; - return aSNS; -} -*/ -/* -//----------------------------------------------------------------- -// chart2::XPlotter -//----------------------------------------------------------------- - - ::rtl::OUString SAL_CALL CandleStickChart -::getCoordinateSystemTypeID() - throw (uno::RuntimeException) -{ - return CHART2_COOSYSTEM_CARTESIAN_SERVICE_NAME; -} -*/ - drawing::Direction3D CandleStickChart::getPreferredDiagramAspectRatio() const { return drawing::Direction3D(-1,-1,-1); diff --git a/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx index eee13848b11b..1e21659a7195 100644 --- a/chart2/source/view/charttypes/PieChart.cxx +++ b/chart2/source/view/charttypes/PieChart.cxx @@ -43,8 +43,6 @@ #include <com/sun/star/container/XChild.hpp> -//#include "chartview/servicenames_charttypes.hxx" -//#include "servicenames_coosystems.hxx" #include <tools/debug.hxx> #include <rtl/math.hxx> @@ -188,21 +186,6 @@ bool PieChart::shouldSnapRectToUsedArea() return true; } -//----------------------------------------------------------------- -// lang::XServiceInfo -//----------------------------------------------------------------- -/* -APPHELPER_XSERVICEINFO_IMPL(PieChart,CHART2_VIEW_PIECHART_SERVICE_IMPLEMENTATION_NAME) - - uno::Sequence< rtl::OUString > PieChart -::getSupportedServiceNames_Static() -{ - uno::Sequence< rtl::OUString > aSNS( 1 ); - aSNS.getArray()[ 0 ] = CHART2_VIEW_PIECHART_SERVICE_NAME; - return aSNS; -} -*/ - uno::Reference< drawing::XShape > PieChart::createDataPoint( const uno::Reference< drawing::XShapes >& xTarget , const uno::Reference< beans::XPropertySet >& xObjectProperties diff --git a/chart2/source/view/main/VDataSeries.cxx b/chart2/source/view/main/VDataSeries.cxx index 8bb6a11b4baf..c43302981a8f 100644 --- a/chart2/source/view/main/VDataSeries.cxx +++ b/chart2/source/view/main/VDataSeries.cxx @@ -40,7 +40,6 @@ #include <com/sun/star/chart/MissingValueTreatment.hpp> #include <com/sun/star/chart2/Symbol.hpp> -//#include "CommonConverters.hxx" #include <rtl/math.hxx> #include <tools/debug.hxx> #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/sc/inc/AccessibleFilterTopWindow.hxx b/sc/inc/AccessibleFilterTopWindow.hxx index 55fcb503f51b..0a8c0dfbe005 100644 --- a/sc/inc/AccessibleFilterTopWindow.hxx +++ b/sc/inc/AccessibleFilterTopWindow.hxx @@ -28,7 +28,6 @@ #ifndef SC_ACCESSIBLEFILTERTOPWINDOW_HXX #define SC_ACCESSIBLEFILTERTOPWINDOW_HXX -//#include "AccessibleContextBase.hxx" #include "AccessibleFilterMenu.hxx" #include "cppuhelper/implbase1.hxx" diff --git a/sc/inc/styleuno.hxx b/sc/inc/styleuno.hxx index a1dee10fd75d..3a363ee0d1c5 100644 --- a/sc/inc/styleuno.hxx +++ b/sc/inc/styleuno.hxx @@ -42,7 +42,6 @@ #include <com/sun/star/beans/XPropertyState.hpp> #include <com/sun/star/beans/XMultiPropertyStates.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> -//#include <cppuhelper/implbase3.hxx> #include <cppuhelper/implbase4.hxx> #include <cppuhelper/implbase7.hxx> @@ -131,7 +130,7 @@ class ScStyleFamilyObj : public ::cppu::WeakImplHelper4< { private: ScDocShell* pDocShell; - SfxStyleFamily eFamily; // Familie + SfxStyleFamily eFamily; // Family ScStyleObj* GetObjectByIndex_Impl(UINT32 nIndex); ScStyleObj* GetObjectByName_Impl(const rtl::OUString& Name); @@ -223,7 +222,7 @@ class ScStyleObj : public ::cppu::WeakImplHelper7< private: const SfxItemPropertySet* pPropSet; ScDocShell* pDocShell; - SfxStyleFamily eFamily; // Familie + SfxStyleFamily eFamily; // Family String aStyleName; SfxStyleSheetBase* GetStyle_Impl(); @@ -239,7 +238,7 @@ public: ScStyleObj(ScDocShell* pDocSh, SfxStyleFamily eFam, const String& rName); virtual ~ScStyleObj(); - // per getImplementation gerufen: + // created by getImplementation: sal_Bool IsInserted() const { return pDocShell != NULL; } SfxStyleFamily GetFamily() const { return eFamily; } void InitDoc( ScDocShell* pNewDocSh, const String& rNewName ); diff --git a/sc/source/core/inc/core_pch.hxx b/sc/source/core/inc/core_pch.hxx index 899169154d8d..5449cf5093ed 100644 --- a/sc/source/core/inc/core_pch.hxx +++ b/sc/source/core/inc/core_pch.hxx @@ -25,7 +25,7 @@ * ************************************************************************/ -// ItemID-Defines etc. muessen immer ganz vorne stehen +// ItemID-Defines etc. must be included first #include "scitems.hxx" @@ -34,8 +34,8 @@ #define SC_PROGRESS_CXX -// ab hier automatisch per makepch generiert -// folgende duerfen nicht aufgenommen werden: +// Automatically generated by makepch +// The following is not to be included: // setjmp.h #include <tools/solar.h> diff --git a/sc/source/core/tool/charthelper.cxx b/sc/source/core/tool/charthelper.cxx index 1b2cde3d4a6d..4c314ee37ff4 100644 --- a/sc/source/core/tool/charthelper.cxx +++ b/sc/source/core/tool/charthelper.cxx @@ -34,7 +34,6 @@ #include "rangelst.hxx" #include "chartlis.hxx" -//#include <vcl/svapp.hxx> #include <svx/svditer.hxx> #include <svx/svdoole2.hxx> #include <svx/svdpage.hxx> @@ -208,7 +207,6 @@ void ScChartHelper::GetChartRanges( const uno::Reference< chart2::XChartDocument uno::Reference< chart2::data::XDataSource > xDataSource( xChartDoc, uno::UNO_QUERY ); if( !xDataSource.is() ) return; - //uno::Reference< chart2::data::XDataProvider > xProvider = xChartDoc->getDataProvider(); uno::Sequence< uno::Reference< chart2::data::XLabeledDataSequence > > aLabeledDataSequences( xDataSource->getDataSequences() ); rRanges.realloc(2*aLabeledDataSequences.getLength()); diff --git a/sc/source/filter/lotus/op.cxx b/sc/source/filter/lotus/op.cxx index bdfe84104c93..ad29869e2abb 100644 --- a/sc/source/filter/lotus/op.cxx +++ b/sc/source/filter/lotus/op.cxx @@ -57,7 +57,6 @@ #include "op.h" #include "optab.h" #include "tool.h" -//#include "math.h" #include "decl.h" #include "lotform.hxx" #include "lotrange.hxx" diff --git a/sc/source/filter/xml/xmldpimp.cxx b/sc/source/filter/xml/xmldpimp.cxx index 491941b36152..855fbcfefdf1 100644 --- a/sc/source/filter/xml/xmldpimp.cxx +++ b/sc/source/filter/xml/xmldpimp.cxx @@ -59,8 +59,6 @@ #include <com/sun/star/sheet/DataPilotFieldLayoutMode.hpp> #include <com/sun/star/sheet/DataPilotFieldGroupBy.hpp> -//#include <com/sun/star/sheet/DataPilotFieldOrientation.hpp> - using namespace com::sun::star; using namespace xmloff::token; using ::com::sun::star::uno::Reference; diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx index 84979e3dbcdf..9510c91e3290 100644 --- a/sc/source/ui/docshell/docsh5.cxx +++ b/sc/source/ui/docshell/docsh5.cxx @@ -51,7 +51,6 @@ #include "undodat.hxx" #include "undotab.hxx" #include "undoblk.hxx" -//#include "pivot.hxx" #include "dpobject.hxx" #include "dpshttab.hxx" #include "dbdocfun.hxx" @@ -74,7 +73,7 @@ void VBA_InsertModule( ScDocument& rDoc, SCTAB nTab, String& sModuleName, String // --------------------------------------------------------------------------- // -// ehemalige viewfunc/dbfunc Methoden +// former viewfunc/dbfunc methods // void ScDocShell::ErrorMessage( USHORT nGlobStrId ) @@ -351,9 +350,6 @@ ScDBData* ScDocShell::GetDBData( const ScRange& rMarked, ScGetDBMode eMode, ScGe pData = pNoNameData; } -// if (bMark) -// MarkRange( ScRange( nStartCol, nStartRow, nTab, nEndCol, nEndRow, nTab ), FALSE ); - return pData; } diff --git a/sc/source/ui/docshell/docsh6.cxx b/sc/source/ui/docshell/docsh6.cxx index fbb6dc8ead35..93ac54726781 100644 --- a/sc/source/ui/docshell/docsh6.cxx +++ b/sc/source/ui/docshell/docsh6.cxx @@ -42,8 +42,6 @@ // INCLUDE --------------------------------------------------------------- -//#include <svxlink.hxx> - #include "docsh.hxx" #include "stlsheet.hxx" @@ -153,8 +151,6 @@ void ScDocShell::SetVisAreaOrSize( const Rectangle& rVisArea, BOOL bModifyStart if (pViewSh->GetViewData()->GetDocShell() == this) pViewSh->UpdateOleZoom(); } - //else - // DataChanged( SvDataType() ); // fuer Zuppeln wenn nicht IP-aktiv } if (aDocument.IsEmbedded()) @@ -220,9 +216,6 @@ void ScDocShell::UpdateOle( const ScViewData* pViewData, BOOL bSnapSize ) SetVisAreaOrSize( aNewArea, TRUE ); // hier muss auch der Start angepasst werden bChange = TRUE; } - -// if (bChange) -// DataChanged( SvDataType() ); //! passiert auch bei SetModified } // @@ -445,11 +438,9 @@ BOOL ScDocShell::ReloadTabLinks() if (pBase->ISA(ScTableLink)) { ScTableLink* pTabLink = (ScTableLink*)pBase; -// pTabLink->SetAddUndo(FALSE); //! Undo's zusammenfassen pTabLink->SetPaint(FALSE); // Paint nur einmal am Ende pTabLink->Update(); pTabLink->SetPaint(TRUE); -// pTabLink->SetAddUndo(TRUE); bAny = TRUE; } } diff --git a/sc/source/ui/inc/msgpool.hxx b/sc/source/ui/inc/msgpool.hxx index 7bc33b3af96b..948da8c9d735 100644 --- a/sc/source/ui/inc/msgpool.hxx +++ b/sc/source/ui/inc/msgpool.hxx @@ -36,7 +36,6 @@ #include <svl/stritem.hxx> #include <svl/eitem.hxx> -//#include <dbitems.hxx> #include "uiitems.hxx" diff --git a/sc/source/ui/unoobj/targuno.cxx b/sc/source/ui/unoobj/targuno.cxx index aa4cdf58882d..e4a0768002a6 100644 --- a/sc/source/ui/unoobj/targuno.cxx +++ b/sc/source/ui/unoobj/targuno.cxx @@ -32,7 +32,6 @@ #include <vcl/image.hxx> #include <vcl/virdev.hxx> -//#include <toolkit/unoiface.hxx> #include <toolkit/unohlp.hxx> #include <svl/itemprop.hxx> #include <svl/smplhint.hxx> @@ -120,7 +119,6 @@ uno::Any SAL_CALL ScLinkTargetTypesObj::getByName(const rtl::OUString& aName) } throw container::NoSuchElementException(); -// return uno::Any(); } uno::Sequence<rtl::OUString> SAL_CALL ScLinkTargetTypesObj::getElementNames(void) throw( uno::RuntimeException ) diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index 455af075306c..0724541278fa 100755 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -86,7 +86,6 @@ #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> #include <com/sun/star/awt/XDevice.hpp> -//#include <com/sun/star/sheet/CellDeleteMode.hpp> #include <com/sun/star/sheet/XCellRangeMovement.hpp> #include <com/sun/star/sheet/XSubTotalCalculatable.hpp> #include <com/sun/star/sheet/XSubTotalDescriptor.hpp> @@ -1110,7 +1109,6 @@ getCellRangesForAddress( USHORT& rResFlags, const rtl::OUString& sAddress, ScDoc pDoc = pDocSh->GetDocument(); String aString(sAddress); USHORT nMask = SCA_VALID; - //USHORT nParse = rCellRanges.Parse( sAddress, pDoc, nMask, formula::FormulaGrammar::CONV_XL_A1 ); rResFlags = rCellRanges.Parse( sAddress, pDoc, nMask, eConv, 0 ); if ( rResFlags & SCA_VALID ) { diff --git a/sc/source/ui/vba/vbarange.hxx b/sc/source/ui/vba/vbarange.hxx index e7488e434f30..84a65e7e2af5 100644 --- a/sc/source/ui/vba/vbarange.hxx +++ b/sc/source/ui/vba/vbarange.hxx @@ -50,7 +50,6 @@ #include <com/sun/star/sheet/XSpreadsheet.hpp> #include <com/sun/star/sheet/XSheetCellRangeContainer.hpp> -//#include <vbahelper/vbahelperinterface.hxx> #include "vbaformat.hxx" #include <formula/grammar.hxx> @@ -62,7 +61,6 @@ class ScDocShell; class ScDocument; class ScRangeList; -//typedef InheritedHelperInterfaceImpl1< ov::excel::XRange > ScVbaRange_BASE; typedef ScVbaFormat< ov::excel::XRange > ScVbaRange_BASE; class ArrayVisitor diff --git a/sc/source/ui/vba/vbawindows.cxx b/sc/source/ui/vba/vbawindows.cxx index 3ddc5f5b3b45..e21ca2c53090 100644 --- a/sc/source/ui/vba/vbawindows.cxx +++ b/sc/source/ui/vba/vbawindows.cxx @@ -35,7 +35,6 @@ #include <tools/urlobj.hxx> #include "vbawindow.hxx" #include "vbaglobals.hxx" -//#include "vbaworkbook.hxx" using namespace ::com::sun::star; using namespace ::ooo::vba; diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx index c8cd6325682d..c596e7e62c79 100644 --- a/sc/source/ui/view/gridwin4.cxx +++ b/sc/source/ui/view/gridwin4.cxx @@ -78,8 +78,6 @@ // #i74769# #include <svx/sdrpaintwindow.hxx> -//#include "tabvwsh.hxx" //! Test !!!! - //------------------------------------------------------------------------ void lcl_LimitRect( Rectangle& rRect, const Rectangle& rVisible ) @@ -642,10 +640,6 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod aDrawingRectLogic = PixelToLogic(aDrawingRectPixel, aDrawMode); } -// not necessary with overlay -// if (bCurVis) -// HideCursor(); - OutputDevice* pContentDev = this; // device for document content, used by overlay manager SdrPaintWindow* pTargetPaintWindow = 0; // #i74769# work with SdrPaintWindow directly @@ -820,16 +814,6 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod { pContentDev->SetClipRegion(); } - - //BOOL bDraw = TRUE; - //if (eMode == SC_UPDATE_CHANGED) - // bDraw = NeedDrawMarks() && aOutputData.SetChangedClip(); - //if (bDraw) - //{ - // DrawMarks(); - // if (eMode == SC_UPDATE_CHANGED) - // pContentDev->SetClipRegion(); - //} } pContentDev->SetMapMode(MAP_PIXEL); @@ -965,8 +949,6 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod if ( pNoteMarker ) pNoteMarker->Draw(); // ueber den Cursor, im Drawing-MapMode - //DrawStartTimer(); // fuer bunte Handles ohne System-Clipping - // // Wenn waehrend des Paint etwas invertiert wurde (Selektion geaendert aus Basic-Macro), // ist das jetzt durcheinandergekommen und es muss neu gemalt werden @@ -1650,9 +1632,6 @@ void ScGridWindow::InvertSimple( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, void ScGridWindow::GetSelectionRects( ::std::vector< Rectangle >& rPixelRects ) { - // transformed from ScGridWindow::InvertSimple - -// ScMarkData& rMark = pViewData->GetMarkData(); ScMarkData aMultiMark( pViewData->GetMarkData() ); aMultiMark.SetMarking( FALSE ); aMultiMark.MarkToMulti(); @@ -1704,8 +1683,6 @@ void ScGridWindow::GetSelectionRects( ::std::vector< Rectangle >& rPixelRects ) if (nX2 > nXRight) nX2 = nXRight; if (nY2 > nYBottom) nY2 = nYBottom; -// MapMode aOld = GetMapMode(); SetMapMode(MAP_PIXEL); // erst nach den return's !!! - double nPPTX = pViewData->GetPPTX(); double nPPTY = pViewData->GetPPTY(); diff --git a/sc/source/ui/view/select.cxx b/sc/source/ui/view/select.cxx index 96b06ec7dfef..72ee0fdaadfa 100644 --- a/sc/source/ui/view/select.cxx +++ b/sc/source/ui/view/select.cxx @@ -41,7 +41,6 @@ #include "tabvwsh.hxx" #include "scmod.hxx" #include "document.hxx" -//#include "dataobj.hxx" #include "transobj.hxx" #include "docsh.hxx" #include "tabprotection.hxx" @@ -106,15 +105,14 @@ void __EXPORT ScViewFunctionSet::BeginDrag() BOOL bRefMode = pScMod->IsFormulaMode(); if (!bRefMode) { - pViewData->GetView()->FakeButtonUp( GetWhich() ); // ButtonUp wird verschluckt + pViewData->GetView()->FakeButtonUp( GetWhich() ); // ButtonUp is swallowed ScMarkData& rMark = pViewData->GetMarkData(); -// rMark.SetMarking(FALSE); // es fehlt ein ButtonUp rMark.MarkToSimple(); if ( rMark.IsMarked() && !rMark.IsMultiMarked() ) { ScDocument* pClipDoc = new ScDocument( SCDOCMODE_CLIP ); - // bApi = TRUE -> no error mesages + // bApi = TRUE -> no error messages BOOL bCopied = pViewData->GetView()->CopyToClip( pClipDoc, FALSE, TRUE ); if ( bCopied ) { @@ -159,7 +157,7 @@ void __EXPORT ScViewFunctionSet::BeginDrag() Sound::Beep(); // can't drag } -// Selektion +// Selection void __EXPORT ScViewFunctionSet::CreateAnchor() { |