LibreOffice Gerrit News for core on 2014-05-08
Moin!
* Open changes on master for project core changed in the last 25 hours:
First time contributors doing great things!
+ Icon Redux 02: Optimised Galaxy theme
in https://gerrit.libreoffice.org/8799 from Andrew Dent
about module icon-themes
+ fdo#78290 : The File gets corrupted when saved in LO
in https://gerrit.libreoffice.org/9273 from BisalNayal
about module chart2, oox
End of freshness
+ fdo#77760 Calculate table height for Floating Tables
in https://gerrit.libreoffice.org/9214 from Vinaya Mandke
about module sw, writerfilter
+ fdo#77716 : Paragraph spacing is not preserved after RT.
in https://gerrit.libreoffice.org/9197 from Tushar Bende
about module sw, writerfilter
* Merged changes on master for project core changed in the last 25 hours:
+ Handle non-initialized pImplSVData in InitAppFontData
in https://gerrit.libreoffice.org/9272 from Chris Sherlock
+ Icon redux 01: Tidy hicontrast icons
in https://gerrit.libreoffice.org/8794 from Andrew Dent
+ Icon Redux 02: Optimised Sifr theme
in https://gerrit.libreoffice.org/8795 from Andrew Dent
+ fdo#78382 PDF Import: add opacity support for fill and stroke
in https://gerrit.libreoffice.org/9268 from Vort
+ WaE: C4389: '!=' : signed/unsigned mismatch
in https://gerrit.libreoffice.org/9266 from Thomas Arnhold
+ fdo#77812 :FILESAVE :DOCX : Extra Section Break gets added in file
in https://gerrit.libreoffice.org/9200 from Pallavi Jadhav
* Abandoned changes on master for project core changed in the last 25 hours:
+ Fix wrong value of 2 table-border styles in model.xml
in https://gerrit.libreoffice.org/9213 from Adam CloudOn
* Open changes needing tweaks, but being untouched for more than a week:
+ 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
+ cppunittest_filter_xslt: fix fdo#77893
in https://gerrit.libreoffice.org/9177 from Douglas Mencken
+ DrawWaveLine/ImplDrawWaveLine fixes: - try to avoid huge looping due to
in https://gerrit.libreoffice.org/9174 from Douglas Mencken
+ FDO#74886: Data labels are not preserved for Column Chart in RT file
in https://gerrit.libreoffice.org/8098 from Umesh Kadam
+ move inettype.{hc}xx from svl to tools
in https://gerrit.libreoffice.org/8926 from Christina Roßmanith
+ 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
+ WIP fdo#72987 Use firebird backup format for .odb
in https://gerrit.libreoffice.org/7299 from Andrzej Hunt
+ 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
RE: fdo77985 Calc function NETWORKDAYS
Hi Eike, I'd avoid changing existing Add-In functions, it's a source of hassle ;-) Fine, I prefer to keep away from the add-in code, too. Rather implement an ODFF compliant NETWORKDAYS function at the interpreter [...] OK, then there will be 3 NETWORKDAYS functions: Add-in, OOXML and ODFF: Add-in is a subset of ODFF as Add-in misses the 4th argument (defining weekend days); OOXML differs from ODFF as the 3rd and 4th argument are the other way round and the weekend day argument for OOXML uses a 7-character string of 0 and 1, whereas ODFF uses a list of numbers (0 and not 0). The difference between OOXML and ODFF doesn't concern me, that I can solve easily in the code. The difference between Add-in and ODFF looks problematic to me when using ODFF NETWORKDAYS with 2 arguments and saving to xls. And how about compatibility with documents saved before introduction of ODFF NETWORKDAYS? Are these regarded as Add-inn? A solution (which I don't like) could be to assume that NETWORKDAYS with 2 or 3 arguments is Add-in, and with 4 arguments is ODFF. I don't know if this can be implemented. I will start making the ODFF NETWORKDAYS function and rename the Add-in function to NETWORKDAYS_ADD. Winfried ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 74333, which changed state. Bug 74333 Summary: DATALOSS: Textfield or Picture inside a chart is hidden https://bugs.freedesktop.org/show_bug.cgi?id=74333 What|Removed |Added Status|RESOLVED|REOPENED 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
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/ww8par6.cxx |6 -- 1 file changed, 4 insertions(+), 2 deletions(-) New commits: commit 9beda5ab8feaeb6d5e1c64e094065b02551532a4 Author: Stephan Bergmann sberg...@redhat.com Date: Thu May 8 08:26:46 2014 +0200 Handle bad SwWW8ImplReader::GetCol input With previously found offenders out of the way, looks like sw/qa/core/data/ww8/pass/CVE-2009-3302-2.doc is the only case that triggers this, and that is likely deliberately malformed input. As the whole ww8 parser appears not to be build around robust eager input validation and error signalling, there is little more we can do here than throw up our hands in despair. Change-Id: Idf61fcf14a784cef1539654f2825c013c218987f diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index 8836d30..772ee882 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -121,8 +121,10 @@ ColorData SwWW8ImplReader::GetCol(sal_uInt8 nIco) COL_CYAN, COL_GREEN, COL_MAGENTA, COL_RED, COL_BROWN, COL_GRAY, COL_LIGHTGRAY }; - -return eSwWW8ColA[nIco]; +SAL_WARN_IF( +nIco = SAL_N_ELEMENTS(eSwWW8ColA), sw.ww8, +ico sal_uInt32(nIco) = SAL_N_ELEMENTS(eSwWW8ColA)); +return nIco SAL_N_ELEMENTS(eSwWW8ColA) ? eSwWW8ColA[nIco] : COL_AUTO; } inline sal_uInt32 MSRoundTweak(sal_uInt32 x) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Questions about getCppuType
Hi Julien, here's the regex you may want to use: git grep -lE 'getCppuType\(\((const )?sal_Int32\*\)0\)' | xargs sed -ir 's/getCppuType((\(const \)\?sal_Int32\*)0)/cppu::UnoTypesal_Int32::get()/g' Using brackets in regex is a horror ;) Regards Thomas -- View this message in context: http://nabble.documentfoundation.org/Questions-about-getCppuType-tp4106361p4107951.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Questions about getCppuType
On 2014-05-07 23:48, julien2412 wrote:
In fact, my primary goal was to clean this use of getCppuType because it was
reported by cppcheck (when they were used in if/else if blocks)
Then I wanted to remove all of them. The problem is there are 33 Opengrok
pages of these and I don't know enough about regexp to remove them quickly.
I tried things like this:
fgrep -lR 'getCppuType((const sal_Int32*)0)' |xargs -i sed -i
's/getCppuType[(][(]const sal_Int32[*])0)/cppu::UnoTypesal_Int32::get()/g'
{}
But it's still too naive to get rid of them. (I wanted to put const
optional but didn't even find how to do it)
Any regexp wizard here?
This works for me:
git grep -lF getCppuType((const sal_Int32*)0) -- *.cxx | xargs perl -pi -w -e s/getCppuType\(\(const
sal_Int32\*\)0\)/cppu::UnoType\sal_Int32\::get\(\)/g;
Disclaimer: http://www.peralex.com/disclaimer.html
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/fdo78284.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx| 11 +++
sw/source/filter/ww8/docxsdrexport.cxx |6 +++---
3 files changed, 14 insertions(+), 3 deletions(-)
New commits:
commit d8b5bd541b946de2b3e70e8227baf6eb602ba8e2
Author: Vinaya Mandke vinaya.man...@synerzip.com
Date: Mon May 5 14:13:31 2014 +0530
fdo#78284 Content-type of .png images in Smart Art
Content-type for 'png' images was not getting added in
[Content_Types].xml. This was as only 'jpeg' and 'wmf'
extensions were handled. Modified DocxSdrExport::writeDiagramRels
to handle all types of extensions.
Added UT for the same.
Reviewed on:
https://gerrit.libreoffice.org/9252
Change-Id: I5e068d4db14f3a43be08a4b7c9bf265f388bf356
diff --git a/sw/qa/extras/ooxmlexport/data/fdo78284.docx
b/sw/qa/extras/ooxmlexport/data/fdo78284.docx
new file mode 100644
index 000..92145eb
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo78284.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index acd3d06..bea603d 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3260,6 +3260,17 @@
DECLARE_OOXMLEXPORT_TEST(testPageBreakInFirstPara,fdo77727.docx)
assertXPath(pXmlDoc,
/w:document/w:body/w:p[1]/w:r[2]/w:br,type,page);
}
+DECLARE_OOXMLEXPORT_TEST(testFDO78284, fdo78284.docx)
+{
+xmlDocPtr pXmlDoc = parseExport([Content_Types].xml);
+
+if (!pXmlDoc)
+return;
+
assertXPath(pXmlDoc,/ContentType:Types/ContentType:Override[@PartName='/word/media/OOXDiagramDataRels1_0.png'],
+ContentType,
+image/png);
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx
b/sw/source/filter/ww8/docxsdrexport.cxx
index 563e124..f47a615 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -828,10 +828,10 @@ void
DocxSdrExport::writeDiagramRels(uno::Referencexml::dom::XDocument xDom,
diagramDataRelTuple[0] = sRelId;
diagramDataRelTuple[2] = sExtension;
OUString sContentType;
-if (sExtension == .jpeg)
-sContentType = image/jpeg;
-else if (sExtension == .WMF)
+if (sExtension.equalsIgnoreAsciiCase(.WMF))
sContentType = image/x-wmf;
+else
+sContentType = OUString(image/) + sExtension.copy(1);
sRelId = sRelId.copy(3);
StreamDataSequence dataSeq;
___
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' - svx/source
svx/source/unodraw/unoshape.cxx |9 +
1 file changed, 1 insertion(+), 8 deletions(-)
New commits:
commit 0500ac6f276f7e0a5522e1ecdbd3688462ee4533
Author: Michael Stahl mst...@redhat.com
Date: Wed May 7 22:15:07 2014 +0200
fdo#62176: Revert n757419: Hidden/Non-wrapping text.
This reverts commit 0f8f92a5b6fcba1fef456539bb929819a9162a85.
Negative fo:text-indent values are explicitly allowed by ODF, so
whatever problem was worked around here needs to be fixed differently.
Conflicts:
svx/source/unodraw/unoshape.cxx
Change-Id: I7e2ae38c4c950e37f0c96a32164a5b6ec10fd47d
(cherry picked from commit 3b566ca82ebbe754902c1837e11da5fba1e6c93d)
Reviewed-on: https://gerrit.libreoffice.org/9275
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 77fa691..40feb56 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -4295,18 +4295,11 @@ uno::Any SvxItemPropertySet_getPropertyValue( const
SvxItemPropertySet rPropSet
void SvxItemPropertySet_setPropertyValue( const SvxItemPropertySet rPropSet,
const SfxItemPropertySimpleEntry* pMap, const uno::Any rVal, SfxItemSet rSet )
{
-uno::Any aVal(rVal);
if(!pMap || !pMap-nWID)
return;
bool bDontConvertNegativeValues = ( pMap-nWID == XATTR_FILLBMP_SIZEX ||
pMap-nWID == XATTR_FILLBMP_SIZEY );
-if( pMap-nWID == EE_PARA_LRSPACE ) // n#757419 Don't import negative
values
-{
-sal_Int32 nVal = sal_Int32();
-if( (aVal = nVal) nVal 0 )
-aVal = ( sal_Int32 ) 0;
-}
-rPropSet.setPropertyValue( pMap, aVal, rSet, bDontConvertNegativeValues );
+rPropSet.setPropertyValue( pMap, rVal, rSet, bDontConvertNegativeValues );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
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' - sw/inc sw/source
sw/inc/ndtxt.hxx |3 +++
sw/source/core/doc/doccomp.cxx | 13 +
sw/source/core/txtnode/ndtxt.cxx | 11 ---
3 files changed, 24 insertions(+), 3 deletions(-)
New commits:
commit 8fb7fa143cca628654933459135eee6c3f1450d4
Author: Michael Stahl mst...@redhat.com
Date: Wed May 7 17:52:16 2014 +0200
fdo#74790: sw: Compare Document: fix assertions about RSID-only hints
For ordinary documents the SwTxtNode::MakeFrm() would set the
m_bFormatIgnoreStart/End flags of the RSID-only hints, but the document
loaded by Compare Document (and Merge Document) is special because it
is loaded, there are editing operations on it, but it has no layout,
so the assertions about these flags trigger.
(regression from 6db39dbd7378351f6476f6db25eb7110c9cfb291)
Change-Id: I8a6e02b68f22e609640adbe93ff194e4081d9856
(cherry picked from commit 80b131038d2375c9855ee5fbe225e75bdad2645e)
Reviewed-on: https://gerrit.libreoffice.org/9274
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index d8e1fbb..072aecb 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -280,6 +280,9 @@ public:
// delete all attributes from SwpHintsArray.
voidClearSwpHintsArr( bool bDelFields );
+/// initialize the hints after file loading (which takes shortcuts)
+voidFileLoadedInitHints();
+
/// Insert pAttr into hints array. @return true iff inserted successfully
boolInsertHint( SwTxtAttr * const pAttr,
const SetAttrMode nMode = nsSetAttrMode::SETATTR_DEFAULT );
diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index aaefd2a..ac06f62 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -1756,12 +1756,23 @@ void SwCompareData::SetRedlinesToDoc( sal_Bool
bUseDocInfo )
}
}
+static bool lcl_MergePortions(SwNode *const pNode, void *)
+{
+if (pNode-IsTxtNode())
+{
+pNode-GetTxtNode()-FileLoadedInitHints();
+}
+return true;
+}
+
// Returns (the difference count?) if something is different
long SwDoc::CompareDoc( const SwDoc rDoc )
{
if( rDoc == this )
return 0;
+const_castSwDoc(rDoc).GetNodes().ForEach(lcl_MergePortions);
+
long nRet = 0;
// Get comparison options
@@ -2005,6 +2016,8 @@ long SwDoc::MergeDoc( const SwDoc rDoc )
long nRet = 0;
+const_castSwDoc(rDoc).GetNodes().ForEach(lcl_MergePortions);
+
GetIDocumentUndoRedo().StartUndo(UNDO_EMPTY, NULL);
SwDoc rSrcDoc = (SwDoc)rDoc;
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 2be6fbb9..f6bf93d 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -257,14 +257,19 @@ SwTxtNode::~SwTxtNode()
InitSwParaStatistics( false );
}
-SwCntntFrm *SwTxtNode::MakeFrm( SwFrm* pSib )
+void SwTxtNode::FileLoadedInitHints()
{
-// fdo#52028: ODF file import does not result in MergePortions being called
-// for every attribute, since that would be inefficient. So call it here.
if (m_pSwpHints)
{
m_pSwpHints-MergePortions(*this);
}
+}
+
+SwCntntFrm *SwTxtNode::MakeFrm( SwFrm* pSib )
+{
+// fdo#52028: ODF file import does not result in MergePortions being called
+// for every attribute, since that would be inefficient. So call it here.
+FileLoadedInitHints();
SwCntntFrm *pFrm = new SwTxtFrm( this, pSib );
return pFrm;
}
___
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' - sw/source
sw/source/core/fields/chpfld.cxx | 31 ---
1 file changed, 31 deletions(-)
New commits:
commit 17aeb9e1f0922154a1cf342d17a869161b114f65
Author: Michael Stahl mst...@redhat.com
Date: Wed May 7 14:54:54 2014 +0200
fdo#75519: fix chapter cross references
It would be possible to modify the condition in
SwChapterField::ChangeExpansion() to check for rTxtNd.GetNumRule() as
well and make the bugdoc work again, but do we really want to use
chapter reference to refer to plain numbering? Perhaps it would be
better to add a numbering reference field type; without investigating
what Word actually does here and what the actual problem is that was
supposedly fixed here (which is not possible given there's no reproducer
document) it's best for now to just revert it.
(regression from commit 6319803762d051c4aa645692cde7245a1bbcf7ee)
Change-Id: I7eb9ea46e42729c53c350ff450d49a1eb84ee8eb
(cherry picked from commit cc0a7699bb79efad488094e33464d4793758ee3f)
Reviewed-on: https://gerrit.libreoffice.org/9271
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/source/core/fields/chpfld.cxx b/sw/source/core/fields/chpfld.cxx
index e7fe520..86c6de2 100644
--- a/sw/source/core/fields/chpfld.cxx
+++ b/sw/source/core/fields/chpfld.cxx
@@ -122,41 +122,11 @@ void SwChapterField::ChangeExpansion(const SwFrm* pFrm,
void SwChapterField::ChangeExpansion(const SwTxtNode rTxtNd, sal_Bool
bSrchNum)
{
-//i120759,this function is for both the reference chapter field and normal
chapter field
-//bSrchNum can distinguish the two types,to the latter type,the outline
num rule is must...
sNumber = OUString();
sTitle = OUString();
sPost = OUString();
sPre = OUString();
-//The reference chapter field of normal num rule will be handled in this
code segment
-if (bSrchNum !rTxtNd.IsOutline())
-{
-SwNumRule* pRule(rTxtNd.GetNumRule());
-if (rTxtNd.IsCountedInList() pRule)
-{
-sNumber = rTxtNd.GetNumString(false);
-
-int nListLevel = rTxtNd.GetActualListLevel();
-
-if (nListLevel 0)
-nListLevel = 0;
-if (nListLevel = MAXLEVEL)
-nListLevel = MAXLEVEL - 1;
-
-const SwNumFmt rNFmt = pRule-Get(static_castunsigned
short(nListLevel));
-sPost = rNFmt.GetSuffix();
-sPre = rNFmt.GetPrefix();
-}
-else
-{
-sNumber = ??;
-}
-sTitle = removeControlChars(rTxtNd.GetExpandTxt());
-}
-else
-{
-//End
SwDoc* pDoc = (SwDoc*)rTxtNd.GetDoc();
const SwTxtNode *pTxtNd = rTxtNd.FindOutlineNodeOfLevel( nLevel );
if( pTxtNd )
@@ -216,7 +186,6 @@ void SwChapterField::ChangeExpansion(const SwTxtNode
rTxtNd, sal_Bool bSrchNum)
sTitle = removeControlChars(pTxtNd-GetExpandTxt(0, -1, false, false,
false, false));
}
-}
}
bool SwChapterField::QueryValue( uno::Any rAny, sal_uInt16 nWhichId ) const
___
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' - sw/qa
sw/qa/extras/inc/swmodeltestbase.hxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 81b397ebbd33e4a279a4112de3f1a3b5878c05d4
Author: Michael Stahl mst...@redhat.com
Date: Tue May 6 22:31:59 2014 +0200
sw: call SwEditShell::CalcLayout to avoid crashes
(i.e. similar to 83c0018dba00ae0c0cf5b179cfc7a47ce08ff2b7 on master)
Change-Id: Ia24c7cadd382b89d43bc2e1081ef85751cb6eca6
Reviewed-on: https://gerrit.libreoffice.org/9262
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx
b/sw/qa/extras/inc/swmodeltestbase.hxx
index 316cb9c..dc5a750 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -30,6 +30,7 @@
#include docsh.hxx
#include doc.hxx
#include rootfrm.hxx
+#include editsh.hxx
#include libxml/xmlwriter.h
#include libxml/xpath.h
@@ -211,7 +212,7 @@ private:
{
SwXTextDocument* pTxtDoc = dynamic_castSwXTextDocument
*(mxComponent.get());
SwDoc* pDoc = pTxtDoc-GetDocShell()-GetDoc();
-pDoc-GetCurrentViewShell()-CalcLayout();
+dynamic_castSwEditShell*(pDoc-GetCurrentViewShell())-CalcLayout();
}
___
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' - sw/qa
sw/qa/complex/writer/CheckBookmarks.java |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 5b73d79b7962273e76937c260a2b7b2b7c011619
Author: Michael Stahl mst...@redhat.com
Date: Wed Jan 29 10:01:05 2014 +0100
sw: CheckBookmarks: can't store OOo XML any more
Change-Id: Ib9e92043d8483feb47f024ee067f2103625dd031
(cherry picked from commit 00a63ba1c7e89563ea1aeeca46873e3e205e8632)
Signed-off-by: Stephan Bergmann sberg...@redhat.com
diff --git a/sw/qa/complex/writer/CheckBookmarks.java
b/sw/qa/complex/writer/CheckBookmarks.java
index 2a42711..a6dab9c 100644
--- a/sw/qa/complex/writer/CheckBookmarks.java
+++ b/sw/qa/complex/writer/CheckBookmarks.java
@@ -121,7 +121,7 @@ public class CheckBookmarks {
actualHashes.m_nDeleteRandomHash =
BookmarkHashes.getBookmarksHash(m_xDoc);
insertLinebreaks(007);
actualHashes.m_nLinebreakHash =
BookmarkHashes.getBookmarksHash(m_xDoc);
-m_xOdfReloadedDoc = reloadFrom(StarOffice XML (Writer), odf);
+m_xOdfReloadedDoc = reloadFrom(writer8, odf);
actualHashes.m_nOdfReloadHash =
BookmarkHashes.getBookmarksHash(m_xOdfReloadedDoc);
//m_xMsWordReloadedDoc = reloadFrom(MS Word 97, doc);
//actualHashes.m_nMsWordReloadHash =
BookmarkHashes.getBookmarksHash(m_xMsWordReloadedDoc);
___
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' - sw/source
sw/source/filter/ww8/ww8par6.cxx |6 -- 1 file changed, 4 insertions(+), 2 deletions(-) New commits: commit b803f86341a521f8d07db7ed6a29bb0c7fdf93a5 Author: Stephan Bergmann sberg...@redhat.com Date: Thu May 8 08:26:46 2014 +0200 Handle bad SwWW8ImplReader::GetCol input With previously found offenders out of the way, looks like sw/qa/core/data/ww8/pass/CVE-2009-3302-2.doc is the only case that triggers this, and that is likely deliberately malformed input. As the whole ww8 parser appears not to be build around robust eager input validation and error signalling, there is little more we can do here than throw up our hands in despair. Change-Id: Idf61fcf14a784cef1539654f2825c013c218987f (cherry picked from commit 9beda5ab8feaeb6d5e1c64e094065b02551532a4) diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index 685feae..43c93cd 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -126,8 +126,10 @@ ColorData SwWW8ImplReader::GetCol(sal_uInt8 nIco) COL_CYAN, COL_GREEN, COL_MAGENTA, COL_RED, COL_BROWN, COL_GRAY, COL_LIGHTGRAY }; - -return eSwWW8ColA[nIco]; +SAL_WARN_IF( +nIco = SAL_N_ELEMENTS(eSwWW8ColA), sw.ww8, +ico sal_uInt32(nIco) = SAL_N_ELEMENTS(eSwWW8ColA)); +return nIco SAL_N_ELEMENTS(eSwWW8ColA) ? eSwWW8ColA[nIco] : COL_AUTO; } inline sal_uInt32 MSRoundTweak(sal_uInt32 x) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 20 commits - chart2/source extensions/source sd/source svx/source sw/source
chart2/source/controller/main/ChartController.cxx |4
extensions/source/bibliography/bibload.cxx|9
sd/source/filter/sdpptwrp.cxx |3
svx/source/form/navigatortreemodel.cxx|4
sw/source/core/doc/docnum.cxx |4
sw/source/core/table/swtable.cxx |5
sw/source/core/tox/tox.cxx|9
sw/source/filter/html/htmlforw.cxx| 13
sw/source/filter/html/htmlsect.cxx|2
sw/source/filter/ww8/wrtw8esh.cxx |3
sw/source/filter/xml/xmlexpit.cxx | 613 +++---
11 files changed, 353 insertions(+), 316 deletions(-)
New commits:
commit 8ef22b95059f2158434eeebb567bd04fc8477b32
Author: Caolán McNamara caol...@redhat.com
Date: Wed May 7 17:01:31 2014 +0100
coverity#1209298 Logically dead code
Change-Id: I370f1ff7df1c19e23560599b86b2274649bd5f73
diff --git a/sw/source/filter/html/htmlsect.cxx
b/sw/source/filter/html/htmlsect.cxx
index b943098..8c10ed1 100644
--- a/sw/source/filter/html/htmlsect.cxx
+++ b/sw/source/filter/html/htmlsect.cxx
@@ -704,7 +704,7 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss )
SwFmtCol aFmtCol;
nPrcWidth = 100;
-aFmtCol.Init( nCols, nGutter, nPrcWidth ? USHRT_MAX : nTwipWidth );
+aFmtCol.Init( nCols, nGutter, USHRT_MAX );
aFrmItemSet.Put( aFmtCol );
const SfxPoolItem *pItem;
commit 791f3f9db94c0b849f517cbda3878f2d156dbca7
Author: Caolán McNamara caol...@redhat.com
Date: Wed May 7 16:58:32 2014 +0100
coverity#1209146 Logically dead code
Change-Id: I6777dffb436471b5df69d40a15bd32b473dcfc40
diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx
index 1b1024d..abcfc80 100644
--- a/sw/source/core/tox/tox.cxx
+++ b/sw/source/core/tox/tox.cxx
@@ -417,10 +417,9 @@ void SwForm::AdjustTabStops( SwDoc rDoc ) // #i21237#
continue;
}
-const SvxTabStopItem* pTabStops = pColl != NULL ?
pColl-GetTabStops(false) : 0;
-const sal_uInt16 nTabCount = pTabStops != NULL ? pTabStops-Count() :
0;
-if( pTabStops != NULL
- nTabCount != 0 )
+const SvxTabStopItem rTabStops = pColl-GetTabStops(false);
+const sal_uInt16 nTabCount = rTabStops.Count();
+if (nTabCount != 0)
{
SwFormTokens aCurrentPattern = GetPattern(nLevel);
SwFormTokens::iterator aIt = aCurrentPattern.begin();
@@ -428,7 +427,7 @@ void SwForm::AdjustTabStops( SwDoc rDoc ) // #i21237#
bool bChanged = false;
for(sal_uInt16 nTab = 0; nTab nTabCount; ++nTab)
{
-const SvxTabStop rTab = (*pTabStops)[nTab];
+const SvxTabStop rTab = rTabStops[nTab];
if ( rTab.GetAdjustment() == SVX_TAB_ADJUST_DEFAULT )
continue; // ignore the default tab stop
commit f6012f6c5d40857ea7a9490da90ae5541d859563
Author: Caolán McNamara caol...@redhat.com
Date: Wed May 7 16:52:58 2014 +0100
coverity#736452 Resource leak
Change-Id: I7880007562e6706c2a4439fbda3063dc70fe13a3
diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx
index 52c8f7f..a8bebf0 100644
--- a/sd/source/filter/sdpptwrp.cxx
+++ b/sd/source/filter/sdpptwrp.cxx
@@ -116,6 +116,8 @@ bool SdPPTFilter::Import()
if ( !bRet )
mrMedium.SetError( SVSTREAM_WRONGVERSION,
OSL_LOG_PREFIX );
+
+delete pLibrary;
}
#else
bRet = ImportPPT( mrDocument, *pDocStream, *pStorage,
mrMedium );
commit e3193eb37a2fa75261746c1bdea836889d71a55f
Author: Caolán McNamara caol...@redhat.com
Date: Wed May 7 16:52:20 2014 +0100
coverity#736451 Resource leak
Change-Id: Ifd806074e31a4d7f91023d5baf22bc465e52019c
diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx
index cfeaeeb..52c8f7f 100644
--- a/sd/source/filter/sdpptwrp.cxx
+++ b/sd/source/filter/sdpptwrp.cxx
@@ -205,6 +205,7 @@ void SdPPTFilter::PreSaveBasic()
{
pSaveVBA( (SfxObjectShell) mrDocShell, pBas );
}
+delete pLibrary;
}
#else
SaveVBA( (SfxObjectShell) mrDocShell, pBas );
commit 50511afead5d0c30ea9f04e6d80e591678bdde29
Author: Caolán McNamara caol...@redhat.com
Date: Wed May 7 16:41:05 2014 +0100
coverity#736155 Dereference null return value
Change-Id: I781a949abb47b6e845a222a4fa8f685e9a620693
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index db10a84..5c3d3f6 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -2581,11 +2581,12 @@ public:
~Impl() {}
-void setTable(const SwTable * pTable) {
+void setTable(const SwTable * pTable)
+{
m_pTable = pTable;
SwFrmFmt
[Libreoffice-commits] core.git: sdext/source
sdext/source/pdfimport/wrapper/wrapper.cxx |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit e0bde4c53b1b8412833d4b84a214da8b8fc1f6e7
Author: Vort vv...@yandex.ru
Date: Thu May 8 11:54:35 2014 +0300
fdo#78427 PDF Import: Improve detection of bold italic font
(Bug #78427 is fixed only partially by this commit)
Change-Id: I080dca98a77a645c4c5ae19a9bbcae7d54179d3c
Reviewed-on: https://gerrit.libreoffice.org/9276
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx
b/sdext/source/pdfimport/wrapper/wrapper.cxx
index 391e71a..6d8567e 100644
--- a/sdext/source/pdfimport/wrapper/wrapper.cxx
+++ b/sdext/source/pdfimport/wrapper/wrapper.cxx
@@ -458,8 +458,8 @@ sal_Int32 Parser::parseFontCheckForString(
if (tolower(pCopy[i]) != pAttrib[i]
toupper(pCopy[i]) != pAttrib[i])
return 0;
-rResult.isItalic = bItalic;
-rResult.isBold = bBold;
+rResult.isItalic |= bItalic;
+rResult.isBold |= bBold;
return nAttribLen;
}
@@ -488,6 +488,7 @@ void Parser::parseFontFamilyName( FontAttributes rResult )
nLen -= 7;
}
+// TODO: Looks like this block needs to be refactored
while( nLen )
{
if (parseFontRemoveSuffix(pCopy, nLen,
RTL_CONSTASCII_STRINGPARAM(PSMT)))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/clucene
external/clucene/UnpackedTarball_clucene.mk |1 +
external/clucene/patches/clucene-mutex.patch | 13 +
2 files changed, 14 insertions(+)
New commits:
commit 10314b5d8b653864c92d392cbb774438633b2fe1
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu May 8 11:08:51 2014 +0200
CLucene: Helgrind reported pthread_mutex_destroy of a locked mutex
pthread_mutex_destroy
(/usr/src/debug/valgrind-3.9.0/helgrind/hg_intercepts.c:478)
lucene::util::mutex_thread::~mutex_thread()
(workdir/UnpackedTarball/clucene/src/shared/CLucene/config/threads.cpp:179)
lucene::store::FSDirectory::FSIndexInput::close()
(workdir/UnpackedTarball/clucene/src/core/CLucene/store/FSDirectory.cpp:225)
lucene::index::SegmentInfos::read(lucene::store::Directory*, char const*)
(workdir/UnpackedTarball/clucene/src/core/CLucene/index/SegmentInfos.cpp:770)
lucene::index::IndexFileDeleter::IndexFileDeleter(lucene::store::Directory*,
lucene::index::IndexDeletionPolicy*, lucene::index::SegmentInfos*,
std::ostream*, lucene::index::DocumentsWriter*)
(workdir/UnpackedTarball/clucene/src/core/CLucene/index/IndexFileDeleter.cpp:149)
lucene::index::IndexWriter::init(lucene::store::Directory*,
lucene::analysis::Analyzer*, bool, bool, lucene::index::IndexDeletionPolicy*,
bool)
(workdir/UnpackedTarball/clucene/src/core/CLucene/index/IndexWriter.cpp:262)
lucene::index::IndexWriter::IndexWriter(char const*,
lucene::analysis::Analyzer*, bool)
(workdir/UnpackedTarball/clucene/src/core/CLucene/index/IndexWriter.cpp:158)
HelpIndexer::indexDocuments() (helpcompiler/source/HelpIndexer.cxx:55)
Change-Id: I19cb9bd49b339d206a624c1f1d3dacdd909f4e25
diff --git a/external/clucene/UnpackedTarball_clucene.mk
b/external/clucene/UnpackedTarball_clucene.mk
index 5148fb7..4407f73 100644
--- a/external/clucene/UnpackedTarball_clucene.mk
+++ b/external/clucene/UnpackedTarball_clucene.mk
@@ -31,6 +31,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,clucene,\
external/clucene/patches/clucene-aix.patch \
external/clucene/patches/clucene-git1-win64.patch \
external/clucene/patches/clucene-ub.patch \
+ external/clucene/patches/clucene-mutex.patch \
))
ifneq ($(OS),WNT)
diff --git a/external/clucene/patches/clucene-mutex.patch
b/external/clucene/patches/clucene-mutex.patch
new file mode 100644
index 000..2a6b7d2
--- /dev/null
+++ b/external/clucene/patches/clucene-mutex.patch
@@ -0,0 +1,13 @@
+--- src/core/CLucene/store/FSDirectory.cpp
src/core/CLucene/store/FSDirectory.cpp
+@@ -219,9 +219,8 @@
+ _CLDECDELETE(handle);
+
+ //printf(handle=%d\n, handle-__cl_refcount);
+- if ( dounlock ){
+ mutex-unlock();
+- }else{
++ if ( !dounlock ){
+ delete mutex;
+ }
+ }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 74333, which changed state. Bug 74333 Summary: DATALOSS: Textfield or Picture inside a chart is hidden https://bugs.freedesktop.org/show_bug.cgi?id=74333 What|Removed |Added Status|REOPENED|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
[Libreoffice-commits] core.git: external/clucene
external/clucene/UnpackedTarball_clucene.mk |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit adef90807391c039408d40e283e38eaae77f0fee Author: Stephan Bergmann sberg...@redhat.com Date: Thu May 8 11:54:06 2014 +0200 Record patch upstream notification Change-Id: I210b995d4a8eb3e2f00ba982f7a6cf5ecd8e6f0d diff --git a/external/clucene/UnpackedTarball_clucene.mk b/external/clucene/UnpackedTarball_clucene.mk index 4407f73..efa7747 100644 --- a/external/clucene/UnpackedTarball_clucene.mk +++ b/external/clucene/UnpackedTarball_clucene.mk @@ -21,7 +21,9 @@ endif $(eval $(call gb_UnpackedTarball_set_patchlevel,clucene,0)) # clucene-multimap-put.patch was proposed upstream, see -# http://sourceforge.net/mailarchive/message.php?msg_id=29143260 +# http://sourceforge.net/mailarchive/message.php?msg_id=29143260 +# clucene-mutex.patch was proposed upstream, see +# http://sourceforge.net/mailarchive/message.php?msg_id=32314782 $(eval $(call gb_UnpackedTarball_add_patches,clucene,\ external/clucene/patches/clucene-debug.patch \ external/clucene/patches/clucene-multimap-put.patch \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - set_soenv.in sw/source
set_soenv.in |3 ++-
sw/source/ui/utlui/navipi.cxx |1 +
2 files changed, 3 insertions(+), 1 deletion(-)
New commits:
commit a6c044e24a397fa303989f1180c7bc944cbde1f7
Author: Herbert Dürr h...@apache.org
Date: Thu May 8 08:36:03 2014 +
#i124422# adjust include path for libc++ headers to the selected XCode
folder
While XCode5's xcode-select supports the -p and --print-path options, XCode4
officially only knows -print-path. XCode4 seems to tolerate --print-path
though
(tested on XCode4.6), so this can be universally used.
Patch-by: Thorsten Wagner thorsten.wagne...@gmail.com
Review-by: Herbert Duerr h...@apache.org
diff --git a/set_soenv.in b/set_soenv.in
index 2364a60..80fb9d2 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1441,7 +1441,8 @@ elsif ($platform =~ m/cygwin/)
elsif ($platform =~ m/darwin/)
{
$FRAMEWORKSHOME = @MACOSX_SDK_PATH@/System/Library/Frameworks;
-my $STLINC .=
$I./Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/c++/v1/;
+chomp( my $TOOLSPATH = `xcode-select --print-path` );
+my $STLINC .=
$I.$TOOLSPATH/Toolchains/XcodeDefault.xctoolchain/usr/lib/c++/v1/;
$SOLARINC .= $STLINC .
$I.$FRAMEWORKSHOME.$ds.JavaVM.framework.$ds.Headers;
$GUIBASE = aqua;
}
commit c104272ea1274dea87cd66cfaa61b34806708521
Author: Tsutomu Uchino ha...@apache.org
Date: Thu May 8 08:08:57 2014 +
#i27364# set line count of dropdown to 9 for document list of navigator on
Writer
diff --git a/sw/source/ui/utlui/navipi.cxx b/sw/source/ui/utlui/navipi.cxx
index 0ae216d..d3aea70 100644
--- a/sw/source/ui/utlui/navipi.cxx
+++ b/sw/source/ui/utlui/navipi.cxx
@@ -803,6 +803,7 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings,
aContentToolBox.SetHelpId(HID_NAVIGATOR_TOOLBOX );
aGlobalToolBox.SetHelpId(HID_NAVIGATOR_GLOBAL_TOOLBOX);
aDocListBox.SetHelpId(HID_NAVIGATOR_LISTBOX );
+aDocListBox.SetDropDownLineCount(9);
nDocLBIniHeight = aDocListBox.GetSizePixel().Height();
nZoomOutInit = nZoomOut = Resource::ReadShortRes();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/osl
sal/osl/unx/security.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit bdfcc8c92947b7c1629c3b7f3a0326ed01c4cf17
Author: Noel Grandin n...@peralex.com
Date: Thu May 8 12:08:55 2014 +0200
fix MACOS build
after commit 78b9537 various: sal_Bool-bool
Change-Id: Ia2842ac3c23d629a29edadf2b4699135b4d124ae
diff --git a/sal/osl/unx/security.cxx b/sal/osl/unx/security.cxx
index 6afdc1c..7466858 100644
--- a/sal/osl/unx/security.cxx
+++ b/sal/osl/unx/security.cxx
@@ -463,15 +463,15 @@ static bool SAL_CALL osl_psz_getConfigDir(oslSecurity
Security, sal_Char* pszDir
*/
#define MACOSX_CONFIG_DIR /Library/Application Support /* Used on iOS, too */
-static sal_Bool SAL_CALL osl_psz_getConfigDir(oslSecurity Security, sal_Char*
pszDirectory, sal_uInt32 nMax)
+static bool SAL_CALL osl_psz_getConfigDir(oslSecurity Security, sal_Char*
pszDirectory, sal_uInt32 nMax)
{
if( osl_psz_getHomeDir(Security, pszDirectory, nMax -
sizeof(MACOSX_CONFIG_DIR) + 1) )
{
strcat( pszDirectory, MACOSX_CONFIG_DIR );
-return sal_True;
+return true;
}
-return sal_False;
+return false;
}
#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/scripts
desktop/scripts/soffice.sh |6 -- 1 file changed, 4 insertions(+), 2 deletions(-) New commits: commit 95343c998a078b30ca83d2e1be40149f7f56fed7 Author: Stephan Bergmann sberg...@redhat.com Date: Thu May 8 12:11:24 2014 +0200 Disable rtl/alloc.h also for Helgrind Change-Id: I472d11d50a3b0810779108f3f81624ab9880fe8b diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh index 6d5dc38..26fb776 100755 --- a/desktop/scripts/soffice.sh +++ b/desktop/scripts/soffice.sh @@ -107,10 +107,12 @@ for arg in $@ $VALGRINDOPT ; do VALGRINDCHECK=valgrind --tool=$VALGRIND --trace-children=yes $valgrind_skip --num-callers=50 --error-limit=no echo use kill -SIGUSR2 pid to dump traces of active allocations checks=c$checks -if [ $VALGRIND = memcheck ] ; then +case $VALGRIND in +helgrind|memcheck) export G_SLICE=always-malloc export GLIBCXX_FORCE_NEW=1 -fi +;; +esac else echo Error: Can't find the tool \valgrind\, --valgrind option will be ignored exit 1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 63315] sign windows binaries during build
https://bugs.freedesktop.org/show_bug.cgi?id=63315 David Tardon dtar...@redhat.com changed: What|Removed |Added Resolution|FIXED |WONTFIX --- Comment #4 from David Tardon dtar...@redhat.com --- (In reply to comment #3) Fixed by cloph in https://gerrit.libreoffice.org/9176, so windows signing depends on slowcheck. That was not the goal of this Easy Hack--that that problem would be fixed as well (and I mean really fixed, not just postponed) was just a side effect. Since we agreed not to do this - WONTFIX. -- 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: include/jvmfwk jvmfwk/source
include/jvmfwk/framework.h | 33 ++---
jvmfwk/source/framework.cxx | 29 ++---
2 files changed, 4 insertions(+), 58 deletions(-)
New commits:
commit 5a8b1b16de62bf595df7927891d539691ac26a89
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu May 8 12:58:01 2014 +0200
Remove unused jfw_setJRELocations
Change-Id: If71cc5052f7ddfbc2d69ba01aa0cd3be2a4def8e
diff --git a/include/jvmfwk/framework.h b/include/jvmfwk/framework.h
index 50480da..570f852 100644
--- a/include/jvmfwk/framework.h
+++ b/include/jvmfwk/framework.h
@@ -337,7 +337,7 @@ JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL
jfw_isVMRunning(sal_Bool *bRunning)
installation and checks if they there is one among them that supports
a set of features (currently only accessibilty is possible). If none was
found then it also uses a list of paths, which have been registered
-by codejfw_addJRELocation/code or codejfw_setJRELocations/code
+by codejfw_addJRELocation/code
to find JREs. Found JREs are examined in the same way./p
p
A JRE installation is only selected if it meets the version requirements.
@@ -394,7 +394,7 @@ JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL
jfw_findAndSelectJRE(JavaInfo **pIn
the plug-in libraries to provide lists of available codeJavaInfo/code
objects where each object represents a JRE (see vendorplugin.h,
getAllJavaInfos). It also uses a list of paths, which have been registered
-by codejfw_addJRELocation/code or codejfw_setJRELocations/code.
+by codejfw_addJRELocation/code.
It is checked if the path still contains a valid JRE and if so the
respective
codeJavaInfo/code object will be appended to the array unless there is
already an equal object./p
@@ -729,38 +729,9 @@ JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL
jfw_getUserClassPath(rtl_uString **
JFW_E_CONFIGURATION mode was not properly set or their prerequisites
were not met.br/
JFW_E_DIRECT_MODE the function cannot be used in this mode.
-@see jfw_setJRELocations
*/
JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_addJRELocation(rtl_uString *
sLocation);
-/** saves the locations of a number of JREs.
-
-p
-The function does not verify if the paths points to JRE. However,
-it makes sure that every path is unique. That is, if the array
-contains strings which are the same then only one is stored./p
-p
-If codearLocations/code is NULL or it has the length null (nSize = 0)
-then all previously stored paths are deleted. Otherwise,
-the old values are overwritten./p
-
-@param arLocations
-[in] array of paths to locations of JREs.
-
-@param nSize
-[in] the size of the array codearLocations/code
-
-@return
-JFW_E_NONE function ran successfully.br/
-JFW_E_INVALIDARG arLocation is NULL and nSize is not null.br/
-JFW_E_ERROR An error occurred.br/
-JFW_E_CONFIGURATION mode was not properly set or their prerequisites
-were not met.br/
-JFW_E_DIRECT_MODE the function cannot be used in this mode.
-@see jfw_addJRELocations
- */
-JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_setJRELocations(
-rtl_uString ** arLocations, sal_Int32 nSize);
/** obtains an array containing paths to JRE installations.
p
diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx
index dcaac1b..56e24c6 100644
--- a/jvmfwk/source/framework.cxx
+++ b/jvmfwk/source/framework.cxx
@@ -171,7 +171,7 @@ javaFrameworkError SAL_CALL jfw_findAllJREs(JavaInfo
***pparInfo, sal_Int32 *pSi
rtl_freeMemory(arInfos);
//Check if the current plugin can detect JREs at the location
-// of the paths added by jfw_setJRELocations or jfw_addJRELocation
+// of the paths added by jfw_addJRELocation
//get the function from the plugin
#ifndef DISABLE_DYNLOADING
jfw_plugin_getJavaInfoByPath_ptr jfw_plugin_getJavaInfoByPathFunc =
@@ -591,7 +591,7 @@ javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo
**pInfo)
if (!pluginLib.is())
return JFW_E_NO_PLUGIN;
//Check if the current plugin can detect JREs at the location
-// of the paths added by jfw_setJRELocations or
jfw_addJRELocation
+// of the paths added by jfw_addJRELocation
//get the function from the plugin
jfw_plugin_getJavaInfoByPath_ptr
jfw_plugin_getJavaInfoByPathFunc =
(jfw_plugin_getJavaInfoByPath_ptr)
pluginLib.getFunctionSymbol(
@@ -1109,31 +1109,6 @@ javaFrameworkError SAL_CALL
jfw_addJRELocation(rtl_uString * sLocation)
}
-javaFrameworkError SAL_CALL jfw_setJRELocations(
-rtl_uString ** arLocations, sal_Int32 nLen)
-{
-javaFrameworkError errcode = JFW_E_NONE;
-try
-{
-osl::MutexGuard guard(jfw::FwkMutex::get());
-if (jfw::getMode() ==
Re: fdo#63315: sign windows binaries during build
On 07/05/14 14:17, David Tardon wrote: Hi, On Wed, May 07, 2014 at 10:41:59AM +0200, Christian Lohmaier wrote: Hi David, *, On Wed, May 7, 2014 at 10:17 AM, David Tardon dtar...@redhat.com wrote: If we really want to continue to use this script for signing, IMHO it should be done as a separate step after build. Which in effect it is. After slowcheck it is more or less separate. Except that it isn't. There are still tasks that are not needed by unit tests, so they could end up running in parallel with the signing. I have already mentioned gallery creation, but there is generation of help, UI file translations and possibly others. All of these use internal tools, therefore they use some internal libraries. The only way to ensure there will be no problems in this area is to move the signing to instsetoo_native and let the target depend on $(call gb_Postprocess_get_target,AllModulesButInstsetNative) Which puts it outside of the normal build anyway. why don't we do the signing in the same rule that links the library? that would avoid all potential dependency problems. (and gbuild does something similar with sn.exe for CLI libraries already) is the signing interactive or is there some other reason why that wouldn't be possible? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: jvmfwk/plugins
jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit f5ed2f4e926016d23617355c94dd2292b40e6986
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu May 8 13:10:46 2014 +0200
Resolves: rhbz#1092589 Thoroughly check whether JRE is still present
...not only on Mac OS X. Was able to reproduce this on Fedora 20 where
current
JRE was /usr/lib/jvm/java-1.8.0-openjdk-1.8.0.5.x86_64 but for whatever
reason
there was also a left-behind /usr/lib/jvm/java-1.8.0-openjdk-1.8.0.0.x86_64
tree
(containing just a handful of sub-dirs, but no real content) that was still
recorded in my
~/.config/libreoffice/4/user/config/javasettings_Linux_X86_64.xml
Change-Id: Ie477c5a506a430f6c29525f6c558dbc18bbf1c48
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index 0069aec..ca816cb 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -772,10 +772,10 @@ javaPluginError jfw_plugin_existJRE(const JavaInfo
*pInfo, sal_Bool *exist)
{
ret = JFW_PLUGIN_E_ERROR;
}
-#ifdef MACOSX
//We can have the situation that the JavaVM runtime library is not
//contained within JAVA_HOME. Then the check for JAVA_HOME would return
//true although the runtime library may not be loadable.
+//Or the JAVA_HOME directory of a deinstalled JRE left behind.
if (ret == JFW_PLUGIN_E_NONE *exist == sal_True)
{
OUString sRuntimeLib = getRuntimeLib(pInfo-arVendorData);
@@ -803,7 +803,6 @@ javaPluginError jfw_plugin_existJRE(const JavaInfo *pInfo,
sal_Bool *exist)
+ sRuntimeLib + \n);
}
}
-#endif
return ret;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/doc/doclay.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 6d14a2c264506e8d5272e87e99f140b1f976b6ef
Author: Julien Nabet serval2...@yahoo.fr
Date: Mon Apr 21 13:54:07 2014 +0200
Related: fdo#77720 Writer crashes when running Mail Merge Wizard
Change-Id: I02695420ff4f54ad15b077ab1d16f27ff684e5da
Reviewed-on: https://gerrit.libreoffice.org/9111
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index 4afd2ee..7b601c8 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -721,7 +721,7 @@ SwFlyFrmFmt* SwDoc::MakeFlySection( RndStdIds eAnchorType,
const SfxPoolItem * pItem = NULL;
-if (bCalledFromShell !lcl_IsItemSet(*pNewTxtNd, RES_PARATR_ADJUST)
+if (bCalledFromShell pAnchorNode !lcl_IsItemSet(*pNewTxtNd,
RES_PARATR_ADJUST)
SFX_ITEM_SET == pAnchorNode-GetSwAttrSet().
GetItemState(RES_PARATR_ADJUST, true, pItem))
{
___
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' - jvmfwk/plugins
jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 610a6a4e262868381677838fdd3571e22adee12e
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu May 8 13:10:46 2014 +0200
Resolves: rhbz#1092589 Thoroughly check whether JRE is still present
...not only on Mac OS X. Was able to reproduce this on Fedora 20 where
current
JRE was /usr/lib/jvm/java-1.8.0-openjdk-1.8.0.5.x86_64 but for whatever
reason
there was also a left-behind /usr/lib/jvm/java-1.8.0-openjdk-1.8.0.0.x86_64
tree
(containing just a handful of sub-dirs, but no real content) that was still
recorded in my
~/.config/libreoffice/4/user/config/javasettings_Linux_X86_64.xml
Change-Id: Ie477c5a506a430f6c29525f6c558dbc18bbf1c48
(cherry picked from commit f5ed2f4e926016d23617355c94dd2292b40e6986)
Reviewed-on: https://gerrit.libreoffice.org/9279
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index a3449c3..d3650f9 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -765,10 +765,10 @@ javaPluginError jfw_plugin_existJRE(const JavaInfo
*pInfo, sal_Bool *exist)
{
ret = JFW_PLUGIN_E_ERROR;
}
-#ifdef MACOSX
//We can have the situation that the JavaVM runtime library is not
//contained within JAVA_HOME. Then the check for JAVA_HOME would return
//true although the runtime library may not be loadable.
+//Or the JAVA_HOME directory of a deinstalled JRE left behind.
if (ret == JFW_PLUGIN_E_NONE *exist == sal_True)
{
OUString sRuntimeLib = getRuntimeLib(pInfo-arVendorData);
@@ -796,7 +796,6 @@ javaPluginError jfw_plugin_existJRE(const JavaInfo *pInfo,
sal_Bool *exist)
+ sRuntimeLib + \n);
}
}
-#endif
return ret;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on||52226 -- 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 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on|52226 | -- 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: config_host/config_options.h.in config_host.mk.in configure.ac jvmfwk/plugins sal/Library_sal.mk
config_host.mk.in |1 config_host/config_options.h.in |3 + configure.ac| 33 jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 10 -- sal/Library_sal.mk |2 - 5 files changed, 44 insertions(+), 5 deletions(-) New commits: commit eae3f52f94f2ce3633539ad782d5c1e768c52089 Author: Stephan Bergmann sberg...@redhat.com Date: Thu May 8 14:20:04 2014 +0200 New --disable-runtime-optimizations ...to better serve the needs of tools like -fsanitize=address Change-Id: Ic2f2b981b2f5c1bc95ff91bc7a8d21fbb695dc8d diff --git a/config_host.mk.in b/config_host.mk.in index 6b68d93..ca57978 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -159,6 +159,7 @@ export ENABLE_PDFIMPORT=@ENABLE_PDFIMPORT@ export ENABLE_RANDR=@ENABLE_RANDR@ export ENABLE_RELEASE_BUILD=@ENABLE_RELEASE_BUILD@ export ENABLE_REPORTBUILDER=@ENABLE_REPORTBUILDER@ +export ENABLE_RUNTIME_OPTIMIZATIONS=@ENABLE_RUNTIME_OPTIMIZATIONS@ export ENABLE_SCRIPTING_BEANSHELL=@ENABLE_SCRIPTING_BEANSHELL@ export ENABLE_SCRIPTING_JAVASCRIPT=@ENABLE_SCRIPTING_JAVASCRIPT@ export ENABLE_SDREMOTE=@ENABLE_SDREMOTE@ diff --git a/config_host/config_options.h.in b/config_host/config_options.h.in index 6c882d7..0223f08 100644 --- a/config_host/config_options.h.in +++ b/config_host/config_options.h.in @@ -9,7 +9,8 @@ * Whether we want to link as many object files as possible into one big object. * True in case of --enable-lto or --enable-mergelibs. */ - #define STATIC_LINKING 0 +#define ENABLE_RUNTIME_OPTIMIZATIONS 0 + #endif diff --git a/configure.ac b/configure.ac index 682aee6..4811cd3 100644 --- a/configure.ac +++ b/configure.ac @@ -967,6 +967,15 @@ AC_ARG_ENABLE(symbols, This enables -g compiler flag for GCC or equivalent, without changing anything else compared to productive code.])) +AC_ARG_ENABLE(runtime-optimizations, +AS_HELP_STRING([--disable-runtime-optimizations], +[Statically disable certain runtime optimizations (like rtl/alloc.h or + JVM JIT) that are known to interact badly with certain dynamic analysis + tools (like -fsanitize=address or Valgrind). By default, disabled iff + CC contains -fsanitize=address. (For Valgrind, those runtime + optimizations are typcially disabled dynamically via + RUNNING_ON_VALGRIND.)])) + AC_ARG_ENABLE(compiler-plugins, AS_HELP_STRING([--enable-compiler-plugins], [Enable compiler plugins that will perform additional checks during @@ -5625,6 +5634,30 @@ AC_DEFINE_UNQUOTED(SAL_TYPES_ALIGNMENT4,$SAL_TYPES_ALIGNMENT4) AC_DEFINE_UNQUOTED(SAL_TYPES_ALIGNMENT8,$SAL_TYPES_ALIGNMENT8) dnl === +dnl Check whether to enable runtime optimizations +dnl === +ENABLE_RUNTIME_OPTIMIZATIONS= +AC_MSG_CHECKING([whether to enable runtime optimizations]) +if test -z $enable_runtime_optimizations; then +for i in $CC; do +case $i in +-fsanitize=address) +enable_runtime_optimizations=no +break +;; +esac +done +fi +if test $enable_runtime_optimizations != no; then +ENABLE_RUNTIME_OPTIMIZATIONS=TRUE +AC_DEFINE(ENABLE_RUNTIME_OPTIMIZATIONS) +AC_MSG_RESULT([yes]) +else +AC_MSG_RESULT([no]) +fi +AC_SUBST([ENABLE_RUNTIME_OPTIMIZATIONS]) + +dnl === dnl Check if valgrind headers are available dnl === ENABLE_VALGRIND= diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx index ca816cb..266cdc6 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx @@ -34,6 +34,7 @@ #include string.h #include boost/scoped_array.hpp +#include config_options.h #include osl/diagnose.h #include rtl/ustring.hxx #include rtl/ustrbuf.hxx @@ -58,10 +59,13 @@ #ifdef ANDROID #include osl/detail/android-bootstrap.h #else -#if defined HAVE_VALGRIND_HEADERS +#if !ENABLE_RUNTIME_OPTIMIZATIONS +#define FORCE_INTERPRETED 1 +#elif defined HAVE_VALGRIND_HEADERS #include valgrind/valgrind.h +#define FORCE_INTERPRETED RUNNING_ON_VALGRIND #else -#define RUNNING_ON_VALGRIND 0 +#define FORCE_INTERPRETED 0 #endif #endif @@ -627,7 +631,7 @@ javaPluginError jfw_plugin_startJavaVirtualMachine( // Valgrind typically emits many false errors when executing JIT'ed JVM // code, so force the JVM into interpreted mode: -bool forceInterpreted = RUNNING_ON_VALGRIND 0; +bool forceInterpreted = FORCE_INTERPRETED 0; // Some testing with Java 1.4 showed that JavaVMOption.optionString has to
[Libreoffice-commits] core.git: configure.ac
configure.ac | 15 ++- 1 file changed, 14 insertions(+), 1 deletion(-) New commits: commit d15540c431587368d749b53074af25cf865e7a5f Author: Stephan Bergmann sberg...@redhat.com Date: Thu May 8 14:37:19 2014 +0200 Prevent false positive configure check under Clang -fsanitize=address (at the expense of effectively disabling the check in that case, though) Change-Id: I57a0f4f815e8e8dac09e8695f3281504a6501569 diff --git a/configure.ac b/configure.ac index 4811cd3..7f2e48e 100644 --- a/configure.ac +++ b/configure.ac @@ -6522,7 +6522,20 @@ _ACEOF if ! $CXX $CXXFLAGS $CPPFLAGS $LINKFLAGSSHL -fPIC -fvisibility-inlines-hidden conftestlib1.cc -o libconftest1$DLLPOST /dev/null 25; then gccvisinlineshiddenok=no else -if ! $CXX $CXXFLAGS $CPPFLAGS $LINKFLAGSSHL -fPIC -fvisibility-inlines-hidden conftestlib2.cc -L. -lconftest1 $LINKFLAGSNOUNDEFS -o libconftest2$DLLPOST /dev/null 25; then +dnl At least Clang -fsanitize=address is known to not work with +dnl -z defs (unsetting which makes the test moot, though): +my_linkflagsnoundefs=$LINKFLAGSNOUNDEFS +if test $COM_GCC_IS_CLANG = TRUE; then +for i in $CXX; do +case $i in +-fsanitize=address) +my_linkflagsnoundefs= +break +;; +esac +done +fi +if ! $CXX $CXXFLAGS $CPPFLAGS $LINKFLAGSSHL -fPIC -fvisibility-inlines-hidden conftestlib2.cc -L. -lconftest1 $my_linkflagsnoundefs -o libconftest2$DLLPOST /dev/null 25; then gccvisinlineshiddenok=no fi fi ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 pierre-yves samyn pierre-yves.sa...@laposte.net changed: What|Removed |Added Depends on||68981 -- 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 pierre-yves samyn pierre-yves.sa...@laposte.net changed: What|Removed |Added Depends on|68981 | -- 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 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 --- Comment #136 from pierre-yves samyn pierre-yves.sa...@laposte.net --- Moving bug 68891 (dataloss: thisComponent.store corrupts the macro library password) from MAB 4.1 to MAB 4.2 because LO 4.1 is reaching its End-Of-Life. Regards Pierre-Yves -- 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 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 --- Comment #137 from pierre-yves samyn pierre-yves.sa...@laposte.net --- (In reply to comment #136) Moving bug 68891 (dataloss: thisComponent.store corrupts the macro library password) from MAB 4.1 to MAB 4.2 because LO 4.1 is reaching its End-Of-Life. Sorry it is 68981 Regards Pierre-Yves -- 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: Branch 'libreoffice-4-2' - sc/inc sc/source
sc/inc/columnspanset.hxx |8 +
sc/source/core/data/columnspanset.cxx | 47 ++
sc/source/ui/inc/undobase.hxx | 13 +
sc/source/ui/inc/undoblk.hxx |4 ++
sc/source/ui/undo/undobase.cxx| 45 +++-
sc/source/ui/undo/undoblk3.cxx| 12 +++-
sc/source/ui/view/viewfunc.cxx| 32 ---
7 files changed, 155 insertions(+), 6 deletions(-)
New commits:
commit 23e43dfd8a4b26a9adee87e5274b82a6d1d84a57
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Sat May 3 00:50:46 2014 -0400
fdo#78062: Broadcast only on non-empty cells within deleted range.
We don't want to broadcast over the whole selected range, which may be
the whole sheet which is well over 1 billion cells !
(cherry picked from commit af7df25bcc8bc95462e2b3bf8c003d035111a479)
Conflicts:
sc/source/ui/inc/undobase.hxx
sc/source/ui/undo/undobase.cxx
Change-Id: I7c139ce5efe09312cf824e35f0efe551184032eb
Reviewed-on: https://gerrit.libreoffice.org/9240
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
diff --git a/sc/inc/columnspanset.hxx b/sc/inc/columnspanset.hxx
index 62e96a8..c12f13e 100644
--- a/sc/inc/columnspanset.hxx
+++ b/sc/inc/columnspanset.hxx
@@ -39,8 +39,10 @@ struct RowSpan
*/
class ColumnSpanSet : boost::noncopyable
{
+public:
typedef mdds::flat_segment_treeSCROW, bool ColumnSpansType;
+private:
struct ColumnType
{
ColumnSpansType maSpans;
@@ -81,6 +83,12 @@ public:
void set(SCTAB nTab, SCCOL nCol, SCROW nRow1, SCROW nRow2, bool bVal);
void set(const ScRange rRange, bool bVal);
+/**
+ * Scan specified range in a specified sheet and mark all non-empty cells
+ * with specified boolean value.
+ */
+void scan(const ScDocument rDoc, SCTAB nTab, SCCOL nCol1, SCROW nRow1,
SCCOL nCol2, SCROW nRow2, bool bVal);
+
void executeAction(Action ac) const;
void executeColumnAction(ScDocument rDoc, ColumnAction ac) const;
};
diff --git a/sc/source/core/data/columnspanset.cxx
b/sc/source/core/data/columnspanset.cxx
index efa51b5..7bc517b 100644
--- a/sc/source/core/data/columnspanset.cxx
+++ b/sc/source/core/data/columnspanset.cxx
@@ -20,6 +20,29 @@
namespace sc {
+namespace {
+
+class ColumnScanner
+{
+ColumnSpanSet::ColumnSpansType mrRanges;
+bool mbVal;
+public:
+ColumnScanner(ColumnSpanSet::ColumnSpansType rRanges, bool bVal) :
+mrRanges(rRanges), mbVal(bVal) {}
+
+void operator() (const sc::CellStoreType::value_type node, size_t
nOffset, size_t nDataSize)
+{
+if (node.type == sc::element_type_empty)
+return;
+
+size_t nRow = node.position + nOffset;
+size_t nEndRow = nRow + nDataSize; // Last row of current block plus 1
+mrRanges.insert_back(nRow, nEndRow, mbVal);
+}
+};
+
+}
+
RowSpan::RowSpan(SCROW nRow1, SCROW nRow2) : mnRow1(nRow1), mnRow2(nRow2) {}
ColumnSpanSet::ColumnType::ColumnType(SCROW nStart, SCROW nEnd, bool bInit) :
@@ -94,6 +117,30 @@ void ColumnSpanSet::set(const ScRange rRange, bool bVal)
}
}
+void ColumnSpanSet::scan(
+const ScDocument rDoc, SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
SCROW nRow2, bool bVal)
+{
+if (!ValidColRow(nCol1, nRow1) || !ValidColRow(nCol2, nRow2))
+return;
+
+if (nCol1 nCol2 || nRow1 nRow2)
+return;
+
+const ScTable* pTab = rDoc.FetchTable(nTab);
+if (!pTab)
+return;
+
+for (SCCOL nCol = nCol1; nCol = nCol2; ++nCol)
+{
+ColumnType rCol = getColumn(nTab, nCol);
+
+const CellStoreType rSrcCells = pTab-aCol[nCol].maCells;
+
+ColumnScanner aScanner(rCol.maSpans, bVal);
+ParseBlock(rSrcCells.begin(), rSrcCells, aScanner, nRow1, nRow2);
+}
+}
+
void ColumnSpanSet::executeAction(Action ac) const
{
for (size_t nTab = 0; nTab maDoc.size(); ++nTab)
diff --git a/sc/source/ui/inc/undobase.hxx b/sc/source/ui/inc/undobase.hxx
index 5c9df4b..fd84303 100644
--- a/sc/source/ui/inc/undobase.hxx
+++ b/sc/source/ui/inc/undobase.hxx
@@ -24,6 +24,9 @@
#include global.hxx
#include address.hxx
#include docsh.hxx
+#include columnspanset.hxx
+
+#include boost/ptr_container/ptr_map.hpp
class ScDocument;
class ScDocShell;
@@ -39,6 +42,8 @@ class ScSimpleUndo: public SfxUndoAction
public:
TYPEINFO();
+typedef boost::ptr_mapSCTAB,sc::ColumnSpanSet DataSpansType;
+
ScSimpleUndo( ScDocShell* pDocSh );
virtual ~ScSimpleUndo();
@@ -59,6 +64,14 @@ protected:
void BroadcastChanges( const ScRange rRange );
+/**
+ * Broadcast changes on specified spans.
+ *
+ * @param rSpans container that specifies all spans whose changes need to
+ * be broadcasted.
+ */
+
[Reminder] feature-freeze for 4.3.0 in two weeks
Hi *, this is a reminder that Monday the week after the next (i.e. May 19th) is feature-freeze for 4.3.0 See https://wiki.documentfoundation.org/ReleasePlan/4.3#4.3.0_release for the detailed schedule. ciao Christian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - icon-themes/galaxy idl/source include/svx sd/source sd/uiconfig svx/source
icon-themes/galaxy/svx/res/zoom_page_statusbar.png |binary
idl/source/objects/object.cxx |2
include/svx/dialogs.hrc|6 +-
include/svx/zoomctrl.hxx | 15 +-
sd/source/ui/app/sddll.cxx |1
sd/uiconfig/simpress/statusbar/statusbar.xml |1
svx/source/stbctrls/modctrl.cxx|7 ---
svx/source/stbctrls/stbctrls.src | 13 +
svx/source/stbctrls/zoomctrl.cxx | 46 +
9 files changed, 71 insertions(+), 20 deletions(-)
New commits:
commit d6f5d4ee2cd0654497f1af37421d788411db762c
Author: Caolán McNamara caol...@redhat.com
Date: Thu May 8 14:27:53 2014 +0100
add a status bar icon to fit slide to window
Change-Id: I2c1d1fc7425b0aaad2a2445e0ac71ddc38410fdb
diff --git a/icon-themes/galaxy/svx/res/zoom_page_statusbar.png
b/icon-themes/galaxy/svx/res/zoom_page_statusbar.png
new file mode 100644
index 000..5fb2d59
Binary files /dev/null and b/icon-themes/galaxy/svx/res/zoom_page_statusbar.png
differ
diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc
index fb417e6..09a122d 100644
--- a/include/svx/dialogs.hrc
+++ b/include/svx/dialogs.hrc
@@ -981,12 +981,14 @@
#define RID_SVXSTR_DOC_LOAD (SVX_OOO_BUILD_START + 6) // 1236
#define RID_SVXSTR_ERR_OLD_PASSWD(SVX_OOO_BUILD_START + 7) // 1237
#define RID_SVXSTR_ERR_REPEAT_PASSWD (SVX_OOO_BUILD_START + 8) // 1238
+#define RID_SVXBMP_ZOOM_PAGE (SVX_OOO_BUILD_START + 9) // 1239
+#define RID_SVXSTR_FIT_SLIDE (SVX_OOO_BUILD_START + 10) // 1240
// sidebar-related resources (defined in the appropriate .hrc's)
-#define RID_SVX_SIDEBAR_BEGIN(RID_SVX_START + 1240)
+#define RID_SVX_SIDEBAR_BEGIN(RID_SVX_START + 1241)
// !!! IMPORTANT: consider and update RID_SVXSTR_NEXTFREE when introducing new
RIDs for Strings !!!
-#define RID_SVXSTR_NEXTFREE (RID_SVX_START + 1270)
+#define RID_SVXSTR_NEXTFREE (RID_SVX_START + 1271)
// if we have _a_lot_ time, we should group the resource ids by type, instead
diff --git a/include/svx/zoomctrl.hxx b/include/svx/zoomctrl.hxx
index 29d9472..c6937ee 100644
--- a/include/svx/zoomctrl.hxx
+++ b/include/svx/zoomctrl.hxx
@@ -21,8 +21,7 @@
#include sfx2/stbitem.hxx
#include svx/svxdllapi.h
-
-// class SvxZoomToolBoxControl ---
+#include vcl/image.hxx
class SVX_DLLPUBLIC SvxZoomStatusBarControl : public SfxStatusBarControl
{
@@ -42,6 +41,18 @@ public:
};
+class SVX_DLLPUBLIC SvxZoomPageStatusBarControl : public SfxStatusBarControl
+{
+private:
+Image maImage;
+public:
+virtual voidPaint( const UserDrawEvent rEvt ) SAL_OVERRIDE;
+virtual boolMouseButtonDown( const MouseEvent rEvt ) SAL_OVERRIDE;
+
+SFX_DECL_STATUSBAR_CONTROL();
+
+SvxZoomPageStatusBarControl(sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar
rStb);
+};
#endif
diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx
index 7b6b89c..26db281 100644
--- a/sd/source/ui/app/sddll.cxx
+++ b/sd/source/ui/app/sddll.cxx
@@ -239,6 +239,7 @@ void SdDLL::RegisterControllers()
SvxCTLTextTbxCtrl::RegisterControl(SID_ATTR_PARA_RIGHT_TO_LEFT, pMod);
// register StatusBarControls
+SvxZoomPageStatusBarControl::RegisterControl( SID_ZOOM_ENTIRE_PAGE, pMod );
SvxZoomStatusBarControl::RegisterControl( SID_ATTR_ZOOM, pMod );
SvxPosSizeStatusBarControl::RegisterControl( SID_ATTR_SIZE, pMod );
SvxModifyControl::RegisterControl( SID_DOC_MODIFIED, pMod );
diff --git a/sd/uiconfig/simpress/statusbar/statusbar.xml
b/sd/uiconfig/simpress/statusbar/statusbar.xml
index 24224fe..78042ef 100644
--- a/sd/uiconfig/simpress/statusbar/statusbar.xml
+++ b/sd/uiconfig/simpress/statusbar/statusbar.xml
@@ -24,6 +24,7 @@
statusbar:statusbaritem xlink:href=.uno:Signature statusbar:align=center
statusbar:ownerdraw=true statusbar:width=16/
statusbar:statusbaritem xlink:href=.uno:PageStatus statusbar:align=left
statusbar:width=124/
statusbar:statusbaritem xlink:href=.uno:LayoutStatus
statusbar:align=left statusbar:autosize=true statusbar:width=54/
+ statusbar:statusbaritem xlink:href=.uno:ZoomPage statusbar:align=center
statusbar:ownerdraw=true statusbar:width=9/
statusbar:statusbaritem xlink:href=.uno:ZoomSlider
statusbar:align=center statusbar:ownerdraw=true statusbar:width=130/
statusbar:statusbaritem xlink:href=.uno:Zoom statusbar:align=center
statusbar:width=36/
/statusbar:statusbar
diff --git a/svx/source/stbctrls/modctrl.cxx b/svx/source/stbctrls/modctrl.cxx
index 15bc693..63d50fd 100644
--- a/svx/source/stbctrls/modctrl.cxx
+++ b/svx/source/stbctrls/modctrl.cxx
@@ -136,10 +136,6 @@ void SvxModifyControl::_repaint()
GetStatusBar().SetItemData( GetId(), 0 );// force repaint
}
-
-
-namespace {
-
/**
* Given a bounding
[Libreoffice-commits] website.git: Branch 'update' - check.php
check.php | 52 +---
1 file changed, 29 insertions(+), 23 deletions(-)
New commits:
commit ce06eca1035294e1779662ce98de882fe6072878
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date: Thu May 8 15:58:25 2014 +0200
fix update for 4.2 line, enable update to 4.2.4 and 4.1.6
diff --git a/check.php b/check.php
index 6805eff..e8b5127 100644
--- a/check.php
+++ b/check.php
@@ -254,28 +254,34 @@ $build_hash_to_version = array(
'1c1366bba2ba2b554cd2ca4d87c06da81c05d24' = '4.1.5.3', # unscheduled,
Final
# 4.1.6
'a59ce81388f477fc89db57f0c27f222f31884eb' = '4.1.6.1',
+'40ff705089295be5be0aae9b15123f687c05b0a' = '4.1.6.2', # Final
##
# 4.2.0 versions
-'c2b9ad37f8a8de9c7dbdd76c86aecf638810705' = '4.2.0.0.a1', # alpha1
-'f4ca7b35f580827ad2c69ea6d29f7c9b48ebbac' = '4.2.0.0.b1', # beta1
-'1a27be92e320f97c20d581a69ef1c8b99ea9885' = '4.2.0.0.b2', # beta2
-'7bf567613a536ded11709b952950c9e8f7181a4' = '4.2.0.1',
-'cd65d6220c5694ee7012d7863bcde3455c9e3c3' = '4.2.0.2',
-'601a398b803303d1a40a3299729531824fe0db5' = '4.2.0.2', # buildfix1
-'c63c03decdf780d8fb80823950665b782ec9ecd' = '4.2.0.3',
-'05dceb5d363845f2cf968344d7adab8dcfb2ba7' = '4.2.0.4', # unscheduled,
Final
+'c2b9ad37f8a8de9c7dbdd76c86aecf6388107056' = '4.2.0.0.a1', # alpha1
+'f4ca7b35f580827ad2c69ea6d29f7c9b48ebbac7' = '4.2.0.0.b1', # beta1
+'1a27be92e320f97c20d581a69ef1c8b99ea9885d' = '4.2.0.0.b2', # beta2
+'7bf567613a536ded11709b952950c9e8f7181a4a' = '4.2.0.1',
+'cd65d6220c5694ee7012d7863bcde3455c9e3c30' = '4.2.0.2',
+'601a398b803303d1a40a3299729531824fe0db56' = '4.2.0.2', # buildfix1
+'c63c03decdf780d8fb80823950665b782ec9ecd0' = '4.2.0.3',
+'05dceb5d363845f2cf968344d7adab8dcfb2ba71' = '4.2.0.4', # unscheduled,
Final
# 4.2.1
-'d7dbbd7842e6a58b0f521599204e827654e1fb8' = '4.2.1.1', # rc1, was made
final
+'d7dbbd7842e6a58b0f521599204e827654e1fb8b' = '4.2.1.1', # rc1, was made
final
# 4.2.2
-'3be8cda0bddd8e430d8cda1ebfd581265cca5a0' = '4.2.2.1', # rc1, was made
final
+'3be8cda0bddd8e430d8cda1ebfd581265cca5a0f' = '4.2.2.1', # rc1, was made
final
# 4.2.3
-'3d4fc3d9dbf8f4c0aeb61498a81f91c5b7922f1' = '4.2.3.1',
-'7c5c769e412afd32da4d946d2cb0c8b0674e95e' = '4.2.3.2',
-'6c3586f855673fa6a1576797f575b31ac6fa0ba' = '4.2.3.3',
-'882f8a0a489bc99a9e60c7905a60226254cb6ff' = '4.2.3.3', # hotfix1, Final
+'3d4fc3d9dbf8f4c0aeb61498a81f91c5b7922f13' = '4.2.3.1',
+'7c5c769e412afd32da4d946d2cb0c8b0674e95e0' = '4.2.3.2',
+'6c3586f855673fa6a1576797f575b31ac6fa0ba3' = '4.2.3.3',
+'882f8a0a489bc99a9e60c7905a60226254cb6ff0' = '4.2.3.3', # hotfix1, Final
# 4.2.4
-'d4c441391e20647b3d2e8dde4d20aa868e77e51' = '4.2.4.1',
+'d4c441391e20647b3d2e8dde4d20aa868e77e515' = '4.2.4.1',
+'63150712c6d317d27ce2db16eb94c2f3d7b699f8' = '4.2.4.2', # Final
+
+##
+# 4.3.0 versions
+'46cfcd5a05aa1d13fecd73f5a25b64b8d8dd6781' = '4.3.0.0.a1', # alpha1
);
# Descriptions of the target versions
@@ -288,18 +294,18 @@ $build_hash_to_version = array(
# where 'type' and 'lang' will be substitued with the right value
# NOTE: '' in the URL has to be escaped as amp;
$update_map = array(
-'stable' = array('gitid' =
'1c1366bba2ba2b554cd2ca4d87c06da81c05d24',
- 'id' = 'LibreOffice 4.1.5',
- 'version' = '4.1.5',
+'stable' = array('gitid' =
'40ff705089295be5be0aae9b15123f687c05b0a',
+ 'id' = 'LibreOffice 4.1.6',
+ 'version' = '4.1.6',
'update_type' = 'text/html',
- 'update_src' =
'http://www.libreoffice.org/download/libreoffice-stable/?type=typeamp;lang=langamp;version=4.1.5',
+ 'update_src' =
'http://www.libreoffice.org/download/libreoffice-stable/?type=typeamp;lang=langamp;version=4.1.6',
'substitute' = true ),
-'latest' = array('gitid' =
'882f8a0a489bc99a9e60c7905a60226254cb6ff',
- 'id' = 'LibreOffice 4.2.3',
- 'version' = '4.2.3',
+'latest' = array('gitid' =
'63150712c6d317d27ce2db16eb94c2f3d7b699f8',
+ 'id' = 'LibreOffice 4.2.4',
+ 'version' = '4.2.4',
'update_type' = 'text/html',
- 'update_src' =
'http://www.libreoffice.org/download/libreoffice-fresh/?type=typeamp;lang=langamp;version=4.2.3',
+ 'update_src' =
'http://www.libreoffice.org/download/libreoffice-fresh/?type=typeamp;lang=langamp;version=4.2.4',
'substitute' = true ),
);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
[Libreoffice-commits] core.git: vcl/quartz
vcl/quartz/ctfonts.cxx |1 +
vcl/quartz/ctlayout.cxx |1 +
2 files changed, 2 insertions(+)
New commits:
commit 4b1ccdefe2594d8bec9343171c15ff1f90ac97bf
Author: Ptyl Dragon p...@cloudon.com
Date: Thu May 8 15:58:50 2014 +0300
fix memory leaks in vcl quartz
Change-Id: Ifb6a924759b8a3a7f459f2335144ca4dda434cb9
diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx
index 029caed..919ac5d 100644
--- a/vcl/quartz/ctfonts.cxx
+++ b/vcl/quartz/ctfonts.cxx
@@ -207,6 +207,7 @@ bool CoreTextStyle::GetGlyphOutline( sal_GlyphId aGlyphId,
basegfx::B2DPolyPolyg
const CGPathElement aClosingElement = { kCGPathElementCloseSubpath, NULL };
MyCGPathApplierFunc( (void*)aGgoData, aClosingElement );
#endif
+CFRelease( xPath );
return true;
}
diff --git a/vcl/quartz/ctlayout.cxx b/vcl/quartz/ctlayout.cxx
index 9376402..5c61150 100644
--- a/vcl/quartz/ctlayout.cxx
+++ b/vcl/quartz/ctlayout.cxx
@@ -552,6 +552,7 @@ sal_Int32 CTLayout::GetTextBreak( long nMaxWidth, long
/*nCharExtra*/, int nFact
CTTypesetterRef aCTTypeSetter = CTTypesetterCreateWithAttributedString(
mpAttrString );
const double fCTMaxWidth = (double)nMaxWidth / nFactor;
CFIndex nIndex = CTTypesetterSuggestClusterBreak( aCTTypeSetter, 0,
fCTMaxWidth );
+CFRelease( aCTTypeSetter );
if( nIndex = mnCharCount )
return -1;
___
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' - a6/c044e24a397fa303989f1180c7bc944cbde1f7
a6/c044e24a397fa303989f1180c7bc944cbde1f7 |1 + 1 file changed, 1 insertion(+) New commits: commit b5b25c43353e7c4448869e569482caecdb8678a1 Author: Caolán McNamara caol...@redhat.com Date: Thu May 8 15:03:38 2014 +0100 Notes added by 'git notes add' diff --git a/a6/c044e24a397fa303989f1180c7bc944cbde1f7 b/a6/c044e24a397fa303989f1180c7bc944cbde1f7 new file mode 100644 index 000..8e5c182 --- /dev/null +++ b/a6/c044e24a397fa303989f1180c7bc944cbde1f7 @@ -0,0 +1 @@ +ignore: aoo ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/uibase/utlui/navipi.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 3915e0034d6d0f96dcb37af51dad5eab490eef8c Author: Tsutomu Uchino ha...@apache.org Date: Thu May 8 08:08:57 2014 + Resolves: #i27364# set line count of dropdown to 9... for document list of navigator on Writer (cherry picked from commit c104272ea1274dea87cd66cfaa61b34806708521) Change-Id: Iac9644d513dd1195b3986d79607f336dc6ed9884 diff --git a/sw/source/core/uibase/utlui/navipi.cxx b/sw/source/core/uibase/utlui/navipi.cxx index 1eec0af..f4e7830 100644 --- a/sw/source/core/uibase/utlui/navipi.cxx +++ b/sw/source/core/uibase/utlui/navipi.cxx @@ -692,6 +692,7 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings, aContentToolBox.SetHelpId(HID_NAVIGATOR_TOOLBOX ); aGlobalToolBox.SetHelpId(HID_NAVIGATOR_GLOBAL_TOOLBOX); aDocListBox.SetHelpId(HID_NAVIGATOR_LISTBOX ); +aDocListBox.SetDropDownLineCount(9); nDocLBIniHeight = aDocListBox.GetSizePixel().Height(); nZoomOutInit = nZoomOut = Resource::ReadShortRes(); ___ 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' - c1/04272ea1274dea87cd66cfaa61b34806708521
c1/04272ea1274dea87cd66cfaa61b34806708521 |1 + 1 file changed, 1 insertion(+) New commits: commit 5e2dca0a5a91dc76f9ee6e05b38a53ffb6be2af8 Author: Caolán McNamara caol...@redhat.com Date: Thu May 8 15:19:53 2014 +0100 Notes added by 'git notes add' diff --git a/c1/04272ea1274dea87cd66cfaa61b34806708521 b/c1/04272ea1274dea87cd66cfaa61b34806708521 new file mode 100644 index 000..6ffdd5c --- /dev/null +++ b/c1/04272ea1274dea87cd66cfaa61b34806708521 @@ -0,0 +1 @@ +merged as: 3915e0034d6d0f96dcb37af51dad5eab490eef8c ___ 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/ui/src/scfuncs.src |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 95297dde822d27af727137c25b5b1556547da619
Author: Andras Timar andras.ti...@collabora.com
Date: Thu May 8 16:44:49 2014 +0200
typo fixes
Change-Id: Ibd4f9821c62a76b76d9d811e0f7e61cf4c3df6ee
diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src
index 0e6dfb7..14201f6 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.src
@@ -723,7 +723,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
};
String 7 // Description of Parameter 3
{
-Text [ en-US ] = Optional number or string to indicate to
indicate when weekends occur. When omitted, weekend is Saturday and Sunday. ;
+Text [ en-US ] = Optional number or string to indicate when
weekends occur. When omitted, weekend is Saturday and Sunday. ;
};
String 8 // Name of Parameter 4
{
@@ -763,7 +763,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
};
String 5 // Description of Parameter 2
{
-Text [ en-US ] = RThe number of workdays before or after start
date. ;
+Text [ en-US ] = The number of workdays before or after start
date. ;
};
String 6 // Name of Parameter 3
{
@@ -771,7 +771,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
};
String 7 // Description of Parameter 3
{
-Text [ en-US ] = Optional number or string to indicate to
indicate when weekends occur. When omitted, weekend is Saturday and Sunday. ;
+Text [ en-US ] = Optional number or string to indicate when
weekends occur. When omitted, weekend is Saturday and Sunday. ;
};
String 8 // Name of Parameter 4
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 7 commits - canvas/source cui/source dbaccess/source editeng/source lotuswordpro/source sc/source sd/source
canvas/source/cairo/cairo_spritecanvas.cxx |3
cui/source/dialogs/iconcdlg.cxx|3
dbaccess/source/ui/querydesign/QTableWindow.cxx| 20 ---
editeng/source/editeng/impedit4.cxx|4
lotuswordpro/source/filter/xfilter/xfparastyle.cxx |2
sc/source/ui/drawfunc/futext.cxx | 139 +
sd/source/ui/dlg/headerfooterdlg.cxx |2
7 files changed, 68 insertions(+), 105 deletions(-)
New commits:
commit ae71ad47e938259732a1a38bf1644774a0939ff4
Author: Caolán McNamara caol...@redhat.com
Date: Thu May 8 16:03:39 2014 +0100
coverity#735401 Logically dead code
Change-Id: I62f278dfd5df7485f809d642789951ab450ea458
diff --git a/canvas/source/cairo/cairo_spritecanvas.cxx
b/canvas/source/cairo/cairo_spritecanvas.cxx
index 56b852c..78f2450 100644
--- a/canvas/source/cairo/cairo_spritecanvas.cxx
+++ b/canvas/source/cairo/cairo_spritecanvas.cxx
@@ -93,9 +93,6 @@ namespace cairocanvas
const ::basegfx::B2ISize aSize( aPixelSize.Width(),
aPixelSize.Height() );
-ENSURE_ARG_OR_THROW( pParentWindow != NULL,
- CairoSpriteCanvas::initialize: invalid Window
pointer );
-
// setup helper
maDeviceHelper.init( *pParentWindow,
*this,
commit b0668acdd28777290d063e49ccc003d02a888b3d
Author: Caolán McNamara caol...@redhat.com
Date: Thu May 8 16:02:44 2014 +0100
coverity#735403 Logically dead code
Change-Id: I73262dcd37e76bc299929d55e38fea25d2510609
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index 3c5f794..d8117d1 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -1075,7 +1075,6 @@ bool IconChoiceDialog::OK_Impl()
if ( pSet )
{
SfxItemSet aTmp( *pSet-GetPool(), pSet-GetRanges() );
-bool bRet = false;
if ( pPage-HasExchangeSupport() )
nRet = pPage-DeactivatePage( aTmp );
@@ -1086,8 +1085,6 @@ bool IconChoiceDialog::OK_Impl()
pExampleSet-Put( aTmp );
pOutSet-Put( aTmp );
}
-else if ( bRet )
-bModified |= true;
}
else
nRet = pPage-DeactivatePage( NULL );
commit ded5c13bb5e4c345b04893ef0632336fef77a9fd
Author: Caolán McNamara caol...@redhat.com
Date: Thu May 8 16:01:50 2014 +0100
coverity#735404 Logically dead code
Change-Id: I648a573bc886c790886caa45324503cd15c350cd
diff --git a/dbaccess/source/ui/querydesign/QTableWindow.cxx
b/dbaccess/source/ui/querydesign/QTableWindow.cxx
index 0c0037a..be5a91d 100644
--- a/dbaccess/source/ui/querydesign/QTableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/QTableWindow.cxx
@@ -73,7 +73,7 @@ OQueryTableWindow::~OQueryTableWindow()
bool OQueryTableWindow::Init()
{
bool bSuccess = OTableWindow::Init();
-if(!bSuccess)
+if (!bSuccess)
return bSuccess;
OQueryTableView* pContainer =
static_castOQueryTableView*(getTableView());
@@ -105,24 +105,6 @@ bool OQueryTableWindow::Init()
m_aTitle.SetText( pWinData-GetWinName() );
m_aTitle.Show();
-if (!bSuccess)
-{ // it should just open a dummy window...
-OSL_ENSURE(!GetAliasName().isEmpty(), OQueryTableWindow::Init : kein
Alias- UND kein Tabellenname geht nicht !);
-// .. but that needs at least an Alias
-
-// create ::com::sun::star::form::ListBox
-if (!m_pListBox)
-m_pListBox = CreateListBox();
-
-// set title
-m_aTitle.SetText(GetAliasName());
-m_aTitle.Show();
-
-clearListBox();
-// don't need to refill them as I don't have a table
-m_pListBox-Show();
-}
-
getTableView()-getDesignView()-getController().InvalidateFeature(ID_BROWSER_QUERY_EXECUTE);
return bSuccess;
}
commit eb87aecdad36638d371c8a7a297a22c90a4ad515
Author: Caolán McNamara caol...@redhat.com
Date: Thu May 8 16:00:34 2014 +0100
coverity#735420 Logically dead code
Change-Id: I290f336baac7021358139d292231620bbe272fe0
diff --git a/editeng/source/editeng/impedit4.cxx
b/editeng/source/editeng/impedit4.cxx
index 99a696e..77827e4 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -2078,8 +2078,8 @@ void ImpEditEngine::AddPortionIterated(
_pFieldAttr-GetStart() != _pFieldAttr-GetEnd()
_pFieldAttr-Which() == EE_FEATURE_FIELD;
//on every new field move the end position
-if(bIsField)
-nEndField = bIsField ? _pFieldAttr-GetEnd() : USHRT_MAX;
+if (bIsField)
+nEndField = _pFieldAttr-GetEnd();
LanguageType eCurLanguage = GetLanguage( aCursor );
if(eCurLanguage !=
[Libreoffice-commits] core.git: svtools/source
svtools/source/uno/unoiface.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 940ac1e52ef5921e47a835f28e4da870cc2ded40
Author: Caolán McNamara caol...@redhat.com
Date: Thu May 8 16:18:15 2014 +0100
WaE: -Werror=maybe-uninitialized
Change-Id: I8f63bc51c48d69eaa81bf080b05747c026871f08
diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx
index 0b9f036..f713f42 100644
--- a/svtools/source/uno/unoiface.cxx
+++ b/svtools/source/uno/unoiface.cxx
@@ -574,7 +574,7 @@ void SAL_CALL VCLXFileControl::setProperty( const OUString
PropertyName, const
{
case BASEPROPERTY_HIDEINACTIVESELECTION:
{
-bool bValue;
+bool bValue(false);
OSL_VERIFY( Value = bValue );
lcl_setWinBits( pControl, WB_NOHIDESELECTION, !bValue );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: test/source
test/source/sheet/datapilotfield.cxx | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) New commits: commit f21c57c2bc5b24b6afe261bc1530e6f86168f25e Author: Caolán McNamara caol...@redhat.com Date: Thu May 8 16:21:41 2014 +0100 WaE: -Werror=maybe-uninitialized Change-Id: Iec05633cf1716079eee54c376bd0736b638673dd diff --git a/test/source/sheet/datapilotfield.cxx b/test/source/sheet/datapilotfield.cxx index 1cd175a..581bc26 100644 --- a/test/source/sheet/datapilotfield.cxx +++ b/test/source/sheet/datapilotfield.cxx @@ -50,7 +50,7 @@ void DataPilotField::testSortInfo() aNewSortInfoValue.Mode == aSortInfoValue.Mode aNewSortInfoValue.IsAscending == aSortInfoValue.IsAscending); //setting HasSortInfo only makes sense for false, for true the uno implementation does nothing -bool bHasSortInfo; +bool bHasSortInfo(false); OUString aHasSortInfo(HasSortInfo); xValue = xPropSet-getPropertyValue(aHasSortInfo); CPPUNIT_ASSERT( xValue = bHasSortInfo ); @@ -83,7 +83,7 @@ void DataPilotField::testLayoutInfo() aNewLayoutInfoValue.AddEmptyLines == aLayoutInfoValue.AddEmptyLines); //setting HasLayoutInfo only makes sense for false, tor true the uno implementation does nothing -bool bHasLayoutInfo; +bool bHasLayoutInfo(false); OUString aHasLayoutInfo(HasLayoutInfo); xValue = xPropSet-getPropertyValue(aHasLayoutInfo); CPPUNIT_ASSERT( xValue = bHasLayoutInfo ); @@ -116,7 +116,7 @@ void DataPilotField::testAutoShowInfo() aNewAutoShowInfoValue.IsEnabled == aAutoShowInfoValue.IsEnabled); //setting HasLayoutInfo only makes sense for false, tor true the uno implementation does nothing -bool bHasAutoShowInfo; +bool bHasAutoShowInfo(false); OUString aHasAutoShowInfo(HasAutoShowInfo); xValue = xPropSet-getPropertyValue(aHasAutoShowInfo); CPPUNIT_ASSERT( xValue = bHasAutoShowInfo ); @@ -149,7 +149,7 @@ void DataPilotField::testReference() aReferenceValue.ReferenceItemType == aNewReferenceValue.ReferenceItemType); //setting HasReference only makes sense for false, tor true the uno implementation does nothing -bool bHasReference; +bool bHasReference(false); OUString aHasReference(HasReference); xValue = xPropSet-getPropertyValue(aHasReference); CPPUNIT_ASSERT( xValue = bHasReference ); @@ -169,7 +169,7 @@ void DataPilotField::testIsGroupField() uno::Reference beans::XPropertySet xPropSet(init(),UNO_QUERY_THROW); uno::Any xValue; OUString aIsGroupField(IsGroupField); -bool bIsGroupField; +bool bIsGroupField(false); xValue = xPropSet-getPropertyValue(aIsGroupField); CPPUNIT_ASSERT( xValue = bIsGroupField); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
minutes of ESC call ...
* Present + Christian, Stephan, David, Thorsten, Adam, Miklos, Kendy, Michael M, Eike, Andras, Markus, Eilidh, Caolan, Kohei, Bjoern, Miklos, Michael S, Robinson, Norbert, Jacobo * Pending Action Items: + crashtest box - more research (Moggi/Cloph) [ calc is working, writer problems can't easily be nailed down, have to use multiple processes ] [ calc numbers increased a bit - but not as bad as expected ] + will try filing a lot of small string changes as easy hacks (Astron) + encourage icon authors to put them into git (Astron) + fix the Java bridge for MSVC2012 for 4.3 (Stephan/Michael S.) * Release Engineering update (Christian) + 4.3 status + looking so/so - reports that Windows / Alpha wouldn't run at all. + need to poke at the windows build environment, or a general problem with the Alpha. + are we past the failing unit tests oddness ? + the failing tests are not reproducible in a debug environment related to a parallel build (most likely). + created a new tinderbox with this baseline, which reports only to tinderbox; hitting failing checks. + not always the same tests fail. + sd/ filters sd/ import tests, also seen in sc/ + more data? (Michael) + memory ? which exception fails ? which test ? + SEGV from 'make' (Cloph) http://tinderbox.libreoffice.org/cgi-bin/gunzip.cgi?tree=MASTERfull-log=1399551601.15078 + seems to fail on the first line etc. + re-running make passes in the same tree. + sounds like missing UNO components ? or dependencies (Bjoern) + maybe good to test 20-100 times after the build completed. + and if they're fine - its missing dependencies. + if you keep running 'make check' on a full-build its unstable (Stephan) + slowcheck is a bit more stable than a subsequentcheck (Miklos) + if suspected with a failing UNO component ? (Kendy) + just add a printf + Windows tinderboxes do incremental builds and these fail too (Sberg) http://tinderbox.libreoffice.org/cgi-bin/gunzip.cgi?tree=MASTERbrief-log=1399545019.7798#28531 AI:+ turn the SAL_WARN into a fprintf send to Cloph ? (Kendy) AI:+ run the 'make slowcheck' 20x from the top-level report (Cloph) + 4.2.x builds with older compiler Windows version + 4.3 VS 2012 + Windows Server 2012 + 4.2 VS 2010 + Windows Server 2008 rc2 + 4.3.0 feature freeze: + week after next. + 4.2.4 RC2 status + announced today as final, enabled the update too. + update was broken + none of the 4.2.x was updated so far, until today. + discovered the ver. included the git hash there. + thanks to report from Michael Stahl. + we lean on QA to check this cf. MozTrap ... AI:+ poke Sophie to query that (Cloph) + BlueZ 5 bits get merged. + status of KDE4 support ? (Bjoern) + 4.2.3 deadlocked under KDE right away + best to poke Lubos - requires some KDE patch. + 4.1.6 announce / retrospective + Update enabled from 4.1.x - 4.1.6 today. + good to see MAB's migrated to 4.2.x - 4.1.x is dead. + Android / iOS remote + patch for Android Remote for pointer feature, + also (re-)adding an About Dialog + with version; discussion ongoing. + 4.2.4 removed StarOffice XML export (Michael S) + bit unexpected + bug was around saving calc as old format (Kohei) + opted to remove rather than fix / work around. + was not added to release notes: we should add it. + failing tests - not running; and tests passed and back-ported the fix to the -4-2 branch (Kohei) + one of the JUnit tests failed recently (Michael S) AI:+ Add the removal to 4.2 release notes (Cloph) * 4.3 Features Page (Michael) + https://wiki.documentfoundation.org/ReleaseNotes/4.3 + please update it ! * Should we simplify version numbering? (Kendy) + So far major.minor.micro, but due to our release plan, all our versions are continuous improvements - does it make sense to still keep 'major'? [ ie. should we do 4.3.0 - 5.0, 4.4.3 - 6.3, etc.? ] + Technical POV reasoning for stale 1st version number (Bjoern) + used to mean stable ABI + agreed - not such an issue these days. + technical reason is ABI stability, vague anyway. + Agreed, technically no need for it (Stephan) + What is the cost of change ? (Cloph) + book publishers unhappy with this + Scripts - implied dependencies: extensions, versions etc. (Bjoern) + potentially extensions break ?
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 78108, which changed state. Bug 78108 Summary: EDITING: Instability when pasting calc data that includes a formula into writer (As calc8 object) https://bugs.freedesktop.org/show_bug.cgi?id=78108 What|Removed |Added Status|RESOLVED|UNCONFIRMED 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: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 58ff85ffe5d82268489e1b1e3dc030826c28773b Author: Caolán McNamara caol...@redhat.com Date: Thu May 8 16:31:41 2014 +0100 Updated core Project: help 9674052b7254ff18c95ac557164f589ebbec02ee diff --git a/helpcontent2 b/helpcontent2 index 3df0ca4..9674052 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 3df0ca4718f3f966e1a3df4884f7deb56789b7b1 +Subproject commit 9674052b7254ff18c95ac557164f589ebbec02ee ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |6 -- source/text/shared/autopi/01170300.xhp |5 +++-- 2 files changed, 3 insertions(+), 8 deletions(-) New commits: commit 9674052b7254ff18c95ac557164f589ebbec02ee Author: Caolán McNamara caol...@redhat.com Date: Thu May 8 16:31:41 2014 +0100 update help ids for table selection page .ui conversion Change-Id: I6a0332245506adb74aabbe52d520a889c76e4783 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 6f2fe9c..286807f 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -5254,9 +5254,6 @@ extensions_ListBox_RID_PAGE_LCW_CONTENTSELECTION_FIELD_LB_SELECTFIELD,859770374, extensions_ListBox_RID_PAGE_LCW_CONTENTSELECTION_TABLE_LB_SELECTTABLE,859753989, extensions_ListBox_RID_PAGE_OPTIONVALUES_LB_RADIOBUTTONS,859704835, extensions_ListBox_RID_PAGE_OPTION_DBFIELD_LB_STOREINFIELD,859721220, -extensions_ListBox_RID_PAGE_TABLESELECTION_AB_LB_TABLELIST,860655105, -extensions_ListBox_RID_PAGE_TABLESELECTION_LB_DATASOURCE,859655681, -extensions_ListBox_RID_PAGE_TABLESELECTION_LB_TABLE,859655682, extensions_ListBox_RID_SANE_DIALOG_RID_DEVICE_BOX,1090129414, extensions_ListBox_RID_SANE_DIALOG_RID_SCAN_QUANTUM_RANGE_BOX,1090129433, extensions_ListBox_RID_SANE_DIALOG_RID_SCAN_STRING_RANGE_BOX,1090129434, @@ -5288,7 +5285,6 @@ extensions_PushButton_RID_PAGE_GW_FIELDSELECTION_PB_ALLFIELDSLEFT,859804166, extensions_PushButton_RID_PAGE_GW_FIELDSELECTION_PB_ALLFIELDSRIGHT,859804164, extensions_PushButton_RID_PAGE_GW_FIELDSELECTION_PB_FIELDLEFT,859804165, extensions_PushButton_RID_PAGE_GW_FIELDSELECTION_PB_FIELDRIGHT,859804163, -extensions_PushButton_RID_PAGE_TABLESELECTION_PB_FORMDATASOURCE,859656711, extensions_PushButton_RID_SANE_DIALOG_RID_DEVICEINFO_BTN,1090130435, extensions_PushButton_RID_SANE_DIALOG_RID_PREVIEW_BTN,1090130450, extensions_PushButton_RID_SANE_DIALOG_RID_SCAN_BUTTON_OPTION_BTN,1090130460, @@ -5309,8 +5305,6 @@ extensions_TabPage_RID_PAGE_LCW_FIELDLINK,859783168, extensions_TabPage_RID_PAGE_OPTIONS_FINAL,859734016, extensions_TabPage_RID_PAGE_OPTIONVALUES,859701248, extensions_TabPage_RID_PAGE_OPTION_DBFIELD,859717632, -extensions_TabPage_RID_PAGE_TABLESELECTION,859652096, -extensions_TabPage_RID_PAGE_TABLESELECTION_AB,860651520, extensions_TabPage_RID_TP_LICENSE,553664512, extensions_TabPage_RID_TP_WELCOME,553697280, filter_CheckBox_DLG_OPTIONS_BOOL_EXPORT_ALL,1090520065, diff --git a/source/text/shared/autopi/01170300.xhp b/source/text/shared/autopi/01170300.xhp index 229805e..dd6244f 100644 --- a/source/text/shared/autopi/01170300.xhp +++ b/source/text/shared/autopi/01170300.xhp @@ -28,6 +28,7 @@ /meta body section id=tabauswahl +bookmark xml-lang=en-US branch=hid/modules/sabpilot/ui/selecttablepage/SelectTablePage id=bm_id3147400 localize=false/ paragraph role=heading id=hd_id3149748 xml-lang=en-US level=1 l10n=U oldref=1link href=text/shared/autopi/01170300.xhp name=Select TableSelect Table/link/paragraph paragraph role=paragraph id=par_id3156211 xml-lang=en-US l10n=CHG oldref=2ahelp hid=.Specifies a table from the Seamonkey / Netscape address book source that is used as the address book in $[officename]./ahelp/paragraph /section @@ -35,9 +36,9 @@ embed href=text/shared/00/0401.xhp#addressimport3/ /section paragraph role=paragraph id=par_id3155150 xml-lang=en-US l10n=U oldref=3All tables from the first user profile will be registered for this data source in $[officename]. You must specify one as the table that will be used in the $[officename] templates./paragraph -bookmark xml-lang=en-US branch=hid/extensions:ListBox:RID_PAGE_TABLESELECTION:LB_TABLELIST id=bm_id3147399 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/sabpilot/ui/selecttablepage/table id=bm_id3147399 localize=false/ paragraph role=heading id=hd_id3154927 xml-lang=en-US level=2 l10n=U oldref=4List box/paragraph -paragraph role=paragraph id=par_id3147043 xml-lang=en-US l10n=U oldref=5ahelp hid=extensions:ListBox:RID_PAGE_TABLESELECTION:LB_TABLELISTSpecifies the table that is to serve as the address book for the $[officename] templates./ahelp/paragraph +paragraph role=paragraph id=par_id3147043 xml-lang=en-US l10n=U oldref=5ahelp hid=modules/sabpilot/ui/selecttablepage/tableSpecifies the table that is to serve as the address book for the $[officename] templates./ahelp/paragraph paragraph role=tip id=par_id3152801 xml-lang=en-US l10n=U oldref=6You can make changes to the templates and documents at a later time by choosing emphEdit - Exchange Database/emph./paragraph /body /helpdocument ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extensions/source extensions/uiconfig extensions/UIConfig_sabpilot.mk
extensions/UIConfig_sabpilot.mk|1
extensions/source/abpilot/abpresid.hrc |4 -
extensions/source/abpilot/abspilot.src | 29 -
extensions/source/abpilot/tableselectionpage.cxx | 26 +--
extensions/source/abpilot/tableselectionpage.hxx |3 -
extensions/uiconfig/sabpilot/ui/selecttablepage.ui | 46 +
6 files changed, 60 insertions(+), 49 deletions(-)
New commits:
commit 8a6b647990ba435a1b0b169d321d4f50550e567d
Author: Caolán McNamara caol...@redhat.com
Date: Thu May 8 16:29:21 2014 +0100
convert table selection page to .ui
Change-Id: Id54d2c6e9cb2f32f90e60d6348fc768e00e5c704
diff --git a/extensions/UIConfig_sabpilot.mk b/extensions/UIConfig_sabpilot.mk
index 18683e4..b630a75 100644
--- a/extensions/UIConfig_sabpilot.mk
+++ b/extensions/UIConfig_sabpilot.mk
@@ -11,6 +11,7 @@ $(eval $(call gb_UIConfig_UIConfig,modules/sabpilot))
$(eval $(call gb_UIConfig_add_uifiles,modules/sabpilot,\
extensions/uiconfig/sabpilot/ui/fieldassignpage \
+ extensions/uiconfig/sabpilot/ui/selecttablepage \
extensions/uiconfig/sabpilot/ui/selecttypepage \
))
diff --git a/extensions/source/abpilot/abpresid.hrc
b/extensions/source/abpilot/abpresid.hrc
index cc8f18b..2e4b02c 100644
--- a/extensions/source/abpilot/abpresid.hrc
+++ b/extensions/source/abpilot/abpresid.hrc
@@ -45,7 +45,6 @@
// tab pages
#define RID_PAGE_ADMININVOKATION( RID_PAGE_START + 1 )
-#define RID_PAGE_TABLESELECTION_AB ( RID_PAGE_START + 2 )
#define RID_PAGE_FINAL ( RID_PAGE_START + 4 )
// please adjust RID_PAGE_END (below) when adding new tab pages
@@ -131,7 +130,6 @@
#define FT_ADMINEXPLANATION 3
#define FT_NAME_EXPL 4
#define FT_ERROR 5
-#define FL_TOOMUCHTABLES 6
#define FT_FINISH_EXPL 9
#define FT_DUPLICATENAME10
#define FT_LOCATION 11
@@ -141,8 +139,6 @@
#define PB_INVOKE_ADMIN_DIALOG 1
#define PB_BROWSE 3
-#define LB_TABLELIST1
-
#define CB_REGISTER_DS 1
#define CBB_LOCATION1
diff --git a/extensions/source/abpilot/abspilot.src
b/extensions/source/abpilot/abspilot.src
index ddc17c3..f3f65bc 100644
--- a/extensions/source/abpilot/abspilot.src
+++ b/extensions/source/abpilot/abspilot.src
@@ -93,35 +93,6 @@ TabPage RID_PAGE_ADMININVOKATION
};
};
-
-TabPage RID_PAGE_TABLESELECTION_AB
-{
-HelpID = extensions:TabPage:RID_PAGE_TABLESELECTION_AB;
-SVLook = TRUE ;
-Size= MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
-
-FixedText FL_TOOMUCHTABLES
-{
-Pos = MAP_APPFONT ( BORDER_X, 9 ) ;
-Size= MAP_APPFONT ( WINDOW_SIZE_X - 2 * BORDER_X, 24 ) ;
-WordBreak = TRUE;
-
-Text [ en-US ] = The external data source you have chosen contains
more than one address book.\nPlease select the one you mainly want to work
with:;
-};
-
-ListBox LB_TABLELIST
-{
-HelpID = extensions:ListBox:RID_PAGE_TABLESELECTION_AB:LB_TABLELIST;
-Pos = MAP_APPFONT ( BORDER_X, 36 ) ;
-Size= MAP_APPFONT ( WINDOW_SIZE_X - 2 * BORDER_X, 50 ) ;
-SVLook = TRUE;
-Sort = TRUE;
-DropDown = FALSE;
-AutoHScroll = TRUE;
-Border = TRUE;
-};
-};
-
TabPage RID_PAGE_FINAL
{
HelpID = extensions:TabPage:RID_PAGE_FINAL;
diff --git a/extensions/source/abpilot/tableselectionpage.cxx
b/extensions/source/abpilot/tableselectionpage.cxx
index 4b66b83..61ac27d 100644
--- a/extensions/source/abpilot/tableselectionpage.cxx
+++ b/extensions/source/abpilot/tableselectionpage.cxx
@@ -33,14 +33,12 @@ namespace abp
TableSelectionPage::TableSelectionPage( OAddessBookSourcePilot* _pParent )
-:AddressBookSourcePage(_pParent, ModuleRes(RID_PAGE_TABLESELECTION_AB))
-,m_aLabel ( this, ModuleRes( FL_TOOMUCHTABLES ) )
-,m_aTableList ( this, ModuleRes( LB_TABLELIST ) )
+:AddressBookSourcePage(_pParent, SelectTablePage,
+ modules/sabpilot/ui/selecttablepage.ui)
{
-FreeResource();
-
-m_aTableList.SetSelectHdl( LINK( this, TableSelectionPage,
OnTableSelected ) );
-m_aTableList.SetDoubleClickHdl( LINK( this, TableSelectionPage,
OnTableDoubleClicked ) );
+get(m_pTableList, table);
+m_pTableList-SetSelectHdl( LINK( this, TableSelectionPage,
OnTableSelected ) );
+m_pTableList-SetDoubleClickHdl( LINK( this, TableSelectionPage,
OnTableDoubleClicked ) );
}
@@ -48,7 +46,7 @@ namespace abp
{
AddressBookSourcePage::ActivatePage();
-m_aTableList.GrabFocus();
+m_pTableList-GrabFocus();
}
@@ -64,7 +62,7 @@ namespace abp
const AddressSettings rSettings = getSettings();
-m_aTableList.Clear();
+m_pTableList-Clear();
// get the table names
const
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 78108, which changed state. Bug 78108 Summary: EDITING: Instability when pasting calc data that includes a formula into writer (As calc8 object) https://bugs.freedesktop.org/show_bug.cgi?id=78108 What|Removed |Added Status|UNCONFIRMED |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: external/python3
external/python3/UnpackedTarball_python3.mk|6 external/python3/python-3.3.3-disable-obmalloc.patch.0 | 21 + 2 files changed, 27 insertions(+) New commits: commit de386effc0532451c193c9c824d58006645e9c8f Author: Stephan Bergmann sberg...@redhat.com Date: Thu May 8 17:49:57 2014 +0200 Make external/python3 play well with -fsanitize=address Change-Id: I72a9ec9569bcd74e212ad98456a76869ac213221 diff --git a/external/python3/UnpackedTarball_python3.mk b/external/python3/UnpackedTarball_python3.mk index 9ca68d5..15ca76a 100644 --- a/external/python3/UnpackedTarball_python3.mk +++ b/external/python3/UnpackedTarball_python3.mk @@ -37,4 +37,10 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\ )) endif +ifneq ($(ENABLE_RUNTIME_OPTIMIZATIONS),TRUE) +$(eval $(call gb_UnpackedTarball_add_patches,python3,\ + external/python3/python-3.3.3-disable-obmalloc.patch.0 \ +)) +endif + # vim: set noet sw=4 ts=4: diff --git a/external/python3/python-3.3.3-disable-obmalloc.patch.0 b/external/python3/python-3.3.3-disable-obmalloc.patch.0 new file mode 100644 index 000..639cff6 --- /dev/null +++ b/external/python3/python-3.3.3-disable-obmalloc.patch.0 @@ -0,0 +1,21 @@ +--- Objects/obmalloc.c Objects/obmalloc.c +@@ -9,8 +9,8 @@ + #endif + #endif + ++#define WITH_VALGRIND + #ifdef WITH_VALGRIND +-#include valgrind/valgrind.h + + /* If we're using GCC, use __builtin_expect() to reduce overhead of +the valgrind checks */ +@@ -771,7 +771,7 @@ + + #ifdef WITH_VALGRIND + if (UNLIKELY(running_on_valgrind == -1)) +-running_on_valgrind = RUNNING_ON_VALGRIND; ++running_on_valgrind = 1; + if (UNLIKELY(running_on_valgrind)) + goto redirect; + #endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source
cui/source/dialogs/iconcdlg.cxx |1 -
cui/source/inc/iconcdlg.hxx |1 -
2 files changed, 2 deletions(-)
New commits:
commit 9e8629c73327474598c4c1f2250937544a1562e7
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu May 8 17:53:20 2014 +0200
-Werror,-Wunused-private-field
Change-Id: Ie01aeb4215998b38bcb171be9d2c1961798b1488
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index d8117d1..388b400 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -214,7 +214,6 @@ IconChoiceDialog::IconChoiceDialog ( Window* pParent, const
ResId rResId,
bHideResetBtn ( false ),
bModal ( false ),
bInOK ( false ),
-bModified ( false ),
bItemsReset ( false )
{
diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx
index b7561a0..bc59ec3 100644
--- a/cui/source/inc/iconcdlg.hxx
+++ b/cui/source/inc/iconcdlg.hxx
@@ -151,7 +151,6 @@ private :
boolbHideResetBtn;
boolbModal;
boolbInOK;
-boolbModified;
boolbItemsReset;
DECL_LINK ( ChosePageHdl_Impl, void * );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 50470] PyUno objects not introspectable on Python 3
https://bugs.freedesktop.org/show_bug.cgi?id=50470 Michael Stahl mst...@redhat.com changed: What|Removed |Added Status|NEW |RESOLVED Whiteboard|EasyHack DifficultyBeginner |target:4.1.2 target:4.2.0 |SkillCpp TopicCleanup | |target:4.1.2 target:4.2.0 | Resolution|--- |FIXED CC||mst...@redhat.com --- Comment #8 from Michael Stahl mst...@redhat.com --- this appears to be fixed, thanks Daniel! import uno x = uno.getComponentContext() dir(x) ['/services/com.sun.star.security.AccessController/mode', ... 'ElementNames', 'ElementType', 'ImplementationId', 'ServiceManager', 'Types', 'addEventListener', 'dispose', 'getByName', 'getElementNames', 'getElementType', 'getImplementationId', 'getServiceManager', 'getTypes', 'getValueByName', 'hasByName', 'hasElements', 'insertByName', 'queryAdapter', 'queryInterface', 'removeByName', 'removeEventListener', 'replaceByName'] -- 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 50470] PyUno objects not introspectable on Python 3
https://bugs.freedesktop.org/show_bug.cgi?id=50470 Michael Stahl mst...@redhat.com changed: What|Removed |Added Component|Libreoffice |sdk --- Comment #9 from Michael Stahl mst...@redhat.com --- (In reply to comment #8) this appears to be fixed, thanks Daniel! argh sorry, thanks *David* of course -- 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: Changes to 'feature/debugevent'
New branch 'feature/debugevent' available with the following commits: commit daff06ba3fffa23086f1f1f610207f80f4fe6b44 Author: Michael Meeks michael.me...@collabora.com Date: Thu May 8 17:03:08 2014 +0100 Initial cut at some infinite monkeys work. Change-Id: I71c7fe027262305893d8eabee94a726f4aa909d6 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 55bad431a0f77d66002e5e4d3e192c057d4e8f07 Author: Caolán McNamara caol...@redhat.com Date: Thu May 8 17:27:22 2014 +0100 Updated core Project: help be223a7183d020358306a15426789c263e96151d diff --git a/helpcontent2 b/helpcontent2 index 9674052..be223a7 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 9674052b7254ff18c95ac557164f589ebbec02ee +Subproject commit be223a7183d020358306a15426789c263e96151d ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |5 - source/text/shared/autopi/01170400.xhp |9 + 2 files changed, 5 insertions(+), 9 deletions(-) New commits: commit be223a7183d020358306a15426789c263e96151d Author: Caolán McNamara caol...@redhat.com Date: Thu May 8 17:27:22 2014 +0100 update help ids for final addressbook tabpage Change-Id: I4c616b96d91bef3e5ab05c5b19bca7155531cbeb diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 286807f..31c223c 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -5199,14 +5199,11 @@ desktop_RadioButton_TP_REGISTRATION_RB_REGISTRATION_LATER,586088966, desktop_RadioButton_TP_REGISTRATION_RB_REGISTRATION_NEVER,586088967, desktop_RadioButton_TP_REGISTRATION_RB_REGISTRATION_NOW,586088965, extensions_CheckBox_RID_DLG_SELECTLABELCONTROL_1,1090126849, -extensions_CheckBox_RID_PAGE_FINAL_CB_REGISTER_DS,860685313, extensions_CheckBox_RID_SANE_DIALOG_RID_SCAN_ADVANCED_BOX,1090126881, extensions_CheckBox_RID_SANE_DIALOG_RID_SCAN_BOOL_OPTION_BOX,1090126870, extensions_CheckBox_RID_TP_LICENSE_CB_ACCEPT,55366, -extensions_ComboBox_RID_PAGE_FINAL_CBB_LOCATION,860688385, extensions_ComboBox_RID_PAGE_LCW_FIELDLINK_CMB_TABLEFIELD,859787266, extensions_ComboBox_RID_PAGE_LCW_FIELDLINK_CMB_VALUELISTFIELD,859787265, -extensions_Edit_RID_PAGE_FINAL_ET_DATASOURCENAME,860686337, extensions_Edit_RID_PAGE_GROUPRADIOSELECTION_ET_RADIOLABELS,859670529, extensions_Edit_RID_PAGE_LCW_CONTENTSELECTION_FIELD_ET_DISPLAYEDFIELD,859768836, extensions_Edit_RID_PAGE_OPTIONS_FINAL_ET_NAMEIT,859736067, @@ -5278,7 +5275,6 @@ extensions_PushButton_RID_DLG_FORMLINKS_PB_SUGGEST,1090163204, extensions_PushButton_RID_DLG_OEMWIZARD_PB_NEXT,1090523650, extensions_PushButton_RID_DLG_OEMWIZARD_PB_PREV,1090523649, extensions_PushButton_RID_PAGE_ADMININVOKATION_PB_INVOKE_ADMIN_DIALOG,860639745, -extensions_PushButton_RID_PAGE_FINAL_PB_BROWSE,860688899, extensions_PushButton_RID_PAGE_GROUPRADIOSELECTION_PB_MOVETOLEFT,859673090, extensions_PushButton_RID_PAGE_GROUPRADIOSELECTION_PB_MOVETORIGHT,859673089, extensions_PushButton_RID_PAGE_GW_FIELDSELECTION_PB_ALLFIELDSLEFT,859804166, @@ -5295,7 +5291,6 @@ extensions_RadioButton_RID_PAGE_OPTION_DBFIELD_RB_STOREINFIELD_NO,859718148, extensions_RadioButton_RID_PAGE_OPTION_DBFIELD_RB_STOREINFIELD_YES,859718147, extensions_TabPage_RID_PAGE_ADMININVOKATION,860635136, extensions_TabPage_RID_PAGE_DEFAULTFIELDSELECTION,859684864, -extensions_TabPage_RID_PAGE_FINAL,860684288, extensions_TabPage_RID_PAGE_FORM_DATASOURCE_STATUS,859815936, extensions_TabPage_RID_PAGE_GROUPRADIOSELECTION,859668480, extensions_TabPage_RID_PAGE_GW_FIELDSELECTION,859799552, diff --git a/source/text/shared/autopi/01170400.xhp b/source/text/shared/autopi/01170400.xhp index 4785343..470c6fa 100644 --- a/source/text/shared/autopi/01170400.xhp +++ b/source/text/shared/autopi/01170400.xhp @@ -30,6 +30,7 @@ /meta body section id=datquetitel +bookmark xml-lang=en-US branch=hid/modules/sabpilot/ui/datasourcepage/DataSourcePage id=bm_id3865170 localize=false/ paragraph role=heading id=hd_id3147000 xml-lang=en-US level=1 l10n=U oldref=1link href=text/shared/autopi/01170400.xhp name=Data Source NameData Source Name/link/paragraph paragraph role=paragraph id=par_id3144740 xml-lang=en-US l10n=CHG oldref=2ahelp hid=.Specifies a location for the address book file and a name under which the data source will be listed in the data source explorer./ahelp/paragraph /section @@ -38,12 +39,12 @@ /section paragraph role=heading id=par_idN105B7 xml-lang=en-US level=2 l10n=NEWLocation/paragraph paragraph role=paragraph id=par_idN105BB xml-lang=en-US l10n=NEWahelp hid=.Specifies the location of the database file./ahelp/paragraph -bookmark xml-lang=en-US branch=hid/extensions:PushButton:RID_PAGE_FINAL:PB_BROWSE id=bm_id3865169 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/sabpilot/ui/datasourcepage/browse id=bm_id3865169 localize=false/ bookmark xml-lang=en-US branch=hid/DBACCESS_HID_DSADMIN_BROWSECONN id=bm_id1817072 localize=false/paragraph role=heading id=par_idN105BE xml-lang=en-US level=2 l10n=NEWBrowse/paragraph paragraph role=paragraph id=par_idN105C2 xml-lang=en-US l10n=NEWahelp hid=.Specifies the location using a file dialog./ahelp/paragraph -bookmark xml-lang=en-US branch=hid/extensions:CheckBox:RID_PAGE_FINAL:CB_REGISTER_DS id=bm_id1906186 localize=false/paragraph role=heading id=par_idN105C5 xml-lang=en-US level=2 l10n=NEWMake this address book available to all modules in %PRODUCTNAME/paragraph +bookmark xml-lang=en-US branch=hid/modules/sabpilot/ui/datasourcepage/available id=bm_id1906186 localize=false/paragraph role=heading id=par_idN105C5 xml-lang=en-US level=2 l10n=NEWMake this address book available to all modules in %PRODUCTNAME/paragraph paragraph role=paragraph id=par_idN105C9 xml-lang=en-US l10n=NEWahelp hid=.Registers the newly created database file in %PRODUCTNAME. The
[Libreoffice-commits] core.git: extensions/source extensions/uiconfig extensions/UIConfig_sabpilot.mk
extensions/UIConfig_sabpilot.mk|1
extensions/source/abpilot/abpfinalpage.cxx | 70 +++
extensions/source/abpilot/abpfinalpage.hxx | 21 +-
extensions/source/abpilot/abpresid.hrc | 13 -
extensions/source/abpilot/abspilot.src | 86
extensions/uiconfig/sabpilot/ui/datasourcepage.ui | 204 +
extensions/uiconfig/sabpilot/ui/fieldassignpage.ui |4
extensions/uiconfig/sabpilot/ui/selecttypepage.ui |2
8 files changed, 254 insertions(+), 147 deletions(-)
New commits:
commit 9319ea5b5321e33b0f7bfa85e2064bc794d3b465
Author: Caolán McNamara caol...@redhat.com
Date: Thu May 8 17:23:21 2014 +0100
convert FinalPage to .ui
Change-Id: I3e7728da37d36bdf7f9a24bbc70bae856a85d9c4
diff --git a/extensions/UIConfig_sabpilot.mk b/extensions/UIConfig_sabpilot.mk
index b630a75..a52e50e 100644
--- a/extensions/UIConfig_sabpilot.mk
+++ b/extensions/UIConfig_sabpilot.mk
@@ -10,6 +10,7 @@
$(eval $(call gb_UIConfig_UIConfig,modules/sabpilot))
$(eval $(call gb_UIConfig_add_uifiles,modules/sabpilot,\
+ extensions/uiconfig/sabpilot/ui/datasourcepage \
extensions/uiconfig/sabpilot/ui/fieldassignpage \
extensions/uiconfig/sabpilot/ui/selecttablepage \
extensions/uiconfig/sabpilot/ui/selecttypepage \
diff --git a/extensions/source/abpilot/abpfinalpage.cxx
b/extensions/source/abpilot/abpfinalpage.cxx
index 8fd56ab..337b732 100644
--- a/extensions/source/abpilot/abpfinalpage.cxx
+++ b/extensions/source/abpilot/abpfinalpage.cxx
@@ -43,32 +43,33 @@ namespace abp
}
//= FinalPage
-
-
FinalPage::FinalPage( OAddessBookSourcePilot* _pParent )
-:AddressBookSourcePage(_pParent, ModuleRes(RID_PAGE_FINAL))
-,m_aExplanation ( this, ModuleRes( FT_FINISH_EXPL ) )
-,m_aLocationLabel ( this, ModuleRes( FT_LOCATION ) )
-,m_aLocation( this, ModuleRes( CBB_LOCATION ) )
-,m_aBrowse ( this, ModuleRes( PB_BROWSE ) )
-,m_aRegisterName( this, ModuleRes( CB_REGISTER_DS ) )
-,m_aNameLabel ( this, ModuleRes( FT_NAME_EXPL ) )
-,m_aName( this, ModuleRes( ET_DATASOURCENAME ) )
-,m_aDuplicateNameError ( this, ModuleRes( FT_DUPLICATENAME ) )
-,m_aLocationController( _pParent-getORB(), m_aLocation, m_aBrowse )
+: AddressBookSourcePage(_pParent, DataSourcePage,
+modules/sabpilot/ui/datasourcepage.ui)
{
-FreeResource();
-
-m_aName.SetModifyHdl( LINK(this, FinalPage, OnNameModified) );
-m_aLocation.SetModifyHdl( LINK(this, FinalPage, OnNameModified) );
-m_aRegisterName.SetClickHdl( LINK( this, FinalPage, OnRegister ) );
-m_aRegisterName.Check(true);
+get(m_pLocation, location);
+get(m_pBrowse, browse);
+get(m_pRegisterName, available);
+get(m_pNameLabel, nameft);
+get(m_pName, name);
+get(m_pDuplicateNameError, warning);
+m_pLocationController = new
::svx::DatabaseLocationInputController(_pParent-getORB(),
+*m_pLocation, *m_pBrowse);
+
+m_pName-SetModifyHdl( LINK(this, FinalPage, OnNameModified) );
+m_pLocation-SetModifyHdl( LINK(this, FinalPage, OnNameModified) );
+m_pRegisterName-SetClickHdl( LINK( this, FinalPage, OnRegister ) );
+m_pRegisterName-Check(true);
}
+FinalPage::~FinalPage()
+{
+delete m_pLocationController;
+}
bool FinalPage::isValidName() const
{
-OUString sCurrentName(m_aName.GetText());
+OUString sCurrentName(m_pName-GetText());
if (sCurrentName.isEmpty())
// the name must not be empty
@@ -81,7 +82,6 @@ namespace abp
return true;
}
-
void FinalPage::setFields()
{
AddressSettings rSettings = getSettings();
@@ -104,16 +104,16 @@ namespace abp
}
OSL_ENSURE( aURL.GetProtocol() != INET_PROT_NOT_VALID ,No valid file
name!);
rSettings.sDataSourceName = aURL.GetMainURL( INetURLObject::NO_DECODE
);
-m_aLocationController.setURL( rSettings.sDataSourceName );
+m_pLocationController-setURL( rSettings.sDataSourceName );
OUString sName = aURL.getName( );
sal_Int32 nPos = sName.indexOf(aURL.GetExtension());
if ( nPos != -1 )
{
sName = sName.replaceAt(nPos-1, 4, );
}
-m_aName.SetText(sName);
+m_pName-SetText(sName);
-OnRegister(m_aRegisterName);
+OnRegister(m_pRegisterName);
}
@@ -131,15 +131,15 @@ namespace abp
return false;
if ( ( ::svt::WizardTypes::eTravelBackward != _eReason )
- ( !m_aLocationController.prepareCommit() )
+ ( !m_pLocationController-prepareCommit() )
)
return false;
AddressSettings rSettings = getSettings();
-
[Libreoffice-commits] core.git: 2 commits - connectivity/source dbaccess/source desktop/source reportdesign/source sc/source svx/source wizards/source
connectivity/source/resource/conn_shared_res.src | 10 +-
dbaccess/source/ui/dlg/dbadminsetup.src |2 +-
dbaccess/source/ui/querydesign/querydlg.src |2 +-
desktop/source/app/desktop.src |2 +-
desktop/source/deployment/misc/dp_misc.src |2 +-
reportdesign/source/ui/report/report.src |4 ++--
sc/source/ui/src/scfuncs.src |4 ++--
svx/source/dialog/sdstring.src |6 +++---
svx/source/gallery2/galtheme.src |4 ++--
wizards/source/formwizard/dbwizres.src |2 +-
10 files changed, 19 insertions(+), 19 deletions(-)
New commits:
commit a89355091baeff266bc7c0d9c92d3404b185d268
Author: Thomas Arnhold tho...@arnhold.org
Date: Thu May 8 18:27:34 2014 +0200
some more %PRODUCTNAME usage
Change-Id: If418877b88e95cd55c39fc6dbe314b3a796574cd
diff --git a/desktop/source/app/desktop.src b/desktop/source/app/desktop.src
index 383af8f..9246f22 100644
--- a/desktop/source/app/desktop.src
+++ b/desktop/source/app/desktop.src
@@ -137,7 +137,7 @@ String STR_INTERNAL_ERRMSG
String STR_LO_MUST_BE_RESTARTED
{
-Text [ en-US ] = LibreOffice must unfortunately be manually restarted
once after installation or update. ;
+Text [ en-US ] = %PRODUCTNAME must unfortunately be manually restarted
once after installation or update. ;
};
QueryBox QBX_USERDATALOCKED
diff --git a/desktop/source/deployment/misc/dp_misc.src
b/desktop/source/deployment/misc/dp_misc.src
index d626a19..498e042 100644
--- a/desktop/source/deployment/misc/dp_misc.src
+++ b/desktop/source/deployment/misc/dp_misc.src
@@ -32,7 +32,7 @@ String RID_DEPLOYMENT_DEPENDENCIES_OOO_MAX {
};
String RID_DEPLOYMENT_DEPENDENCIES_LO_MIN {
-Text[en-US] = Extension requires at least LibreOffice version %VERSION;
+Text[en-US] = Extension requires at least %PRODUCTNAME version %VERSION;
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/sdstring.src b/svx/source/dialog/sdstring.src
index 71cd150..f4387bc 100644
--- a/svx/source/dialog/sdstring.src
+++ b/svx/source/dialog/sdstring.src
@@ -1930,7 +1930,7 @@ String RID_SVXSTR_COLOR_USER
String RID_SVXSTR_COLOR_LIBRE_GREEN_1
{
-Text [ en-US ] = Green 1 (LibreOffice Main Color) ;
+Text [ en-US ] = Green 1 (%PRODUCTNAME Main Color) ;
};
String RID_SVXSTR_COLOR_LIBRE_GREEN_ACCENT
@@ -1965,7 +1965,7 @@ String RID_SVXSTR_COLOR_LIBRE_YELLOW_ACCENT
String RID_SVXSTR_COLOR_LIBRE_GREEN_1_DEF
{
-Text = Green 1 (LibreOffice Main Color) ;
+Text = Green 1 (%PRODUCTNAME Main Color) ;
};
String RID_SVXSTR_COLOR_LIBRE_GREEN_ACCENT_DEF
commit dcee245d88aba3e4b50f6307668591c4d9f05ff6
Author: Thomas Arnhold tho...@arnhold.org
Date: Thu May 8 18:23:54 2014 +0200
typos
Change-Id: I2e7676ddec446dfdb72018a1039d6271f963376c
diff --git a/connectivity/source/resource/conn_shared_res.src
b/connectivity/source/resource/conn_shared_res.src
index 1ed4ed3..99273cd 100644
--- a/connectivity/source/resource/conn_shared_res.src
+++ b/connectivity/source/resource/conn_shared_res.src
@@ -33,26 +33,26 @@
String STR_MOZILLA_ADDRESSBOOKS
{
-Text [ en-US ] = Mozilla/Seamonkey Addressbook Directory;
+Text [ en-US ] = Mozilla/Seamonkey Address Book Directory;
Text [ x-comment ] = This must be the term referring to address books in
the user's
Mozilla/Seamonkey profile in the system.;
};
String STR_THUNDERBIRD_ADDRESSBOOKS
{
-Text [ en-US ] = Thunderbird Addressbook Directory;
+Text [ en-US ] = Thunderbird Address Book Directory;
Text [ x-comment ] = This must be the term referring to address books in
the user's
Thunderbird profile in the system.;
};
String STR_OE_ADDRESSBOOK
{
-Text [ en-US ] = Outlook Express Addressbook;
+Text [ en-US ] = Outlook Express Address Book;
};
String STR_OUTLOOK_MAPI_ADDRESSBOOK
{
-Text [ en-US ] = Outlook (MAPI) Addressbook;
+Text [ en-US ] = Outlook (MAPI) Address Book;
};
String STR_NO_TABLE_CREATION_SUPPORT
@@ -87,7 +87,7 @@ String STR_ERR_EXECUTING_QUERY
String STR_MOZILLA_IS_RUNNIG_NO_CHANGES
{
-Text [ en-US ] = You can't make any changes to mozilla address book when
mozilla is running.;
+Text [ en-US ] = You can't make any changes to Mozilla Address Book when
Mozilla is running.;
};
String STR_FOREIGN_PROCESS_CHANGED_AB
diff --git a/dbaccess/source/ui/dlg/dbadminsetup.src
b/dbaccess/source/ui/dlg/dbadminsetup.src
index f4617a8..3572bc2 100644
--- a/dbaccess/source/ui/dlg/dbadminsetup.src
+++ b/dbaccess/source/ui/dlg/dbadminsetup.src
@@ -500,7 +500,7 @@ TabPage PAGE_DBWIZARD_ORACLE
};
String STR_ORACLE_HELPTEXT{
-Text[ en-US ] = Please enter the required information to connect to
an Oracle database.Note that a JDBC Driver Class must be installed on your
system and registered with %PRODUCTNAME.\nPlease contact your system
administrator
[Libreoffice-commits] core.git: extensions/uiconfig
extensions/uiconfig/sabpilot/ui/datasourcepage.ui |4 ++-- extensions/uiconfig/sabpilot/ui/fieldassignpage.ui |4 ++-- extensions/uiconfig/sabpilot/ui/selecttypepage.ui |2 +- 3 files changed, 5 insertions(+), 5 deletions(-) New commits: commit 3a61db17545e0cee9eccaf02a3372068bb0768d4 Author: Caolán McNamara caol...@redhat.com Date: Thu May 8 17:32:37 2014 +0100 use 70 chars instead of 80 Change-Id: Iaecd0e5a32d01d5f3c2dc2dc9a98f316b637ab01 diff --git a/extensions/uiconfig/sabpilot/ui/datasourcepage.ui b/extensions/uiconfig/sabpilot/ui/datasourcepage.ui index dc8c04d..f1bfb46 100644 --- a/extensions/uiconfig/sabpilot/ui/datasourcepage.ui +++ b/extensions/uiconfig/sabpilot/ui/datasourcepage.ui @@ -18,7 +18,7 @@ Now, just enter the name under which you want to register the data source in %PRODUCTNAME./property property name=wrapTrue/property -property name=max_width_chars80/property +property name=max_width_chars70/property /object packing property name=left_attach0/property @@ -173,7 +173,7 @@ Now, just enter the name under which you want to register the data source in %PR property name=yalign0/property property name=label translatable=yesAnother data source already has this name. As data sources have to have globally unique names, you need to choose another one./property property name=wrapTrue/property -property name=max_width_chars80/property +property name=max_width_chars70/property /object packing property name=left_attach0/property diff --git a/extensions/uiconfig/sabpilot/ui/fieldassignpage.ui b/extensions/uiconfig/sabpilot/ui/fieldassignpage.ui index 53868d4..f0ec0b7 100644 --- a/extensions/uiconfig/sabpilot/ui/fieldassignpage.ui +++ b/extensions/uiconfig/sabpilot/ui/fieldassignpage.ui @@ -19,7 +19,7 @@ For instance, you could have stored the e-mail addresses in a field named email Click the button below to open another dialog where you can enter the settings for your data source./property property name=wrapTrue/property -property name=max_width_chars80/property +property name=max_width_chars70/property /object packing property name=left_attach0/property @@ -52,7 +52,7 @@ Click the button below to open another dialog where you can enter the settings f property name=xalign0/property property name=yalign0/property property name=wrapTrue/property -property name=max_width_chars80/property +property name=max_width_chars70/property /object packing property name=left_attach0/property diff --git a/extensions/uiconfig/sabpilot/ui/selecttypepage.ui b/extensions/uiconfig/sabpilot/ui/selecttypepage.ui index 5551f42..8cb4ba3 100644 --- a/extensions/uiconfig/sabpilot/ui/selecttypepage.ui +++ b/extensions/uiconfig/sabpilot/ui/selecttypepage.ui @@ -246,7 +246,7 @@ This wizard helps you create the data source./property property name=wrapTrue/property -property name=max_width_chars80/property +property name=max_width_chars70/property /object packing property name=left_attach0/property ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - avmedia/source canvas/source slideshow/source
avmedia/source/viewer/mediawindow_impl.cxx|3
avmedia/source/win/window.cxx | 11 ---
canvas/source/directx/dx_canvas.cxx | 20 -
canvas/source/directx/dx_devicehelper.cxx | 14 ++--
canvas/source/directx/dx_devicehelper.hxx |5 -
canvas/source/directx/dx_spritedevicehelper.cxx |3
slideshow/source/engine/shapes/viewmediashape.cxx | 76 --
slideshow/source/engine/shapes/viewmediashape.hxx |5 -
8 files changed, 29 insertions(+), 108 deletions(-)
New commits:
commit 22e9b1188c37340941dca2cdbdca4a1d9dd474ca
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Thu May 8 18:33:56 2014 +0200
avmedia: fix media embedding problem in edit mode
Some of the media player interfaces don't use the given
SystemChildWindow, but they work with the parent window handle.
e.g. directx (avmedia/source/win) and
quicktime (avmedia/source/quicktime)
Without the parent window handle they create a
separate child window outside impress window.
It affects only editing and not the slideshow.
Change-Id: I80252ce35fcd29ab2cce081299529b85129017ee
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx
b/avmedia/source/viewer/mediawindow_impl.cxx
index 58c2d49..ab9d351 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -517,9 +517,8 @@ void MediaWindowImpl::onURLChanged()
uno::Reference media::XPlayerWindow xPlayerWindow;
const PointaPoint;
const Size aSize(
mpChildWindow-GetSizePixel() );
-const sal_Int32nWndHandle = 0;
-aArgs[ 0 ] = uno::makeAny( nWndHandle );
+aArgs[ 0 ] = uno::makeAny( mpChildWindow-GetParentWindowHandle() );
aArgs[ 1 ] = uno::makeAny( awt::Rectangle( aPoint.X(), aPoint.Y(),
aSize.Width(), aSize.Height() ) );
aArgs[ 2 ] = uno::makeAny( reinterpret_cast sal_IntPtr (
mpChildWindow.get() ) );
commit 05c141bc3ab264c8e1f4fba57c4a82fa93e91261
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Thu May 8 16:39:25 2014 +0200
DX canvas: provide a OutputDevice pointer as a device handler instead of HDC
With it all canvas can be handled on the same way.
avmedia/source/win/window.cxx: always comes a HWND
Change-Id: Id6b8e6d52b8a136143f724daf8feff5c85cf5804
diff --git a/avmedia/source/win/window.cxx b/avmedia/source/win/window.cxx
index 3d5a7cc..029ad40 100644
--- a/avmedia/source/win/window.cxx
+++ b/avmedia/source/win/window.cxx
@@ -303,17 +303,6 @@ bool Window::create( const uno::Sequence uno::Any
rArguments )
aRect.X, aRect.Y, aRect.Width,
aRect.Height,
(HWND) mnParentWnd, NULL,
mpWndClass-hInstance, 0 );
-// if the last CreateWindow failed...
-if( mnFrameWnd == 0 )
-{
-// try again and this time assume that mnParent is indeed a dc
-mnParentWnd = reinterpret_castint(::WindowFromDC(
(HDC)mnParentWnd ));
-mnFrameWnd = (int) ::CreateWindow( mpWndClass-lpszClassName, NULL,
- WS_VISIBLE | WS_CHILD |
WS_CLIPSIBLINGS | WS_CLIPCHILDREN,
- aRect.X, aRect.Y, aRect.Width,
aRect.Height,
- (HWND)mnParentWnd , NULL,
mpWndClass-hInstance, 0 );
-}
-
if( mnFrameWnd )
{
::SetWindowLong( (HWND) mnFrameWnd, 0, (DWORD) this );
diff --git a/canvas/source/directx/dx_canvas.cxx
b/canvas/source/directx/dx_canvas.cxx
index 6ad7ee1..2c471ee 100644
--- a/canvas/source/directx/dx_canvas.cxx
+++ b/canvas/source/directx/dx_canvas.cxx
@@ -89,7 +89,7 @@ namespace dxcanvas
// At index 2, we expect the current window bound rect
ENSURE_ARG_OR_THROW( maArguments.getLength() = 6
maArguments[5].getValueTypeClass() ==
uno::TypeClass_SEQUENCE,
- SpriteCanvas::initialize: wrong number of
arguments, or wrong types );
+ Canvas::initialize: wrong number of arguments,
or wrong types );
uno::Sequencesal_Int8 aSeq;
maArguments[5] = aSeq;
@@ -98,9 +98,13 @@ namespace dxcanvas
if( !pSysData || !pSysData-hDC )
throw lang::NoSupportException(Passed SystemGraphicsData or HDC
invalid!, NULL);
+sal_Int64 nPtr = 0;
+maArguments[0] = nPtr;
+OutputDevice* pOutDev = reinterpret_castOutputDevice*(nPtr);
+ENSURE_ARG_OR_THROW( pOutDev != NULL,Canvas::initialize: invalid
OutDev pointer );
+
// setup helper
-maDeviceHelper.init( pSysData-hDC,
- *this );
+maDeviceHelper.init( pSysData-hDC, pOutDev, *this );
[Libreoffice-commits] core.git: 2 commits - sfx2/source xmloff/source
sfx2/source/doc/templatedlg.cxx |2 ++
xmloff/source/draw/XMLShapeStyleContext.cxx |4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 80ec4885e97b3fcb34b93e71ced52a4aab43ce93
Author: Julien Nabet serval2...@yahoo.fr
Date: Thu May 8 16:15:14 2014 +0200
cppcheck: Prefer prefix ++/-- operators for non-primitive types
Change-Id: Ieb7933207ed921353a9681ce850d0f4a38d69759
diff --git a/xmloff/source/draw/XMLShapeStyleContext.cxx
b/xmloff/source/draw/XMLShapeStyleContext.cxx
index d366b96..4dbafca 100644
--- a/xmloff/source/draw/XMLShapeStyleContext.cxx
+++ b/xmloff/source/draw/XMLShapeStyleContext.cxx
@@ -195,7 +195,7 @@ void XMLShapeStyleContext::FillPropertySet( const
Reference beans::XPropertySet
static ::rtl::OUString
s_FillStyle(RTL_CONSTASCII_USTRINGPARAM(FillStyle));
// try to find a FillStyle entry and a value from it
-for(a = rProperties.begin(); a != rProperties.end(); a++)
+for(a = rProperties.begin(); a != rProperties.end(); ++a)
{
if(a-mnIndex != -1)
{
@@ -238,7 +238,7 @@ void XMLShapeStyleContext::FillPropertySet( const
Reference beans::XPropertySet
static ::rtl::OUString
s_BackGraphicLocation(RTL_CONSTASCII_USTRINGPARAM(BackGraphicLocation));
static ::rtl::OUString
s_BackGraphicTransparency(RTL_CONSTASCII_USTRINGPARAM(BackGraphicTransparency));
-for(a = rProperties.begin(); a != rProperties.end(); a++)
+for(a = rProperties.begin(); a != rProperties.end(); ++a)
{
if(a-mnIndex != -1)
{
commit 24cb5b3cf8ea893acd4d8a43e5405459d765b314
Author: Julien Nabet serval2...@yahoo.fr
Date: Thu May 8 16:15:03 2014 +0200
cppcheck: Missing bounds check for extra iterator increment in loop
Change-Id: Ia6f7d35acacc99b4cfe4f8b8d5a7c81e97558205
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 7551c95..2f91796 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -1263,6 +1263,8 @@ void SfxTemplateManagerDlg::OnFolderDelete()
aFolderList = aFolderList + \n + (*pIter)-maTitle;
++pIter;
+if (pIter == aSelFolders.end())
+break;
}
}
___
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/charttypes/GL3DBarChart.cxx | 28 +--
chart2/source/view/inc/3DChartObjects.hxx |2
chart2/source/view/inc/GL3DBarChart.hxx| 11 +++-
chart2/source/view/main/3DChartObjects.cxx |3 -
chart2/source/view/main/ChartView.cxx | 62 ++---
5 files changed, 71 insertions(+), 35 deletions(-)
New commits:
commit 56e36f2e36aef20ef594b6725ee091dd534d1eba
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu May 8 11:26:48 2014 -0400
Put category and data series names into the shape collection.
Their positions are yet to be calculated.
Change-Id: Ibb1f2498eb2af3305c2afb6d41be99eaf279daaf
diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx
b/chart2/source/view/charttypes/GL3DBarChart.cxx
index 12a5417..6cd0d0a 100644
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -16,16 +16,22 @@
#include 3DChartObjects.hxx
#include GL3DRenderer.hxx
+#include ExplicitCategoriesProvider.hxx
+#include DataSeriesHelper.hxx
using namespace com::sun::star;
namespace chart {
-GL3DBarChart::GL3DBarChart(const std::vectorVDataSeries* rDataSeries,
-OpenGLWindow rWindow):
+GL3DBarChart::GL3DBarChart(
+const css::uno::Referencecss::chart2::XChartType xChartType,
+const std::vectorVDataSeries* rDataSeries,
+OpenGLWindow rWindow, ExplicitCategoriesProvider rCatProvider ) :
+mxChartType(xChartType),
maDataSeries(rDataSeries),
mpRenderer(new opengl3D::OpenGL3DRenderer()),
-mrWindow(rWindow)
+mrWindow(rWindow),
+mrCatProvider(rCatProvider)
{
}
@@ -40,15 +46,29 @@ void GL3DBarChart::create3DShapes()
const float nBarDistanceX = nBarSizeX / 2;
const float nBarDistanceY = nBarSizeY / 2;
+sal_uInt32 nId = 1;
+
+uno::SequenceOUString aCats = mrCatProvider.getSimpleCategories();
+for (sal_Int32 i = 0; i aCats.getLength(); ++i)
+// Category name text object.
+maShapes.push_back(new opengl3D::Text(mpRenderer.get(), aCats[i],
nId++));
+
maShapes.clear();
maShapes.push_back(new opengl3D::Camera(mpRenderer.get()));
sal_Int32 nSeriesIndex = 0;
-sal_uInt32 nId = 1;
for(std::vectorVDataSeries*::const_iterator itr = maDataSeries.begin(),
itrEnd = maDataSeries.end(); itr != itrEnd; ++itr)
{
VDataSeries* pDataSeries = *itr;
sal_Int32 nPointCount = pDataSeries-getTotalPointCount();
+
+// Create series name text object.
+OUString aSeriesName =
+DataSeriesHelper::getDataSeriesLabel(
+pDataSeries-getModel(),
mxChartType-getRoleOfSequenceForSeriesLabel());
+
+maShapes.push_back(new opengl3D::Text(mpRenderer.get(), aSeriesName,
nId++));
+
for(sal_Int32 nIndex = 0; nIndex nPointCount; ++nIndex)
{
float nVal = pDataSeries-getYValue(nIndex);
diff --git a/chart2/source/view/inc/3DChartObjects.hxx
b/chart2/source/view/inc/3DChartObjects.hxx
index 05c2f5b..ca56580 100644
--- a/chart2/source/view/inc/3DChartObjects.hxx
+++ b/chart2/source/view/inc/3DChartObjects.hxx
@@ -62,7 +62,7 @@ private:
class Text : public Renderable3DObject
{
public:
-Text(OpenGL3DRenderer* pRenderer, sal_uInt32 nId);
+Text(OpenGL3DRenderer* pRenderer, const OUString rStr, sal_uInt32 nId);
virtual void render() SAL_OVERRIDE;
private:
BitmapEx maText;
diff --git a/chart2/source/view/inc/GL3DBarChart.hxx
b/chart2/source/view/inc/GL3DBarChart.hxx
index 06b1be5..f3e225f 100644
--- a/chart2/source/view/inc/GL3DBarChart.hxx
+++ b/chart2/source/view/inc/GL3DBarChart.hxx
@@ -18,6 +18,8 @@
namespace chart {
+class ExplicitCategoriesProvider;
+
namespace opengl3D {
class Renderable3DObject;
@@ -32,7 +34,11 @@ class TemporaryContext;
class GL3DBarChart
{
public:
-GL3DBarChart(const std::vectorVDataSeries* rDataSeries, OpenGLWindow
rContext);
+GL3DBarChart(
+const css::uno::Referencecss::chart2::XChartType xChartType,
+const std::vectorVDataSeries* rDataSeries, OpenGLWindow rContext,
+ExplicitCategoriesProvider rCatProvider );
+
~GL3DBarChart();
void create3DShapes();
@@ -40,12 +46,13 @@ public:
void render();
private:
-
+css::uno::Referencecss::chart2::XChartType mxChartType;
std::vectorVDataSeries* maDataSeries;
boost::ptr_vectoropengl3D::Renderable3DObject maShapes;
boost::scoped_ptropengl3D::OpenGL3DRenderer mpRenderer;
OpenGLWindow mrWindow;
+ExplicitCategoriesProvider mrCatProvider;
};
}
diff --git a/chart2/source/view/main/3DChartObjects.cxx
b/chart2/source/view/main/3DChartObjects.cxx
index b4ca2c4..daa5eca 100644
--- a/chart2/source/view/main/3DChartObjects.cxx
+++ b/chart2/source/view/main/3DChartObjects.cxx
@@ -51,9 +51,10 @@ void Line::render()
mpRenderer-EndAddShapePolygon3DObject();
}
-Text::Text(OpenGL3DRenderer* pRenderer, sal_uInt32 nId):
Public License Statements
All of my past future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. -- Michał Siedlaczek ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: connectivity/source officecfg/registry ucb/workben
connectivity/source/drivers/postgresql/pq_xcolumns.cxx |2 +-
officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs |4 ++--
officecfg/registry/schema/org/openoffice/Setup.xcs |2 +-
ucb/workben/ucb/srcharg.cxx|4 ++--
ucb/workben/ucb/ucbdemo.cxx|4 ++--
5 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 88db0ab698055ce1ea37a3b200a425eee5b9f2f8
Author: Julien Nabet serval2...@yahoo.fr
Date: Thu May 8 18:46:04 2014 +0200
Typos
Change-Id: Id4b79ae8576acaaf9d5ee1c9c030b6ffda3059a5
diff --git a/connectivity/source/drivers/postgresql/pq_xcolumns.cxx
b/connectivity/source/drivers/postgresql/pq_xcolumns.cxx
index 90d9c6e..1176248 100644
--- a/connectivity/source/drivers/postgresql/pq_xcolumns.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xcolumns.cxx
@@ -222,7 +222,7 @@ OUString columnMetaData2SDBCX(
st.DESCRIPTION, makeAny( xRow-getString( DESCRIPTION ) ) );
-// maybe a better criterium than the type name can be found in future
+// maybe a better criterion than the type name can be found in future
pBase-setPropertyValue_NoBroadcast_public(
st.IS_AUTO_INCREMENT, isAutoIncrement(xRow-getString( DEFAULT_VALUE
)) );
diff --git a/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs
b/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs
index ddcd452..1edab99 100644
--- a/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs
@@ -104,7 +104,7 @@
/prop
set oor:name=Fields oor:node-type=FieldAssignment
info
- descSpecifies the column name mapping between the programatic
column name and the logical column name./desc
+ descSpecifies the column name mapping between the programmatic
column name and the logical column name./desc
/info
/set
/group
@@ -334,7 +334,7 @@
/prop
set oor:name=Fields oor:node-type=FieldAssignment
info
- descSpecifies the column name mapping between the programatic
column name and the logical column name./desc
+ descSpecifies the column name mapping between the programmatic
column name and the logical column name./desc
/info
/set
/group
diff --git a/officecfg/registry/schema/org/openoffice/Setup.xcs
b/officecfg/registry/schema/org/openoffice/Setup.xcs
index df6e1f3..0b3ee4e 100644
--- a/officecfg/registry/schema/org/openoffice/Setup.xcs
+++ b/officecfg/registry/schema/org/openoffice/Setup.xcs
@@ -118,7 +118,7 @@
info
descIt's the most actual filter, which is able to import/export
ALL currently implemented features of this office module. It has to
be
- the programatic name of the filter./desc
+ the programmatic name of the filter./desc
/info
/prop
prop oor:name=ooSetupFactoryActualTemplateFilter oor:type=xs:string
diff --git a/ucb/workben/ucb/srcharg.cxx b/ucb/workben/ucb/srcharg.cxx
index f63587b..781f168 100644
--- a/ucb/workben/ucb/srcharg.cxx
+++ b/ucb/workben/ucb/srcharg.cxx
@@ -105,14 +105,14 @@ bool parseSearchArgument(String const rInput,
ucb::SearchInfo rInfo)
{
/* Format of rInput:
- argument = *option [criterium *(OR criterium)]
+ argument = *option [criterion *(OR criterion)]
option = (--RECURSE = (NONE / ONE / DEEP))
/ ((--BASE / --FOLDERVIEW / --DOCVIEW
/ --INDIRECT)
= bool)
- criterium = EMPTY / (term *(AND term))
+ criterion = EMPTY / (term *(AND term))
term = text-term / date-term / numeric-term / bool-term
diff --git a/ucb/workben/ucb/ucbdemo.cxx b/ucb/workben/ucb/ucbdemo.cxx
index d4cf14c..0be3ecf 100644
--- a/ucb/workben/ucb/ucbdemo.cxx
+++ b/ucb/workben/ucb/ucbdemo.cxx
@@ -949,10 +949,10 @@ void UcbContent::open( const OUString rName, const
OUString rInput,
{
// Sort criteria... Note that column numbering starts with 1!
aOpenArg.SortingInfo.realloc(2);
-// primary sort criterium: column 4 -- IsFolder
+// primary sort criterion: column 4 -- IsFolder
aOpenArg.SortingInfo[ 0 ].ColumnIndex = 4;
aOpenArg.SortingInfo[ 0 ].Ascending = sal_False;
-// secondary sort criterium: column 1 -- Title
+// secondary sort criterion: column 1 -- Title
aOpenArg.SortingInfo[ 1 ].ColumnIndex = 1;
aOpenArg.SortingInfo[ 1 ].Ascending = sal_True;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on||56847 -- 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 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on|56847 | -- 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
Michał Siedlaczek license statement
All of my past future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/core/text/frmpaint.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0fd4cc8ba7335e33515413f54b19455b376d5db9 Author: Miklos Vajna vmik...@collabora.co.uk Date: Thu May 8 18:49:11 2014 +0200 fdo#78444 sw: avoid incorrect right shrinking of repaint rectangle The old condition was: set the right edge of the repaint rectangle, in case the result would be wider than the original (if we repaint more, that can't hurt regarding the end result) or in case the left edge was set. But that's problematic, the reproducer situation described in the bug triggers a case when the right edge is shrunk too much, so part of the painted letter is missing. Fix that by only setting the right edge of the repaint rectangle when we know that it won't shrink. Change-Id: I33b78a929021b284d5283fc2c35e0b3c999fa224 diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx index fb41bab..69eb302 100644 --- a/sw/source/core/text/frmpaint.cxx +++ b/sw/source/core/text/frmpaint.cxx @@ -432,7 +432,7 @@ SwRect SwTxtFrm::Paint() pRepaint-Left( pRepaint-GetOfst() ); l = pRepaint-GetRightOfst(); -if( l ( pRepaint-GetOfst() || l pRepaint-Right() ) ) +if( l l pRepaint-Right() ) pRepaint-Right( l ); pRepaint-SetOfst( 0 ); aRet = *pRepaint; ___ 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/charttypes/GL3DBarChart.cxx | 12 ++--
chart2/source/view/inc/GL3DBarChart.hxx|4 ++--
chart2/source/view/main/ChartView.cxx |5 ++---
3 files changed, 10 insertions(+), 11 deletions(-)
New commits:
commit 2908bfefbc04357890967bb13a4435b9fdb643d4
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu May 8 13:10:45 2014 -0400
Stop the leak of VDataSeries instances.
Change-Id: I36cfa84e4fb19c3da584672d510e8b35f9343950
diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx
b/chart2/source/view/charttypes/GL3DBarChart.cxx
index 6cd0d0a..be82ca5 100644
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -25,7 +25,7 @@ namespace chart {
GL3DBarChart::GL3DBarChart(
const css::uno::Referencecss::chart2::XChartType xChartType,
-const std::vectorVDataSeries* rDataSeries,
+const boost::ptr_vectorVDataSeries rDataSeries,
OpenGLWindow rWindow, ExplicitCategoriesProvider rCatProvider ) :
mxChartType(xChartType),
maDataSeries(rDataSeries),
@@ -56,22 +56,22 @@ void GL3DBarChart::create3DShapes()
maShapes.clear();
maShapes.push_back(new opengl3D::Camera(mpRenderer.get()));
sal_Int32 nSeriesIndex = 0;
-for(std::vectorVDataSeries*::const_iterator itr = maDataSeries.begin(),
+for (boost::ptr_vectorVDataSeries::const_iterator itr =
maDataSeries.begin(),
itrEnd = maDataSeries.end(); itr != itrEnd; ++itr)
{
-VDataSeries* pDataSeries = *itr;
-sal_Int32 nPointCount = pDataSeries-getTotalPointCount();
+const VDataSeries rDataSeries = *itr;
+sal_Int32 nPointCount = rDataSeries.getTotalPointCount();
// Create series name text object.
OUString aSeriesName =
DataSeriesHelper::getDataSeriesLabel(
-pDataSeries-getModel(),
mxChartType-getRoleOfSequenceForSeriesLabel());
+rDataSeries.getModel(),
mxChartType-getRoleOfSequenceForSeriesLabel());
maShapes.push_back(new opengl3D::Text(mpRenderer.get(), aSeriesName,
nId++));
for(sal_Int32 nIndex = 0; nIndex nPointCount; ++nIndex)
{
-float nVal = pDataSeries-getYValue(nIndex);
+float nVal = rDataSeries.getYValue(nIndex);
float nXPos = nIndex * (nBarSizeX + nBarDistanceX);
float nYPos = nSeriesIndex * (nBarSizeY + nBarDistanceY);
diff --git a/chart2/source/view/inc/GL3DBarChart.hxx
b/chart2/source/view/inc/GL3DBarChart.hxx
index f3e225f..8237805 100644
--- a/chart2/source/view/inc/GL3DBarChart.hxx
+++ b/chart2/source/view/inc/GL3DBarChart.hxx
@@ -36,7 +36,7 @@ class GL3DBarChart
public:
GL3DBarChart(
const css::uno::Referencecss::chart2::XChartType xChartType,
-const std::vectorVDataSeries* rDataSeries, OpenGLWindow rContext,
+const boost::ptr_vectorVDataSeries rDataSeries, OpenGLWindow
rContext,
ExplicitCategoriesProvider rCatProvider );
~GL3DBarChart();
@@ -47,7 +47,7 @@ public:
private:
css::uno::Referencecss::chart2::XChartType mxChartType;
-std::vectorVDataSeries* maDataSeries;
+const boost::ptr_vectorVDataSeries maDataSeries;
boost::ptr_vectoropengl3D::Renderable3DObject maShapes;
boost::scoped_ptropengl3D::OpenGL3DRenderer mpRenderer;
diff --git a/chart2/source/view/main/ChartView.cxx
b/chart2/source/view/main/ChartView.cxx
index 0c23d05..13f4bf7 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -3120,7 +3120,7 @@ void ChartView::createShapes3D()
return;
uno::Sequence uno::Reference XCoordinateSystem aCooSysList(
xCooSysContainer-getCoordinateSystems() );
-std::vectorVDataSeries* aDataSeries;
+boost::ptr_vectorVDataSeries aDataSeries;
if (aCooSysList.getLength() != 1)
// Supporting multiple coordinates in a truly 3D chart (which implies
@@ -3155,8 +3155,7 @@ void ChartView::createShapes3D()
if(!xDataSeries.is())
continue;
-VDataSeries* pSeries = new VDataSeries( xDataSeries );
-aDataSeries.push_back(pSeries);
+aDataSeries.push_back(new VDataSeries(xDataSeries));
}
OpenGLWindow* pWindow = mrChartModel.getOpenGLWindow();
___
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/filter/sdpptwrp.cxx |2 -- 1 file changed, 2 deletions(-) New commits: commit 11fc0c1ee9c8f7aa8bcfc94b9703134c06cd7bff Author: Thomas Arnhold tho...@arnhold.org Date: Thu May 8 20:37:07 2014 +0200 Revert coverity#736452 Resource leak Somehow this one lets the windows tinderboxes fail. This reverts commit f6012f6c5d40857ea7a9490da90ae5541d859563. Change-Id: I1f3e503bef74956f64bb2f0b9d748fc7fc7299c5 diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx index a8bebf0..52c8f7f 100644 --- a/sd/source/filter/sdpptwrp.cxx +++ b/sd/source/filter/sdpptwrp.cxx @@ -116,8 +116,6 @@ bool SdPPTFilter::Import() if ( !bRet ) mrMedium.SetError( SVSTREAM_WRONGVERSION, OSL_LOG_PREFIX ); - -delete pLibrary; } #else bRet = ImportPPT( mrDocument, *pDocStream, *pStorage, mrMedium ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/quartz
vcl/quartz/ctfonts.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit 2ba05b4800d6cc322276a6911792363f8eb32051
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu May 8 21:46:37 2014 +0200
Handle CTFontCreatePathForGlyph failure
Change-Id: I724b9983295fe408f4beadb9ed488ab77f9fa63f
diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx
index 919ac5d..4382cae 100644
--- a/vcl/quartz/ctfonts.cxx
+++ b/vcl/quartz/ctfonts.cxx
@@ -199,6 +199,9 @@ bool CoreTextStyle::GetGlyphOutline( sal_GlyphId aGlyphId,
basegfx::B2DPolyPolyg
// XXX: this is broken if the glyph came from fallback font
CTFontRef pCTFont = (CTFontRef)CFDictionaryGetValue( mpStyleDict,
kCTFontAttributeName );
CGPathRef xPath = CTFontCreatePathForGlyph( pCTFont, nCGGlyph, NULL );
+if (!xPath) {
+return false;
+}
GgoData aGgoData;
aGgoData.mpPolyPoly = rResult;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extensions/source
extensions/source/abpilot/abpfinalpage.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 18e4e155642b4a4cbcc1090df081e45eaf7de8a0 Author: Stephan Bergmann sberg...@redhat.com Date: Thu May 8 21:49:53 2014 +0200 loplugin:saloverride Change-Id: Ia43a2a842d97dc9ad9fdbe7f59d62998496cc97a diff --git a/extensions/source/abpilot/abpfinalpage.hxx b/extensions/source/abpilot/abpfinalpage.hxx index 6c8c329..821f39f 100644 --- a/extensions/source/abpilot/abpfinalpage.hxx +++ b/extensions/source/abpilot/abpfinalpage.hxx @@ -52,7 +52,7 @@ namespace abp public: FinalPage( OAddessBookSourcePilot* _pParent ); -~FinalPage(); +virtual ~FinalPage(); protected: // OWizardPage overridables ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/draw/ximpshap.cxx | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
New commits:
commit 3d2a17fd2e9cde29f12268ddfccc3f5b51455722
Author: Laurent Balland-Poirier laurent.balland-poir...@laposte.net
Date: Tue Apr 15 14:34:50 2014 +0200
fdo#77451 Detect AOO 4.x for SvXMLImport::needFixPositionAfterZ
Old versions of OOo and AOO need a fix for Z paths. But AOO 4.0 did not
fix it neither.
Change-Id: I29af75035c7c059b69fcdc3a1ce27b617a30dbd1
Reviewed-on: https://gerrit.libreoffice.org/9012
Tested-by: Michael Stahl mst...@redhat.com
Reviewed-by: Michael Stahl mst...@redhat.com
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index a3fd8bb..97040ea 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -1848,10 +1848,12 @@ bool SvXMLImport::needFixPositionAfterZ() const
bool bWrongPositionAfterZ( false );
sal_Int32 nUPD( 0 );
sal_Int32 nBuildId( 0 );
-if ( getBuildIds( nUPD, nBuildId )
- ( ( nUPD == 641 ) || ( nUPD == 645 ) || ( nUPD == 680 ) || ( nUPD ==
300 ) ||
- ( nUPD == 310 ) || ( nUPD == 320 ) || ( nUPD == 330 ) || ( nUPD ==
340 ) ||
- ( nUPD == 350 nBuildId 202 ) ) )
+if ( getBuildIds( nUPD, nBuildId ) // test OOo and old versions of LibO
and AOO
+ ( ( ( nUPD == 641 ) || ( nUPD == 645 ) || ( nUPD == 680 ) || ( nUPD ==
300 ) ||
+ ( nUPD == 310 ) || ( nUPD == 320 ) || ( nUPD == 330 ) || ( nUPD ==
340 ) ||
+ ( nUPD == 350 nBuildId 202 ) )
+ || ( getGeneratorVersion() = SvXMLImport::AOO_40x // test if AOO
4.x
+ getGeneratorVersion() SvXMLImport::AOO_4x ) ) )
{
bWrongPositionAfterZ = true;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - chart2/source
chart2/source/view/charttypes/GL3DBarChart.cxx | 54 ++---
chart2/source/view/inc/3DChartObjects.hxx |5 ++
chart2/source/view/inc/GL3DBarChart.hxx|6 --
chart2/source/view/main/3DChartObjects.cxx | 28
4 files changed, 80 insertions(+), 13 deletions(-)
New commits:
commit 74335267c235bb4eb8e015d271983dbc9f3ada24
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu May 8 16:03:10 2014 -0400
My best attempt at positioning text objects.
Change-Id: I390b6d09558b7f2dea46cfd4e5db5ed6f2162b5f
diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx
b/chart2/source/view/charttypes/GL3DBarChart.cxx
index be82ca5..4bf460e 100644
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -41,6 +41,14 @@ GL3DBarChart::~GL3DBarChart()
void GL3DBarChart::create3DShapes()
{
+// Each series of data flows from left to right, and multiple series are
+// stacked vertically along y axis.
+
+// NOTE: These objects are created and positioned in a totally blind
+// fashion since we don't even have a way to see them on screen. So, no
+// guarantee they are positioned correctly. In fact, they are guaranteed
+// to be positioned incorrectly.
+
const float nBarSizeX = 10;
const float nBarSizeY = 10;
const float nBarDistanceX = nBarSizeX / 2;
@@ -48,10 +56,9 @@ void GL3DBarChart::create3DShapes()
sal_uInt32 nId = 1;
-uno::SequenceOUString aCats = mrCatProvider.getSimpleCategories();
-for (sal_Int32 i = 0; i aCats.getLength(); ++i)
-// Category name text object.
-maShapes.push_back(new opengl3D::Text(mpRenderer.get(), aCats[i],
nId++));
+std::vectoropengl3D::Text* aYAxisTexts;
+
+float nYPos = 0.0;
maShapes.clear();
maShapes.push_back(new opengl3D::Camera(mpRenderer.get()));
@@ -59,6 +66,8 @@ void GL3DBarChart::create3DShapes()
for (boost::ptr_vectorVDataSeries::const_iterator itr =
maDataSeries.begin(),
itrEnd = maDataSeries.end(); itr != itrEnd; ++itr)
{
+nYPos = nSeriesIndex * (nBarSizeY + nBarDistanceY);
+
const VDataSeries rDataSeries = *itr;
sal_Int32 nPointCount = rDataSeries.getTotalPointCount();
@@ -67,13 +76,21 @@ void GL3DBarChart::create3DShapes()
DataSeriesHelper::getDataSeriesLabel(
rDataSeries.getModel(),
mxChartType-getRoleOfSequenceForSeriesLabel());
-maShapes.push_back(new opengl3D::Text(mpRenderer.get(), aSeriesName,
nId++));
+aYAxisTexts.push_back(new opengl3D::Text(mpRenderer.get(),
aSeriesName, nId++));
+opengl3D::Text* p = aYAxisTexts.back();
+Size aTextSize = p-getSize();
+glm::vec3 aTopLeft, aTopRight, aBottomRight;
+aTopLeft.x = aTextSize.getWidth() * -1.0;
+aTopLeft.y = nYPos;
+aTopRight.y = nYPos;
+aBottomRight = aTopRight;
+aBottomRight.y += aTextSize.getHeight();
+p-setPosition(aTopLeft, aTopRight, aBottomRight);
for(sal_Int32 nIndex = 0; nIndex nPointCount; ++nIndex)
{
float nVal = rDataSeries.getYValue(nIndex);
float nXPos = nIndex * (nBarSizeX + nBarDistanceX);
-float nYPos = nSeriesIndex * (nBarSizeY + nBarDistanceY);
sal_Int32 nColor = COL_BLUE;
@@ -86,6 +103,31 @@ void GL3DBarChart::create3DShapes()
++nSeriesIndex;
}
+
+nYPos += nBarSizeY + nBarDistanceY;
+
+// Create category texts along X-axis at the bottom.
+uno::SequenceOUString aCats = mrCatProvider.getSimpleCategories();
+for (sal_Int32 i = 0; i aCats.getLength(); ++i)
+{
+float nXPos = i * (nBarSizeX + nBarDistanceX);
+
+maShapes.push_back(new opengl3D::Text(mpRenderer.get(), aCats[i],
nId++));
+opengl3D::Text* p = static_castopengl3D::Text*(maShapes.back());
+Size aTextSize = p-getSize();
+glm::vec3 aTopLeft;
+aTopLeft.x = nXPos;
+aTopLeft.y = nYPos;
+glm::vec3 aTopRight = aTopLeft;
+aTopRight.x += aTextSize.getWidth();
+glm::vec3 aBottomRight = aTopRight;
+aBottomRight.y += aTextSize.getHeight();
+p-setPosition(aTopLeft, aTopRight, aBottomRight);
+}
+
+// Transfer all Y-axis text objects to the shape collection.
+std::copy(aYAxisTexts.begin(), aYAxisTexts.end(),
std::back_inserter(maShapes));
+aYAxisTexts.clear();
}
void GL3DBarChart::render()
diff --git a/chart2/source/view/inc/3DChartObjects.hxx
b/chart2/source/view/inc/3DChartObjects.hxx
index ca56580..e93d656 100644
--- a/chart2/source/view/inc/3DChartObjects.hxx
+++ b/chart2/source/view/inc/3DChartObjects.hxx
@@ -64,6 +64,11 @@ class Text : public Renderable3DObject
public:
Text(OpenGL3DRenderer* pRenderer, const OUString rStr, sal_uInt32 nId);
virtual void render() SAL_OVERRIDE;
+
+Size getSize() const;
+
+void
[Libreoffice-commits] core.git: chart2/source
chart2/source/view/charttypes/GL3DBarChart.cxx |9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
New commits:
commit a4e028447e6f06e4d6660dbe95e15dca8cb5cbf2
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu May 8 16:13:42 2014 -0400
Try without std::back_inserter. Some tinderboxes don't like that.
Change-Id: I37b5da446abe123d0e0526b5556014df606e6156
diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx
b/chart2/source/view/charttypes/GL3DBarChart.cxx
index 4bf460e..e65f07e 100644
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -125,8 +125,13 @@ void GL3DBarChart::create3DShapes()
p-setPosition(aTopLeft, aTopRight, aBottomRight);
}
-// Transfer all Y-axis text objects to the shape collection.
-std::copy(aYAxisTexts.begin(), aYAxisTexts.end(),
std::back_inserter(maShapes));
+{
+// Transfer all Y-axis text objects to the shape collection.
+std::vectoropengl3D::Text*::iterator itText = aYAxisTexts.begin(),
itTextEnd = aYAxisTexts.end();
+for (; itText != itTextEnd; ++itText)
+maShapes.push_back(*itText);
+}
+
aYAxisTexts.clear();
}
___
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' - xmloff/source
xmloff/source/draw/ximpshap.cxx | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
New commits:
commit 6a1c8a0b53c8ec1c822e60913c1ccdfd2eaa21ce
Author: Laurent Balland-Poirier laurent.balland-poir...@laposte.net
Date: Tue Apr 15 14:34:50 2014 +0200
fdo#77451 Detect AOO 4.x for SvXMLImport::needFixPositionAfterZ
Old versions of OOo and AOO need a fix for Z paths. But AOO 4.0 did not
fix it neither.
Change-Id: I29af75035c7c059b69fcdc3a1ce27b617a30dbd1
Reviewed-on: https://gerrit.libreoffice.org/9012
Tested-by: Michael Stahl mst...@redhat.com
Reviewed-by: Michael Stahl mst...@redhat.com
(cherry picked from commit 3d2a17fd2e9cde29f12268ddfccc3f5b51455722)
Signed-off-by: Michael Stahl mst...@redhat.com
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index ae94d31..65c3084 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -1755,10 +1755,12 @@ bool SvXMLImport::needFixPositionAfterZ() const
bool bWrongPositionAfterZ( false );
sal_Int32 nUPD( 0 );
sal_Int32 nBuildId( 0 );
-if ( getBuildIds( nUPD, nBuildId )
- ( ( nUPD == 641 ) || ( nUPD == 645 ) || ( nUPD == 680 ) || ( nUPD ==
300 ) ||
- ( nUPD == 310 ) || ( nUPD == 320 ) || ( nUPD == 330 ) || ( nUPD ==
340 ) ||
- ( nUPD == 350 nBuildId 202 ) ) )
+if ( getBuildIds( nUPD, nBuildId ) // test OOo and old versions of LibO
and AOO
+ ( ( ( nUPD == 641 ) || ( nUPD == 645 ) || ( nUPD == 680 ) || ( nUPD ==
300 ) ||
+ ( nUPD == 310 ) || ( nUPD == 320 ) || ( nUPD == 330 ) || ( nUPD ==
340 ) ||
+ ( nUPD == 350 nBuildId 202 ) )
+ || ( getGeneratorVersion() = SvXMLImport::AOO_40x // test if AOO
4.x
+ getGeneratorVersion() SvXMLImport::AOO_4x ) ) )
{
bWrongPositionAfterZ = true;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/debugevent' - 2 commits - include/vcl vcl/source
include/vcl/debugevent.hxx |2 -
vcl/source/window/debugevent.cxx | 56 ---
2 files changed, 42 insertions(+), 16 deletions(-)
New commits:
commit 4b74bdd3a2122e64fe43aabb02341a454db77b73
Author: Michael Meeks michael.me...@collabora.com
Date: Thu May 8 21:59:45 2014 +0100
Make the inserted text more European and sensible for now.
Change-Id: I8b2ecef11362c0fc1dc2b76780140881e769bb89
diff --git a/include/vcl/debugevent.hxx b/include/vcl/debugevent.hxx
index ce31570..2700324 100644
--- a/include/vcl/debugevent.hxx
+++ b/include/vcl/debugevent.hxx
@@ -20,7 +20,7 @@ class VCL_DLLPUBLIC DebugEventInjector : Timer {
DebugEventInjector( sal_uInt32 nMaxEvents );
Window *ChooseWindow();
- void InjectKeyEvent();
+ void InjectTextEvent();
void InjectMenuEvent();
void InjectMouseEvent();
void InjectEvent();
diff --git a/vcl/source/window/debugevent.cxx b/vcl/source/window/debugevent.cxx
index 37ca716..4bd54ed 100644
--- a/vcl/source/window/debugevent.cxx
+++ b/vcl/source/window/debugevent.cxx
@@ -131,22 +131,43 @@ static void InitKeyEvent( SalKeyEvent rKeyEvent )
rKeyEvent.mnRepeat = 0;
}
-void DebugEventInjector::InjectKeyEvent()
+void DebugEventInjector::InjectTextEvent()
{
SalKeyEvent aKeyEvent;
Window *pWindow = ChooseWindow();
InitKeyEvent( aKeyEvent );
-sal_uInt16 nCode = getRandom() * KEY_CODE;
-if( getRandom() 0.05 ) // modifier
-nCode |= (sal_uInt16)( getRandom() * KEY_MODTYPE ) KEY_MODTYPE;
-aKeyEvent.mnCode = nCode;
-aKeyEvent.mnCharCode = getRandom() * 0x;
+if (getRandom() 0.10) // Occasionally a truly random event
+{
+aKeyEvent.mnCode = getRandom() * KEY_CODE;
+aKeyEvent.mnCharCode = getRandom() * 0x;
+}
+else
+{
+struct {
+sal_uInt16 nCodeStart, nCodeEnd;
+char aCharStart;
+} nTextCodes[] = {
+{ KEY_0, KEY_9, '0' },
+{ KEY_A, KEY_Z, 'a' }
+};
+
+size_t i = getRandom() * SAL_N_ELEMENTS( nTextCodes );
+int offset = trunc( getRandom() * ( nTextCodes[i].nCodeEnd -
nTextCodes[i].nCodeStart ) );
+aKeyEvent.mnCode = nTextCodes[i].nCodeStart + offset;
+aKeyEvent.mnCharCode = nTextCodes[i].aCharStart + offset;
+//fprintf( stderr, Char '%c' offset %d into record %d base '%c'\n,
+// aKeyEvent.mnCharCode, offset, (int)i,
nTextCodes[i].aCharStart );
+}
+
+if( getRandom() 0.05 ) // modifier
+aKeyEvent.mnCode |= (sal_uInt16)( getRandom() * KEY_MODTYPE )
KEY_MODTYPE;
bool bHandled = ImplWindowFrameProc( pWindow, NULL, SALEVENT_KEYINPUT,
aKeyEvent);
-fprintf (stderr, Injected key 0x%x - %d win %p\n,
- (int) aKeyEvent.mnCode, (int)bHandled, pWindow);
+fprintf( stderr, Injected key 0x%x - %d win %p\n,
+ (int) aKeyEvent.mnCode, (int)bHandled, pWindow );
+ImplWindowFrameProc( pWindow, NULL, SALEVENT_KEYUP, aKeyEvent );
}
/*
@@ -155,12 +176,14 @@ void DebugEventInjector::InjectKeyEvent()
*/
void DebugEventInjector::InjectEvent()
{
+fprintf( stderr, %6d - , (int)mnEventsLeft );
+
double nRand = getRandom();
-if (nRand 0.50)
+if (nRand 0.30)
{
int nEvents = getRandom() * 10;
for (int i = 0; i nEvents; i++)
-InjectKeyEvent();
+InjectTextEvent();
}
else if (nRand 0.60)
InjectKeyNavEdit();
commit ade994548c593ea1185711a3e226f51a99fbb660
Author: Michael Meeks michael.me...@collabora.com
Date: Thu May 8 21:43:46 2014 +0100
quit after emitting all the events to allow valgrinding.
Change-Id: Ibee9d8f8dd0a266db276772d48deb0bd9d18
diff --git a/vcl/source/window/debugevent.cxx b/vcl/source/window/debugevent.cxx
index 2f37678..37ca716 100644
--- a/vcl/source/window/debugevent.cxx
+++ b/vcl/source/window/debugevent.cxx
@@ -120,7 +120,7 @@ void DebugEventInjector::InjectMenuEvent()
static void InitKeyEvent( SalKeyEvent rKeyEvent )
{
double nRand = getRandom();
-if (nRand 0.01)
+if (nRand 0.001)
rKeyEvent.mnTime = getRandom() * ULONG_MAX;
else
rKeyEvent.mnTime = Time::GetSystemTicks();
@@ -216,14 +216,15 @@ void DebugEventInjector::InjectKeyNavEdit()
InitKeyEvent( aKeyEvent );
aKeyEvent.mnCode = nKey;
-if (getRandom() 0.10) // modifier
+if (getRandom() 0.15) // modifier
aKeyEvent.mnCode |= (sal_uInt16)(getRandom() * KEY_MODTYPE)
KEY_MODTYPE;
aKeyEvent.mnCharCode = 0x0; // hopefully unused.
-bool bHandled = ImplWindowFrameProc( pWindow, NULL, SALEVENT_KEYINPUT,
aKeyEvent);
-fprintf (stderr, Injected edit / move key 0x%x - %d win %p\n,
- (int) aKeyEvent.mnCode, (int)bHandled, pWindow);
+bool bHandled = ImplWindowFrameProc( pWindow, NULL, SALEVENT_KEYINPUT,
aKeyEvent );
+fprintf( stderr, Injected edit / move key 0x%x - %d win %p\n,
+
[Libreoffice-commits] core.git: vcl/osx
vcl/osx/salframe.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 13009b5cde632b05f62620f214357565c622f7fa Author: Tor Lillqvist t...@collabora.com Date: Fri May 9 00:01:57 2014 +0300 Fix typo, thanks to Cor Nouws for noticing Change-Id: Ib20fa5dbbc8bfbd399c3266c175ba1971e9a4774 diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx index 35fa723..b3a1015 100644 --- a/vcl/osx/salframe.cxx +++ b/vcl/osx/salframe.cxx @@ -1020,7 +1020,7 @@ OUString AquaSalFrame::GetKeyName( sal_uInt16 nKeyCode ) aKeyMap[ KEY_OPEN ] = OUString( sal_Unicode( 0x23cf ) ); aKeyMap[ KEY_TILDE ]= OUString( '~' ); aKeyMap[ KEY_BRACKETLEFT ] = OUString( '[' ); -aKeyMap[ KEY_BRACKETRIGHT ] = OUString( '}' ); +aKeyMap[ KEY_BRACKETRIGHT ] = OUString( ']' ); aKeyMap[ KEY_SEMICOLON ] = OUString( ';' ); aKeyMap[ KEY_QUOTERIGHT ] = OUString( '\'' ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/impfont.cxx |8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 434c5d7845ab25f8a518e7bec910f8628725d5b9
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu May 8 23:42:28 2014 +0200
Fix symbol aliasing code
Change-Id: Ic4605c40b9f3467f84732a0e3c956976fae68277
diff --git a/vcl/source/gdi/impfont.cxx b/vcl/source/gdi/impfont.cxx
index 31d7968..eb5a0c0 100644
--- a/vcl/source/gdi/impfont.cxx
+++ b/vcl/source/gdi/impfont.cxx
@@ -152,11 +152,15 @@ int ImplFontCharMap::GetGlyphIndex( sal_UCS4 cChar ) const
// check that we are inside any range
if( (nRange == 0) (cChar mpRangeCodes[0]) ) {
// symbol aliasing gives symbol fonts a second chance
-const bool bSymbolic = (mpRangeCodes[0]=0xF000)
(mpRangeCodes[1]=0xF0FF);
+const bool bSymbolic = cChar = 0xFF (mpRangeCodes[0]=0xF000)
(mpRangeCodes[1]=0xF0FF);
if( !bSymbolic )
return 0;
// check for symbol aliasing (U+F0xx - U+00xx)
-nRange = ImplFindRangeIndex( cChar | 0xF000 );
+cChar |= 0xF000;
+nRange = ImplFindRangeIndex( cChar );
+if( (nRange == 0) (cChar mpRangeCodes[0]) ) {
+return 0;
+}
}
// check that we are inside a range
if( (nRange 1) != 0 )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - chart2/source include/vcl vcl/source
chart2/source/view/main/GL3DRenderer.cxx | 43 ++-
include/vcl/opengl/OpenGLHelper.hxx |1
vcl/source/opengl/OpenGLContext.cxx | 13 -
vcl/source/opengl/OpenGLHelper.cxx | 18
4 files changed, 23 insertions(+), 52 deletions(-)
New commits:
commit 37852a02cdb67b6c5665a794deae3efbed6d244a
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Fri May 9 00:35:33 2014 +0200
Die, die, die BMP code
This is at least the forth time that I kill this code!
Change-Id: I038a03a8beed6f743ce6ad17a6a6b71085f43890
diff --git a/chart2/source/view/main/GL3DRenderer.cxx
b/chart2/source/view/main/GL3DRenderer.cxx
index 339cc7e..5a961a2 100644
--- a/chart2/source/view/main/GL3DRenderer.cxx
+++ b/chart2/source/view/main/GL3DRenderer.cxx
@@ -22,9 +22,9 @@
#define GL_PI 3.14159f
#define RGB_WHITE (0xFF | (0xFF 8) | (0xFF 16))
-#define BMP_HEADER_LEN 54
#define DEBUG_FBO 0
+
using namespace com::sun::star;
namespace chart {
@@ -1535,36 +1535,6 @@ void OpenGL3DRenderer::CreateSceneBoxView()
m_bCameraUpdated = true;
}
-void OpenGL3DRenderer::CreateBMPHeader(sal_uInt8 *bmpHeader, int xsize, int
ysize)
-{
-unsigned char header[BMP_HEADER_LEN] = {
-0x42, 0x4d, 0, 0, 0, 0, 0, 0, 0, 0,
-54, 0, 0, 0, 40, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 24, 0,
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0
-};
-
-long file_size = (long)xsize * (long)ysize * 3 + 54;
-header[2] = (unsigned char)(file_size 0x00ff);
-header[3] = (file_size 8) 0x00ff;
-header[4] = (file_size 16) 0x00ff;
-header[5] = (file_size 24) 0x00ff;
-
-long width = xsize;
-header[18] = width 0x00ff;
-header[19] = (width 8) 0x00ff;
-header[20] = (width 16) 0x00ff;
-header[21] = (width 24) 0x00ff;
-
-long height = -ysize;
-header[22] = height 0x00ff;
-header[23] = (height 8) 0x00ff;
-header[24] = (height 16) 0x00ff;
-header[25] = (height 24) 0x00ff;
-memcpy(bmpHeader, header, BMP_HEADER_LEN);
-}
-
-
void OpenGL3DRenderer::ProcessUnrenderedShape()
{
CreateSceneBoxView();
@@ -1592,15 +1562,8 @@ void OpenGL3DRenderer::ProcessUnrenderedShape()
glViewport(0, 0, m_iWidth, m_iHeight);
RenderTexture(m_TextureObj[0]);
#if DEBUG_FBO
-char fileName[256] = {0};
-sprintf(fileName, D://shaderout_%d_%d.bmp, m_iWidth, m_iHeight);
-FILE *pfile = fopen(fileName,wb);
-sal_uInt8 *Tmp = (sal_uInt8 *)malloc(m_iWidth * m_iHeight * 3 +
BMP_HEADER_LEN);
-CreateBMPHeader(Tmp, m_iWidth, m_iHeight);
-glReadPixels(0, 0, m_iWidth, m_iHeight, GL_BGR, GL_UNSIGNED_BYTE, Tmp +
BMP_HEADER_LEN);
-fwrite(Tmp, m_iWidth * m_iHeight * 3 + BMP_HEADER_LEN, 1, pfile);
-fclose(pfile);
-free(Tmp);
+OUString aFileName = OUString(D://shaderout_) +
OUString::number(m_iWidth) + _ + OUString::number(m_iHeight) + .png;
+OpenGLHelper::renderToFile(m_iWidth, m_iHeight, aFileName);
#endif
//glBindFramebuffer(GL_FRAMEBUFFER, 0);
}
commit 7ffd1af7228e05d05229ec66923208b6c4fdb845
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Fri May 9 00:31:05 2014 +0200
move the renderToFile function to the helper to avoid the context
Change-Id: I5493126047179d67b2f2ed0d3d5d936ebbaf4810
diff --git a/include/vcl/opengl/OpenGLHelper.hxx
b/include/vcl/opengl/OpenGLHelper.hxx
index 3530b2b..4afeae4 100644
--- a/include/vcl/opengl/OpenGLHelper.hxx
+++ b/include/vcl/opengl/OpenGLHelper.hxx
@@ -23,6 +23,7 @@ public:
static sal_uInt8* ConvertBitmapExToRGBABuffer(const BitmapEx rBitmapEx);
static BitmapEx ConvertBGRABufferToBitmapEx(const sal_uInt8* const
pBuffer, long nWidth, long nHeight);
+static void renderToFile(long nWidth, long nHeight, const OUString
rFileName);
static const char* GLErrorString(GLenum errorCode);
};
diff --git a/vcl/source/opengl/OpenGLContext.cxx
b/vcl/source/opengl/OpenGLContext.cxx
index f79a160..8ad2d7a 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -558,20 +558,9 @@ void OpenGLContext::renderToFile()
{
int iWidth = m_aGLWin.Width;
int iHeight = m_aGLWin.Height;
-boost::scoped_arraysal_uInt8 buf(new sal_uInt8[iWidth * iHeight * 4]);
-glReadPixels(0, 0, iWidth, iHeight, GL_BGRA, GL_UNSIGNED_BYTE, buf.get());
-
-BitmapEx aBmp = OpenGLHelper::ConvertBGRABufferToBitmapEx(buf.get(),
iWidth, iHeight);
static int nIdx = 0;
OUString aName = OUString( file:///home/moggi/Documents/work/output ) +
OUString::number( nIdx++ ) + .png;
-try {
-vcl::PNGWriter aWriter( aBmp );
-SvFileStream sOutput( aName, STREAM_WRITE );
-aWriter.Write( sOutput );
-sOutput.Close();
-} catch (...) {
-SAL_WARN(vcl.opengl, Error writing png to aName);
-}
+
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/consoli.hxx |7 ++---
sc/source/core/tool/consoli.cxx | 52 ++--
2 files changed, 22 insertions(+), 37 deletions(-)
New commits:
commit e891afeccba8f20f8bdaeacb20f2215cfcb1abfd
Author: Eike Rathke er...@redhat.com
Date: Fri May 9 00:11:06 2014 +0200
resolve fdo#77509 memory corruption / crash in Consolidate
Regression introduced with c81dec478ab0618f2acd2580654a93d3a7185444
memcpy some sizeof(OUString) is doomed to fail.
Change-Id: I81dc9cc7eaf02607ed05b4d284a7e5e462eeeb0a
diff --git a/sc/inc/consoli.hxx b/sc/inc/consoli.hxx
index ec96a60..8811f5b 100644
--- a/sc/inc/consoli.hxx
+++ b/sc/inc/consoli.hxx
@@ -80,11 +80,10 @@ private:
double**ppCount;
double**ppSumSqr;
ScReferenceList** ppRefs;
-OUString* mpColHeaders;
-OUString* mpRowHeaders;
+::std::vectorOUString maColHeaders;
+::std::vectorOUString maRowHeaders;
+::std::vectorOUString maTitles;
SCSIZE nDataCount;
-SCSIZE nTitleCount;
-OUString* mpTitles;
SCSIZE**ppTitlePos;
boolbCornerUsed;
OUStringaCornerText;// only for bColByName
bRowByName
diff --git a/sc/source/core/tool/consoli.cxx b/sc/source/core/tool/consoli.cxx
index 7c897c0..5a36fba 100644
--- a/sc/source/core/tool/consoli.cxx
+++ b/sc/source/core/tool/consoli.cxx
@@ -71,16 +71,9 @@ void ScReferenceList::AddEntry( SCCOL nCol, SCROW nRow,
SCTAB nTab )
}
template typename T
-static void lcl_AddString( OUString* pData, T nCount, const OUString
rInsert )
+static void lcl_AddString( ::std::vectorOUString rData, T nCount, const
OUString rInsert )
{
-OUString* pOldData = pData;
-pData = new OUString[ nCount+1 ];
-if (pOldData)
-{
-memcpy( pData, pOldData, nCount * sizeof(OUString) );
-delete[] pOldData;
-}
-pData[nCount] = rInsert;
+rData.push_back( rInsert);
++nCount;
}
@@ -96,11 +89,7 @@ ScConsData::ScConsData() :
ppCount(NULL),
ppSumSqr(NULL),
ppRefs(NULL),
-mpColHeaders(NULL),
-mpRowHeaders(NULL),
nDataCount(0),
-nTitleCount(0),
-mpTitles(NULL),
ppTitlePos(NULL),
bCornerUsed(false)
{
@@ -141,16 +130,12 @@ void ScConsData::DeleteData()
DELETEARR( ppSumSqr,nColCount );
DELETEARR( ppUsed, nColCount );// erst nach ppRefs !!!
DELETEARR( ppTitlePos, nRowCount );
-delete[] mpColHeaders;
-mpColHeaders = NULL;
-delete[] mpRowHeaders;
-mpRowHeaders = NULL;
-delete[] mpTitles;
-mpTitles = NULL;
-nTitleCount = 0;
+::std::vectorOUString().swap( maColHeaders);
+::std::vectorOUString().swap( maRowHeaders);
+::std::vectorOUString().swap( maTitles);
nDataCount = 0;
-if (bColByName) nColCount = 0; // sonst stimmt
mpColHeaders nicht
+if (bColByName) nColCount = 0; // sonst stimmt
maColHeaders nicht
if (bRowByName) nRowCount = 0;
bCornerUsed = false;
@@ -254,10 +239,10 @@ void ScConsData::AddFields( ScDocument* pSrcDoc, SCTAB
nTab,
{
bool bFound = false;
for (SCSIZE i=0; inColCount !bFound; i++)
-if ( mpColHeaders[i] == aTitle )
+if ( maColHeaders[i] == aTitle )
bFound = true;
if (!bFound)
-lcl_AddString( mpColHeaders, nColCount, aTitle );
+lcl_AddString( maColHeaders, nColCount, aTitle );
}
}
}
@@ -271,10 +256,10 @@ void ScConsData::AddFields( ScDocument* pSrcDoc, SCTAB
nTab,
{
bool bFound = false;
for (SCSIZE i=0; inRowCount !bFound; i++)
-if ( mpRowHeaders[i] == aTitle )
+if ( maRowHeaders[i] == aTitle )
bFound = true;
if (!bFound)
-lcl_AddString( mpRowHeaders, nRowCount, aTitle );
+lcl_AddString( maRowHeaders, nRowCount, aTitle );
}
}
}
@@ -287,7 +272,8 @@ void ScConsData::AddName( const OUString rName )
if (bReference)
{
-lcl_AddString( mpTitles, nTitleCount, rName );
+maTitles.push_back( rName);
+size_t nTitleCount = maTitles.size();
for (nArrY=0; nArrYnRowCount; nArrY++)
{
@@ -526,7 +512,7 @@ void ScConsData::AddData( ScDocument* pSrcDoc, SCTAB nTab,
{
bool bFound = false;
for (SCSIZE i=0; inColCount !bFound; i++)
-if ( mpColHeaders[i] == aTitle )
+if ( maColHeaders[i] == aTitle )
{
nPos = static_castSCCOL(i);
bFound = true;
@@ -547,7 +533,7 @@ void ScConsData::AddData( ScDocument*
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/inc sc/source
sc/inc/consoli.hxx |7 ++---
sc/source/core/tool/consoli.cxx | 52 ++--
2 files changed, 22 insertions(+), 37 deletions(-)
New commits:
commit 948728a4159a8ba74ecc663373d31f1840fed9ac
Author: Eike Rathke er...@redhat.com
Date: Fri May 9 00:11:06 2014 +0200
resolve fdo#77509 memory corruption / crash in Consolidate
Regression introduced with c81dec478ab0618f2acd2580654a93d3a7185444
memcpy some sizeof(OUString) is doomed to fail.
Change-Id: I81dc9cc7eaf02607ed05b4d284a7e5e462eeeb0a
(cherry picked from commit e891afeccba8f20f8bdaeacb20f2215cfcb1abfd)
Reviewed-on: https://gerrit.libreoffice.org/9282
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Tested-by: Kohei Yoshida libreoff...@kohei.us
diff --git a/sc/inc/consoli.hxx b/sc/inc/consoli.hxx
index 9ae5060..e93ea8a 100644
--- a/sc/inc/consoli.hxx
+++ b/sc/inc/consoli.hxx
@@ -80,11 +80,10 @@ private:
double**ppCount;
double**ppSumSqr;
ScReferenceList** ppRefs;
-OUString* mpColHeaders;
-OUString* mpRowHeaders;
+::std::vectorOUString maColHeaders;
+::std::vectorOUString maRowHeaders;
+::std::vectorOUString maTitles;
SCSIZE nDataCount;
-SCSIZE nTitleCount;
-OUString* mpTitles;
SCSIZE**ppTitlePos;
sal_BoolbCornerUsed;
OUStringaCornerText;// only for bColByName
bRowByName
diff --git a/sc/source/core/tool/consoli.cxx b/sc/source/core/tool/consoli.cxx
index 3dbe8f9..c2a5121 100644
--- a/sc/source/core/tool/consoli.cxx
+++ b/sc/source/core/tool/consoli.cxx
@@ -70,16 +70,9 @@ void ScReferenceList::AddEntry( SCCOL nCol, SCROW nRow,
SCTAB nTab )
}
template typename T
-static void lcl_AddString( OUString* pData, T nCount, const OUString
rInsert )
+static void lcl_AddString( ::std::vectorOUString rData, T nCount, const
OUString rInsert )
{
-OUString* pOldData = pData;
-pData = new OUString[ nCount+1 ];
-if (pOldData)
-{
-memcpy( pData, pOldData, nCount * sizeof(OUString) );
-delete[] pOldData;
-}
-pData[nCount] = rInsert;
+rData.push_back( rInsert);
++nCount;
}
@@ -95,11 +88,7 @@ ScConsData::ScConsData() :
ppCount(NULL),
ppSumSqr(NULL),
ppRefs(NULL),
-mpColHeaders(NULL),
-mpRowHeaders(NULL),
nDataCount(0),
-nTitleCount(0),
-mpTitles(NULL),
ppTitlePos(NULL),
bCornerUsed(false)
{
@@ -140,16 +129,12 @@ void ScConsData::DeleteData()
DELETEARR( ppSumSqr,nColCount );
DELETEARR( ppUsed, nColCount );// erst nach ppRefs !!!
DELETEARR( ppTitlePos, nRowCount );
-delete[] mpColHeaders;
-mpColHeaders = NULL;
-delete[] mpRowHeaders;
-mpRowHeaders = NULL;
-delete[] mpTitles;
-mpTitles = NULL;
-nTitleCount = 0;
+::std::vectorOUString().swap( maColHeaders);
+::std::vectorOUString().swap( maRowHeaders);
+::std::vectorOUString().swap( maTitles);
nDataCount = 0;
-if (bColByName) nColCount = 0; // sonst stimmt
mpColHeaders nicht
+if (bColByName) nColCount = 0; // sonst stimmt
maColHeaders nicht
if (bRowByName) nRowCount = 0;
bCornerUsed = false;
@@ -256,10 +241,10 @@ void ScConsData::AddFields( ScDocument* pSrcDoc, SCTAB
nTab,
{
bool bFound = false;
for (SCSIZE i=0; inColCount !bFound; i++)
-if ( mpColHeaders[i] == aTitle )
+if ( maColHeaders[i] == aTitle )
bFound = true;
if (!bFound)
-lcl_AddString( mpColHeaders, nColCount, aTitle );
+lcl_AddString( maColHeaders, nColCount, aTitle );
}
}
}
@@ -273,10 +258,10 @@ void ScConsData::AddFields( ScDocument* pSrcDoc, SCTAB
nTab,
{
bool bFound = false;
for (SCSIZE i=0; inRowCount !bFound; i++)
-if ( mpRowHeaders[i] == aTitle )
+if ( maRowHeaders[i] == aTitle )
bFound = true;
if (!bFound)
-lcl_AddString( mpRowHeaders, nRowCount, aTitle );
+lcl_AddString( maRowHeaders, nRowCount, aTitle );
}
}
}
@@ -289,7 +274,8 @@ void ScConsData::AddName( const OUString rName )
if (bReference)
{
-lcl_AddString( mpTitles, nTitleCount, rName );
+maTitles.push_back( rName);
+size_t nTitleCount = maTitles.size();
for (nArrY=0; nArrYnRowCount; nArrY++)
{
@@ -528,7 +514,7 @@ void ScConsData::AddData( ScDocument* pSrcDoc, SCTAB nTab,
{
bool bFound = false;
for (SCSIZE i=0; inColCount !bFound; i++)
-if ( mpColHeaders[i] == aTitle )
+
[Libreoffice-commits] core.git: Changes to 'feature/chart-3d-chart'
New branch 'feature/chart-3d-chart' available with the following commits: commit e994833dc0cf848cc62200858f069737f6d06643 Author: Markus Mohrhard markus.mohrh...@collabora.co.uk Date: Fri May 9 04:10:19 2014 +0200 delete OpenGL resources in the destructor Change-Id: Ibfeb836d23d48e4ad9fd9b111394b8349ba7c8a3 commit 9ea149b97b8453ab3d0fb2bd22ba1be1bda9560b Author: Markus Mohrhard markus.mohrh...@collabora.co.uk Date: Fri May 9 04:02:05 2014 +0200 move the declaration to the top of the file Change-Id: I6b062a4a1c5c4e64846cecd2fd44549de9c516a8 commit 8219bf43441056459eec528233aab52d1489e6ee Author: Markus Mohrhard markus.mohrh...@collabora.co.uk Date: Fri May 9 03:55:06 2014 +0200 remove framebuffer objects We want window rendering and not off-screen rendering. Change-Id: I23580da148a4d9449f66dd5a0a1dcb2bf5cd7745 commit b2435882d12bf8d38e1d38d242b5bb4e96d28b21 Author: Markus Mohrhard markus.mohrh...@collabora.co.uk Date: Fri May 9 00:35:33 2014 +0200 Die, die, die BMP code This is at least the forth time that I kill this code! Change-Id: I038a03a8beed6f743ce6ad17a6a6b71085f43890 commit d0027518fb3d2ad859dc8f40c05533848a329ff9 Author: Markus Mohrhard markus.mohrh...@collabora.co.uk Date: Fri May 9 00:31:05 2014 +0200 move the renderToFile function to the helper to avoid the context Change-Id: I5493126047179d67b2f2ed0d3d5d936ebbaf4810 commit 8cfb0fa2a96cf0ce3fb051ca2b1fe725e865d7b5 Author: Markus Mohrhard markus.mohrh...@collabora.co.uk Date: Fri May 9 00:19:31 2014 +0200 chart2.opengl to vcl.opengl Change-Id: Idd3b6ddec5ba2fbc56b7b9eb45ff379425104527 commit 34b34bc44c2242d4fc95456276bd6b37b03368f2 Author: Markus Mohrhard markus.mohrh...@collabora.co.uk Date: Thu May 8 06:00:48 2014 +0200 correct casts Change-Id: Ib74e924663c91be09d96e9e25e011e578656a6a0 commit 0f3c4868d6235d00f84aa297606079cafe00b7e5 Author: weigao wei...@multicorewareinc.com Date: Wed May 7 15:10:42 2014 +0800 add reverse image shader Change-Id: Ibd3aff8aeb71626dada762b53cde8f50f7fbf812 commit 03414121af8ce915b7097e31a27d3c2f1ebe1f3e Author: Markus Mohrhard markus.mohrh...@collabora.co.uk Date: Thu May 8 05:16:49 2014 +0200 fix wrong access to array Change-Id: I3298bd15260b2cbfd9a74024504d982dc00f4137 commit f64d776fef11329c1b7124abe7f8e72833abf4bc Author: weigao wei...@multicorewareinc.com Date: Wed May 7 13:30:59 2014 +0800 fix the render part Change-Id: I92f60d706408acefd763f0f80af5fa3398e667d4 commit 9423ad1ff372cd3017e6dc76f78d90634904cd35 Author: Markus Mohrhard markus.mohrh...@collabora.co.uk Date: Thu May 8 03:05:49 2014 +0200 we only want a fb that allows window rendering Change-Id: I13d58c941e6a2411c3840b9efd341a4b827afc93 commit f14d17613f1caab4b1652c02a36b60733952d8cf Author: Markus Mohrhard markus.mohrh...@collabora.co.uk Date: Thu May 8 03:03:19 2014 +0200 fix another crash on exit Change-Id: I580d17b16760516b73ac9f882fd8f9707ce6337b commit 05b1a4e68cce29fae14814bfbd8205ef0fd2a216 Author: Markus Mohrhard markus.mohrh...@collabora.co.uk Date: Thu May 8 03:02:12 2014 +0200 don't put the parent window as child into itself Change-Id: I961b92d47c35d63fa852bab2b478b93314e9add7 commit 2642f2d327c14d3f84a1fa543f434a352349be5a Author: Markus Mohrhard markus.mohrh...@collabora.co.uk Date: Thu May 8 03:01:05 2014 +0200 correct check for double buffered rendering Change-Id: I52972cb477c77a86fa04aa876717db9740cc0113 commit 251de5eb7837f638703c416ede297a45156221f8 Author: Markus Mohrhard markus.mohrh...@collabora.co.uk Date: Thu May 8 02:25:18 2014 +0200 we only want fb configs that support double buffered rendering Change-Id: I808e36ccd2a0d1ad89af2449d709d24a92ecff4f commit 205c12630582e982131231c05af52fb50535de8b Author: Markus Mohrhard markus.mohrh...@collabora.co.uk Date: Thu May 8 01:30:30 2014 +0200 this inheritance is no longer needed Change-Id: I039dd767bcfd0c1343f4230d3fe8e52ab5a6e4fd ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/chart-3d-chart' - chart2/source
chart2/source/view/charttypes/GL3DBarChart.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 81ebd9965110f432b8f329df14341c4b393d1918
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Fri May 9 05:19:32 2014 +0200
let us at least try to render the shapes
Change-Id: I8753c6a9397117137d4da25f76db1f9cae23f90e
diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx
b/chart2/source/view/charttypes/GL3DBarChart.cxx
index 12a5417..02264e4 100644
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -79,6 +79,7 @@ void GL3DBarChart::render()
{
itr-render();
}
+mpRenderer-ProcessUnrenderedShape();
mrWindow.getContext()-swapBuffers();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/chart-3d-chart' - 3 commits - chart2/source vcl/source
chart2/source/view/inc/GL3DRenderer.hxx | 22 +++---
vcl/source/opengl/OpenGLContext.cxx | 20 ++--
2 files changed, 21 insertions(+), 21 deletions(-)
New commits:
commit 13236d5af1fdd4449ff0e9379f1baa5e67c063b1
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Fri May 9 05:31:42 2014 +0200
avoid temporary copy
Change-Id: Ica949141c58d7ebb85f246dee4109c39ee8f889e
diff --git a/chart2/source/view/inc/GL3DRenderer.hxx
b/chart2/source/view/inc/GL3DRenderer.hxx
index 339114e..6c00422 100644
--- a/chart2/source/view/inc/GL3DRenderer.hxx
+++ b/chart2/source/view/inc/GL3DRenderer.hxx
@@ -141,7 +141,7 @@ struct RoundBarMesh
struct PackedVertex{
glm::vec3 position;
glm::vec3 normal;
-bool operator(const PackedVertex that) const{
+bool operator(const PackedVertex that) const{
return memcmp((void*)this, (void*)that, sizeof(PackedVertex))0;
};
};
commit cf99ca8c8a7764b84a4431398400f9a6a55fd8f8
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Fri May 9 05:30:46 2014 +0200
remove these unnecessary typedefs
Change-Id: Iae2dc2d9bcc40bf7b45cd319a8be46b040d9ec23
diff --git a/chart2/source/view/inc/GL3DRenderer.hxx
b/chart2/source/view/inc/GL3DRenderer.hxx
index a67c625..339114e 100644
--- a/chart2/source/view/inc/GL3DRenderer.hxx
+++ b/chart2/source/view/inc/GL3DRenderer.hxx
@@ -111,24 +111,24 @@ typedef struct Extrude3DInfo
}Extrude3DInfo;
-typedef struct CameraInfo
+struct CameraInfo
{
bool useDefault;
glm::vec3 cameraPos;
glm::vec3 cameraOrg;
glm::vec3 cameraUp;
-}CameraInfo;
+};
-typedef struct CoordinateAxisInfo
+struct CoordinateAxisInfo
{
int pickingFlg;
int reverse;
glm::vec4 color;
PosVecf3 trans;
PosVecf3 scale;
-}CoordinateAxisInfo;
+};
-typedef struct RoundBarMesh
+struct RoundBarMesh
{
float topThreshold;
float bottomThreshold;
@@ -136,7 +136,7 @@ typedef struct RoundBarMesh
int iMeshSizes;
int iElementStartIndices[5];
int iElementSizes[5];
-}RoundBarMesh;
+};
struct PackedVertex{
glm::vec3 position;
@@ -146,14 +146,14 @@ struct PackedVertex{
};
};
-typedef struct TextInfo
+struct TextInfo
{
GLuint texture;
float vertex[12];
-}TextInfo;
+};
-typedef struct SceneBox
+struct SceneBox
{
float maxXCoord;
float minXCoord;
@@ -161,7 +161,7 @@ typedef struct SceneBox
float minYCoord;
float maxZCoord;
float minZCoord;
-}SceneBox;
+};
class OpenGL3DRenderer
commit 64729597b7dfb97f12b61c38bcf2f6410ddaca36
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Fri May 9 05:23:12 2014 +0200
we need glew initalized before testing through it for features
Change-Id: I4999de29b2a12888129ab291344b239b8def373c
diff --git a/vcl/source/opengl/OpenGLContext.cxx
b/vcl/source/opengl/OpenGLContext.cxx
index 8ad2d7a..58202fb 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -509,16 +509,6 @@ bool OpenGLContext::ImplInit()
//rGLRender.InitOpenGL(m_aGLWin);
-#ifdef DBG_UTIL
-// only enable debug output in dbgutil build
-if( GLEW_ARB_debug_output )
-{
-glEnable(GL_DEBUG_OUTPUT);
-glDebugMessageCallback(debug_callback, NULL);
-}
-
-#endif
-
static bool bGlewInit = false;
if(!bGlewInit)
{
@@ -533,6 +523,16 @@ bool OpenGLContext::ImplInit()
bGlewInit = true;
}
+#ifdef DBG_UTIL
+// only enable debug output in dbgutil build
+if( GLEW_ARB_debug_output )
+{
+glEnable(GL_DEBUG_OUTPUT);
+glDebugMessageCallback(debug_callback, NULL);
+}
+
+#endif
+
SAL_INFO(vcl.opengl, OpenGLContext::ImplInitend);
mbInitialized = true;
return true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 77806, which changed state. Bug 77806 Summary: copy cells from calc and paste in writer makes libreoffice crashed in mdds https://bugs.freedesktop.org/show_bug.cgi?id=77806 What|Removed |Added Status|RESOLVED|REOPENED 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
[Libreoffice-qa] Fwd: are there any known bugs about online update not working in 4.2?
apparently a user commented (off-topic on a bug) that his LO 4.2.0.4 does not get online update notification; are we aware of any problems in that area (has anybody tested it?) or should we assume it's some local mis-configuration? Original Message Subject:[Bug 74148] LO crashes when opening an ott template file for editing Date: Thu, 08 May 2014 09:20:02 + From: bugzilla-dae...@freedesktop.org To: mst...@redhat.com *Comment # 17 https://bugs.freedesktop.org/show_bug.cgi?id=74148#c17 on bug 74148 https://bugs.freedesktop.org/show_bug.cgi?id=74148 from Peter Lairo mailto:peterla...@gmail.com * (In reply to comment #12 show_bug.cgi?id=74148#c12) fdo#74148: sfx2: fix crash when editing template It will be available in LibreOffice 4.2.1. It's been 3 months since that post, but LibreOffice 4.2.1 has still not been released. Template editing is still crashing the current release version of LibreOffice. My version is 4.2.0.4, and a Check for Updates says LibreOffice 4.2 is up to date. What's going on? When is LibreOffice 4.2.1 planned to be released? The Release Plan[1] seems to indicate that LibreOffice 4.2.1 was supposed to have been released by 13 April 2014 (one month ago). [1] https://wiki.documentfoundation.org/ReleasePlan Original Message Subject:[Bug 74148] LO crashes when opening an ott template file for editing Date: Thu, 08 May 2014 12:10:38 + From: bugzilla-dae...@freedesktop.org To: mst...@redhat.com *Comment # 18 https://bugs.freedesktop.org/show_bug.cgi?id=74148#c18 on bug 74148 https://bugs.freedesktop.org/show_bug.cgi?id=74148 from V Stuart Foote mailto:vstuart.fo...@utsa.edu * Pedro, (In reply to comment #17 show_bug.cgi?id=74148#c17) fdo#74148: sfx2: fix crash when editing template It will be available in LibreOffice 4.2.1. The check for updates function does not work correctly. Here are dates for the releases for 4.2 thus far, available here: http://downloadarchive.documentfoundation.org/libreoffice/old/ 4.2.1.115-Apr-2014 4.2.3.317-Apr-2014 4.2.4.205-May-2014 Your best bet is to check the downloads on the project download page, here: http://www.libreoffice.org/download/libreoffice-fresh/ But have a peak at the link to the Development Versions page from time to time. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Fwd: are there any known bugs about online update not working in 4.2?
Yes, this is true. You get LibreOffice 4.2 is up to date. This is also true for Version: 4.2.1.1 and Version: 4.2.2.1 Also information hasn't been updated for branch 4.1 (which affects branch 4.0 and previous) but I guess this is the normal delay. HTH, Pedro -- View this message in context: http://nabble.documentfoundation.org/Libreoffice-qa-Fwd-are-there-any-known-bugs-about-online-update-not-working-in-4-2-tp4107994p4108007.html Sent from the QA mailing list archive at Nabble.com. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Fwd: are there any known bugs about online update not working in 4.2?
Hi Michael, *, On Thu, May 8, 2014 at 2:18 PM, Michael Stahl mst...@redhat.com wrote: apparently a user commented (off-topic on a bug) that his LO 4.2.0.4 does not get online update notification; are we aware of any problems in that area (has anybody tested it?) or should we assume it's some local mis-configuration? Hmm. The hashes have been added to the update-check script up to 4.2.3 http://cgit.freedesktop.org/libreoffice/website/tree/check.php?h=update#n272 (and that is also what is on the actual server). And when I simulate an update request using 4.2.3.2's hash for example: curl -A 'LibreOffice 1.2.3 (7c5c769e412afd32da4d946d2cb0c8b0674e95e; Windows; x86; BundledLanguages=en-US)' http://update.libreoffice.org/check.php I get the update available response: ?xml version=1.0 encoding=utf-8? inst:description xmlns:inst=http://update.libreoffice.org/description; inst:idLibreOffice 4.2.3/inst:id inst:gitid882f8a0a489bc99a9e60c7905a60226254cb6ff/inst:gitid inst:osWindows/inst:os inst:archx86/inst:arch inst:version4.2.3/inst:version inst:buildid/inst:buildid inst:update type=text/html src=http://www.libreoffice.org/download/libreoffice-fresh/?type=win-x86amp;lang=en-USamp;version=4.2.3; / /inst:description So if no update is offered, then the user-agent string used by LO is not what the script expects anymore... Need to look what exactly is wrong... ciao Christian ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Fwd: are there any known bugs about online update not working in 4.2?
Hi *, On Thu, May 8, 2014 at 3:35 PM, Christian Lohmaier lohma...@googlemail.com wrote: Hi Michael, *, On Thu, May 8, 2014 at 2:18 PM, Michael Stahl mst...@redhat.com wrote: apparently a user commented (off-topic on a bug) that his LO 4.2.0.4 does not get online update notification; are we aware of any problems in that area (has anybody tested it?) or should we assume it's some local mis-configuration? Fixed the problem. The version-hash that was formerly advertised with one character less than the actual one, now is the full hash. also enabled updates to 4.1.6 and 4.2.4 while I was at it.. ciao Christian ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Fwd: are there any known bugs about online update not working in 4.2?
Christian Lohmaier-3 wrote also enabled updates to 4.1.6 and 4.2.4 while I was at it.. Thanks! Wow! This is definitely the fastest update notice in LO history! Version 4.2.4 was announced at 12:01pm and is available at 3:00pm! If only someone with programming skills would write a script to do this automatically when a new version is announced/available... -- View this message in context: http://nabble.documentfoundation.org/Libreoffice-qa-Fwd-are-there-any-known-bugs-about-online-update-not-working-in-4-2-tp4107994p4108018.html Sent from the QA mailing list archive at Nabble.com. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Website QA Suggestions, links to other languages
This kind of a suggestion should be on the redmine site not on QA mailing list. The email thread that I started was specific about suggestions that we discussed during the call. Apologies for the confusion. Best, Joel On 05/07/2014 08:44 AM, Harald Köster wrote: Hi all, at the moment on the LibreOffice home page there are no links to home pages in other languages. I think for a world wide project it should be a matter of course to provide such links, so that also users who are not familiar with English are able to find informations in their language fast. How it may look like, see: www.facebook.com www.twitter.com Best Harald ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-qa] New Version (PreBibisect)
I have added PreBibisect to version field on FDO - if you try to bibisect a version and the regression shows up in the earliest commit in bibisect please set it to PreBibisect. Then if anyone is interested in going through these and testing them against the first release of LibreOffice that would be fantastic. My guess is quite a few of these are not regressions. http://downloadarchive.documentfoundation.org/libreoffice/old/ Best, Joel ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Fwd: are there any known bugs about online update not working in 4.2?
Hi Pedro, On Thu, May 8, 2014 at 4:22 PM, Pedro pedl...@gmail.com wrote: Christian Lohmaier-3 wrote also enabled updates to 4.1.6 and 4.2.4 while I was at it.. Wow! This is definitely the fastest update notice in LO history! Version 4.2.4 was announced at 12:01pm and is available at 3:00pm! If only someone with programming skills would write a script to do this automatically when a new version is announced/available... As I have written so many times already: It is intentional that the update is not done at the very same day. I made an exception now since it would be pointless to have people update to 4.2.3 now just to get notification for 4.2.4 in two days. ciao Christian ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Website QA Suggestions, links to other languages
Hi Joel, On Thu, May 8, 2014 at 4:37 PM, Joel Madero jmadero@gmail.com wrote: This kind of a suggestion should be on the redmine site not on QA mailing list. The email thread that I started was specific about suggestions that we discussed during the call. Apologies for the confusion. Website list is better than redmine, for suggestions, as it doesn't only touch technical aspects, but layout, design, etc. As Sophie pointed out, there already is a NLP list, just in a sublevel. Changing this would require change in the overall layout and presentation and thus also requires a proposal on how it should be done instead :-) ciao Christian ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Fwd: are there any known bugs about online update not working in 4.2?
Hi Christian Christian Lohmaier-3 wrote If only someone with programming skills would write a script to do this automatically when a new version is announced/available... As I have written so many times already: It is intentional that the update is not done at the very same day. I made an exception now since it would be pointless to have people update to 4.2.3 now just to get notification for 4.2.4 in two days. I'm sure it is possible to add a delay... A script could update the value 2 days after it's announced or after it is available at a number of mirrors... or at the slowest mirror... As I have written so many times already: manual updating is prone to forgetting... My last 2 cents on this subject. -- View this message in context: http://nabble.documentfoundation.org/Libreoffice-qa-Fwd-are-there-any-known-bugs-about-online-update-not-working-in-4-2-tp4107994p4108030.html Sent from the QA mailing list archive at Nabble.com. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
