[Libreoffice-commits] core.git: 2 commits - sc/source sw/qa sw/source writerfilter/qa writerfilter/source

[Miklos Vajna (via logerrit)]

 sc/source/core/data/dociter.cxx  |
6 +-
 sw/qa/extras/rtfexport/rtfexport3.cxx|   
23 +++
 sw/source/filter/ww8/rtfexport.cxx   |
8 ++
 writerfilter/qa/cppunittests/rtftok/data/do-not-break-wrapped-tables.rtf |   
10 +++
 writerfilter/qa/cppunittests/rtftok/rtfdispatchflag.cxx  |   
17 +
 writerfilter/source/dmapper/SettingsTable.cxx|
3 -
 writerfilter/source/rtftok/rtfdispatchflag.cxx   |
8 --
 writerfilter/source/rtftok/rtfdispatchvalue.cxx  |   
30 --
 writerfilter/source/rtftok/rtfdocumentimpl.hxx   |
3 -
 9 files changed, 65 insertions(+), 43 deletions(-)

New commits:
commit d785d26a5599d3d546b96958b0f1c6d5ed777a0d
Author: Miklos Vajna 
AuthorDate: Tue May 30 08:21:33 2023 +0200
Commit: Miklos Vajna 
CommitDate: Tue May 30 12:49:52 2023 +0200

sw floattable: handle \nobrkwrptbl in the RTF filter

This is the RTF import/export for the functionality added in
commit 08fa2903df1a7cf9a1647fcf967e4c8b57dad793 (sw floattable: add a
DoNotBreakWrappedTables compat flag, 2023-05-24).

Change-Id: I3c458cbe1f4b0947a94651cc205f2a7660d2ec2c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152377
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins

diff --git a/sw/qa/extras/rtfexport/rtfexport3.cxx 
b/sw/qa/extras/rtfexport/rtfexport3.cxx
index 2b45ca61f33e..8b5e2489a001 100644
--- a/sw/qa/extras/rtfexport/rtfexport3.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport3.cxx
@@ -28,6 +28,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace css;
 
@@ -430,6 +431,28 @@ DECLARE_RTFEXPORT_TEST(testTdf128428_dntblnsbdb, 
"tdf128428_dntblnsbdb.rtf")
 CPPUNIT_ASSERT_EQUAL(1, getPages());
 }
 
+CPPUNIT_TEST_FIXTURE(Test, testDontBreakWrappedTables)
+{
+// Given a document with no DO_NOT_BREAK_WRAPPED_TABLES compat mode 
enabled:
+createSwDoc();
+{
+SwDoc* pDoc = getSwDoc();
+IDocumentSettingAccess& rIDSA = pDoc->getIDocumentSettingAccess();
+rIDSA.set(DocumentSettingId::DO_NOT_BREAK_WRAPPED_TABLES, true);
+}
+
+// When saving to rtf:
+reload(mpFilter, "dont-break-wrapped-tables.rtf");
+
+// Then make sure \nobrkwrptbl is not written:
+SwDoc* pDoc = getSwDoc();
+IDocumentSettingAccess& rIDSA = pDoc->getIDocumentSettingAccess();
+bool bDontBreakWrappedTables = 
rIDSA.get(DocumentSettingId::DO_NOT_BREAK_WRAPPED_TABLES);
+// Without the accompanying fix in place, this test would have failed, the 
compat flag was not
+// set.
+CPPUNIT_ASSERT(bDontBreakWrappedTables);
+}
+
 CPPUNIT_TEST_FIXTURE(Test, testRtlGutter)
 {
 auto verify = [this]() {
diff --git a/sw/source/filter/ww8/rtfexport.cxx 
b/sw/source/filter/ww8/rtfexport.cxx
index 1bfc2ebc5740..96f0f628f6a9 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -829,7 +829,8 @@ ErrCode RtfExport::ExportDocument_Impl()
 Strm().WriteOString(OOO_STRING_SVTOOLS_RTF_MARGMIRROR);
 
 // Gutter at top?
-if 
(m_rDoc.getIDocumentSettingAccess().get(DocumentSettingId::GUTTER_AT_TOP))
+IDocumentSettingAccess& rIDSA = m_rDoc.getIDocumentSettingAccess();
+if (rIDSA.get(DocumentSettingId::GUTTER_AT_TOP))
 {
 Strm().WriteOString(LO_STRING_SVTOOLS_RTF_GUTTERPRL);
 }
@@ -858,7 +859,10 @@ ErrCode RtfExport::ExportDocument_Impl()
 
 // Enable breaking wrapped tables across pages: the "no" in the control 
word's name is
 // confusing.
-Strm().WriteOString(LO_STRING_SVTOOLS_RTF_NOBRKWRPTBL);
+if (!rIDSA.get(DocumentSettingId::DO_NOT_BREAK_WRAPPED_TABLES))
+{
+Strm().WriteOString(LO_STRING_SVTOOLS_RTF_NOBRKWRPTBL);
+}
 
 // size and empty margins of the page
 if (m_rDoc.GetPageDescCnt())
diff --git 
a/writerfilter/qa/cppunittests/rtftok/data/do-not-break-wrapped-tables.rtf 
b/writerfilter/qa/cppunittests/rtftok/data/do-not-break-wrapped-tables.rtf
new file mode 100644
index ..f6ec013cb1dc
--- /dev/null
+++ b/writerfilter/qa/cppunittests/rtftok/data/do-not-break-wrapped-tables.rtf
@@ -0,0 +1,10 @@
+{\rtf1
+\paperw12240\paperh6203\margl1440\margr1440\margt1440\margb1440
+\pard\plain First paragraph\par
+\pard\plain\intbl A1\cell
+\pard\plain\trowd\trrh1812\tpvpara\tphcol\tposy10\tposx20\tdfrmtxtLeft30\tdfrmtxtRight40\cellx3828\row
+\pard\plain\intbl A2\cell
+\pard\plain\trowd\trrh1812\tpvpara\tphcol\tposy10\tposx20\tdfrmtxtLeft30\tdfrmtxtRight40\cellx3828\row
+\pard\plain Second paragraph.
+\par
+}
diff --git a/writerfilter/qa/cppunittests/rtftok/rtfdispatchflag.cxx 
b/writerfilter/qa/cppunittests/rtftok/rtfdispatchflag.cxx
index 810dc750d7d7..6d6b85be61c4 100644
--- a/writerfilter/qa/cppunittests/rtftok/rtfdispatchflag.cxx
+++ 

[Libreoffice-commits] core.git: 2 commits - sc/source sw/qa sw/source

[Vasily Melenchuk (via logerrit)]

 sc/source/ui/navipi/content.cxx  |7 ++-
 sc/source/ui/navipi/navipi.cxx   |1 -
 sw/qa/extras/uiwriter/data/tdf129270.odt |binary
 sw/qa/extras/uiwriter/uiwriter4.cxx  |   26 ++
 sw/source/core/txtnode/ndtxt.cxx |   10 +-
 5 files changed, 41 insertions(+), 3 deletions(-)

New commits:
commit a72f2dcf73df9b9f4420cc93aa57a77c165a0fcb
Author: Vasily Melenchuk 
AuthorDate: Mon Aug 9 18:42:02 2021 +0300
Commit: Michael Stahl 
CommitDate: Thu Aug 12 14:10:46 2021 +0200

tdf#129270: sw: do not copy list level on paragraph cut

Current list level (RES_PARATR_LIST_LEVEL) is initialized
before, but current value can overwrite it with invalid
in given context. So we could have mismatch of outline
style (which are not overwritten) and actual list level.

Change-Id: Ibf34a6f35b922493c4a1477326ea6c1599b4938f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120212
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/sw/qa/extras/uiwriter/data/tdf129270.odt 
b/sw/qa/extras/uiwriter/data/tdf129270.odt
new file mode 100644
index ..e86c1f872153
Binary files /dev/null and b/sw/qa/extras/uiwriter/data/tdf129270.odt differ
diff --git a/sw/qa/extras/uiwriter/uiwriter4.cxx 
b/sw/qa/extras/uiwriter/uiwriter4.cxx
index d93447d71dc2..e079ff006aea 100644
--- a/sw/qa/extras/uiwriter/uiwriter4.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter4.cxx
@@ -278,6 +278,7 @@ public:
 void testRedlineAutoCorrect();
 void testRedlineAutoCorrect2();
 void testEmojiAutoCorrect();
+void testTdf129270();
 void testInsertPdf();
 
 CPPUNIT_TEST_SUITE(SwUiWriterTest4);
@@ -393,6 +394,7 @@ public:
 CPPUNIT_TEST(testRedlineAutoCorrect);
 CPPUNIT_TEST(testRedlineAutoCorrect2);
 CPPUNIT_TEST(testEmojiAutoCorrect);
+CPPUNIT_TEST(testTdf129270);
 CPPUNIT_TEST(testInsertPdf);
 CPPUNIT_TEST_SUITE_END();
 };
@@ -3602,6 +3604,30 @@ void SwUiWriterTest4::testInsertLongDateFormat()
 CPPUNIT_ASSERT(xField->getString().indexOf(" ") > -1);
 }
 
+void SwUiWriterTest4::testTdf129270()
+{
+SwDoc* pDoc = createSwDoc(DATA_DIRECTORY, "tdf129270.odt");
+CPPUNIT_ASSERT(pDoc);
+SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
+CPPUNIT_ASSERT(pWrtShell);
+SwXTextDocument* pXTextDocument = 
dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pXTextDocument);
+
+// Go to document end
+pWrtShell->SttEndDoc(/*bStt=*/false);
+
+// Press enter
+pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, KEY_RETURN);
+Scheduler::ProcessEventsToIdle();
+
+// Numbering for previous outline should remain the same "2"
+CPPUNIT_ASSERT_EQUAL(OUString("2"), getProperty(getParagraph(4), 
"ListLabelString"));
+
+// Numbering for newly created outline should be "2.1"
+CPPUNIT_ASSERT_EQUAL(OUString("2.1"),
+ getProperty(getParagraph(5), 
"ListLabelString"));
+}
+
 void SwUiWriterTest4::testInsertPdf()
 {
 auto pPdfium = vcl::pdf::PDFiumLibrary::get();
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index c65455722c85..626b3b21bdd0 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -2497,7 +2497,15 @@ void SwTextNode::CutImpl( SwTextNode * const pDest, 
const SwIndex & rDestStart,
 }
 else
 {
-GetpSwAttrSet()->CopyToModify( *pDest );
+// Copy all attrs except RES_PARATR_LIST_LEVEL: it was initialized 
before
+// and current SwTextNode can contain not suitable for pDest value
+SfxItemSet aCharSet(
+pDest->GetDoc().GetAttrPool(),
+svl::Items);
+aCharSet.Put(*GetpSwAttrSet());
+if (aCharSet.Count())
+pDest->SetAttr(aCharSet, nDestStart, nDestStart + nLen);
 }
 }
 
commit 38027099e773403ffd3314a5b54493adc65150ec
Author: Noel Grandin 
AuthorDate: Thu Aug 12 12:36:23 2021 +0200
Commit: Noel Grandin 
CommitDate: Thu Aug 12 14:10:37 2021 +0200

tdf#95549 speed up navigator tree load

(*) inline the load loop

(*) remove Refresh call from ScNavigatorDlg constructor, the SetListMode
call at the bottom will trigger a load of the tree content

Change-Id: I27f1d1bde89d8dcb5cc111ae132fbb05abc2fc7b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120383
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index a5d464821f12..fe7c7f04f3e9 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -960,8 +960,13 @@ void ScContentTree::GetNoteStrings()
 // loop over cell notes
 std::vector aEntries;
 pDoc->GetAllNoteEntries(aEntries);
+weld::TreeIter* pParent = m_aRootNodes[ScContentId::NOTE].get();
 for (const auto& rEntry 

[Libreoffice-commits] core.git: 2 commits - sc/source sw/qa sw/source

[Noel Grandin (via logerrit)]

 sc/source/core/data/drwlayer.cxx|6 --
 sw/qa/extras/tiledrendering/tiledrendering.cxx  |2 +-
 sw/qa/extras/uiwriter/uiwriter.cxx  |2 +-
 sw/qa/extras/uiwriter/uiwriter2.cxx |2 +-
 sw/source/core/crsr/crsrsh.cxx  |2 +-
 sw/source/core/doc/DocumentDrawModelManager.cxx |2 +-
 sw/source/core/doc/DocumentTimerManager.cxx |2 +-
 sw/source/core/doc/docbm.cxx|2 +-
 sw/source/core/doc/docedt.cxx   |2 +-
 sw/source/core/doc/doclay.cxx   |2 +-
 sw/source/core/doc/docredln.cxx |2 +-
 sw/source/core/doc/list.cxx |2 +-
 sw/source/core/doc/tblafmt.cxx  |2 +-
 sw/source/core/doc/tblrwcl.cxx  |4 ++--
 sw/source/core/docnode/ndtbl1.cxx   |2 +-
 sw/source/core/draw/dcontact.cxx|4 ++--
 sw/source/core/edit/edatmisc.cxx|2 +-
 sw/source/core/edit/edattr.cxx  |2 +-
 sw/source/core/edit/edfld.cxx   |2 +-
 sw/source/core/edit/editsh.cxx  |4 ++--
 sw/source/core/edit/edredln.cxx |2 +-
 sw/source/core/edit/edsect.cxx  |2 +-
 sw/source/core/edit/edtab.cxx   |2 +-
 sw/source/core/frmedt/fedesc.cxx|2 +-
 sw/source/core/frmedt/fefly1.cxx|2 +-
 sw/source/core/layout/paintfrm.cxx  |2 +-
 sw/source/core/undo/unsort.cxx  |6 +++---
 sw/source/core/unocore/unochart.cxx |2 +-
 sw/source/core/unocore/unostyle.cxx |3 ++-
 sw/source/core/unocore/unotbl.cxx   |4 ++--
 sw/source/core/view/viewsh.cxx  |2 +-
 sw/source/filter/html/htmlgrin.cxx  |2 +-
 sw/source/filter/html/svxcss1.cxx   |4 ++--
 sw/source/filter/html/swhtml.cxx|2 +-
 sw/source/filter/ww8/docxattributeoutput.cxx|2 +-
 sw/source/filter/ww8/docxsdrexport.cxx  |2 +-
 sw/source/filter/ww8/docxtablestyleexport.cxx   |2 +-
 sw/source/filter/ww8/rtfattributeoutput.cxx |4 ++--
 sw/source/filter/ww8/rtfexport.cxx  |2 +-
 sw/source/filter/ww8/wrtw8sty.cxx   |2 +-
 sw/source/filter/ww8/ww8par5.cxx|2 +-
 sw/source/filter/ww8/ww8toolbar.cxx |2 +-
 sw/source/filter/xml/XMLRedlineImportHelper.cxx |2 +-
 sw/source/ui/envelp/label1.cxx  |2 +-
 sw/source/ui/index/cnttab.cxx   |6 +++---
 sw/source/uibase/app/mainwn.cxx |2 +-
 sw/source/uibase/dbui/dbmgr.cxx |8 
 sw/source/uibase/dochdl/gloshdl.cxx |2 +-
 sw/source/uibase/docvw/AnnotationWin2.cxx   |2 +-
 sw/source/uibase/docvw/PostItMgr.cxx|6 +++---
 sw/source/uibase/sidebar/ThemePanel.cxx |4 ++--
 sw/source/uibase/uno/unotxdoc.cxx   |2 +-
 sw/source/uibase/utlui/glbltree.cxx |2 +-
 sw/source/uibase/utlui/gloslst.cxx  |2 +-
 54 files changed, 74 insertions(+), 71 deletions(-)

New commits:
commit 102a94c9de3c8c4d1326022dd14a300d6b72e222
Author: Noel Grandin 
AuthorDate: Tue Aug 20 15:53:25 2019 +0200
Commit: Noel Grandin 
CommitDate: Tue Aug 20 18:37:27 2019 +0200

loplugin:constvars in sw

Change-Id: Ic1f11240561ba8fffc51710c9a49933c3ab3849d
Reviewed-on: https://gerrit.libreoffice.org/77826
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx 
b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index 5851faa56534..fe2d1e510cab 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -298,7 +298,7 @@ void SwTiledRenderingTest::callbackImpl(int nType, const 
char* pPayload)
 boost::property_tree::ptree aTree;
 std::stringstream aStream(pPayload);
 boost::property_tree::read_json(aStream, aTree);
-for (boost::property_tree::ptree::value_type& rValue : 
aTree.get_child("searchResultSelection"))
+for (const boost::property_tree::ptree::value_type& rValue : 
aTree.get_child("searchResultSelection"))
 {
 
m_aSearchResultSelection.emplace_back(rValue.second.get("rectangles").c_str());
 
m_aSearchResultPart.push_back(std::atoi(rValue.second.get("part").c_str()));
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 959a5990744c..b4665cd17b3d 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -4403,7 +4403,7 @@ void SwUiWriterTest::testTdf77014()
 {
 printf ("Portions:\n");
 
-for (auto& rPortionItem : aHandler.mPortionItems)
+for (const auto& rPortionItem : 

[Libreoffice-commits] core.git: 2 commits - sc/source sw/qa sw/source

[Stephan Bergmann]

 sc/source/ui/vba/vbarange.cxx |2 
 sw/qa/extras/uiwriter/data/tdf112109.fodt |  170 ++
 sw/qa/extras/uiwriter/uiwriter.cxx|   10 +
 sw/source/core/layout/sectfrm.cxx |   34 --
 4 files changed, 208 insertions(+), 8 deletions(-)

New commits:
commit e601a2cf161a833a74ac02bb431cfde8ad965fa1
Author: Stephan Bergmann 
Date:   Thu Aug 31 15:22:46 2017 +0200

Fix silent merge conflict

Change-Id: I8879560850b4cf94984e3b3657800273b276fcdb

diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index 29380216900b..7a39865446c1 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -4250,7 +4250,7 @@ static ScDBData* lcl_GetDBData_Impl( ScDocShell* 
pDocShell, sal_Int16 nSheet )
 return pRet;
 }
 
-static void lcl_SelectAll( const ScDocShell* pDocShell, const ScQueryParam& 
aParam )
+static void lcl_SelectAll( ScDocShell* pDocShell, const ScQueryParam& aParam )
 {
 if ( pDocShell )
 {
commit 3d1bb76ebf5c51141018cfd76eccdb63472de8de
Author: Miklos Vajna 
Date:   Thu Aug 31 11:51:53 2017 +0200

tdf#112109 sw: split section frames inside table cells, ignore nested tables

Commit f8a76d218305a56d15b82b9dac4fafa558872780 (tdf#108524 sw: split
section frames inside table cells, non-split text frames, 2017-07-06)
added support for moving text frame masters to a next page inside
section-in-table frames. But the code in SwFrame::GetNextSctLeaf()
responsible for this is not up to nested tables, so don't try to split
sections in this case.

Otherwise we'll end up with frames which are marked as "in table", but
don't actually have have table frame parents, so we crash in
SwFrame::IsFootnoteAllowed() which assumes being in a table means a
table frame parent.

Change-Id: Iff19a4eda21a4dbfb9562dea7af8ec6767d47873
Reviewed-on: https://gerrit.libreoffice.org/41748
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/sw/qa/extras/uiwriter/data/tdf112109.fodt 
b/sw/qa/extras/uiwriter/data/tdf112109.fodt
new file mode 100644
index ..507873fc9063
--- /dev/null
+++ b/sw/qa/extras/uiwriter/data/tdf112109.fodt
@@ -0,0 +1,170 @@
+
+http://www.w3.org/1999/xlink; 
xmlns:dc="http://purl.org/dc/elements/1.1/; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office; 
xmlns:ooow="http://openoffice.org/2004/writer; 
xmlns:oooc="http://openoffice.org/2004/calc; 
xmlns:dom="http://www.w3.org/2001/xml-events; 
xmlns:xforms="http://www.w3.org/2002/xforms; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xmlns:rpt="http://openoffice.org/2005/report; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#; 
xmlns:officeooo="http://openoffice.org/2009/office; 
xmlns:tableooo="http://openoffice.org/2009/table; 
xmlns:drawooo="http://openoffice.org/2010/draw; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
+  
+
+
+
+
+
+
+
+  
+  
+
+  
+  
+
+
+  
+
+
+  
+
+
+  
+
+  
+  
+
+  
+
+
+  
+
+
+  
+
+
+  
+
+  
+
+
+  
+
+
+  
+
+
+  
+
+
+  
+
+
+  
+
+
+  
+
+
+  
+
+
+  
+
+
+  
+
+
+  
+
+
+  
+
+
+  
+
+
+  
+
+  
+  
+  
+
+  
+  
+
+  
+  
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
+
+  
+Table1.A1
+  
+
+
+
+  
+
+  
+  
+  
+  

[Libreoffice-commits] core.git: 2 commits - sc/source sw/qa sw/source

[Christian M . Heller]

 sc/source/filter/dif/difimp.cxx  |   26 +-
 sw/qa/extras/ooxmlexport/ooxmlexport2.cxx|6 +-
 sw/source/filter/ww8/docxattributeoutput.cxx |2 +-
 sw/source/filter/ww8/wrtw8esh.cxx|   10 +-
 sw/source/filter/ww8/wrtww8.cxx  |1 +
 sw/source/filter/ww8/wrtww8.hxx  |2 ++
 6 files changed, 31 insertions(+), 16 deletions(-)

New commits:
commit 3bbb934da7368217680e67cb76d6ecd2b4694696
Author: Christian M. Heller christian.helle...@gmail.com
Date:   Wed Oct 1 05:30:54 2014 -0400

fdo#39468 Translate German Comments - sc/cource/filter/dif

Change-Id: I1d44c2538baac9a1443118c95a2886db5098dab1
Reviewed-on: https://gerrit.libreoffice.org/11736
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com

diff --git a/sc/source/filter/dif/difimp.cxx b/sc/source/filter/dif/difimp.cxx
index 243f6fa..2a8e187 100644
--- a/sc/source/filter/dif/difimp.cxx
+++ b/sc/source/filter/dif/difimp.cxx
@@ -121,7 +121,7 @@ FltError ScFormatFilterPluginImpl::ScImportDif( SvStream 
rIn, ScDocument* pDoc,
 }
 
 if( eTopic == T_DATA )
-{   // Ab hier kommen die Daten
+{   // data starts here
 SCCOL   nBaseCol = rInsPos.Col();
 
 SCCOL   nColCnt = SCCOL_MAX;
@@ -149,7 +149,7 @@ FltError ScFormatFilterPluginImpl::ScImportDif( SvStream 
rIn, ScDocument* pDoc,
 break;
 case D_EOD:
 break;
-case D_NUMERIC: // Numbercell
+case D_NUMERIC: // Number cell
 if( nColCnt == SCCOL_MAX )
 nColCnt = nBaseCol;
 
@@ -188,7 +188,7 @@ FltError ScFormatFilterPluginImpl::ScImportDif( SvStream 
rIn, ScDocument* pDoc,
 
 nColCnt++;
 break;
-case D_STRING:  // Textcell
+case D_STRING:  // Text cell
 if( nColCnt == SCCOL_MAX )
 nColCnt = nBaseCol;
 
@@ -221,7 +221,7 @@ FltError ScFormatFilterPluginImpl::ScImportDif( SvStream 
rIn, ScDocument* pDoc,
 
 if( bSyntErrWarn )
 
-// ACHTUNG: Hier fehlt noch die richtige Warnung!
+// FIXME: Add proper Warnung!
 return eERR_RNGOVRFLW;
 
 else if( bOverflowWarn )
@@ -369,7 +369,7 @@ TOPIC DifParser::GetNextTopic( void )
 break;
 case S_Data:
 OSL_ENSURE( aLine.getLength() = 2,
-+GetNextTopic(): String ist zu kurz! );
++GetNextTopic(): String is too short! );
 if( aLine.getLength()  2 )
 aData = aLine.copy( 1, aLine.getLength() - 2 );
 else
@@ -380,11 +380,11 @@ TOPIC DifParser::GetNextTopic( void )
 OSL_FAIL( DifParser::GetNextTopic - unexpected state );
 break;
 case S_UNKNOWN:
-// 2 Zeilen ueberlesen
+// skip 2 lines
 ReadNextLine( aLine );
 // fall-through
 case S_ERROR_L2:// Fehler in Line 2 aufgetreten
-// eine Zeile ueberlesen
+// skip 1 line
 ReadNextLine( aLine );
 eS = S_END;
 break;
@@ -418,7 +418,7 @@ DATASET DifParser::GetNumberDataset( const sal_Unicode* 
pPossibleNumericData )
 eRet = D_SYNT_ERROR;
 }
 else
-{   // ...und zur Strafe mit'm Numberformatter...
+{   // ...and for punishment, with number formatting...
 OSL_ENSURE( pNumFormatter, -DifParser::GetNextDataset(): No 
Formatter, more fun! );
 OUString aTestVal( pPossibleNumericData );
 sal_uInt32 nFormat = 0;
@@ -514,7 +514,7 @@ DATASET DifParser::GetNextDataset( void )
 }
 break;
 case '0':   // Numeric Data
-pAktBuffer++;   // Wert in fVal, 2. Zeile in aData
+pAktBuffer++;   // value in fVal, 2. line in aData
 if( *pAktBuffer == ',' )
 {
 pAktBuffer++;
@@ -636,7 +636,7 @@ bool DifParser::ScanFloatVal( const sal_Unicode* pStart )
 sal_Int32   nExp = 0;
 boolbExpNeg = false;
 boolbExpOverflow = false;
-static const sal_uInt16 nExpLimit = 4096;   // ACHTUNG: muss genauer 
ermittelt werden!
+static const sal_uInt16 nExpLimit = 4096;   // FIXME: has to be set 
more accurately!
 
 sal_Unicode cAkt;
 boolbRet = false;
@@ -774,7 +774,7 @@ bool DifParser::ScanFloatVal( const sal_Unicode* pStart )
 case S_FINDEND:
 if( IsNumberEnding( cAkt ) )
 {
-bRet = true;// damit sinnvoll weitergeparst werden