drawinglayer/source/primitive2d/metafileprimitive2d.cxx | 4 ++--
forms/source/runtime/formoperations.cxx | 2 +-
svx/source/dialog/imapdlg.cxx | 2 +-
svx/source/inc/fmcontrolbordermanager.hxx | 4 ++--
svx/source/inc/formcontroller.hxx | 2 +-
sw/source/ui/app/swmodul1.cxx | 2 +-
vcl/inc/osx/saldata.hxx | 2 +-
7 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit 45befb368528a0c273b695e37d53a56ab90503e5
Author: Michael Stahl <mst...@redhat.com>
Date: Thu Jan 30 14:01:15 2014 +0100
"stati" considered both pretentious and incorrect Latin
As one knows, the Latin plural of the noun status is statūs.
Change-Id: I6b19c57aa2aedcc1337736becc93d8802fe03f2e
diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
index 00d0059..ea0a64e 100644
--- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
@@ -64,8 +64,8 @@ namespace
{
/** helper class for graphic context
- This class allows to hold a complete status of classic
- VCL OutputDevice stati. This data is needed for correct
+ This class allows to hold a complete representation of classic
+ VCL OutputDevice state. This data is needed for correct
interpretation of the MetaFile action flow.
*/
class PropertyHolder
diff --git a/forms/source/runtime/formoperations.cxx
b/forms/source/runtime/formoperations.cxx
index aee7e6a..5cdeddf4 100644
--- a/forms/source/runtime/formoperations.cxx
+++ b/forms/source/runtime/formoperations.cxx
@@ -707,7 +707,7 @@ namespace frm
if ( bCanInsert )
m_xUpdateCursor->moveToInsertRow();
else
- // move record to update stati
+ // move record to update status
m_xCursor->first();
}
}
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index 11d0cba..c873f6a 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -763,7 +763,7 @@ IMPL_LINK( SvxIMapDlg, StateHdl, IMapWindow*, pWnd )
aTbxIMapDlg1.EnableItem( TBI_POLY, bDrawEnabled );
aTbxIMapDlg1.EnableItem( TBI_FREEPOLY, bDrawEnabled );
- // BezierEditor-Stati
+ // BezierEditor State
aTbxIMapDlg1.EnableItem( TBI_POLYEDIT, bPolyEdit );
aTbxIMapDlg1.EnableItem( TBI_POLYMOVE, !bDrawEnabled );
aTbxIMapDlg1.EnableItem( TBI_POLYINSERT, !bDrawEnabled );
diff --git a/svx/source/inc/fmcontrolbordermanager.hxx
b/svx/source/inc/fmcontrolbordermanager.hxx
index 6d90b75..0886ec9 100644
--- a/svx/source/inc/fmcontrolbordermanager.hxx
+++ b/svx/source/inc/fmcontrolbordermanager.hxx
@@ -186,7 +186,7 @@ namespace svxform
void restoreAll();
private:
- /** called when a control got one of the two possible stati (focused,
and hovered with the mouse)
+ /** called when a control got one of the two possible statuses
(focused, and hovered with the mouse)
@param _rxControl
the control which gained the status
@param _rControlData
@@ -197,7 +197,7 @@ namespace svxform
ControlData& _rControlData
) SAL_THROW(());
- /** called when a control lost one of the two possible stati (focused,
and hovered with the mouse)
+ /** called when a control lost one of the two possible statuses
(focused, and hovered with the mouse)
@param _rxControl
the control which lost the status
@param _rControlData
diff --git a/svx/source/inc/formcontroller.hxx
b/svx/source/inc/formcontroller.hxx
index c74d7e5..62e178d 100644
--- a/svx/source/inc/formcontroller.hxx
+++ b/svx/source/inc/formcontroller.hxx
@@ -319,7 +319,7 @@ namespace svxform
// XGridControlListener
virtual void SAL_CALL columnChanged( const
::com::sun::star::lang::EventObject& _event ) throw
(::com::sun::star::uno::RuntimeException);
- // ::com::sun::star::beans::XPropertyChangeListener -> aenderung der stati
+ // ::com::sun::star::beans::XPropertyChangeListener -> change of states
virtual void SAL_CALL propertyChange(const
::com::sun::star::beans::PropertyChangeEvent& evt) throw(
::com::sun::star::uno::RuntimeException );
// XTextListener -> modify setzen
diff --git a/sw/source/ui/app/swmodul1.cxx b/sw/source/ui/app/swmodul1.cxx
index 73fe0a1..7469e6c 100644
--- a/sw/source/ui/app/swmodul1.cxx
+++ b/sw/source/ui/app/swmodul1.cxx
@@ -577,7 +577,7 @@ sal_uInt16 SwModule::GetMetric( sal_Bool bWeb ) const
return static_cast< sal_uInt16 >(pPref->GetMetric());
}
-// Pass-through Update-Stati
+// Pass-through Update-Status
sal_uInt16 SwModule::GetLinkUpdMode( sal_Bool ) const
{
if(!pUsrPref)
diff --git a/vcl/inc/osx/saldata.hxx b/vcl/inc/osx/saldata.hxx
index 2bc0a6f..b125caa 100644
--- a/vcl/inc/osx/saldata.hxx
+++ b/vcl/inc/osx/saldata.hxx
@@ -76,7 +76,7 @@ public:
SalVirtualDevice *mpFirstVD; // first
VirDev
SalPrinter *mpFirstPrinter; // first
printing printer
SystemFontList *mpFontList;
- NSStatusItem* mpStatusItem; // one
status item that draws all our stati
+ NSStatusItem* mpStatusItem; // one
status item that draws all our statuses
// at the
moment this is only one add menu button
CGColorSpaceRef mxRGBSpace;
CGColorSpaceRef mxGraySpace;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
