[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/fdo77759.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 13 +
sw/source/filter/ww8/docxattributeoutput.cxx |7 +--
sw/source/filter/ww8/docxexport.cxx |4 ++--
sw/source/filter/ww8/docxexport.hxx |2 +-
5 files changed, 21 insertions(+), 5 deletions(-)
New commits:
commit a3c00ee3c7b3b0fbcde32baeb7023c7e8526b908
Author: Ravindra Vidhate
Date: Tue Apr 22 15:28:46 2014 +0530
fdo#77759 : Embedded excel getting renamed to binary object.
The embedded excel (xlsx) when inserted on its own (unlike with chart) is
getting converted to ".bin".
Note that only extension differs otherwise its an excel file only.
There is no loss of user experience in editing the file in MS Word.
The similar case is also exists when power point is inserted on it's own.
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Reviewed on:
https://gerrit.libreoffice.org/9126
Change-Id: Ie13c098a794179c3b27100a7b9e30884fb47f656
diff --git a/sw/qa/extras/ooxmlexport/data/fdo77759.docx
b/sw/qa/extras/ooxmlexport/data/fdo77759.docx
new file mode 100644
index 000..6558690
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo77759.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 31fd36b..18f91a8 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3225,6 +3225,19 @@ DECLARE_OOXMLEXPORT_TEST(testFDO75431, "fdo75431.docx")
assertXPath(pXmlDoc, "//w:p/w:pPr/w:sectPr/w:type", "val", "nextPage");
}
+DECLARE_OOXMLEXPORT_TEST(testContentTypeOLE, "fdo77759.docx")
+{
+xmlDocPtr pXmlDoc = parseExport("[Content_Types].xml");
+
+if (!pXmlDoc)
+ return;
+
+assertXPath(pXmlDoc,
+
"/ContentType:Types/ContentType:Override[@ContentType='application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']",
+"PartName",
+"/word/embeddings/oleObject1.xlsx");
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index a4679f7..27835b3 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -4011,7 +4011,7 @@ void DocxAttributeOutput::WriteOLE( SwOLENode& rNode,
const Size& rSize, const S
OUString sObjectName = aContainer->GetEmbeddedObjectName( xObj );
// set some attributes according to the type of the embedded object
-OUString sProgID, sMediaType, sRelationType;
+OUString sProgID, sMediaType, sRelationType, sFileExtension;
for( sal_Int32 i=0; i < aObjectsInteropList.getLength(); ++i )
if ( aObjectsInteropList[i].Name == sObjectName )
{
@@ -4022,20 +4022,23 @@ void DocxAttributeOutput::WriteOLE( SwOLENode& rNode,
const Size& rSize, const S
{
sMediaType =
"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
sRelationType =
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/package";;
+sFileExtension = "xlsx";
}
else if( sProgID.startsWith("PowerPoint.Show") )
{
sMediaType =
"application/vnd.openxmlformats-officedocument.presentationml.presentation";
sRelationType =
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/package";;
+sFileExtension = "pptx";
}
else
{
sMediaType = "application/vnd.openxmlformats-officedocument.oleObject";
sRelationType =
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/oleObject";;
+sFileExtension = "bin";
}
// write embedded file
-OString sId = m_rExport.WriteOLEObject( aObject, sMediaType, sRelationType
);
+OString sId = m_rExport.WriteOLEObject( aObject, sMediaType,
sRelationType, sFileExtension );
if( sId.isEmpty() )
{
diff --git a/sw/source/filter/ww8/docxexport.cxx
b/sw/source/filter/ww8/docxexport.cxx
index ff74f3a..c3a6ddf 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -358,13 +358,13 @@ OString DocxExport::OutputChart( uno::Reference<
frame::XModel >& xModel, sal_In
return OUStringToOString( sId, RTL_TEXTENCODING_UTF8 );
}
-OString DocxExport::WriteOLEObject( SwOLEObj& rObject, const OUString&
sMediaType, const OUString& sRelationType )
+OString DocxExport::WriteOLEObject( SwOLEObj& rObject, const OUString&
sMediaType, const OUString& sRelationType, const OUString& sFileExtension )
{
uno::Reference xObj( rObject.GetOleRef() );
comphelper::EmbeddedObjectContainer* aContainer =
rObject.GetObject().GetContainer();
uno::Reference< io::XInputStream > xInStream =
aContainer->GetObjectStream( xObj, NULL );
-OUString sFileName = "embeddings/oleObject" + OUString::number(
++
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/FDO77715.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx|9 +
sw/source/filter/ww8/ww8atr.cxx | 12
3 files changed, 17 insertions(+), 4 deletions(-)
New commits:
commit c865de60a769cc99c25050652aaad751771b2249
Author: Dinesh Patil
Date: Wed Apr 23 13:29:29 2014 +0530
fdo#77715: Fix for TOC flag field \c
Description:
If SEQIdentifier for TOC field \c is not there then blank "" are getting
added
due to which opening of RT file in LO was causing system hang.
Implementation:
1) Check added for SEQIdentifier, if found then add SEQIdentifier with ""
e.g. {TOC \c "SEQ"}
2) If SEQIdentifier not found then don't add ""
e.g. {TOC \c}
Change-Id: I9dbfa1db51358908b246456201428de8b4104e10
Reviewed-on: https://gerrit.libreoffice.org/9145
Reviewed-by: Miklos Vajna
Tested-by: Miklos Vajna
diff --git a/sw/qa/extras/ooxmlexport/data/FDO77715.docx
b/sw/qa/extras/ooxmlexport/data/FDO77715.docx
new file mode 100644
index 000..f93a46e
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/FDO77715.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 18f91a8..f33771f 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2248,6 +2248,15 @@ DECLARE_OOXMLEXPORT_TEST(testPreserveXfieldTOC,
"PreserveXfieldTOC.docx")
assertXPathContent(pXmlDoc, "/w:document/w:body/w:p/w:r[2]/w:instrText", "
TOC \\x \\f \\o \"1-3\" \\h");
}
+DECLARE_OOXMLEXPORT_TEST(testFDO77715,"FDO77715.docx")
+{
+xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+if (!pXmlDoc)
+return;
+
+assertXPathContent(pXmlDoc,
"/w:document/w:body/w:p[3]/w:r[2]/w:instrText[1]", " TOC \\c ");
+}
+
DECLARE_OOXMLEXPORT_TEST(testTrackChangesParagraphProperties,
"testTrackChangesParagraphProperties.docx")
{
xmlDocPtr pXmlDoc = parseExport("word/document.xml");
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 839d70c..b82ea5c 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -2172,10 +2172,14 @@ void AttributeOutputBase::StartTOX( const SwSection&
rSect )
{
sStr = FieldString(eCode);
-sStr += "\\c \"";
-sStr += pTOX->GetSequenceName();
-sStr += sEntryEnd;
-
+sStr += "\\c ";
+OUString seqName = pTOX->GetSequenceName();
+if(!seqName.isEmpty())
+{
+sStr += "\"";
+sStr += seqName;
+sStr += sEntryEnd;
+}
OUString aTxt;
int nRet = ::lcl_CheckForm( pTOX->GetTOXForm(), 1, aTxt );
if (1 == nRet)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/SdtContent.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx |8
sw/source/filter/ww8/docxattributeoutput.cxx |6 +++---
3 files changed, 11 insertions(+), 3 deletions(-)
New commits:
commit d9de57dd2acc4719f846e908284ed81f09856098
Author: Rajashri
Date: Thu Apr 24 14:44:33 2014 +0530
fdo#77713 : File Corruption - Header.xml
Document containing track changes within a SDT content
is getting corrupted.
Reason for corruption: In export side,parent tag [SDT] is
getting closed before child tag ['del' tag].
The corruption is resolved now.
Change-Id: I42451495f80e30ddfebab8b81bcf1e309b0c2ca2
Reviewed-on: https://gerrit.libreoffice.org/9146
Reviewed-by: Miklos Vajna
Tested-by: Miklos Vajna
diff --git a/sw/qa/extras/ooxmlexport/data/SdtContent.docx
b/sw/qa/extras/ooxmlexport/data/SdtContent.docx
new file mode 100644
index 000..91e0ef0
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/SdtContent.docx
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index f33771f..5dc3bcf 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2947,6 +2947,14 @@ DECLARE_OOXMLEXPORT_TEST(testlvlPicBulletId,
"lvlPicBulletId.docx")
assertXPath(pXmlDoc,
"/w:numbering[1]/w:abstractNum[1]/w:lvl[1]/w:lvlPicBulletId[1]", 0);
}
+DECLARE_OOXMLEXPORT_TEST(testSdtContent, "SdtContent.docx")
+{
+xmlDocPtr pXmlDoc = parseExport("word/header1.xml");
+if (!pXmlDoc)
+ return;
+assertXPath(pXmlDoc, "/w:hdr[1]/w:p[1]/w:sdt[1]/w:sdtContent[1]/w:del[1]");
+}
+
DECLARE_OOXMLEXPORT_TEST(testCitation,"FDO74775.docx")
{
xmlDocPtr pXmlDoc = parseExport();
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 27835b3..3321999 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -836,6 +836,9 @@ void DocxAttributeOutput::EndRun()
// append the actual run end
m_pSerializer->endElementNS( XML_w, XML_r );
+// if there is some redlining in the document, output it
+EndRedline( m_pRedlineData );
+
// enclose in a sdt block, if necessary
WriteSdtBlock( m_nRunSdtPrToken, m_pRunSdtPrTokenChildren,
m_pRunSdtPrDataBindingAttrs );
m_pSerializer->mergeTopMarks();
@@ -848,9 +851,6 @@ void DocxAttributeOutput::EndRun()
WritePendingPlaceholder();
-// if there is some redlining in the document, output it
-EndRedline( m_pRedlineData );
-
m_pRedlineData = NULL;
if ( m_closeHyperlinkInThisRun )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/Configuration_officecfg.mk
officecfg/Configuration_officecfg.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d6904736b9a07b2a321add96be4857ba41a7f370 Author: Andras Timar Date: Mon Apr 28 09:53:59 2014 +0200 fdo#67112 ReportCommands.xcu is localizable Change-Id: I51db40b14ec138632d922c910f59cfe50d6b3f2f diff --git a/officecfg/Configuration_officecfg.mk b/officecfg/Configuration_officecfg.mk index d0a7239..5f345b7 100644 --- a/officecfg/Configuration_officecfg.mk +++ b/officecfg/Configuration_officecfg.mk @@ -51,7 +51,6 @@ $(eval $(call gb_Configuration_add_datas,registry,officecfg/registry/data,\ org/openoffice/Office/ReportDesign.xcu \ org/openoffice/Office/UI/Controller.xcu \ org/openoffice/Office/UI/Factories.xcu \ - org/openoffice/Office/UI/ReportCommands.xcu \ org/openoffice/TypeDetection/UISort.xcu \ org/openoffice/ucb/Configuration.xcu \ )) @@ -171,6 +170,7 @@ $(eval $(call gb_Configuration_add_localized_datas,registry,officecfg/registry/d org/openoffice/Office/UI/DrawWindowState.xcu \ org/openoffice/Office/UI/ImpressWindowState.xcu \ org/openoffice/Office/UI/MathWindowState.xcu \ + org/openoffice/Office/UI/ReportCommands.xcu \ org/openoffice/Office/UI/Sidebar.xcu \ org/openoffice/Office/UI/StartModuleWindowState.xcu \ org/openoffice/Office/UI/WriterWindowState.xcu \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - officecfg/Configuration_officecfg.mk
officecfg/Configuration_officecfg.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f9abada1886648560182a1b993ea952fdda4c249 Author: Andras Timar Date: Mon Apr 28 09:53:59 2014 +0200 fdo#67112 ReportCommands.xcu is localizable (cherry picked from commit d6904736b9a07b2a321add96be4857ba41a7f370) Conflicts: officecfg/Configuration_officecfg.mk Change-Id: I51db40b14ec138632d922c910f59cfe50d6b3f2f diff --git a/officecfg/Configuration_officecfg.mk b/officecfg/Configuration_officecfg.mk index 8957977..eeebae6 100644 --- a/officecfg/Configuration_officecfg.mk +++ b/officecfg/Configuration_officecfg.mk @@ -50,7 +50,6 @@ $(eval $(call gb_Configuration_add_datas,registry,officecfg/registry/data,\ org/openoffice/Office/ReportDesign.xcu \ org/openoffice/Office/UI/Controller.xcu \ org/openoffice/Office/UI/Factories.xcu \ - org/openoffice/Office/UI/ReportCommands.xcu \ org/openoffice/TypeDetection/Filter.xcu \ org/openoffice/TypeDetection/Types.xcu \ org/openoffice/TypeDetection/UISort.xcu \ @@ -171,6 +170,7 @@ $(eval $(call gb_Configuration_add_localized_datas,registry,officecfg/registry/d org/openoffice/Office/UI/DrawWindowState.xcu \ org/openoffice/Office/UI/ImpressWindowState.xcu \ org/openoffice/Office/UI/MathWindowState.xcu \ + org/openoffice/Office/UI/ReportCommands.xcu \ org/openoffice/Office/UI/Sidebar.xcu \ org/openoffice/Office/UI/StartModuleWindowState.xcu \ org/openoffice/Office/UI/WriterWindowState.xcu \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - officecfg/Configuration_officecfg.mk
officecfg/Configuration_officecfg.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1af76048964b1ab1972122262097c50ac85240c5 Author: Andras Timar Date: Mon Apr 28 09:53:59 2014 +0200 fdo#67112 ReportCommands.xcu is localizable Change-Id: I51db40b14ec138632d922c910f59cfe50d6b3f2f (cherry picked from commit d6904736b9a07b2a321add96be4857ba41a7f370) diff --git a/officecfg/Configuration_officecfg.mk b/officecfg/Configuration_officecfg.mk index d0a7239..5f345b7 100644 --- a/officecfg/Configuration_officecfg.mk +++ b/officecfg/Configuration_officecfg.mk @@ -51,7 +51,6 @@ $(eval $(call gb_Configuration_add_datas,registry,officecfg/registry/data,\ org/openoffice/Office/ReportDesign.xcu \ org/openoffice/Office/UI/Controller.xcu \ org/openoffice/Office/UI/Factories.xcu \ - org/openoffice/Office/UI/ReportCommands.xcu \ org/openoffice/TypeDetection/UISort.xcu \ org/openoffice/ucb/Configuration.xcu \ )) @@ -171,6 +170,7 @@ $(eval $(call gb_Configuration_add_localized_datas,registry,officecfg/registry/d org/openoffice/Office/UI/DrawWindowState.xcu \ org/openoffice/Office/UI/ImpressWindowState.xcu \ org/openoffice/Office/UI/MathWindowState.xcu \ + org/openoffice/Office/UI/ReportCommands.xcu \ org/openoffice/Office/UI/Sidebar.xcu \ org/openoffice/Office/UI/StartModuleWindowState.xcu \ org/openoffice/Office/UI/WriterWindowState.xcu \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/fdo77719.docx |binary
sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx |8
sw/source/filter/ww8/docxsdrexport.cxx |3 +++
3 files changed, 11 insertions(+)
New commits:
commit f0860625e29c18d2eca647a6cedd0ce679d5a80d
Author: Sourav
Date: Thu Apr 24 18:18:16 2014 +0530
fdo#77719 File containing CusGeom gets corrupted on RT.
RT file gets corrupted because in presetgeometry tag shapetype is coming as
blank.
A check is introduced to handle that.
Reviewed on:
https://gerrit.libreoffice.org/9147
Change-Id: Ie79db0f5dcadfa3cd5d3f54d4a676393b3a882c5
diff --git a/sw/qa/extras/ooxmlexport/data/fdo77719.docx
b/sw/qa/extras/ooxmlexport/data/fdo77719.docx
new file mode 100644
index 000..e671b33
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo77719.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
index cc04809..06182df 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
@@ -1105,6 +1105,14 @@ DECLARE_OOXMLEXPORT_TEST(testShapeEffectPreservation,
"shape-effect-preservation
"val", "5");
}
+DECLARE_OOXMLEXPORT_TEST(fdo77719, "fdo77719.docx")
+{
+xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+if (!pXmlDoc)
+return;
+assertXPath(pXmlDoc,
"/w:document[1]/w:body[1]/w:p[1]/w:r[2]/mc:AlternateContent[1]/mc:Choice[1]/w:drawing[1]/wp:anchor[1]/a:graphic[1]/a:graphicData[1]/wps:wsp[1]/wps:spPr[1]/a:prstGeom[1]",
"prst", "rect");
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx
b/sw/source/filter/ww8/docxsdrexport.cxx
index 5c5d5a2..563e124 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -1164,6 +1164,9 @@ void DocxSdrExport::writeDMLTextFrame(sw::Frame*
pParentFrame, int nAnchorId)
}
}
}
+//Empty shapeType will lead to corruption so to avoid that shapeType is
set to default i.e. "rect"
+if (shapeType.isEmpty())
+shapeType = "rect";
pFS->singleElementNS(XML_a, XML_prstGeom,
XML_prst, OUStringToOString(shapeType,
RTL_TEXTENCODING_UTF8).getStr(),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Reminder: Call for papers LiboCon Bern 2014
Hi all, This is a reminder that you have until *May, 15* to submit your talk proposals for the LibreOffice Conference in Bern. See the original announcement here http://nabble.documentfoundation.org/LibreOffice-Conference-2014-Call-for-Paper-td4100170.html Submit your proposal on the conference at libreoffice.org list. Thanks :) Kind regards Sophie -- Sophie Gautier Tel:+33683901545 Membership & Certification Committee Member - Co-founder The Document Foundation ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/ooxmlexport/ooxmlexport.cxx| 57
sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx | 57
2 files changed, 57 insertions(+), 57 deletions(-)
New commits:
commit 236c05bb1cdd42d485fde0811cdcf0b843d3cde3
Author: Miklos Vajna
Date: Mon Apr 28 10:13:47 2014 +0200
CppunitTest_sw_ooxmlexport: move sdr-related tests to the dedicated suite
Given that CppunitTest_sw_ooxmlexport and
CppunitTest_sw_ooxmlsdrexport run in parallel, the
CppunitTest_sw_ooxmlsdrexport is way smaller, moving stuff from
CppunitTest_sw_ooxmlexport to CppunitTest_sw_ooxmlsdrexport speeds up a
toplevel 'make' a bit.
Change-Id: I97297404bc3a02b6ca65552670edf16137deb264
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 5dc3bcf..b1bc8c2 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2991,15 +2991,6 @@ DECLARE_OOXMLEXPORT_TEST(testFileWithInvalidImageLink,
"FileWithInvalidImageLink
assertXPath(pXmlDoc,
"/w:document/w:body/w:p[2]/w:r[2]/w:drawing[1]/wp:inline[1]/a:graphic[1]/a:graphicData[1]/pic:pic[1]/pic:blipFill[1]/a:blip[1]",
"embed", "");
}
-DECLARE_OOXMLEXPORT_TEST(testNestedAlternateContent,
"nestedAlternateContent.docx")
-{
- xmlDocPtr pXmlDoc = parseExport("word/document.xml");
- if (!pXmlDoc)
-return;
-// We check alternateContent could not contains alternateContent (i.e.
nested alternateContent)
-
assertXPath(pXmlDoc,"/w:document[1]/w:body[1]/w:p[1]/w:r[1]/mc:AlternateContent[1]/mc:Choice[1]/w:drawing[1]/wp:anchor[1]/a:graphic[1]/a:graphicData[1]/wpg:wgp[1]/wps:wsp[2]/wps:txbx[1]/w:txbxContent[1]/w:p[1]/w:r[2]/mc:AlternateContent[1]",0);
-}
-
DECLARE_OOXMLEXPORT_TEST(testContentTypeXLSM, "fdo76098.docx")
{
xmlDocPtr pXmlDoc = parseExport("[Content_Types].xml");
@@ -3067,13 +3058,6 @@ DECLARE_OOXMLEXPORT_TEST(testFDO76248, "FDO76248.docx")
assertXPath(pXmlDoc, "//a:graphicData[not(*)]", 0);
}
-DECLARE_OOXMLEXPORT_TEST(test76317, "test76317.docx")
-{
-xmlDocPtr pXmlDoc = parseExport("word/document.xml");
-if (!pXmlDoc) return;
-assertXPath(pXmlDoc,
"/w:document[1]/w:body[1]/w:p[1]/w:r[1]/mc:AlternateContent[1]/mc:Choice[1]/w:drawing[1]/wp:anchor[1]/a:graphic[1]/a:graphicData[1]/wps:wsp[1]/wps:spPr[1]/a:prstGeom[1]",
"prst", "hexagon");
-}
-
DECLARE_OOXMLEXPORT_TEST(testFdo76101, "fdo76101.docx")
{
xmlDocPtr pXmlDoc = parseExport("word/styles.xml");
@@ -3093,21 +3077,6 @@ DECLARE_OOXMLEXPORT_TEST(testFDO76163 , "fdo76163.docx")
assertXPath ( pXmlDoc,
"/w:document/w:body/w:p[2]/w:hyperlink/w:r[11]/w:fldChar", "fldCharType", "end"
);
}
-DECLARE_OOXMLEXPORT_TEST(fdo76591, "fdo76591.docx")
-{
-xmlDocPtr pXmlDoc = parseExport("word/document.xml");
-if (!pXmlDoc)
-return;
-assertXPath(pXmlDoc,
"/w:document[1]/w:body[1]/w:p[1]/w:r[3]/mc:AlternateContent[1]/mc:Choice[1]/w:drawing[1]/wp:anchor[1]",
"relativeHeight", "3");
-}
-
-DECLARE_OOXMLEXPORT_TEST(test76317_2K10, "test76317_2K10.docx")
-{
-xmlDocPtr pXmlDoc = parseExport("word/document.xml");
-if (!pXmlDoc) return;
-assertXPath(pXmlDoc,
"/w:document[1]/w:body[1]/w:p[1]/w:r[1]/mc:AlternateContent[1]/mc:Choice[1]/w:drawing[1]/wp:anchor[1]/a:graphic[1]/a:graphicData[1]/wps:wsp[1]/wps:spPr[1]/a:prstGeom[1]/a:avLst[1]/a:gd[1]",
"name", "adj");
-}
-
DECLARE_OOXMLEXPORT_TEST(testfdo76589 , "fdo76589.docx")
{
/* Numbered list was not preserve after RT.
@@ -3136,16 +3105,6 @@ DECLARE_OOXMLEXPORT_TEST(testAuthorPropertySdt,
"author-property.docx")
//"xmlns:ns0='http://purl.org/dc/elements/1.1/'
xmlns:ns1='http://schemas.openxmlformats.org/package/2006/metadata/core-properties'");
}
-DECLARE_OOXMLEXPORT_TEST(testFDO77122, "LinkedTextBoxes.docx")
-{
-xmlDocPtr pXmlDoc = parseExport("word/document.xml");
-if (!pXmlDoc)
-return;
-//ensure that the text box links are preserved.
-assertXPath(pXmlDoc,
"/w:document/w:body/w:p/w:r[2]/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor/a:graphic/a:graphicData[1]/wps:wsp[1]/wps:txbx[1]",
"id", "1");
-assertXPath(pXmlDoc,
"/w:document[1]/w:body[1]/w:p[1]/w:r[3]/mc:AlternateContent[1]/mc:Choice[1]/w:drawing[1]/wp:anchor[1]/a:graphic[1]/a:graphicData[1]/wps:wsp[1]/wps:linkedTxbx[1]",
"id", "1");
-}
-
DECLARE_OOXMLEXPORT_TEST(testFDO76586, "fdo76586.docx")
{
/*
@@ -3172,22 +3131,6 @@ DECLARE_OOXMLEXPORT_TEST(testFDO76587 , "fdo76587.docx")
assertXPath(pXmlDoc, "/w:styles/w:style[8]/w:pPr/w:spacing", "lineRule",
"auto");
}
-DECLARE_OOXMLEXPORT_TEST(test76734_2K7, "test76734_2K7.docx")
-{
-xmlDocPtr pXmlDoc = parseExport("word/document.xml");
-if (!pXmlDoc)
-return;
-assertXPath(pXmlDoc,
"/w:document[1]/w:body[1]/w:p[1]/w:r[3]/mc:AlternateContent[1]/mc:Choice[1]",
"Requires", "wps");
-}
-
-DECLARE_OOXMLEXPORT_TEST(test77219, "test772
[Libreoffice-commits] dev-tools.git: scripts/gerrit-filter-domain
scripts/gerrit-filter-domain | 20 +---
1 file changed, 9 insertions(+), 11 deletions(-)
New commits:
commit 79767d72acb658f633704b971127ad050c7c85b4
Author: Miklos Vajna
Date: Mon Apr 28 10:15:28 2014 +0200
gerrit-filter-domain: print all skip reasons, not just the first of them
Change-Id: I4a9ef9d6e3994d9311ff80d3fd027db10522d4ca
diff --git a/scripts/gerrit-filter-domain b/scripts/gerrit-filter-domain
index 1b1e464..9586bc7 100755
--- a/scripts/gerrit-filter-domain
+++ b/scripts/gerrit-filter-domain
@@ -44,7 +44,7 @@ def main(argv):
skippedChanges = []
for i in domainChanges:
-skip = False
+skip = []
files = (set([fileobj['file'] for pset in i['patchSets'] for fileobj
in pset['files']]))
files.remove('/COMMIT_MSG')
@@ -53,20 +53,18 @@ def main(argv):
for j in files:
for k in blacklist:
if k in j:
-skippedChanges.append((i, k))
-skip = True
+skip.append(k)
break
if skip:
break
-if not skip:
-for j in i['patchSets'][-1]['approvals']:
-if j['value'] in ("-1", "-2"):
-skippedChanges.append((i, "negative review"))
-skip = True
-break
+for j in i['patchSets'][-1]['approvals']:
+if j['value'] in ("-1", "-2"):
+skip.append("%s review" % j['value'])
+break
except:
pass
-if skip:
+if len(skip):
+skippedChanges.append((i, skip))
continue
print("http://gerrit.libreoffice.org/%s [%s] %s" % (i['number'],
i['branch'], i['subject']))
print("Changed files: %s" % ', '.join(files))
@@ -75,7 +73,7 @@ def main(argv):
print()
print("Skipped %s changes:" % len(skippedChanges))
for i in skippedChanges:
-print("http://gerrit.libreoffice.org/%s: %s" % (i[0]['number'], i[1]))
+print("http://gerrit.libreoffice.org/%s: %s" % (i[0]['number'], ",
".join(i[1])))
if __name__ == "__main__":
try:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - bin/find-german-comments tools/source ucb/source xmloff/source
bin/find-german-comments| 142 +++-
tools/source/generic/poly.cxx |8 -
tools/source/rc/resmgr.cxx |2
ucb/source/ucp/webdav/webdavcontent.cxx |5 -
xmloff/source/text/txtprmap.cxx |8 -
5 files changed, 151 insertions(+), 14 deletions(-)
New commits:
commit d8ae7ef18576101071f6cefbaa0feb970fb56267
Author: Michael Meeks
Date: Sat Apr 26 17:16:52 2014 +0100
German Comment translation
for directories with only a trivial set of lingering comments.
Change-Id: Id1ffa237549ee8fd82059caf68cc092f8c4a7efe
diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx
index f9a23a9..2447271 100644
--- a/tools/source/generic/poly.cxx
+++ b/tools/source/generic/poly.cxx
@@ -151,10 +151,10 @@ void ImplPolygon::ImplSetSize( sal_uInt16 nNewSize, bool
bResize )
if ( bResize )
{
-// Alte Punkte kopieren
+// Copy the old points
if ( mnPoints < nNewSize )
{
-// Neue Punkte mit 0 initialisieren
+// New points initialized to zero
memset( pNewAry+mnPoints, 0,
(sal_uIntPtr)(nNewSize-mnPoints)*sizeof(Point) );
if ( mpPointAry )
memcpy( pNewAry, mpPointAry, mnPoints*sizeof(Point) );
@@ -183,10 +183,10 @@ void ImplPolygon::ImplSetSize( sal_uInt16 nNewSize, bool
bResize )
if( bResize )
{
-// Alte Flags kopieren
+// copy the old flags
if ( mnPoints < nNewSize )
{
-// Neue Punkte mit 0 initialisieren
+// initialize new flags to zero
memset( pNewFlagAry+mnPoints, 0, nNewSize-mnPoints );
memcpy( pNewFlagAry, mpFlagAry, mnPoints );
}
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index b582990..bf9c3d8 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.cxx
@@ -1026,7 +1026,7 @@ bool ResMgr::GetResource( const ResId& rId, const
Resource* pResObj )
}
if ( pTop->pClassRes )
-// lokale Resource, nicht system Resource
+// local Resource, not a system Resource
pTop->pResource = (RSHEADER_TYPE *)pTop->pClassRes;
else
{
diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx
b/ucb/source/ucp/webdav/webdavcontent.cxx
index f22a306..e4fd59e 100644
--- a/ucb/source/ucp/webdav/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav/webdavcontent.cxx
@@ -986,7 +986,7 @@ throw( beans::UnknownPropertyException,
uno::RuntimeException )
{
#if 0
-// @@@ REMOVABLE z.Z. nicht richtig an der PropSetInfo gesetzt!!!
+// @@@ REMOVABLE z.Z. hasn't been set correctly in the PropSetInfo
try
{
beans::Property aProp
@@ -1006,10 +1006,7 @@ throw( beans::UnknownPropertyException,
}
#endif
-
// Try to remove property from server.
-
-
try
{
std::vector< ProppatchValue > aProppatchValues;
diff --git a/xmloff/source/text/txtprmap.cxx b/xmloff/source/text/txtprmap.cxx
index 175b707..dba9a4f 100644
--- a/xmloff/source/text/txtprmap.cxx
+++ b/xmloff/source/text/txtprmap.cxx
@@ -411,10 +411,10 @@ XMLPropertyMapEntry aXMLParaPropMap[] =
XMLPropertyMapEntry aXMLAdditionalTextDefaultsMap[] =
{
-// RES_FOLLOW_TEXT_FLOW - DVO, OD 01.10.2003 #i18732#
+// RES_FOLLOW_TEXT_FLOW - DVO #i18732#
MG_ED( "IsFollowingTextFlow", STYLE, FLOW_WITH_TEXT, XML_TYPE_BOOL, 0
),
-// OD 2004-05-05 #i28701# - RES_WRAP_INFLUENCE_ON_OBJPOS
+// #i28701# - RES_WRAP_INFLUENCE_ON_OBJPOS
MG_ED( "WrapInfluenceOnPosition", DRAW, WRAP_INFLUENCE_ON_POSITION,
XML_TYPE_WRAP_INFLUENCE_ON_POSITION, 0 ),
M_END()
@@ -786,10 +786,10 @@ XMLPropertyMapEntry aXMLFramePropMap[] =
// RES_GRFATR_DRAWMODE
MG_E( "GraphicColorMode", DRAW, COLOR_MODE, XML_TYPE_COLOR_MODE, 0
),
MG_E( "WritingMode", STYLE, WRITING_MODE,
XML_TYPE_TEXT_WRITING_MODE_WITH_DEFAULT, 0 ),
-// RES_FOLLOW_TEXT_FLOW - DVO, OD 01.10.2003 #i18732#
+// RES_FOLLOW_TEXT_FLOW - DVO #i18732#
MG_E( "IsFollowingTextFlow", DRAW, FLOW_WITH_TEXT,
XML_TYPE_BOOL|MID_FLAG_SPECIAL_ITEM_EXPORT, CTF_OLD_FLOW_WITH_TEXT ),
MG_E( "IsFollowingTextFlow", STYLE, FLOW_WITH_TEXT, XML_TYPE_BOOL, 0 ),
-// OD 2004-05-05 #i28701# - RES_WRAP_INFLUENCE_ON_OBJPOS
+// #i28701# - RES_WRAP_INFLUENCE_ON_OBJPOS
MG_E( "WrapInfluenceOnPosition", DRAW, WRAP_INFLUENCE_ON_POSITION,
XML_TYPE_WRAP_INFLUENCE_ON_POSITION, 0 ),
// special entries for floating frames
commit 14e06df21d60f0dcd681bd77beeba731533f81e2
Author: Michael Meeks
Date: Sat Apr 26 16:43:40 2014 +0100
whitelist directories with no German to speed up the count.
Change-Id: Ic8d5861fda5b21df43447eb7bc4dc9a416ce1afb
diff --git a/bin/find-german-comments b/bin/find-german-c
[Libreoffice-commits] core.git: bin/find-german-comments
bin/find-german-comments |1 - 1 file changed, 1 deletion(-) New commits: commit 751c076f3b03e374c84e7efff587f232e734117f Author: Miklos Vajna Date: Mon Apr 28 10:54:14 2014 +0200 bin/find-german-comments: fix duplicated "sw" key in dictionary Change-Id: I2a0a14c905ec1ba1408b625894ba0b8a02e17aa7 diff --git a/bin/find-german-comments b/bin/find-german-comments index 1c35745..c6f6803 100755 --- a/bin/find-german-comments +++ b/bin/find-german-comments @@ -325,7 +325,6 @@ class Parser: "tools" : 1, "touch" : 1, "tubes" : 1, -"sw" : 1, "ucb" : 1, "ucbhelper" : 1, "unodevtools" : 1, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - oox/source
oox/source/drawingml/transform2dcontext.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 66c01c7ba3882555642ce0c353ea3abf15bda2b5
Author: Muthu Subramanian
Date: Wed Mar 26 16:05:44 2014 +0530
n#862510: Fix text rotation.
Fix breaks document in n#783433 - the one there is
damaged - resaving it using mso 2010 should fix the problem there.
Change-Id: Ib2ee7ab20489d716dc189ac6810d705763a16476
(cherry picked from commit e3e12b1d1e36e1a0d4fc4c6423b584d677693897)
Signed-off-by: Andras Timar
diff --git a/oox/source/drawingml/transform2dcontext.cxx
b/oox/source/drawingml/transform2dcontext.cxx
index 8b9040c..d3a7c4b 100644
--- a/oox/source/drawingml/transform2dcontext.cxx
+++ b/oox/source/drawingml/transform2dcontext.cxx
@@ -46,7 +46,8 @@ Transform2DContext::Transform2DContext(
ContextHandler2Helper& rParent, const At
}
else
{
-mrShape.getTextBody()->getTextProperties().moRotation =
rAttribs.getInteger( XML_rot );
+if( rAttribs.hasAttribute( XML_rot ) )
+mrShape.getTextBody()->getTextProperties().moRotation =
-rAttribs.getInteger( XML_rot ).get();
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bin/find-german-comments
bin/find-german-comments |1 - 1 file changed, 1 deletion(-) New commits: commit 8eb41a5c0d7a076ab07bdfea56715b46b423713e Author: Julien Nabet Date: Mon Apr 28 11:06:57 2014 +0200 bin/find-german-comments: fix duplicated "basctl" key in dictionary Change-Id: I12b9d5816c685b2374e6d659436e46965f29cd3a diff --git a/bin/find-german-comments b/bin/find-german-comments index c6f6803..3834d63 100755 --- a/bin/find-german-comments +++ b/bin/find-german-comments @@ -232,7 +232,6 @@ class Parser: "avmedia" : 1, "basctl" : 1, "basebmp" : 1, -"basctl" : 1, "basegfx" : 1, "basic" : 1, "binaryurp" : 1, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 18 commits - cppcanvas/source filter/source sc/source sw/source vcl/source
cppcanvas/source/mtfrenderer/emfplus.cxx| 59 ++--
cppcanvas/source/mtfrenderer/implrenderer.cxx | 26 --
filter/source/graphicfilter/ios2met/ios2met.cxx | 34 +
sc/source/filter/excel/excrecds.cxx |8 ++-
sc/source/filter/excel/xestream.cxx |1
sc/source/filter/excel/xestyle.cxx |2
sc/source/filter/excel/xeview.cxx |8 +--
sc/source/filter/excel/xlchart.cxx | 12 ++--
sc/source/filter/excel/xlview.cxx |1
sc/source/filter/inc/lotrange.hxx |2
sw/source/core/undo/undobj1.cxx |7 ++
sw/source/core/undo/unmove.cxx |9 ++-
vcl/source/filter/wmf/winmtf.hxx| 25 --
vcl/source/gdi/pdfextoutdevdata.cxx |2
vcl/source/gdi/pdfwriter_impl.hxx | 14 -
15 files changed, 157 insertions(+), 53 deletions(-)
New commits:
commit 4ccdf41bd03a756c0e8d598fb3788e63433872c8
Author: Caolán McNamara
Date: Mon Apr 28 09:53:55 2014 +0100
coverity#708631 Uninitialized scalar field
Change-Id: Ie95fe7f64e9f60500748511aa1e55c430f0a6641
diff --git a/vcl/source/gdi/pdfwriter_impl.hxx
b/vcl/source/gdi/pdfwriter_impl.hxx
index 4cab95c..7f1b358 100644
--- a/vcl/source/gdi/pdfwriter_impl.hxx
+++ b/vcl/source/gdi/pdfwriter_impl.hxx
@@ -475,6 +475,7 @@ public:
m_nTextStyle( 0 ),
m_nFlags( 0 ),
m_nParent( 0 ),
+ m_nTabOrder( 0 ),
m_nRadioGroup( -1 ),
m_nMaxLen( 0 ),
m_bSubmit( false ),
commit 94fcab784bad15022481d5acf1c8c7803d7c2611
Author: Caolán McNamara
Date: Mon Apr 28 09:52:58 2014 +0100
coverity#708630 Uninitialized scalar field
Change-Id: Iaab1985c5db6482578d66abf224248da38db1624
diff --git a/vcl/source/gdi/pdfwriter_impl.hxx
b/vcl/source/gdi/pdfwriter_impl.hxx
index 66d5105..4cab95c 100644
--- a/vcl/source/gdi/pdfwriter_impl.hxx
+++ b/vcl/source/gdi/pdfwriter_impl.hxx
@@ -222,7 +222,12 @@ public:
sal_Int32 m_nObject;
boolm_bTrueColor;
-JPGEmit() : m_pStream( NULL ), m_bTrueColor( false ) {}
+JPGEmit()
+: m_pStream(NULL)
+, m_nObject(0)
+, m_bTrueColor(false)
+{
+}
~JPGEmit() { delete m_pStream; }
};
commit bedf2d65ca9e77f2072354fe1561a9cd047b0bd1
Author: Caolán McNamara
Date: Mon Apr 28 09:51:47 2014 +0100
coverity#708629 Uninitialized scalar field
Change-Id: Ia570a267732a4f7d76f1873563f6db1eb884dc56
diff --git a/vcl/source/gdi/pdfwriter_impl.hxx
b/vcl/source/gdi/pdfwriter_impl.hxx
index 07fab7f..66d5105 100644
--- a/vcl/source/gdi/pdfwriter_impl.hxx
+++ b/vcl/source/gdi/pdfwriter_impl.hxx
@@ -207,7 +207,11 @@ public:
sal_Int32 m_nObject;
boolm_bDrawMask;
-BitmapEmit() : m_bDrawMask( false ) {}
+BitmapEmit()
+: m_nObject(0)
+, m_bDrawMask(false)
+{
+}
};
struct JPGEmit
commit d085620d0306f7e9a0346950259c8770f067595a
Author: Caolán McNamara
Date: Mon Apr 28 09:49:28 2014 +0100
coverity#708627 Uninitialized scalar field
Change-Id: I729eab07b6de04be07e8495f28d14bcf1191e00d
diff --git a/vcl/source/gdi/pdfextoutdevdata.cxx
b/vcl/source/gdi/pdfextoutdevdata.cxx
index 7a1f437..da71065 100644
--- a/vcl/source/gdi/pdfextoutdevdata.cxx
+++ b/vcl/source/gdi/pdfextoutdevdata.cxx
@@ -499,6 +499,8 @@ PDFExtOutDevData::PDFExtOutDevData( const OutputDevice&
rOutDev ) :
mbTransitionEffects ( true ),
mbUseLosslessCompression( true ),
mbReduceImageResolution ( false ),
+mbExportFormFields ( false ),
+mbExportBookmarks ( false ),
mbExportHiddenSlides( false ),
mbExportNDests ( false ),
mnFormsFormat ( 0 ),
commit c7a53e6320d6b21ad29a0572f87d8ccc36549c15
Author: Caolán McNamara
Date: Mon Apr 28 09:47:46 2014 +0100
coverity#708319 Uninitialized scalar field
Change-Id: I8f817ba8fc286979f666ad06f4fe21f4703b4652
diff --git a/vcl/source/filter/wmf/winmtf.hxx b/vcl/source/filter/wmf/winmtf.hxx
index 52b1848..dfda459 100644
--- a/vcl/source/filter/wmf/winmtf.hxx
+++ b/vcl/source/filter/wmf/winmtf.hxx
@@ -775,7 +775,7 @@ protected:
class EnhWMFReader : public WinMtf
{
boolbRecordPath;
-sal_Int32 nRecordCount;
+sal_Int32 nRecordCount;
boolbEMFPlus;
boolReadHeader();
@@ -783,18 +783,17 @@ class EnhWMFReader : public WinMtf
Rectangle ReadRectangle( sal_Int32, sal_Int32, sal_Int32, sal_Int32
);
public:
-EnhWMFReader(
-SvStream& rStreamWMF,
-GDIMetaFile& rGDIMetaFile,
-FilterConfigItem* pConfigItem = NU
[Libreoffice-commits] core.git: vcl/source
vcl/source/outdev/bitmap.cxx |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 789d3b363f9a0619d14b37a74f37809d05230594
Author: Thomas Arnhold
Date: Mon Apr 28 11:33:03 2014 +0200
fdo#78030 - Bitmaps are missing allover the UI
Original behavior was to call DrawBitmap without the size argument.
case IMAGETYPE_BITMAP:
{
const Bitmap &rBitmap = *static_cast< Bitmap* >(
rImage.mpImplData->mpData );
if( nStyle & IMAGE_DRAW_DISABLE )
DrawBitmapEx( rPos, makeDisabledBitmap(rBitmap) );
else
DrawBitmap( rPos, rBitmap );
}
break;
A check of bIsValidSize is needed here, too.
This brings the missing bitmaps back.
Change-Id: I60582090a7543b3916b15675af1a5ec9ee216270
diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx
index 46d58da..e0841a6 100644
--- a/vcl/source/outdev/bitmap.cxx
+++ b/vcl/source/outdev/bitmap.cxx
@@ -1160,7 +1160,10 @@ void OutputDevice::DrawImage( const Point& rPos, const
Size& rSize,
}
else
{
-DrawBitmap( rPos, rSize, rBitmap );
+if ( bIsSizeValid )
+DrawBitmap( rPos, rSize, rBitmap );
+else
+DrawBitmap( rPos, rBitmap );
}
}
break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: ucb/source
ucb/source/ucp/webdav/webdavcontent.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0087fc02ec179f9a5e189bdb256bb9b80d027ca9
Author: Thomas Arnhold
Date: Mon Apr 28 11:39:56 2014 +0200
translate z.Z.
Change-Id: Ia048a33bf27b32b65c0e72dd48c5c98e51b818ff
diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx
b/ucb/source/ucp/webdav/webdavcontent.cxx
index e4fd59e..cf1a55e6 100644
--- a/ucb/source/ucp/webdav/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav/webdavcontent.cxx
@@ -986,7 +986,7 @@ throw( beans::UnknownPropertyException,
uno::RuntimeException )
{
#if 0
-// @@@ REMOVABLE z.Z. hasn't been set correctly in the PropSetInfo
+// @@@ REMOVABLE at the moment not properly set in the PropSetInfo
try
{
beans::Property aProp
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - include/oox oox/source
include/oox/drawingml/textcharacterproperties.hxx |2 ++
oox/source/drawingml/textcharacterproperties.cxx|3 +++
oox/source/drawingml/textcharacterpropertiescontext.cxx |4
3 files changed, 9 insertions(+)
New commits:
commit ce609f477e488e9c701b2bfa893bcf01722d2a01
Author: Muthu Subramanian
Date: Fri Mar 28 17:24:45 2014 +0530
n#870234: Import gradfill for text colors.
Uses the first color from the gradfill list.
(Which is better than plain black!)
(cherry picked from commit cfc76de83e3c0a56abd30a8f3bd7c69d3500d223)
Signed-off-by: Andras Timar
Conflicts:
oox/source/drawingml/textcharacterproperties.cxx
oox/source/drawingml/textcharacterpropertiescontext.cxx
Change-Id: I4c1c0c4b031f3681c95b75b3c0683eb4de95bffb
diff --git a/include/oox/drawingml/textcharacterproperties.hxx
b/include/oox/drawingml/textcharacterproperties.hxx
index c079015..d2335e1 100644
--- a/include/oox/drawingml/textcharacterproperties.hxx
+++ b/include/oox/drawingml/textcharacterproperties.hxx
@@ -24,6 +24,7 @@
#include
#include
#include
+#include
namespace oox { class PropertySet; }
@@ -53,6 +54,7 @@ struct TextCharacterProperties
OptValue< bool >moItalic;
OptValue< bool >moUnderlineLineFollowText;
OptValue< bool >moUnderlineFillFollowText;
+GradientFillProperties maGradientProps; /// Properties for gradient
text colors
/** Overwrites all members that are explicitly set in rSourceProps. */
voidassignUsed( const TextCharacterProperties&
rSourceProps );
diff --git a/oox/source/drawingml/textcharacterproperties.cxx
b/oox/source/drawingml/textcharacterproperties.cxx
index febb28c..a7be42b 100644
--- a/oox/source/drawingml/textcharacterproperties.cxx
+++ b/oox/source/drawingml/textcharacterproperties.cxx
@@ -60,6 +60,7 @@ void TextCharacterProperties::assignUsed( const
TextCharacterProperties& rSource
moItalic.assignIfUsed( rSourceProps.moItalic );
moUnderlineLineFollowText.assignIfUsed(
rSourceProps.moUnderlineLineFollowText );
moUnderlineFillFollowText.assignIfUsed(
rSourceProps.moUnderlineFillFollowText );
+maGradientProps.assignUsed( rSourceProps.maGradientProps );
}
void TextCharacterProperties::pushToPropMap( PropertyMap& rPropMap, const
XmlFilterBase& rFilter, bool bUseOptional ) const
@@ -93,6 +94,8 @@ void TextCharacterProperties::pushToPropMap( PropertyMap&
rPropMap, const XmlFil
if( maCharColor.isUsed() )
rPropMap[ PROP_CharColor ] <<= maCharColor.getColor(
rFilter.getGraphicHelper() );
+if( maGradientProps.maGradientStops.size() > 0 )
+rPropMap[ PROP_CharColor ] <<=
maGradientProps.maGradientStops.begin()->second.getColor(
rFilter.getGraphicHelper() );
if( moLang.has() && !moLang.get().isEmpty() )
{
diff --git a/oox/source/drawingml/textcharacterpropertiescontext.cxx
b/oox/source/drawingml/textcharacterpropertiescontext.cxx
index e166e6d..6887cda 100644
--- a/oox/source/drawingml/textcharacterpropertiescontext.cxx
+++ b/oox/source/drawingml/textcharacterpropertiescontext.cxx
@@ -132,6 +132,10 @@ ContextHandlerRef
TextCharacterPropertiesContext::onCreateContext( sal_Int32 aEl
case A_TOKEN( hlinkClick ): // CT_Hyperlink
case A_TOKEN( hlinkMouseOver ): // CT_Hyperlink
return new HyperLinkContext( *this, rAttribs,
mrTextCharacterProperties.maHyperlinkPropertyMap );
+
+case A_TOKEN( gradFill ):
+return new GradientFillContext( *this, rAttribs,
mrTextCharacterProperties.maGradientProps );
+
}
return this;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/sdr/contact/objectcontactofpageview.cxx | 15 +++ 1 file changed, 15 insertions(+) New commits: commit 89e14d6c318580354081b3b3ad39188f25481ae7 Author: Jan Holesovsky Date: Mon Apr 28 11:24:29 2014 +0200 Fix repainting problems in Draw. Regression from 465730622e2eb77828c1cf4845f8e8a40b92f1b2; unfortunately the hierarchy can contain more than just the sdr shapes, in which case it fails to recognize that there is still something to paint. We need to improve the way getPrimitive2DSequenceHierarchy() works, and come up with a way how to cut early the primitives that are not interesting for the area that we are redrawing. Change-Id: Ieb2e40a576e9a394fe28f248e582c132ab5b6578 diff --git a/svx/source/sdr/contact/objectcontactofpageview.cxx b/svx/source/sdr/contact/objectcontactofpageview.cxx index 019cc2c..09b37be 100644 --- a/svx/source/sdr/contact/objectcontactofpageview.cxx +++ b/svx/source/sdr/contact/objectcontactofpageview.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include + #include #include #include @@ -231,6 +233,18 @@ namespace sdr updateViewInformation2D(aNewViewInformation2D); drawinglayer::primitive2d::Primitive2DSequence xPrimitiveSequence; +#if HAVE_FEATURE_DESKTOP +// get whole Primitive2DSequence; this will already make use of updated ViewInformation2D +// and may use the MapMode from the Target OutDev in the DisplayInfo +xPrimitiveSequence = rDrawPageVOContact.getPrimitive2DSequenceHierarchy(rDisplayInfo); +#else +// HACK: this only works when we are drawing sdr shapes via +// drawinglayer; but it can happen that the hierarchy contains +// more than just the shapes, and then it fails. +// +// This is good enough for the tiled rendering for the moment, but +// we need to come up with with the real solution shortly. + // Only get the expensive hierarchy if we can be sure that the // returned sequence won't be empty anyway. bool bGetHierarchy = rRedrawArea.IsEmpty(); @@ -254,6 +268,7 @@ namespace sdr // get whole Primitive2DSequence; this will already make use of updated ViewInformation2D // and may use the MapMode from the Target OutDev in the DisplayInfo xPrimitiveSequence = rDrawPageVOContact.getPrimitive2DSequenceHierarchy(rDisplayInfo); +#endif // if there is something to show, use a primitive processor to render it. There // is a choice between VCL and Canvas processors currently. The decision is made in ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/qa oox/source
chart2/qa/extras/chart2export.cxx| 38 +++
chart2/qa/extras/data/docx/fdo77216.docx |binary
oox/source/export/chartexport.cxx| 17 +
3 files changed, 54 insertions(+), 1 deletion(-)
New commits:
commit a211c754003f98bc8f7761224a0b265bd224f61f
Author: Sourav
Date: Tue Apr 15 16:39:52 2014 +0530
fdo77216-Charts-Scattered chart: Chart gets distorted on RT
In case there is some text entered in place of X coordinates for scatter
chart
then x coordinates should be taken as 1,2,3
MS Word does the same thing
Change-Id: I1db0fd64c6ac0f4d5e77a9676812f5e26577ecf6
Reviewed-on: https://gerrit.libreoffice.org/9011
Tested-by: Markus Mohrhard
Reviewed-by: Markus Mohrhard
diff --git a/chart2/qa/extras/chart2export.cxx
b/chart2/qa/extras/chart2export.cxx
index bc1dcd3..eded887 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -36,6 +36,7 @@ public:
void testStockChart();
void testBarChart();
void testCrosses();
+void testScatterChart();
void testChartDataTable();
void testChartExternalData();
void testEmbeddingsGrabBag();
@@ -64,6 +65,7 @@ public:
CPPUNIT_TEST(testStockChart);
CPPUNIT_TEST(testBarChart);
CPPUNIT_TEST(testCrosses);
+CPPUNIT_TEST(testScatterChart);
CPPUNIT_TEST(testChartDataTable);
CPPUNIT_TEST(testChartExternalData);
CPPUNIT_TEST(testEmbeddingsGrabBag);
@@ -117,6 +119,14 @@ protected:
* Same as the assertXPath(), but don't assert: return the string instead.
*/
OUString getXPath(xmlDocPtr pXmlDoc, const OString& rXPath, const OString&
rAttribute);
+/**
+Assert that rXPath exists, and its content equals rContent.
+*/
+void assertXPathContent(xmlDocPtr pXmlDoc, const OString& rXPath, const
OUString& rContent);
+/**
+Same as the assertXPathContent(), but don't assert: return the string
instead.
+*/
+OUString getXPathContent(xmlDocPtr pXmlDoc, const OString& rXPath);
private:
};
@@ -211,6 +221,24 @@ void Chart2ExportTest::assertXPath(xmlDocPtr pXmlDoc,
const OString& rXPath, int
nNumberOfNodes, xmlXPathNodeSetGetLength(pXmlNodes));
}
+void Chart2ExportTest::assertXPathContent(xmlDocPtr pXmlDoc, const OString&
rXPath, const OUString& rContent)
+{
+CPPUNIT_ASSERT_EQUAL_MESSAGE("XPath contents of child does not match",
rContent, getXPathContent(pXmlDoc, rXPath));
+}
+
+OUString Chart2ExportTest::getXPathContent(xmlDocPtr pXmlDoc, const OString&
rXPath)
+{
+ xmlNodeSetPtr pXmlNodes = getXPathNode(pXmlDoc, rXPath);
+
+ CPPUNIT_ASSERT_MESSAGE(OString("XPath '" + rXPath + "' not
found").getStr(),
+ xmlXPathNodeSetGetLength(pXmlNodes) > 0);
+
+ xmlNodePtr pXmlNode = pXmlNodes->nodeTab[0];
+
+_xmlNode *pNode = &(pXmlNode->children[0]);
+ return pNode ? OUString::createFromAscii((const
char*)((pXmlNode->children[0]).content)) : OUString();
+}
+
OUString Chart2ExportTest::getXPath(xmlDocPtr pXmlDoc, const OString& rXPath,
const OString& rAttribute)
{
xmlNodeSetPtr pXmlNodes = getXPathNode(pXmlDoc, rXPath);
@@ -479,6 +507,16 @@ void Chart2ExportTest::testCrosses()
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx/c:crosses",
"val", "autoZero");
}
+void Chart2ExportTest::testScatterChart()
+{
+load("/chart2/qa/extras/data/docx/", "fdo77216.docx");
+xmlDocPtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML
Text");
+if (!pXmlDoc)
+ return;
+
+assertXPathContent(pXmlDoc,
"//c:scatterChart/c:ser[1]/c:xVal[1]/c:numRef[1]/c:numCache[1]/c:pt[1]/c:v[1]",
"1");
+}
+
void Chart2ExportTest::testChartDataTable()
{
load("/chart2/qa/extras/data/docx/", "testChartDataTable.docx");
diff --git a/chart2/qa/extras/data/docx/fdo77216.docx
b/chart2/qa/extras/data/docx/fdo77216.docx
new file mode 100644
index 000..b741bbc
Binary files /dev/null and b/chart2/qa/extras/data/docx/fdo77216.docx differ
diff --git a/oox/source/export/chartexport.cxx
b/oox/source/export/chartexport.cxx
index f6e02db..9b12eb7 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -2008,6 +2008,14 @@ void ChartExport::exportSeriesValues( const Reference<
chart2::data::XDataSequen
pFS->singleElement( FSNS( XML_c, XML_ptCount ),
XML_val, I32S( ptCount ),
FSEND );
+
+sal_Bool bIsNumberValue = sal_True;
+sal_Bool bXSeriesValue = sal_False;
+double Value = 1.0;
+
+if(nValueType == XML_xVal)
+bXSeriesValue = sal_True;
+
for( sal_Int32 i = 0; i < ptCount; i++ )
{
pFS->startElement( FSNS( XML_c, XML_pt ),
@@ -2015,8 +2023,15 @@ void ChartExport::exportSeriesValues( const Reference<
chart2::data::XDataSequen
FSEND );
pFS->startElement( FSNS( XML_c, XML_v ),
FSEND );
-if (!rtl
[Libreoffice-commits] core.git: bin/find-german-comments starmath/source
bin/find-german-comments |2 +-
starmath/source/parse.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 4cd629645cdebf30f2e941df6e17f51b50d934f1
Author: Thorsten Behrens
Date: Mon Apr 28 11:52:50 2014 +0200
Make starmath german-comment-free.
Change-Id: I48b5c6afe861704abe978cb07ecd9df6e39d7b7c
diff --git a/bin/find-german-comments b/bin/find-german-comments
index 3834d63..4910611 100755
--- a/bin/find-german-comments
+++ b/bin/find-german-comments
@@ -310,7 +310,7 @@ class Parser:
"smoketest" : 1,
"solenv" : 1,
"soltools" : 1,
-"starmath" : 0, # - 1 line !
+"starmath" : 1,
"stoc" : 0, #
"store" : 1,
"svgio" : 1,
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index a05f8a0..a1338e9 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -1295,7 +1295,7 @@ void SmParser::Blank()
NextToken();
}
-// Blanks am Zeilenende ignorieren wenn die entsprechende Option gesetzt
ist
+// Ignore trailing spaces, if corresponding option is set
if ( m_aCurToken.eType == TNEWLINE ||
(m_aCurToken.eType == TEND &&
SM_MOD()->GetConfig()->IsIgnoreSpacesRight()) )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/source
oox/source/export/chartexport.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit dea3ab9db68502b4f8306eb79c944ab87660888e
Author: Markus Mohrhard
Date: Mon Apr 28 11:49:44 2014 +0200
sal_Bool to bool in previous commit
Change-Id: I6de50ccd8b99d6d7dbd049fc184c3f6117217318
diff --git a/oox/source/export/chartexport.cxx
b/oox/source/export/chartexport.cxx
index 9b12eb7..ae7a926 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -2009,12 +2009,12 @@ void ChartExport::exportSeriesValues( const Reference<
chart2::data::XDataSequen
XML_val, I32S( ptCount ),
FSEND );
-sal_Bool bIsNumberValue = sal_True;
-sal_Bool bXSeriesValue = sal_False;
+bool bIsNumberValue = true;
+bool bXSeriesValue = false;
double Value = 1.0;
if(nValueType == XML_xVal)
-bXSeriesValue = sal_True;
+bXSeriesValue = true;
for( sal_Int32 i = 0; i < ptCount; i++ )
{
@@ -2030,7 +2030,7 @@ void ChartExport::exportSeriesValues( const Reference<
chart2::data::XDataSequen
//In Case aValues is not a number for X Values...We write X values
as 1,2,3MS Word does the same thing.
pFS->write( Value );
Value = Value + 1;
-bIsNumberValue = sal_False;
+bIsNumberValue = false;
}
pFS->endElement( FSNS( XML_c, XML_v ) );
pFS->endElement( FSNS( XML_c, XML_pt ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 7 commits - vcl/source
vcl/source/outdev/outdev.cxx | 328 -
vcl/source/outdev/outdevstate.cxx | 333 ++
2 files changed, 333 insertions(+), 328 deletions(-)
New commits:
commit 0f83b6379af62a9a0556371ee82a152c7d4e93b3
Author: Chris Sherlock
Date: Mon Apr 28 19:25:55 2014 +1000
VCL: Move SetFont up the include file
Change-Id: I6721e78f8a10d95a54ff09c1f25f0ae3ece71cfa
diff --git a/vcl/source/outdev/outdevstate.cxx
b/vcl/source/outdev/outdevstate.cxx
index d149542..908abc3 100644
--- a/vcl/source/outdev/outdevstate.cxx
+++ b/vcl/source/outdev/outdevstate.cxx
@@ -371,29 +371,6 @@ void OutputDevice::SetBackground( const Wallpaper&
rBackground )
mpAlphaVDev->SetBackground( rBackground );
}
-
-void OutputDevice::InitFillColor()
-{
-DBG_TESTSOLARMUTEX();
-
-if( mbFillColor )
-{
-if( ROP_0 == meRasterOp )
-mpGraphics->SetROPFillColor( SAL_ROP_0 );
-else if( ROP_1 == meRasterOp )
-mpGraphics->SetROPFillColor( SAL_ROP_1 );
-else if( ROP_INVERT == meRasterOp )
-mpGraphics->SetROPFillColor( SAL_ROP_INVERT );
-else
-mpGraphics->SetFillColor( ImplColorToSal( maFillColor ) );
-}
-else
-mpGraphics->SetFillColor();
-
-mbInitFillColor = false;
-}
-
-
void OutputDevice::SetFont( const Font& rNewFont )
{
@@ -501,4 +478,25 @@ void OutputDevice::SetFont( const Font& rNewFont )
}
}
+void OutputDevice::InitFillColor()
+{
+DBG_TESTSOLARMUTEX();
+
+if( mbFillColor )
+{
+if( ROP_0 == meRasterOp )
+mpGraphics->SetROPFillColor( SAL_ROP_0 );
+else if( ROP_1 == meRasterOp )
+mpGraphics->SetROPFillColor( SAL_ROP_1 );
+else if( ROP_INVERT == meRasterOp )
+mpGraphics->SetROPFillColor( SAL_ROP_INVERT );
+else
+mpGraphics->SetFillColor( ImplColorToSal( maFillColor ) );
+}
+else
+mpGraphics->SetFillColor();
+
+mbInitFillColor = false;
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 0ada64dfd99fdaa1b182f88d32e4f4c6fbd2b5f6
Author: Chris Sherlock
Date: Mon Apr 28 19:24:08 2014 +1000
VCL: Move SetBackground from outdev.cxx to outdevstate.cxx
Change-Id: I04bf1470e43ed08ef5759fcbd6f96d4896f7690b
diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx
index 31c5774..c0dd42a 100644
--- a/vcl/source/outdev/outdev.cxx
+++ b/vcl/source/outdev/outdev.cxx
@@ -821,30 +821,6 @@ Color OutputDevice::ImplDrawModeToColor( const Color&
rColor ) const
return aColor;
}
-void OutputDevice::SetBackground()
-{
-
-maBackground = Wallpaper();
-mbBackground = false;
-
-if( mpAlphaVDev )
-mpAlphaVDev->SetBackground();
-}
-
-void OutputDevice::SetBackground( const Wallpaper& rBackground )
-{
-
-maBackground = rBackground;
-
-if( rBackground.GetStyle() == WALLPAPER_NULL )
-mbBackground = false;
-else
-mbBackground = true;
-
-if( mpAlphaVDev )
-mpAlphaVDev->SetBackground( rBackground );
-}
-
void OutputDevice::SetRefPoint()
{
diff --git a/vcl/source/outdev/outdevstate.cxx
b/vcl/source/outdev/outdevstate.cxx
index 2fada5e..d149542 100644
--- a/vcl/source/outdev/outdevstate.cxx
+++ b/vcl/source/outdev/outdevstate.cxx
@@ -347,6 +347,30 @@ void OutputDevice::SetFillColor( const Color& rColor )
mpAlphaVDev->SetFillColor( COL_BLACK );
}
+void OutputDevice::SetBackground()
+{
+
+maBackground = Wallpaper();
+mbBackground = false;
+
+if( mpAlphaVDev )
+mpAlphaVDev->SetBackground();
+}
+
+void OutputDevice::SetBackground( const Wallpaper& rBackground )
+{
+
+maBackground = rBackground;
+
+if( rBackground.GetStyle() == WALLPAPER_NULL )
+mbBackground = false;
+else
+mbBackground = true;
+
+if( mpAlphaVDev )
+mpAlphaVDev->SetBackground( rBackground );
+}
+
void OutputDevice::InitFillColor()
{
commit d0d21235cd653d66aa877161086c474e988277b6
Author: Chris Sherlock
Date: Mon Apr 28 19:23:09 2014 +1000
VCL: Move SetFillColor from outdev.cxx to outdevstate.cxx
Change-Id: Ia817fbe4aa2927ac5568fd842e8f313608bed320
diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx
index cec9f14..31c5774 100644
--- a/vcl/source/outdev/outdev.cxx
+++ b/vcl/source/outdev/outdev.cxx
@@ -821,91 +821,6 @@ Color OutputDevice::ImplDrawModeToColor( const Color&
rColor ) const
return aColor;
}
-void OutputDevice::SetFillColor()
-{
-
-if ( mpMetaFile )
-mpMetaFile->AddAction( new MetaFillColorAction( Color(), false ) );
-
-if ( mbFillColor )
-{
-mbInitFillColor = true;
-mbFillColor = false;
-maFillColor = Color( COL_TRANSPARENT );
-}
-
-if( mpAlphaVDev )
-mpAlphaVDev->SetFillColor();
-}
-
-void OutputDevice::SetFillColor( const Color& rColor )
-{
-
-Color aColor( rColor );
-
-if( mnDrawM
Build Error
Hi, I was building LO( it had already gone on for about 6-7 hours), when suddenly this popped up:- *[build LNK] CppunitTest/libtest_sc_subsequent_export_test.so* */home/shreyansh/core/solenv/gbuild/Package.mk:35: *** gb_Deliver_deliver: file does not exist in instdir, and cannot be delivered: /home/shreyansh/core/instdir/program/libscopencllo.so. Stop.* *make[1]: *** Waiting for unfinished jobs* *make: *** [build] Error 2* Any advice on how to deal with this? Regards, Shreyansh Gandhi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 3 commits - vcl/source
vcl/source/outdev/outdev.cxx | 45 -
vcl/source/outdev/outdevstate.cxx | 68 ++
vcl/source/outdev/text.cxx| 22
3 files changed, 68 insertions(+), 67 deletions(-)
New commits:
commit 94d0eb659ed1310f3d2647c83db8e54184c55e23
Author: Chris Sherlock
Date: Mon Apr 28 20:29:21 2014 +1000
VCL move SetLayoutMode & SetDigitLanguage from font.cxx to outdevstate.cxx
Change-Id: Iaf48a39fa1d4d7b88143022e517f2c4e119e94d5
diff --git a/vcl/source/outdev/outdevstate.cxx
b/vcl/source/outdev/outdevstate.cxx
index 7ce35cf..228620a 100644
--- a/vcl/source/outdev/outdevstate.cxx
+++ b/vcl/source/outdev/outdevstate.cxx
@@ -288,6 +288,28 @@ void OutputDevice::SetDrawMode( sal_uLong nDrawMode )
mpAlphaVDev->SetDrawMode( nDrawMode );
}
+void OutputDevice::SetLayoutMode( sal_uLong nTextLayoutMode )
+{
+if( mpMetaFile )
+mpMetaFile->AddAction( new MetaLayoutModeAction( nTextLayoutMode ) );
+
+mnTextLayoutMode = nTextLayoutMode;
+
+if( mpAlphaVDev )
+mpAlphaVDev->SetLayoutMode( nTextLayoutMode );
+}
+
+void OutputDevice::SetDigitLanguage( LanguageType eTextLanguage )
+{
+if( mpMetaFile )
+mpMetaFile->AddAction( new MetaTextLanguageAction( eTextLanguage ) );
+
+meTextLanguage = eTextLanguage;
+
+if( mpAlphaVDev )
+mpAlphaVDev->SetDigitLanguage( eTextLanguage );
+}
+
void OutputDevice::SetRasterOp( RasterOp eRasterOp )
{
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index dd03ac4..4383e5e 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -681,28 +681,6 @@ long OutputDevice::ImplGetTextLines(
ImplMultiTextLineInfo& rLineInfo,
return nMaxLineWidth;
}
-void OutputDevice::SetLayoutMode( sal_uLong nTextLayoutMode )
-{
-if( mpMetaFile )
-mpMetaFile->AddAction( new MetaLayoutModeAction( nTextLayoutMode ) );
-
-mnTextLayoutMode = nTextLayoutMode;
-
-if( mpAlphaVDev )
-mpAlphaVDev->SetLayoutMode( nTextLayoutMode );
-}
-
-void OutputDevice::SetDigitLanguage( LanguageType eTextLanguage )
-{
-if( mpMetaFile )
-mpMetaFile->AddAction( new MetaTextLanguageAction( eTextLanguage ) );
-
-meTextLanguage = eTextLanguage;
-
-if( mpAlphaVDev )
-mpAlphaVDev->SetDigitLanguage( eTextLanguage );
-}
-
void OutputDevice::SetTextColor( const Color& rColor )
{
commit 690b655f06af5717ecb79f0cb804342a78a6ba43
Author: Chris Sherlock
Date: Mon Apr 28 20:25:25 2014 +1000
VCL move SetRasterOp & SetDrawMode from outdev.cxx to outdevstate.cxx
Change-Id: I8c597e5b9049cd23223ecf4376a4449ca1effb38
diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx
index bd2ad9a..7eb435e 100644
--- a/vcl/source/outdev/outdev.cxx
+++ b/vcl/source/outdev/outdev.cxx
@@ -753,34 +753,6 @@ void OutputDevice::ImplGetFrameDev( const Point& rPt,
const Point& rDevPt, const
}
-void OutputDevice::SetDrawMode( sal_uLong nDrawMode )
-{
-
-mnDrawMode = nDrawMode;
-
-if( mpAlphaVDev )
-mpAlphaVDev->SetDrawMode( nDrawMode );
-}
-
-void OutputDevice::SetRasterOp( RasterOp eRasterOp )
-{
-
-if ( mpMetaFile )
-mpMetaFile->AddAction( new MetaRasterOpAction( eRasterOp ) );
-
-if ( meRasterOp != eRasterOp )
-{
-meRasterOp = eRasterOp;
-mbInitLineColor = mbInitFillColor = true;
-
-if( mpGraphics || AcquireGraphics() )
-mpGraphics->SetXORMode( (ROP_INVERT == meRasterOp) || (ROP_XOR ==
meRasterOp), ROP_INVERT == meRasterOp );
-}
-
-if( mpAlphaVDev )
-mpAlphaVDev->SetRasterOp( eRasterOp );
-}
-
Color OutputDevice::ImplDrawModeToColor( const Color& rColor ) const
{
Color aColor( rColor );
diff --git a/vcl/source/outdev/outdevstate.cxx
b/vcl/source/outdev/outdevstate.cxx
index 7a1ae46..7ce35cf 100644
--- a/vcl/source/outdev/outdevstate.cxx
+++ b/vcl/source/outdev/outdevstate.cxx
@@ -262,7 +262,6 @@ void OutputDevice::EnableOutput( bool bEnable )
mpAlphaVDev->EnableOutput( bEnable );
}
-
void OutputDevice::SetAntialiasing( sal_uInt16 nMode )
{
if ( mnAntialiasing != nMode )
@@ -280,6 +279,34 @@ void OutputDevice::SetAntialiasing( sal_uInt16 nMode )
mpAlphaVDev->SetAntialiasing( nMode );
}
+void OutputDevice::SetDrawMode( sal_uLong nDrawMode )
+{
+
+mnDrawMode = nDrawMode;
+
+if( mpAlphaVDev )
+mpAlphaVDev->SetDrawMode( nDrawMode );
+}
+
+void OutputDevice::SetRasterOp( RasterOp eRasterOp )
+{
+
+if ( mpMetaFile )
+mpMetaFile->AddAction( new MetaRasterOpAction( eRasterOp ) );
+
+if ( meRasterOp != eRasterOp )
+{
+meRasterOp = eRasterOp;
+mbInitLineColor = mbInitFillColor = true;
+
+if( mpGraphics || AcquireGraphics() )
+mpGraphics->SetXORMode( (ROP_INVERT == meRasterOp) || (ROP_XOR ==
meRasterOp), ROP_INVERT == meRasterOp );
+}
+
+if( mpAlphaVDev )
+mpAlphaVDev->SetRas
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - officecfg/Configuration_officecfg.mk
officecfg/Configuration_officecfg.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 18439c59a11a9c3c6ece1792e8d465399c1c0e84 Author: Andras Timar Date: Mon Apr 28 09:53:59 2014 +0200 fdo#67112 ReportCommands.xcu is localizable Change-Id: I51db40b14ec138632d922c910f59cfe50d6b3f2f (cherry picked from commit d6904736b9a07b2a321add96be4857ba41a7f370) Reviewed-on: https://gerrit.libreoffice.org/9183 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/officecfg/Configuration_officecfg.mk b/officecfg/Configuration_officecfg.mk index d0a7239..5f345b7 100644 --- a/officecfg/Configuration_officecfg.mk +++ b/officecfg/Configuration_officecfg.mk @@ -51,7 +51,6 @@ $(eval $(call gb_Configuration_add_datas,registry,officecfg/registry/data,\ org/openoffice/Office/ReportDesign.xcu \ org/openoffice/Office/UI/Controller.xcu \ org/openoffice/Office/UI/Factories.xcu \ - org/openoffice/Office/UI/ReportCommands.xcu \ org/openoffice/TypeDetection/UISort.xcu \ org/openoffice/ucb/Configuration.xcu \ )) @@ -171,6 +170,7 @@ $(eval $(call gb_Configuration_add_localized_datas,registry,officecfg/registry/d org/openoffice/Office/UI/DrawWindowState.xcu \ org/openoffice/Office/UI/ImpressWindowState.xcu \ org/openoffice/Office/UI/MathWindowState.xcu \ + org/openoffice/Office/UI/ReportCommands.xcu \ org/openoffice/Office/UI/Sidebar.xcu \ org/openoffice/Office/UI/StartModuleWindowState.xcu \ org/openoffice/Office/UI/WriterWindowState.xcu \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source
sc/source/core/opencl/formulagroupcl.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0b6fe077679e33ed91bf81796fe454cc75730916 Author: Julien Nabet Date: Sat Apr 26 22:34:35 2014 +0200 cppcheck: fix "Mismatching allocation and deallocation" Change-Id: Ic007b07a82eb83978527254518d85c5a2903a48d Reviewed-on: https://gerrit.libreoffice.org/9175 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx index ec5c4bf..ee614d6 100644 --- a/sc/source/core/opencl/formulagroupcl.cxx +++ b/sc/source/core/opencl/formulagroupcl.cxx @@ -3393,7 +3393,7 @@ DynamicKernel* DynamicKernel::create(ScDocument& /* rDoc */, #ifdef NO_FALLBACK_TO_SWINTERP assert(false); #else -free(pDynamicKernel); +delete pDynamicKernel; return NULL; #endif } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 4 commits - vcl/source
vcl/source/outdev/outdev.cxx | 24
vcl/source/outdev/polygon.cxx | 100 -
vcl/source/outdev/rect.cxx| 125 +-
3 files changed, 123 insertions(+), 126 deletions(-)
New commits:
commit 3d91d54c49af4dd0832c27ccb9721724fa98b6b5
Author: Chris Sherlock
Date: Mon Apr 28 20:48:31 2014 +1000
VCL move DrawCheckered from outdev.cxx to rect.cxx
Change-Id: I55cbab29e4e0d772e593f39ba48a3a2dffbce382
diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx
index 7eb435e..5af2be3 100644
--- a/vcl/source/outdev/outdev.cxx
+++ b/vcl/source/outdev/outdev.cxx
@@ -985,28 +985,4 @@ bool OutputDevice::DrawEPS( const Point& rPoint, const
Size& rSize,
return bDrawn;
}
-void OutputDevice::DrawCheckered(const Point& rPos, const Size& rSize,
sal_uInt32 nLen, Color aStart, Color aEnd)
-{
-const sal_uInt32 nMaxX(rPos.X() + rSize.Width());
-const sal_uInt32 nMaxY(rPos.Y() + rSize.Height());
-
-Push(PUSH_LINECOLOR|PUSH_FILLCOLOR);
-SetLineColor();
-
-for(sal_uInt32 x(0), nX(rPos.X()); nX < nMaxX; x++, nX += nLen)
-{
-const sal_uInt32 nRight(std::min(nMaxX, nX + nLen));
-
-for(sal_uInt32 y(0), nY(rPos.Y()); nY < nMaxY; y++, nY += nLen)
-{
-const sal_uInt32 nBottom(std::min(nMaxY, nY + nLen));
-
-SetFillColor((x & 0x0001) ^ (y & 0x0001) ? aStart : aEnd);
-DrawRect(Rectangle(nX, nY, nRight, nBottom));
-}
-}
-
-Pop();
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/outdev/rect.cxx b/vcl/source/outdev/rect.cxx
index 3701354..285100c 100644
--- a/vcl/source/outdev/rect.cxx
+++ b/vcl/source/outdev/rect.cxx
@@ -121,6 +121,30 @@ void OutputDevice::DrawRect( const Rectangle& rRect,
mpAlphaVDev->DrawRect( rRect, nHorzRound, nVertRound );
}
+void OutputDevice::DrawCheckered(const Point& rPos, const Size& rSize,
sal_uInt32 nLen, Color aStart, Color aEnd)
+{
+const sal_uInt32 nMaxX(rPos.X() + rSize.Width());
+const sal_uInt32 nMaxY(rPos.Y() + rSize.Height());
+
+Push(PUSH_LINECOLOR|PUSH_FILLCOLOR);
+SetLineColor();
+
+for(sal_uInt32 x(0), nX(rPos.X()); nX < nMaxX; x++, nX += nLen)
+{
+const sal_uInt32 nRight(std::min(nMaxX, nX + nLen));
+
+for(sal_uInt32 y(0), nY(rPos.Y()); nY < nMaxY; y++, nY += nLen)
+{
+const sal_uInt32 nBottom(std::min(nMaxY, nY + nLen));
+
+SetFillColor((x & 0x0001) ^ (y & 0x0001) ? aStart : aEnd);
+DrawRect(Rectangle(nX, nY, nRight, nBottom));
+}
+}
+
+Pop();
+}
+
void OutputDevice::DrawGrid( const Rectangle& rRect, const Size& rDist,
sal_uLong nFlags )
{
Rectangle aDstRect( PixelToLogic( Point() ), GetOutputSize() );
commit db45e761df999c5435bf24fb69f3b0ec7bca16cf
Author: Chris Sherlock
Date: Mon Apr 28 20:47:12 2014 +1000
VCL move DrawGrid from polygon.cxx to rect.cxx
Change-Id: I55190ee8eee2a9c1cf75890b89f7100d925d
diff --git a/vcl/source/outdev/polygon.cxx b/vcl/source/outdev/polygon.cxx
index cf3a073..632db7d 100644
--- a/vcl/source/outdev/polygon.cxx
+++ b/vcl/source/outdev/polygon.cxx
@@ -479,103 +479,4 @@ void OutputDevice::ImplDrawPolyPolygon( const
PolyPolygon& rPolyPoly, const Poly
delete pPolyPoly;
}
-void OutputDevice::DrawGrid( const Rectangle& rRect, const Size& rDist,
sal_uLong nFlags )
-{
-Rectangle aDstRect( PixelToLogic( Point() ), GetOutputSize() );
-aDstRect.Intersection( rRect );
-
-if( aDstRect.IsEmpty() || ImplIsRecordLayout() )
-return;
-
-if( !mpGraphics && !AcquireGraphics() )
-return;
-
-if( mbInitClipRegion )
-InitClipRegion();
-
-if( mbOutputClipped )
-return;
-
-const long nDistX = std::max( rDist.Width(), 1L );
-const long nDistY = std::max( rDist.Height(), 1L );
-long nX = ( rRect.Left() >= aDstRect.Left() ) ? rRect.Left() : (
rRect.Left() + ( ( aDstRect.Left() - rRect.Left() ) / nDistX ) * nDistX );
-long nY = ( rRect.Top() >= aDstRect.Top() ) ? rRect.Top() : ( rRect.Top()
+ ( ( aDstRect.Top() - rRect.Top() ) / nDistY ) * nDistY );
-const long nRight = aDstRect.Right();
-const long nBottom = aDstRect.Bottom();
-const long nStartX = ImplLogicXToDevicePixel( nX );
-const long nEndX = ImplLogicXToDevicePixel( nRight );
-const long nStartY = ImplLogicYToDevicePixel( nY );
-const long nEndY = ImplLogicYToDevicePixel( nBottom );
-long nHorzCount = 0L;
-long nVertCount = 0L;
-
-css::uno::Sequence< sal_Int32 > aVertBuf;
-css::uno::Sequence< sal_Int32 > aHorzBuf;
-
-if( ( nFlags & GRID_DOTS ) || ( nFlags & GRID_HORZLINES ) )
-{
-aVertBuf.realloc( aDstRect.GetHeight() / nDistY + 2L );
-aVertBuf[ nVertCount++ ] = nStartY;
-while( ( nY += nDistY ) <= nBottom )
-{
-aVertBuf[ nVertCount++ ] = ImplLogicYToDevicePixel( nY );
-
[Libreoffice-commits] core.git: filter/source
filter/source/graphicfilter/icgm/cgm.cxx | 31 ---
filter/source/graphicfilter/icgm/cgm.hxx |6 +-
2 files changed, 1 insertion(+), 36 deletions(-)
New commits:
commit a3abc602578270582ab7d8df9ef34ef9503234de
Author: Noel Grandin
Date: Fri Apr 25 16:00:39 2014 +0200
remove some dodgy defines from the ICGM filter
One of these looks it was somebodys temporary debugging code.
The others constants are are always defined,
so the #ifdef blocks are pointless.
Change-Id: I4817e9ce268ab58f5e329830e2e332e2b4ebf4dc
Reviewed-on: https://gerrit.libreoffice.org/9163
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/filter/source/graphicfilter/icgm/cgm.cxx
b/filter/source/graphicfilter/icgm/cgm.cxx
index 780b5af..d168101 100644
--- a/filter/source/graphicfilter/icgm/cgm.cxx
+++ b/filter/source/graphicfilter/icgm/cgm.cxx
@@ -32,8 +32,6 @@
using namespace ::com::sun::star;
-#ifdef CGM_EXPORT_IMPRESS
-
CGM::CGM( sal_uInt32 nMode, uno::Reference< frame::XModel > & rModel )
: mnOutdx(28000)
, mnOutdy(21000)
@@ -66,20 +64,16 @@ CGM::CGM( sal_uInt32 nMode, uno::Reference< frame::XModel >
& rModel )
, mnElementClass(0)
, mnElementID(0)
, mnElementSize(0)
-#ifdef CGM_EXPORT_META
, mpVirDev(NULL)
, mpGDIMetaFile(NULL)
-#endif
{
pElement = new CGMElements( *this );
pCopyOfE = new CGMElements( *this );
}
-#endif
CGM::~CGM()
{
-#ifdef CGM_EXPORT_META
if ( mpGraphic )
{
mpGDIMetaFile->Stop();
@@ -88,7 +82,6 @@ CGM::~CGM()
delete mpVirDev;
*mpGraphic = Graphic( *mpGDIMetaFile );
}
-#endif
for( size_t i = 0, n = maDefRepList.size(); i < n; ++i )
delete maDefRepList[ i ];
maDefRepList.clear();
@@ -594,13 +587,6 @@ void CGM::ImplMapPoint( FloatPoint& rFloatPoint )
void CGM::ImplDoClass()
{
-#ifdef CGM_USER_BREAKPOINT
-#ifdef WNT
-#define CGM_BREAK_ACTION0x
-if ( mnActCount == CGM_BREAK_ACTION )
-_asm int 0x3;
-#endif
-#endif
switch ( mnElementClass )
{
case 0 : ImplDoClass0(); break;
@@ -695,14 +681,6 @@ bool CGM::Write( SvStream& rIStm )
rIStm.SeekRel( 1 );
ImplDoClass();
-
-#ifdef CGM_USER_BREAKPOINT
-#ifdef WNT
-if ( !mbStatus || mnParaSize && ( mnElementSize != mnParaSize ) )
-_asm int 0x3;
-#endif
-#endif
-
return mbStatus;
};
@@ -731,7 +709,6 @@ ImportCGM( OUString& rFileName, uno::Reference<
frame::XModel > & rXModel, sal_u
sal_uInt64 const nInSize = pIn->remainingSize();
pIn->Seek( 0 );
-#ifdef CGM_EXPORT_IMPRESS
uno::Reference< task::XStatusIndicator > aXStatInd;
sal_uInt32 nNext = 0;
sal_uInt32 nAdd = nInSize / 20;
@@ -740,14 +717,9 @@ ImportCGM( OUString& rFileName, uno::Reference<
frame::XModel > & rXModel, sal_u
bProgressBar = aXStatInd.is();
if ( bProgressBar )
aXStatInd->start( "CGM Import" , nInSize );
-#endif
while ( pCGM->IsValid() && ( pIn->Tell() < nInSize )
&& !pCGM->IsFinished() )
{
-
-#ifdef CGM_EXPORT_IMPRESS
-
-
if ( bProgressBar )
{
sal_uInt32 nCurrentPos = pIn->Tell();
@@ -757,7 +729,6 @@ ImportCGM( OUString& rFileName, uno::Reference<
frame::XModel > & rXModel, sal_u
nNext = nCurrentPos + nAdd;
}
}
-#endif
if ( pCGM->Write( *pIn ) == false )
break;
@@ -766,10 +737,8 @@ ImportCGM( OUString& rFileName, uno::Reference<
frame::XModel > & rXModel, sal_u
{
nStatus = pCGM->GetBackGroundColor() | 0xff00;
}
-#ifdef CGM_EXPORT_IMPRESS
if ( bProgressBar )
aXStatInd->end();
-#endif
}
}
}
diff --git a/filter/source/graphicfilter/icgm/cgm.hxx
b/filter/source/graphicfilter/icgm/cgm.hxx
index 3bdd0c3..25ab80a 100644
--- a/filter/source/graphicfilter/icgm/cgm.hxx
+++ b/filter/source/graphicfilter/icgm/cgm.hxx
@@ -22,8 +22,6 @@
#include
-#undef CGM_USER_BREAKPOINT
-
#define CGM_IMPORT_CGM 0x0001
#define CGM_EXPORT_IMPRESS 0x0100
#define CGM_EXPORT_META 0x0200
@@ -61,7 +59,7 @@ class CGM
double mnYFraction;
boolmbAngReverse; // AngularDirection
-Graphic*mpGraphic; // ifdef CGM_EXPORT_META
+Graphic*mpGraphic;
boolmbStatus;
boolmbMetaFi
[Libreoffice-commits] core.git: basctl/source include/svtools sc/source sd/source svtools/source
basctl/source/basicide/bastypes.cxx |2 +-
basctl/source/inc/bastypes.hxx |2 +-
include/svtools/tabbar.hxx | 17 +
sc/source/ui/inc/tabcont.hxx|4 ++--
sc/source/ui/view/tabcont.cxx | 10 +-
sd/source/ui/dlg/LayerTabBar.cxx|6 +++---
sd/source/ui/inc/LayerTabBar.hxx|4 ++--
sd/source/ui/inc/TabControl.hxx |6 +++---
sd/source/ui/view/tabcontr.cxx | 12 ++--
svtools/source/control/tabbar.cxx | 16
10 files changed, 40 insertions(+), 39 deletions(-)
New commits:
commit 883481fd200510f5ae62e7ab7cd18f7d925c2c47
Author: Noel Grandin
Date: Fri Apr 25 12:49:17 2014 +0200
Improve TabBar return types
DeactivatePage() goes from returning long to returning bool.
StartRenaming goes from returning long to returning bool.
AllowRenaming goes from returning long to returning a
constant from a new enum.
Change-Id: Ib87e8d7ceb4e23846547257b358ca4dfd41eb6ca
Reviewed-on: https://gerrit.libreoffice.org/9161
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/basctl/source/basicide/bastypes.cxx
b/basctl/source/basicide/bastypes.cxx
index 784de87..7da4f17 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -543,7 +543,7 @@ void TabBar::Command( const CommandEvent& rCEvt )
}
}
-long TabBar::AllowRenaming()
+TabBarAllowRenamingReturnCode TabBar::AllowRenaming()
{
bool const bValid = IsValidSbxName(GetEditText());
diff --git a/basctl/source/inc/bastypes.hxx b/basctl/source/inc/bastypes.hxx
index fbdf3d9..0d0db7e 100644
--- a/basctl/source/inc/bastypes.hxx
+++ b/basctl/source/inc/bastypes.hxx
@@ -122,7 +122,7 @@ protected:
virtual voidMouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
virtual voidCommand( const CommandEvent& rCEvt ) SAL_OVERRIDE;
-virtual longAllowRenaming() SAL_OVERRIDE;
+virtual TabBarAllowRenamingReturnCode AllowRenaming() SAL_OVERRIDE;
virtual voidEndRenaming() SAL_OVERRIDE;
public:
diff --git a/include/svtools/tabbar.hxx b/include/svtools/tabbar.hxx
index 0c7751a..4ca74ce 100644
--- a/include/svtools/tabbar.hxx
+++ b/include/svtools/tabbar.hxx
@@ -313,12 +313,13 @@ typedef sal_uInt16 TabBarPageBits;
#define TPB_SPECIAL ((TabBarPageBits)0x0001)
-// - TabBar-Types -
+// - TabBar-Types - used in TabBar::AllowRenaming
-
-#define TABBAR_RENAMING_YES((long)sal_True)
-#define TABBAR_RENAMING_NO ((long)sal_False)
-#define TABBAR_RENAMING_CANCEL ((long)2)
+enum TabBarAllowRenamingReturnCode {
+ TABBAR_RENAMING_NO,
+ TABBAR_RENAMING_YES,
+ TABBAR_RENAMING_CANCEL
+};
// - TabBar -
@@ -425,9 +426,9 @@ public:
virtual voidDoubleClick();
virtual voidSplit();
virtual voidActivatePage();
-virtual longDeactivatePage();
-virtual longStartRenaming();
-virtual longAllowRenaming();
+virtual boolDeactivatePage();
+virtual boolStartRenaming();
+virtual TabBarAllowRenamingReturnCodeAllowRenaming();
virtual voidEndRenaming();
virtual voidMirror();
diff --git a/sc/source/ui/inc/tabcont.hxx b/sc/source/ui/inc/tabcont.hxx
index d04e026..644a2f9 100644
--- a/sc/source/ui/inc/tabcont.hxx
+++ b/sc/source/ui/inc/tabcont.hxx
@@ -58,8 +58,8 @@ protected:
virtual voidStartDrag( sal_Int8 nAction, const Point& rPosPixel )
SAL_OVERRIDE;
-virtual longStartRenaming() SAL_OVERRIDE;
-virtual longAllowRenaming() SAL_OVERRIDE;
+virtual boolStartRenaming() SAL_OVERRIDE;
+virtual TabBarAllowRenamingReturnCodeAllowRenaming() SAL_OVERRIDE;
virtual voidEndRenaming() SAL_OVERRIDE;
virtual voidMirror() SAL_OVERRIDE;
diff --git a/sc/source/ui/view/tabcont.cxx b/sc/source/ui/view/tabcont.cxx
index b029844..c6c41c0 100644
--- a/sc/source/ui/view/tabcont.cxx
+++ b/sc/source/ui/view/tabcont.cxx
@@ -579,20 +579,20 @@ sal_Int8 ScTabControl::AcceptDrop( const AcceptDropEvent&
rEvt )
return 0;
}
-long ScTabControl::StartRenaming()
+bool ScTabControl::StartRenaming()
{
if ( pViewData->GetDocument()->IsDocEditable() )
-return TABBAR_RENAMING_YES;
+return true;
else
-return TABBAR_RENAMING_NO;
+return false;
}
-long ScTabControl::AllowRenaming()
+TabBarAllowRenamingReturnCode ScTabControl::AllowRenaming()
{
ScTabViewShell* pViewSh = pViewData->GetViewShell();
OSL_ENSURE( pViewSh, "pViewData->GetViewShell()" );
-long nRet = TABBAR_RENAMING_CANCEL;
+TabBarAllowRenamingReturnCode nRet = TABBAR_RENAMING_CANCEL;
sal_uInt16 nId = GetEditPageId();
if ( nId )
{
diff --git a/sd/source/ui/dlg/LayerTabBar.cxx b/sd/source/ui/dlg/LayerTabBar.cxx
index c6c9b0b..fa14066 100644
--- a/sd/source/ui/dlg/LayerTabBar.cxx
+++ b/sd/source/ui/dlg/LayerTabBar.cxx
@@ -174,7 +174,7 @@ void LayerTabBar::Command(
[Libreoffice-commits] core.git: include/svtools svtools/source
include/svtools/tabbar.hxx| 21 -
svtools/source/control/tabbar.cxx | 18 +++---
2 files changed, 3 insertions(+), 36 deletions(-)
New commits:
commit 2554d0ab4e293c2e68477c1b390367c15353234e
Author: Noel Grandin
Date: Fri Apr 25 15:39:59 2014 +0200
remove unused code from TabBar
Change-Id: I9f975d99893135b414c749c4fe86912362375c4e
Reviewed-on: https://gerrit.libreoffice.org/9162
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/include/svtools/tabbar.hxx b/include/svtools/tabbar.hxx
index 4ca74ce..20e644b 100644
--- a/include/svtools/tabbar.hxx
+++ b/include/svtools/tabbar.hxx
@@ -372,13 +372,7 @@ private:
boolmbHasInsertTab; // if true, the tab bar has an extra tab
at the end.
boolmbScrollAlwaysEnabled;
LinkmaSelectHdl;
-LinkmaDoubleClickHdl;
LinkmaSplitHdl;
-LinkmaActivatePageHdl;
-LinkmaDeactivatePageHdl;
-LinkmaStartRenamingHdl;
-LinkmaAllowRenamingHdl;
-LinkmaEndRenamingHdl;
LinkmaScrollAreaContextHdl;
size_t maCurrentItemList;
@@ -537,23 +531,8 @@ public:
SizeCalcWindowSizePixel() const;
voidSetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; }
-const Link& GetSelectHdl() const { return maSelectHdl; }
-voidSetDoubleClickHdl( const Link& rLink ) { maDoubleClickHdl
= rLink; }
-const Link& GetDoubleClickHdl() const { return maDoubleClickHdl; }
voidSetSplitHdl( const Link& rLink ) { maSplitHdl = rLink; }
-const Link& GetSplitHdl() const { return maSplitHdl; }
-voidSetActivatePageHdl( const Link& rLink ) {
maActivatePageHdl = rLink; }
-const Link& GetActivatePageHdl() const { return maActivatePageHdl; }
-voidSetDeactivatePageHdl( const Link& rLink ) {
maDeactivatePageHdl = rLink; }
-const Link& GetDeactivatePageHdl() const { return maDeactivatePageHdl;
}
-voidSetStartRenamingHdl( const Link& rLink ) {
maStartRenamingHdl = rLink; }
-const Link& GetStartRenamingHdl() const { return maStartRenamingHdl; }
-voidSetAllowRenamingHdl( const Link& rLink ) {
maAllowRenamingHdl = rLink; }
-const Link& GetAllowRenamingHdl() const { return maAllowRenamingHdl; }
-voidSetEndRenamingHdl( const Link& rLink ) { maEndRenamingHdl
= rLink; }
-const Link& GetEndRenamingHdl() const { return maEndRenamingHdl; }
voidSetScrollAreaContextHdl( const Link& rLink ) {
maScrollAreaContextHdl = rLink; }
-const Link& GetScrollAreaContextHdl() const { return
maScrollAreaContextHdl; }
// accessibility
virtual ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE;
diff --git a/svtools/source/control/tabbar.cxx
b/svtools/source/control/tabbar.cxx
index 5c118cb..2b1f0ed 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -1692,7 +1692,6 @@ void TabBar::Select()
void TabBar::DoubleClick()
{
-maDoubleClickHdl.Call( this );
}
@@ -1715,7 +1714,6 @@ void TabBar::ImplActivatePage()
void TabBar::ActivatePage()
{
-maActivatePageHdl.Call( this );
}
@@ -1809,37 +1807,27 @@ Rectangle TabBar::ImplGetInsertTabRect(ImplTabBarItem*
pItem) const
bool TabBar::DeactivatePage()
{
-if ( maDeactivatePageHdl.IsSet() )
-return maDeactivatePageHdl.Call( this );
-else
-return true;
+return true;
}
bool TabBar::StartRenaming()
{
-if ( maStartRenamingHdl.IsSet() )
-return maStartRenamingHdl.Call( this );
-else
-return true;
+return true;
}
TabBarAllowRenamingReturnCode TabBar::AllowRenaming()
{
-if ( maAllowRenamingHdl.IsSet() )
-return (TabBarAllowRenamingReturnCode) maAllowRenamingHdl.Call( this );
-else
-return TABBAR_RENAMING_YES;
+return TABBAR_RENAMING_YES;
}
void TabBar::EndRenaming()
{
-maEndRenamingHdl.Call( this );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - framework/source
framework/source/uielement/toolbarmanager.cxx |9 +
1 file changed, 9 insertions(+)
New commits:
commit 9e3d6ec6e5333bf1fa4bd151a9897dad20d11a14
Author: Andrzej Hunt
Date: Fri Apr 25 20:25:48 2014 +0100
fdo#75489 Pass toolbar context menu commands to toolbar for handling.
The toolbar context menu is handled by the toolbar manager, however
the items are provided and managed by the toolbar itself -- previously
any events on the list of toolbar items in the context menu were silently
discarded, whereas now we pass them on to the owning toolbar.
Change-Id: Ia17718c3ff8acfba1b6d655022dd9469932f3493
(cherry picked from commit 944c78ecb91608f4c3e9bab32fdbc90c67326525)
Reviewed-on: https://gerrit.libreoffice.org/9170
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/framework/source/uielement/toolbarmanager.cxx
b/framework/source/uielement/toolbarmanager.cxx
index 3a2617b..288f20d 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -1914,6 +1914,7 @@ IMPL_LINK( ToolBarManager, MenuSelect, Menu*, pMenu )
{
sal_uInt16 nId = pMenu->GetCurItemId();
if(( nId > 0 ) && ( nId < TOOLBOX_MENUITEM_START ))
+// Items in the "enable/disable" sub-menu
{
// toggle toolbar button visibility
OUString aCommand = pMenu->GetItemCommand( nId );
@@ -1976,6 +1977,14 @@ IMPL_LINK( ToolBarManager, MenuSelect, Menu*, pMenu )
}
}
}
+else
+// The list of "hidden items", i.e. items which are disabled on
+// the toolbar hence shown in the context menu for easier
access,
+// which are managed by the owning toolbar.
+{
+m_pToolBar->TriggerItem( pMenu->GetCurItemId()
+ - TOOLBOX_MENUITEM_START );
+}
break;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 51 +++--
writerfilter/source/rtftok/rtfdocumentimpl.hxx |6 ++
writerfilter/source/rtftok/rtfsprm.cxx |9 +---
3 files changed, 40 insertions(+), 26 deletions(-)
New commits:
commit 9209e07e2a724fa85ba6fee0ead5a0baad247d27
Author: Miklos Vajna
Date: Fri Jan 24 21:44:57 2014 +0100
fdo#70853 writerfilter: refactor to avoid redundant Papx class in doctok
(cherry picked from commit f453cf1d328f96dd5ad8e94b102bff3124e06154, but
only the rtftok part, the rest is not needed to fix the bug)
Conflicts:
writerfilter/source/dmapper/DomainMapper.cxx
writerfilter/source/dmapper/StyleSheetTable.cxx
writerfilter/source/doctok/resources.xmi
writerfilter/source/rtftok/rtfdocumentimpl.cxx
Change-Id: Ic65e750bab99fb6b4c862418ccc53aa4b1f1298e
Reviewed-on: https://gerrit.libreoffice.org/9173
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index d06f6bc..ab23fb4 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -632,6 +632,19 @@ int RTFDocumentImpl::getFontIndex(int nIndex)
return m_pSuperstream->getFontIndex(nIndex);
}
+OUString RTFDocumentImpl::getStyleName(int nIndex)
+{
+if (!m_pSuperstream)
+{
+OUString aRet;
+if (m_aStyleNames.find(nIndex) != m_aStyleNames.end())
+aRet = m_aStyleNames[nIndex];
+return aRet;
+}
+else
+return m_pSuperstream->getStyleName(nIndex);
+}
+
RTFParserState& RTFDocumentImpl::getDefaultState()
{
if (!m_pSuperstream)
@@ -1075,8 +1088,11 @@ void RTFDocumentImpl::text(OUString& rString)
case DESTINATION_STYLEENTRY:
if
(m_aStates.top().aTableAttributes.find(NS_rtf::LN_SGC))
{
-RTFValue::Pointer_t pValue(new
RTFValue(m_aStates.top().aDestinationText.makeStringAndClear()));
-
m_aStates.top().aTableAttributes.set(NS_rtf::LN_XSTZNAME1, pValue);
+OUString aName =
m_aStates.top().aDestinationText.makeStringAndClear();
+m_aStyleNames[m_nCurrentStyleIndex] = aName;
+RTFValue::Pointer_t pValue(new
RTFValue(aName));
+
m_aStates.top().aTableAttributes.set(NS_ooxml::LN_CT_Style_styleId, pValue);
+
m_aStates.top().aTableSprms.set(NS_ooxml::LN_CT_Style_name, pValue);
writerfilter::Reference::Pointer_t
const pProp(
new
RTFReferenceProperties(mergeAttributes(), mergeSprms())
@@ -3039,6 +3055,10 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword,
int nParam)
case RTF_RI: nSprm = NS_sprm::LN_PDxaRight; break;
case RTF_RIN: nSprm = 0x845d; break;
case RTF_ITAP: nSprm = NS_sprm::LN_PTableDepth; break;
+case RTF_SBASEDON:
+ nSprm = (nKeyword == RTF_SBASEDON) ? NS_ooxml::LN_CT_Style_basedOn
: NS_ooxml::LN_CT_Style_next;
+ pIntValue.reset(new RTFValue(getStyleName(nParam)));
+ break;
default: break;
}
if (nSprm > 0)
@@ -3057,19 +3077,6 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword,
int nParam)
return 0;
}
-// Trivial table attributes.
-switch (nKeyword)
-{
-case RTF_SBASEDON: nSprm = NS_rtf::LN_ISTDBASE; break;
-case RTF_SNEXT: nSprm = NS_rtf::LN_ISTDNEXT; break;
-default: break;
-}
-if (nSprm > 0)
-{
-m_aStates.top().aTableAttributes.set(nSprm, pIntValue);
-return 0;
-}
-
// Info group.
switch (nKeyword)
{
@@ -3231,24 +3238,30 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword,
int nParam)
if (m_aStates.top().nDestinationState ==
DESTINATION_STYLESHEET || m_aStates.top().nDestinationState ==
DESTINATION_STYLEENTRY)
{
m_nCurrentStyleIndex = nParam;
-m_aStates.top().aTableAttributes.set(NS_rtf::LN_ISTD,
pIntValue);
RTFValue::Pointer_t pValue(new RTFValue(1));
m_aStates.top().aTableAttributes.set(NS_rtf::LN_SGC,
pValue); // paragraph style
}
else
- m_aStates.top().aParagraphAttributes.set(NS_rtf::LN_ISTD,
pIntValue);
+{
+OUString aName = getStyleName(nParam);
+if (!aName.isEmpty())
+
m_aStates.top().aParagraphSprms.set(NS_ooxml::LN_CT_PPrBase_pStyle,
RTFValue::Pointer_t(new RTFValue(aName)));
+}
}
break;
[Libreoffice-commits] core.git: cui/source sc/source
cui/source/tabpages/transfrm.cxx |2 +-
sc/source/ui/vba/vbacharacters.hxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit adad1a2c56a60140c2d507339c7eec8a796bc496
Author: Julien Nabet
Date: Mon Apr 28 14:19:00 2014 +0200
Typo: diferent -> different
Change-Id: If73e80903457531a88bb273cab8d4c2344c8a1d3
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index e3e6fde..291bea7 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -730,7 +730,7 @@ void SvxPositionSizeTabPage::Construct()
if(maAnchor != basegfx::B2DPoint(pObj->GetAnchorPos().X(),
pObj->GetAnchorPos().Y()))
{
-// diferent anchor positions
+// different anchor positions
m_pMtrPosX->SetText( "" );
m_pMtrPosY->SetText( "" );
mbPageDisabled = true;
diff --git a/sc/source/ui/vba/vbacharacters.hxx
b/sc/source/ui/vba/vbacharacters.hxx
index 6cceb9c..147d493 100644
--- a/sc/source/ui/vba/vbacharacters.hxx
+++ b/sc/source/ui/vba/vbacharacters.hxx
@@ -37,7 +37,7 @@ private:
ScVbaPalette m_aPalette;
sal_Int16 nLength;
sal_Int16 nStart;
-// Add because of MSO has diferent behavior.
+// Add because of MSO has different behavior.
bool bReplace;
public:
ScVbaCharacters( const css::uno::Reference< ov::XHelperInterface >&
xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext,
const ScVbaPalette& dPalette, const css::uno::Reference< css::text::XSimpleText
>& xRange, const css::uno::Any& Start, const css::uno::Any& Length, bool
bReplace = false ) throw ( css::lang::IllegalArgumentException,
css::uno::RuntimeException );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: odk/examples writerfilter/source
odk/examples/DevelopersGuide/Forms/DataAwareness.java |2 +-
odk/examples/DevelopersGuide/Forms/KeyGenerator.java |2 +-
writerfilter/source/dmapper/DomainMapper_Impl.cxx |2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 99c9e0f86b86a642a869cae9e6ccb6ef703e1652
Author: Julien Nabet
Date: Mon Apr 28 14:21:25 2014 +0200
Typo: becase -> because
Change-Id: I065a581ea02e5f8892e44c7e97903297a40cde18
diff --git a/odk/examples/DevelopersGuide/Forms/DataAwareness.java
b/odk/examples/DevelopersGuide/Forms/DataAwareness.java
index e13f82b..ca6454f 100644
--- a/odk/examples/DevelopersGuide/Forms/DataAwareness.java
+++ b/odk/examples/DevelopersGuide/Forms/DataAwareness.java
@@ -219,7 +219,7 @@ public class DataAwareness extends DocumentBasedExample
implements XPropertyChan
/* -- */
public void resetted( EventObject aEvent ) throws
com.sun.star.uno.RuntimeException
{
-// check if this reset occurred becase we're on a new record
+// check if this reset occurred because we're on a new record
XPropertySet xFormProps = UNO.queryPropertySet( aEvent.Source );
try
{
diff --git a/odk/examples/DevelopersGuide/Forms/KeyGenerator.java
b/odk/examples/DevelopersGuide/Forms/KeyGenerator.java
index d3e7466..47a8bd8 100644
--- a/odk/examples/DevelopersGuide/Forms/KeyGenerator.java
+++ b/odk/examples/DevelopersGuide/Forms/KeyGenerator.java
@@ -249,7 +249,7 @@ class KeyGeneratorForReset extends UniqueColumnValue
implements XResetListener
/* -- */
public void resetted( com.sun.star.lang.EventObject aEvent ) throws
com.sun.star.uno.RuntimeException
{
-// check if this reset occurred becase we're on a new record
+// check if this reset occurred because we're on a new record
XPropertySet xFormProps = UNO.queryPropertySet( aEvent.Source );
try
{
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 26aa550..a738d83 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -497,7 +497,7 @@ voidDomainMapper_Impl::PopProperties(ContextType eId)
{
m_pLastCharacterContext = m_aPropertyStacks[eId].top();
// Sadly an assert about deferredCharacterProperties being empty is
not possible
-// here, becase appendTextPortion() may not be called for every
character section.
+// here, because appendTextPortion() may not be called for every
character section.
deferredCharacterProperties.clear();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - include/vcl vcl/source
include/vcl/outdev.hxx| 15
include/vcl/print.hxx |2 -
vcl/source/gdi/print.cxx |2 -
vcl/source/outdev/line.cxx| 69
vcl/source/outdev/mask.cxx|4 +-
vcl/source/outdev/outdevstate.cxx | 71 ++
6 files changed, 83 insertions(+), 80 deletions(-)
New commits:
commit 9a89946c95234b19ded1cecdd50bc1ddbd8f8fcb
Author: Chris Sherlock
Date: Mon Apr 28 22:05:43 2014 +1000
VCL: Move line functions into state areas
Change-Id: I4a92c66892fbb9687b9e7c521c770150b75229b0
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 51b40aa..9cc34e8 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -570,6 +570,11 @@ public:
voidSetOutDevViewType( OutDevViewType
eOutDevViewType ) { meOutDevViewType=eOutDevViewType; }
OutDevViewType GetOutDevViewType() const { return
meOutDevViewType; }
+voidSetLineColor();
+voidSetLineColor( const Color& rColor );
+const Color&GetLineColor() const { return maLineColor; }
+boolIsLineColor() const { return mbLineColor; }
+
voidSetFillColor();
voidSetFillColor( const Color& rColor );
const Color&GetFillColor() const { return maFillColor; }
@@ -586,6 +591,8 @@ public:
private:
+SAL_DLLPRIVATE void InitLineColor();
+
SAL_DLLPRIVATE void InitFillColor();
///@}
@@ -669,13 +676,7 @@ public:
voidDrawLine( const Point& rStartPt, const Point&
rEndPt,
const LineInfo& rLineInfo );
-voidSetLineColor();
-voidSetLineColor( const Color& rColor );
-const Color&GetLineColor() const { return maLineColor; }
-boolIsLineColor() const { return mbLineColor; }
-
private:
-SAL_DLLPRIVATE void InitLineColor();
/** Helper for line geometry paint with support for graphic expansion
(pattern and fat_to_area)
*/
diff --git a/vcl/source/outdev/line.cxx b/vcl/source/outdev/line.cxx
index ea987fa..752bad4 100644
--- a/vcl/source/outdev/line.cxx
+++ b/vcl/source/outdev/line.cxx
@@ -145,75 +145,6 @@ void OutputDevice::DrawLine( const Point& rStartPt, const
Point& rEndPt )
mpAlphaVDev->DrawLine( rStartPt, rEndPt );
}
-void OutputDevice::SetLineColor()
-{
-
-if ( mpMetaFile )
-mpMetaFile->AddAction( new MetaLineColorAction( Color(), false ) );
-
-if ( mbLineColor )
-{
-mbInitLineColor = true;
-mbLineColor = false;
-maLineColor = Color( COL_TRANSPARENT );
-}
-
-if( mpAlphaVDev )
-mpAlphaVDev->SetLineColor();
-}
-
-void OutputDevice::SetLineColor( const Color& rColor )
-{
-
-Color aColor = ImplDrawModeToColor( rColor );
-
-if( mpMetaFile )
-mpMetaFile->AddAction( new MetaLineColorAction( aColor, true ) );
-
-if( ImplIsColorTransparent( aColor ) )
-{
-if ( mbLineColor )
-{
-mbInitLineColor = true;
-mbLineColor = false;
-maLineColor = Color( COL_TRANSPARENT );
-}
-}
-else
-{
-if( maLineColor != aColor )
-{
-mbInitLineColor = true;
-mbLineColor = true;
-maLineColor = aColor;
-}
-}
-
-if( mpAlphaVDev )
-mpAlphaVDev->SetLineColor( COL_BLACK );
-}
-
-void OutputDevice::InitLineColor()
-{
-DBG_TESTSOLARMUTEX();
-
-if( mbLineColor )
-{
-if( ROP_0 == meRasterOp )
-mpGraphics->SetROPLineColor( SAL_ROP_0 );
-else if( ROP_1 == meRasterOp )
-mpGraphics->SetROPLineColor( SAL_ROP_1 );
-else if( ROP_INVERT == meRasterOp )
-mpGraphics->SetROPLineColor( SAL_ROP_INVERT );
-else
-mpGraphics->SetLineColor( ImplColorToSal( maLineColor ) );
-}
-else
-mpGraphics->SetLineColor();
-
-mbInitLineColor = false;
-}
-
void OutputDevice::PaintLineGeometryWithEvtlExpand(
const LineInfo& rInfo,
basegfx::B2DPolyPolygon aLinePolyPolygon)
diff --git a/vcl/source/outdev/outdevstate.cxx
b/vcl/source/outdev/outdevstate.cxx
index 228620a..15c5dd6 100644
--- a/vcl/source/outdev/outdevstate.cxx
+++ b/vcl/source/outdev/outdevstate.cxx
@@ -415,6 +415,54 @@ void OutputDevice::SetFillColor( const Color& rColor )
mpAlphaVDev->SetFillColor( COL_BLACK );
}
+void OutputDevice::SetLineColor()
+{
+
+if ( mpMetaFile )
+mpMetaFile->AddAction( new MetaLineColorAction( Color(), false ) );
+
+if ( mbLineColor )
+{
+mbInitLineColor = true;
+mbLineColor = false;
+maLineColor = Color( COL_TRANSPARENT
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sd/source
sd/source/ui/inc/slideshow.hxx|5 -
sd/source/ui/slideshow/SlideShowRestarter.cxx |3 +++
sd/source/ui/slideshow/slideshow.cxx | 20 +++-
3 files changed, 22 insertions(+), 6 deletions(-)
New commits:
commit a61463bfb6948f530bb87fc480b2360688b54c92
Author: Caolán McNamara
Date: Fri Apr 25 19:27:57 2014 +0100
Related: rhbz#1032774 slide restarter should disable auto-exit
The scenario is a pps that exits the app when the presentation
is complete. But using "switch screens" in the presenter
console will stop and restart the presentation. So protect
that "stop" against existing by disabling the autoexit
and restoring it afterwards
(cherry picked from commit b7197cfe5d207b171412760c6d72353f31947e93)
Conflicts:
sd/source/ui/slideshow/slideshow.cxx
Change-Id: Id986ad7e3cfafb8068540fb90d05443f329b554c
Reviewed-on: https://gerrit.libreoffice.org/9166
Tested-by: Andrzej Hunt
Reviewed-by: Andrzej Hunt
diff --git a/sd/source/ui/inc/slideshow.hxx b/sd/source/ui/inc/slideshow.hxx
index 6573b2b..f6567e1 100644
--- a/sd/source/ui/inc/slideshow.hxx
+++ b/sd/source/ui/inc/slideshow.hxx
@@ -178,6 +178,9 @@ public:
static sal_Int32 GetDisplay();
+bool IsExitAfterPresenting() const;
+void SetExitAfterPresenting(bool bExit);
+
private:
SlideShow( SdDrawDocument* pDoc );
@@ -187,7 +190,7 @@ private:
void StartInPlacePresentation();
void StartFullscreenPresentation();
-void ThrowIfDisposed() throw (::com::sun::star::uno::RuntimeException);
+void ThrowIfDisposed() const throw (css::uno::RuntimeException);
void CreateController( ViewShell* pViewSh, ::sd::View* pView, ::Window*
pParentWindow );
WorkWindow *GetWorkWindow();
diff --git a/sd/source/ui/slideshow/SlideShowRestarter.cxx
b/sd/source/ui/slideshow/SlideShowRestarter.cxx
index 822e8be..63fae11 100644
--- a/sd/source/ui/slideshow/SlideShowRestarter.cxx
+++ b/sd/source/ui/slideshow/SlideShowRestarter.cxx
@@ -83,7 +83,10 @@ IMPL_LINK_NOARG(SlideShowRestarter, EndPresentation)
{
if (mnDisplayCount != (sal_Int32)Application::GetScreenCount())
{
+bool bIsExitAfterPresenting = mpSlideShow->IsExitAfterPresenting();
+mpSlideShow->SetExitAfterPresenting(false);
mpSlideShow->end();
+mpSlideShow->SetExitAfterPresenting(bIsExitAfterPresenting);
// The following piece of code should not be here because the
// slide show should be aware of the existence of the presenter
diff --git a/sd/source/ui/slideshow/slideshow.cxx
b/sd/source/ui/slideshow/slideshow.cxx
index 2bab38d..20a210b 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -146,16 +146,12 @@ SlideShow::SlideShow( SdDrawDocument* pDoc )
{
}
-//
-
-void SlideShow::ThrowIfDisposed() throw (RuntimeException)
+void SlideShow::ThrowIfDisposed() const throw (RuntimeException)
{
if( mpDoc == 0 )
throw DisposedException();
}
-//
-
/// used by the model to create a slideshow for it
rtl::Reference< SlideShow > SlideShow::Create( SdDrawDocument* pDoc )
{
@@ -678,6 +674,20 @@ WorkWindow *SlideShow::GetWorkWindow()
return
dynamic_cast(pShell->GetViewFrame()->GetTopFrame().GetWindow().GetParent());
}
+bool SlideShow::IsExitAfterPresenting() const
+{
+SolarMutexGuard aGuard;
+ThrowIfDisposed();
+return mpDoc->IsExitAfterPresenting();
+}
+
+void SlideShow::SetExitAfterPresenting(bool bExit)
+{
+SolarMutexGuard aGuard;
+ThrowIfDisposed();
+mpDoc->SetExitAfterPresenting(bExit);
+}
+
void SAL_CALL SlideShow::end() throw(RuntimeException)
{
SolarMutexGuard aGuard;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/inc/DrawController.hxx |1 +
sd/source/ui/slideshow/SlideShowRestarter.cxx |9 +
2 files changed, 10 insertions(+)
New commits:
commit de053813e38e4a036067f4ee26e479f9326614fa
Author: Caolán McNamara
Date: Mon Apr 28 13:20:51 2014 +0100
Resolves: rhbz#1091117 SdGlobalResourceContainer used after delete
the configuration dispose triggers the presentation being restarted
the only scenario I know where this is a problem is already fixed
by rhbz#1032774 but lets try to fix this anyway
Change-Id: Ib487601fc2c072dee7589bf71de964438cdd0087
diff --git a/sd/source/ui/inc/DrawController.hxx
b/sd/source/ui/inc/DrawController.hxx
index a4e877a..084040b 100644
--- a/sd/source/ui/inc/DrawController.hxx
+++ b/sd/source/ui/inc/DrawController.hxx
@@ -145,6 +145,7 @@ public:
//void fireSwitchCurrentPage( String pageName) throw();
void fireSwitchCurrentPage( sal_Int32 pageIndex) throw();
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XLayer>*
mpCurrentLayer;
+bool IsDisposing() const { return mbDisposing; }
/** Return a pointer to the ViewShellBase object that the DrawController
is connected to.
diff --git a/sd/source/ui/slideshow/SlideShowRestarter.cxx
b/sd/source/ui/slideshow/SlideShowRestarter.cxx
index 63fae11..2b2d464 100644
--- a/sd/source/ui/slideshow/SlideShowRestarter.cxx
+++ b/sd/source/ui/slideshow/SlideShowRestarter.cxx
@@ -18,12 +18,14 @@
*/
+#include "DrawController.hxx"
#include "SlideShowRestarter.hxx"
#include "framework/ConfigurationController.hxx"
#include "framework/FrameworkHelper.hxx"
#include
#include
#include
+#include
#include
#include
#include
@@ -125,6 +127,13 @@ IMPL_LINK_NOARG(SlideShowRestarter, EndPresentation)
void SlideShowRestarter::StartPresentation (void)
{
+//rhbz#1091117 crash because we're exiting the application, and this is
+//being called during the configuration update event on exit. At this point
+//newly created objects won't get disposed called on them, because the
+//disposer is doing its last execution of that now.
+if (mpViewShellBase && mpViewShellBase->GetDrawController().IsDisposing())
+return;
+
if (mpDispatcher == NULL && mpViewShellBase!=NULL)
mpDispatcher = mpViewShellBase->GetViewFrame()->GetDispatcher();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 Bug 75025 depends on bug 77973, which changed state. Bug 77973 Summary: VIEWING: Page not visible in Libreoffice Draw https://bugs.freedesktop.org/show_bug.cgi?id=77973 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Bug 60270 depends on bug 57906, which changed state. Bug 57906 Summary: BUGZILLAASSISTANT: Submit fails with error message "It looks like you didn't come from the right page ..." https://bugs.freedesktop.org/show_bug.cgi?id=57906 What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |DUPLICATE -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 3 commits - svx/README sw/source
svx/README|3 ---
sw/source/core/uibase/uiview/view0.cxx|2 ++
sw/source/core/uibase/uiview/viewsrch.cxx | 28 ++--
sw/source/core/view/viewsh.cxx|2 ++
4 files changed, 30 insertions(+), 5 deletions(-)
New commits:
commit d87b312bcc8a5e64d9a5d0ea647a1050629421bd
Author: Tor Lillqvist
Date: Mon Apr 28 16:45:06 2014 +0300
Avoid SvxSearchDialogWrapper for non-desktop
Change-Id: Ie602ac05caafba132d9c41333d034a5621664c13
diff --git a/sw/source/core/uibase/uiview/viewsrch.cxx
b/sw/source/core/uibase/uiview/viewsrch.cxx
index d9bb583..6dd8370 100644
--- a/sw/source/core/uibase/uiview/viewsrch.cxx
+++ b/sw/source/core/uibase/uiview/viewsrch.cxx
@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include
+
#include
#include
@@ -189,6 +191,7 @@ void SwView::ExecSearch(SfxRequest& rReq, sal_Bool
bNoMessage)
if( bRet )
Scroll(m_pWrtShell->GetCharRect().SVRect());
rReq.SetReturnValue(SfxBoolItem(nSlot, bRet));
+#if HAVE_FEATURE_DESKTOP
{
const sal_uInt16 nChildId =
SvxSearchDialogWrapper::GetChildWindowId();
SvxSearchDialogWrapper *pDlgWrp =
(SvxSearchDialogWrapper*)GetViewFrame()->GetChildWindow(nChildId);
@@ -199,6 +202,7 @@ void SwView::ExecSearch(SfxRequest& rReq, sal_Bool
bNoMessage)
m_pSrchDlg->SetSrchFlag();
}
}
+#endif
}
break;
case SVX_SEARCHCMD_FIND_ALL:
@@ -206,11 +210,14 @@ void SwView::ExecSearch(SfxRequest& rReq, sal_Bool
bNoMessage)
sal_Bool bRet = SearchAll();
if( !bRet )
{
+#if HAVE_FEATURE_DESKTOP
if( !bApi )
SvxSearchDialogWrapper::SetSearchLabel(SL_NotFound);
+#endif
m_bFound = sal_False;
}
rReq.SetReturnValue(SfxBoolItem(nSlot, bRet));
+#if HAVE_FEATURE_DESKTOP
{
const sal_uInt16 nChildId =
SvxSearchDialogWrapper::GetChildWindowId();
SvxSearchDialogWrapper *pDlgWrp =
(SvxSearchDialogWrapper*)GetViewFrame()->GetChildWindow(nChildId);
@@ -222,6 +229,7 @@ void SwView::ExecSearch(SfxRequest& rReq, sal_Bool
bNoMessage)
m_pSrchDlg->SetSrchFlag();
}
}
+#endif
}
break;
case SVX_SEARCHCMD_REPLACE:
@@ -270,6 +278,7 @@ void SwView::ExecSearch(SfxRequest& rReq, sal_Bool
bNoMessage)
m_pSrchItem->SetCommand( nOldCmd );
rReq.SetReturnValue(SfxBoolItem(nSlot, bRet));
}
+#if HAVE_FEATURE_DESKTOP
{
const sal_uInt16 nChildId =
SvxSearchDialogWrapper::GetChildWindowId();
SvxSearchDialogWrapper *pDlgWrp =
(SvxSearchDialogWrapper*)GetViewFrame()->GetChildWindow(nChildId);
@@ -281,6 +290,7 @@ void SwView::ExecSearch(SfxRequest& rReq, sal_Bool
bNoMessage)
m_pSrchDlg->SetSrchFlag();
}
}
+#endif
break;
case SVX_SEARCHCMD_REPLACE_ALL:
@@ -322,8 +332,10 @@ void SwView::ExecSearch(SfxRequest& rReq, sal_Bool
bNoMessage)
rReq.SetReturnValue(SfxBoolItem(nSlot, nFound != 0 &&
ULONG_MAX != nFound));
if( !nFound )
{
+#if HAVE_FEATURE_DESKTOP
if( !bApi )
SvxSearchDialogWrapper::SetSearchLabel(SL_NotFound);
+#endif
m_bFound = sal_False;
return;
}
@@ -336,6 +348,7 @@ void SwView::ExecSearch(SfxRequest& rReq, sal_Bool
bNoMessage)
InfoBox( pParentWindow, aText ).Execute();
}
}
+#if HAVE_FEATURE_DESKTOP
const sal_uInt16 nChildId =
SvxSearchDialogWrapper::GetChildWindowId();
SvxSearchDialogWrapper *pDlgWrp =
(SvxSearchDialogWrapper*)GetViewFrame()->GetChildWindow(nChildId);
@@ -345,6 +358,7 @@ void SwView::ExecSearch(SfxRequest& rReq, sal_Bool
bNoMessage)
m_pSrchDlg->SetDocWin( (Window*)m_pEditWin);
m_pSrchDlg->SetSrchFlag();
}
+#endif
break;
}
@@ -494,7 +508,11 @@ sal_Bool SwView::SearchAndWrap(sal_Bool bApi)
{
m_pWrtShell->EndAllAction();
if( !bApi )
+{
+#if HAVE_FEATURE_DESKTOP
SvxSearchDialogWrapper::SetSearchLabel(SL_NotFound);
+#endif
+}
m_bFound = sal_False;
m_pWrtShell->Pop();
return sal_False;
@@ -523,11 +541,12 @@ sal_Bool SwView::SearchAndWrap(sal_Bool bApi)
m_bFound = bool(FU
Re: Build Error
On 28/04/14 12:46, Shreyansh Gandhi wrote: > Hi, > > I was building LO( it had already gone on for about 6-7 hours), when > suddenly this popped up:- > > *[build LNK] CppunitTest/libtest_sc_subsequent_export_test..so* > */home/shreyansh/core/solenv/gbuild/Package.mk:35: *** > gb_Deliver_deliver: file does not exist in instdir, and cannot be > delivered: /home/shreyansh/core/instdir/program/libscopencllo.so. Stop.* > *make[1]: *** Waiting for unfinished jobs* > *make: *** [build] Error 2* > > Any advice on how to deal with this? looks like that was fixed by commit 00c19e5def4a62445c85786aef6a507bee6c45fa ... so just git pull and try again. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 5 commits - avmedia/source include/avmedia include/vcl slideshow/Library_slideshow.mk slideshow/source vcl/source
avmedia/source/framework/modeltools.cxx |6 +++
avmedia/source/opengl/oglplayer.cxx | 11 +-
avmedia/source/opengl/oglplayer.hxx |1
avmedia/source/opengl/oglwindow.cxx | 16 +
avmedia/source/viewer/mediawindow_impl.cxx|9 +++--
include/avmedia/modeltools.hxx|2 +
include/vcl/opengl/OpenGLContext.hxx |1
slideshow/Library_slideshow.mk|9 -
slideshow/source/engine/shapes/viewmediashape.cxx | 37 ++
slideshow/source/engine/shapes/viewmediashape.hxx |5 +-
vcl/source/opengl/OpenGLContext.cxx | 31 ++
11 files changed, 102 insertions(+), 26 deletions(-)
New commits:
commit 1736e5d91c76a824ffcb052c5e769444d3a0ed5e
Author: Zolnai Tamás
Date: Mon Apr 28 16:32:33 2014 +0200
Slideshow: display OpenGL window also during slideshow
Use vcl based player window initialization.
Change-Id: If5c2198fa891e1d3ad218c8b7e1495161c0d6c25
diff --git a/avmedia/source/framework/modeltools.cxx
b/avmedia/source/framework/modeltools.cxx
index 506a36c..c625fba 100644
--- a/avmedia/source/framework/modeltools.cxx
+++ b/avmedia/source/framework/modeltools.cxx
@@ -9,6 +9,7 @@
#include
#include
+#include "mediamisc.hxx"
#include
#include
@@ -193,6 +194,11 @@ bool Embed3DModel( const uno::Reference&
xModel,
return false;
}
+bool IsModel(const OUString& rMimeType)
+{
+return rMimeType == AVMEDIA_MIMETYPE_JSON;
+}
+
} // namespace avemdia
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/opengl/oglplayer.cxx
b/avmedia/source/opengl/oglplayer.cxx
index a0a27b0..5c8bbea 100644
--- a/avmedia/source/opengl/oglplayer.cxx
+++ b/avmedia/source/opengl/oglplayer.cxx
@@ -192,6 +192,12 @@ uno::Reference< media::XPlayerWindow > SAL_CALL
OGLPlayer::createPlayerWindow( c
rArguments[ 2 ] >>= pIntPtr;
SystemChildWindow *pChildWindow = reinterpret_cast< SystemChildWindow*
>( pIntPtr );
m_aContext.init(pChildWindow);
+Size aSize = pChildWindow->GetSizePixel();
+m_aContext.setWinSize(aSize);
+m_pHandle->viewport.x = 0;
+m_pHandle->viewport.y = 0;
+m_pHandle->viewport.width = aSize.Width();
+m_pHandle->viewport.height = aSize.Height();
}
OGLWindow* pWindow = new OGLWindow(m_pHandle, &m_aContext);
return uno::Reference< media::XPlayerWindow >( pWindow );
diff --git a/avmedia/source/opengl/oglwindow.cxx
b/avmedia/source/opengl/oglwindow.cxx
index b674562..a1b4a40 100644
--- a/avmedia/source/opengl/oglwindow.cxx
+++ b/avmedia/source/opengl/oglwindow.cxx
@@ -119,6 +119,8 @@ awt::Rectangle SAL_CALL OGLWindow::getPosSize()
void SAL_CALL OGLWindow::setVisible( sal_Bool bSet )
throw (uno::RuntimeException, std::exception)
{
+if( bSet && !m_bVisible )
+update();
m_bVisible = bSet;
}
diff --git a/include/avmedia/modeltools.hxx b/include/avmedia/modeltools.hxx
index db9fc13..3de866d 100644
--- a/include/avmedia/modeltools.hxx
+++ b/include/avmedia/modeltools.hxx
@@ -17,6 +17,8 @@ bool AVMEDIA_DLLPUBLIC Embed3DModel(
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel>&
xModel,
const OUString& rSourceURL, OUString& o_rEmbeddedURL);
+bool AVMEDIA_DLLPUBLIC IsModel(const OUString& rMimeType);
+
} // namespace avemdia
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/Library_slideshow.mk b/slideshow/Library_slideshow.mk
index ccd3e99..d5af9a1 100644
--- a/slideshow/Library_slideshow.mk
+++ b/slideshow/Library_slideshow.mk
@@ -27,7 +27,11 @@ endif
$(eval $(call
gb_Library_set_precompiled_header,slideshow,$(SRCDIR)/slideshow/inc/pch/precompiled_slideshow))
-$(eval $(call gb_Library_use_external,slideshow,boost_headers))
+$(eval $(call gb_Library_use_externals,slideshow,\
+ boost_headers \
+ glew \
+ mesa_headers \
+))
$(eval $(call gb_Library_use_sdk_api,slideshow))
@@ -44,7 +48,8 @@ $(eval $(call gb_Library_use_libraries,slideshow,\
tl \
utl \
vcl \
- $(gb_UWINAPI) \
+vclopengl \
+$(gb_UWINAPI) \
))
$(eval $(call gb_Library_set_componentfile,slideshow,slideshow/util/slideshow))
diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx
b/slideshow/source/engine/shapes/viewmediashape.cxx
index 22fa24e..bbf1703 100644
--- a/slideshow/source/engine/shapes/viewmediashape.cxx
+++ b/slideshow/source/engine/shapes/viewmediashape.cxx
@@ -30,6 +30,7 @@
#include
#include
+#include
#include
#include
@@ -45,6 +46,9 @@
#include
#include
#include
+#include
+
+#include
#include
#include
@@ -302,25 +306,26 @@ namespace slideshow
if( xCanvas.is() )
{
uno::Reference< beans::XPropertySet > xPropSet;
-OUString aURL;
-
[Libreoffice-commits] core.git: 5 commits - desktop/source sc/source sd/source vcl/source
desktop/source/lib/init.cxx | 40 +++---
sc/source/filter/html/htmlexp.cxx | 81 +++---
sd/source/filter/html/htmlex.cxx | 52 ++--
sd/source/filter/html/htmlex.hxx |4 +
vcl/source/filter/wmf/winmtf.cxx | 22 ++
vcl/source/filter/wmf/winmtf.hxx |2
vcl/source/filter/wmf/winwmf.cxx | 14 ++
7 files changed, 145 insertions(+), 70 deletions(-)
New commits:
commit 6e793fdb9f349e650cf3bed47cd900119147c442
Author: Tomaž Vajngerl
Date: Mon Apr 28 17:37:43 2014 +0200
sd html: Support export of any text objects (draw) and groups
Change-Id: Ied2de0a076db722df8366e866ae66846f3fb2854
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index dd69ce4..e6f163d 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -62,13 +62,16 @@
#include
#include
#include
+#include
#include
#include
#include
#include
#include
-#include "comphelper/anytostring.hxx"
-#include "cppuhelper/exc_hlp.hxx"
+#include
+#include
+#include
+#include
#include "drawdoc.hxx"
#include "htmlpublishmode.hxx"
@@ -80,9 +83,6 @@
#include "imapinfo.hxx"
#include "sdresid.hxx"
#include "buttonset.hxx"
-#include
-
-#include
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -1218,6 +1218,23 @@ OUString HtmlExport::CreateTextForPage(SdrOutliner*
pOutliner, SdPage* pPage,
switch (eKind)
{
+case PRESOBJ_NONE:
+{
+if (pObject->GetObjIdentifier() == OBJ_GRUP)
+{
+SdrObjGroup* pObjectGroup = (SdrObjGroup*) pObject;
+WriteObjectGroup(aStr, pObjectGroup, pOutliner,
rBackgroundColor, false);
+}
+else
+{
+if (pObject->GetOutlinerParaObject())
+{
+WriteOutlinerParagraph(aStr, pOutliner,
pObject->GetOutlinerParaObject(), rBackgroundColor, false);
+}
+}
+}
+break;
+
case PRESOBJ_TABLE:
{
SdrTableObj* pTableObject = (SdrTableObj*) pObject;
@@ -1248,6 +1265,7 @@ OUString HtmlExport::CreateTextForPage(SdrOutliner*
pOutliner, SdPage* pPage,
aStr.append("\r\n");
}
break;
+
case PRESOBJ_TEXT:
case PRESOBJ_OUTLINE:
{
@@ -1257,6 +1275,7 @@ OUString HtmlExport::CreateTextForPage(SdrOutliner*
pOutliner, SdPage* pPage,
WriteOutlinerParagraph(aStr, pOutliner,
pTextObject->GetOutlinerParaObject(), rBackgroundColor, bHeadLine);
}
break;
+
default:
break;
}
@@ -1264,6 +1283,29 @@ OUString HtmlExport::CreateTextForPage(SdrOutliner*
pOutliner, SdPage* pPage,
return aStr.makeStringAndClear();
}
+void HtmlExport::WriteObjectGroup(OUStringBuffer& aStr, SdrObjGroup*
pObjectGroup, SdrOutliner* pOutliner,
+ const Color& rBackgroundColor, bool
bHeadLine)
+{
+SdrObjListIter aGroupIterator(*pObjectGroup->GetSubList(),
IM_DEEPNOGROUPS);
+while (aGroupIterator.IsMore())
+{
+SdrObject* pCurrentObject = aGroupIterator.Next();
+if (pCurrentObject->GetObjIdentifier() == OBJ_GRUP)
+{
+SdrObjGroup* pCurrentGroupObject = (SdrObjGroup*) pCurrentObject;
+WriteObjectGroup(aStr, pCurrentGroupObject, pOutliner,
rBackgroundColor, bHeadLine);
+}
+else
+{
+OutlinerParaObject* pOutlinerParagraphObject =
pCurrentObject->GetOutlinerParaObject();
+if (pOutlinerParagraphObject != NULL)
+{
+WriteOutlinerParagraph(aStr, pOutliner,
pOutlinerParagraphObject, rBackgroundColor, bHeadLine);
+}
+}
+}
+}
+
void HtmlExport::WriteOutlinerParagraph(OUStringBuffer& aStr, SdrOutliner*
pOutliner,
OutlinerParaObject*
pOutlinerParagraphObject,
const Color& rBackgroundColor, bool
bHeadLine)
diff --git a/sd/source/filter/html/htmlex.hxx b/sd/source/filter/html/htmlex.hxx
index 58e0086..51d3359 100644
--- a/sd/source/filter/html/htmlex.hxx
+++ b/sd/source/filter/html/htmlex.hxx
@@ -55,6 +55,7 @@ class SdrOutliner;
class SdPage;
class HtmlState;
class SdrTextObj;
+class SdrObjGroup;
class SdrPage;
class SdDrawDocument;
class ButtonSet;
@@ -215,6 +216,9 @@ class HtmlExport
OutlinerParaObject* pOutlinerParagraphObject,
const Color& rBackgroundColor, bool bHeadLine);
+void WriteObjectGroup(OUStringBuffer& aStr, SdrObjGroup* pObjectGroup,
SdrOutliner* pOutliner,
+ const Color& rBackgroundColor, bool bHeadLine);
+
pu
[Libreoffice-commits] core.git: 2 commits - RepositoryModule_host.mk solenv/bin sw/source
RepositoryModule_host.mk |2
solenv/bin/native-code.py |1
sw/source/core/doc/doc.cxx|6 ++
sw/source/core/doc/docfld.cxx | 76 ++
sw/source/core/uibase/uno/unofreg.cxx |4 +
sw/source/core/unocore/unofield.cxx |5 ++
6 files changed, 75 insertions(+), 19 deletions(-)
New commits:
commit d2f9e1a165314ad9e8588b1d44b3ff0a455ef7f6
Author: Tor Lillqvist
Date: Mon Apr 28 18:01:11 2014 +0300
More --disable-database-connectivity work
Bypass various database field and mail-merge functionality in the case
of !HAVE_FEATURE_DBCONNECTIVITY.
Now TiledLibreOffice builds and runs.
Change-Id: I9aa167413f426fe28d44dd063dc661f468ddc847
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 623a546..6b338c1 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include
+
#include
#include
#include
@@ -318,7 +320,9 @@ void SwDoc::ChgDBData(const SwDBData& rNewData)
maDBData = rNewData;
SetModified();
}
+#if HAVE_FEATURE_DBCONNECTIVITY
GetSysFldType(RES_DBNAMEFLD)->UpdateFlds();
+#endif
}
bool SwDoc::SplitNode( const SwPosition &rPos, bool bChkTableStart )
@@ -686,7 +690,7 @@ SwFlyFrmFmt* SwDoc::InsertOLE(const SwPaM &rRg, const
OUString& rObjName,
SwFieldType *SwDoc::GetSysFldType( const sal_uInt16 eWhich ) const
{
for( sal_uInt16 i = 0; i < INIT_FLDTYPES; ++i )
-if( eWhich == (*mpFldTypes)[i]->Which() )
+if( (*mpFldTypes)[i] && eWhich == (*mpFldTypes)[i]->Which() )
return (*mpFldTypes)[i];
return 0;
}
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index fafb713..6468d26 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -95,7 +95,8 @@ SwFieldType* SwDoc::InsertFldType(const SwFieldType &rFldTyp)
const ::utl::TransliterationWrapper& rSCmp = GetAppCmpStrIgnore();
OUString sFldNm( rFldTyp.GetName() );
for( ; i < nSize; ++i )
-if( nFldWhich == (*mpFldTypes)[i]->Which() &&
+if( (*mpFldTypes)[i] &&
+nFldWhich == (*mpFldTypes)[i]->Which() &&
rSCmp.isEqual( sFldNm, (*mpFldTypes)[i]->GetName() ))
return (*mpFldTypes)[i];
}
@@ -103,13 +104,15 @@ SwFieldType* SwDoc::InsertFldType(const SwFieldType
&rFldTyp)
case RES_AUTHORITY:
for( ; i < nSize; ++i )
-if( nFldWhich == (*mpFldTypes)[i]->Which() )
+if( (*mpFldTypes)[i] &&
+nFldWhich == (*mpFldTypes)[i]->Which() )
return (*mpFldTypes)[i];
break;
default:
for( i = 0; i < nSize; ++i )
-if( nFldWhich == (*mpFldTypes)[i]->Which() )
+if( (*mpFldTypes)[i] &&
+nFldWhich == (*mpFldTypes)[i]->Which() )
return (*mpFldTypes)[i];
}
@@ -164,7 +167,8 @@ void SwDoc::InsDeletedFldType( SwFieldType& rFldTyp )
SwFieldType* pFnd;
for( ; i < nSize; ++i )
-if( nFldWhich == (pFnd = (*mpFldTypes)[i])->Which() &&
+if( (*mpFldTypes)[i] &&
+nFldWhich == (pFnd = (*mpFldTypes)[i])->Which() &&
rSCmp.isEqual( rFldNm, pFnd->GetName() ) )
{
// find new name
@@ -172,7 +176,8 @@ void SwDoc::InsDeletedFldType( SwFieldType& rFldTyp )
do {
OUString sSrch = rFldNm + OUString::number( nNum );
for( i = INIT_FLDTYPES; i < nSize; ++i )
-if( nFldWhich == (pFnd = (*mpFldTypes)[i])->Which() &&
+if( (*mpFldTypes)[i] &&
+nFldWhich == (pFnd = (*mpFldTypes)[i])->Which() &&
rSCmp.isEqual( sSrch, pFnd->GetName() ) )
break;
@@ -210,7 +215,7 @@ void SwDoc::RemoveFldType(sal_uInt16 nFld)
* Dependent fields present -> ErrRaise
*/
sal_uInt16 nSize = mpFldTypes->size();
-if(nFld < nSize)
+if(nFld < nSize && (*mpFldTypes)[nFld])
{
SwFieldType* pTmp = (*mpFldTypes)[nFld];
@@ -283,6 +288,9 @@ SwFieldType* SwDoc::GetFldType(
SwFieldType* pRet = 0;
for( ; i < nSize; ++i )
{
+if( !(*mpFldTypes)[i] )
+continue;
+
SwFieldType* pFldType = (*mpFldTypes)[i];
OUString aFldName( pFldType->GetName() );
@@ -307,6 +315,9 @@ void SwDoc::UpdateFlds( SfxPoolItem *pNewHt, bool bCloseDB )
for( sal_uInt16 i=0; i < mpFldTypes->size(); ++i)
{
+if( !(*mpFldTypes)[i] )
+continue;
+
switch( (*mpFldTypes)[i]->Which() )
{
// Update table fields second to last
@@ -364,13 +375,15 @@ void SwDoc::UpdateUsrFlds()
SwCalc* pCalc = 0;
const SwFieldType* pFldType;
f
Re: copying format
On 23/04/14 16:16, Adriam Delgado Rivero wrote: > Hi, I need copy the format properties of one row and paste in other row, in > java. XProperty just have setPropertyValue (set one property) and i need all > properties hi Adriam, you can use the interface XPropertySetInfo to see what properties are available on an object https://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/Properties ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Loading file Finished
On 18/04/14 11:29, tuan vu dao wrote: > How I know file loading finished when I open? I am using > loadComponentFromURL load find, i'm searching event return when loading > finished but i don'n know. How to I get event return? Can you help me? you can register an event listener to receive various different events on a document; for loading there is the "OnLoad" event, you have to register at the GlobalEventBroadcaster to receive it (since when it is sent you do not have a reference to the document itself yet). https://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Document_Events ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Playing Video in a Dialog
On 17/04/14 11:23, Fernand Vanrie wrote:
> On The French user site i found usefull code to play video on Windows
> using the API and Basic.
>
> The code opens a MediaWindow and play any video
>
> The player has a undocumented method "CreatePlayerWindow" who needs
> arguments (a empty array do crash LO)
>
> Do someone knows how to use this method and how Video can been played in
> a Dialog ?
hi Fernand,
let's see...
avmedia/source/win/window.cxx:
> bool Window::create( const uno::Sequence< uno::Any >& rArguments )
> {
> IVideoWindow* pVideoWindow = const_cast< IVideoWindow* >(
> mrPlayer.getVideoWindow() );
> WNDCLASS* mpWndClass = lcl_getWndClass();
>
> if( !mnFrameWnd && pVideoWindow && mpWndClass )
> {
> awt::Rectangle aRect;
> sal_IntPtr nWnd;
>
> rArguments[ 0 ] >>= nWnd;
> rArguments[ 1 ] >>= aRect;
>
> mnParentWnd = static_cast(nWnd);
>
so on Windows, parameters are a HWND of the parent and a rectangle...
probably the parameters are undocumented for a reason, very
system-dependent and subject to change without notice. also i have no
idea how you can get a window's HWND from BASIC code.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - framework/source
framework/source/layoutmanager/toolbarlayoutmanager.cxx | 50 +++-
1 file changed, 36 insertions(+), 14 deletions(-)
New commits:
commit 5ae7fba33ee7095620aca753e9488f1cd9cd41f2
Author: Oliver-Rainer Wittmann
Date: Mon Apr 28 15:09:35 2014 +
124674: Toolbarmanager: correct show/hide of toolbars (correction of fix
for issue 124355); correct consideration of hidden toolbars;
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
index f267684..9c94679 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
@@ -332,6 +332,12 @@ Rectangle ToolbarLayoutManager::implts_calcDockingArea()
// Note: For each docking area row resp. column only the size of
largest UIElement is collected.
for ( UIElementVector::const_iterator pConstIter =
m_aUIElements.begin(); pConstIter != m_aUIElements.end(); ++pConstIter )
{
+if ( !pConstIter->m_bVisible
+ || pConstIter->m_bMasterHide )
+{
+continue;
+}
+
uno::Reference< ui::XUIElement > xUIElement(
pConstIter->m_xUIElement, uno::UNO_QUERY );
if ( xUIElement.is() )
{
@@ -340,7 +346,8 @@ Rectangle ToolbarLayoutManager::implts_calcDockingArea()
if ( xWindow.is() && xDockWindow.is() )
{
Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
-if ( pWindow && !xDockWindow->isFloating() &&
pConstIter->m_bVisible )
+if ( pWindow != NULL
+ && !xDockWindow->isFloating() )
{
const awt::Rectangle aPosSize = xWindow->getPosSize();
insertDockingAreaSize(
@@ -572,9 +579,6 @@ bool ToolbarLayoutManager::implts_setToolbarVisibility(
{
implts_setLayoutDirty();
}
-aUIElement.m_bVisible = bVisible;
-implts_writeWindowStateData( aUIElement );
-implts_setToolbar( aUIElement );
bRet = true;
}
@@ -586,6 +590,9 @@ bool ToolbarLayoutManager::showToolbar( const
::rtl::OUString& rResourceURL )
{
UIElement aUIElement = implts_findToolbar( rResourceURL );
const bool bRet = implts_setToolbarVisibility( true, aUIElement );
+aUIElement.m_bVisible = true;
+implts_writeWindowStateData( aUIElement );
+implts_setToolbar( aUIElement );
implts_sortUIElements();
return bRet;
}
@@ -594,6 +601,9 @@ bool ToolbarLayoutManager::hideToolbar( const
::rtl::OUString& rResourceURL )
{
UIElement aUIElement = implts_findToolbar( rResourceURL );
const bool bRet = implts_setToolbarVisibility( false, aUIElement );
+aUIElement.m_bVisible = false;
+implts_writeWindowStateData( aUIElement );
+implts_setToolbar( aUIElement );
implts_sortUIElements();
return bRet;
}
@@ -662,8 +672,9 @@ void ToolbarLayoutManager::setVisible( bool bVisible )
UIElementVector::iterator pIter;
for ( pIter = aUIElementVector.begin(); pIter != aUIElementVector.end();
pIter++ )
{
-pIter->m_bMasterHide = !bVisible;
implts_setToolbarVisibility( bVisible, *pIter );
+pIter->m_bMasterHide = !bVisible;
+implts_setToolbar( *pIter );
}
implts_sortUIElements();
@@ -758,16 +769,18 @@ bool ToolbarLayoutManager::dockAllToolbars()
{
std::vector< ::rtl::OUString > aToolBarNameVector;
-::rtl::OUString aElementType;
-::rtl::OUString aElementName;
-
ReadGuard aReadLock( m_aLock );
UIElementVector::iterator pIter;
for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++
)
{
-if ( pIter->m_aType.equalsAscii( "toolbar" ) &&
pIter->m_xUIElement.is() &&
- pIter->m_bFloating && pIter->m_bVisible )
+if ( pIter->m_aType.equalsAscii( "toolbar" )
+ && pIter->m_xUIElement.is()
+ && pIter->m_bFloating
+ && pIter->m_bVisible
+ && !pIter->m_bMasterHide )
+{
aToolBarNameVector.push_back( pIter->m_aName );
+}
}
aReadLock.unlock();
@@ -1371,7 +1384,7 @@ uno::Reference< ui::XUIElement >
ToolbarLayoutManager::implts_createElement( con
void ToolbarLayoutManager::implts_setElementData( UIElement& rElement, const
uno::Reference< awt::XDockableWindow >& rDockWindow )
{
ReadGuard aReadLock( m_aLock );
-bool bShowElement( rElement.m_bVisible && !rElement.m_bMasterHide &&
implts_isParentWindowVisible() );
+const bool bShowElement( rElement.m_bVisible && !rElement.m_bMasterHide &&
implts_isParentWindowVisible() );
aReadLock.unlock();
uno::Reference< awt::XDockableWindow > xDockWindow( rDockWindow );
@@ -2012,7 +2025,10 @@ void
ToolbarLayoutManager::implts_getDockingAreaElementInfos( ui::DockingArea eD
UIEleme
[Libreoffice-commits] core.git: 2 commits - sc/qa sc/source
sc/qa/unit/ucalc.hxx |2 ++
sc/qa/unit/ucalc_formula.cxx | 33 +
sc/source/core/tool/scmatrix.cxx |2 +-
3 files changed, 36 insertions(+), 1 deletion(-)
New commits:
commit 5fab47ddbe332a150fb2005e941a2c19bd38ce7f
Author: Kohei Yoshida
Date: Mon Apr 28 11:55:23 2014 -0400
fdo#75397: Return an empty string for empty element.
This is the behavior as of 3.6. It had changed in 4.0 and onward by
accident, and caused the bug as reported in fdo#75397.
Change-Id: Id96fea354604b3c13cbbf2d9a73223b7725c7d66
diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index b71da72..32da95a 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -579,7 +579,7 @@ svl::SharedString ScMatrixImpl::GetString(
SvNumberFormatter& rFormatter, SCSIZE
{
if (!maMatFlag.get(nR, nC))
// not an empty path.
-break;
+return svl::SharedString::getEmptyString();
// result of empty FALSE jump path
sal_uLong nKey = rFormatter.GetStandardFormat(
NUMBERFORMAT_LOGICAL,
commit 18fa4733f46c2dae40bad7cdea9d3f98e24495dd
Author: Kohei Yoshida
Date: Mon Apr 28 11:16:29 2014 -0400
fdo#75397: Write unit test for this.
Change-Id: Id261aebd427eb032463668c2654ce837139b4a05
diff --git a/sc/qa/unit/ucalc.hxx b/sc/qa/unit/ucalc.hxx
index 2939ac5..71b33a7 100644
--- a/sc/qa/unit/ucalc.hxx
+++ b/sc/qa/unit/ucalc.hxx
@@ -133,6 +133,7 @@ public:
void testFuncN();
void testFuncCOUNTIF();
void testFuncNUMBERVALUE();
+void testFuncLEN();
void testFuncLOOKUP();
void testFuncVLOOKUP();
void testFuncMATCH();
@@ -383,6 +384,7 @@ public:
CPPUNIT_TEST(testFuncN);
CPPUNIT_TEST(testFuncCOUNTIF);
CPPUNIT_TEST(testFuncNUMBERVALUE);
+CPPUNIT_TEST(testFuncLEN);
CPPUNIT_TEST(testFuncLOOKUP);
CPPUNIT_TEST(testFuncVLOOKUP);
CPPUNIT_TEST(testFuncMATCH);
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index 9776715..b2caf22 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -2635,6 +2635,39 @@ void Test::testFuncNUMBERVALUE()
m_pDoc->DeleteTab(0);
}
+void Test::testFuncLEN()
+{
+sc::AutoCalcSwitch aACSwitch(*m_pDoc, true); // turn auto calc on.
+
+m_pDoc->InsertTab(0, "Formula");
+
+// Leave A1:A3 empty, and insert an array of LEN in B1:B3 that references
+// these empty cells.
+
+ScMarkData aMark;
+aMark.SelectOneTable(0);
+m_pDoc->InsertMatrixFormula(1, 0, 1, 2, aMark, "=LEN(A1:A3)", NULL);
+
+ScFormulaCell* pFC = m_pDoc->GetFormulaCell(ScAddress(1,0,0));
+CPPUNIT_ASSERT(pFC);
+CPPUNIT_ASSERT_MESSAGE("This formulashould be a matrix origin.",
+ pFC->GetMatrixFlag() == MM_FORMULA);
+
+// This should be a 1x3 matrix.
+SCCOL nCols = -1;
+SCROW nRows = -1;
+pFC->GetMatColsRows(nCols, nRows);
+CPPUNIT_ASSERT_EQUAL(static_cast(1), nCols);
+CPPUNIT_ASSERT_EQUAL(static_cast(3), nRows);
+
+// LEN value should be 0 for an empty cell.
+CPPUNIT_ASSERT_EQUAL(0.0, m_pDoc->GetValue(ScAddress(1,0,0)));
+CPPUNIT_ASSERT_EQUAL(0.0, m_pDoc->GetValue(ScAddress(1,1,0)));
+CPPUNIT_ASSERT_EQUAL(0.0, m_pDoc->GetValue(ScAddress(1,2,0)));
+
+m_pDoc->DeleteTab(0);
+}
+
void Test::testFuncLOOKUP()
{
FormulaGrammarSwitch aFGSwitch(m_pDoc,
formula::FormulaGrammar::GRAM_ENGLISH_XL_R1C1);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - external/boost include/sfx2 include/svtools svtools/source
external/boost/UnpackedTarball_boost.mk |2 --
external/boost/boost.random.Wuninitialized.patch | 10 --
include/sfx2/recentdocsviewitem.hxx |4 ++--
include/svtools/tabbar.hxx |2 +-
svtools/source/control/tabbar.cxx|4 ++--
5 files changed, 5 insertions(+), 17 deletions(-)
New commits:
commit 1053688105c1064a4e04dcb2c6056b4326c4a880
Author: Tor Lillqvist
Date: Mon Apr 28 18:42:27 2014 +0300
Bin outdated patch
We use gcc 4.8 for Android now.
Change-Id: I607499c9a61529349d2c3154593b2edf48eccb7e
diff --git a/external/boost/UnpackedTarball_boost.mk
b/external/boost/UnpackedTarball_boost.mk
index 29c478c..8af8c36 100644
--- a/external/boost/UnpackedTarball_boost.mk
+++ b/external/boost/UnpackedTarball_boost.mk
@@ -65,8 +65,6 @@ boost_patches += boost.ptr_container.Wextra.warnings.patch
boost_patches += boost.ptr_container.Wunused-parameter.warnings.patch
# https://svn.boost.org/trac/boost/ticket/9898
boost_patches += boost.random.Wshadow.warnings.patch
-# https://svn.boost.org/trac/boost/ticket/9899
-boost_patches += boost.random.Wuninitialized.patch
# fixed upstream
boost_patches += boost.random.Wunused-local-typedefs.warnings.patch
# https://svn.boost.org/trac/boost/ticket/9900
diff --git a/external/boost/boost.random.Wuninitialized.patch
b/external/boost/boost.random.Wuninitialized.patch
deleted file mode 100644
index 1b6384e..000
--- a/external/boost/boost.random.Wuninitialized.patch
+++ /dev/null
@@ -1,10 +0,0 @@
foo/foo/foo/boost/random/binomial_distribution.hpp
-+++ foo/foo/foo/boost/random/binomial_distribution.hpp
-@@ -278,6 +278,7 @@
- m = static_cast((t_lcl+1)*p_lcl);
-
- if(use_inversion()) {
-+btrd.r = btrd.nr = btrd.npq = btrd.b = btrd.a = btrd.c =
btrd.alpha = btrd.v_r = btrd.u_rv_r = 0;
- q_n = pow((1 - p_lcl), static_cast(t_lcl));
- } else {
- btrd.r = p_lcl/(1-p_lcl);
commit f0a266681974ef3d7ae881e1d8342a6bdfd9d737
Author: Tor Lillqvist
Date: Mon Apr 28 17:00:20 2014 +0300
WaE: overriding virtual function declaration not marked 'override'
Change-Id: Ie3eacab8c5f593144be9d98e4fbfae3f929f384f
diff --git a/include/sfx2/recentdocsviewitem.hxx
b/include/sfx2/recentdocsviewitem.hxx
index 96cd84c..b1a51fe 100644
--- a/include/sfx2/recentdocsviewitem.hxx
+++ b/include/sfx2/recentdocsviewitem.hxx
@@ -31,9 +31,9 @@ public:
virtual OUString getHelpText() const SAL_OVERRIDE;
virtual void Paint(drawinglayer::processor2d::BaseProcessor2D *pProcessor,
- const ThumbnailItemAttributes *pAttrs);
+ const ThumbnailItemAttributes *pAttrs) SAL_OVERRIDE;
-virtual void MouseButtonUp(const MouseEvent& rMEvt);
+virtual void MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE;
/// Called when the user clicks a document - it will open it.
void OpenDocument();
commit 6f59894afca1f3aee968be10c98167cd0900340d
Author: Tor Lillqvist
Date: Mon Apr 28 16:49:12 2014 +0300
WaE: implicit conversion from bool to 'long'
Change-Id: Ibe8bf3070fb64b447315b280c7c06a7851f7a7ed
diff --git a/include/svtools/tabbar.hxx b/include/svtools/tabbar.hxx
index 20e644b..bc15dd4 100644
--- a/include/svtools/tabbar.hxx
+++ b/include/svtools/tabbar.hxx
@@ -389,7 +389,7 @@ private:
SVT_DLLPRIVATE voidImplEnableControls();
SVT_DLLPRIVATE voidImplSelect();
SVT_DLLPRIVATE voidImplActivatePage();
-SVT_DLLPRIVATE longImplDeactivatePage();
+SVT_DLLPRIVATE boolImplDeactivatePage();
SVT_DLLPRIVATE voidImplPrePaint();
SVT_DLLPRIVATE ImplTabBarItem* ImplGetLastTabBarItem( sal_uInt16
nItemCount );
SVT_DLLPRIVATE Rectangle ImplGetInsertTabRect(ImplTabBarItem* pItem)
const;
diff --git a/svtools/source/control/tabbar.cxx
b/svtools/source/control/tabbar.cxx
index 2b1f0ed..9183f73 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -1718,9 +1718,9 @@ void TabBar::ActivatePage()
-long TabBar::ImplDeactivatePage()
+bool TabBar::ImplDeactivatePage()
{
-long nRet = DeactivatePage();
+bool nRet = DeactivatePage();
CallEventListeners( VCLEVENT_TABBAR_PAGEDEACTIVATED,
reinterpret_cast(sal::static_int_cast(mnCurPageId)) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/subsequent_export-test.cxx |7 +++ 1 file changed, 7 insertions(+) New commits: commit f60d4c758ab94bfb55990ca0975de91e22f8265b Author: Eike Rathke Date: Mon Apr 28 18:11:16 2014 +0100 temporarily disable export to ODS due to derailed validator Change-Id: Ib2e6ce3f2663242eebbf1cfa3fc04c57468194bf diff --git a/sc/qa/unit/subsequent_export-test.cxx b/sc/qa/unit/subsequent_export-test.cxx index 43052d0..c1ca64d 100644 --- a/sc/qa/unit/subsequent_export-test.cxx +++ b/sc/qa/unit/subsequent_export-test.cxx @@ -133,7 +133,14 @@ public: CPPUNIT_TEST(testSharedFormulaStringResultExportXLSX); CPPUNIT_TEST(testFunctionsExcel2010XLSX); CPPUNIT_TEST(testFunctionsExcel2010XLS); + +/* TODO: export to ODS currently (2014-04-28) makes the validator stumble, + * probably due to a loext:fill-character attribute in a + * element (says number:text tag would not be + * allowed, which is nonsense). Skip this test until solved. */ +#if 0 CPPUNIT_TEST(testFunctionsExcel2010ODS); +#endif CPPUNIT_TEST_SUITE_END(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sw/inc sw/sdi sw/source
sw/inc/cmdid.h |2 sw/inc/docary.hxx |9 +++ sw/inc/editsh.hxx |2 sw/inc/swcommands.h|2 sw/sdi/_viewsh.sdi | 12 + sw/sdi/swriter.sdi | 50 + sw/source/core/doc/docredln.cxx| 66 ++--- sw/source/core/edit/edredln.cxx| 18 +++ sw/source/core/uibase/inc/redline_tmpl.hrc | 12 + sw/source/core/uibase/lingu/olmenu.cxx | 10 +++- sw/source/core/uibase/uiview/view2.cxx | 10 sw/source/core/uibase/uiview/viewstat.cxx | 39 + 12 files changed, 196 insertions(+), 36 deletions(-) New commits: commit 4a60f9387ddd832f7c164102b76351e5e520d920 Author: LuboÅ¡ LuÅák Date: Mon Apr 28 19:16:20 2014 +0200 allow accepting/rejecting changes in a selection (bnc#874790) Adds 'Accept Changes'/'Reject Changes' to the RMB popup if appropriate, more convenient than handling them one by one. Change-Id: I4e2670aa9fdac1b7ecca36b9c150c82e2e72 diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h index 8f49675..721b3f4b 100644 --- a/sw/inc/cmdid.h +++ b/sw/inc/cmdid.h @@ -163,6 +163,8 @@ #define FN_COPY_HYPERLINK_LOCATION (FN_EDIT2 + 40)/* copy hyperlink URL to clipboard */ #define FN_REDLINE_NEXT_CHANGE (FN_EDIT2 + 41)/* Go to the next change */ #define FN_REDLINE_PREV_CHANGE (FN_EDIT2 + 42)/* Go to the previous change */ +#define FN_REDLINE_ACCEPT_DIRECT_SELECTION (FN_EDIT2 + 43)/* accept redlines in the selection */ +#define FN_REDLINE_REJECT_DIRECT_SELECTION (FN_EDIT2 + 44)/* reject redlines in the selection */ /* Region: Edit diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx index 70c18cb..31a1b0e 100644 --- a/sw/inc/editsh.hxx +++ b/sw/inc/editsh.hxx @@ -890,6 +890,8 @@ public: const SwRangeRedline& GetRedline( sal_uInt16 nPos ) const; sal_Bool AcceptRedline( sal_uInt16 nPos ); sal_Bool RejectRedline( sal_uInt16 nPos ); +bool AcceptRedlinesInSelection(); +bool RejectRedlinesInSelection(); /** Search Redline for this Data and @return position in array. If not found, return USHRT_MAX. */ diff --git a/sw/inc/swcommands.h b/sw/inc/swcommands.h index cc9bc07..aa580e3 100644 --- a/sw/inc/swcommands.h +++ b/sw/inc/swcommands.h @@ -122,6 +122,8 @@ #define CMD_FN_HIDE_ALL_NOTES ".uno:HideAllNotes" #define CMD_FN_REDLINE_ACCEPT_DIRECT".uno:AcceptTracedChange" #define CMD_FN_REDLINE_REJECT_DIRECT".uno:RejectTracedChange" +#define CMD_FN_REDLINE_ACCEPT_DIRECT_SELECTION ".uno:AcceptTracedChangesInSelection" +#define CMD_FN_REDLINE_REJECT_DIRECT_SELECTION ".uno:RejectTracedChangesInSelection" #define CMD_FN_REDLINE_NEXT_CHANGE ".uno:NextTrackedChange" #define CMD_FN_REDLINE_PREV_CHANGE ".uno:PreviousTrackedChange" #define CMD_FN_REMOVE_HYPERLINK ".uno:RemoveHyperlink" diff --git a/sw/sdi/_viewsh.sdi b/sw/sdi/_viewsh.sdi index 40ec958..7c8f2ad 100644 --- a/sw/sdi/_viewsh.sdi +++ b/sw/sdi/_viewsh.sdi @@ -142,6 +142,18 @@ interface BaseTextEditView StateMethod = GetState ; DisableFlags="SW_DISABLE_ON_MAILBOX_EDITOR"; ] +FN_REDLINE_ACCEPT_DIRECT_SELECTION +[ +ExecMethod = Execute ; +StateMethod = GetState ; +DisableFlags="SW_DISABLE_ON_MAILBOX_EDITOR"; +] +FN_REDLINE_REJECT_DIRECT_SELECTION +[ +ExecMethod = Execute ; +StateMethod = GetState ; +DisableFlags="SW_DISABLE_ON_MAILBOX_EDITOR"; +] FN_REDLINE_NEXT_CHANGE [ ExecMethod = Execute ; diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi index 9bde88a..1ddeba3 100644 --- a/sw/sdi/swriter.sdi +++ b/sw/sdi/swriter.sdi @@ -9823,6 +9823,56 @@ SfxVoidItem RejectTracedChange FN_REDLINE_REJECT_DIRECT GroupId = GID_EDIT; ] +SfxVoidItem AcceptTracedChangeInSelection FN_REDLINE_ACCEPT_DIRECT_SELECTION +[ +/* flags: */ +AutoUpdate = FALSE, +Cachable = Cachable, +FastCall = FALSE, +HasCoreId = FALSE, +HasDialog = FALSE, +ReadOnlyDoc = FALSE, +Toggle = FALSE, +Container = FALSE, +RecordAbsolute = FALSE, +RecordPerSet; +Asynchron; + +Readonly = FALSE, + +/* config: */ +AccelConfig = TRUE, +MenuConfig = TRUE, +StatusBarConfig = FALSE, +ToolBoxConfig = TRUE, +GroupId = GID_EDIT; +] + +SfxVoidItem RejectTracedChangeInSelection FN_REDLINE_REJECT_DIRECT_SELECTION +[ +/* flags: */ +AutoUpdate = FALSE, +Cachable = Cachable, +FastCall = FALSE, +HasCoreId = FALSE, +HasDialog = FALSE, +ReadOnlyDoc = FALSE, +Toggle = FALSE, +Container = FALSE, +RecordAbsolute = FALSE, +RecordPerSet; +
Re: Playing Video in a Dialog
On 28/04/2014 18:07, Michael Stahl wrote:
On 17/04/14 11:23, Fernand Vanrie wrote:
On The French user site i found usefull code to play video on Windows
using the API and Basic.
The code opens a MediaWindow and play any video
The player has a undocumented method "CreatePlayerWindow" who needs
arguments (a empty array do crash LO)
Do someone knows how to use this method and how Video can been played in
a Dialog ?
hi Fernand,
let's see...
avmedia/source/win/window.cxx:
bool Window::create( const uno::Sequence< uno::Any >& rArguments )
{
IVideoWindow* pVideoWindow = const_cast< IVideoWindow* >(
mrPlayer.getVideoWindow() );
WNDCLASS* mpWndClass = lcl_getWndClass();
if( !mnFrameWnd && pVideoWindow && mpWndClass )
{
awt::Rectangle aRect;
sal_IntPtr nWnd;
rArguments[ 0 ] >>= nWnd;
rArguments[ 1 ] >>= aRect;
mnParentWnd = static_cast(nWnd);
so on Windows, parameters are a HWND of the parent and a rectangle...
probably the parameters are undocumented for a reason, very
system-dependent and subject to change without notice. also i have no
idea how you can get a window's HWND from BASIC code.
Michael thakns for the hint
on the ooForum i found this code:
Dim arg(0) As Object
Dim oWindow As Object
...
moSM = CreateObject("com.sun.star.ServiceManager")
moDesk = moSM2.CreateInstance("com.sun.star.frame.Desktop")
oWindow = moDesk.ActiveFrame.GetContainerWindow()
Dim tableau()
tableau = Array()
' the 1st param is an empty array, the 2nd is an integer = 1 (may
be OS dependant ?)
mHwndOOo = oWindow.getWindowHandle(tableau, 1)
but how to make this work in a dialog ?
Greetz
Fernand
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Fwd: Build Error
looks like that was fixed by commit 00c19e5def4a62445c85786aef6a507bee6c45fa ... so just git pull and try again. Thanks for the advice I did git pull and tried to build again However, the build was unsuccessful. On running "make check", I got this:- There were 2 failures: 1) test(org.openoffice.test.UnoApiTest) com.sun.star.lang.DisposedException: java_remote_bridge com.sun.star.lib.uno.bridges.java_remote.java_remote_bridge@eafc191 is disposed at com.sun.star.lib.uno.bridges.java_remote.java_remote_bridge.checkDisposed(java_remote_bridge.java:690) at com.sun.star.lib.uno.bridges.java_remote.java_remote_bridge.sendRequest(java_remote_bridge.java:611) at com.sun.star.lib.uno.bridges.java_remote.ProxyFactory$Handler.request(ProxyFactory.java:141) at com.sun.star.lib.uno.bridges.java_remote.ProxyFactory$Handler.invoke(ProxyFactory.java:123) at com.sun.proxy.$Proxy6.createInstance(Unknown Source) at util.DesktopTools.createDesktop(DesktopTools.java:82) at util.DesktopTools.getCLoader(DesktopTools.java:61) at util.DesktopTools.openNewDoc(DesktopTools.java:238) at util.WriterTools.createTextDoc(WriterTools.java:39) at mod._forms.GenericModelTest.initialize(GenericModelTest.java:219) at mod._forms.OComboBoxModel.initialize(OComboBoxModel.java:118) at lib.TestCase.initializeTestCase(TestCase.java:68) at base.java_fat.getEnv(java_fat.java:450) at base.java_fat.executeTest(java_fat.java:239) at org.openoffice.Runner.run(Runner.java:234) at org.openoffice.test.UnoApiTest.test(UnoApiTest.java:38) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:483) at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:47) at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12) at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:44) at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17) at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:26) at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:27) at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:271) at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:70) at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:50) at org.junit.runners.ParentRunner$3.run(ParentRunner.java:238) at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:63) at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:236) at org.junit.runners.ParentRunner.access$000(ParentRunner.java:53) at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:229) at org.junit.runners.ParentRunner.run(ParentRunner.java:309) at org.junit.runners.Suite.runChild(Suite.java:127) at org.junit.runners.Suite.runChild(Suite.java:26) at org.junit.runners.ParentRunner$3.run(ParentRunner.java:238) at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:63) at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:236) at org.junit.runners.ParentRunner.access$000(ParentRunner.java:53) at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:229) at org.junit.runners.ParentRunner.run(ParentRunner.java:309) at org.junit.runner.JUnitCore.run(JUnitCore.java:160) at org.junit.runner.JUnitCore.run(JUnitCore.java:138) at org.junit.runner.JUnitCore.run(JUnitCore.java:117) at org.junit.runner.JUnitCore.runMain(JUnitCore.java:96) at org.junit.runner.JUnitCore.runMainAndExit(JUnitCore.java:47) at org.junit.runner.JUnitCore.main(JUnitCore.java:40) 2) test(org.openoffice.test.UnoApiTest) java.lang.AssertionError: expected:<0> but was:<134> at org.junit.Assert.fail(Assert.java:88) at org.junit.Assert.failNotEquals(Assert.java:743) at org.junit.Assert.assertEquals(Assert.java:118) at org.junit.Assert.assertEquals(Assert.java:555) at org.junit.Assert.assertEquals(Assert.java:542) at org.openoffice.test.OfficeConnection.tearDown(OfficeConnection.java:151) at org.openoffice.test.UnoApiTest.tearDown(UnoApiTest.java:34) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:483) at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:47) at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12) at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:44) at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:33) at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:271) at org.junit.runners.BlockJUnit4ClassRunner.runChild(Bloc
[Libreoffice-commits] core.git: 3 commits - sc/qa sc/source
sc/qa/unit/ucalc.hxx |2 +
sc/qa/unit/ucalc_formula.cxx | 50 +++
sc/source/core/tool/scmatrix.cxx | 12 +++--
3 files changed, 62 insertions(+), 2 deletions(-)
New commits:
commit 5233971396b2ed8e280ad68912e1a55e803f3856
Author: Kohei Yoshida
Date: Mon Apr 28 13:44:18 2014 -0400
Add a bit more test code to test the normal use cases of MIN.
Change-Id: Iad1e120dff49d569e5fb66905e5fe28462759c5a
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index de1fd11..1ecc5d2 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -2292,6 +2292,18 @@ void Test::testFuncMIN()
CPPUNIT_ASSERT_EQUAL(0.0, m_pDoc->GetValue(ScAddress(2,0,0)));
CPPUNIT_ASSERT_EQUAL(0.0, m_pDoc->GetValue(ScAddress(2,1,0)));
+// Inline array input (A4).
+m_pDoc->SetString(ScAddress(0,3,0), "=MIN({-2;4;3})");
+CPPUNIT_ASSERT_EQUAL(-2.0, m_pDoc->GetValue(ScAddress(0,3,0)));
+
+// Add more values to B3:B4.
+m_pDoc->SetValue(ScAddress(1,2,0), 20.0);
+m_pDoc->SetValue(ScAddress(1,3,0), -20.0);
+
+// Get the MIN of B1:B4.
+m_pDoc->SetString(ScAddress(2,4,0), "=MIN(B1:B4)");
+CPPUNIT_ASSERT_EQUAL(-20.0, m_pDoc->GetValue(ScAddress(2,4,0)));
+
m_pDoc->DeleteTab(0);
}
commit 453ea919e70fa9832f11e3ef042bb80cd86892cc
Author: Kohei Yoshida
Date: Mon Apr 28 13:33:08 2014 -0400
fdo#77969: Return 0 in case of matrix consisting of all empty elements.
Change-Id: I225d50445d7f84a17c0b9492c17247e4c1c9ef44
diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index 32da95a..f21baed 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -1235,12 +1235,14 @@ class CalcMaxMinValue :
std::unary_function
Date: Mon Apr 28 13:23:12 2014 -0400
fdo#77969: Write test for this corner case.
Change-Id: Iac8a3d0693456a380d3290c7be06136b04b50390
diff --git a/sc/qa/unit/ucalc.hxx b/sc/qa/unit/ucalc.hxx
index 71b33a7..9a81c5e 100644
--- a/sc/qa/unit/ucalc.hxx
+++ b/sc/qa/unit/ucalc.hxx
@@ -130,6 +130,7 @@ public:
void testFuncSUM();
void testFuncPRODUCT();
void testFuncSUMPRODUCT();
+void testFuncMIN();
void testFuncN();
void testFuncCOUNTIF();
void testFuncNUMBERVALUE();
@@ -381,6 +382,7 @@ public:
CPPUNIT_TEST(testFuncSUM);
CPPUNIT_TEST(testFuncPRODUCT);
CPPUNIT_TEST(testFuncSUMPRODUCT);
+CPPUNIT_TEST(testFuncMIN);
CPPUNIT_TEST(testFuncN);
CPPUNIT_TEST(testFuncCOUNTIF);
CPPUNIT_TEST(testFuncNUMBERVALUE);
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index b2caf22..de1fd11 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -2257,6 +2257,44 @@ void Test::testFuncSUMPRODUCT()
m_pDoc->DeleteTab(0);
}
+void Test::testFuncMIN()
+{
+sc::AutoCalcSwitch aACSwitch(*m_pDoc, true); // turn on auto recalc.
+m_pDoc->InsertTab(0, "Formula");
+
+// A1:A2
+m_pDoc->SetString(ScAddress(0,0,0), "a");
+m_pDoc->SetString(ScAddress(0,1,0), "b");
+
+// B1:B2
+m_pDoc->SetValue(ScAddress(1,0,0), 1.0);
+m_pDoc->SetValue(ScAddress(1,1,0), 2.0);
+
+// Matrix in C1:C2.
+ScMarkData aMark;
+aMark.SelectOneTable(0);
+m_pDoc->InsertMatrixFormula(2, 0, 2, 1, aMark,
"=MIN(IF(A1:A2=\"c\";B1:B2))");
+
+// Formula cell in C1:C2 should be a 1x2 matrix array.
+ScFormulaCell* pFC = m_pDoc->GetFormulaCell(ScAddress(2,0,0));
+CPPUNIT_ASSERT(pFC);
+CPPUNIT_ASSERT_MESSAGE("This formula should be an array.",
pFC->GetMatrixFlag() == MM_FORMULA);
+
+SCCOL nCols;
+SCROW nRows;
+pFC->GetMatColsRows(nCols, nRows);
+CPPUNIT_ASSERT_EQUAL(static_cast(1), nCols);
+CPPUNIT_ASSERT_EQUAL(static_cast(2), nRows);
+
+CPPUNIT_ASSERT_MESSAGE("Formula in C1 is invalid.",
m_pDoc->GetErrCode(ScAddress(2,0,0)) == 0);
+CPPUNIT_ASSERT_MESSAGE("Formula in C2 is invalid.",
m_pDoc->GetErrCode(ScAddress(2,1,0)) == 0);
+
+CPPUNIT_ASSERT_EQUAL(0.0, m_pDoc->GetValue(ScAddress(2,0,0)));
+CPPUNIT_ASSERT_EQUAL(0.0, m_pDoc->GetValue(ScAddress(2,1,0)));
+
+m_pDoc->DeleteTab(0);
+}
+
void Test::testFuncN()
{
OUString aTabName("foo");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
getUserIdent Unit test error in Windows 7 build when logged on as domain user
Hello,
I get a unit test failure for getUserIdent when trying to build under
Windows 7 (Professional, 64-bit), logged in as a domain user.
Output for error:
C:/sources/libo-core/sal/qa/osl/security/osl_Security.cxx:135:osl_Security::getUserIdent::getUserIdent_001
assertion failed
- Expression: strUserID.equals(strID) && bRes
- strUserID: S-1-5-21-3685578860-4172030127-4274943249-1000, strID:
S-1-5-21-2709487531-110703884-4059662957-1146, bRes: true
strID equals the SID for the domain user
(NOVENTUS.NOVENTUS.COM\peter.grimtell), but strID equals the SID for a
local account by the same name (peter.grimtell).
I did a little testing, and found that GetUserNameA() returns the name
without the domain part, and therefore returns the same for the domain
account as for the local account. When this name is sent on
LookupAccountNameW() it returns the SID for the local account. To get
the full user name, one seems to need to call
GetUserNameExA(NameDnsDomain, ...). I patched the unit test as below,
and then the build went through. But is it the unit test that is wrong,
or is it the code under test, or is my account setup not supported by
design?
diff --git a/sal/qa/osl/security/osl_Security.cxx
b/sal/qa/osl/security/osl_Security.cxx
index b675ab1..8e07836 100644
--- a/sal/qa/osl/security/osl_Security.cxx
+++ b/sal/qa/osl/security/osl_Security.cxx
@@ -19,6 +19,9 @@
#ifdef WNT
#include
+#define SECURITY_WIN32
+#include
+#pragma comment( lib, "Secur32" )
#undef min
#endif
#include
@@ -403,8 +406,11 @@ void MyTestPlugInImpl::initialize(
CPPUNIT_NS::TestFactoryRegistry *,
SID_NAME_USE eSidType;
DWORD dwErrorCode = 0;
-LPCWSTR wszAccName = ( LPWSTR ) strUserName.getStr( );
-
+WCHAR wchAccName[BUFSIZE];
+DWORD cchAccName = sizeof wchAccName / sizeof(WCHAR);
+if( !GetUserNameExW(NameDnsDomain, wchAccName, &cchAccName) )
+wchAccName[0] = L'\0';
+
// Create buffers for the SID and the domain name.
PSID pSid = (PSID) new BYTE[dwSidBufferSize];
CPPUNIT_ASSERT_MESSAGE("# creating SID buffer failed.\n", pSid!=
NULL );
@@ -422,7 +428,7 @@ void MyTestPlugInImpl::initialize(
CPPUNIT_NS::TestFactoryRegistry *,
cchDomainName = dwDomainBufferSize;
if (LookupAccountNameW(
NULL,// Computer name. NULL for
the local computer
- wszAccName,
+ wchAccName,
pSid, // Pointer to the SID
buffer. Use NULL to get the size needed,
&cbSid, // Size of the SID buffer
needed.
wszDomainName, // wszDomainName,
@@ -431,7 +437,7 @@ void MyTestPlugInImpl::initialize(
CPPUNIT_NS::TestFactoryRegistry *,
))
{
if (IsValidSid( pSid) == FALSE)
-wprintf(L"# The SID for %s is invalid.\n", wszAccName);
+wprintf(L"# The SID for %s is invalid.\n", wchAccName);
break;
}
dwErrorCode = GetLastError();
Thanks,
Peter
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-qa] US Hackfest July 26-27
Hi Joel, Robinson, *, Am 17.04.2014 20:22, schrieb Joel Madero: Hi All, So Robinson, Immanuel and myself are in the midst of planning a US hackfest in Boston. We're trying to get a sense of who will be there so we can plan accordingly. If you're at all interested please respond so we can get you on the list. Date: July 26-27 Location: Boston, MA Accommodations: TBD So you need a banner like the other ones for this? png (2000dpi) https://owncloud.documentfoundation.org/public.php?service=files&t=9baf4044085fce6c0b673bb9074d7e0b svg: https://owncloud.documentfoundation.org/public.php?service=files&t=6cddcd82a7a9ff92e17590ecc05de233 -- Grüße k-j ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
bibisect suggestion (was: QA Meeting Minutes - 2014-04-21)
>From the QA meeting minutes: > (*) SUGGESTION: Standardization of our summary field for Bugzilla > (*) Or: When searching for one phrase, display results from a < similar one (e.g. "image" -> "picture" or "graphic") I have been thinking about the possibility of canned pieces of queries to ease searching for a particular kind of crash. I mean ... (*) A segmentaion fault is a segfault is a SIGSEGV is a signal 11. (*) A crash may be a segmentation fault, except when it is something else. Something else could be an assertion, SIGABRT, or signal 6, It could even be a hang. And lots of reports say nothing more specific than "crash". and so forth. I have not said anything here before because I hoped to make a more concrete suggestion. But if we assume standardized words in the summary or whiteboard or keyword (without thinking about how that standardization happens), things become very simple. HTH, Terry. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Build Error
On Mon, Apr 28, 2014 at 7:35 PM, Shreyansh Gandhi wrote: > > > looks like that was fixed by commit > 00c19e5def4a62445c85786aef6a507bee6c45fa > > ... so just git pull and try again. > > > Thanks for the advice I did git pull and tried to build again > However, the build was unsuccessful. On running "make check", I got this:- > > There were 2 failures: > 1) test(org.openoffice.test.UnoApiTest) > com.sun.star.lang.DisposedException: java_remote_bridge > com.sun.star.lib.uno.bridges.java_remote.java_remote_bridge@eafc191 is > disposed > at > com.sun.star.lib.uno.bridges.java_remote.java_remote_bridge.checkDisposed(java_remote_bridge.java:690) > at > com.sun.star.lib.uno.bridges.java_remote.java_remote_bridge.sendRequest(java_remote_bridge.java:611) > at > com.sun.star.lib.uno.bridges.java_remote.ProxyFactory$Handler.request(ProxyFactory.java:141) > at > com.sun.star.lib.uno.bridges.java_remote.ProxyFactory$Handler.invoke(ProxyFactory.java:123) > at com.sun.proxy.$Proxy6.createInstance(Unknown Source) > at util.DesktopTools.createDesktop(DesktopTools.java:82) > at util.DesktopTools.getCLoader(DesktopTools.java:61) > at util.DesktopTools.openNewDoc(DesktopTools.java:238) > at util.WriterTools.createTextDoc(WriterTools.java:39) > at mod._forms.GenericModelTest.initialize(GenericModelTest.java:219) > at mod._forms.OComboBoxModel.initialize(OComboBoxModel.java:118) > at lib.TestCase.initializeTestCase(TestCase.java:68) > at base.java_fat.getEnv(java_fat.java:450) > at base.java_fat.executeTest(java_fat.java:239) > at org.openoffice.Runner.run(Runner.java:234) > at org.openoffice.test.UnoApiTest.test(UnoApiTest.java:38) > at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) > at > sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) > at > sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) > at java.lang.reflect.Method.invoke(Method.java:483) > at > org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:47) > at > org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12) > at > org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:44) > at > org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17) > at > org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:26) > at > org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:27) > at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:271) > at > org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:70) > at > org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:50) > at org.junit.runners.ParentRunner$3.run(ParentRunner.java:238) > at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:63) > at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:236) > at org.junit.runners.ParentRunner.access$000(ParentRunner.java:53) > at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:229) > at org.junit.runners.ParentRunner.run(ParentRunner.java:309) > at org.junit.runners.Suite.runChild(Suite.java:127) > at org.junit.runners.Suite.runChild(Suite.java:26) > at org.junit.runners.ParentRunner$3.run(ParentRunner.java:238) > at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:63) > at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:236) > at org.junit.runners.ParentRunner.access$000(ParentRunner.java:53) > at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:229) > at org.junit.runners.ParentRunner.run(ParentRunner.java:309) > at org.junit.runner.JUnitCore.run(JUnitCore.java:160) > at org.junit.runner.JUnitCore.run(JUnitCore.java:138) > at org.junit.runner.JUnitCore.run(JUnitCore.java:117) > at org.junit.runner.JUnitCore.runMain(JUnitCore.java:96) > at org.junit.runner.JUnitCore.runMainAndExit(JUnitCore.java:47) > at org.junit.runner.JUnitCore.main(JUnitCore.java:40) > 2) test(org.openoffice.test.UnoApiTest) > java.lang.AssertionError: expected:<0> but was:<134> > at org.junit.Assert.fail(Assert.java:88) > at org.junit.Assert.failNotEquals(Assert.java:743) > at org.junit.Assert.assertEquals(Assert.java:118) > at org.junit.Assert.assertEquals(Assert.java:555) > at org.junit.Assert.assertEquals(Assert.java:542) > at org.openoffice.test.OfficeConnection.tearDown(OfficeConnection.java:151) > at org.openoffice.test.UnoApiTest.tearDown(UnoApiTest.java:34) > at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) > at > sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) > at > sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) > at java.lang.reflect.Method.invoke(Method.java:483) > at > org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:47) > at > org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12) > at >
Re: Fwd: Build Error
On 28/04/14 19:35, Shreyansh Gandhi wrote: > > > looks like that was fixed by commit 00c19e5def4a62445c85786aef6a507bee6c45fa > > so just git pull and try again. > > > Thanks for the advice I did git pull and tried to build again > However, the build was unsuccessful. On running "make check", I got this:- > > There were 2 failures: > 1) test(org.openoffice.test.UnoApiTest) > com.sun.star.lang.DisposedException: java_remote_bridge > com.sun.star.lib.uno.bridges.java_remote.java_remote_bridge@eafc191 is > disposed most likely the test's soffice process crashed; if you enable core files via "ulimit -c unlimited" you should automatically get a gdb backtrace printed if a test crashes. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/subsequent_export-test.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit e34afd43bd6cfeeb90eacf315371cb38d0fc2e28
Author: Tor Lillqvist
Date: Mon Apr 28 22:10:29 2014 +0300
WaE: Unreferenced function definition
Change-Id: Idd0f00f58dda4ec035ff736694d7766a39d15fa1
diff --git a/sc/qa/unit/subsequent_export-test.cxx
b/sc/qa/unit/subsequent_export-test.cxx
index c1ca64d..82edb80 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -100,7 +100,9 @@ public:
void testFunctionsExcel2010( sal_uLong nFormatType );
void testFunctionsExcel2010XLSX();
void testFunctionsExcel2010XLS();
+#if 0
void testFunctionsExcel2010ODS();
+#endif
CPPUNIT_TEST_SUITE(ScExportTest);
CPPUNIT_TEST(test);
@@ -1446,10 +1448,12 @@ void ScExportTest::testFunctionsExcel2010XLS()
testFunctionsExcel2010(XLS);
}
+#if 0
void ScExportTest::testFunctionsExcel2010ODS()
{
testFunctionsExcel2010(ODS);
}
+#endif
ScExportTest::ScExportTest()
: ScBootstrapFixture("/sc/qa/unit/data")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/token.cxx | 45 --
1 file changed, 43 insertions(+), 2 deletions(-)
New commits:
commit 8a421be2b155a24ac673456284652214c72bd645
Author: Kohei Yoshida
Date: Mon Apr 28 15:27:55 2014 -0400
Dump more info from ScTokenArray (for debugging).
Change-Id: I57897c0b3c7f5974f2b9e510f03c91e23e362096
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 8bb53c3..5344454 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -3784,14 +3784,55 @@ void ScTokenArray::WrapReference( const ScAddress&
rPos, SCCOL nMaxCol, SCROW nM
}
#if DEBUG_FORMULA_COMPILER
+
+namespace {
+
+void dumpFormulaToken( const FormulaToken& rToken )
+{
+cout << "-- FormulaToken" << endl;
+cout << " opcode: " << rToken.GetOpCode() << endl;
+cout << " type: " << static_cast(rToken.GetType()) << endl;
+switch (rToken.GetType())
+{
+case svDouble:
+cout << " value: " << rToken.GetDouble() << endl;
+break;
+case svString:
+cout << " string: "
+<< OUStringToOString(rToken.GetString().getString(),
RTL_TEXTENCODING_UTF8).getStr()
+<< endl;
+break;
+default:
+;
+}
+}
+
+}
+
void ScTokenArray::Dump() const
{
+cout << "+++ Normal Tokens +++" << endl;
for (sal_uInt16 i = 0; i < nLen; ++i)
{
-const ScToken* p = dynamic_cast(pCode[i]);
+const FormulaToken* pToken = pCode[i];
+const ScToken* p = dynamic_cast(pToken);
+if (!p)
+{
+dumpFormulaToken(*pToken);
+continue;
+}
+
+p->Dump();
+}
+
+cout << "+++ RPN Tokens +++" << endl;
+for (sal_uInt16 i = 0; i < nRPN; ++i)
+{
+const FormulaToken* pToken = pRPN[i];
+const ScToken* p = dynamic_cast(pToken);
if (!p)
{
-cout << "-- (non ScToken)" << endl;
+dumpFormulaToken(*pToken);
continue;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - filter/source vcl/source
filter/source/graphicfilter/ieps/ieps.cxx |4 ++--
vcl/source/outdev/outdev.cxx |7 +++
2 files changed, 5 insertions(+), 6 deletions(-)
New commits:
commit 2ac155139776f6c3a0cfbd4544c6aafce093
Author: Caolán McNamara
Date: Mon Apr 28 20:47:23 2014 +0100
mem leak in OutDevStackState
regression since cf3c6cb40f99fa1761a6af3d7447a899b9447868
Change-Id: I74900c93a1aee87e7ae0a6fa58905f751a528756
diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx
index 5af2be3..62f31d6 100644
--- a/vcl/source/outdev/outdev.cxx
+++ b/vcl/source/outdev/outdev.cxx
@@ -206,6 +206,7 @@ OutputDevice::~OutputDevice()
mpOutDevStateStack->pop_back();
}
}
+delete mpOutDevStateStack;
// release the active font instance
if( mpFontEntry )
@@ -213,11 +214,9 @@ OutputDevice::~OutputDevice()
// remove cached results of GetDevFontList/GetDevSizeList
// TODO: use smart pointers for them
-if( mpGetDevFontList )
-delete mpGetDevFontList;
+delete mpGetDevFontList;
-if( mpGetDevSizeList )
-delete mpGetDevSizeList;
+delete mpGetDevSizeList;
// release ImplFontCache specific to this OutputDevice
// TODO: refcount ImplFontCache
commit 4d88c6dee6d57fa9c366b67624842aefa429f527
Author: Caolán McNamara
Date: Mon Apr 28 20:45:19 2014 +0100
Related: fdo#64161 pstoedit not writing file until its closed
there's more to this than that, but at least its consistent this way and not
differing per person. Its a bit unfortunate that pstoedit can't render the
text
in this example either though.
Change-Id: I6f6bb7f83ed23dfc0f6b5c5f2b00753fa7190a8d
diff --git a/filter/source/graphicfilter/ieps/ieps.cxx
b/filter/source/graphicfilter/ieps/ieps.cxx
index 1a436cd..ddabb5f 100644
--- a/filter/source/graphicfilter/ieps/ieps.cxx
+++ b/filter/source/graphicfilter/ieps/ieps.cxx
@@ -235,14 +235,14 @@ static bool RenderAsEMF(const sal_uInt8* pBuf, sal_uInt32
nBytesRead, Graphic &r
osl_closeFile(pOut);
}
if (pErr) osl_closeFile(pErr);
+osl_joinProcess(aProcess);
+osl_freeProcessHandle(aProcess);
if (nCount == nBytesRead && bEMFSupported)
{
SvFileStream aFile(output, STREAM_READ);
if (GraphicConverter::Import(aFile, rGraphic, CVT_EMF) == ERRCODE_NONE)
bRet = true;
}
-osl_joinProcess(aProcess);
-osl_freeProcessHandle(aProcess);
return bRet;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: slideshow/source
slideshow/source/engine/shapes/viewmediashape.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit e081294aaf020f118c4e2e3f629ccc0d31762b2b
Author: Tor Lillqvist
Date: Mon Apr 28 22:21:01 2014 +0300
WaE: unused parameter 'rMimeType'
Change-Id: I3f755240322d23aa2ccb757607399544aa1fa0c4
diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx
b/slideshow/source/engine/shapes/viewmediashape.cxx
index bbf1703..da44d93 100644
--- a/slideshow/source/engine/shapes/viewmediashape.cxx
+++ b/slideshow/source/engine/shapes/viewmediashape.cxx
@@ -416,6 +416,7 @@ namespace slideshow
{
#if !HAVE_FEATURE_AVMEDIA
(void) rMediaURL;
+(void) rMimeType;
#else
if( !mxPlayer.is() )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 5a/e7fba33ee7095620aca753e9488f1cd9cd41f2
5a/e7fba33ee7095620aca753e9488f1cd9cd41f2 |1 + 1 file changed, 1 insertion(+) New commits: commit 833721fd1d822980eec53b3d8916103560aad7a3 Author: Caolán McNamara Date: Mon Apr 28 20:57:03 2014 +0100 Notes added by 'git notes add' diff --git a/5a/e7fba33ee7095620aca753e9488f1cd9cd41f2 b/5a/e7fba33ee7095620aca753e9488f1cd9cd41f2 new file mode 100644 index 000..e839218 --- /dev/null +++ b/5a/e7fba33ee7095620aca753e9488f1cd9cd41f2 @@ -0,0 +1 @@ +prefer: 986644335c3f9e99ec3c6bebc0b75cca0acdf79b ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/inc sc/source unusedcode.easy
sc/inc/formulacell.hxx |1
sc/source/core/data/formulacell.cxx | 41
unusedcode.easy |1
3 files changed, 43 deletions(-)
New commits:
commit 531f283b3d80b8bffeb1ac39a4656e27511fdaff
Author: Julien Nabet
Date: Mon Apr 28 22:46:59 2014 +0200
unusedcode.easy: remove SwapWithinGroup
Cleanup after 3f41b12c6685b82b5c2674bd9b9d5991adebeaf9 "SwapRow() is no
more!"
Change-Id: If0e76e442bcee37c3136665e598038ab19a436bb
diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index 71389ea..91a3625 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -209,7 +209,6 @@ public:
voidSetDirtyAfterLoad();
void ResetTableOpDirtyVar();
voidSetTableOpDirty();
-boolSwapWithinGroup( ScFormulaCell *pSwap );
boolIsDirtyOrInTableOpDirty() const;
bool GetDirty() const;
void ResetDirty();
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index 45ff164..aa52450 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -2020,47 +2020,6 @@ bool ScFormulaCell::IsDirtyOrInTableOpDirty() const
return bDirty || (bTableOpDirty && pDocument->IsInInterpreterTableOp());
}
-/** Exchange formulae cell result data inside a formula
-group if possible. Return true if both Formula cells
-are inside the same formula group and the data has
-been successfully exchanged; otherwise false - leaving
-the formulae untouched.
- */
-bool ScFormulaCell::SwapWithinGroup( ScFormulaCell *pSwap )
-{
-if (!mxGroup || // ungrouped
- mxGroup != pSwap->mxGroup)
-return false;
-
-if (pDocument != pSwap->pDocument ||
-nSeenInIteration != pSwap->nSeenInIteration ||
-eTempGrammar != pSwap->eTempGrammar ||
-cMatrixFlag != pSwap->cMatrixFlag ||
-nFormatType != pSwap->nFormatType ||
-bDirty != pSwap->bDirty ||
-bChanged != pSwap->bChanged ||
-bRunning != pSwap->bRunning ||
-bCompile != pSwap->bCompile ||
-bSubTotal != pSwap->bSubTotal ||
-bIsIterCell != pSwap->bIsIterCell ||
-bInChangeTrack != pSwap->bInChangeTrack ||
-bTableOpDirty != pSwap->bTableOpDirty ||
-bNeedListening != pSwap->bNeedListening ||
-mbNeedsNumberFormat != pSwap->mbNeedsNumberFormat ||
-mbPostponedDirty != pSwap->mbPostponedDirty
-)
-return false; // we are paranoid for good reason.
-
-// retain aPos as is.
-
-// swap result value
-ScFormulaResult aTemp(aResult);
-aResult = pSwap->aResult;
-pSwap->aResult.Assign(aTemp);
-
-return true;
-}
-
void ScFormulaCell::SetResultDouble( double n )
{
aResult.SetDouble(n);
diff --git a/unusedcode.easy b/unusedcode.easy
index 4ba0403..4f5c4c2 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -41,7 +41,6 @@ ScBitMaskCompressedArray::GetFirstForCondition(int, int, uns
ScDocument::CreateFormatTable() const
ScDocument::GetRowFlagsArray(short) const
ScExtIButton::GetSelected() const
-ScFormulaCell::SwapWithinGroup(ScFormulaCell*)
ScFormulaCellGroup::scheduleCompilation()
ScTable::GetCellTextAttr(short, int) const
ScTable::TransferCellValuesFrom(short, int, sc::CellValues&)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/rtftok/rtfreferencetable.cxx |6 ++-
writerfilter/source/rtftok/rtfreferencetable.hxx | 36 ---
2 files changed, 23 insertions(+), 19 deletions(-)
New commits:
commit c21e35272038aff8e7db5713ee36a496a91e73c7
Author: Miklos Vajna
Date: Mon Apr 28 22:30:41 2014 +0200
writerfilter: fix indentation in rtfreferencetable
Change-Id: Ia3a05af7a77eaa8e965a7557456adfcc26966fb1
diff --git a/writerfilter/source/rtftok/rtfreferencetable.cxx
b/writerfilter/source/rtftok/rtfreferencetable.cxx
index eda6cb8..7d4cefd 100644
--- a/writerfilter/source/rtftok/rtfreferencetable.cxx
+++ b/writerfilter/source/rtftok/rtfreferencetable.cxx
@@ -9,8 +9,10 @@
#include
-namespace writerfilter {
-namespace rtftok {
+namespace writerfilter
+{
+namespace rtftok
+{
RTFReferenceTable::RTFReferenceTable(Entries_t const& rEntries)
: m_aEntries(rEntries)
diff --git a/writerfilter/source/rtftok/rtfreferencetable.hxx
b/writerfilter/source/rtftok/rtfreferencetable.hxx
index 612eb03..feb7848 100644
--- a/writerfilter/source/rtftok/rtfreferencetable.hxx
+++ b/writerfilter/source/rtftok/rtfreferencetable.hxx
@@ -13,23 +13,25 @@
#include
#include
-namespace writerfilter {
-namespace rtftok {
-/// Sends tables (e.g. font table) to the domain mapper.
-class RTFReferenceTable
-: public writerfilter::Reference
-{
-public:
-typedef std::map::Pointer_t> Entries_t;
-typedef std::pair::Pointer_t> Entry_t;
-RTFReferenceTable(Entries_t const& rEntries);
-virtual ~RTFReferenceTable();
-virtual void resolve(Table & rHandler) SAL_OVERRIDE;
-virtual std::string getType() const SAL_OVERRIDE;
-private:
-Entries_t m_aEntries;
-};
-} // namespace rtftok
+namespace writerfilter
+{
+namespace rtftok
+{
+/// Sends tables (e.g. font table) to the domain mapper.
+class RTFReferenceTable
+: public writerfilter::Reference
+{
+public:
+typedef std::map::Pointer_t>
Entries_t;
+typedef std::pair::Pointer_t>
Entry_t;
+RTFReferenceTable(Entries_t const& rEntries);
+virtual ~RTFReferenceTable();
+virtual void resolve(Table& rHandler) SAL_OVERRIDE;
+virtual std::string getType() const SAL_OVERRIDE;
+private:
+Entries_t m_aEntries;
+};
+} // namespace rtftok
} // namespace writerfilter
#endif // INCLUDED_WRITERFILTER_SOURCE_RTFTOK_RTFREFERENCETABLE_HXX
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: More --disable-database-connectivity work
On 28/04/14 17:41, Tor Lillqvist wrote:
> RepositoryModule_host.mk |2
> solenv/bin/native-code.py |1
> sw/source/core/doc/doc.cxx|6 ++
> sw/source/core/doc/docfld.cxx | 76
> ++
> sw/source/core/uibase/uno/unofreg.cxx |4 +
> sw/source/core/unocore/unofield.cxx |5 ++
> 6 files changed, 75 insertions(+), 19 deletions(-)
>
> New commits:
> commit d2f9e1a165314ad9e8588b1d44b3ff0a455ef7f6
> Author: Tor Lillqvist
> Date: Mon Apr 28 18:01:11 2014 +0300
>
> More --disable-database-connectivity work
>
> Bypass various database field and mail-merge functionality in the case
> of !HAVE_FEATURE_DBCONNECTIVITY.
>
> Now TiledLibreOffice builds and runs.
>
> @@ -1252,7 +1280,11 @@ void SwDoc::UpdateExpFlds( SwTxtFld* pUpdtFld, bool
> bUpdRefFlds )
> const SwFieldType* pFldType;
> // process separately:
> for( n = mpFldTypes->size(); n; )
> -switch( ( pFldType = (*mpFldTypes)[ --n ] )->Which() )
> +{
> +if( !(*mpFldTypes)[--n] )
> +continue;
these null checks all over the place are quite ugly addition.
> @@ -1596,7 +1629,11 @@ void SwDoc::_InitFieldTypes() // is being called
> by the CTOR
> mpFldTypes->push_back( new SwPageNumberFieldType );
> mpFldTypes->push_back( new SwAuthorFieldType );
> mpFldTypes->push_back( new SwFileNameFieldType(this) );
> +#if HAVE_FEATURE_DBCONNECTIVITY
> mpFldTypes->push_back( new SwDBNameFieldType(this) );
> +#else
> +mpFldTypes->push_back( NULL );
> +#endif
with this change i guess it won't be possible to round-trip an ODF file
that contains such fields through your mobile apps losslessly, since
these fields can't be created - is that really what you want?
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source
sc/source/core/tool/scmatrix.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 473e10aa5e1e3c6a4854dec9ff2ea522be283799
Author: Kohei Yoshida
Date: Mon Apr 28 11:55:23 2014 -0400
fdo#75397: Return an empty string for empty element.
This is the behavior as of 3.6. It had changed in 4.0 and onward by
accident, and caused the bug as reported in fdo#75397.
Change-Id: Id96fea354604b3c13cbbf2d9a73223b7725c7d66
(cherry picked from commit 5fab47ddbe332a150fb2005e941a2c19bd38ce7f)
Reviewed-on: https://gerrit.libreoffice.org/9187
Tested-by: Markus Mohrhard
Reviewed-by: Markus Mohrhard
diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index 215bb76..f48de85 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -580,7 +580,7 @@ svl::SharedString ScMatrixImpl::GetString(
SvNumberFormatter& rFormatter, SCSIZE
{
if (!maMatFlag.get(nR, nC))
// not an empty path.
-break;
+return svl::SharedString::getEmptyString();
// result of empty FALSE jump path
sal_uLong nKey = rFormatter.GetStandardFormat(
NUMBERFORMAT_LOGICAL,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source
sc/source/core/tool/scmatrix.cxx | 12 ++-- 1 file changed, 10 insertions(+), 2 deletions(-) New commits: commit bfc8a79c957dd65dc7e42c47c4fc6de61443fa29 Author: Kohei Yoshida Date: Mon Apr 28 13:33:08 2014 -0400 fdo#77969: Return 0 in case of matrix consisting of all empty elements. Change-Id: I225d50445d7f84a17c0b9492c17247e4c1c9ef44 (cherry picked from commit 453ea919e70fa9832f11e3ef042bb80cd86892cc) Reviewed-on: https://gerrit.libreoffice.org/9189 Tested-by: Markus Mohrhard Reviewed-by: Markus Mohrhard diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx index f48de85..3b2c42c 100644 --- a/sc/source/core/tool/scmatrix.cxx +++ b/sc/source/core/tool/scmatrix.cxx @@ -1236,12 +1236,14 @@ class CalcMaxMinValue : std::unary_functionhttp://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - svx/source
svx/source/svdraw/svdedtv2.cxx |6 ++ 1 file changed, 6 insertions(+) New commits: commit b6189665e0143d68cf2fe225eca77bcf0454a107 Author: Armin Le Grand Date: Mon Apr 28 16:57:14 2014 + i124760 ensure that only the created object is selected diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx index 89e4d26..212e84e 100644 --- a/svx/source/svdraw/svdedtv2.cxx +++ b/svx/source/svdraw/svdedtv2.cxx @@ -1164,6 +1164,12 @@ void SdrEditView::MergeMarkedObjects(SdrMergeMode eMode) pInsOL->InsertObject(pPath, nInsPos, &aReason); if( bUndo ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pPath)); + +// #124760# To have a correct selection with only the new object it is necessary to +// unmark all objects first. If not doing so, there may remain invalid pointers to objects +//:Not needed for aw080 (!) +UnmarkAllObj(pInsPV); + MarkObj(pPath, pInsPV, sal_False, sal_True); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/source
chart2/source/view/main/GL3DRenderer.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit b6086aa6b6107421e1267ad7a50a74aa05770041
Author: Markus Mohrhard
Date: Tue Apr 29 02:26:15 2014 +0200
disable until I can test build on windows myself
diff --git a/chart2/source/view/main/GL3DRenderer.cxx
b/chart2/source/view/main/GL3DRenderer.cxx
index 834cb85..1884dab 100644
--- a/chart2/source/view/main/GL3DRenderer.cxx
+++ b/chart2/source/view/main/GL3DRenderer.cxx
@@ -543,7 +543,7 @@ int
OpenGL3DRenderer::GenerateRoundCornerBar(vector &vertices, vector
void OpenGL3DRenderer::GetFreq()
{
-#if defined( _WIN32 )
+#if 0
LARGE_INTEGER litmpold;
QueryPerformanceFrequency(&litmpold);
m_dFreq= litmpold.QuadPart;
@@ -552,7 +552,7 @@ void OpenGL3DRenderer::GetFreq()
double OpenGL3DRenderer::GetTime()
{
-#if defined( _WIN32 )
+#if 0
LARGE_INTEGER litmpold;
QueryPerformanceCounter(&litmpold);
return litmpold.QuadPart*100 / m_dFreq;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sc/source
sc/source/core/tool/scmatrix.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a226019bb5431ca04cae28fefb6b83e2bb738243
Author: Kohei Yoshida
Date: Mon Apr 28 11:55:23 2014 -0400
fdo#75397: Return an empty string for empty element.
This is the behavior as of 3.6. It had changed in 4.0 and onward by
accident, and caused the bug as reported in fdo#75397.
(cherry picked from commit 5fab47ddbe332a150fb2005e941a2c19bd38ce7f)
Change-Id: Id96fea354604b3c13cbbf2d9a73223b7725c7d66
Reviewed-on: https://gerrit.libreoffice.org/9188
Tested-by: Markus Mohrhard
Reviewed-by: Markus Mohrhard
diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index 933e808..66e43d8 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -677,7 +677,7 @@ OUString ScMatrixImpl::GetString( SvNumberFormatter&
rFormatter, SCSIZE nC, SCSI
{
if (!maMatFlag.get(nR, nC))
// not an empty path.
-break;
+return EMPTY_OUSTRING;
// result of empty FALSE jump path
sal_uLong nKey = rFormatter.GetStandardFormat(
NUMBERFORMAT_LOGICAL,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dev-tools.git: scripts/esc-bug-stats.pl
scripts/esc-bug-stats.pl | 17 +
1 file changed, 13 insertions(+), 4 deletions(-)
New commits:
commit cb66ccec290602a1bdd7e29444b98b6276fbf92c
Author: Michael Stahl
Date: Fri Apr 25 18:29:06 2014 +0200
esc-bug-stats: add all components containing LO code
These comprise ~30% of open regression bugs.
Change-Id: I11818a51edf17c923e28edd1a144ab78abd69be4
Reviewed-on: https://gerrit.libreoffice.org/9165
Reviewed-by: Michael Meeks
Tested-by: Michael Meeks
diff --git a/scripts/esc-bug-stats.pl b/scripts/esc-bug-stats.pl
index 487bf1b..2be4240 100755
--- a/scripts/esc-bug-stats.pl
+++ b/scripts/esc-bug-stats.pl
@@ -1,5 +1,7 @@
#!/usr/bin/perl -w
+use URI::Escape qw(uri_escape);
+
# Please take the time to check that the script still runs
# before changing this to something else.
my $bugserver = "bugs.freedesktop.org";
@@ -117,7 +119,10 @@ sub get_query($)
if ($line =~ m/(\d+) bugs found./) {
$bug_count = $1;
last;
- }
+} else { if ($line =~ m/One bug found./) {
+ $bug_count = 1;
+ last;
+ } }
}
return $bug_count;
}
@@ -253,9 +258,10 @@ $component_count{'Migration'} =
get_deps("https://$bugserver/showdependencytree.
$component_count{'Crashes'} =
get_query("https://$bugserver/buglist.cgi?keywords=regression&keywords_type=allwords&list_id=296015&short_desc=crash&query_based_on=CrashRegressions&query_format=advanced&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&short_desc_type=allwordssubstr&product=LibreOffice&known_name=CrashRegressions";);
$component_count{'Borders'} =
get_query("https://$bugserver/buglist.cgi?keywords=regression&keywords_type=allwords&list_id=296016&short_desc=border&query_based_on=BorderRegressions&query_format=advanced&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&short_desc_type=allwordssubstr&product=LibreOffice&known_name=BorderRegressions";);
-my @reg_toquery = ( 'Spreadsheet', 'Presentation', 'Database', 'Drawing',
'Libreoffice', 'Writer', 'BASIC' );
+my @reg_toquery = ( 'Spreadsheet', 'Presentation', 'Database', 'Drawing',
'Libreoffice', 'Writer', 'BASIC', 'Chart', 'Extensions', 'Formula Editor',
'Impress Remote', 'Installation', 'Linguistic', 'Printing and PDF export',
'UI', 'filters and storage', 'framework', 'graphics stack', 'sdk' );
for my $component (@reg_toquery) {
-$component_count{$component} =
get_query("https://$bugserver/buglist.cgi?keywords=regression&keywords_type=allwords&list_id=296025&query_format=advanced&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&bug_status=PLEASETEST&component=$component&product=LibreOffice";);
+$component_uri = uri_escape($component);
+$component_count{$component} =
get_query("https://$bugserver/buglist.cgi?keywords=regression&keywords_type=allwords&list_id=296025&query_format=advanced&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&bug_status=PLEASETEST&component=$component_uri&product=LibreOffice";);
}
print STDERR "\t* ~Component count net *\n";
@@ -437,7 +443,10 @@ EOF
my @output_order = ( 'Spreadsheet', 'Presentation', 'Database', 'Drawing',
'Libreoffice', 'Borders', 'Crashes', 'BASIC', 'Writer/RTF',
-'Writer', 'Migration' );
+'Writer', 'Migration',
+ 'Chart', 'Extensions', 'Formula Editor', 'Impress Remote',
+ 'Installation', 'Linguistic', 'Printing and PDF export', 'UI',
+ 'filters and storage', 'framework', 'graphics stack', 'sdk' );
for my $foo (@output_order) {
print << "EOF"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source
sc/source/core/data/colorscale.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c624eea0e46e84c68d1a1ad79ef217390bd28ef3 Author: Markus Mohrhard Date: Tue Apr 29 00:48:07 2014 +0200 the safety check was a bit too strict, fdo#77984 Change-Id: Idfc3b3dd1d9f4de428e43c515b13a8d7e40e347c (cherry picked from commit f1d5c27892b0b6a5dc81c94dbf61f9285a52aa5a) Signed-off-by: Kohei Yoshida diff --git a/sc/source/core/data/colorscale.cxx b/sc/source/core/data/colorscale.cxx index 29d53b7..e186220 100644 --- a/sc/source/core/data/colorscale.cxx +++ b/sc/source/core/data/colorscale.cxx @@ -996,7 +996,7 @@ ScIconSetInfo* ScIconSetFormat::GetIconSetInfo(const ScAddress& rAddr) const double nMax = GetMaxValue(); // this check is for safety -if(nMin >= nMax) +if(nMin > nMax) return NULL; sal_Int32 nIndex = 0; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Ultimas Horas Para Aproveitar a Quinzena do Sutiã
Title: GISELE BÜNDCHEN Intimates | Respeitamos sua privacidade, caso não deseje mais receber nossas mensagens acesse este link Gisele trabalhou muitos anos com lingeries e quando, em 2011, surgiu a oportunidade de ter uma marca própria, achou que poderia ser divertido, foi então que lançou a Gisele Bündchen Intimates: uma lingerie sexy, mas sofisticada. Gisele é a responsável pela direção criativa e faz questão de provar cada um dos modelos exclusivos de sua marca: “quando penso na minha coleção, imagino lingeries sensuais e com muita classe. Procuro ter peças variadas, que podem ser usadas no dia a dia e também em ocasiões mais especiais.”, afirma. Gisele acredita que a lingerie pode ser usada de diversas maneiras, seja de forma descontraída na composição de um look ou até para criar um clima, segundo ela, “uma lingerie pode dizer muito sobre você e suas intenções. Espero que as mulheres gostem”. As coleções seguem as principais tendências de moda e tecnologia, aliadas à sensualidade e sofisticações das rendas e tecidos com sedas, cetins e microfibras levíssimas, sempre com muita inspiração e modernidade. Acesse nosso site e aproveite a quinzena do sutiã, descontos de até 20% e frete grátis para compras acima de R$200,00. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 3 commits - sc/inc sc/qa sc/source
sc/inc/document.hxx |4 +--
sc/qa/unit/ucalc.hxx |2 +
sc/qa/unit/ucalc_formula.cxx | 43 ++-
sc/source/core/data/documen2.cxx | 10 +
sc/source/core/tool/token.cxx|2 -
5 files changed, 57 insertions(+), 4 deletions(-)
New commits:
commit c3e40f47abe3da7e24059281a9047b1292241398
Author: Kohei Yoshida
Date: Mon Apr 28 22:57:56 2014 -0400
fdo#77647: Expand reference only when the top of the selected range is...
below the top of the reference range.
Change-Id: Ibb3dadb50dd076ae05033b046c9506c60605f713
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 5344454..016ff79 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -2562,7 +2562,7 @@ bool expandRange( const sc::RefUpdateContext& rCxt,
ScRange& rRefRange, const Sc
// Selected range is only partially overlapping in horizontal
direction. Bail out.
return false;
-if (!rCxt.mrDoc.IsExpandRefs() && rSelectedRange.aStart.Row() ==
rRefRange.aStart.Row())
+if (!rCxt.mrDoc.IsExpandRefs() && rSelectedRange.aStart.Row() <=
rRefRange.aStart.Row())
// Selected range is at the top end and the edge expansion is
turned off. No expansion.
return false;
commit ce0228af2da5cea2accb91c3ca770cbe01005bab
Author: Kohei Yoshida
Date: Mon Apr 28 22:56:09 2014 -0400
Make these non inline.
Change-Id: Icfed6fa13a04eb9b2006296421d52c566635ac33
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index f16b292..f86bdda 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1956,8 +1956,8 @@ public:
return *pRecursionHelper;
}
boolIsInDtorClear() const { return bInDtorClear; }
-voidSetExpandRefs( bool bVal ) { bExpandRefs = bVal; }
-boolIsExpandRefs() { return bExpandRefs; }
+void SetExpandRefs( bool bVal );
+bool IsExpandRefs() const;
sal_uLong GetXMLImportedFormulaCount() const { return
nXMLImportedFormulaCount; }
voidIncXMLImportedFormulaCount( sal_uLong nVal )
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index 20b38f6..28f3ca7 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -364,6 +364,16 @@ IMPL_LINK_NOARG(ScDocument, TrackTimeHdl)
return 0;
}
+void ScDocument::SetExpandRefs( bool bVal )
+{
+bExpandRefs = bVal;
+}
+
+bool ScDocument::IsExpandRefs() const
+{
+return bExpandRefs;
+}
+
void ScDocument::StartTrackTimer()
{
if (!aTrackTimer.IsActive())// nicht ewig aufschieben
commit e4a886f657723040ba10a0ce0101f14763f5605a
Author: Kohei Yoshida
Date: Mon Apr 28 20:52:29 2014 -0400
fdo#77647: Write test for this.
Change-Id: I25b04c4790fcdae1e85b5d7b9cb85792226af757
diff --git a/sc/qa/unit/ucalc.hxx b/sc/qa/unit/ucalc.hxx
index 9a81c5e..06bab38 100644
--- a/sc/qa/unit/ucalc.hxx
+++ b/sc/qa/unit/ucalc.hxx
@@ -118,6 +118,7 @@ public:
void testFormulaRefUpdate();
void testFormulaRefUpdateRange();
void testFormulaRefUpdateSheets();
+void testFormulaRefUpdateInsertRows();
void testFormulaRefUpdateMove();
void testFormulaRefUpdateMoveUndo();
void testFormulaRefUpdateNamedExpression();
@@ -370,6 +371,7 @@ public:
CPPUNIT_TEST(testFormulaRefUpdate);
CPPUNIT_TEST(testFormulaRefUpdateRange);
CPPUNIT_TEST(testFormulaRefUpdateSheets);
+CPPUNIT_TEST(testFormulaRefUpdateInsertRows);
CPPUNIT_TEST(testFormulaRefUpdateMove);
CPPUNIT_TEST(testFormulaRefUpdateMoveUndo);
CPPUNIT_TEST(testFormulaRefUpdateNamedExpression);
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index 1ecc5d2..937c96e 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -1477,6 +1477,43 @@ void Test::testFormulaRefUpdateSheets()
m_pDoc->DeleteTab(0);
}
+void Test::testFormulaRefUpdateInsertRows()
+{
+ScModule* pMod = SC_MOD();
+ScInputOptions aOpt = pMod->GetInputOptions();
+aOpt.SetExpandRefs(false);
+pMod->SetInputOptions(aOpt);
+
+sc::AutoCalcSwitch aACSwitch(*m_pDoc, true); // turn auto calc on.
+m_pDoc->InsertTab(0, "Formula");
+
+// Insert raw values in B2:B4.
+m_pDoc->SetValue(ScAddress(1,1,0), 1.0);
+m_pDoc->SetValue(ScAddress(1,2,0), 2.0);
+m_pDoc->SetValue(ScAddress(1,3,0), 3.0);
+
+// Insert a formula in B5 to sum up B2:B4.
+m_pDoc->SetString(ScAddress(1,4,0), "=SUM(B2:B4)");
+
+CPPUNIT_ASSERT_EQUAL(6.0, m_pDoc->GetValue(ScAddress(1,4,0)));
+
+// Insert rows over rows 1:2.
+ScMarkData aMark;
+aMark.SelectOneTable(0);
+ScDocFunc& rFunc = getDocShell().GetDocFunc();
+rFunc.InsertCells(ScRange(0,0,0,MAXCOL,1,0), &aMark, INS_INSROWS, false,
true, false);
Re: More --disable-database-connectivity work
> with this change i guess it won't be possible to round-trip an ODF file > that contains such fields through your mobile apps losslessly, since > these fields can't be created Ah, good point! I guess the same holds for .doc (and .docx)? --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/core/doc/doc.cxx|6 --
sw/source/core/doc/docfld.cxx | 76 +++---
sw/source/core/uibase/uno/unofreg.cxx |4 -
sw/source/core/unocore/unofield.cxx |5 --
4 files changed, 17 insertions(+), 74 deletions(-)
New commits:
commit aed63550d90a3ad71ac464d2d975539e89ff14cd
Author: Tor Lillqvist
Date: Tue Apr 29 07:06:31 2014 +0300
Revert "More --disable-database-connectivity work"
Nah, this was not a good idea. We do need to keep the db related
fields around in some way for document roundtripping. Need to do
database functionality disabling at a different level. If at all, I am
starting to lose trust that it can meaningfully and cleanly be done.
This reverts commit d2f9e1a165314ad9e8588b1d44b3ff0a455ef7f6.
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 6b338c1..623a546 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include
-
#include
#include
#include
@@ -320,9 +318,7 @@ void SwDoc::ChgDBData(const SwDBData& rNewData)
maDBData = rNewData;
SetModified();
}
-#if HAVE_FEATURE_DBCONNECTIVITY
GetSysFldType(RES_DBNAMEFLD)->UpdateFlds();
-#endif
}
bool SwDoc::SplitNode( const SwPosition &rPos, bool bChkTableStart )
@@ -690,7 +686,7 @@ SwFlyFrmFmt* SwDoc::InsertOLE(const SwPaM &rRg, const
OUString& rObjName,
SwFieldType *SwDoc::GetSysFldType( const sal_uInt16 eWhich ) const
{
for( sal_uInt16 i = 0; i < INIT_FLDTYPES; ++i )
-if( (*mpFldTypes)[i] && eWhich == (*mpFldTypes)[i]->Which() )
+if( eWhich == (*mpFldTypes)[i]->Which() )
return (*mpFldTypes)[i];
return 0;
}
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index 6468d26..fafb713 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -95,8 +95,7 @@ SwFieldType* SwDoc::InsertFldType(const SwFieldType &rFldTyp)
const ::utl::TransliterationWrapper& rSCmp = GetAppCmpStrIgnore();
OUString sFldNm( rFldTyp.GetName() );
for( ; i < nSize; ++i )
-if( (*mpFldTypes)[i] &&
-nFldWhich == (*mpFldTypes)[i]->Which() &&
+if( nFldWhich == (*mpFldTypes)[i]->Which() &&
rSCmp.isEqual( sFldNm, (*mpFldTypes)[i]->GetName() ))
return (*mpFldTypes)[i];
}
@@ -104,15 +103,13 @@ SwFieldType* SwDoc::InsertFldType(const SwFieldType
&rFldTyp)
case RES_AUTHORITY:
for( ; i < nSize; ++i )
-if( (*mpFldTypes)[i] &&
-nFldWhich == (*mpFldTypes)[i]->Which() )
+if( nFldWhich == (*mpFldTypes)[i]->Which() )
return (*mpFldTypes)[i];
break;
default:
for( i = 0; i < nSize; ++i )
-if( (*mpFldTypes)[i] &&
-nFldWhich == (*mpFldTypes)[i]->Which() )
+if( nFldWhich == (*mpFldTypes)[i]->Which() )
return (*mpFldTypes)[i];
}
@@ -167,8 +164,7 @@ void SwDoc::InsDeletedFldType( SwFieldType& rFldTyp )
SwFieldType* pFnd;
for( ; i < nSize; ++i )
-if( (*mpFldTypes)[i] &&
-nFldWhich == (pFnd = (*mpFldTypes)[i])->Which() &&
+if( nFldWhich == (pFnd = (*mpFldTypes)[i])->Which() &&
rSCmp.isEqual( rFldNm, pFnd->GetName() ) )
{
// find new name
@@ -176,8 +172,7 @@ void SwDoc::InsDeletedFldType( SwFieldType& rFldTyp )
do {
OUString sSrch = rFldNm + OUString::number( nNum );
for( i = INIT_FLDTYPES; i < nSize; ++i )
-if( (*mpFldTypes)[i] &&
-nFldWhich == (pFnd = (*mpFldTypes)[i])->Which() &&
+if( nFldWhich == (pFnd = (*mpFldTypes)[i])->Which() &&
rSCmp.isEqual( sSrch, pFnd->GetName() ) )
break;
@@ -215,7 +210,7 @@ void SwDoc::RemoveFldType(sal_uInt16 nFld)
* Dependent fields present -> ErrRaise
*/
sal_uInt16 nSize = mpFldTypes->size();
-if(nFld < nSize && (*mpFldTypes)[nFld])
+if(nFld < nSize)
{
SwFieldType* pTmp = (*mpFldTypes)[nFld];
@@ -288,9 +283,6 @@ SwFieldType* SwDoc::GetFldType(
SwFieldType* pRet = 0;
for( ; i < nSize; ++i )
{
-if( !(*mpFldTypes)[i] )
-continue;
-
SwFieldType* pFldType = (*mpFldTypes)[i];
OUString aFldName( pFldType->GetName() );
@@ -315,9 +307,6 @@ void SwDoc::UpdateFlds( SfxPoolItem *pNewHt, bool bCloseDB )
for( sal_uInt16 i=0; i < mpFldTypes->size(); ++i)
{
-if( !(*mpFldTypes)[i] )
-continue;
-
switch( (*mpFldTypes)[i]->Which() )
{
// Update table fields second to last
@@ -375,15 +364,13 @@ void SwDoc::UpdateUsrFlds()
SwCalc*
[Libreoffice-commits] core.git: chart2/source
chart2/source/view/main/GL3DRenderer.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b8ec9371ad27352aa0d4abac7237f2ef54ee87c9
Author: Tor Lillqvist
Date: Tue Apr 29 07:57:35 2014 +0300
WaE: array index 2 is past the end of the array (which contains 2 elements)
I assume index 1 was intended here.
Change-Id: Ib360b4d37bc342adadc11186810db77ceee91d4e
diff --git a/chart2/source/view/main/GL3DRenderer.cxx
b/chart2/source/view/main/GL3DRenderer.cxx
index 1884dab..a17c79c 100644
--- a/chart2/source/view/main/GL3DRenderer.cxx
+++ b/chart2/source/view/main/GL3DRenderer.cxx
@@ -1262,7 +1262,7 @@ int OpenGL3DRenderer::GetIndexByColor(int r, int g, int b)
int OpenGL3DRenderer::ProcessPickingBox()
{
glViewport(0, 0, m_iWidth, m_iHeight);
-glBindFramebuffer(GL_FRAMEBUFFER, m_FboID[2]);
+glBindFramebuffer(GL_FRAMEBUFFER, m_FboID[1]);
glClearDepth(1.0f);
glClearColor(1.0, 1.0, 1.0, 1.0);
if(ProcessExtrude3DPickingBox() == 1)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/source
chart2/source/view/main/GL3DRenderer.cxx | 36 +--
1 file changed, 34 insertions(+), 2 deletions(-)
New commits:
commit 79f7c05d9e7de5b6a695363491a56e56e628d09b
Author: Tor Lillqvist
Date: Tue Apr 29 08:14:59 2014 +0300
glu is not available on OpenGL ES
Change-Id: If0a60c2b88953540aebf46e53f5488456c2d1e06
diff --git a/chart2/source/view/main/GL3DRenderer.cxx
b/chart2/source/view/main/GL3DRenderer.cxx
index a17c79c..3807ede 100644
--- a/chart2/source/view/main/GL3DRenderer.cxx
+++ b/chart2/source/view/main/GL3DRenderer.cxx
@@ -42,6 +42,38 @@ struct TextInfo
float nDy;
};
+static const char* errorString(GLenum errorCode)
+{
+static const struct {
+GLenum code;
+const char *string;
+} errors[]=
+{
+/* GL */
+{GL_NO_ERROR, "no error"},
+{GL_INVALID_ENUM, "invalid enumerant"},
+{GL_INVALID_VALUE, "invalid value"},
+{GL_INVALID_OPERATION, "invalid operation"},
+{GL_STACK_OVERFLOW, "stack overflow"},
+{GL_STACK_UNDERFLOW, "stack underflow"},
+{GL_OUT_OF_MEMORY, "out of memory"},
+
+{0, NULL }
+};
+
+int i;
+
+for (i=0; errors[i].string; i++)
+{
+if (errors[i].code == errorCode)
+{
+return errors[i].string;
+}
+ }
+
+return NULL;
+}
+
int static checkGLError(const char *file, int line)
{
GLenum glErr;
@@ -49,10 +81,10 @@ int static checkGLError(const char *file, int line)
glErr = glGetError();
while (glErr != GL_NO_ERROR)
{
-const GLubyte* sError = gluErrorString(glErr);
+const char* sError = errorString(glErr);
if (sError)
-SAL_WARN("chart2.opengl", "GL Error #" << glErr << "(" <<
gluErrorString(glErr) << ") " << " in File " << file << " at line: " << line);
+SAL_WARN("chart2.opengl", "GL Error #" << glErr << "(" << sError
<< ") " << " in File " << file << " at line: " << line);
else
SAL_WARN("chart2.opengl", "GL Error #" << glErr << " (no message
available)" << " in File " << file << " at line: " << line);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - chart2/Module_chart2.mk chart2/source include/vcl Repository.mk vcl/source
Repository.mk|2 -
chart2/Module_chart2.mk |6 +
chart2/source/view/main/GL3DRenderer.cxx | 34 ---
chart2/source/view/main/OpenGLRender.cxx |4 +--
include/vcl/opengl/OpenGLHelper.hxx |2 +
vcl/source/opengl/OpenGLHelper.cxx | 32 +
6 files changed, 40 insertions(+), 40 deletions(-)
New commits:
commit 31b0eb64430eadec6d594354afc0d7b9551ae409
Author: Tor Lillqvist
Date: Tue Apr 29 08:28:54 2014 +0300
Use OpenGLHelper::GLErrorString()
Change-Id: I45f627b20c4cfdd3048d7b1716af882ddd0d82b9
diff --git a/chart2/source/view/main/GL3DRenderer.cxx
b/chart2/source/view/main/GL3DRenderer.cxx
index 3807ede..b9b7201 100644
--- a/chart2/source/view/main/GL3DRenderer.cxx
+++ b/chart2/source/view/main/GL3DRenderer.cxx
@@ -42,38 +42,6 @@ struct TextInfo
float nDy;
};
-static const char* errorString(GLenum errorCode)
-{
-static const struct {
-GLenum code;
-const char *string;
-} errors[]=
-{
-/* GL */
-{GL_NO_ERROR, "no error"},
-{GL_INVALID_ENUM, "invalid enumerant"},
-{GL_INVALID_VALUE, "invalid value"},
-{GL_INVALID_OPERATION, "invalid operation"},
-{GL_STACK_OVERFLOW, "stack overflow"},
-{GL_STACK_UNDERFLOW, "stack underflow"},
-{GL_OUT_OF_MEMORY, "out of memory"},
-
-{0, NULL }
-};
-
-int i;
-
-for (i=0; errors[i].string; i++)
-{
-if (errors[i].code == errorCode)
-{
-return errors[i].string;
-}
- }
-
-return NULL;
-}
-
int static checkGLError(const char *file, int line)
{
GLenum glErr;
@@ -81,7 +49,7 @@ int static checkGLError(const char *file, int line)
glErr = glGetError();
while (glErr != GL_NO_ERROR)
{
-const char* sError = errorString(glErr);
+const char* sError = OpenGLHelper::GLErrorString(glErr);
if (sError)
SAL_WARN("chart2.opengl", "GL Error #" << glErr << "(" << sError
<< ") " << " in File " << file << " at line: " << line);
diff --git a/chart2/source/view/main/OpenGLRender.cxx
b/chart2/source/view/main/OpenGLRender.cxx
index 96368cd..2b7eab1 100644
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -84,10 +84,10 @@ int static checkGLError(const char *file, int line)
glErr = glGetError();
while (glErr != GL_NO_ERROR)
{
-const GLubyte* sError = gluErrorString(glErr);
+const char* sError = OpenGLHelper::GLErrorString(glErr);
if (sError)
-SAL_WARN("chart2.opengl", "GL Error #" << glErr << "(" <<
gluErrorString(glErr) << ") " << " in File " << file << " at line: " << line);
+SAL_WARN("chart2.opengl", "GL Error #" << glErr << "(" << sError
<< ") " << " in File " << file << " at line: " << line);
else
SAL_WARN("chart2.opengl", "GL Error #" << glErr << " (no message
available)" << " in File " << file << " at line: " << line);
commit 47a99f19bb9d46eb617c71703d5548523fe72d11
Author: Tor Lillqvist
Date: Tue Apr 29 08:27:58 2014 +0300
Add gluErrorString() replacement to OpenGLHelper
Change-Id: I1a04ece7026ceff75456df03b4eb189a3cb9687f
diff --git a/include/vcl/opengl/OpenGLHelper.hxx
b/include/vcl/opengl/OpenGLHelper.hxx
index 7fa7d84..3530b2b 100644
--- a/include/vcl/opengl/OpenGLHelper.hxx
+++ b/include/vcl/opengl/OpenGLHelper.hxx
@@ -23,6 +23,8 @@ public:
static sal_uInt8* ConvertBitmapExToRGBABuffer(const BitmapEx& rBitmapEx);
static BitmapEx ConvertBGRABufferToBitmapEx(const sal_uInt8* const
pBuffer, long nWidth, long nHeight);
+
+static const char* GLErrorString(GLenum errorCode);
};
#endif
diff --git a/vcl/source/opengl/OpenGLHelper.cxx
b/vcl/source/opengl/OpenGLHelper.cxx
index 82b4a9a..0ed24d0 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -197,4 +197,36 @@ BitmapEx OpenGLHelper::ConvertBGRABufferToBitmapEx(const
sal_uInt8* const pBuffe
return BitmapEx(aBitmap, aAlpha);
}
+const char* OpenGLHelper::GLErrorString(GLenum errorCode)
+{
+static const struct {
+GLenum code;
+const char *string;
+} errors[]=
+{
+/* GL */
+{GL_NO_ERROR, "no error"},
+{GL_INVALID_ENUM, "invalid enumerant"},
+{GL_INVALID_VALUE, "invalid value"},
+{GL_INVALID_OPERATION, "invalid operation"},
+{GL_STACK_OVERFLOW, "stack overflow"},
+{GL_STACK_UNDERFLOW, "stack underflow"},
+{GL_OUT_OF_MEMORY, "out of memory"},
+
+{0, NULL }
+};
+
+int i;
+
+for (i=0; errors[i].string; i++)
+{
+if (errors[i].code == errorCode)
+{
+return errors[i].string;
+}
+ }
+
+return NULL;
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 20fc0ed8fa5765d3e13e5351c03993c3ff6c2732
Auth
[Libreoffice-commits] core.git: chart2/Library_chartcore.mk chart2/Library_chartopengl.mk
chart2/Library_chartcore.mk |2 -- chart2/Library_chartopengl.mk |2 -- 2 files changed, 4 deletions(-) New commits: commit aea15180a8928935d0a27c8cb2ded57b36045f78 Author: Tor Lillqvist Date: Tue Apr 29 08:31:41 2014 +0300 We don't sniff glu Change-Id: I4d293bb74c9dcb4f9a7ebd4946476cf06ef783d9 diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk index 63f2ec1..e4e1fee 100644 --- a/chart2/Library_chartcore.mk +++ b/chart2/Library_chartcore.mk @@ -255,7 +255,6 @@ ifeq ($(strip $(OS)),WNT) $(eval $(call gb_Library_use_system_win32_libs,chartcore,\ opengl32 \ gdi32 \ - glu32 \ )) else ifeq ($(OS),MACOSX) $(eval $(call gb_Library_use_system_darwin_frameworks,chartcore,\ @@ -265,7 +264,6 @@ else ifeq ($(OS),LINUX) $(eval $(call gb_Library_add_libs,chartcore,\ -ldl \ -lGL \ - -lGLU \ -lX11 \ )) endif diff --git a/chart2/Library_chartopengl.mk b/chart2/Library_chartopengl.mk index 8bc6b6e..18505ef 100644 --- a/chart2/Library_chartopengl.mk +++ b/chart2/Library_chartopengl.mk @@ -60,7 +60,6 @@ ifeq ($(strip $(OS)),WNT) $(eval $(call gb_Library_use_system_win32_libs,chartopengl,\ opengl32 \ gdi32 \ - glu32 \ )) else ifeq ($(OS),MACOSX) $(eval $(call gb_Library_use_system_darwin_frameworks,chartopengl,\ @@ -70,7 +69,6 @@ else ifeq ($(OS),LINUX) $(eval $(call gb_Library_add_libs,chartopengl,\ -ldl \ -lGL \ - -lGLU \ -lX11 \ )) endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
LibreOffice Gerrit News for core on 2014-04-29
Moin!
* Open changes on master for project core changed in the last 25 hours:
First time contributors doing great things!
+ external: revert java 1.6 stuff (at least until we'd get a real check in
in https://gerrit.libreoffice.org/8801 from Douglas Mencken
about module build, external, reportbuilder, swext
+ cppunittest_filter_xslt: fix fdo#77893
in https://gerrit.libreoffice.org/9177 from Douglas Mencken
about module filter
+ fdo#77887 : Floating Table positions are not preserved when doing Export
in https://gerrit.libreoffice.org/9185 from Ravindra Vidhate
about module sw, writerfilter
End of freshness
* Merged changes on master for project core changed in the last 25 hours:
+ remove unused code from TabBar
in https://gerrit.libreoffice.org/9162 from Noel Grandin
+ Improve TabBar return types
in https://gerrit.libreoffice.org/9161 from Noel Grandin
+ remove some dodgy defines from the ICGM filter
in https://gerrit.libreoffice.org/9163 from Noel Grandin
+ fdo77216-Charts-Scattered chart: Chart gets distorted on RT
in https://gerrit.libreoffice.org/9011 from Sourav Mahajan
+ fdo#77713 : File Corruption - Header.xml
in https://gerrit.libreoffice.org/9146 from Rajashri Udhoji
+ fdo#77719 File containing CusGeom gets corrupted on RT.
in https://gerrit.libreoffice.org/9147 from Sourav Mahajan
+ fdo#77715: Fix for TOC flag field \c
in https://gerrit.libreoffice.org/9145 from Dinesh Patil
+ fdo#77759 : Embedded excel getting renamed to binary object.
in https://gerrit.libreoffice.org/9126 from Ravindra Vidhate
* Abandoned changes on master for project core changed in the last 25 hours:
+ VCL: move native widget rendering functions out of OutputDevice
in https://gerrit.libreoffice.org/9186 from Chris Sherlock
+ fdo#76934 : FILESAVE: DOCX: Title is not preserved after Roundtrip
in https://gerrit.libreoffice.org/8847 from Pallavi Jadhav
* Open changes needing tweaks, but being untouched for more than a week:
+ move inettype.{hc}xx from svl to tools
in https://gerrit.libreoffice.org/8926 from Christina Roßmanith
+ fdo#43157 Remove OSL_POSTCOND, prefer SAL_WARN_IF
in https://gerrit.libreoffice.org/8883 from Michaël Lefèvre
+ new method INetURLObject::getData() for data urls
in https://gerrit.libreoffice.org/8737 from Christina Roßmanith
+ fdo#67544 Slide transistion sound(other sound) is not included in present
in https://gerrit.libreoffice.org/8700 from Vishv Brahmbhatt
+ fdo#57950: Replace chained O(U)StringBuffer::append() with operator+
in https://gerrit.libreoffice.org/8699 from Tharindu Lakmal
+ Refactored
in https://gerrit.libreoffice.org/8683 from Tharindu Lakmal
+ fdo#75757 Remove inheritance to std::map from PropertyMap
in https://gerrit.libreoffice.org/8656 from Krisztian Pinter
+ Remove visual noise from ios
in https://gerrit.libreoffice.org/8274 from Alexander Wilms
+ FDO#75205 : Charts - Up Down bars are getting added to Line Chart.
in https://gerrit.libreoffice.org/8360 from Umesh Kadam
+ WIP: Converting ExtensionUpdate dialog for new format
in https://gerrit.libreoffice.org/8506 from Rodolfo Ribeiro Gomes
+ Refactored swooxmlexport tests cases. Added function to check contents.
in https://gerrit.libreoffice.org/8390 from Nikhil Walvekar
+ fdo#71984 fix first line indentation in footnotes for MS Word documents
in https://gerrit.libreoffice.org/8160 from Andras Timar
+ Lots of changes to Tango icons
in https://gerrit.libreoffice.org/7987 from Miroslav Mazel
+ sw/docx export: fix handling of document with header and section(s)
in https://gerrit.libreoffice.org/6248 from Pierre-Eric Pelloux-Prayer
+ fdo#51525 Fix duplicate "Paste Special" entries in Calc.
in https://gerrit.libreoffice.org/7784 from Andrzej Hunt
+ fdo#72661: Check ‘Hyphenation active’ automatically
in https://gerrit.libreoffice.org/7291 from Jiwoong Youn
+ sa/l add release_assert() and assert that stay even in release code
in https://gerrit.libreoffice.org/7625 from Norbert Thiebaud
+ WIP fdo#72987 Use firebird backup format for .odb
in https://gerrit.libreoffice.org/7299 from Andrzej Hunt
+ sw/export docx: add unit test for document with header and section(s)
in https://gerrit.libreoffice.org/6249 from Pierre-Eric Pelloux-Prayer
+ WIP: fdo#33980 Preserve selection across all slide sorters.
in https://gerrit.libreoffice.org/6633 from Andrzej Hunt
Best,
Your friendly LibreOffice Gerrit Digest Mailer
Note: The bot generating this message can be found and improved here:
https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
LibreOffice Gerrit News for dev-tools on 2014-04-29
Moin! * Open changes on master for project dev-tools changed in the last 25 hours: None * Merged changes on master for project dev-tools changed in the last 25 hours: + esc-bug-stats: add all components containing LO code in https://gerrit.libreoffice.org/9165 from Michael Stahl * Abandoned changes on master for project dev-tools changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: None Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/core/uibase/lingu/olmenu.cxx |9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 94fc0b4752599601ddf9ff3c9b49da15cffb4882
Author: LuboÅ¡ LuÅák
Date: Tue Apr 29 08:20:09 2014 +0200
prevent duplicated redline accept/reject spellcheck popup items
Change-Id: Ib7bd7e471b017f7e09a447f987ab7ce8bf506b53
diff --git a/sw/source/core/uibase/lingu/olmenu.cxx
b/sw/source/core/uibase/lingu/olmenu.cxx
index 8694eab..7bd3281 100644
--- a/sw/source/core/uibase/lingu/olmenu.cxx
+++ b/sw/source/core/uibase/lingu/olmenu.cxx
@@ -607,15 +607,13 @@ void SwSpellPopup::checkRedline()
// Build an item set that contains a void item for each menu entry. The
// WhichId of each item is set, so SwView may clear it.
static const sal_uInt16 pRedlineIds[] = {
-FN_REDLINE_ACCEPT_DIRECT,
-FN_REDLINE_REJECT_DIRECT,
FN_REDLINE_NEXT_CHANGE,
FN_REDLINE_PREV_CHANGE,
FN_REDLINE_ACCEPT_DIRECT_SELECTION,
FN_REDLINE_REJECT_DIRECT_SELECTION
};
SwDoc *pDoc = m_pSh->GetDoc();
-SfxItemSet aSet(pDoc->GetAttrPool(), FN_REDLINE_ACCEPT_DIRECT,
FN_REDLINE_REJECT_DIRECT_SELECTION);
+SfxItemSet aSet(pDoc->GetAttrPool(), FN_REDLINE_NEXT_CHANGE,
FN_REDLINE_REJECT_DIRECT_SELECTION);
for (size_t i = 0; i < SAL_N_ELEMENTS(pRedlineIds); ++i)
{
const sal_uInt16 nWhich = pRedlineIds[i];
@@ -630,6 +628,11 @@ void SwSpellPopup::checkRedline()
const sal_uInt16 nWhich = pRedlineIds[i];
EnableItem(nWhich, aSet.Get(nWhich).Which());
}
+// Spellcheck popup selects the whole word, so xxx_SELECTION items would
be enabled if needed,
+// and there would be needless duplicates (and if only a part of the word
is redlined,
+// these might not work anyway).
+EnableItem(FN_REDLINE_ACCEPT_DIRECT, false);
+EnableItem(FN_REDLINE_REJECT_DIRECT, false);
}
sal_uInt16 SwSpellPopup::Execute( const Rectangle& rWordPos, Window* pWin )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/Library_sw.mk sw/source
sw/Library_sw.mk |2 +-
sw/source/core/uibase/uno/unofreg.cxx |4
2 files changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 81272fdb1e093d44e2e67eba65c79a490832f320
Author: Tor Lillqvist
Date: Tue Apr 29 09:44:37 2014 +0300
Less intrusive --disable-database-connectivity change for sw
Do compile in the SwDBFieldType class. Still bypass mail merge stuff.
Results in about 1.8MB reduction in text segment size for
TiledLibreOffice.
Change-Id: Iec900bd451d1b4154f3bf03f604783e548b8e7af
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index 62b864f..af465ca 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -258,6 +258,7 @@ $(eval $(call gb_Library_add_exception_objects,sw,\
sw/source/core/fields/authfld \
sw/source/core/fields/cellfml \
sw/source/core/fields/chpfld \
+sw/source/core/fields/dbfld \
sw/source/core/fields/ddefld \
sw/source/core/fields/ddetbl \
sw/source/core/fields/docufld \
@@ -744,7 +745,6 @@ $(eval $(call gb_Library_add_exception_objects,sw,\
ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
$(eval $(call gb_Library_add_exception_objects,sw,\
-sw/source/core/fields/dbfld \
sw/source/core/uibase/dbui/dbmgr \
sw/source/core/uibase/dbui/dbtree \
sw/source/core/uibase/dbui/dbui \
diff --git a/sw/source/core/uibase/uno/unofreg.cxx
b/sw/source/core/uibase/uno/unofreg.cxx
index 77b6f90..985e3ee 100644
--- a/sw/source/core/uibase/uno/unofreg.cxx
+++ b/sw/source/core/uibase/uno/unofreg.cxx
@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include
+
#include "SwXFilterOptions.hxx"
#include "unofreg.hxx"
#include
@@ -204,6 +206,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL
sw_component_getFactory(
SwXModule_createInstance,
SwXModule_getSupportedServiceNames() );
}
+#if HAVE_FEATURE_DBCONNECTIVITY
else if( SwXMailMerge_getImplementationName().equalsAsciiL(
pImplName, nImplNameLen ) )
{
@@ -212,6 +215,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL
sw_component_getFactory(
SwXMailMerge_createInstance,
SwXMailMerge_getSupportedServiceNames() );
}
+#endif
else if( SwXFilterOptions::getImplementationName_Static().equalsAsciiL(
pImplName, nImplNameLen ) )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
