To complete this:
https://gerrit.libreoffice.org/#/c/78312/

This is a massive replace for lines ending with
".." instead of "..."

It passed "make check" on Linux.

Change-Id: I07fa7b2e30ba9ea17a1f9a5e21c57216ba958efe
Reviewed-on: https://gerrit.libreoffice.org/78356
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Tested-by: Jenkins
This commit is contained in:
Andrea Gelmini
2019-09-01 11:15:11 +02:00
committed by Julien Nabet
parent 9c06059ec5
commit 0940229305
112 changed files with 145 additions and 145 deletions
+1 -1
View File
@@ -275,7 +275,7 @@ task createRCfiles {
}
}
// creating the UI stuff is cheap, don't bother only applying it for the flavor..
// creating the UI stuff is cheap, don't bother only applying it for the flavor...
preBuild.dependsOn 'createRCfiles',
'createStrippedConfigMain',
'createStrippedConfigRegistry',
@@ -172,7 +172,7 @@ public interface TileProvider {
void setGraphicSelectionStart(PointF documentCoordinate);
/**
* Send a request to change end the change of graphic selection..
* Send a request to change end the change of graphic selection...
*/
void setGraphicSelectionEnd(PointF documentCoordinate);
+1 -1
View File
@@ -325,7 +325,7 @@ bool SbiScanner::NextSym()
eScanType = SbxDOUBLE;
bool bScanError = false;
bool bBufOverflow = false;
// All this because of 'D' or 'd' floating point type, sigh..
// All this because of 'D' or 'd' floating point type, sigh...
while(!bScanError && nCol < aLine.getLength() && strchr("0123456789.DEde", aLine[nCol]))
{
// from 4.1.1996: buffer full? -> go on scanning empty
+1 -1
View File
@@ -1874,7 +1874,7 @@ void SbRtl_CDateToIso(StarBASIC *, SbxArray & rPar, bool)
}
// Function to convert date from ISO 8601 date format YYYYMMDD or YYYY-MM-DD
// And even YYMMDD for compatibility, sigh..
// And even YYMMDD for compatibility, sigh...
void SbRtl_CDateFromIso(StarBASIC *, SbxArray & rPar, bool)
{
if ( rPar.Count() == 2 )
+1 -1
View File
@@ -338,7 +338,7 @@ void SbxArray::Merge( SbxArray* p )
}
// Search of an element by his name and type. If an element is an object,
// it will also be scanned..
// it will also be scanned...
SbxVariable* SbxArray::Find( const OUString& rName, SbxClassType t )
{
+1 -1
View File
@@ -51,7 +51,7 @@ bool DerivedClass::VisitCXXRecordDecl(CXXRecordDecl const * decl) {
!decl->hasAnyDependentBases() &&
!decl->forallBases(BaseCheck, &BaseClassName)) {
string warning_msg("class %0 derives from ");
// no idea how BaseClassName can be 0 sometimes..
// no idea how BaseClassName can be 0 sometimes...
if (BaseClassName)
warning_msg += BaseClassName;
report(
+2 -2
View File
@@ -7373,12 +7373,12 @@ if test "$ENABLE_JAVA" != ""; then
add_warning "JAVA_HOME is set to /usr - this is very likely to be incorrect"
add_warning "if this is the case, please inform the correct JAVA_HOME with --with-jdk-home"
fi
dnl now that we probably have the path to the real javac, make a JAVA_HOME out of it..
dnl now that we probably have the path to the real javac, make a JAVA_HOME out of it...
if test "$JAVA_HOME" != "/usr"; then
if test "$_os" = "Darwin" -o "$OS_FOR_BUILD" = MACOSX; then
dnl Leopard returns a non-suitable path with readlink - points to "Current" only
JAVA_HOME=$(echo $JAVA_HOME | $SED -e s,/Current/Commands/javac$,/CurrentJDK/Home,)
dnl Tiger already returns a JDK path..
dnl Tiger already returns a JDK path...
JAVA_HOME=$(echo $JAVA_HOME | $SED -e s,/CurrentJDK/Commands/javac$,/CurrentJDK/Home,)
else
JAVA_HOME=$(echo $JAVA_HOME | $SED -e s,/bin/javac$,,)
+1 -1
View File
@@ -4535,7 +4535,7 @@ static OUString delComment( const OUString& rQuery )
}
else
{
// comment can't close anymore, actually an error, but..
// comment can't close anymore, actually an error, but...
}
continue;
}
+1 -1
View File
@@ -116,7 +116,7 @@ void SvxAreaTabPage::SetOptimalSize(weld::DialogController* pController)
if (!aFillTab.pController)
aFillTab.pParent = GetParentDialog();
// Calculate optimal size of all pages..
// Calculate optimal size of all pages...
m_pFillTabPage.disposeAndReset(SvxColorTabPage::Create(aFillTab, &m_rXFSet));
Size aSize(m_xFillTab->get_preferred_size());
@@ -1457,7 +1457,7 @@ static std::vector< CommentStrip > getComment( const OUString& rQuery )
}
else
{
// comment can't close anymore, actually an error, but..
// comment can't close anymore, actually an error, but...
aRet.emplace_back( aBuf.makeStringAndClear(), false);
}
continue;
+1 -1
View File
@@ -577,7 +577,7 @@ void Desktop::DeInit()
osl_removeSignalHandler( pSignalHandler );
} catch (const RuntimeException&) {
// someone threw an exception during shutdown
// this will leave some garbage behind..
// this will leave some garbage behind...
}
}
+1 -1
View File
@@ -2160,7 +2160,7 @@ static int doc_saveAs(LibreOfficeKitDocument* pThis, const char* sUrl, const cha
OUString aFilterOptions = getUString(pFilterOptions);
// Check if watermark for pdf is passed by filteroptions..
// Check if watermark for pdf is passed by filteroptions...
// It is not a real filter option so it must be filtered out.
OUString watermarkText;
int aIndex = -1;
@@ -58,7 +58,7 @@ Based on:
Missing:
- Currently, u\XXXX sequences are escaped when saving, but not unescaped
when read..
when read...
License: Python License
+2 -2
View File
@@ -247,10 +247,10 @@ bool T602ImportFilter::importImpl( const Sequence< css::beans::PropertyValue >&
return false;
}
// An XML import service: what we push sax messages to..
// An XML import service: what we push sax messages to...
mxHandler.set( mxMSF->createInstance( "com.sun.star.comp.Writer.XMLImporter" ), UNO_QUERY );
// The XImporter sets up an empty target document for XDocumentHandler to write to..
// The XImporter sets up an empty target document for XDocumentHandler to write to...
Reference < XImporter > xImporter(mxHandler, UNO_QUERY);
xImporter->setTargetDocument(mxDoc);
@@ -385,7 +385,7 @@
<xsl:with-param name="globalData" select="$globalData" />
<xsl:with-param name="previousFrameWidths" select="0"/>
<xsl:with-param name="previousFrameHeights" select="0"/>
<!-- 2DO for me (Svante) - Not used, uncertain 4now..
<!-- 2DO for me (Svante) - Not used, uncertain 4now...
<xsl:with-param name="pageMarginLeft">
<xsl:call-template name="getPageMarginLeft"/>
</xsl:with-param>-->
@@ -1608,7 +1608,7 @@
| text:space-before (listlevelstyle) | text:min-label-width |
| + fo:left-margin (firstParagraph) | |
Further details beyond text:list-list..
Further details beyond text:list-list...
-->
<xsl:key name="listStyles" match=" /*/office:styles/text:list-style | /*/office:automatic-styles/text:list-style | /*/office:styles/style:graphic-properties/text:list-style | /*/office:automatic-styles/style:graphic-properties/text:list-style | /*/office:styles/text:list-style | /*/office:automatic-styles/text:list-style | /*/office:styles/style:graphic-properties/text:list-style | /*/office:automatic-styles/style:graphic-properties/text:list-style" use="@style:name"/>
+2 -2
View File
@@ -2297,7 +2297,7 @@ const FormulaToken* FormulaCompiler::CreateStringFromToken( OUStringBuffer& rBuf
rBuffer.appendAscii( pInternal[ eOp - ocInternalBegin ] );
else if (eOp == ocIntersect)
{
// Nasty, ugly, horrific, terrifying..
// Nasty, ugly, horrific, terrifying...
if (FormulaGrammar::isExcelSyntax( meGrammar))
rBuffer.append(' ');
else
@@ -2591,7 +2591,7 @@ OpCode FormulaCompiler::NextToken()
}
}
}
// Nasty, ugly, horrific, terrifying.. significant whitespace..
// Nasty, ugly, horrific, terrifying... significant whitespace...
if (eOp == ocSpaces && FormulaGrammar::isExcelSyntax( meGrammar))
{
// Fake an intersection op as last op for the next round, but at
+1 -1
View File
@@ -141,7 +141,7 @@ void FuncPage::UpdateFunctionList(const OUString& aStr)
const sal_uInt32 nCategoryCount = m_pFunctionManager->getCount();
// Category listbox holds additional entries for Last Used and All, so
// the offset should be two but hard coded numbers are ugly..
// the offset should be two but hard coded numbers are ugly...
const sal_Int32 nCategoryOffset = m_xLbCategory->get_count() - nCategoryCount;
// If a real category (not Last Used or All) is selected, list only
// functions of that category. Else list all, LRU is handled above.
+1 -1
View File
@@ -131,7 +131,7 @@ class JobData final
/**
the alias name of this job.
Is used as entry of configuration set for job registration, to find all
necessary properties of it..
necessary properties of it...
*/
OUString m_sAlias;
+1 -1
View File
@@ -604,7 +604,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
{ LANGUAGE_USER_MANX, "gv", "GB", k0 },
{ LANGUAGE_USER_ARAGONESE, "an", "ES", k0 },
{ LANGUAGE_USER_KEYID, "qtz", "" , k0 }, // key id pseudolanguage used for UI testing
{ LANGUAGE_USER_PALI_LATIN, "pli", "" , kSAME }, // Pali with Latin script, ISO 639-3 (sigh..) back-compat, Latin is not a default script though..
{ LANGUAGE_USER_PALI_LATIN, "pli", "" , kSAME }, // Pali with Latin script, ISO 639-3 (sigh..) back-compat, Latin is not a default script though...
{ LANGUAGE_USER_KYRGYZ_CHINA, "ky", "CN", k0 },
{ LANGUAGE_USER_KOMI_ZYRIAN, "kpv", "RU", k0 },
{ LANGUAGE_USER_KOMI_PERMYAK, "koi", "RU", k0 },
@@ -67,7 +67,7 @@ static const KnownTagSet & getKnowns()
{
// Do not use the BCP47 string here to initialize the
// LanguageTag because then canonicalize() would call this
// getKnowns() again..
// getKnowns() again...
::std::vector< OUString > aFallbacks( LanguageTag( elemDefined.mnLang).getFallbackStrings( true));
for (auto const& fallback : aFallbacks)
{
+1 -1
View File
@@ -1999,7 +1999,7 @@ void LCMiscNode::generateCode (const OFileWriter &of) const
}
const LocaleNode * reserveNode = findNode("ReservedWords");
if (!reserveNode)
incError( "No ReservedWords element."); // should not happen if validated..
incError( "No ReservedWords element."); // should not happen if validated...
const LocaleNode * forbidNode = findNode("ForbiddenCharacters");
const LocaleNode * breakNode = findNode("BreakIteratorRules");
+3 -3
View File
@@ -266,7 +266,7 @@ void TextSearch::setOptions( const SearchOptions& rOptions )
break;
}
// It would be nice if an inherited struct had a ctor that takes an
// instance of the object the struct derived from..
// instance of the object the struct derived from...
SearchOptions2 aOptions2(
rOptions.algorithmType,
rOptions.searchFlag,
@@ -278,7 +278,7 @@ void TextSearch::setOptions( const SearchOptions& rOptions )
rOptions.insertedChars,
rOptions.transliterateFlags,
nAlgorithmType2,
0 // no wildcard search, no escape character..
0 // no wildcard search, no escape character...
);
setOptions2( aOptions2);
}
@@ -1348,7 +1348,7 @@ SearchResult TextSearch::WildcardSrchBkwrd( const OUString& searchStr, sal_Int32
{
// Copy the escape character code units first in the
// unlikely case that it would not be of BMP.
assert(nIndex - nOld == 2); // it's UTF-16, so..
assert(nIndex - nOld == 2); // it's UTF-16, so...
sal_Unicode buf[2];
buf[0] = rPattern[nOld];
buf[1] = rPattern[nOld+1];
+1 -1
View File
@@ -36,7 +36,7 @@ enum class ErrorCode
CantInherit, // Cannot inherit from non-interface
IdentNotFound, // Identifier not found
CannotInheritFromForward, // Cannot inherit from fwd decl interface
ExpectedConstant, // We got something else..
ExpectedConstant, // We got something else...
Eval, // Error in evaluating expression
ForwardDeclLookup, // Tried to lookup in fwd declared intf
RecursiveType, // Illegal recursive use of type
+1 -1
View File
@@ -68,7 +68,7 @@ public:
themself for concurrent access, no additional guarding is necessary.
Remark: The copy is on demand. The iterator copy the elements only if the container
change the contents..
change the contents...
@param rCont the container of the elements.
*/
+1 -1
View File
@@ -57,7 +57,7 @@
http://msdn.microsoft.com/en-us/library/ms776294.aspx
! Hey, yet another list, maybe this one will not move around? It seems to be
! quite complete..
! quite complete...
! Language Identifier Constants and Strings (Windows)
! http://msdn.microsoft.com/en-us/library/dd318693.aspx
!
@@ -61,7 +61,7 @@ bool LotusWordProImportFilter::importImpl( const Sequence< css::beans::PropertyV
if (!inputStream.good())
return false;
// An XML import service: what we push sax messages to..
// An XML import service: what we push sax messages to...
uno::Reference< XDocumentHandler > xInternalHandler(
mxContext->getServiceManager()->createInstanceWithContext( "com.sun.star.comp.Writer.XMLImporter", mxContext ), UNO_QUERY );
uno::Reference < XImporter > xImporter(xInternalHandler, UNO_QUERY);
@@ -243,7 +243,7 @@ void XFParaStyle::SetLineHeight(enumLHType type, double value)
case enumLHLeast:
m_aLineHeight.SetLeastHeight(value);
break;
case enumLHPercent: //perhaps i should redesign the interface here,ohm..
case enumLHPercent: //perhaps i should redesign the interface here,ohm...
m_aLineHeight.SetPercent(static_cast<sal_Int32>(value));
break;
case enumLHSpace:
+1 -1
View File
@@ -146,7 +146,7 @@ void lru_map_test::testLruRemoval()
o3tl::lru_map<int, int> lru(5);
CPPUNIT_ASSERT_EQUAL(size_t(0), lru.size());
// fill up..
// fill up...
lru.insert(std::make_pair<int, int>(1, 100));
lru.insert(std::make_pair<int, int>(2, 200));
lru.insert(std::make_pair<int, int>(3, 300));
@@ -120,7 +120,7 @@ public class MessageBox {
} else {
// Note: This method is potentially dangerous and should only be used for debugging
// purposes as it relies on the platform dependent window handler..
// purposes as it relies on the platform dependent window handler...
Object oDesktop = m_xMCF.createInstanceWithContext("com.sun.star.frame.Desktop", m_xContext);
XFramesSupplier xFramesSupplier = UnoRuntime.queryInterface(XFramesSupplier.class, oDesktop);
xFrame = xFramesSupplier.getActiveFrame();
@@ -83,7 +83,7 @@ public class SystemDialog {
Object oFilePicker = m_xMCF.createInstanceWithContext("com.sun.star.ui.dialogs.FilePicker", m_xContext);
XFilePicker xFilePicker = UnoRuntime.queryInterface(XFilePicker.class, oFilePicker);
// the defaultname is the initially proposed filename..
// the defaultname is the initially proposed filename...
xFilePicker.setDefaultName("MyExampleDocument");
// set the initial displaydirectory. In this example the user template directory is used
@@ -1323,7 +1323,7 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis
new Object[] {Boolean.FALSE, Integer.valueOf(nDialogHeight - 26), sRoadmapName, Integer.valueOf(0), Integer.valueOf(0), "Steps", Integer.valueOf(85)});
m_xRMPSet = UnoRuntime.queryInterface(XPropertySet.class, oRoadmapModel);
// add the roadmapmodel to the dialog container..
// add the roadmapmodel to the dialog container...
m_xDlgModelNameContainer.insertByName(sRoadmapName, oRoadmapModel);
// the roadmapmodel is a SingleServiceFactory to instantiate the roadmapitems...
@@ -88,7 +88,7 @@ public class UnoDialogSample2 extends UnoDialogSample {
System.out.println("Connected to a running office ...");
XMultiComponentFactory xMCF = xContext.getServiceManager();
PropertyValue[] aPropertyValues = new PropertyValue[]{};
// create an arbitrary Uno-Object - in this case an empty writer document..
// create an arbitrary Uno-Object - in this case an empty writer document...
Object oDesktop =xMCF.createInstanceWithContext("com.sun.star.frame.Desktop", xContext);
XComponentLoader xComponentLoader = UnoRuntime.queryInterface(XComponentLoader.class, oDesktop);
Object oUnoObject = xComponentLoader.loadComponentFromURL("private:factory/swriter", "_default", 0, aPropertyValues);
@@ -143,7 +143,7 @@ public UnoMenu(XComponentContext _xContext, XMultiComponentFactory _xMCF) {
Object oDesktop = m_xMCF.createInstanceWithContext("com.sun.star.frame.Desktop", m_xContext);
XFramesSupplier xFramesSupplier = UnoRuntime.queryInterface(XFramesSupplier.class, oDesktop);
m_xFrame.setCreator(xFramesSupplier);
// get the XTopWindow interface..
// get the XTopWindow interface...
xTopWindow = UnoRuntime.queryInterface(XTopWindow.class, xWindow);
} catch (com.sun.star.lang.IllegalArgumentException ex) {
ex.printStackTrace();
@@ -1180,7 +1180,7 @@ public class TextDocuments {
// Insert the text field
mxDocText.insertTextContent(mxDocText.getEnd(), xRefContent, false);
// And some text after the reference..
// And some text after the reference...
mxDocText.insertString(mxDocText.getEnd(),
" contains the sum of some random numbers.", false );
@@ -173,7 +173,7 @@ import com.sun.star.uno.XComponentContext;
}
}
}
// ReturnObject of method node == null..
// ReturnObject of method node == null...
else{
if (!bHasParameters){
_oUnoMethodNode.setLabel(_oUnoMethodNode.getLabel() + " = null");
@@ -32,7 +32,7 @@
constants AnimationFill
{
/** The fill behavior for the element is determined by the value of the XTiming::FillDefault attribute.
This is the default value for the XTiming::Fill..
This is the default value for the XTiming::Fill...
If the application of fillDefault to an element would result in the element having a value
of fill that is not allowed on that element, the element will instead have a fill value of
AnimationFill::AUTO.
@@ -35,7 +35,7 @@ module com { module sun { module star { module configuration { module backend {
</p>
@see com::sun::star::configuration::backend::UpdatableLayer
Service describes a layer and accepts a changed layer..
Service describes a layer and accepts a changed layer...
@since OOo 1.1.2
*/
@@ -36,7 +36,7 @@ module com { module sun { module star { module configuration { module bootstrap
component context.
</p>
<p> The implementation is usually available as a singleton in the context
that it wraps..
that it wraps...
</p>
@since OOo 1.1.2
@@ -99,7 +99,7 @@ enum EventType
mouseout,
/*
The mouseout event occurs when the pointing device is moved away from an element. This event is valid for most elements..
The mouseout event occurs when the pointing device is moved away from an element. This event is valid for most elements...
* Bubbles: Yes
* Cancelable: Yes
* Context Info: screenX, screenY, clientX, clientY, altKey, ctrlKey, shiftKey, metaKey, relatedTarget indicates the EventTarget the pointing device is entering.
+1 -1
View File
@@ -157,7 +157,7 @@ BlipContext::BlipContext( ContextHandler2Helper const & rParent,
{
// external URL
// we will embed this link, this is better than just doing nothing..
// we will embed this link, this is better than just doing nothing...
// TODO: import this graphic as real link, but this requires some
// code rework.
OUString aRelId = rAttribs.getString( R_TOKEN( link ), OUString() );
@@ -99,7 +99,7 @@ public class DefaultNameGenerator
int counter = 0;
while (exists)
{
if (counter < 0) // wraparound should not happen..
if (counter < 0) // wraparound should not happen...
{
throw new IOException();
}
@@ -546,7 +546,7 @@ public class TextRawReportTarget extends OfficeDocumentReportTarget
if (isTableMergeActive() && detailBandProcessingState == DETAIL_SECTION_OTHER_PRINTED && ObjectUtilities.equal(OfficeNamespaces.TABLE_NS, namespace) && ObjectUtilities.equal(OfficeToken.TABLE_COLUMNS, elementType))
{
// Skip the columns section if the tables get merged..
// Skip the columns section if the tables get merged...
startBuffering(getStylesCollection(), true);
}
else
@@ -642,7 +642,7 @@ public class TextRawReportTarget extends OfficeDocumentReportTarget
if (style == null)
{
style = deriveStyle(OfficeToken.PARAGRAPH, styleName);
// Lets set the 'keep-together' flag..
// Lets set the 'keep-together' flag...
Element paragraphProps = style.getParagraphProperties();
if (paragraphProps == null)
@@ -1070,7 +1070,7 @@ public class TextRawReportTarget extends OfficeDocumentReportTarget
{
// if we have a repeating header, then skip the first one ..
// if this is a repeating footer, skip the last one. This means,
// we have to buffer all group footers and wait for the next section..
// we have to buffer all group footers and wait for the next section...
startBuffering(getContentStylesCollection(), true);
}
@@ -61,7 +61,7 @@ public class VariablesDeclarations
final String result = nameGenerator.generateName(name);
if (holder.isEmpty())
{
// create the default mapping as well..
// create the default mapping as well...
holder.put(null, name);
holder.put("time", name);
holder.put("date", name);
+1 -1
View File
@@ -226,7 +226,7 @@ namespace sax_fastparser {
// sequence that was not unescaped and
// shall be written as is, to not end
// up with "_x005F_x005F_xHHHH_" and
// repeated..
// repeated...
if (c1 == '0' && c2 == '0' && c3 == '5' && (c4 | 0x20) == 'f' &&
i + kXescapeLen <= nLen - 6 &&
pStr[i+kXescapeLen+5] == '_' &&
+2 -2
View File
@@ -98,7 +98,7 @@ struct ScRawToken final
{
friend class ScCompiler;
// Friends that use a temporary ScRawToken on the stack (and therefore need
// the private dtor) and know what they're doing..
// the private dtor) and know what they're doing...
friend class ScTokenArray;
OpCode eOp;
formula::StackVar eType; // type of data; this determines how the unions are used
@@ -376,7 +376,7 @@ public:
static void CheckTabQuotes( OUString& aTabName,
const formula::FormulaGrammar::AddressConvention eConv = formula::FormulaGrammar::CONV_OOO );
/** Analyzes a string for a 'Doc'#Tab construct, or 'Do''c'#Tab etc..
/** Analyzes a string for a 'Doc'#Tab construct, or 'Do''c'#Tab etc...
@returns the position of the unquoted # hash mark in 'Doc'#Tab, or
-1 if none. */
+1 -1
View File
@@ -206,7 +206,7 @@ public:
*
* @return a new token array instance. Note that <i>the caller must
* manage the life cycle of the returned instance</i>, which is
* guaranteed if the TokenArrayRef is properly used..
* guaranteed if the TokenArrayRef is properly used...
*/
ScExternalRefCache::TokenArrayRef getCellRangeData(
sal_uInt16 nFileId, const OUString& rTabName, const ScRange& rRange);
+1 -1
View File
@@ -82,7 +82,7 @@ public:
/** Forget the SdrCaptionObj pointer in this one instance.
Decrements a use count but does not destroy the object, it's up to the
caller to manage this mess..
caller to manage this mess...
*/
void forget();
+3 -3
View File
@@ -3794,7 +3794,7 @@ void Test::testFormulaRefUpdateNameDeleteRow()
// the named expression because when updating the sheet reference is
// relative to its base position on sheet 0 (same for the 'MyRange' range,
// which is the reason why it is not updated either).
// This is a tad confusing..
// This is a tad confusing...
aExpr2 = pCode2->CreateString(aCxt2, ScAddress(0,0,0));
CPPUNIT_ASSERT_EQUAL(OUString("$B$3"), aExpr2);
@@ -5493,7 +5493,7 @@ static void runTestHorizontalMATCH(ScDocument* pDoc, const char* aData[DataSize]
{
pDoc->SetString(i, 1, 0, OUString::createFromAscii(aChecks[i].pVal));
// Assume we don't have more than 26 data columns..
// Assume we don't have more than 26 data columns...
OUStringBuffer aBuf;
aBuf.append("=MATCH(");
aBuf.append(static_cast<sal_Unicode>('A'+i));
@@ -6666,7 +6666,7 @@ void Test::testExternalRefUnresolved()
m_pDoc->InsertTab(0, "Test");
// Test error propagation of unresolved (not existing document) external
// references. Well, let's hope no build machine has such file with sheet..
// references. Well, let's hope no build machine has such file with sheet...
const char* aData[][1] = {
{ "='file:///NonExistingFilePath/AnyName.ods'#$NoSuchSheet.A1" },
+1 -1
View File
@@ -53,7 +53,7 @@
#define BCA_SLOTS_DEFINE (BCA_SLOTS_COL * BCA_SLOTS_ROW)
// Arbitrary 2**31/8, assuming size_t can hold at least 2^31 values and
// sizeof_ptr is at most 8 bytes. You'd probably doom your machine's memory
// anyway, once you reached these values..
// anyway, once you reached these values...
#if BCA_SLOTS_DEFINE > 268435456
#error BCA_SLOTS_DEFINE DOOMed!
#endif
+1 -1
View File
@@ -167,7 +167,7 @@ long ScColumn::GetNeededSize(
// If a formula cell needs to be interpreted during aCell.hasNumeric()
// to determine the type, the pattern may get invalidated because the
// result may set a number format. In which case there's also the
// General format not set anymore..
// General format not set anymore...
bool bMayInvalidatePattern = (aCell.meType == CELLTYPE_FORMULA);
const ScPatternAttr* pOldPattern = pPattern;
bool bNumeric = aCell.hasNumeric();
+3 -3
View File
@@ -88,7 +88,7 @@ bool ScDocument::LimitRangeToAvailableSheets( const ScRange& rRange, ScRange& o_
return false;
// Originally BCA_LISTEN_ALWAYS uses an implicit tab 0 and should had been
// valid already, but in case that would change..
// valid already, but in case that would change...
if (rRange == BCA_LISTEN_ALWAYS)
return false;
@@ -264,7 +264,7 @@ void ScDocument::PutInFormulaTree( ScFormulaCell* pCell )
if ( pEOFormulaTree )
pEOFormulaTree->SetNext( pCell );
else
pFormulaTree = pCell; // No end, no beginning..
pFormulaTree = pCell; // No end, no beginning...
pCell->SetPrevious( pEOFormulaTree );
pCell->SetNext( nullptr );
pEOFormulaTree = pCell;
@@ -457,7 +457,7 @@ void ScDocument::AppendToFormulaTrack( ScFormulaCell* pCell )
if ( pEOFormulaTrack )
pEOFormulaTrack->SetNextTrack( pCell );
else
pFormulaTrack = pCell; // No end, no beginning..
pFormulaTrack = pCell; // No end, no beginning...
pCell->SetPreviousTrack( pEOFormulaTrack );
pCell->SetNextTrack( nullptr );
pEOFormulaTrack = pCell;
+1 -1
View File
@@ -1226,7 +1226,7 @@ OUString ScDPCache::GetFormattedString(long nDim, const ScDPItemData& rItem, boo
return aStr;
}
// Last resort..
// Last resort...
return GetLocaleIndependentFormattedNumberString( rItem.GetValue());
}
+1 -1
View File
@@ -16,7 +16,7 @@ namespace sc {
void UpdatedRangeNames::setUpdatedName(SCTAB nTab, sal_uInt16 nIndex)
{
// Map anything <-1 to global names. Unless we really want to come up with
// some classification there..
// some classification there...
if (nTab < -1)
nTab = -1;
+1 -1
View File
@@ -1433,7 +1433,7 @@ void ScTable::GetNextPos( SCCOL& rCol, SCROW& rRow, SCCOL nMovX, SCROW nMovY,
// Add some cols/rows to the print area (which is "content or
// visually different from empty") to enable travelling through
// protected forms with empty cells and no visual indicator.
// 42 might be good enough and not too much..
// 42 might be good enough and not too much...
nEndCol = std::min<SCCOL>( nEndCol+42, MAXCOL);
nEndRow = std::min<SCROW>( nEndRow+42, MAXROW);
}
+1 -1
View File
@@ -454,7 +454,7 @@ bool ScTableProtectionImpl::isBlockEditable( const ScRange& rRange ) const
// No security descriptor in an enhanced protection means the ranges of
// that protection are editable. If there is any security descriptor
// present we assume the permission to edit is not granted. Until we
// actually can evaluate the descriptors..
// actually can evaluate the descriptors...
auto lIsEditable = [rRange](const ScEnhancedProtection& rEnhancedProtection) {
return !rEnhancedProtection.hasSecurityDescriptor()
+2 -2
View File
@@ -2442,7 +2442,7 @@ void ScRange::IncEndColSticky( SCCOL nDelta )
if (nCol < MAXCOL)
aEnd.SetCol( ::std::min( static_cast<SCCOL>(nCol + nDelta), MAXCOL));
else
aEnd.IncCol( nDelta); // was greater than MAXCOL, caller should know..
aEnd.IncCol( nDelta); // was greater than MAXCOL, caller should know...
}
void ScRange::IncEndRowSticky( SCROW nDelta )
@@ -2462,7 +2462,7 @@ void ScRange::IncEndRowSticky( SCROW nDelta )
if (nRow < MAXROW)
aEnd.SetRow( ::std::min( static_cast<SCROW>(nRow + nDelta), MAXROW));
else
aEnd.IncRow( nDelta); // was greater than MAXROW, caller should know..
aEnd.IncRow( nDelta); // was greater than MAXROW, caller should know...
}
OUString ScAddress::GetColRowString() const
+2 -2
View File
@@ -1501,7 +1501,7 @@ struct ConventionXL_OOX : public ConventionXL_A1
// Actually Excel writes '[N]Sheet One:Sheet Two'!A1:B2 but reads the
// simpler to produce and more logical form with independently quoted
// sheet names as well. The [N] having to be within the quoted sheet
// name is ugly enough..
// name is ugly enough...
ScRange aAbsRef = rRef.toAbs(rPos);
@@ -3532,7 +3532,7 @@ bool ScCompiler::IsColRowName( const OUString& rName )
// Don't crash if cell (via CompileNameFormula) encounters
// a formula cell without code and
// HasStringData/Interpret/Compile is executed and all that
// recursive..
// recursively...
// Furthermore, *this* cell won't be touched, since no RPN exists yet.
CellType eType = aIter.getType();
bool bOk = false;
+2 -2
View File
@@ -8159,7 +8159,7 @@ void ScInterpreter::ScIndirect()
// It may be even a TableRef.
// Anything else that resolves to one reference could be added
// here, but we don't want to compile every arbitrary string. This
// is already nasty enough..
// is already nasty enough...
sal_Int32 nIndex = 0;
if ((nIndex = sRefStr.indexOf('[')) >= 0 && sRefStr.indexOf(']',nIndex+1) > nIndex)
{
@@ -9848,7 +9848,7 @@ bool ScInterpreter::MayBeWildcard( const OUString& rStr )
{
// Wildcards with '~' escape, if there are no wildcards then an escaped
// character does not make sense, but it modifies the search pattern in an
// Excel compatible wildcard search..
// Excel compatible wildcard search...
static const sal_Unicode cw[] = { '*','?','~', 0 };
const sal_Unicode* p1 = rStr.getStr();
sal_Unicode c1;
+2 -2
View File
@@ -865,7 +865,7 @@ void ScInterpreter::ScGetDateDif()
// and 10 months and 19 days.
// Algorithm's roll-over behavior extracted from Excel by try and
// error..
// error...
// If day1 <= day2 then simply day2 - day1.
// If day1 > day2 then set month1 to month2-1 and year1 to
// year2(-1) and subtract dates, e.g. for 2012-01-28,2012-03-01 set
@@ -2433,7 +2433,7 @@ void ScInterpreter::ScIntersect()
if (sv1 == svRefList || sv2 == svRefList)
{
// Now this is a bit nasty but it simplifies things, and having
// intersections with lists isn't too common, if at all..
// intersections with lists isn't too common, if at all...
// Convert a reference to list.
const formula::FormulaToken* xt[2] = { x1, x2 };
StackVar sv[2] = { sv1, sv2 };
+1 -1
View File
@@ -1373,7 +1373,7 @@ void ScInterpreter::PopRefListPushMatrixOrRef()
{
// Only single cells can be stuffed into a column vector.
// XXX NOTE: Excel doesn't do this but returns #VALUE! instead.
// Though there's no compelling reason not to..
// Though there's no compelling reason not to...
for (const auto & rRef : *pv)
{
if (rRef.Ref1 != rRef.Ref2)
+2 -2
View File
@@ -519,7 +519,7 @@ bool ScComplexRefData::IncEndColSticky( SCCOL nDelta, const ScAddress& rPos )
Ref2.SetAbsCol( nCol);
}
else
Ref2.IncCol( nDelta); // was greater than MAXCOL, caller should know..
Ref2.IncCol( nDelta); // was greater than MAXCOL, caller should know...
return true;
}
@@ -548,7 +548,7 @@ bool ScComplexRefData::IncEndRowSticky( SCROW nDelta, const ScAddress& rPos )
Ref2.SetAbsRow( nRow);
}
else
Ref2.IncRow( nDelta); // was greater than MAXROW, caller should know..
Ref2.IncRow( nDelta); // was greater than MAXROW, caller should know...
return true;
}
+1 -1
View File
@@ -358,7 +358,7 @@ static size_t GetElementsMax( size_t nMemory )
{
// Arbitrarily assuming 12 bytes per element, 8 bytes double plus
// overhead. Stored as an array in an mdds container it's less, but for
// strings or mixed matrix it can be much more..
// strings or mixed matrix it can be much more...
constexpr size_t nPerElem = 12;
if (nMemory)
return nMemory / nPerElem;
+3 -3
View File
@@ -577,7 +577,7 @@ FormulaTokenRef extendRangeReference( FormulaToken & rTok1, FormulaToken & rTok2
xRes = new ScDoubleRefToken( (*pRefList)[0] );
}
if (!xRes)
return nullptr; // shouldn't happen..
return nullptr; // shouldn't happen...
StackVar sv[2] = { sv1, sv2 };
formula::FormulaToken* pt[2] = { &rTok1, &rTok2 };
ScComplexRefData& rRef = *xRes->GetDoubleRef();
@@ -1112,7 +1112,7 @@ ScHybridCellToken::ScHybridCellToken(
maFormula( rFormula ),
mbEmptyDisplayedAsString( bEmptyDisplayedAsString)
{
// caller, make up your mind..
// caller, make up your mind...
assert( !bEmptyDisplayedAsString || (f == 0.0 && rStr.getString().isEmpty()));
}
@@ -1621,7 +1621,7 @@ void ScTokenArray::CheckToken( const FormulaToken& r )
// ScFormulaCell::InterpretFormulaGroup() and below.
case ocDBArea:
// Certainly not a vectorization of the entire area..
// Certainly not a vectorization of the entire area...
case ocTableRef:
// May result in a single cell or range reference, depending on
+1 -1
View File
@@ -194,7 +194,7 @@ void ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc,
// for an explanation why this complicated, see
// sc/source/ui/docsh.cxx:ScDocShell::AsciiSave()
// In fact we should create a common method if this would be
// needed just one more time..
// needed just one more time...
assert( aOS.isEmpty() && "aOS should be empty");
OUString aTmpStr = aString;
aOS.append(pStringData);
+1 -1
View File
@@ -426,7 +426,7 @@ void ImportExcel8::FilterMode()
// The FilterMode record exists: if either the AutoFilter
// record exists or an Advanced Filter is saved and stored
// in the sheet. Thus if the FilterMode records only exists
// then the latter is true..
// then the latter is true...
if( !pExcRoot->pAutoFilterBuffer ) return;
XclImpAutoFilterData* pData = pExcRoot->pAutoFilterBuffer->GetByTab( GetCurrScTab() );
+1 -1
View File
@@ -182,7 +182,7 @@ const Color& LotAttrCache::GetColor( const sal_uInt8 nLotIndex ) const
void LotAttrCol::SetAttr( const SCROW nRow, const ScPatternAttr& rAttr )
{
// Actually with the current implementation of MAXROWCOUNT>=64k and nRow
// being read as sal_uInt16 there's no chance that nRow would be invalid..
// being read as sal_uInt16 there's no chance that nRow would be invalid...
SAL_WARN_IF( !ValidRow(nRow), "sc.filter", "*LotAttrCol::SetAttr(): ... and failed?!" );
std::vector<std::unique_ptr<ENTRY> >::reverse_iterator iterLast = aEntries.rbegin();
+1 -1
View File
@@ -195,7 +195,7 @@ void LotusToSc::DoFunc( DefTokenId eOc, sal_uInt8 nCnt, const sal_Char* pExtStri
{ // special case ocPMT, negate last parameter!
// additionally: 1. -> 3., 3. -> 2., 2. -> 1.
SAL_WARN_IF( nCnt != 3, "sc.filter", "+LotusToSc::DoFunc(): ocPMT needs 3 parameters!" );
// There should be at least 3 arguments, but with binary crap may not..
// There should be at least 3 arguments, but with binary crap may not...
switch (nCnt)
{
case 1:
+1 -1
View File
@@ -222,7 +222,7 @@ OUString UnitConverter::calcErrorString( sal_uInt8 nErrorCode ) const
if (aIt->second == BIFF_ERR_NA)
iFail = aIt;
}
assert(iFail != maOoxErrCodes.end()); // BIFF_ERR_NA really should be in the map..
assert(iFail != maOoxErrCodes.end()); // BIFF_ERR_NA really should be in the map...
return iFail != maOoxErrCodes.end() ? iFail->first : OUString();
}
+2 -2
View File
@@ -136,7 +136,7 @@ void QProToSc::DoFunc( DefTokenId eOc, sal_uInt16 nArgs, const sal_Char* pExtStr
{
if( eOc == ocRRI )
{
// There should be at least 3 arguments, but with binary crap may not..
// There should be at least 3 arguments, but with binary crap may not...
SAL_WARN_IF( nArgs < 3, "sc.filter","QProToSc::DoFunc - ocRRI expects 3 parameters but got " << nArgs);
// Store first 3 parameters to pool in order 2,1,0
if (nArgs > 3)
@@ -144,7 +144,7 @@ void QProToSc::DoFunc( DefTokenId eOc, sal_uInt16 nArgs, const sal_Char* pExtStr
}
else if( eOc == ocIpmt )
{
// There should be at least 4 arguments, but with binary crap may not..
// There should be at least 4 arguments, but with binary crap may not...
SAL_WARN_IF( nArgs < 4, "sc.filter","QProToSc::DoFunc - ocIpmt expects 4 parameters but got " << nArgs);
// Store first 4 parameters to pool in order 3,2,1,0
if (nArgs > 4)
+1 -1
View File
@@ -4850,7 +4850,7 @@ void ScXMLExport::WriteExternalRefCaches()
}
// Determine maximum column count of used area, for repeated cells.
SCCOL nMaxColsUsed = 1; // assume that there is at least one cell somewhere..
SCCOL nMaxColsUsed = 1; // assume that there is at least one cell somewhere...
vector<SCROW> aRows;
pTable->getAllRows(aRows);
for (SCROW nRow : aRows)
+1 -1
View File
@@ -1351,7 +1351,7 @@ bool ScDBDocFunc::RemovePivotTable(ScDPObject& rDPObj, bool bRecord, bool bApi)
if (!bApi)
{
// If we come from GUI - ask to delete the associated pivot charts too..
// If we come from GUI - ask to delete the associated pivot charts too...
std::vector<SdrOle2Obj*> aListOfObjects =
sc::tools::getAllPivotChartsConntectedTo(rDPObj.GetName(), &rDocShell);
+1 -1
View File
@@ -1476,7 +1476,7 @@ bool ScDocShell::ConvertFrom( SfxMedium& rMedium )
// TODO: Filter should set column widths. Not doing it here, it may
// result in very narrow or wide columns, depending on content.
// Setting row heights makes cells with font size attribution or
// wrapping enabled look nicer..
// wrapping enabled look nicer...
bSetRowHeights = true;
}
else if (aFltName == pFilterRtf)
+1 -1
View File
@@ -634,7 +634,7 @@ void ScDocShell::SetChangeComment( ScChangeAction* pAction, const OUString& rCom
void ScDocShell::ExecuteChangeCommentDialog( ScChangeAction* pAction, weld::Window* pParent, bool bPrevNext)
{
if (!pAction) return; // without action is nothing..
if (!pAction) return; // without action is nothing...
OUString aComment = pAction->GetComment();
OUString aAuthor = pAction->GetUser();
+1 -1
View File
@@ -692,7 +692,7 @@ void lcl_GetColumnTypes(
bHasMemo = true;
}
else
nFieldLen = 254; // bad luck..
nFieldLen = 254; // bad luck...
}
pColNames[nField] = aFieldName;
+1 -1
View File
@@ -706,7 +706,7 @@ bool ScPrintFunc::AdjustPrintArea( bool bNew )
SCROW nPAEndRow;
bFound = pDoc->GetPrintAreaVer( nPrintTab, nStartCol, nEndCol, nPAEndRow, bNotes );
// Say we don't want to print more than ~1000 empty rows, which are
// about 14 pages intentionally left blank..
// about 14 pages intentionally left blank...
const SCROW nFuzzy = 23*42;
if (nPAEndRow + nFuzzy < nEndRow)
{
+1 -1
View File
@@ -1233,7 +1233,7 @@ bool ScViewData::SelectionFillDOOM( const ScRange& rRange )
// to not overflow in case number of available columns or rows would be
// arbitrarily increased.
// We could refine this and take some actual cell size into account,
// evaluate available memory and what not, but..
// evaluate available memory and what not, but...
const sal_Int32 kMax = 23 * 1024 * 1024; // current MAXROWCOUNT is 1024*1024=1048576
return (rRange.aEnd.Row() - rRange.aStart.Row() + 1) > (kMax / (rRange.aEnd.Col() - rRange.aStart.Col() + 1));
}
@@ -442,7 +442,7 @@ bool SelectionFunction::KeyInput (const KeyEvent& rEvent)
bResult = true;
break;
// Go to next page. No wrap around..
// Go to next page. No wrap around...
case KEY_PAGEDOWN:
GotoNextPage(+1);
bResult = true;
+1 -1
View File
@@ -212,7 +212,7 @@ SfxSplitWindow::SfxSplitWindow( vcl::Window* pParent, SfxChildAlignment eAl,
break;
default:
eTbxAlign = WindowAlign::Top; // some sort of default...
break; // -Wall lots not handled..
break; // -Wall lots not handled...
}
SetAlign (eTbxAlign);
+1 -1
View File
@@ -63,7 +63,7 @@ namespace slideshow
This class holds all modifiable attributes of a shape, and
at the same time provides means to layer attributes on top
of each other..
of each other...
And yes, there's a reason why we even pass bools and ints
by const reference. Namely, that makes the set* methods
+1 -1
View File
@@ -286,7 +286,7 @@ static void* pool_alloc(struct pool* pool)
/* ===============================================
* Hash implementation customized to be just tracking
* a unique list of string (i.e no data associated
* with the key, no need for retrieval, etc..
* with the key, no need for retrieval, etc...
*
* This is tuned for the particular use-case we have here
* measures in tail_build showed that
+2 -2
View File
@@ -29,8 +29,8 @@ char wd[128];
/*
ER: Table was made extra large, because there seems to be a problem with the
chaining. An nlist->next is sometimes overwritten somewhere, which
results in a SIGSEGV. I canceled the GDB with watchpoint after 2 days, though..
It works this way for now..
results in a SIGSEGV. I canceled the GDB with watchpoint after 2 days, though...
It works this way for now...
*/
#define NLSIZE 15000
+1 -1
View File
@@ -1360,7 +1360,7 @@ bool ImpSvNumberInputScan::IsAcceptedDatePattern( sal_uInt16 nStartPatternAt )
OUStringBuffer aBuf(sStrArray[nNext]);
aBuf.stripEnd();
// Expand again in case of pattern "M. D. " and
// input "M. D. ", maybe fetched far, but..
// input "M. D. ", maybe fetched far, but...
padToLength(aBuf, rPat.getLength() - nPat, ' ');
OUString aStr = aBuf.makeStringAndClear();
bOk = (rPat.indexOf( aStr, nPat) == nPat);
+1 -1
View File
@@ -3232,7 +3232,7 @@ bool SvNumberformat::ImpGetTimeOutput(double fNumber,
// IDEA: instead of eCodeType pass the index to nTypeArray and restrict
// inspection of month name around that one, that would enable different month
// cases in one format. Though probably the most rare use case ever..
// cases in one format. Though probably the most rare use case ever...
sal_Int32 SvNumberformat::ImpUseMonthCase( int & io_nState, const ImpSvNumFor& rNumFor, NfKeywordIndex eCodeType )
{
+1 -1
View File
@@ -2052,7 +2052,7 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& rString )
{ // #,,,,
if ( StringEqualsChar( sOldThousandSep, ' ' ) )
{
// strange, those French..
// strange, those French...
bool bFirst = true;
// set a hard No-Break Space or ConvertMode
const OUString& rSepF = pFormatter->GetNumThousandSep();
+1 -1
View File
@@ -774,7 +774,7 @@ BitmapEx ImpGetBitmapEx(BitmapMarkerKind eKindOfMarker, BitmapColorIndex eIndex)
}
}
// if we can't load the marker..
// if we can't load the marker...
static vcl::DeleteOnDeinit< SdrHdlBitmapSet > aModernSet(new SdrHdlBitmapSet);
return aModernSet.get()->GetBitmapEx(eKindOfMarker, sal_uInt16(eIndex));
+1 -1
View File
@@ -673,7 +673,7 @@ DECLARE_OOXMLEXPORT_TEST(testFdo78939, "fdo78939.docx")
// fdo#78939 : LO hanged while opening issue document
// Whenever a para-style was applied to a Numbering format level,
// LO incorrectly also changed the para-style..
// LO incorrectly also changed the para-style...
// check that file opens and does not hang while opening and also
// check that an incorrect numbering style is not applied ...
@@ -256,7 +256,7 @@ namespace
vMarksToCopy.push_back(pMark);
}
}
// We have to count the "non-copied" nodes..
// We have to count the "non-copied" nodes...
sal_uLong nDelCount;
SwNodeIndex aCorrIdx(InitDelCount(rPam, nDelCount));
for(const sw::mark::IMark* const pMark : vMarksToCopy)
+1 -1
View File
@@ -1071,7 +1071,7 @@ void SwSectionNode::MakeFramesForAdjacentContentNode(const SwNodeIndex & rIdx)
}
// if the node is in a section, the sectionframe now
// has to be created..
// has to be created...
// boolean to control <Init()> of a new section frame.
bool bInitNewSect = false;
if( pS )
+2 -2
View File
@@ -169,7 +169,7 @@ void SwLayoutCache::Write( SvStream &rStream, const SwDoc& rDoc )
// of the first content
sal_uLong nStartOfContent = rDoc.GetNodes().GetEndOfContent().
StartOfSectionNode()->GetIndex();
// The first page..
// The first page...
SwPageFrame* pPage = const_cast<SwPageFrame*>(static_cast<const SwPageFrame*>(rDoc.getIDocumentLayoutAccess().GetCurrentLayout()->Lower()));
aIo.OpenRec( SW_LAYCACHE_IO_REC_PAGES );
@@ -590,7 +590,7 @@ sal_uLong SwLayHelper::CalcPageCount()
//Estimates the number of paragraphs.
sal_uLong nTmp = mpDoc->GetNodes().GetEndOfContent().GetIndex() -
mpDoc->GetNodes().GetEndOfExtras().GetIndex();
//Tables have a little overhead..
//Tables have a little overhead...
nTmp -= mpDoc->GetTableFrameFormats()->size() * 25;
//Fly frames, too ..
nTmp -= (mpDoc->GetNodes().GetEndOfAutotext().GetIndex() -
+1 -1
View File
@@ -746,7 +746,7 @@ void SwSectionFrame::MoveContentAndDelete( SwSectionFrame* pDel, bool bSave )
pPrvSct = nullptr; // Such that nothing will be merged
}
}
// The content is going to be inserted..
// The content is going to be inserted...
if( pSave )
{
lcl_InvalidateInfFlags( pSave, bSize );
+1 -1
View File
@@ -1865,7 +1865,7 @@ bool SwRootFrame::MakeTableCursors( SwTableCursor& rTableCursor )
bool bRet = false;
// For new table models there's no need to ask the layout..
// For new table models there's no need to ask the layout...
if( rTableCursor.NewTableSelection() )
return true;
+1 -1
View File
@@ -1711,7 +1711,7 @@ void SwTable::CreateSelection( const SwNode* pStartNd, const SwNode* pEndNd,
nTop = nRow;
lcl_CheckMinMax( nUpperMin, nUpperMax, *pLine, nCol, true );
++nFound;
// If start and end node are identical, we're nearly done..
// If start and end node are identical, we're nearly done...
if( pEndNd == pStartNd )
{
nBottom = nTop;
+1 -1
View File
@@ -1256,7 +1256,7 @@ bool SwCombinedPortion::Format( SwTextFormatInfo &rInf )
if( Height() < nMainAscent + nMainDescent )
Height( nMainAscent + nMainDescent );
// We calculate the x positions of the characters in both lines..
// We calculate the x positions of the characters in both lines...
sal_uInt16 nTopDiff = 0;
sal_uInt16 nBotDiff = 0;
if( nMaxWidth > Width() )
+1 -1
View File
@@ -1175,7 +1175,7 @@ std::unique_ptr<SwMultiCreator> SwTextSizeInfo::GetMultiCreator(TextFrameIndex &
return pRet;
if (pTmp ? lcl_Has2Lines(*pTmp, pActiveTwoLinesItem, bTwo)
: lcl_Check2Lines(pNodeTwoLinesItem, pActiveTwoLinesItem, bTwo))
{ // We have an interesting attribute..
{ // We have an interesting attribute...
if( bTwo == bOn )
{ // .. with the same state, so the last attribute could
// be continued.
+2 -2
View File
@@ -149,7 +149,7 @@ void SwUndoPageDesc::ExchangeContentNodes( SwPageDesc& rSource, SwPageDesc &rDes
if( !rDest.IsHeaderShared() )
{
// Same procedure for unshared header..
// Same procedure for unshared header...
const SwFormatHeader& rSourceLeftHead = rSource.GetLeft().GetHeader();
rDest.GetLeft().GetAttrSet().GetItemState( RES_HEADER, false, &pItem );
pNewItem.reset(pItem->Clone());
@@ -162,7 +162,7 @@ void SwUndoPageDesc::ExchangeContentNodes( SwPageDesc& rSource, SwPageDesc &rDes
}
if (!rDest.IsFirstShared())
{
// Same procedure for unshared header..
// Same procedure for unshared header...
const SwFormatHeader& rSourceFirstMasterHead = rSource.GetFirstMaster().GetHeader();
rDest.GetFirstMaster().GetAttrSet().GetItemState( RES_HEADER, false, &pItem );
pNewItem.reset(pItem->Clone());
+4 -4
View File
@@ -131,10 +131,10 @@ namespace sw
Additionally it then has to avoid name collisions such as
a) styles "Normal" and "Default" in a single document, where
we can use the original distinct names "Normal" and "Default" and..
we can use the original distinct names "Normal" and "Default" and...
b) styles "Normal" and "Default" in a single document, where
we can not use the original names, and must come up with an
alternative name for one of them..
alternative name for one of them...
And it needs to report to the importer if the style being mapped to
was already in existence, for the cut and paste/insert file mode we
@@ -188,10 +188,10 @@ namespace sw
Additionally it then has to avoid name collisions such as
a) styles "Normal" and "Default" in a single document, where
we can use the original distinct names "Normal" and "Default" and..
we can use the original distinct names "Normal" and "Default" and...
b) styles "Normal" and "Default" in a single document, where
we can not use the original names, and must come up with an
alternative name for one of them..
alternative name for one of them...
And it needs to report to the importer if the style being mapped to
was already in existence, for the cut and paste/insert file mode we
+1 -1
View File
@@ -841,7 +841,7 @@ namespace sw
// Force to Japanese when finding one of 'geE'.
// XXX This actually may not be correct, all era keywords could be
// used in other locales as well. I just don't know about Word. But
// this is how it was for 10 years..
// this is how it was for 10 years...
bool bForceJapanese = (-1 != findUnquoted( rParams, 'g', 0));
// XXX Why replace? The number formatter does handle them and this
// effectively changes from Gengou to Gregorian calendar. Legacy
+1 -1
View File
@@ -2910,7 +2910,7 @@ void SwBasicEscherEx::WriteOLEPicture(EscherPropertyContainer &rPropOpt,
OString aId = aGraphicObject.GetUniqueID();
if (!aId.isEmpty())
{
// SJ: the third parameter (pVisArea) should be set..
// SJ: the third parameter (pVisArea) should be set...
sal_uInt32 nBlibId = mxGlobal->GetBlibID( *QueryPictureStream(), aGraphicObject, pVisArea);
if (nBlibId)
rPropOpt.AddOpt(ESCHER_Prop_pib, nBlibId, true);
+1 -1
View File
@@ -316,7 +316,7 @@ void SwAddressPreview::SelectAddress(sal_uInt16 nSelect)
{
OSL_ENSURE(pImpl->nSelectedAddress < pImpl->aAddresses.size(), "selection invalid");
pImpl->nSelectedAddress = nSelect;
// now make it visible..
// now make it visible...
sal_uInt16 nSelectRow = nSelect / pImpl->nColumns;
sal_uInt16 nStartRow = m_xVScrollBar->vadjustment_get_value();
if( (nSelectRow < nStartRow) || (nSelectRow >= (nStartRow + pImpl->nRows) ))
+1 -1
View File
@@ -719,7 +719,7 @@ void UnoControlModel::write( const css::uno::Reference< css::io::XObjectOutputSt
if ( aProps.find( BASEPROPERTY_FONTDESCRIPTOR ) != aProps.end() )
{
const css::uno::Any* pProp = &maData[ BASEPROPERTY_FONTDESCRIPTOR ];
// Until 5.0 export arrives, write old format..
// Until 5.0 export arrives, write old format...
css::awt::FontDescriptor aFD;
(*pProp) >>= aFD;

Some files were not shown because too many files have changed in this diff Show More