diff --git a/main/autodoc/inc/ary/doc/d_types4doc.hxx b/main/autodoc/inc/ary/doc/d_types4doc.hxx index 67d4011c65d..5401f2316ed 100644 --- a/main/autodoc/inc/ary/doc/d_types4doc.hxx +++ b/main/autodoc/inc/ary/doc/d_types4doc.hxx @@ -43,7 +43,7 @@ enum E_BlockType dbt_singleline }; -/** Type of documentation text: with html or without. +/** Type of documentation text: with HTML or without. */ enum E_TextType { diff --git a/main/basctl/source/basicide/moduldl2.cxx b/main/basctl/source/basicide/moduldl2.cxx index e0c016dfcdc..0b7234baffa 100644 --- a/main/basctl/source/basicide/moduldl2.cxx +++ b/main/basctl/source/basicide/moduldl2.cxx @@ -795,7 +795,7 @@ void LibPage::InsertLib() aFilter += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ";*.sdw;*.sxw;*.odt" ) ); // text aFilter += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ";*.vor;*.stw;*.ott" ) ); // text template aFilter += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ";*.sgl;*.sxg;*.odm" ) ); // master document - aFilter += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ";*.oth" ) ); // html document template + aFilter += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ";*.oth" ) ); // HTML document template aFilter += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ";*.sdc;*.sxc;*.ods" ) ); // spreadsheet aFilter += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ";*.stc;*.ots" ) ); // spreadsheet template aFilter += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ";*.sda;*.sxd;*.odg" ) ); // drawing diff --git a/main/dbaccess/source/ui/misc/WCopyTable.cxx b/main/dbaccess/source/ui/misc/WCopyTable.cxx index ab1bd64c58e..15b54e3aaf0 100644 --- a/main/dbaccess/source/ui/misc/WCopyTable.cxx +++ b/main/dbaccess/source/ui/misc/WCopyTable.cxx @@ -728,7 +728,7 @@ void OCopyTableWizard::construct() m_pbNext.GrabFocus(); if (m_vDestColumns.size()) - // source is a html or rtf table + // source is a HTML or rtf table m_pbNext.SetStyle(m_pbFinish.GetStyle() | WB_DEFBUTTON); else m_pbFinish.SetStyle(m_pbFinish.GetStyle() | WB_DEFBUTTON); diff --git a/main/dtrans/source/win32/dtobj/FmtFilter.cxx b/main/dtrans/source/win32/dtobj/FmtFilter.cxx index 60ecc4eac35..29db06ebd49 100644 --- a/main/dtrans/source/win32/dtobj/FmtFilter.cxx +++ b/main/dtrans/source/win32/dtobj/FmtFilter.cxx @@ -242,7 +242,7 @@ Sequence< sal_Int8 > SAL_CALL OOBmpToWinDIB( Sequence< sal_Int8 >& aOOBmp ) //------------------------------------------------------------------------------ // converts the openoffice text/html clipboard format to the HTML Format // well known under MS Windows -// the MS HTML Format has a header before the real html data +// the MS HTML Format has a header before the real HTML data // // Version:1.0 Version number of the clipboard. Staring is 0.9 // StartHTML: Byte count from the beginning of the clipboard to the start @@ -288,7 +288,7 @@ Sequence< sal_Int8 > SAL_CALL TextHtmlToHTMLFormat( Sequence< sal_Int8 >& aTextH sal_uInt32 lHTMLFmtHdr = rtl_str_getLength( aHTMLFmtHdr ); // the office always writes the start - // and end html tag in upper cases and + // and end HTML tag in upper cases and // without spaces // both tags don't allow parameters OString startHtmlTag( "" ); @@ -321,7 +321,7 @@ Sequence< sal_Int8 > SAL_CALL TextHtmlToHTMLFormat( Sequence< sal_Int8 >& aTextH nStartFrgmt = nStartFrgmt + startBodyTag.getLength( ) + lHTMLFmtHdr; // after the tag nEndFrgmt = nEndFrgmt + lHTMLFmtHdr; - // fill the html header + // fill the HTML header rtl_zeroMemory( aHTMLFmtHdr, sizeof( aHTMLFmtHdr ) ); wsprintf( @@ -360,7 +360,7 @@ std::string GetHtmlFormatHeader(size_t startHtml, size_t endHtml, size_t startFr return htmlHeader.str(); } -// the office always writes the start and end html tag in upper cases and +// the office always writes the start and end HTML tag in upper cases and // without spaces both tags don't allow parameters const std::string TAG_HTML = std::string(""); const std::string TAG_END_HTML = std::string(""); diff --git a/main/dtrans/source/win32/dtobj/FmtFilter.hxx b/main/dtrans/source/win32/dtobj/FmtFilter.hxx index 73c78165344..6ed718fedc1 100644 --- a/main/dtrans/source/win32/dtobj/FmtFilter.hxx +++ b/main/dtrans/source/win32/dtobj/FmtFilter.hxx @@ -78,7 +78,7 @@ com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL OOBmpToWinDIB( com::sun::star /*------------------------------------------------------------------------ input: aTextHtml - a sequence of text/html which will be converted to the - HTML Format; the HTML Format has header before the real html data + HTML Format; the HTML Format has header before the real HTML data the Format is described in the MSDN Library under HTML Clipboard Format ------------------------------------------------------------------------*/ diff --git a/main/extras/source/misc_config/wizard/web/layouts/diagonal/index.html.xsl b/main/extras/source/misc_config/wizard/web/layouts/diagonal/index.html.xsl index 4ba42de3655..915aa32882d 100644 --- a/main/extras/source/misc_config/wizard/web/layouts/diagonal/index.html.xsl +++ b/main/extras/source/misc_config/wizard/web/layouts/diagonal/index.html.xsl @@ -46,13 +46,13 @@ @@ -108,13 +108,13 @@
diff --git a/main/extras/source/misc_config/wizard/web/layouts/frame_bottom/tocframe.html.xsl b/main/extras/source/misc_config/wizard/web/layouts/frame_bottom/tocframe.html.xsl index 370500a96e0..b0e3a430628 100644 --- a/main/extras/source/misc_config/wizard/web/layouts/frame_bottom/tocframe.html.xsl +++ b/main/extras/source/misc_config/wizard/web/layouts/frame_bottom/tocframe.html.xsl @@ -78,7 +78,7 @@ places...

diff --git a/main/extras/source/misc_config/wizard/web/layouts/frame_left/tocframe.html.xsl b/main/extras/source/misc_config/wizard/web/layouts/frame_left/tocframe.html.xsl index 321021fc42b..6811119e1e4 100644 --- a/main/extras/source/misc_config/wizard/web/layouts/frame_left/tocframe.html.xsl +++ b/main/extras/source/misc_config/wizard/web/layouts/frame_left/tocframe.html.xsl @@ -73,7 +73,7 @@ places...

diff --git a/main/extras/source/misc_config/wizard/web/layouts/frame_right/tocframe.html.xsl b/main/extras/source/misc_config/wizard/web/layouts/frame_right/tocframe.html.xsl index 99fad174bba..3ea4bcd538b 100644 --- a/main/extras/source/misc_config/wizard/web/layouts/frame_right/tocframe.html.xsl +++ b/main/extras/source/misc_config/wizard/web/layouts/frame_right/tocframe.html.xsl @@ -73,7 +73,7 @@ places...

diff --git a/main/extras/source/misc_config/wizard/web/layouts/frame_top/tocframe.html.xsl b/main/extras/source/misc_config/wizard/web/layouts/frame_top/tocframe.html.xsl index 5f502a7b24e..fec54773d33 100644 --- a/main/extras/source/misc_config/wizard/web/layouts/frame_top/tocframe.html.xsl +++ b/main/extras/source/misc_config/wizard/web/layouts/frame_top/tocframe.html.xsl @@ -77,7 +77,7 @@ places...

diff --git a/main/extras/source/misc_config/wizard/web/layouts/layoutX.xsl b/main/extras/source/misc_config/wizard/web/layouts/layoutX.xsl index 32d40e26ba3..27e7da1180b 100644 --- a/main/extras/source/misc_config/wizard/web/layouts/layoutX.xsl +++ b/main/extras/source/misc_config/wizard/web/layouts/layoutX.xsl @@ -63,7 +63,7 @@ @@ -82,7 +82,7 @@ @@ -97,7 +97,7 @@ --> @@ -142,7 +142,7 @@ diff --git a/main/extras/source/misc_config/wizard/web/layouts/simple/index.html.xsl b/main/extras/source/misc_config/wizard/web/layouts/simple/index.html.xsl index 8fed8131de9..2e97fc04689 100644 --- a/main/extras/source/misc_config/wizard/web/layouts/simple/index.html.xsl +++ b/main/extras/source/misc_config/wizard/web/layouts/simple/index.html.xsl @@ -66,7 +66,7 @@ places...   @@ -80,7 +80,7 @@ places... @@ -134,7 +134,7 @@ places... @@ -142,7 +142,7 @@ places... diff --git a/main/extras/source/misc_config/wizard/web/layouts/table_2/index.html.xsl b/main/extras/source/misc_config/wizard/web/layouts/table_2/index.html.xsl index 14d3b1c7baf..295bb21d02a 100644 --- a/main/extras/source/misc_config/wizard/web/layouts/table_2/index.html.xsl +++ b/main/extras/source/misc_config/wizard/web/layouts/table_2/index.html.xsl @@ -80,7 +80,7 @@ places... @@ -88,7 +88,7 @@ places... @@ -99,7 +99,7 @@ places... - + @@ -119,7 +119,7 @@ places... - + diff --git a/main/extras/source/misc_config/wizard/web/layouts/table_3/index.html.xsl b/main/extras/source/misc_config/wizard/web/layouts/table_3/index.html.xsl index d414639f744..66aaaa0bfc2 100644 --- a/main/extras/source/misc_config/wizard/web/layouts/table_3/index.html.xsl +++ b/main/extras/source/misc_config/wizard/web/layouts/table_3/index.html.xsl @@ -80,7 +80,7 @@ places... @@ -88,7 +88,7 @@ places... @@ -99,7 +99,7 @@ places... - + @@ -119,7 +119,7 @@ places... - + diff --git a/main/extras/source/misc_config/wizard/web/layouts/zigzag/index.html.xsl b/main/extras/source/misc_config/wizard/web/layouts/zigzag/index.html.xsl index a9f87986402..e92defaaca8 100644 --- a/main/extras/source/misc_config/wizard/web/layouts/zigzag/index.html.xsl +++ b/main/extras/source/misc_config/wizard/web/layouts/zigzag/index.html.xsl @@ -69,13 +69,13 @@ places... @@ -194,14 +194,14 @@ places...
 
diff --git a/main/filter/source/xslt/odf2xhtml/export/common/table/table_columns.xsl b/main/filter/source/xslt/odf2xhtml/export/common/table/table_columns.xsl index bdd13f0a338..fd8a9ed523a 100644 --- a/main/filter/source/xslt/odf2xhtml/export/common/table/table_columns.xsl +++ b/main/filter/source/xslt/odf2xhtml/export/common/table/table_columns.xsl @@ -200,7 +200,7 @@ - + diff --git a/main/forms/source/component/DatabaseForm.cxx b/main/forms/source/component/DatabaseForm.cxx index 39795db5830..ddffe7a1a0d 100644 --- a/main/forms/source/component/DatabaseForm.cxx +++ b/main/forms/source/component/DatabaseForm.cxx @@ -482,7 +482,7 @@ ODatabaseForm::~ODatabaseForm() } //============================================================================== -// html tools +// HTML tools //------------------------------------------------------------------------ ::rtl::OUString ODatabaseForm::GetDataURLEncoded(const Reference& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt) { @@ -541,7 +541,7 @@ ::rtl::OUString ODatabaseForm::GetDataEncoded(bool _bURLEncoded,const Reference< } //============================================================================== -// html tools +// HTML tools //------------------------------------------------------------------------ ::rtl::OUString ODatabaseForm::GetDataTextEncoded(const Reference& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt) { @@ -3955,7 +3955,7 @@ void SAL_CALL ODatabaseForm::write(const Reference& _rxOutS _rxOutStream->writeBoolean(m_bAllowUpdate); _rxOutStream->writeBoolean(m_bAllowDelete); - // html form stuff + // HTML form stuff ::rtl::OUString sTmp = INetURLObject::decode( m_aTargetURL, '%', INetURLObject::DECODE_UNAMBIGUOUS); _rxOutStream << sTmp; _rxOutStream->writeShort( (sal_Int16)m_eSubmitMethod ); @@ -4063,7 +4063,7 @@ void SAL_CALL ODatabaseForm::read(const Reference& _rxInStre m_bAllowUpdate = _rxInStream->readBoolean(); m_bAllowDelete = _rxInStream->readBoolean(); - // html stuff + // HTML stuff ::rtl::OUString sTmp; _rxInStream >> sTmp; m_aTargetURL = INetURLObject::decode( sTmp, '%', INetURLObject::DECODE_UNAMBIGUOUS); diff --git a/main/forms/source/component/DatabaseForm.hxx b/main/forms/source/component/DatabaseForm.hxx index f02820c95df..c3443f3a019 100644 --- a/main/forms/source/component/DatabaseForm.hxx +++ b/main/forms/source/component/DatabaseForm.hxx @@ -90,7 +90,7 @@ namespace frm //......................................................................... //======================================================================== -//= html tools +//= HTML tools //======================================================================== const sal_uInt16 SUCCESSFUL_REPRESENT_TEXT = 0x0001; @@ -524,7 +524,7 @@ private: void onError(const ::com::sun::star::sdb::SQLErrorEvent& _rEvent); void onError(const ::com::sun::star::sdbc::SQLException&, const ::rtl::OUString& _rContextDescription); - // html tools + // HTML tools ::rtl::OUString GetDataEncoded(bool _bURLEncoded,const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt); ::rtl::OUString GetDataURLEncoded(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt); ::rtl::OUString GetDataTextEncoded(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt); diff --git a/main/framework/qa/complex/framework/autosave/Protocol.java b/main/framework/qa/complex/framework/autosave/Protocol.java index 7a326ab099a..3297c9bf126 100644 --- a/main/framework/qa/complex/framework/autosave/Protocol.java +++ b/main/framework/qa/complex/framework/autosave/Protocol.java @@ -73,7 +73,7 @@ public class Protocol extends JComponent * @const MODE_STDOUT messages are logged to stdout * @const MODE_STDERR messages are logged to stderr * @const MODE_ASCII messages are logged to an ascii file - * @const MODE_HTML messages are logged to a html file + * @const MODE_HTML messages are logged to a HTML file * * @const TYPE_SCOPE_OPEN open, mark or count a new scope for following log statements * @const TYPE_SCOPE_CLOSE close, mark or count the current scope @@ -298,7 +298,7 @@ public synchronized String toString() /** * format this line as a string for writing log files - * using the html format + * using the HTML format */ public synchronized String toHTML() { @@ -503,7 +503,7 @@ public Protocol(int nMode , // ____________________ /** * For some modes it's necessary, that we write some additional - * informations to the log. E.g. for html we must generate close targets. + * informations to the log. E.g. for HTML we must generate close targets. */ public synchronized void finish() { @@ -754,10 +754,10 @@ public synchronized void resetStatistics() // ____________________ /** - * returns a generic html header for generating html log files + * returns a generic HTML header for generating HTML log files * - * It's used from the method finish() to generate a valid html formatted file. - * For that it's necessary to open some special html targets like e.g. . + * It's used from the method finish() to generate a valid HTML formatted file. + * For that it's necessary to open some special HTML targets like e.g. . * * @return A string, which includes the whole header. * diff --git a/main/framework/test/typecfg/cfgview.cxx b/main/framework/test/typecfg/cfgview.cxx index d8d83f97353..95755003d36 100644 --- a/main/framework/test/typecfg/cfgview.cxx +++ b/main/framework/test/typecfg/cfgview.cxx @@ -233,7 +233,7 @@ void CFGView::impl_printSyntax() /*-************************************************************************************************************//** @short analyze command line arguments @descr Created binary accept different command line arguments. These parameters - regulate creation of this html view. Follow arguments are supported: + regulate creation of this HTML view. Follow arguments are supported: "-dir=" "-ver=[1|2|3]" diff --git a/main/javainstaller2/src/Helpfiles/create_helpfiles.pl b/main/javainstaller2/src/Helpfiles/create_helpfiles.pl index f2c74ed5051..bede711254d 100755 --- a/main/javainstaller2/src/Helpfiles/create_helpfiles.pl +++ b/main/javainstaller2/src/Helpfiles/create_helpfiles.pl @@ -24,7 +24,7 @@ -# create java installer help files in html format for all languages defined in ulf file +# create java installer help files in HTML format for all languages defined in ulf file use Cwd; use File::Copy; @@ -136,13 +136,13 @@ sub main::collect_helpfile_content my @helpfilecontent = (); my $stringhash = create_string_hash($ulffile, $language); - # Collecting all strings for one html file. + # Collecting all strings for one HTML file. # For "Prologue_de.html" all files need to begin with "STRING_PROLOGUE_X" # The "X" is the ordering number. my $basestring = "STRING_" . uc($helpfilename) . "_"; - for ( my $i = 0; $i <= 10; $i++ ) # 10 strings possible for each html file + for ( my $i = 0; $i <= 10; $i++ ) # 10 strings possible for each HTML file { my $key = $basestring . $i; if ( exists $stringhash->{$key} ) diff --git a/main/javainstaller2/src/Helpfiles/helpfilenames.txt b/main/javainstaller2/src/Helpfiles/helpfilenames.txt index d81ec2ee1ea..23c5d08532d 100644 --- a/main/javainstaller2/src/Helpfiles/helpfilenames.txt +++ b/main/javainstaller2/src/Helpfiles/helpfilenames.txt @@ -19,7 +19,7 @@ # #************************************************************** -# List of all required html files: +# List of all required HTML files: # -> ChooseDirectory.html, ChooseDirectory_de.html, ... Prologue AcceptLicense diff --git a/main/javainstaller2/src/JavaSetup/org/openoffice/setup/Dialogs/HelpDialog.java b/main/javainstaller2/src/JavaSetup/org/openoffice/setup/Dialogs/HelpDialog.java index 5d0ab1a1f40..c5ed649e1d3 100644 --- a/main/javainstaller2/src/JavaSetup/org/openoffice/setup/Dialogs/HelpDialog.java +++ b/main/javainstaller2/src/JavaSetup/org/openoffice/setup/Dialogs/HelpDialog.java @@ -139,7 +139,7 @@ private JEditorPane createEditorPane() { } } else { - System.err.println("Did not find html directory"); + System.err.println("Did not find HTML directory"); } return editorPane; diff --git a/main/javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/AcceptLicense.java b/main/javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/AcceptLicense.java index 08b440c0b2a..91d0c220df9 100644 --- a/main/javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/AcceptLicense.java +++ b/main/javainstaller2/src/JavaSetup/org/openoffice/setup/Panel/AcceptLicense.java @@ -92,7 +92,7 @@ private JEditorPane createEditorPane() { System.err.println("Attempted to read a bad URL"); } } else { - System.err.println("Did not find html directory"); + System.err.println("Did not find HTML directory"); } return editorPane; diff --git a/main/javainstaller2/src/JavaSetup/org/openoffice/setup/ResourceManager.java b/main/javainstaller2/src/JavaSetup/org/openoffice/setup/ResourceManager.java index 64639bf1048..5d78fd43243 100644 --- a/main/javainstaller2/src/JavaSetup/org/openoffice/setup/ResourceManager.java +++ b/main/javainstaller2/src/JavaSetup/org/openoffice/setup/ResourceManager.java @@ -79,7 +79,7 @@ static public void checkFileExistence(File htmlDirectory) { setupFiles.put(key, newFileName); // System.err.println("Using file: " + fileName); } else { - // Introducing fallback to a very special simple html page + // Introducing fallback to a very special simple HTML page String simplePage = "Excuse.html"; File simpleFile = new File(htmlDirectory, simplePage); if ( simpleFile.exists() ) { diff --git a/main/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/InfoDir.java b/main/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/InfoDir.java index e9db5560dad..e8d9153bed8 100644 --- a/main/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/InfoDir.java +++ b/main/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/InfoDir.java @@ -303,7 +303,7 @@ static public void prepareUninstallation() { static public void removeUninstallationFiles() { // removing selected File removeSpecialFiles(); - // removing directories html/images, html and xpd + // removing directories html/images, HTML and xpd removeInforootSubdir("html", "images"); removeInforootSubdir("html"); removeInforootSubdir("xpd"); diff --git a/main/l10ntools/source/filter/utils/Cache.java b/main/l10ntools/source/filter/utils/Cache.java index 0141d198864..22f6720ea17 100644 --- a/main/l10ntools/source/filter/utils/Cache.java +++ b/main/l10ntools/source/filter/utils/Cache.java @@ -481,9 +481,9 @@ public synchronized void fromXML(java.io.File aXML , //___________________________________________ - /** create some html views of the current content of this cache. + /** create some HTML views of the current content of this cache. * - * The given directory is used to create different html files + * The given directory is used to create different HTML files * there. Every of them show another aspect of this cache. * E.g.: - all type/filter properties * - relation ships between types/filters/loaders etc. diff --git a/main/odk/examples/java/Inspector/UnoNode.java b/main/odk/examples/java/Inspector/UnoNode.java index 3587de9b72c..1770f2ca087 100644 --- a/main/odk/examples/java/Inspector/UnoNode.java +++ b/main/odk/examples/java/Inspector/UnoNode.java @@ -125,7 +125,7 @@ protected void setLabel(String _sLabel){ public void openIdlDescription(String _sIDLUrl, String _sClassName, String _sAnchor){ try{ String sIDLUrl = _sIDLUrl; - String sAnchor = ""; // TODO find out how the Anchor may be set at the html file; //_sAnchor; + String sAnchor = ""; // TODO find out how the Anchor may be set at the HTML file; //_sAnchor; boolean bExists = Introspector.getIntrospector().getXSimpleFileAccess().exists(sIDLUrl); if (sIDLUrl.equals("") || (!bExists)){ sIDLUrl = "http://api.openoffice.org/" + Inspector.sIDLDOCUMENTSUBFOLDER; diff --git a/main/offapi/com/sun/star/image/ImageMap.idl b/main/offapi/com/sun/star/image/ImageMap.idl index 45b1663f4a5..a10667e7c64 100644 --- a/main/offapi/com/sun/star/image/ImageMap.idl +++ b/main/offapi/com/sun/star/image/ImageMap.idl @@ -37,7 +37,7 @@ //============================================================================= -/** This service specifies a html image map. +/** This service specifies a HTML image map. */ published service ImageMap { diff --git a/main/offapi/com/sun/star/image/ImageMapCircleObject.idl b/main/offapi/com/sun/star/image/ImageMapCircleObject.idl index d0161fc5ea9..c8ea30cec29 100644 --- a/main/offapi/com/sun/star/image/ImageMapCircleObject.idl +++ b/main/offapi/com/sun/star/image/ImageMapCircleObject.idl @@ -38,7 +38,7 @@ //============================================================================= /** this service describes a circular-shaped region inside - a html image map. + a HTML image map. @see ImageMap @see ImageMapObject */ diff --git a/main/offapi/com/sun/star/image/ImageMapPolygonObject.idl b/main/offapi/com/sun/star/image/ImageMapPolygonObject.idl index 847b048b588..bfafd0d01e7 100644 --- a/main/offapi/com/sun/star/image/ImageMapPolygonObject.idl +++ b/main/offapi/com/sun/star/image/ImageMapPolygonObject.idl @@ -38,7 +38,7 @@ //============================================================================= /** this service describes a polygon-shaped region inside - a html image map. + a HTML image map. @see ImageMap @see ImageMapObject */ diff --git a/main/offapi/com/sun/star/image/ImageMapRectangleObject.idl b/main/offapi/com/sun/star/image/ImageMapRectangleObject.idl index 03e05809bfa..d045b559b71 100644 --- a/main/offapi/com/sun/star/image/ImageMapRectangleObject.idl +++ b/main/offapi/com/sun/star/image/ImageMapRectangleObject.idl @@ -38,7 +38,7 @@ //============================================================================= /** this service describes a rectangular-shaped region inside - a html image map. + a HTML image map. @see ImageMap @see ImageMapObject */ diff --git a/main/pyuno/demo/ooextract.py b/main/pyuno/demo/ooextract.py index 8dee28c02a5..bd92a35529a 100644 --- a/main/pyuno/demo/ooextract.py +++ b/main/pyuno/demo/ooextract.py @@ -124,7 +124,7 @@ def usage(): " the script should connect to in order to do the conversion.\n" + " The strings defaults to socket,host=localhost,port=2002\n" "--html \n" - " Instead of the text filter, the writer html filter is used\n" + " Instead of the text filter, the writer HTML filter is used\n" ) main() diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/convwatch/ConvWatchStarter.java b/main/qadevOOo/java/OOoRunner/src/main/java/convwatch/ConvWatchStarter.java index 6b376089d4e..b8fbd4f1a02 100644 --- a/main/qadevOOo/java/OOoRunner/src/main/java/convwatch/ConvWatchStarter.java +++ b/main/qadevOOo/java/OOoRunner/src/main/java/convwatch/ConvWatchStarter.java @@ -294,7 +294,7 @@ public void compareGraphicalDiffs() LISToutput.close(); HTMLoutput.close(); - log.println("The file '" + HTMLoutput.getFilename() + "' shows a html based status."); + log.println("The file '" + HTMLoutput.getFilename() + "' shows a HTML based status."); DB.writeHTMLFile(HTMLoutput.getFilename()); } diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/graphical/ParameterHelper.java b/main/qadevOOo/java/OOoRunner/src/main/java/graphical/ParameterHelper.java index 025022e5b53..86278d63ad3 100644 --- a/main/qadevOOo/java/OOoRunner/src/main/java/graphical/ParameterHelper.java +++ b/main/qadevOOo/java/OOoRunner/src/main/java/graphical/ParameterHelper.java @@ -404,7 +404,7 @@ public String getHTMLPrefix() String sPrefix = (String)getTestParameters().get( PropertyName.DOC_COMPARATOR_HTML_OUTPUT_PREFIX ); if (sPrefix == null || sPrefix.length() == 0) { - GlobalLogWriter.println("Please set html prefix " + PropertyName.DOC_COMPARATOR_HTML_OUTPUT_PREFIX + "=prefix."); + GlobalLogWriter.println("Please set HTML prefix " + PropertyName.DOC_COMPARATOR_HTML_OUTPUT_PREFIX + "=prefix."); } else { diff --git a/main/sal/qa/helper/gcov/gcov_result.pl b/main/sal/qa/helper/gcov/gcov_result.pl index 981fcdf416b..69135bd88b5 100644 --- a/main/sal/qa/helper/gcov/gcov_result.pl +++ b/main/sal/qa/helper/gcov/gcov_result.pl @@ -25,7 +25,7 @@ # GCOV_RESULT # -# Helper, to interpret the result and put the result via html in a database. +# Helper, to interpret the result and put the result via HTML in a database. # Put into DB works via php. # # Q: Why perl? diff --git a/main/scripting/examples/javascript/ExportSheetsToHTML/exportsheetstohtml.js b/main/scripting/examples/javascript/ExportSheetsToHTML/exportsheetstohtml.js index f9e30cc5767..698bfe8ba1f 100644 --- a/main/scripting/examples/javascript/ExportSheetsToHTML/exportsheetstohtml.js +++ b/main/scripting/examples/javascript/ExportSheetsToHTML/exportsheetstohtml.js @@ -20,7 +20,7 @@ // ************************************************************* // When this script is run on an existing, saved, spreadsheet, // eg. /home/testuser/myspreadsheet.sxc, the script will export -// each sheet to a separate html file, +// each sheet to a separate HTML file, // eg. /home/testuser/myspreadsheet_sheet1.html, // /home/testuser/myspreadsheet_sheet2.html etc importClass(Packages.com.sun.star.uno.UnoRuntime); diff --git a/main/sd/source/filter/html/htmlex.cxx b/main/sd/source/filter/html/htmlex.cxx index 1c64bccc18d..961af817a42 100644 --- a/main/sd/source/filter/html/htmlex.cxx +++ b/main/sd/source/filter/html/htmlex.cxx @@ -633,7 +633,7 @@ void HtmlExport::InitExportParameters( const Sequence< PropertyValue >& rParams } else { - DBG_ERROR("Unknown property for html export detected!"); + DBG_ERROR("Unknown property for HTML export detected!"); } pParams++; @@ -1161,7 +1161,7 @@ bool HtmlExport::CreateHtmlTextForPresPages() return bOk; } -/** exports the given html data into a non unicode file in the current export path with +/** exports the given HTML data into a non unicode file in the current export path with the given filename */ bool HtmlExport::WriteHtml( const String& rFileName, bool bAddExtension, const String& rHtmlData ) { @@ -2398,7 +2398,7 @@ bool HtmlExport::CreateFrames() // ==================================================================== // Buttonleiste fuer Standard ausgeben -// Es werden 4 html files erstellt +// Es werden 4 HTML files erstellt // navbar0.htm Navigationsleiste Grafik fuer erste Seite // navbar1.htm Navigationsleiste Grafik fuer zweite bis vorletzte Seite // navbar2.htm Navigationsleiste Grafik fuer letzte Seite diff --git a/main/sd/source/filter/html/pubdlg.cxx b/main/sd/source/filter/html/pubdlg.cxx index abaa614481b..a473e2cbc4b 100644 --- a/main/sd/source/filter/html/pubdlg.cxx +++ b/main/sd/source/filter/html/pubdlg.cxx @@ -206,7 +206,7 @@ int SdPublishingDesign::operator ==(const SdPublishingDesign & rDesign) const m_aCompression == rDesign.m_aCompression && m_eFormat == rDesign.m_eFormat && m_bHiddenSlides == rDesign.m_bHiddenSlides && - ( // compare html options + ( // compare HTML options (m_eMode != PUBLISH_HTML && m_eMode != PUBLISH_FRAMES) || ( m_bContentPage == rDesign.m_bContentPage && @@ -1055,7 +1055,7 @@ IMPL_LINK( SdPublishingDlg, DesignDeleteHdl, PushButton *, EMPTYARG ) } // ===================================================================== -// Clickhandler fuer das ändern des Servertyps +// Clickhandler fuer das ändern des Servertyps // ===================================================================== IMPL_LINK( SdPublishingDlg, WebServerHdl, RadioButton *, pButton ) { @@ -1405,7 +1405,7 @@ void SdPublishingDlg::UpdatePage() } } -/** loads the html buttons from the button sets, creates a preview and fills the +/** loads the HTML buttons from the button sets, creates a preview and fills the itemset for page 5 */ void SdPublishingDlg::LoadPreviewButtons() diff --git a/main/sfx2/source/doc/docfile.cxx b/main/sfx2/source/doc/docfile.cxx index dddd026dae9..fb827def025 100644 --- a/main/sfx2/source/doc/docfile.cxx +++ b/main/sfx2/source/doc/docfile.cxx @@ -3333,7 +3333,7 @@ SfxMedium::~SfxMedium() { /* Attention Don't enable CancelTransfers() till you know that the writer/web has changed his asynchronous load - behaviour. Otherwise maybe StyleSheets inside a html file will not be loaded at the right time. + behaviour. Otherwise maybe StyleSheets inside a HTML file will not be loaded at the right time. => further the help will be empty then ... #100490# */ //CancelTransfers(); diff --git a/main/sfx2/source/view/viewsh.cxx b/main/sfx2/source/view/viewsh.cxx index 2307e20d3e8..99ac9f8bcf8 100644 --- a/main/sfx2/source/view/viewsh.cxx +++ b/main/sfx2/source/view/viewsh.cxx @@ -698,7 +698,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq ) aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterName" )); aArgs[0].Value = css::uno::makeAny( aFilterName ); - // Store document in the html format + // Store document in the HTML format try { xStorable->storeToURL( aFileURL, aArgs ); diff --git a/main/solenv/bin/build.pl b/main/solenv/bin/build.pl index b3631c87b7a..f98e2eac009 100755 --- a/main/solenv/bin/build.pl +++ b/main/solenv/bin/build.pl @@ -146,7 +146,7 @@ my $post_job = ''; # -"- my @warnings = (); # array of warnings to be shown at the end of the process my @errors = (); # array of errors to be shown at the end of the process - my %html_info = (); # hash containing all necessary info for generating of html page + my %html_info = (); # hash containing all necessary info for generating of HTML page my %module_by_hash = (); # hash containing all modules names as values and correspondent hashes as keys my %build_in_progress = (); # hash of modules currently being built my %build_is_finished = (); # hash of already built modules diff --git a/main/solenv/bin/patch_tool.pl b/main/solenv/bin/patch_tool.pl index d241f8d8e72..0c6b6638a36 100644 --- a/main/solenv/bin/patch_tool.pl +++ b/main/solenv/bin/patch_tool.pl @@ -1625,7 +1625,7 @@ ($$$$) my $new_name = $candidate; $new_name =~ s/Details.*$/$log_basename.html/; - # Rename the top-level html file and replace the title. + # Rename the top-level HTML file and replace the title. open my $in, "<", $candidate; open my $out, ">", $new_name; while (<$in>) diff --git a/main/solenv/doc/gbuild/doxygen.cfg b/main/solenv/doc/gbuild/doxygen.cfg index b0f057e5189..8f0c20eab18 100644 --- a/main/solenv/doc/gbuild/doxygen.cfg +++ b/main/solenv/doc/gbuild/doxygen.cfg @@ -862,7 +862,7 @@ GENERATE_HTMLHELP = NO # If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can # be used to specify the file name of the resulting .chm file. You # can add a path in front of the file if the result should not be -# written to the html output directory. +# written to the HTML output directory. CHM_FILE = diff --git a/main/sw/inc/doc.hxx b/main/sw/inc/doc.hxx index 1c530891e18..7c1f9d87ab2 100644 --- a/main/sw/inc/doc.hxx +++ b/main/sw/inc/doc.hxx @@ -1430,7 +1430,7 @@ public: // <- #116530# - // --> FME 2005-03-16 #i44963# The html import sometimes overwrites the + // --> FME 2005-03-16 #i44963# The HTML import sometimes overwrites the // page sizes set in the page descriptions. This function is used to // correct this. void CheckDefaultPageFmt(); diff --git a/main/sw/source/ui/uiview/srcview.cxx b/main/sw/source/ui/uiview/srcview.cxx index 9af00060d55..73edaa637fb 100644 --- a/main/sw/source/ui/uiview/srcview.cxx +++ b/main/sw/source/ui/uiview/srcview.cxx @@ -352,7 +352,7 @@ void SwSrcView::Execute(SfxRequest& rReq) // pFileDlg->SetHelpId(HID_FILEDLG_SRCVIEW); uno::Reference xFltMgr(xFP, UNO_QUERY); - // search for an html filter for export + // search for an HTML filter for export SfxFilterContainer* pFilterCont = GetObjectShell()->GetFactory().GetFilterContainer(); const SfxFilter* pFilter = pFilterCont->GetFilter4Extension( C2S("html"), SFX_FILTER_EXPORT ); diff --git a/main/swext/mediawiki/src/com/sun/star/wiki/WikiArticle.java b/main/swext/mediawiki/src/com/sun/star/wiki/WikiArticle.java index 6e4d508e812..7bfd6eef314 100644 --- a/main/swext/mediawiki/src/com/sun/star/wiki/WikiArticle.java +++ b/main/swext/mediawiki/src/com/sun/star/wiki/WikiArticle.java @@ -102,7 +102,7 @@ public WikiArticle( XComponentContext xContext, String sTitle, Hashtable wikiSet } } - // in case of loading the html contents are used + // in case of loading the HTML contents are used // in case of saving the contents should be checked whether they are empty InitArticleHTML(); diff --git a/main/vcl/aqua/source/dtrans/HtmlFmtFlt.cxx b/main/vcl/aqua/source/dtrans/HtmlFmtFlt.cxx index 46fbd5511a2..15990b08fb4 100644 --- a/main/vcl/aqua/source/dtrans/HtmlFmtFlt.cxx +++ b/main/vcl/aqua/source/dtrans/HtmlFmtFlt.cxx @@ -35,7 +35,7 @@ using namespace com::sun::star::uno; //------------------------------------------------------------------------------ // converts the openoffice text/html clipboard format to the HTML Format // well known under MS Windows -// the MS HTML Format has a header before the real html data +// the MS HTML Format has a header before the real HTML data // // Version:1.0 Version number of the clipboard. Staring is 0.9 // StartHTML: Byte count from the beginning of the clipboard to the start @@ -73,7 +73,7 @@ std::string GetHtmlFormatHeader(size_t startHtml, size_t endHtml, size_t startFr } // namespace private -// the office always writes the start and end html tag in upper cases and +// the office always writes the start and end HTML tag in upper cases and // without spaces both tags don't allow parameters const std::string TAG_HTML = std::string(""); const std::string TAG_END_HTML = std::string(""); diff --git a/main/writerfilter/documentation/doxygen/Doxyfile b/main/writerfilter/documentation/doxygen/Doxyfile index ec02ad42c0c..a35135d6329 100644 --- a/main/writerfilter/documentation/doxygen/Doxyfile +++ b/main/writerfilter/documentation/doxygen/Doxyfile @@ -696,7 +696,7 @@ GENERATE_HTMLHELP = NO # If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can # be used to specify the file name of the resulting .chm file. You # can add a path in front of the file if the result should not be -# written to the html output directory. +# written to the HTML output directory. CHM_FILE =