summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/svx/svdorect.hxx4
-rw-r--r--include/svx/svdpntv.hxx5
-rw-r--r--include/toolkit/controls/unocontrolmodel.hxx2
-rw-r--r--sc/sdi/tabvwsh.sdi1
-rw-r--r--sc/source/ui/formdlg/dwfunctr.cxx32
-rw-r--r--sw/source/core/txtnode/ndtxt.cxx8
-rw-r--r--sw/source/filter/html/svxcss1.hxx15
7 files changed, 17 insertions, 50 deletions
diff --git a/include/svx/svdorect.hxx b/include/svx/svdorect.hxx
index ef88cd275d54..df1551b42922 100644
--- a/include/svx/svdorect.hxx
+++ b/include/svx/svdorect.hxx
@@ -57,8 +57,8 @@ protected:
XPolygon ImpCalcXPoly(const Rectangle& rRect1, long nRad1) const;
void SetXPolyDirty();
- // RecalcXPoly sollte ueberladen werden. Dabei muss dann eine XPolygon
- // Instanz generiert (new) und an mpXPoly zugewiesen werden.
+ /// Subclasses should override RecalcXPoly() by creating an XPolygon
+ /// instance with new and assigning it to mpXPoly.
virtual void RecalcXPoly();
const XPolygon& GetXPoly() const;
virtual void RestGeoData(const SdrObjGeoData& rGeo) SAL_OVERRIDE;
diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx
index a1bede091294..25d8e087ebc8 100644
--- a/include/svx/svdpntv.hxx
+++ b/include/svx/svdpntv.hxx
@@ -436,9 +436,8 @@ public:
void InvalidateAllWin();
void InvalidateAllWin(const Rectangle& rRect, bool bPlus1Pix=false);
- // Wenn die View kein Invalidate() an den Fenstern durchfuehren soll, muss
- // man diese beiden folgenden Methoden ueberladen und entsprechend anders
- // reagieren.
+ /// If the View should not call Invalidate() on the windows, override
+ /// the following 2 methods and do something else.
virtual void InvalidateOneWin(vcl::Window& rWin);
virtual void InvalidateOneWin(vcl::Window& rWin, const Rectangle& rRect);
diff --git a/include/toolkit/controls/unocontrolmodel.hxx b/include/toolkit/controls/unocontrolmodel.hxx
index 6fe15a97d7d4..eeb02c6b3756 100644
--- a/include/toolkit/controls/unocontrolmodel.hxx
+++ b/include/toolkit/controls/unocontrolmodel.hxx
@@ -164,7 +164,7 @@ public:
using cppu::OPropertySetHelper::getFastPropertyValue;
void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const SAL_OVERRIDE;
- // setValue-Methoden ueberladen, um die Einzelproperties des FontDescriptors abzufangen
+ // override setValue methods to handle properties of FontDescriptor
// ::com::sun::star::beans::XPropertySet
void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// ::com::sun::star::beans::XFastPropertySet
diff --git a/sc/sdi/tabvwsh.sdi b/sc/sdi/tabvwsh.sdi
index 8f67a4d4c8a2..89439b89c8ad 100644
--- a/sc/sdi/tabvwsh.sdi
+++ b/sc/sdi/tabvwsh.sdi
@@ -163,7 +163,6 @@ interface TableEditView
SID_ATTR_ZOOM [ ExecMethod = Execute; StateMethod = GetState; ]
SID_ATTR_ZOOMSLIDER [ ExecMethod = Execute; StateMethod = GetState; ]
FID_INSERT_FILE [ ExecMethod = Execute; StateMethod = GetState; ]
- // Save / SaveAs ueberladen, um die Eingabe abzuschliessen
FID_SCALE [ ExecMethod = Execute; StateMethod = GetState; ]
FID_FUNCTION_BOX [ ExecMethod = Execute; StateMethod = GetState; ]
diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx
index d1caf276c112..69cdd848ade8 100644
--- a/sc/source/ui/formdlg/dwfunctr.cxx
+++ b/sc/source/ui/formdlg/dwfunctr.cxx
@@ -588,21 +588,7 @@ void ScFunctionDockWin::SetDescription()
}
}
-/*************************************************************************
-#* Member: Resizing
-#*------------------------------------------------------------------------
-#*
-#* Klasse: ScFunctionDockWin
-#*
-#* Funktion: Ueberladene Funktion um die Groesse der
-#* einzelnen Controls einzustellen.
-#*
-#* Input: neue Groesse
-#*
-#* Output: ---
-#*
-#************************************************************************/
-
+/// override to set new size of the controls
void ScFunctionDockWin::Resizing( Size& rNewSize )
{
if((sal_uLong)rNewSize.Width()<nMinWidth) rNewSize.Width()=nMinWidth;
@@ -717,21 +703,7 @@ void ScFunctionDockWin::Notify( SfxBroadcaster&, const SfxHint& /* rHint */ )
{
}
-/*************************************************************************
-#* Member: Resize
-#*------------------------------------------------------------------------
-#*
-#* Klasse: ScFunctionDockWin
-#*
-#* Funktion: Ueberladene Funktion um die Groesse der
-#* einzelnen Controls einzustellen.
-#*
-#* Input: neue Groesse
-#*
-#* Output: ---
-#*
-#************************************************************************/
-
+/// override to set new size of the controls
void ScFunctionDockWin::Resize()
{
if ( !IsFloatingMode() ||
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index dfc0536a3890..7d56f646d7da 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -3669,11 +3669,9 @@ void SwTxtNode::Modify( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewVal
bool bWasNotifiable = m_bNotifiable;
m_bNotifiable = false;
- // Bug 24616/24617:
- // Modify ueberladen, damit beim Loeschen von Vorlagen diese
- // wieder richtig verwaltet werden (Outline-Numerierung!!)
- // Bug25481:
- // bei Nodes im Undo nie _ChgTxtCollUpdateNum rufen.
+ // Override Modify so that deleting styles works properly (outline
+ // numbering!).
+ // Never call _ChgTxtCollUpdateNum for Nodes in Undo.
if( pOldValue && pNewValue && RES_FMT_CHG == pOldValue->Which() &&
GetRegisteredIn() == static_cast<const SwFmtChg*>(pNewValue)->pChangedFmt &&
GetNodes().IsDocNodes() )
diff --git a/sw/source/filter/html/svxcss1.hxx b/sw/source/filter/html/svxcss1.hxx
index 39b7f8e8e74b..d9ee9169af2d 100644
--- a/sw/source/filter/html/svxcss1.hxx
+++ b/sw/source/filter/html/svxcss1.hxx
@@ -246,16 +246,15 @@ protected:
SfxItemSet& rItemSet,
SvxCSS1PropertyInfo& rPropInfo );
- // Diese Methode wird aufgerufen, wenn ein Selektor geparst wurde
- // Wenn bFirst gesetzt ist, wird der Inhalt von aItemSet in alle
- // zuletzt angelegten Styles kopiert.
- // Diese Methode sollte in abgleiteten Parsern nicht mehr
- // ueberladen werden!
+ /// Will be called when a Selector is parsed. If bFirst is true,
+ /// the content of the aItemSet will be copied into all recently
+ /// created Styles.
+ /// Derived classes should not override this method!
virtual bool SelectorParsed( CSS1Selector *pSelector, bool bFirst ) SAL_OVERRIDE;
- // Diese Methode wird fuer jede geparste Property aufgerufen
- // sie fuegt das Item in den ItemSet 'pItemSet' ein
- // Sie sollte in abgeleiteten Parsern nicht mehr ueberladen werden!
+ /// Will be called for every parsed Property. Adds the item to the
+ /// pItemSet.
+ /// Derived classes should not override this method!
virtual bool DeclarationParsed( const OUString& rProperty,
const CSS1Expression *pExpr ) SAL_OVERRIDE;
generated by cgit (git 2.34.1) at 2025-01-23 05:02:36 +0000