From 25d3c618d831036c08194610f188e4781c135cfc Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Wed, 25 Mar 2015 21:12:16 +0100 Subject: Typo: formated->formatted Change-Id: Iefd4d375a0dfb36732233852f906c6b85dccc2a5 --- cui/source/tabpages/numfmt.cxx | 2 +- cui/uiconfig/ui/numberingformatpage.ui | 4 ++-- external/np_sdk/inc/npfunctions.h | 4 ++-- external/np_sdk/npsdk/npupp.h | 4 ++-- filter/source/xslt/odf2xhtml/export/xhtml/body.xsl | 2 +- framework/inc/classes/filtercachedata.hxx | 6 +++--- framework/qa/complex/framework/autosave/Protocol.java | 4 ++-- framework/source/accelerators/keymapping.cxx | 2 +- framework/source/fwi/classes/converter.cxx | 12 ++++++------ framework/source/jobs/jobdata.cxx | 2 +- framework/source/jobs/joburl.cxx | 2 +- framework/source/xml/acceleratorconfigurationreader.cxx | 2 +- include/basic/sbxform.hxx | 2 +- include/svx/DescriptionGenerator.hxx | 8 ++++---- .../OfficeDev/DesktopEnvironment/FunctionHelper.java | 2 +- odk/examples/java/Text/HardFormatting.java | 8 ++++---- offapi/com/sun/star/text/DateDisplayFormat.idl | 2 +- offapi/com/sun/star/text/TimeDisplayFormat.idl | 2 +- offapi/com/sun/star/text/textfield/URL.idl | 2 +- sd/source/ui/app/sdmod2.cxx | 2 +- sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx | 2 +- sfx2/source/bastyp/fltfnc.cxx | 2 +- shell/source/win32/shlxthandler/infotips/infotips.cxx | 2 +- starmath/inc/cursor.hxx | 2 +- svtools/source/control/fmtfield.cxx | 2 +- svx/source/svdraw/svdotextdecomposition.cxx | 2 +- sw/inc/IDocumentContentOperations.hxx | 4 ++-- sw/inc/dbfld.hxx | 2 +- sw/inc/doc.hxx | 2 +- sw/inc/fesh.hxx | 2 +- sw/inc/fldbas.hxx | 2 +- sw/inc/node.hxx | 2 +- sw/inc/swtable.hxx | 2 +- sw/source/core/layout/trvlfrm.cxx | 2 +- sw/source/core/text/widorp.cxx | 2 +- sw/source/filter/ww8/ww8par3.cxx | 2 +- swext/mediawiki/src/filter/odt2mediawiki.xsl | 2 +- vcl/source/edit/textdata.cxx | 4 ++-- vcl/source/filter/sgvtext.cxx | 2 +- 39 files changed, 58 insertions(+), 58 deletions(-) diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index 8fdcb7e33190..04c8e6e18b38 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -265,7 +265,7 @@ SvxNumberFormatTabPage::SvxNumberFormatTabPage(vcl::Window* pParent, get(m_pEdLeadZeroes, "leadzerosed"); get(m_pBtnThousand, "thousands"); get(m_pFormatCodeFrame, "formatcode"); - get(m_pEdFormat, "formated"); + get(m_pEdFormat, "formatted"); get(m_pIbAdd, "add"); get(m_pIbInfo, "edit"); get(m_pIbRemove, "delete"); diff --git a/cui/uiconfig/ui/numberingformatpage.ui b/cui/uiconfig/ui/numberingformatpage.ui index e6e751d22d32..b7be2e1f4569 100644 --- a/cui/uiconfig/ui/numberingformatpage.ui +++ b/cui/uiconfig/ui/numberingformatpage.ui @@ -100,7 +100,7 @@ 6 6 - + True True center @@ -194,7 +194,7 @@ False _Format code True - formated + formatted diff --git a/external/np_sdk/inc/npfunctions.h b/external/np_sdk/inc/npfunctions.h index 9754567e67f5..0d3a66271bf6 100644 --- a/external/np_sdk/inc/npfunctions.h +++ b/external/np_sdk/inc/npfunctions.h @@ -227,8 +227,8 @@ enum typedef struct _BPSupportedMIMETypes { SInt32 structVersion; /* struct version */ - Handle typeStrings; /* STR# formated handle, allocated by plug-in */ - Handle infoStrings; /* STR# formated handle, allocated by plug-in */ + Handle typeStrings; /* STR# formatted handle, allocated by plug-in */ + Handle infoStrings; /* STR# formatted handle, allocated by plug-in */ } BPSupportedMIMETypes; OSErr BP_GetSupportedMIMETypes(BPSupportedMIMETypes *mimeInfo, UInt32 flags); #define NP_GETMIMEDESCRIPTION_NAME "NP_GetMIMEDescription" diff --git a/external/np_sdk/npsdk/npupp.h b/external/np_sdk/npsdk/npupp.h index e0812ecd9408..e21475aabbe1 100644 --- a/external/np_sdk/npsdk/npupp.h +++ b/external/np_sdk/npsdk/npupp.h @@ -1180,8 +1180,8 @@ enum typedef struct _BPSupportedMIMETypes { SInt32 structVersion; // struct version - Handle typeStrings; // STR# formated handle, allocated by plug-in - Handle infoStrings; // STR# formated handle, allocated by plug-in + Handle typeStrings; // STR# formatted handle, allocated by plug-in + Handle infoStrings; // STR# formatted handle, allocated by plug-in } BPSupportedMIMETypes; OSErr BP_GetSupportedMIMETypes(BPSupportedMIMETypes *mimeInfo, UInt32 flags); diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl index d591bbf4b5e7..8a3e701e258f 100644 --- a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl +++ b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl @@ -2006,7 +2006,7 @@ diff --git a/framework/inc/classes/filtercachedata.hxx b/framework/inc/classes/filtercachedata.hxx index 7bb3d24f4a65..d141652c45b8 100644 --- a/framework/inc/classes/filtercachedata.hxx +++ b/framework/inc/classes/filtercachedata.hxx @@ -580,13 +580,13 @@ class FilterCFGAccess : public ::utl::ConfigItem void write ( DataContainer& rData , DataContainer::ECFGType eType ); // write values from given struct to configuration - static OUString encodeTypeData ( const FileType& aType ); // build own formated string of type properties + static OUString encodeTypeData ( const FileType& aType ); // build own formatted string of type properties static void decodeTypeData ( const OUString& sData , FileType& aType ); - static OUString encodeFilterData( const Filter& aFilter ); // build own formated string of filter properties + static OUString encodeFilterData( const Filter& aFilter ); // build own formatted string of filter properties static void decodeFilterData( const OUString& sData , Filter& aFilter ); - static OUString encodeStringList( const OUStringList& lList ); // build own formated string of OUStringList + static OUString encodeStringList( const OUStringList& lList ); // build own formatted string of OUStringList static OUStringList decodeStringList( const OUString& sValue ); void setProductName ( OUStringHashMap& lUINames ); diff --git a/framework/qa/complex/framework/autosave/Protocol.java b/framework/qa/complex/framework/autosave/Protocol.java index 6748fc3ad6b1..76f64b21e59e 100644 --- a/framework/qa/complex/framework/autosave/Protocol.java +++ b/framework/qa/complex/framework/autosave/Protocol.java @@ -405,7 +405,7 @@ public class Protocol extends JComponent } /** - * create a colored table cell formated as HTML. + * create a colored table cell formatted as HTML. * * @param sCell * an outside string buffer, which can be @@ -662,7 +662,7 @@ public class Protocol extends JComponent /** * returns a generic html header for generating html log files * - * It's used from the method finish() to generate a valid html formated file. + * It's used from the method finish() to generate a valid html formatted file. * For that its necessary to open some special html targets like e.g. . * * @return A string, which includes the whole header. diff --git a/framework/source/accelerators/keymapping.cxx b/framework/source/accelerators/keymapping.cxx index 03d0189a34e9..6b096a899c7c 100644 --- a/framework/source/accelerators/keymapping.cxx +++ b/framework/source/accelerators/keymapping.cxx @@ -165,7 +165,7 @@ sal_uInt16 KeyMapping::mapIdentifierToCode(const OUString& sIdentifier) if (pIt != m_lIdentifierHash.end()) return pIt->second; - // Its not well known identifier - but may be a pure key code formated as string ... + // Its not well known identifier - but may be a pure key code formatted as string ... // Check and convert it! sal_uInt16 nCode = 0; if (!KeyMapping::impl_st_interpretIdentifierAsPureKeyCode(sIdentifier, nCode)) diff --git a/framework/source/fwi/classes/converter.cxx b/framework/source/fwi/classes/converter.cxx index 330eb38e2bea..4dfe07028fbe 100644 --- a/framework/source/fwi/classes/converter.cxx +++ b/framework/source/fwi/classes/converter.cxx @@ -65,7 +65,7 @@ OUString Converter::convert_DateTime2ISO8601( const DateTime& aSource ) sal_Int32 nMin = aSource.GetMin(); sal_Int32 nSec = aSource.GetSec(); - // write year formated as "YYYY" + // write year formatted as "YYYY" if (nYear<10) sBuffer.appendAscii("000"); else if (nYear<100) @@ -75,31 +75,31 @@ OUString Converter::convert_DateTime2ISO8601( const DateTime& aSource ) sBuffer.append( (sal_Int32)nYear ); sBuffer.appendAscii("-"); - // write month formated as "MM" + // write month formatted as "MM" if (nMonth<10) sBuffer.appendAscii("0"); sBuffer.append( (sal_Int32)nMonth ); sBuffer.appendAscii("-"); - // write day formated as "DD" + // write day formatted as "DD" if (nDay<10) sBuffer.appendAscii("0"); sBuffer.append( (sal_Int32)nDay ); sBuffer.appendAscii("T"); - // write hours formated as "hh" + // write hours formatted as "hh" if (nHour<10) sBuffer.appendAscii("0"); sBuffer.append( (sal_Int32)nHour ); sBuffer.appendAscii(":"); - // write min formated as "mm" + // write min formatted as "mm" if (nMin<10) sBuffer.appendAscii("0"); sBuffer.append( (sal_Int32)nMin ); sBuffer.appendAscii(":"); - // write sec formated as "ss" + // write sec formatted as "ss" if (nSec<10) sBuffer.appendAscii("0"); sBuffer.append( (sal_Int32)nSec ); diff --git a/framework/source/jobs/jobdata.cxx b/framework/source/jobs/jobdata.cxx index 814da4ae5d41..3c0adc804a9b 100644 --- a/framework/source/jobs/jobdata.cxx +++ b/framework/source/jobs/jobdata.cxx @@ -457,7 +457,7 @@ bool isEnabled( const OUString& sAdminTime , bool bValidUser = aISOPattern.Matches(sUserTime ); // We check for "isEnabled()" here only. - // Note further: ISO8601 formated strings can be compared as strings directly! + // Note further: ISO8601 formatted strings can be compared as strings directly! // FIXME: this is not true! "T1215" is the same time as "T12:15" or "T121500" return ( (!bValidAdmin && !bValidUser ) || diff --git a/framework/source/jobs/joburl.cxx b/framework/source/jobs/joburl.cxx index 54e69f3c84a2..0eb7d171939c 100644 --- a/framework/source/jobs/joburl.cxx +++ b/framework/source/jobs/joburl.cxx @@ -513,7 +513,7 @@ void JobURL::impldbg_checkURL( /*IN*/ const sal_Char* pURL , @descr It returns a representation of the internal object state as string notation. - @returns The formated string representation. + @returns The formatted string representation. */ OUString JobURL::impldbg_toString() const { diff --git a/framework/source/xml/acceleratorconfigurationreader.cxx b/framework/source/xml/acceleratorconfigurationreader.cxx index 346d84a074ff..7e768f98da37 100644 --- a/framework/source/xml/acceleratorconfigurationreader.cxx +++ b/framework/source/xml/acceleratorconfigurationreader.cxx @@ -32,7 +32,7 @@ namespace framework{ -/* Throws a SaxException in case a wrong formated XML +/* Throws a SaxException in case a wrong formatted XML structure was detected. This macro combined the given comment with a generic diff --git a/include/basic/sbxform.hxx b/include/basic/sbxform.hxx index 71ed5ab3c8d0..4a2f04401b02 100644 --- a/include/basic/sbxform.hxx +++ b/include/basic/sbxform.hxx @@ -96,7 +96,7 @@ class BASIC_DLLPUBLIC SbxBasicFormater { /* Basic command: Format$( number,format-string ) Parameter: - dNumber : number to be formated + dNumber : number to be formatted sFormatStrg : the Format-String, e.g. ###0.0### Return value: diff --git a/include/svx/DescriptionGenerator.hxx b/include/svx/DescriptionGenerator.hxx index 0cf5593d5384..f8fc1cb74a42 100644 --- a/include/svx/DescriptionGenerator.hxx +++ b/include/svx/DescriptionGenerator.hxx @@ -163,24 +163,24 @@ private: */ bool mbIsFirstProperty; - /** Add a property value formated as color to the description string. + /** Add a property value formatted as color to the description string. */ SVX_DLLPRIVATE void AddColor (const OUString& sPropertyName, const OUString& sLocalizedName); - /** Add a property value formated as integer to the description string. + /** Add a property value formatted as integer to the description string. */ SVX_DLLPRIVATE void AddInteger (const OUString& sPropertyName, const OUString& sLocalizedName); - /** Add a property value formated as string to the description string. + /** Add a property value formatted as string to the description string. @param sPropertyName Name of the property. */ SVX_DLLPRIVATE void AddString (const OUString& sPropertyName, const OUString& sLocalizedName, long nWhichId = -1); - /** Add a property value formated as fill style to the description + /** Add a property value formatted as fill style to the description string. If the fill style is HATCH, GRADIENT, or BITMAP, then the of the hatch, gradient, or bitmap is appended as well. diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java index 9d9116c6398f..0aa3fde333a9 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java +++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java @@ -64,7 +64,7 @@ public class FunctionHelper /** - * This convert an URL (formated as a string) to a struct com.sun.star.util.URL. + * This convert an URL (formatted as a string) to a struct com.sun.star.util.URL. * It use a special service to do that: the URLTransformer. * Because some API calls need it and it's not allowed to set "Complete" * part of the util struct only. The URL must be parsed. diff --git a/odk/examples/java/Text/HardFormatting.java b/odk/examples/java/Text/HardFormatting.java index 559c9b98fb16..4b00ad333945 100644 --- a/odk/examples/java/Text/HardFormatting.java +++ b/odk/examples/java/Text/HardFormatting.java @@ -130,7 +130,7 @@ public class HardFormatting { + xPropertySet.getPropertyValue("CharWeight").toString() ); // the PropertyState contains information where the attribute is set, - // is a text part hard formated or not. + // is a text part hard formatted or not. com.sun.star.beans.XPropertyState xPropertyState = null; xPropertyState = UnoRuntime.queryInterface( com.sun.star.beans.XPropertyState.class, xWordCursor); @@ -175,21 +175,21 @@ public class HardFormatting { case com.sun.star.beans.PropertyState.DIRECT_VALUE_value: { System.out.println( "-> The selection '" + xWordCursor.getString() - + "' completely hard formated" ); + + "' completely hard formatted" ); break; } case com.sun.star.beans.PropertyState.DEFAULT_VALUE_value: { System.out.println( "-> The selection '" + xWordCursor.getString() - + "' isn't hard formated" ); + + "' isn't hard formatted" ); break; } case com.sun.star.beans.PropertyState.AMBIGUOUS_VALUE_value: { System.out.println( "-> The selection '" + xWordCursor.getString() - + "' isn't completely hard formated" ); + + "' isn't completely hard formatted" ); break; } diff --git a/offapi/com/sun/star/text/DateDisplayFormat.idl b/offapi/com/sun/star/text/DateDisplayFormat.idl index 16437a94b085..ce314a87780f 100644 --- a/offapi/com/sun/star/text/DateDisplayFormat.idl +++ b/offapi/com/sun/star/text/DateDisplayFormat.idl @@ -24,7 +24,7 @@ module com { module sun { module star { module text { -/** This constants define how a date field is formated before it is displayed. +/** This constants define how a date field is formatted before it is displayed. The format may also depend on the system or document locale. The samples are in German. diff --git a/offapi/com/sun/star/text/TimeDisplayFormat.idl b/offapi/com/sun/star/text/TimeDisplayFormat.idl index 0abd6fabffa2..986ed35421de 100644 --- a/offapi/com/sun/star/text/TimeDisplayFormat.idl +++ b/offapi/com/sun/star/text/TimeDisplayFormat.idl @@ -24,7 +24,7 @@ module com { module sun { module star { module text { -/** This constants define how a time field is formated before it is displayed. +/** This constants define how a time field is formatted before it is displayed. The formate may also depend on the system or document locale. @deprecated diff --git a/offapi/com/sun/star/text/textfield/URL.idl b/offapi/com/sun/star/text/textfield/URL.idl index 30fbdf2e2d17..a6edcdf783e6 100644 --- a/offapi/com/sun/star/text/textfield/URL.idl +++ b/offapi/com/sun/star/text/textfield/URL.idl @@ -33,7 +33,7 @@ published service URL { service com::sun::star::text::TextField; - /** Specifies how the URL is formated on output. + /** Specifies how the URL is formatted on output. */ [property] short Format; diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx index fc01b4a96cb0..fa5f4a018dda 100644 --- a/sd/source/ui/app/sdmod2.cxx +++ b/sd/source/ui/app/sdmod2.cxx @@ -119,7 +119,7 @@ static SdPage* GetCurrentPage( sd::ViewShell* pViewSh, EditFieldInfo* pInfo, boo // which all use the new possibility of setting the visualized page at the SdrOutliner. // if all else failed, geht the current page from the object that is - // currently formated from the document + // currently formatted from the document if(!pPage) { const SdrTextObj* pTextObj = (pViewSh && pViewSh->GetDoc()) ? pViewSh->GetDoc()->GetFormattingTextObj() : NULL; diff --git a/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx b/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx index 5c1111f5e06b..34b921477edd 100644 --- a/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx +++ b/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx @@ -150,7 +150,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>&rxParent); - /** Add a listener that will be informated in the future about state + /** Add a listener that will be informatted in the future about state changes of the tree node. This includes adding and removing children as well as focus, visibility, and expansion state. Multiple calls are ignored. Each listener is added only once. diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx index e759875e1c3a..ee4a7fb15cec 100644 --- a/sfx2/source/bastyp/fltfnc.cxx +++ b/sfx2/source/bastyp/fltfnc.cxx @@ -919,7 +919,7 @@ const SfxFilter* SfxFilterMatcherIter::Next() } /*--------------------------------------------------------------- - helper to build own formated string from given stringlist by + helper to build own formatted string from given stringlist by using given separator ---------------------------------------------------------------*/ OUString implc_convertStringlistToString( const uno::Sequence< OUString >& lList , diff --git a/shell/source/win32/shlxthandler/infotips/infotips.cxx b/shell/source/win32/shlxthandler/infotips/infotips.cxx index 8686898b8f1d..abfb8d69e8a6 100644 --- a/shell/source/win32/shlxthandler/infotips/infotips.cxx +++ b/shell/source/win32/shlxthandler/infotips/infotips.cxx @@ -255,7 +255,7 @@ HRESULT STDMETHODCALLTYPE CInfoTip::GetInfoTip(DWORD /*dwFlags*/, wchar_t** ppws msg += meta_info_accessor.getTagData( META_INFO_DESCRIPTION ); } - //display midified time formated into locale representation. + //display midified time formatted into locale representation. if ( iso8601_date_to_local_date(meta_info_accessor.getTagData(META_INFO_MODIFIED )).length() > 0) { if ( msg != EMPTY_STRING ) diff --git a/starmath/inc/cursor.hxx b/starmath/inc/cursor.hxx index 6a523cfd7405..441a733bb21f 100644 --- a/starmath/inc/cursor.hxx +++ b/starmath/inc/cursor.hxx @@ -144,7 +144,7 @@ public: /** Insert a special node created from aString * * Used for handling insert request from the "catalog" dialog. - * The provided string should be formated as the desired command: %phi + * The provided string should be formatted as the desired command: %phi * Note: this method ONLY supports commands defined in Math.xcu * * For more complex expressions use InsertCommandText, this method doesn't diff --git a/svtools/source/control/fmtfield.cxx b/svtools/source/control/fmtfield.cxx index a3dec60d20a6..1b43103b4e9b 100644 --- a/svtools/source/control/fmtfield.cxx +++ b/svtools/source/control/fmtfield.cxx @@ -924,7 +924,7 @@ bool FormattedField::ImplGetValue(double& dNewVal) sal_uInt32 nFormatKey = m_nFormatKey; // IsNumberFormat changes the FormatKey! if (ImplGetFormatter()->IsTextFormat(nFormatKey) && m_bTreatAsNumber) - // for detection of values like "1,1" in fields that are formated as text + // for detection of values like "1,1" in fields that are formatted as text nFormatKey = 0; // special treatment for percentage formatting diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx index 60302d260f40..8041b3dd4add 100644 --- a/svx/source/svdraw/svdotextdecomposition.cxx +++ b/svx/source/svdraw/svdotextdecomposition.cxx @@ -928,7 +928,7 @@ void SdrTextObj::impDecomposeBlockTextPrimitive( if(bIsCell) { - // cell text is formated neither like a text object nor like a object + // cell text is formatted neither like a text object nor like a object // text, so use a special setup here rOutliner.SetMaxAutoPaperSize(aAnchorTextSize); diff --git a/sw/inc/IDocumentContentOperations.hxx b/sw/inc/IDocumentContentOperations.hxx index 39f92650ea04..38c900a92825 100644 --- a/sw/inc/IDocumentContentOperations.hxx +++ b/sw/inc/IDocumentContentOperations.hxx @@ -188,11 +188,11 @@ public: attribute is split, provided it makes sense. Nodes, where this attribute does not make sense are ignored. In nodes completely enclosed in the selection the attribute - becomes hard-formated, in all other (text-) nodes the attribute + becomes hard-formatted, in all other (text-) nodes the attribute is inserted into the attribute array. For a character attribute, in cases where no selection exists an "empty" hint is inserted. If there is a selection the attribute - is hard-formated and added to the node at rRg.Start(). + is hard-formatted and added to the node at rRg.Start(). If the attribute could not be inserted, the method returns false. */ diff --git a/sw/inc/dbfld.hxx b/sw/inc/dbfld.hxx index 9ee797c76f19..7df97ef6d9b0 100644 --- a/sw/inc/dbfld.hxx +++ b/sw/inc/dbfld.hxx @@ -54,7 +54,7 @@ public: }; // Classes derived from SwFields. They overlay the expand-function. -// Content is formated according to the format (if available). +// Content is formatted according to the format (if available). class SW_DLLPUBLIC SwDBField : public SwValueField { OUString aContent; diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index 200449428be1..a096bbef7cbe 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -759,7 +759,7 @@ public: void SetAllUniqueFlyNames(); /** Reset attributes. All TxtHints and (if completely selected) all hard- - formated stuff (auto-formats) are removed. + formatted stuff (auto-formats) are removed. Introduce new optional parameter in order to control, if the side effect "send data changed events" is triggered or not. */ void ResetAttrs( const SwPaM &rRg, diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx index 03aca2b9712c..13587c691a16 100644 --- a/sw/inc/fesh.hxx +++ b/sw/inc/fesh.hxx @@ -121,7 +121,7 @@ enum ObjCntType enum CurRectType { RECT_PAGE, ///< Rect of current page. - RECT_PAGE_CALC, ///< ... page will be formated if required. + RECT_PAGE_CALC, ///< ... page will be formatted if required. RECT_PAGE_PRT, ///< Rect of current PrtArea of page. RECT_FRM, ///< Rect of current frame. RECT_FLY_EMBEDDED, ///< Rect of current FlyFrm. diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx index 993abd1fca10..b43e4f9bf09e 100644 --- a/sw/inc/fldbas.hxx +++ b/sw/inc/fldbas.hxx @@ -378,7 +378,7 @@ inline sal_uInt32 SwField::GetFormat() const inline sal_uInt16 SwField::GetLanguage() const { return nLang; } - /// Fields containing values that have to be formated via number formatter. + /// Fields containing values that have to be formatted via number formatter. class SwValueFieldType : public SwFieldType { SwDoc* pDoc; diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx index 4013b2596915..4537fde88258 100644 --- a/sw/inc/node.hxx +++ b/sw/inc/node.hxx @@ -262,7 +262,7 @@ public: table cells ... including anchor in case of frames or footnotes)? */ bool IsProtect() const; - /** Search PageDesc with which this node is formated. If layout is existent + /** Search PageDesc with which this node is formatted. If layout is existent search over layout, else only the hard way is left: search over the nodes to the front!! */ const SwPageDesc* FindPageDesc( bool bCalcLay, sal_uInt32* pPgDescNdIdx = 0 ) const; diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx index 751f52853c95..f20b88524a4b 100644 --- a/sw/inc/swtable.hxx +++ b/sw/inc/swtable.hxx @@ -436,7 +436,7 @@ public: bool IsInHeadline( const SwTable* pTbl = 0 ) const; - // Contains box contents, that can be formated as a number? + // Contains box contents, that can be formatted as a number? bool HasNumCntnt( double& rNum, sal_uInt32& rFmtIndex, bool& rIsEmptyTxtNd ) const; sal_uLong IsValidNumTxtNd( bool bCheckAttr = true ) const; diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx index 0598e5871214..33823251456c 100644 --- a/sw/source/core/layout/trvlfrm.cxx +++ b/sw/source/core/layout/trvlfrm.cxx @@ -1446,7 +1446,7 @@ void SwPageFrm::GetCntntPosition( const Point &rPt, SwPosition &rPos ) const if( !pAct->IsValid() ) { - // CntntFrm not formated -> always on node-beginning + // CntntFrm not formatted -> always on node-beginning SwCntntNode* pCNd = (SwCntntNode*)pAct->GetNode(); OSL_ENSURE( pCNd, "Where is my CntntNode?" ); rPos.nNode = *pCNd; diff --git a/sw/source/core/text/widorp.cxx b/sw/source/core/text/widorp.cxx index 89ad3980d21c..305c6ddd9d2a 100644 --- a/sw/source/core/text/widorp.cxx +++ b/sw/source/core/text/widorp.cxx @@ -99,7 +99,7 @@ SwTxtFrmBreak::SwTxtFrmBreak( SwTxtFrm *pNewFrm, const SwTwips nRst ) * Master- and Follow-Frame: * Example: If the first column is 3cm and the second is 4cm and * Widows is set to 3, the decision if the Widows rule matches can not - * be done until the Follow is formated. Unfortunately this is crucial + * be done until the Follow is formatted. Unfortunately this is crucial * to decide if the whole paragraph goes to the next page or not. */ bool SwTxtFrmBreak::IsInside( SwTxtMargin &rLine ) const diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx index f8145e2951aa..f085e7feec19 100644 --- a/sw/source/filter/ww8/ww8par3.cxx +++ b/sw/source/filter/ww8/ww8par3.cxx @@ -2003,7 +2003,7 @@ void SwWW8ImplReader::Read_LFOPosition(sal_uInt16, const sal_uInt8* pData, } else if (SwTxtNode* pTxtNode = pPaM->GetNode().GetTxtNode()) { - // here a paragraph is being directly formated + // here a paragraph is being directly formatted // empty the numbering/list style applied to the current paragraph SwNumRuleItem aEmptyRule( aEmptyOUStr ); diff --git a/swext/mediawiki/src/filter/odt2mediawiki.xsl b/swext/mediawiki/src/filter/odt2mediawiki.xsl index 1205536bac42..89fecbc971e5 100644 --- a/swext/mediawiki/src/filter/odt2mediawiki.xsl +++ b/swext/mediawiki/src/filter/odt2mediawiki.xsl @@ -481,7 +481,7 @@ -->