diff options
46 files changed, 71 insertions, 71 deletions
diff --git a/basegfx/source/matrix/b3dhommatrix.cxx b/basegfx/source/matrix/b3dhommatrix.cxx index 5a57b74bddf7..c4b691f6ca02 100644 --- a/basegfx/source/matrix/b3dhommatrix.cxx +++ b/basegfx/source/matrix/b3dhommatrix.cxx @@ -528,7 +528,7 @@ namespace basegfx rRotate.setZ(atan2(aCol0.getY(), aCol0.getX())); } - // corrcet rotate values + // correct rotate values rRotate.correctValues(); } diff --git a/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx index b291b7119c83..8832505c195e 100644 --- a/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx @@ -192,9 +192,9 @@ namespace drawinglayer basegfx::B3DRange SdrCubePrimitive3D::getB3DRange(const geometry::ViewInformation3D& /*rViewInformation*/) const { - // use defaut from sdrPrimitive3D which uses transformation expanded by line width/2. + // use default from sdrPrimitive3D which uses transformation expanded by line width/2. // The parent implementation which uses the ranges of the decomposition would be more - // corrcet, but for historical reasons it is necessary to do the old method: To get + // correct, but for historical reasons it is necessary to do the old method: To get // the range of the non-transformed geometry and transform it then. This leads to different // ranges where the new method is more correct, but the need to keep the old behaviour // has priority here. diff --git a/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx index 59618f51fef8..46577581369c 100644 --- a/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx @@ -473,9 +473,9 @@ namespace drawinglayer basegfx::B3DRange SdrExtrudePrimitive3D::getB3DRange(const geometry::ViewInformation3D& /*rViewInformation*/) const { - // use defaut from sdrPrimitive3D which uses transformation expanded by line width/2 + // use default from sdrPrimitive3D which uses transformation expanded by line width/2 // The parent implementation which uses the ranges of the decomposition would be more - // corrcet, but for historical reasons it is necessary to do the old method: To get + // correct, but for historical reasons it is necessary to do the old method: To get // the range of the non-transformed geometry and transform it then. This leads to different // ranges where the new method is more correct, but the need to keep the old behaviour // has priority here. diff --git a/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx index 55376419f61b..5331f72cc5df 100644 --- a/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx @@ -335,9 +335,9 @@ namespace drawinglayer basegfx::B3DRange SdrLathePrimitive3D::getB3DRange(const geometry::ViewInformation3D& /*rViewInformation*/) const { - // use defaut from sdrPrimitive3D which uses transformation expanded by line width/2 + // use default from sdrPrimitive3D which uses transformation expanded by line width/2 // The parent implementation which uses the ranges of the decomposition would be more - // corrcet, but for historical reasons it is necessary to do the old method: To get + // correct, but for historical reasons it is necessary to do the old method: To get // the range of the non-transformed geometry and transform it then. This leads to different // ranges where the new method is more correct, but the need to keep the old behaviour // has priority here. diff --git a/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx index 53c36dfc1f0b..ed846a8f4bf3 100644 --- a/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx @@ -194,9 +194,9 @@ namespace drawinglayer basegfx::B3DRange SdrSpherePrimitive3D::getB3DRange(const geometry::ViewInformation3D& /*rViewInformation*/) const { - // use defaut from sdrPrimitive3D which uses transformation expanded by line width/2 + // use default from sdrPrimitive3D which uses transformation expanded by line width/2 // The parent implementation which uses the ranges of the decomposition would be more - // corrcet, but for historical reasons it is necessary to do the old method: To get + // correct, but for historical reasons it is necessary to do the old method: To get // the range of the non-transformed geometry and transform it then. This leads to different // ranges where the new method is more correct, but the need to keep the old behaviour // has priority here. diff --git a/external/libmariadb/mariadb-trunk-101.patch b/external/libmariadb/mariadb-trunk-101.patch index 77742d139c1e..75cf43428393 100644 --- a/external/libmariadb/mariadb-trunk-101.patch +++ b/external/libmariadb/mariadb-trunk-101.patch @@ -10718,7 +10718,7 @@ diff -x .bzr -u --recursive -N mariadb-native-client.release/libmariadb/int2str. + + Note: The standard itoa() returns a pointer to the argument, when int2str + returns the pointer to the end-null. -+ itoa assumes that 10 -base numbers are allways signed and other arn't. ++ itoa assumes that 10 -base numbers are always signed and other aren't. +*/ + +#include <my_global.h> @@ -10859,7 +10859,7 @@ diff -x .bzr -u --recursive -N mariadb-native-client.release/libmariadb/is_prefi + Defines: is_prefix() + + is_prefix(s, t) returns 1 if s starts with t. -+ A empty t is allways a prefix. ++ A empty t is always a prefix. +*/ + +#include <my_global.h> @@ -14653,7 +14653,7 @@ diff -x .bzr -u --recursive -N mariadb-native-client.release/libmariadb/longlong + + Note: The standard itoa() returns a pointer to the argument, when int2str + returns the pointer to the end-null. -+ itoa assumes that 10 -base numbers are allways signed and other arn't. ++ itoa assumes that 10 -base numbers are always signed and other aren't. +*/ + +#include <my_global.h> @@ -23658,9 +23658,9 @@ diff -x .bzr -u --recursive -N mariadb-native-client.release/libmariadb/my_getwd +#define chdir _chdir2 +#endif + -+ /* Gets current working directory in buff. Directory is allways ended ++ /* Gets current working directory in buff. Directory is always ended + with FN_LIBCHAR */ -+ /* One must pass a buffer to my_getwd. One can allways use ++ /* One must pass a buffer to my_getwd. One can always use + curr_dir[] */ + +int my_getwd(my_string buf, uint size, myf MyFlags) @@ -31590,7 +31590,7 @@ diff -x .bzr -u --recursive -N mariadb-native-client.release/libmariadb/strfill. + Defines: strfill() + + strfill(dest, len, fill) makes a string of fill-characters. The result -+ string is of length == len. The des+len character is allways set to NULL. ++ string is of length == len. The des+len character is always set to NULL. + strfill() returns pointer to dest+len; +*/ + @@ -38646,7 +38646,7 @@ diff -x .bzr -u --recursive -N mariadb-native-client.release/libmysql/int2str.c - - Note: The standard itoa() returns a pointer to the argument, when int2str - returns the pointer to the end-null. -- itoa assumes that 10 -base numbers are allways signed and other arn't. +- itoa assumes that 10 -base numbers are always signed and other aren't. -*/ - -#include <my_global.h> @@ -38787,7 +38787,7 @@ diff -x .bzr -u --recursive -N mariadb-native-client.release/libmysql/is_prefix. - Defines: is_prefix() - - is_prefix(s, t) returns 1 if s starts with t. -- A empty t is allways a prefix. +- A empty t is always a prefix. -*/ - -#include <my_global.h> @@ -42104,7 +42104,7 @@ diff -x .bzr -u --recursive -N mariadb-native-client.release/libmysql/longlong2s - - Note: The standard itoa() returns a pointer to the argument, when int2str - returns the pointer to the end-null. -- itoa assumes that 10 -base numbers are allways signed and other arn't. +- itoa assumes that 10 -base numbers are always signed and other aren't. -*/ - -#include <my_global.h> @@ -46193,9 +46193,9 @@ diff -x .bzr -u --recursive -N mariadb-native-client.release/libmysql/my_getwd.c -#define chdir _chdir2 -#endif - -- /* Gets current working directory in buff. Directory is allways ended +- /* Gets current working directory in buff. Directory is always ended - with FN_LIBCHAR */ -- /* One must pass a buffer to my_getwd. One can allways use +- /* One must pass a buffer to my_getwd. One can always use - curr_dir[] */ - -int my_getwd(my_string buf, uint size, myf MyFlags) @@ -55169,7 +55169,7 @@ diff -x .bzr -u --recursive -N mariadb-native-client.release/libmysql/strfill.c - Defines: strfill() - - strfill(dest, len, fill) makes a string of fill-characters. The result -- string is of length == len. The des+len character is allways set to NULL. +- string is of length == len. The des+len character is always set to NULL. - strfill() returns pointer to dest+len; -*/ - diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx index 4dd3e78c46f1..2ce1358186fb 100644 --- a/include/svx/svdotext.hxx +++ b/include/svx/svdotext.hxx @@ -226,7 +226,7 @@ protected: sal_Bool bTextSizeDirty : 1; // #101684# - sal_Bool mbInEditMode : 1; // Is this text obejct in edit mode? + sal_Bool mbInEditMode : 1; // Is this text object in edit mode? // Fuer Objekt mit freier Groesse im Draw (Mengentext). Das Flag wird vom // der App beim Create gesetzt. diff --git a/lotuswordpro/source/filter/lwpfilter.hxx b/lotuswordpro/source/filter/lwpfilter.hxx index ed57baf6b8bb..de61d961615f 100644 --- a/lotuswordpro/source/filter/lwpfilter.hxx +++ b/lotuswordpro/source/filter/lwpfilter.hxx @@ -100,7 +100,7 @@ public: public: /** * @descr loading the file. It's call be SfxObejctShell::ImportFrom. - * @param aDescriptor the parameters include file URL or XInputStream obejct, from which the filter can + * @param aDescriptor the parameters include file URL or XInputStream object, from which the filter can * get which file to import. */ virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& aDescriptor ) diff --git a/lotuswordpro/source/filter/lwpparastyle.cxx b/lotuswordpro/source/filter/lwpparastyle.cxx index 5a4ec6707c4e..a64860d39b28 100644 --- a/lotuswordpro/source/filter/lwpparastyle.cxx +++ b/lotuswordpro/source/filter/lwpparastyle.cxx @@ -343,7 +343,7 @@ void LwpParaStyle::ApplyParaBorder(XFParaStyle* pParaStyle, LwpParaBorderOverrid } } - //convert to XFBorders obejct: + //convert to XFBorders object: LwpBorderStuff *pBorderStuff = pBorder->GetBorderStuff(); if( pBorderStuff && pBorderStuff->GetSide() != 0 ) { diff --git a/lotuswordpro/source/filter/xfilter/ixfcontent.hxx b/lotuswordpro/source/filter/xfilter/ixfcontent.hxx index 27715d416ba9..7da3155338d9 100644 --- a/lotuswordpro/source/filter/xfilter/ixfcontent.hxx +++ b/lotuswordpro/source/filter/xfilter/ixfcontent.hxx @@ -64,7 +64,7 @@ /** * @brief Base interface for all content object.Implementation classes include text span,paragraph, - Drawing obejcts, image, ole and so on. + Drawing objects, image, ole and so on. */ class IXFContent : public IXFObject { diff --git a/lotuswordpro/source/filter/xfilter/xfborders.hxx b/lotuswordpro/source/filter/xfilter/xfborders.hxx index e8e885fc7625..f84ac4ae5650 100644 --- a/lotuswordpro/source/filter/xfilter/xfborders.hxx +++ b/lotuswordpro/source/filter/xfilter/xfborders.hxx @@ -65,7 +65,7 @@ /** * @brief - * Single border obejct for all objects with borders. + * Single border object for all objects with borders. */ class XFBorder { diff --git a/lotuswordpro/source/filter/xfilter/xfcellstyle.hxx b/lotuswordpro/source/filter/xfilter/xfcellstyle.hxx index 12799354f339..a7bebbfbad8a 100644 --- a/lotuswordpro/source/filter/xfilter/xfcellstyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xfcellstyle.hxx @@ -73,7 +73,7 @@ class XFMargins; class XFBGImage; /** - * @descr Style obejct for cell. + * @descr Style object for cell. */ class XFCellStyle : public XFStyle { diff --git a/lotuswordpro/source/filter/xfilter/xfconfigmanager.hxx b/lotuswordpro/source/filter/xfilter/xfconfigmanager.hxx index 7f88196533a1..0c580c5bef16 100644 --- a/lotuswordpro/source/filter/xfilter/xfconfigmanager.hxx +++ b/lotuswordpro/source/filter/xfilter/xfconfigmanager.hxx @@ -70,7 +70,7 @@ * @brief * Config information for OOo document, ie, line count config, endnote and footnote config. * This object should only exist one instance. - * Don't make this obejct an singleton because it's managed by XFStyleManager. + * Don't make this object an singleton because it's managed by XFStyleManager. */ class XFConfigManager : public XFStyleContainer { diff --git a/lotuswordpro/source/filter/xfilter/xfcrossref.hxx b/lotuswordpro/source/filter/xfilter/xfcrossref.hxx index 9df7507dd001..c1794f304c6b 100644 --- a/lotuswordpro/source/filter/xfilter/xfcrossref.hxx +++ b/lotuswordpro/source/filter/xfilter/xfcrossref.hxx @@ -64,7 +64,7 @@ /** * @brief - * Index entry obejct. + * Index entry object. */ class XFCrossRefStart : public XFContent { diff --git a/lotuswordpro/source/filter/xfilter/xfdate.hxx b/lotuswordpro/source/filter/xfilter/xfdate.hxx index 513855132f1a..484fbbf4f30a 100644 --- a/lotuswordpro/source/filter/xfilter/xfdate.hxx +++ b/lotuswordpro/source/filter/xfilter/xfdate.hxx @@ -64,7 +64,7 @@ #include "xfcontent.hxx" /** - * @descr Date obejct. + * @descr Date object. */ class XFDate : public XFContent { diff --git a/lotuswordpro/source/filter/xfilter/xfdrawgroup.hxx b/lotuswordpro/source/filter/xfilter/xfdrawgroup.hxx index 41ecf7471423..32ac42e1d516 100644 --- a/lotuswordpro/source/filter/xfilter/xfdrawgroup.hxx +++ b/lotuswordpro/source/filter/xfilter/xfdrawgroup.hxx @@ -66,7 +66,7 @@ /** * @brief - * Group obejct for drawing. + * Group object for drawing. */ class XFDrawGroup : public XFDrawObject { @@ -82,7 +82,7 @@ public: void Add(XFFrame *pFrame); /** - * @descr Output group obejct and all it's children. + * @descr Output group object and all it's children. */ virtual void ToXml(IXFStream *pStrm); diff --git a/lotuswordpro/source/filter/xfilter/xfdrawline.hxx b/lotuswordpro/source/filter/xfilter/xfdrawline.hxx index ff07d510dacf..565cf0c948be 100644 --- a/lotuswordpro/source/filter/xfilter/xfdrawline.hxx +++ b/lotuswordpro/source/filter/xfilter/xfdrawline.hxx @@ -65,7 +65,7 @@ /** * @brief - * Line obejct of drawing layer. + * Line object of drawing layer. */ class XFDrawLine : public XFDrawObject { diff --git a/lotuswordpro/source/filter/xfilter/xfdrawlinestyle.hxx b/lotuswordpro/source/filter/xfilter/xfdrawlinestyle.hxx index 4e49235fe42f..509984270f14 100644 --- a/lotuswordpro/source/filter/xfilter/xfdrawlinestyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xfdrawlinestyle.hxx @@ -65,7 +65,7 @@ /** * @brief - * Border line style for drawing obejct. + * Border line style for drawing object. */ class XFDrawLineStyle : public XFStyle { diff --git a/lotuswordpro/source/filter/xfilter/xfdrawobj.hxx b/lotuswordpro/source/filter/xfilter/xfdrawobj.hxx index 45eb38170b9f..dfa5517f0079 100644 --- a/lotuswordpro/source/filter/xfilter/xfdrawobj.hxx +++ b/lotuswordpro/source/filter/xfilter/xfdrawobj.hxx @@ -74,7 +74,7 @@ * Base class for all drawing object(ellipse,rect,circle,...). * I can set Postions,anchor,rotate,text style name here. * - * Drawing obejcts can be rotated,scaled and skewed, drawing objects must have positions setted, + * Drawing objects can be rotated,scaled and skewed, drawing objects must have positions setted, * you can use SetPosition(...). */ class XFDrawObject : public XFFrame @@ -89,7 +89,7 @@ public: void SetTextStyleName(OUString style); /** - * @descr Set drawing obejct rotate. + * @descr Set drawing object rotate. */ void SetRotate(double degree, XFPoint aRotatePoint=XFPoint(0,0)); @@ -104,7 +104,7 @@ public: void SetSkewX(double cx); /** - * @descr Set drawing obejct y skew. + * @descr Set drawing object y skew. */ void SetSkewY(double cy); diff --git a/lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx b/lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx index 4f16e41ba3dc..db9a53e947b6 100644 --- a/lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx @@ -94,7 +94,7 @@ public: void SetLineStyle(double width, XFColor color = XFColor(0,0,0), sal_Int32 transparency = 0); /** - * @descr Set drawing obejct dash border style. + * @descr Set drawing object dash border style. */ void SetLineDashStyle(enumXFLineStyle style, int num1, int num2, double len1, double len2, double space ); @@ -104,7 +104,7 @@ public: void SetAreaColor(XFColor& color); /** - * @descr Set drawing obejct area grid style. + * @descr Set drawing object area grid style. */ void SetAreaLineStyle(enumXFAreaLineStyle style, sal_Int32 angle = 0, double space = 0.102, XFColor lineColor = XFColor(0,0,0)); @@ -114,7 +114,7 @@ public: void SetArrowStart(OUString start, double size=0.3, sal_Bool center = sal_False); /** - * @descr Set drawing obejct arrow end style,only lines can have arrows. + * @descr Set drawing object arrow end style,only lines can have arrows. */ void SetArrowEnd(OUString end, double size=0.3, sal_Bool center = sal_False); diff --git a/lotuswordpro/source/filter/xfilter/xfendnote.hxx b/lotuswordpro/source/filter/xfilter/xfendnote.hxx index 7cd9eb4a384b..761979d6321b 100644 --- a/lotuswordpro/source/filter/xfilter/xfendnote.hxx +++ b/lotuswordpro/source/filter/xfilter/xfendnote.hxx @@ -66,7 +66,7 @@ /** * @brief - * End note obejct. + * End note object. */ class XFEndNote : public XFContentContainer { diff --git a/lotuswordpro/source/filter/xfilter/xfentry.hxx b/lotuswordpro/source/filter/xfilter/xfentry.hxx index 4943eb78d7dd..f27eba909adf 100644 --- a/lotuswordpro/source/filter/xfilter/xfentry.hxx +++ b/lotuswordpro/source/filter/xfilter/xfentry.hxx @@ -64,7 +64,7 @@ /** * @brief - * Index entry obejct. + * Index entry object. */ class XFEntry : public XFContent { diff --git a/lotuswordpro/source/filter/xfilter/xffontfactory.hxx b/lotuswordpro/source/filter/xfilter/xffontfactory.hxx index 3b3c9bf01fe5..4ab2a4b15400 100644 --- a/lotuswordpro/source/filter/xfilter/xffontfactory.hxx +++ b/lotuswordpro/source/filter/xfilter/xffontfactory.hxx @@ -85,13 +85,13 @@ public: private: /** - * @descr Add a font. if there exist a font with same properties with pFont, them the font obejct + * @descr Add a font. if there exist a font with same properties with pFont, them the font object * will not be added. */ void AddFont(XFFont *pFont); /** - * @descr Find whether same font obejct exists. + * @descr Find whether same font object exists. */ XFFont* FindSameFont(XFFont *pFont); diff --git a/lotuswordpro/source/filter/xfilter/xffooter.hxx b/lotuswordpro/source/filter/xfilter/xffooter.hxx index 3dd138555778..12bc4dadb06e 100644 --- a/lotuswordpro/source/filter/xfilter/xffooter.hxx +++ b/lotuswordpro/source/filter/xfilter/xffooter.hxx @@ -64,7 +64,7 @@ #include <vector> /** - * @descr Foot obejct. It's just a container. + * @descr Foot object. It's just a container. */ class XFFooter : public XFContentContainer { diff --git a/lotuswordpro/source/filter/xfilter/xfframestyle.hxx b/lotuswordpro/source/filter/xfilter/xfframestyle.hxx index 626a4e7573d0..698572f7ac76 100644 --- a/lotuswordpro/source/filter/xfilter/xfframestyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xfframestyle.hxx @@ -74,7 +74,7 @@ class XFBGImage; /** * @brief - * Style for all frame obejcts. + * Style for all frame objects. */ class XFFrameStyle : public XFStyle { diff --git a/lotuswordpro/source/filter/xfilter/xfheaderstyle.hxx b/lotuswordpro/source/filter/xfilter/xfheaderstyle.hxx index f613ec09a2d9..3f7670498e4a 100644 --- a/lotuswordpro/source/filter/xfilter/xfheaderstyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xfheaderstyle.hxx @@ -114,7 +114,7 @@ public: void SetBackColor(XFColor color); /** - * @descr Output header style obejct. + * @descr Output header style object. */ virtual void ToXml(IXFStream *pStrm); diff --git a/lotuswordpro/source/filter/xfilter/xfimage.hxx b/lotuswordpro/source/filter/xfilter/xfimage.hxx index faa0dcff77ad..1fca8799c490 100644 --- a/lotuswordpro/source/filter/xfilter/xfimage.hxx +++ b/lotuswordpro/source/filter/xfilter/xfimage.hxx @@ -64,7 +64,7 @@ /** * @brief - * Image obejct. + * Image object. * There are two way to import an image, file link or base64 stream. */ class XFImage : public XFFrame diff --git a/lotuswordpro/source/filter/xfilter/xflist.hxx b/lotuswordpro/source/filter/xfilter/xflist.hxx index 3930aafbe546..574ef65965e0 100644 --- a/lotuswordpro/source/filter/xfilter/xflist.hxx +++ b/lotuswordpro/source/filter/xfilter/xflist.hxx @@ -67,7 +67,7 @@ class XFListItem; /** * @brief - * list obejct for order-list and unordered-list. + * list object for order-list and unordered-list. */ class XFList : public XFContentContainer { @@ -88,7 +88,7 @@ public: void SetContinueNumber(sal_Bool bContinueNumber=sal_False); /** - * @descr Output list obejct. + * @descr Output list object. */ virtual void ToXml(IXFStream *pStrm); diff --git a/lotuswordpro/source/filter/xfilter/xfparagraph.hxx b/lotuswordpro/source/filter/xfilter/xfparagraph.hxx index 7fda9cb7a741..6c56806df276 100644 --- a/lotuswordpro/source/filter/xfilter/xfparagraph.hxx +++ b/lotuswordpro/source/filter/xfilter/xfparagraph.hxx @@ -69,7 +69,7 @@ class IXFStream; /** * @brief * Paragraph object for SODC. - * You can call Add() to add text span or drawing obejcts to XFParagraph. + * You can call Add() to add text span or drawing objects to XFParagraph. */ class XFParagraph : public XFContentContainer { diff --git a/lotuswordpro/source/filter/xfilter/xfparastyle.hxx b/lotuswordpro/source/filter/xfilter/xfparastyle.hxx index f0ca1a270b40..19267fb0c80c 100644 --- a/lotuswordpro/source/filter/xfilter/xfparastyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xfparastyle.hxx @@ -106,8 +106,8 @@ public: OUString GetMasterPage(); /** - * @descr set the paragraph defaut font. - * @param font font obejct to be setted.Font object are deleted by font-factory,so + * @descr set the paragraph default font. + * @param font font object to be setted.Font object are deleted by font-factory,so * dont't delete it in the destructure function of para style. */ void SetFont(XFFont *font); diff --git a/lotuswordpro/source/filter/xfilter/xfplaceholder.hxx b/lotuswordpro/source/filter/xfilter/xfplaceholder.hxx index 9e4c08a6e18f..2df7c371f695 100644 --- a/lotuswordpro/source/filter/xfilter/xfplaceholder.hxx +++ b/lotuswordpro/source/filter/xfilter/xfplaceholder.hxx @@ -64,7 +64,7 @@ /** * @brief - * Index entry obejct. + * Index entry object. */ class XFHolderStart : public XFContent { diff --git a/lotuswordpro/source/filter/xfilter/xfsection.hxx b/lotuswordpro/source/filter/xfilter/xfsection.hxx index f77a2a972a40..75c82ec92407 100644 --- a/lotuswordpro/source/filter/xfilter/xfsection.hxx +++ b/lotuswordpro/source/filter/xfilter/xfsection.hxx @@ -79,7 +79,7 @@ public: public: /** - * @descr Output section obejct. + * @descr Output section object. */ virtual void ToXml(IXFStream *pStrm); diff --git a/lotuswordpro/source/filter/xfilter/xfshadow.hxx b/lotuswordpro/source/filter/xfilter/xfshadow.hxx index a94d0a6d102e..187fd3c9c702 100644 --- a/lotuswordpro/source/filter/xfilter/xfshadow.hxx +++ b/lotuswordpro/source/filter/xfilter/xfshadow.hxx @@ -87,7 +87,7 @@ public: enumXFShadowPos GetPosition(); /** - * @descr Set shadow offset from owner obejct. + * @descr Set shadow offset from owner object. */ void SetOffset(double offset); diff --git a/lotuswordpro/source/filter/xfilter/xfstylecont.cxx b/lotuswordpro/source/filter/xfilter/xfstylecont.cxx index 51def4b9a6c9..3d565a90d2d9 100644 --- a/lotuswordpro/source/filter/xfilter/xfstylecont.cxx +++ b/lotuswordpro/source/filter/xfilter/xfstylecont.cxx @@ -114,7 +114,7 @@ IXFStyle* XFStyleContainer::AddStyle(IXFStyle *pStyle) if( !pStyle ) return NULL; - //no matter we want to delete the style or not,XFFont obejct should be saved first. + //no matter we want to delete the style or not,XFFont object should be saved first. ManageStyleFont(pStyle); if( pStyle->GetStyleName().isEmpty() ) diff --git a/lotuswordpro/source/filter/xfilter/xfstylecont.hxx b/lotuswordpro/source/filter/xfilter/xfstylecont.hxx index 420a2eb8f6f9..89d58444838d 100644 --- a/lotuswordpro/source/filter/xfilter/xfstylecont.hxx +++ b/lotuswordpro/source/filter/xfilter/xfstylecont.hxx @@ -66,7 +66,7 @@ class IXFStyle; /** - * @descr container obejct for styles. + * @descr container object for styles. * All styles can be placed into an style container. */ class XFStyleContainer : public IXFObject diff --git a/lotuswordpro/source/filter/xfilter/xfstylemanager.hxx b/lotuswordpro/source/filter/xfilter/xfstylemanager.hxx index 2c7705b9d82d..017735458419 100644 --- a/lotuswordpro/source/filter/xfilter/xfstylemanager.hxx +++ b/lotuswordpro/source/filter/xfilter/xfstylemanager.hxx @@ -78,7 +78,7 @@ class XFEndnoteConfig; /** * @brief * Style manager for the filter. - * This is a global obejct, all styles will be placed here before output. + * This is a global object, all styles will be placed here before output. */ class XFStyleManager// : public IXFObject { diff --git a/lotuswordpro/source/filter/xfilter/xftextboxstyle.hxx b/lotuswordpro/source/filter/xfilter/xftextboxstyle.hxx index f8e6650abcc3..7be96eada887 100644 --- a/lotuswordpro/source/filter/xfilter/xftextboxstyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xftextboxstyle.hxx @@ -64,7 +64,7 @@ /** * @brief -* Style for all frame obejcts. +* Style for all frame objects. */ class XFTextBoxStyle : public XFStyle { diff --git a/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx b/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx index 281ba2ce4a75..f3cf9de7328b 100644 --- a/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx +++ b/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx @@ -241,7 +241,7 @@ namespace rtl_Bootstrap CPPUNIT_ASSERT_MESSAGE("get the value of a variable in ini file.", !suGetname.isEmpty()); } - //use defaut value + //use default value void getFrom_003() { rtl::OUString suIniname = t_getSourcePath(TESTSHL2_INI); diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx index cbff1e6cc82e..374d54692f11 100644 --- a/sc/source/core/data/postit.cxx +++ b/sc/source/core/data/postit.cxx @@ -172,7 +172,7 @@ public: /** Returns the drawing layer page of the sheet contained in maPos. */ SdrPage* GetDrawPage(); - /** Returns the caption drawing obejct. */ + /** Returns the caption drawing object. */ inline SdrCaptionObj* GetCaption() { return mpCaption; } /** Moves the caption inside the passed rectangle. Uses page area if 0 is passed. */ diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index 72e7e469db62..a460294ca484 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -1022,7 +1022,7 @@ bool ScDocFunc::PutData( const ScAddress& rPos, ScEditEngineDefaulter& rEngine, if ( bEditCell ) { // #i61702# With bLoseContent set, the content of rEngine isn't restored - // (used in loading XML, where after the removeActionLock call the API obejct's + // (used in loading XML, where after the removeActionLock call the API object's // EditEngine isn't accessed again. sal_Bool bLoseContent = pDoc->IsImportingXML(); @@ -1238,7 +1238,7 @@ bool ScDocFunc::ReplaceNote( const ScAddress& rPos, const OUString& rNoteText, c aOldData = pOldNote->GetNoteData(); } - // collect drawing undo actions for deleting/inserting caption obejcts + // collect drawing undo actions for deleting/inserting caption objects if( pUndoMgr ) pDrawLayer->BeginCalcUndo(false); diff --git a/sc/source/ui/vba/vbawindow.cxx b/sc/source/ui/vba/vbawindow.cxx index 67b5c3aebb27..544e14971561 100644 --- a/sc/source/ui/vba/vbawindow.cxx +++ b/sc/source/ui/vba/vbawindow.cxx @@ -211,7 +211,7 @@ ScVbaWindow::init() { /* This method is called from the constructor, thus the own refcount is still zero. The implementation of ActivePane() uses a UNO reference of - this (to set this window as parent of the pane obejct). This requires + this (to set this window as parent of the pane object). This requires the own refcount to be non-zero, otherwise this instance will be desctructed immediately! Guard the call to ActivePane() in try/catch to not miss the decrementation of the reference count on exception. */ diff --git a/svx/source/accessibility/ChildrenManagerImpl.hxx b/svx/source/accessibility/ChildrenManagerImpl.hxx index 30cb9c3f9f44..525f01d56897 100644 --- a/svx/source/accessibility/ChildrenManagerImpl.hxx +++ b/svx/source/accessibility/ChildrenManagerImpl.hxx @@ -425,7 +425,7 @@ private: create the missing accessible objects now. @param raDescriptorList Create an accessible object for every member of this list where - that obejct does not already exist. + that object does not already exist. */ void CreateAccessibilityObjects (ChildDescriptorListType& raChildList); diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx index 7f577bdb31cc..6e1c310603ab 100644 --- a/sw/source/core/text/txtfly.cxx +++ b/sw/source/core/text/txtfly.cxx @@ -138,7 +138,7 @@ SwContourCache::~SwContourCache() void SwContourCache::ClrObject( MSHORT nPos ) { - OSL_ENSURE( pTextRanger[ nPos ], "ClrObject: Allready cleared. Good Bye!" ); + OSL_ENSURE( pTextRanger[ nPos ], "ClrObject: Already cleared. Good Bye!" ); nPntCnt -= pTextRanger[ nPos ]->GetPointCount(); delete pTextRanger[ nPos ]; --nObjCnt; diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx index 22917e81800c..1c5e7e74a8d8 100644 --- a/vcl/win/source/app/salinst.cxx +++ b/vcl/win/source/app/salinst.cxx @@ -221,8 +221,8 @@ void ImplSalYieldMutexAcquireWithWait() // If we are the main thread, then we must wait with wait, because // in if we don't reschedule, then we create deadlocks if a Windows - // Function is called from another thread. If we arn't the main thread, - // than we call qcquire directly. + // Function is called from another thread. If we aren't the main thread, + // than we call acquire directly. DWORD nThreadId = GetCurrentThreadId(); SalData* pSalData = GetSalData(); if ( pSalData->mnAppThreadId == nThreadId ) diff --git a/wizards/com/sun/star/wizards/ui/event/DataAware.java b/wizards/com/sun/star/wizards/ui/event/DataAware.java index 855023c7371a..b83889703aed 100644 --- a/wizards/com/sun/star/wizards/ui/event/DataAware.java +++ b/wizards/com/sun/star/wizards/ui/event/DataAware.java @@ -98,7 +98,7 @@ public abstract class DataAware { } /** - * gets the current value from the data obejct. + * gets the current value from the data object. * this method delegates the job to * the value object. * @return the current value of the data object. diff --git a/wizards/com/sun/star/wizards/web/FTPDialog.py b/wizards/com/sun/star/wizards/web/FTPDialog.py index 5507adab3fa6..2ad850a94506 100644 --- a/wizards/com/sun/star/wizards/web/FTPDialog.py +++ b/wizards/com/sun/star/wizards/web/FTPDialog.py @@ -423,7 +423,7 @@ class FTPDialog(UnoDialog2, UIConsts): AbstractErrorHandler.showMessage(self.xMSF, self.xUnoDialog.getPeer(), self.resources.resIllegalFolder, ErrorHandler.ERROR_PROCESS_FATAL) # practical to have such a method... - # @param p the publisher obejct that contains the ftp connection info. + # @param p the publisher object that contains the ftp connection info. # @return the full ftp url with username password and everything one needs. @classmethod def getFullURL1(self, p): |