mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some more continuous corrections

Browse Source
This commit is contained in:
Thomas Arnhold 2014-02-03 14:01:31 +01:00
parent d271e5fd87
commit 326bec33e0
14 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
basic/source/runtime/runtime.cxx
View File

@ -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 )

2
basic/source/sbx/sbxscan.cxx
View File

@ -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!

2
filter/source/xslt/export/wordml/ooo2wordml_field.xsl
View File

@ -354,7 +354,7 @@ $field_number_format_style ='壹, 贰, 叁, ...' ">
</w:fldSimple>
</xsl:template>
<xsl:template name="field_convert_linebreak">
<!-- this template convert the linebreak (&#x0A; and &#x0D;) in continous text to Ms word element<w:br/> -->
<!-- this template convert the linebreak (&#x0A; and &#x0D;) in continuous text to Ms word element<w:br/> -->
<xsl:param name="field_input_text"/>
<xsl:if test="not (contains($field_input_text,'&#x0A;'))">
<w:t>

4
include/unotools/fontcvt.hxx
View File

@ -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() {}

2
sc/source/ui/view/printfun.cxx
View File

@ -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,

2
sd/source/filter/eppt/eppt.cxx
View File

@ -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" ) ) )

4
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
View File

@ -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);

2
sw/qa/extras/rtfimport/rtfimport.cxx
View File

@ -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());
}

2
sw/source/filter/ww8/wrtw8sty.cxx
View File

@ -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 ) );

2
sw/source/filter/ww8/ww8par.cxx
View File

@ -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

4
sw/source/filter/ww8/ww8par3.cxx
View File

@ -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

6
vcl/source/window/split.cxx
View File

@ -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

2
writerfilter/source/dmapper/DomainMapper.cxx
View File

@ -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;

2
writerfilter/source/rtftok/rtfdocumentimpl.hxx
View File

@ -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;