[Libreoffice-commits] core.git: basic/source filter/source include/unotools sc/source sd/source sw/qa sw/source vcl/source writerfilter/source
Thomas Arnhold
thomas at arnhold.org
Mon Feb 3 05:02:32 PST 2014
basic/source/runtime/runtime.cxx | 2 +-
basic/source/sbx/sbxscan.cxx | 2 +-
filter/source/xslt/export/wordml/ooo2wordml_field.xsl | 2 +-
include/unotools/fontcvt.hxx | 4 ++--
sc/source/ui/view/printfun.cxx | 2 +-
sd/source/filter/eppt/eppt.cxx | 2 +-
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 4 ++--
sw/qa/extras/rtfimport/rtfimport.cxx | 2 +-
sw/source/filter/ww8/wrtw8sty.cxx | 2 +-
sw/source/filter/ww8/ww8par.cxx | 2 +-
sw/source/filter/ww8/ww8par3.cxx | 4 ++--
vcl/source/window/split.cxx | 6 +++---
writerfilter/source/dmapper/DomainMapper.cxx | 2 +-
writerfilter/source/rtftok/rtfdocumentimpl.hxx | 2 +-
14 files changed, 19 insertions(+), 19 deletions(-)
New commits:
commit 326bec33e0a08123d716b9d2a06884368a8f07eb
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Feb 3 14:01:31 2014 +0100
some more continuous corrections
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index 8e51eb0..83e81e6 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -983,7 +983,7 @@ SbMethod* SbiRuntime::GetCaller()
// Stacks
-// The expression-stack is available for the continous evaluation
+// The expression-stack is available for the continuous evaluation
// of expressions.
void SbiRuntime::PushVar( SbxVariable* pVar )
diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx
index 6d39ba7..43620d3 100644
--- a/basic/source/sbx/sbxscan.cxx
+++ b/basic/source/sbx/sbxscan.cxx
@@ -916,7 +916,7 @@ void SbxValue::Format( OUString& rRes, const OUString* pFmt ) const
// Remark: For performance reasons there's only ONE BasicFormater-
// object created and 'stored', so that the expensive resource-
// loading is saved (for country-specific predefined outputs,
- // e. g. "On/Off") and the continous string-creation
+ // e. g. "On/Off") and the continuous string-creation
// operations, too.
// BUT: therefore this code is NOT multithreading capable!
diff --git a/filter/source/xslt/export/wordml/ooo2wordml_field.xsl b/filter/source/xslt/export/wordml/ooo2wordml_field.xsl
index eb1eb69..9ea6418 100644
--- a/filter/source/xslt/export/wordml/ooo2wordml_field.xsl
+++ b/filter/source/xslt/export/wordml/ooo2wordml_field.xsl
@@ -354,7 +354,7 @@ $field_number_format_style ='壹, è´°, å, ...' ">
</w:fldSimple>
</xsl:template>
<xsl:template name="field_convert_linebreak">
- <!-- this template convert the linebreak (
 and 
) in continous text to Ms word element<w:br/> -->
+ <!-- this template convert the linebreak (
 and 
) in continuous text to Ms word element<w:br/> -->
<xsl:param name="field_input_text"/>
<xsl:if test="not (contains($field_input_text,'
'))">
<w:t>
diff --git a/include/unotools/fontcvt.hxx b/include/unotools/fontcvt.hxx
index 2beda5d..2a23107 100644
--- a/include/unotools/fontcvt.hxx
+++ b/include/unotools/fontcvt.hxx
@@ -54,9 +54,9 @@ public:
//Starts converting the string at position rIndex. It converts as much of
//the string that can be converted to the same symbol font and returns the
//name of that font. rIndex is modified to the last index that was
- //converted. Typically you call if continously until rIndex ==
+ //converted. Typically you call if continuously until rIndex ==
//rString.Len() and handle each section as separate 8bit strings using
- //separate fonts. Will return an empty string for a continous section
+ //separate fonts. Will return an empty string for a continuous section
//that has no possible mapping.
virtual OUString ConvertString(OUString &rString, sal_Int32 &rIndex) = 0;
virtual ~StarSymbolToMSMultiFont() {}
diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx
index b509e2b..9406a90 100644
--- a/sc/source/ui/view/printfun.cxx
+++ b/sc/source/ui/view/printfun.cxx
@@ -2598,7 +2598,7 @@ void ScPrintFunc::ApplyPrintSettings()
//--------------------------------------------------------------------
// rPageRanges = range for all tables
// nStartPage = rPageRanges starts at nStartPage
-// nDisplayStart = continious number for displaying the page number
+// nDisplayStart = continuous number for displaying the page number
long ScPrintFunc::DoPrint( const MultiSelection& rPageRanges,
long nStartPage, long nDisplayStart, bool bDoPrint,
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index 34abbd6..99ec203 100644
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -783,7 +783,7 @@ sal_Bool PPTWriter::ImplCreateDocument()
// Bit 3 Use named show
// Bit 4 Browse mode on
// Bit 5 Kiosk mode on
- // Bit 7 loop continously
+ // Bit 7 loop continuously
// Bit ? show scrollbar
if ( ImplGetPropertyValue( OUString( "CustomShow" ) ) )
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 6bfe06a..d432f80 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -517,7 +517,7 @@ DECLARE_OOXMLIMPORT_TEST(testN766487, "n766487.docx")
DECLARE_OOXMLIMPORT_TEST(testN693238, "n693238.docx")
{
/*
- * The problem was that a continous section break at the end of the doc caused the margins to be ignored.
+ * The problem was that a continuous section break at the end of the doc caused the margins to be ignored.
*
* xray ThisComponent.StyleFamilies.PageStyles.Default.LeftMargin ' was 2000, should be 635
*/
@@ -682,7 +682,7 @@ DECLARE_OOXMLIMPORT_TEST(testN778140, "n778140.docx")
DECLARE_OOXMLIMPORT_TEST(testN778828, "n778828.docx")
{
/*
- * The problem was that a page break after a continous section break caused
+ * The problem was that a page break after a continuous section break caused
* double page break on title page.
*/
uno::Reference<frame::XModel> xModel(mxComponent, uno::UNO_QUERY);
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx
index 66bd7ef..0289ea2 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -939,7 +939,7 @@ DECLARE_RTFIMPORT_TEST(testFdo58646line, "fdo58646line.rtf")
DECLARE_RTFIMPORT_TEST(testFdo58646, "fdo58646.rtf")
{
- // Page break was ignored inside a continous section, on title page.
+ // Page break was ignored inside a continuous section, on title page.
CPPUNIT_ASSERT_EQUAL(2, getPages());
}
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx
index 363a471..ab89a94 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -1715,7 +1715,7 @@ void MSWordExportBase::SectionProperties( const WW8_SepInfo& rSepInfo, WW8_PdAtt
AttrOutput().OutputStyleItemSet( aSet, true, bOutPgDscSet );
bOutputStyleItemSet = true;
- //Cannot export as normal page framedir, as continous sections
+ //Cannot export as normal page framedir, as continuous sections
//cannot contain any grid settings like proper sections
AttrOutput().SectionBiDi( FRMDIR_HORI_RIGHT_TOP == TrueFrameDirection( *rSepInfo.pSectionFmt ) );
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 285fabd..9db79eb 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -4485,7 +4485,7 @@ void wwSectionManager::InsertSegments()
// End getting the bounds of this section, quite a job eh?
SwSectionFmt *pRet = InsertSection(aSectPaM, *aIter);
- // The last section if continous is always unbalanced
+ // The last section if continuous is always unbalanced
if (pRet)
{
// Set the columns to be UnBalanced if that compatability option is set
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 9a7440a..ff6c175 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -1181,7 +1181,7 @@ WW8ListManager::WW8ListManager(SvStream& rSt_, SwWW8ImplReader& rReader_)
i.e. create a simple list in 2000 and open it in 97 and 97 will
claim (correctly) that it is an outline list. We can set our
- continous flag in these lists to store this information.
+ continuous flag in these lists to store this information.
*/
SwNumRule* pMyNumRule = CreateNextRule(
aLST.bSimpleList || (aBits1 & 0x10));
@@ -1552,7 +1552,7 @@ SwNumRule* WW8ListManager::GetNumRuleForActivation(sal_uInt16 nLFOPosition,
#i1869#
If this list has had its bits set in word 2000 to pretend that it is a
simple list from the point of view of the user, then it is almost
- certainly a simple continous list, and we will try to keep it like that.
+ certainly a simple continuous list, and we will try to keep it like that.
Otherwise when we save again it will be shown as the true outline list
that it is, confusing the user that just wanted what they thought was a
simple list. On the otherhand it is possible that some of the other levels
diff --git a/vcl/source/window/split.cxx b/vcl/source/window/split.cxx
index 3ed8c0d..9d57294 100644
--- a/vcl/source/window/split.cxx
+++ b/vcl/source/window/split.cxx
@@ -394,10 +394,10 @@ void Splitter::ImplKbdTracking( KeyCode aKeyCode )
Point aNewPos;
Size aSize = mpRefWin->GetOutputSize();
Point aPos = GetPosPixel();
- // depending on the position calc allows continous moves or snaps to row/columns
- // continous mode is active when position is at the origin or end of the splitter
+ // depending on the position calc allows continuous moves or snaps to row/columns
+ // continuous mode is active when position is at the origin or end of the splitter
// otherwise snap mode is active
- // default here is snap, holding shift sets continous mode
+ // default here is snap, holding shift sets continuous mode
if( mbHorzSplit )
aNewPos = Point( ImplSplitterActive() ? aPos.X() : mnSplitPos, aKeyCode.IsShift() ? 0 : aSize.Height()/2);
else
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index fbca984..a804339 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1913,7 +1913,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType
OSL_ENSURE(pSectionContext, "SectionContext unavailable!");
if(pSectionContext)
{
- // Ignore continous section break at the end of the document, if the previous section had the same type as well
+ // Ignore continuous section break at the end of the document, if the previous section had the same type as well
// It makes the importer loose margin settings with no benefit
SectionPropertyMap* pLastContext = m_pImpl->GetLastSectionContext();
int nPrevBreakType = 0;
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index 2c213d4..a919614 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -384,7 +384,7 @@ namespace writerfilter {
bool m_bSkipUnknown;
/// Font index <-> encoding map, *not* part of the parser state
std::map<int, rtl_TextEncoding> m_aFontEncodings;
- /// Maps the non-continious font indexes to the continuous dmapper indexes.
+ /// Maps the non-continuous font indexes to the continuous dmapper indexes.
std::vector<int> m_aFontIndexes;
/// Maps style indexes to style names.
std::map<int, OUString> m_aStyleNames;
More information about the Libreoffice-commits
mailing list