From cfda6c9a00fb0edb965716ba44d45edfe191ca2e Mon Sep 17 00:00:00 2001 From: Thomas Arnhold Date: Sat, 18 Aug 2012 14:06:31 +0200 Subject: remove some useless comments Change-Id: Ied223890539a3407abbed7c7135dfc3de2f2fe48 Reviewed-on: https://gerrit.libreoffice.org/429 Reviewed-by: Philipp Riemer Tested-by: Philipp Riemer --- rsc/source/parser/rscibas.cxx | 1 - sc/source/ui/undo/undodat.cxx | 7 +++---- sc/source/ui/vba/vbaworkbook.hxx | 1 - svtools/inc/svtools/ruler.hxx | 1 - svtools/source/control/ruler.cxx | 4 +--- sw/source/ui/misc/pggrid.cxx | 7 ++----- 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 #include @@ -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 -// Amelia : adds two units , 'ch' and 'line' StringArray SV_FUNIT_STRINGS { ItemList [ en-US ] = -- cgit ion value='distro/lhm/libreoffice-7-4+backports'>distro/lhm/libreoffice-7-4+backports LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
(clang-cl)
AgeCommit message (Expand)Author
2018-07-08Fix typoAndrea Gelmini
2018-04-16Use https instead of httpGulsah Kose
2018-01-26Fix typosAndrea Gelmini
2017-08-25i#32546# - Java UnoRuntime.getUniqueKey/generateOid do not work reliablyDamjan Jovanovic
2017-08-17remove UL/L suffixes from integer constants in initialiser/call expressionsNoel Grandin
2017-02-03TyposJulien Nabet
Stephan Bergmann
2019-09-26Remove some unused includesMiklos Vajna
2019-09-26loplugin:constmethod in embeddedobj..extensionsNoel Grandin
2019-09-10Fix typosAndrea Gelmini
2019-08-29LOK: Proper use of isMobile() on embedded chartsMuhammet Kara
2019-08-29LOK: per-view support for isMobile()Muhammet Kara
2019-08-29lok: Disable chart editing on mobileTamás Zolnai
2019-08-17tdf#88205 Adapt uses of css::uno::Sequence to use initializer_list ctorJulien Nabet
2019-08-17tdf#88205 Adapt uses of css::uno::Sequence to use initializer_list ctorJulien Nabet
2019-08-16tdf#126877 crash on inserting floating frameNoel Grandin
2019-08-15embeddedobj: allow controlling if PDF documents are converted to Draw or notMiklos Vajna
2019-08-15embeddedobj: allow controlling if Visio documents are converted to Draw or notMiklos Vajna
2019-08-14embeddedobj: add initial CppunitTest_embeddedobj_generalMiklos Vajna
2019-08-14embeddedobj: respect config for Insert -> Object -> OLE Object -> from fileMiklos Vajna
2019-07-31Improved loplugin:stringconstant (now that GCC 7 supports it): embeddedobjStephan Bergmann
2019-07-19loplugin:referencecasting in embeddedobjNoel Grandin
2019-06-15loplugin:logexceptionnicely in editeng..extensionsNoel Grandin
2019-05-31Use hasElements to check Sequence emptiness in [e-i]*Arkadiy Illarionov
2019-05-23Fix typoAndrea Gelmini
2019-05-23Fix typoAndrea Gelmini
2019-05-22Fix typoAndrea Gelmini
2019-05-22Fix typoAndrea Gelmini
2019-05-22Fix typoAndrea Gelmini
2019-05-22Fix typoAndrea Gelmini
2019-05-22Fix typoAndrea Gelmini
2019-05-13fix wrong SET/QUERY flags passed to uno::ReferenceNoel Grandin
2019-04-13loplugin:sequentialassign in embeddedobj..l10ntoolsNoel Grandin
2019-04-10clang-tidy: Fix suspicious catches of WIP unhandled-self-assignment checkTamás Zolnai
2019-04-08Use osl_atomic_increment/osl_atomic_decrement to change m_refCountMike Kaganski
2019-04-07Don't use resettable/clearable guard where plain guard is enoughMike Kaganski
2019-04-01Fix typoAndrea Gelmini
2019-03-31tdf#120703 PVS: GetBitmapBits does not return required buffer sizeMike Kaganski
2019-03-27loplugin:typedefparam (clang-cl)Stephan Bergmann
2019-03-17tdf#120703 PVS: remove redundant static castsMike Kaganski
2019-02-08loplugin:indentation in editeng..extensionsNoel Grandin