diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2012-08-18 14:06:31 +0200 |
---|---|---|
committer | Philipp Riemer <ruderphilipp@gmail.com> | 2012-08-18 16:49:22 +0000 |
commit | cfda6c9a00fb0edb965716ba44d45edfe191ca2e (patch) | |
tree | 9d0ea244d49357196530ce56dedf887fa0c3e433 | |
parent | 920dcaec05984f8dbe0c413460a5d24a64cba149 (diff) |
remove some useless comments
Change-Id: Ied223890539a3407abbed7c7135dfc3de2f2fe48
Reviewed-on: https://gerrit.libreoffice.org/429
Reviewed-by: Philipp Riemer <ruderphilipp@gmail.com>
Tested-by: Philipp Riemer <ruderphilipp@gmail.com>
-rw-r--r-- | rsc/source/parser/rscibas.cxx | 1 | ||||
-rw-r--r-- | sc/source/ui/undo/undodat.cxx | 7 | ||||
-rw-r--r-- | sc/source/ui/vba/vbaworkbook.hxx | 1 | ||||
-rw-r--r-- | svtools/inc/svtools/ruler.hxx | 1 | ||||
-rw-r--r-- | svtools/source/control/ruler.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/misc/pggrid.cxx | 7 | ||||
-rw-r--r-- | vcl/source/src/units.src | 1 |
7 files changed, 6 insertions, 16 deletions
diff --git a/rsc/source/parser/rscibas.cxx b/rsc/source/parser/rscibas.cxx index 3b37e32bfedf..0f54ff7fc03e 100644 --- a/rsc/source/parser/rscibas.cxx +++ b/rsc/source/parser/rscibas.cxx @@ -219,7 +219,6 @@ RscEnum * RscTypCont::InitFieldUnitsType() SETCONST( pFieldUnits, "FUNIT_FOOT", FUNIT_FOOT ); SETCONST( pFieldUnits, "FUNIT_MILE", FUNIT_MILE ); SETCONST( pFieldUnits, "FUNIT_CUSTOM", FUNIT_CUSTOM ); - // Amelia : adds two units ,"char" and "line" SETCONST( pFieldUnits, "FUNIT_CHAR", FUNIT_CHAR ); SETCONST( pFieldUnits, "FUNIT_LINE", FUNIT_LINE ); SETCONST( pFieldUnits, "FUNIT_PERCENT", FUNIT_PERCENT ); diff --git a/sc/source/ui/undo/undodat.cxx b/sc/source/ui/undo/undodat.cxx index bff8b2f6d7ab..24116db895a6 100644 --- a/sc/source/ui/undo/undodat.cxx +++ b/sc/source/ui/undo/undodat.cxx @@ -49,8 +49,8 @@ #include "attrib.hxx" #include "hints.hxx" #include "sc.hrc" -#include "chgtrack.hxx" // Amelia Wang -#include "refundo.hxx" // Amelia Wang +#include "chgtrack.hxx" +#include "refundo.hxx" #include "markdata.hxx" // ----------------------------------------------------------------------- @@ -71,7 +71,7 @@ TYPEINIT1(ScUndoRepeatDB, ScSimpleUndo); TYPEINIT1(ScUndoDataPilot, ScSimpleUndo); TYPEINIT1(ScUndoConsolidate, ScSimpleUndo); TYPEINIT1(ScUndoChartData, ScSimpleUndo); -TYPEINIT1(ScUndoDataForm, SfxUndoAction); // amelia +TYPEINIT1(ScUndoDataForm, SfxUndoAction); // ----------------------------------------------------------------------- @@ -2015,7 +2015,6 @@ sal_Bool ScUndoChartData::CanRepeat(SfxRepeatTarget& /* rTarget */) const return false; } -// Amelia Wang ScUndoDataForm::ScUndoDataForm( ScDocShell* pNewDocShell, SCCOL nStartX, SCROW nStartY, SCTAB nStartZ, SCCOL nEndX, SCROW nEndY, SCTAB nEndZ, diff --git a/sc/source/ui/vba/vbaworkbook.hxx b/sc/source/ui/vba/vbaworkbook.hxx index 90d3629c7a48..0164eb75a900 100644 --- a/sc/source/ui/vba/vbaworkbook.hxx +++ b/sc/source/ui/vba/vbaworkbook.hxx @@ -65,7 +65,6 @@ public: virtual css::uno::Any SAL_CALL Windows( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); virtual void SAL_CALL Activate() throw (css::uno::RuntimeException); virtual void SAL_CALL Protect( const css::uno::Any & aPassword ) throw (css::uno::RuntimeException); - // Amelia Wang virtual css::uno::Any SAL_CALL Names( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL Styles( const css::uno::Any& Item ) throw (css::uno::RuntimeException); diff --git a/svtools/inc/svtools/ruler.hxx b/svtools/inc/svtools/ruler.hxx index 8597e216f2ee..ad94f3e82c52 100644 --- a/svtools/inc/svtools/ruler.hxx +++ b/svtools/inc/svtools/ruler.hxx @@ -630,7 +630,6 @@ private: sal_uInt16 mnExtraStyle; sal_uInt16 mnExtraClicks; sal_uInt16 mnExtraModifier; -// Amelia long mnCharWidth; long mnLineHeight; diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx index 7e17e6dcb7ee..a69a9a7a3966 100644 --- a/svtools/source/control/ruler.cxx +++ b/svtools/source/control/ruler.cxx @@ -462,7 +462,6 @@ void Ruler::ImplDrawTicks( long nMin, long nMax, long nStart, long nCenter ) long nTickWidth; sal_Bool bNoTicks = sal_False; - //Amelia long nTickUnit = 0; long nTick2 = 0; if ( mnUnitIndex == RULER_UNIT_CHAR ) @@ -502,7 +501,7 @@ void Ruler::ImplDrawTicks( long nMin, long nMax, long nStart, long nCenter ) long nMaxWidth = maVirDev.PixelToLogic( Size( mpData->nPageWidth, 0 ), maMapMode ).Width(); if ( nMaxWidth < 0 ) nMaxWidth = -nMaxWidth; - // Amelia + if (( mnUnitIndex == RULER_UNIT_CHAR ) || ( mnUnitIndex == RULER_UNIT_LINE )) nMaxWidth /= nTickUnit; else @@ -590,7 +589,6 @@ void Ruler::ImplDrawTicks( long nMin, long nMax, long nStart, long nCenter ) // Tick/Tick2 - Output (Strokes) else { - /// Amelia if ( ( mnUnitIndex != RULER_UNIT_CHAR ) && ( mnUnitIndex != RULER_UNIT_LINE ) ) nTick2 = aImplRulerUnitTab[mnUnitIndex].nTick2; if ( !(nTick % nTick2 ) ) diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx index 5be1e5732d6d..c3387fedf609 100644 --- a/sw/source/ui/misc/pggrid.cxx +++ b/sw/source/ui/misc/pggrid.cxx @@ -26,13 +26,10 @@ * ************************************************************************/ - #ifdef SW_DLLIMPLEMENTATION #undef SW_DLLIMPLEMENTATION #endif - - #include <sfx2/app.hxx> #include <cmdid.h> @@ -301,8 +298,8 @@ void SwTextGridPage::PutGridItem(SfxItemSet& rSet) aGridItem.SetPrintGrid(aPrintCB.IsChecked()); aGridItem.SetColor(aColorLB.GetSelectEntryColor()); rSet.Put(aGridItem); -/// Amelia - SwView * pView = ::GetActiveView(); + + SwView * pView = ::GetActiveView(); if ( aGridItem.GetGridType() != GRID_NONE ) { if ( aGridItem.GetGridType() == GRID_LINES_CHARS ) diff --git a/vcl/source/src/units.src b/vcl/source/src/units.src index 342c1085030e..fa39df597c7a 100644 --- a/vcl/source/src/units.src +++ b/vcl/source/src/units.src @@ -27,7 +27,6 @@ #include <svids.hrc> -// Amelia : adds two units , 'ch' and 'line' StringArray SV_FUNIT_STRINGS { ItemList [ en-US ] = |