LibreOffice Gerrit News for submodules on 2014-08-25
Moin! ~~ Project dictionaries ~~ Nothing moved in the project for the last 25 hours ~~ Project translations ~~ Nothing moved in the project for the last 25 hours ~~ Project help ~~ * Open changes on master for project help changed in the last 25 hours: None * Merged changes on master for project help changed in the last 25 hours: + FDO#80453 Help page for Edit-Fill-Random Numbers in https://gerrit.libreoffice.org/11097 from Olivier Hallot * Abandoned changes on master for project help changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: None Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
LibreOffice Gerrit News for core on 2014-08-25
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + fdo#82260 Fix OSX font dropdown crash in https://gerrit.libreoffice.org/11105 from Matthew Francis about module svx + fdo#62054 Enable Select All, Undo and Redo in Save as... on OSX in https://gerrit.libreoffice.org/11104 from Matthew Francis about module vcl + Resolves fdo#81084 fdo#81696 fdo#80874 fdo#81010 : sort causes crash in https://gerrit.libreoffice.org/11102 from Deena P. F. about module sc + disable OpenGL for OS X 10.5 in https://gerrit.libreoffice.org/11061 from Douglas Mencken about module build + [global] [cross-platform] don't force OpenGL requirement as must have in https://gerrit.libreoffice.org/11101 from Douglas Mencken about module avmedia, build, chart2, include, offapi, sc, slideshow, svx, vcl End of freshness + Translate German comments, fix some ws in https://gerrit.libreoffice.org/11103 from Philipp Weissenbacher about module sc * Merged changes on master for project core changed in the last 25 hours: + fdo#73151 Make better use of the sidebar in https://gerrit.libreoffice.org/11077 from Samuel Mehrbrodt + added Lithuanian LTL to EUROCONVERT(), CONVERT() in https://gerrit.libreoffice.org/11088 from Aurimas Fišeras + added LTL Lithuanian Litas to Euro Converter in https://gerrit.libreoffice.org/11090 from Aurimas Fišeras + added EUR as default currency to Lithuanian locale in https://gerrit.libreoffice.org/11089 from Aurimas Fišeras * Abandoned changes on master for project core changed in the last 25 hours: + don't force OpenGL requirement as must have in https://gerrit.libreoffice.org/11100 from Douglas Mencken * Open changes needing tweaks, but being untouched for more than a week: + fdo#81426 : Data from header and footer is getting lost. in https://gerrit.libreoffice.org/10531 from Rajashri Udhoji + fdo#79541 :Corrupt: Shape enclosed within a floating table in https://gerrit.libreoffice.org/9914 from Rajashri Udhoji + fdo#63154: Rearrange some solar.h includes in https://gerrit.libreoffice.org/10892 from Marcos Paulo de Souza + fdo#82290: Perform write(2) and read(2) concurrently to avoid pipe deadlo in https://gerrit.libreoffice.org/10825 from Jan Holesovsky + fdo#80996:Fix for DataLabel not preserved for ColumnChart after RT in https://gerrit.libreoffice.org/10169 from Dushyant Bhalgami + fdo#79018: LO hangs while opening file. in https://gerrit.libreoffice.org/9564 from Yogesh Bharate + fdo#77716 : Paragraph spacing is not preserved after RT. in https://gerrit.libreoffice.org/9197 from Tushar Bende + fdo#77121 Header / Footer positions not preserved after RT in https://gerrit.libreoffice.org/9235 from Priyanka Gaikwad Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/documen3.cxx | 115 +++
sc/source/core/data/global.cxx | 95 ++--
sc/source/core/data/olinetab.cxx | 68 +++
3 files changed, 137 insertions(+), 141 deletions(-)
New commits:
commit c5d47afc152fe5440ebe733203114962f84d63ca
Author: Philipp Weissenbacher p.weissenbac...@gmail.com
Date: Sun Aug 24 22:14:45 2014 +0200
Translate German comments, fix some ws
Change-Id: Ida67ce193ad032e2a1855e4380626f805514c2f2
Reviewed-on: https://gerrit.libreoffice.org/11103
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com
diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx
index 34badd8..7a2bc04 100644
--- a/sc/source/core/data/documen3.cxx
+++ b/sc/source/core/data/documen3.cxx
@@ -524,15 +524,15 @@ bool ScDocument::LinkExternalTab( SCTAB rTab, const
OUString aDocTab,
return false;
}
rTab = 0;
-OUString aFilterName;// wird vom Loader gefuellt
-OUString aOptions; // Filter-Optionen
+OUString aFilterName; // Is filled by the Loader
+OUString aOptions; // Filter options
sal_uInt32 nLinkCnt = pExtDocOptions ?
pExtDocOptions-GetDocSettings().mnLinkCnt : 0;
ScDocumentLoader aLoader( aFileName, aFilterName, aOptions, nLinkCnt + 1 );
if ( aLoader.IsError() )
return false;
ScDocument* pSrcDoc = aLoader.GetDocument();
-// Tabelle kopieren
+// Copy table
SCTAB nSrcTab;
if ( pSrcDoc-GetTable( aTabName, nSrcTab ) )
{
@@ -542,7 +542,7 @@ bool ScDocument::LinkExternalTab( SCTAB rTab, const
OUString aDocTab,
return false;
}
rTab = GetTableCount() - 1;
-// nicht neu einfuegen, nur Ergebnisse
+// Don't insert anew, just the results
TransferTab( pSrcDoc, nSrcTab, rTab, false, true );
}
else
@@ -552,7 +552,7 @@ bool ScDocument::LinkExternalTab( SCTAB rTab, const
OUString aDocTab,
bool bWasThere = HasLink( aFileName, aFilterName, aOptions );
SetLink( rTab, SC_LINK_VALUE, aFileName, aFilterName, aOptions, aTabName,
nRefreshDelay );
-if ( !bWasThere ) // Link pro Quelldokument nur einmal eintragen
+if ( !bWasThere ) // Add link only once per source document
{
ScTableLink* pLink = new ScTableLink( pShell, aFileName, aFilterName,
aOptions, nRefreshDelay );
pLink-SetInCreate( true );
@@ -742,9 +742,10 @@ bool ScDocument::HasSubTotalCells( const ScRange rRange )
return false; // none found
}
-// kopiert aus diesem Dokument die Zellen von Positionen, an denen in pPosDoc
-// auch Zellen stehen, nach pDestDoc
-
+/**
+ * From this document this method copies the cells of positions at which
+ * there are also cells in pPosDoc to pDestDoc
+ */
void ScDocument::CopyUpdated( ScDocument* pPosDoc, ScDocument* pDestDoc )
{
SCTAB nCount = static_castSCTAB(maTabs.size());
@@ -758,17 +759,16 @@ void ScDocument::CopyScenario( SCTAB nSrcTab, SCTAB
nDestTab, bool bNewScenario
if (ValidTab(nSrcTab) ValidTab(nDestTab) nSrcTab
static_castSCTAB(maTabs.size())
nDestTab static_castSCTAB(maTabs.size())
maTabs[nSrcTab] maTabs[nDestTab])
{
-// Flags fuer aktive Szenarios richtig setzen
-// und aktuelle Werte in bisher aktive Szenarios zurueckschreiben
-
+// Set flags correctly for active scenarios
+// and write current values back to recently active scenarios
ScRangeList aRanges = *maTabs[nSrcTab]-GetScenarioRanges();
-// nDestTab ist die Zieltabelle
+// nDestTab is the target table
for ( SCTAB nTab = nDestTab+1;
nTab static_castSCTAB(maTabs.size()) maTabs[nTab]
maTabs[nTab]-IsScenario();
nTab++ )
{
-if ( maTabs[nTab]-IsActiveScenario() ) // auch wenn's
dasselbe Szenario ist
+if ( maTabs[nTab]-IsActiveScenario() ) // Even if it's the same
scenario
{
bool bTouched = false;
for ( size_t nR=0, nRangeCount = aRanges.size(); nR
nRangeCount !bTouched; nR++ )
@@ -786,8 +786,8 @@ void ScDocument::CopyScenario( SCTAB nSrcTab, SCTAB
nDestTab, bool bNewScenario
}
}
-maTabs[nSrcTab]-SetActiveScenario(true); // da kommt's her...
-if (!bNewScenario) // Daten aus dem
ausgewaehlten Szenario kopieren
+maTabs[nSrcTab]-SetActiveScenario(true); // This is where it's from
...
+if (!bNewScenario) // Copy data from the selected scenario
{
sc::AutoCalcSwitch aACSwitch(*this, false);
maTabs[nSrcTab]-CopyScenarioTo( maTabs[nDestTab] );
@@ -860,29 +860,29 @@ void ScDocument::RemoveUnoObject( SfxListener rObject )
if ( bInUnoBroadcast )
{
-// Broadcasts from
Re: Upload nightly builds for OS X Mavericks
Le 25/08/2014 00:35, Robert Antoni a écrit : Hi, Just my two cents, but : I'm open to any configuration change of my tinderbox. --disable-firebird-sdbc Why disable firebird ? It is an integral part of the official releases afaik (enve if still experimental). Or can TB dailies be anything, including either the kitchen sink or some mutilated reduced functionality ? Just trying to understand the general policy. Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Upload nightly builds for OS X Mavericks
Or can TB dailies be anything, including either the kitchen sink or some mutilated reduced functionality ? Yes. They are provided by volunteers who get to choose how to configure what they build. If you want more variety, you are free to offer differently configured builds for upload. Or to submit a change that reduces the (much too large) number of configure-time options we have... I see no problem in leaving out optional features. That is why they are optional, right? The above is of course only my personal opinion. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/core/docnode/nodedump.cxx | 20 +++-
1 file changed, 19 insertions(+), 1 deletion(-)
New commits:
commit a00778f9d3c1ad3e09ee6519e4523c9ff96f9920
Author: Jan-Marek Glogowski glo...@fbihome.de
Date: Fri Aug 22 23:01:41 2014 +0200
Dump table attributes and page description items
Adds the SwPageDesc name to the dumpAsXml output of the
SwFmtPageDesc / RES_PAGEDESC SfxPoolItem and dumps the tables
attibutes.
Adtittionally this renames the unknown field name, so it doesn't
produce wrong XML output (blamed by xmllint --format) and adds
the hex node type to the start and end node XML output.
Reviewed on:
https://gerrit.libreoffice.org/11091
Change-Id: I3cde39d423e17909243675efdd39557a6bfffbd7
diff --git a/sw/source/core/docnode/nodedump.cxx
b/sw/source/core/docnode/nodedump.cxx
index f3041cf..40bbecb 100644
--- a/sw/source/core/docnode/nodedump.cxx
+++ b/sw/source/core/docnode/nodedump.cxx
@@ -33,6 +33,8 @@
#include redline.hxx
#include section.hxx
#include fmtclds.hxx
+#include fmtpdsc.hxx
+#include pagedesc.hxx
#include swmodule.hxx
#include svl/itemiter.hxx
#include svl/intitem.hxx
@@ -258,7 +260,7 @@ void SwFldTypes::dumpAsXml( xmlTextWriterPtr w ) const
writer.startElement(swfmtfld);
writer.writeFormatAttribute(ptr, %p, pCurFldFmt);
writer.writeFormatAttribute(pTxtAttr, %p,
pCurFldFmt-GetTxtFld());
-const char* name = ???;
+const char* name = FIXME_unhandledfield;
switch(pCurFldFmt-GetField()-GetTyp()-Which())
{
case RES_PAGENUMBERFLD: name = swpagenumberfield; break;
@@ -321,6 +323,7 @@ void SwNode::dumpAsXml( xmlTextWriterPtr w )
}
writer.startElement( name );
writer.writeFormatAttribute( ptr, %p, this );
+writer.writeFormatAttribute( type, 0x%04x, GetNodeType() );
writer.writeFormatAttribute( index, TMP_FORMAT, GetIndex() );
writer.endElement();
if( GetNodeType() == ND_ENDNODE )
@@ -365,8 +368,17 @@ void SwStartNode::dumpAsXml( xmlTextWriterPtr w )
}
writer.startElement( name );
writer.writeFormatAttribute( ptr, %p, this );
+writer.writeFormatAttribute( type, 0x%04x, GetNodeType() );
writer.writeFormatAttribute( index, TMP_FORMAT, GetIndex() );
+if (IsTableNode())
+{
+writer.startElement(attrset);
+const SwAttrSet rAttrSet =
GetTableNode()-GetTable().GetFrmFmt()-GetAttrSet();
+lcl_dumpSfxItemSet(writer, rAttrSet);
+writer.endElement();
+}
+
// writer.endElement(); - it is a start node, so don't end, will make xml
better nested
}
@@ -575,6 +587,12 @@ void lcl_dumpSfxItemSet(WriterHelper writer, const
SfxItemSet* pSet)
case RES_SHADOW:
pWhich = shadow;
break;
+case RES_PAGEDESC:
+pWhich = page description;
+const SwFmtPageDesc* pFmt = static_castconst
SwFmtPageDesc*(pItem);
+if (pFmt-GetPageDesc())
+oValue = name: +
OUStringToOString(pFmt-GetPageDesc()-GetName(), RTL_TEXTENCODING_UTF8);
+break;
}
if (pWhich)
writer.writeFormatAttribute(which, %s, BAD_CAST(pWhich));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/inc svx/source
svx/inc/sxraitm.hxx |8 +++-
svx/source/svdraw/svdattr.cxx |2 +-
svx/source/svdraw/svdobj.cxx |4 ++--
3 files changed, 6 insertions(+), 8 deletions(-)
New commits:
commit fe04ce92cd5f32be8a7c8bf237d2f5b53ce0a849
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Aug 25 09:34:43 2014 +0200
Consistency around SdrAngleItem in svx/inc/sxraitm.hxx
...similar to what has been done for svx/sdtmfitm.hxx in
6a2ea81ca1622d2c2ad55bea8ddc28167fcc2794 Remove unused ctors and
68969cc61adecac481ae9656978ef952f435b310 Consistency around SdrMetricItem.
Change-Id: If88f88cfe0144b83b3228650a34d9bf2c468b936
diff --git a/svx/inc/sxraitm.hxx b/svx/inc/sxraitm.hxx
index 8e913ff..e6b44c1 100644
--- a/svx/inc/sxraitm.hxx
+++ b/svx/inc/sxraitm.hxx
@@ -22,11 +22,9 @@
#include svx/svddef.hxx
#include svx/sdangitm.hxx
-class SdrRotateAngleItem: public SdrAngleItem {
-public:
-SdrRotateAngleItem(long nAngle=0):
SdrAngleItem(SDRATTR_ROTATEANGLE,nAngle) {}
-SdrRotateAngleItem(SvStream rIn): SdrAngleItem(SDRATTR_ROTATEANGLE,rIn)
{}
-};
+inline SdrAngleItem makeSdrRotateAngleItem(long nAngle) {
+return SdrAngleItem(SDRATTR_ROTATEANGLE, nAngle);
+}
#endif
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index cb790e5..dc43119 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -218,7 +218,7 @@ SdrItemPool::SdrItemPool(
mppLocalPoolDefaults[SDRATTR_ONESIZEHEIGHT -SDRATTR_START]=new
SdrOneSizeHeightItem;
mppLocalPoolDefaults[SDRATTR_LOGICSIZEWIDTH -SDRATTR_START]=new
SdrLogicSizeWidthItem;
mppLocalPoolDefaults[SDRATTR_LOGICSIZEHEIGHT-SDRATTR_START]=new
SdrLogicSizeHeightItem;
-mppLocalPoolDefaults[SDRATTR_ROTATEANGLE-SDRATTR_START]=new
SdrRotateAngleItem;
+mppLocalPoolDefaults[SDRATTR_ROTATEANGLE-SDRATTR_START]=new
SdrAngleItem(SDRATTR_ROTATEANGLE, 0);
mppLocalPoolDefaults[SDRATTR_SHEARANGLE -SDRATTR_START]=new
SdrShearAngleItem;
mppLocalPoolDefaults[SDRATTR_MOVEX -SDRATTR_START]=new
SdrMoveXItem;
mppLocalPoolDefaults[SDRATTR_MOVEY -SDRATTR_START]=new
SdrMoveYItem;
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index dc2d8d8..acbd428 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -2179,7 +2179,7 @@ void SdrObject::NbcApplyNotPersistAttr(const SfxItemSet
rAttr)
}
}
if (rAttr.GetItemState(SDRATTR_ROTATEANGLE,true,pPoolItem)==SFX_ITEM_SET)
{
-long n=((const SdrRotateAngleItem*)pPoolItem)-GetValue();
+long n=((const SdrAngleItem*)pPoolItem)-GetValue();
n-=GetRotateAngle();
if (n!=0) {
double nSin=sin(n*nPi180);
@@ -2289,7 +2289,7 @@ void SdrObject::TakeNotPersistAttr(SfxItemSet rAttr,
bool bMerge) const
lcl_SetItem(rAttr,bMerge,makeSdrObjSizeProtectItem(IsResizeProtect()));
lcl_SetItem(rAttr,bMerge,SdrObjPrintableItem(IsPrintable()));
lcl_SetItem(rAttr,bMerge,SdrObjVisibleItem(IsVisible()));
-lcl_SetItem(rAttr,bMerge,SdrRotateAngleItem(GetRotateAngle()));
+lcl_SetItem(rAttr,bMerge,makeSdrRotateAngleItem(GetRotateAngle()));
lcl_SetItem(rAttr,bMerge,SdrShearAngleItem(GetShearAngle()));
lcl_SetItem(rAttr,bMerge,SdrOneSizeWidthItem(rSnap.GetWidth()-1));
lcl_SetItem(rAttr,bMerge,SdrOneSizeHeightItem(rSnap.GetHeight()-1));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/ooxml/modelpreprocess.py |6 --
1 file changed, 6 deletions(-)
New commits:
commit 5170d822aa058ff5abc737a50e2b9d8e15b87eab
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Mon Aug 25 09:35:11 2014 +0200
writerfilter: remove unused application attribute
Change-Id: Ic4e16f8303611197e7d2a149e85c7b73dc30bcc8
diff --git a/writerfilter/source/ooxml/modelpreprocess.py
b/writerfilter/source/ooxml/modelpreprocess.py
index 6b2e874..1273b12 100644
--- a/writerfilter/source/ooxml/modelpreprocess.py
+++ b/writerfilter/source/ooxml/modelpreprocess.py
@@ -133,12 +133,6 @@ def preprocess(model):
j.setAttribute(prefix, prefix)
j.setAttribute(localname, localname)
-for i in model.getElementsByTagName(grammar):
-if
i.getAttribute(ns).startswith(http://schemas.openxmlformats.org/;):
-i.setAttribute(application,
i.getAttribute(ns).replace('http://schemas.openxmlformats.org/',
'').split('/')[0])
-else:
-i.setAttribute(application, )
-
namespacesPath = sys.argv[1]
modelPath = sys.argv[2]
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Upload nightly builds for OS X Mavericks
Le 25/08/2014 09:07, Tor Lillqvist a écrit : Or can TB dailies be anything, including either the kitchen sink or some mutilated reduced functionality ? Yes. They are provided by volunteers who get to choose how to configure what they build. If you want more variety, you are free to offer differently configured builds for upload. Or to submit a change that reduces the (much too large) number of configure-time options we have... I see no problem in leaving out optional features. That is why they are optional, right? Absolutely, and I personally agree, but my question is more whether there is a way for a user of the dailies to easily know what is/isn't in the build, other than hopefully finding a build.log file also posted on the relevant page ? Say I wanted to kitchen sink LO on OSX and provide a TB, how would a user know from the download page, what was in it ? Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - solenv/bin
solenv/bin/modules/installer/windows/update.pm |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 4446880a1d004a2151a17e601915a4af927a52e9
Author: Andras Timar andras.ti...@collabora.com
Date: Fri Aug 22 06:41:57 2014 -0700
use MSM directly from MSVC dir
Change-Id: I62ebf7f7bc10a81a3949b0aad6e6353619ef6b22
(cherry picked from commit 4f4bd6c852e2daac9ee30957538cf796f9f8e989)
Reviewed-on: https://gerrit.libreoffice.org/11092
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/solenv/bin/modules/installer/windows/update.pm
b/solenv/bin/modules/installer/windows/update.pm
index d49625a..0edaaf2 100644
--- a/solenv/bin/modules/installer/windows/update.pm
+++ b/solenv/bin/modules/installer/windows/update.pm
@@ -423,10 +423,10 @@ sub readmergedatabase
foreach my $mergemodule ( @{$mergemodules} )
{
my $filename = $mergemodule-{'Name'};
-my $mergefile =
installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$filename,
$includepatharrayref, 1);
+my $mergefile = $ENV{'MSM_PATH'} . $filename;
-if ( $$mergefile eq ) { installer::exiter::exit_program(ERROR: msm
file not found: $filename !, readmergedatabase); }
-my $completesource = $$mergefile;
+if ( ! -f $mergefile ) { installer::exiter::exit_program(ERROR: msm
file not found: $filename !, readmergedatabase); }
+my $completesource = $mergefile;
my $mergegid = $mergemodule-{'gid'};
my $workdir = $mergemoduledir . $installer::globals::separator .
$mergegid;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - solenv/bin
solenv/bin/modules/installer.pm |2 +-
solenv/bin/modules/installer/windows/msp.pm |4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 152a2b48bfb93d9da3bcf654a073ee0fedf56a30
Author: Andras Timar andras.ti...@collabora.com
Date: Sun Jan 12 11:04:41 2014 -0800
fixes related to MSP digital signature
Change-Id: I06bcf0d2cc8c4915eff3658905087be6a2eadca6
(cherry picked from commit 557cfd3bb1e9eb2792b0aa3831ad107d52ed9909)
Reviewed-on: https://gerrit.libreoffice.org/11093
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm
index ab8406f..487bba8 100644
--- a/solenv/bin/modules/installer.pm
+++ b/solenv/bin/modules/installer.pm
@@ -1651,7 +1651,7 @@ sub run {
if ( $allvariableshashref-{'OOODOWNLOADNAME'} ) {
$$downloadname = installer::download::set_download_filename($languagestringref,
$allvariableshashref); }
else { $$downloadname =
installer::download::resolve_variables_in_downloadname($allvariableshashref,
$$downloadname, $languagestringref); }
installer::systemactions::rename_one_file( $finalinstalldir .
$installer::globals::separator . $installer::globals::shortmsidatabasename,
$finalinstalldir . $installer::globals::separator . $$downloadname . .msi );
-if ( defined($ENV{'WINDOWS_BUILD_SIGNING'})
($ENV{'WINDOWS_BUILD_SIGNING'} eq 'TRUE') )
+if ( defined($ENV{'WINDOWS_BUILD_SIGNING'})
($ENV{'WINDOWS_BUILD_SIGNING'} eq 'TRUE') (
$allvariableshashref-{'CREATE_MSP_INSTALLSET'} eq '0'))
{
my $systemcall = signtool.exe sign ;
if ( defined($ENV{'PFXFILE'}) ) { $systemcall .= -f
$ENV{'PFXFILE'} ; }
diff --git a/solenv/bin/modules/installer/windows/msp.pm
b/solenv/bin/modules/installer/windows/msp.pm
index 9441559..01052fc 100644
--- a/solenv/bin/modules/installer/windows/msp.pm
+++ b/solenv/bin/modules/installer/windows/msp.pm
@@ -1194,12 +1194,14 @@ sub create_msp_patch
# Sign .msp file
if ( defined($ENV{'WINDOWS_BUILD_SIGNING'})
($ENV{'WINDOWS_BUILD_SIGNING'} eq 'TRUE') )
{
+my $localmspfilename = $mspfilename;
+$localmspfilename =~ s/\\//g;
my $systemcall = signtool.exe sign ;
if ( defined($ENV{'PFXFILE'}) ) { $systemcall .= -f $ENV{'PFXFILE'}
; }
if ( defined($ENV{'PFXPASSWORD'}) ) { $systemcall .= -p
$ENV{'PFXPASSWORD'} ; }
if ( defined($ENV{'TIMESTAMPURL'}) ) { $systemcall .= -t
$ENV{'TIMESTAMPURL'} ; } else { $systemcall .= -t
http://timestamp.globalsign.com/scripts/timestamp.dll ; }
$systemcall .= -d \ . $allvariables-{'PRODUCTNAME'} . .
$allvariables-{'PRODUCTVERSION'} . Patch .
$allvariables-{'WINDOWSPATCHLEVEL'} . \ ;
-$systemcall .= $mspfilename;
+$systemcall .= $localmspfilename;
installer::logger::print_message( ... code signing and timestamping
with signtool.exe ...\n );
my $returnvalue = system($systemcall);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - solenv/bin
solenv/bin/modules/installer/windows/msp.pm | 11 +++
1 file changed, 3 insertions(+), 8 deletions(-)
New commits:
commit 196196531d22bf9a0142133d9ea16ae0b5d5b6fe
Author: Andras Timar andras.ti...@collabora.com
Date: Mon Jan 13 00:26:17 2014 -0800
MSP patchsequence fix
Change-Id: Iaf4a6e5eb8291d78835a391894ba1b1cc675390a
(cherry picked from commit f74a6338b3897df49f3041e7ce33453eaba9e2e5)
Reviewed-on: https://gerrit.libreoffice.org/11094
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/solenv/bin/modules/installer/windows/msp.pm
b/solenv/bin/modules/installer/windows/msp.pm
index 01052fc..1bbeea8 100644
--- a/solenv/bin/modules/installer/windows/msp.pm
+++ b/solenv/bin/modules/installer/windows/msp.pm
@@ -877,19 +877,14 @@ sub get_patchsequence
my $packageversion = $allvariables-{'PACKAGEVERSION'};
-if ( $packageversion =~ /^\s*(\d+)\.(\d+)\.(\d+)\s*$/ )
+if ( $packageversion =~ /^\s*(\d+)\.(\d+)\.(\d+)\.(\d+)\s*$/ )
{
my $major = $1;
my $minor = $2;
my $micro = $3;
-my $concat = 100 * $minor + $micro;
-$packageversion = $major . \. . $concat;
+my $patch = $4;
+$patchsequence = $major . \. . $minor . \. . $micro . \. .
$patch;
}
-my $vendornumber = 0;
-if ( $allvariables-{'VENDORPATCHVERSION'} ) { $vendornumber =
$allvariables-{'VENDORPATCHVERSION'}; }
-$patchsequence = $packageversion . \. . $installer::globals::buildid .
\. . $vendornumber;
-
-if ( $allvariables-{'PATCHSEQUENCE'} ) { $patchsequence =
$allvariables-{'PATCHSEQUENCE'}; }
return $patchsequence;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - instsetoo_native/util
instsetoo_native/util/openoffice.lst.in |2 -- 1 file changed, 2 deletions(-) New commits: commit 7b8a06cf39daf8e852086cd9fbe8bf7c37f20256 Author: Andras Timar andras.ti...@collabora.com Date: Sat Aug 23 03:48:56 2014 -0700 Revert --with-lang=ALL build exceeds maximum # of files in CAB This reverts commit 3bfac473a1b1dfb2210ec07245e649697679bd83. With Matus Kukan's work, which packs .ui files into .zip archives, file count is reduced dramatically. Multiple .cab files won't be a problem in theory, but unfortunately both .cab files had the same disk id 'DISK1' and it caused problems with MSP patch generation. (cherry picked from commit 29c4a88e01b6892f097c6c1e34649e7011b95fe9) Change-Id: Ie79af3ea30de9f684f7b1fbeb80f0e46ab614b27 Reviewed-on: https://gerrit.libreoffice.org/11095 Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in index 0e323a7..0b2344d 100644 --- a/instsetoo_native/util/openoffice.lst.in +++ b/instsetoo_native/util/openoffice.lst.in @@ -71,7 +71,6 @@ LibreOffice STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/ DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/ STARTCENTER_HIDE_EXTERNAL_LINKS 0 -CABFILENUMBER 2 } active 1 compression 5 @@ -125,7 +124,6 @@ LibreOffice_Dev STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/ DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/ STARTCENTER_HIDE_EXTERNAL_LINKS 0 -CABFILENUMBER 2 } active 1 compression 5 ___ 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' - starmath/source
starmath/source/mathmlexport.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 352a728ffbe171ea6f9f8e93e143fa24198d8271
Author: Julien Nabet serval2...@yahoo.fr
Date: Wed Aug 20 23:02:56 2014 +0200
Resolves: fdo#82747 Crash on opening wikipedia ODT Book
Test if there's indeed a subnode before testing its type
Cherry-picked from 3d34eb4612fa59fae7594399d3d6f798ddb35582
Change-Id: I1bb32652ceb82b0818a8d2cd8d71b46dd96ef2aa
Reviewed-on: https://gerrit.libreoffice.org/11050
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org
Reviewed-on: https://gerrit.libreoffice.org/11084
Reviewed-by: David Tardon dtar...@redhat.com
diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx
index 7fffe8f..7299d08 100644
--- a/starmath/source/mathmlexport.cxx
+++ b/starmath/source/mathmlexport.cxx
@@ -890,6 +890,7 @@ void SmXMLExport::ExportTable(const SmNode *pNode, int
nLevel)
}
else if (pTemp-GetType() == NLINE
pTemp-GetNumSubNodes() == 1
+ pTemp-GetSubNode(0)
pTemp-GetSubNode(0)-GetType() == NALIGN)
{
// For the Table() construction, the NALIGN node is a child
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - extras/CustomTarget_autocorr.mk extras/Package_autocorr.mk
extras/CustomTarget_autocorr.mk |6 +++--- extras/Package_autocorr.mk |6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) New commits: commit 54207ef87fc379b0780a869545700e8a5754abeb Author: Julien Nabet serval2...@yahoo.fr Date: Sat Aug 23 11:11:01 2014 +0200 Resolves fdo#82985 Make generic autocorr files (German/Spanish/Italian) I applied a part of the fdo#79276 fix Cherry-picked from a4f411ba62d4fd7fd4a61d1c9d326488d5e84ff5 Change-Id: I4716c06bfd25efe45a19295e0f5fd7cd1b8b0568 Reviewed-on: https://gerrit.libreoffice.org/11086 Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com diff --git a/extras/CustomTarget_autocorr.mk b/extras/CustomTarget_autocorr.mk index ddafa02..4c0cf3c 100644 --- a/extras/CustomTarget_autocorr.mk +++ b/extras/CustomTarget_autocorr.mk @@ -15,12 +15,12 @@ extras_AUTOCORR_LANGS := \ ca:ca-ES \ cs:cs-CZ \ da:da-DK \ - de:de-DE \ + de:de \ en-AU:en-AU \ en-GB:en-GB \ en-US:en-US \ en-ZA:en-ZA \ - es:es-ES \ + es:es \ fa:fa-IR \ fi:fi-FI \ fr:fr \ @@ -28,7 +28,7 @@ extras_AUTOCORR_LANGS := \ hr:hr-HR \ hu:hu-HU \ is:is-IS \ - it:it-IT \ + it:it \ ja:ja-JP \ ko:ko-KR \ lb-LU:lb-LU \ diff --git a/extras/Package_autocorr.mk b/extras/Package_autocorr.mk index 8c71a60..d0c8ecb 100644 --- a/extras/Package_autocorr.mk +++ b/extras/Package_autocorr.mk @@ -15,12 +15,12 @@ $(eval $(call gb_Package_add_files,extras_autocorr,$(LIBO_SHARE_FOLDER)/autocorr acor_cs-CZ.dat \ acor_ca-ES.dat \ acor_da-DK.dat \ - acor_de-DE.dat \ + acor_de.dat \ acor_en-AU.dat \ acor_en-GB.dat \ acor_en-US.dat \ acor_en-ZA.dat \ - acor_es-ES.dat \ + acor_es.dat \ acor_fa-IR.dat \ acor_fi-FI.dat \ acor_fr.dat \ @@ -28,7 +28,7 @@ $(eval $(call gb_Package_add_files,extras_autocorr,$(LIBO_SHARE_FOLDER)/autocorr acor_hr-HR.dat \ acor_hu-HU.dat \ acor_is-IS.dat \ - acor_it-IT.dat \ + acor_it.dat \ acor_ja-JP.dat \ acor_ko-KR.dat \ acor_lb-LU.dat \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Upload nightly builds for OS X Mavericks
Hi, I'm going to try to build with your proposals. --enable-macosx-retina --with-macosx-sdk=10.9 --with-macosx-version-min-required=10.9 --enable-opengl --disable-gtk --enable-firebird-sdbc --enable-extension-integration --enable-ext-languagetool --with-myspell-dicts --enable-python=internal --with-external-tar=/Volumes/Tarballs/lo/external_tar --srcdir=/Volumes/Tinderbox/lo/core --enable-verbose --disable-dependency-tracking (I prefer that it do always a clean build) --disable-ccache --with-parallelism=2 --enable-64-bit --enable-bogus-pkg-config --disable-cve-tests --enable-odk --disable-online-update Regards, Robert On Mon, Aug 25, 2014 at 8:59 AM, Alex Thurgood alex.thurg...@gmail.com wrote: Le 25/08/2014 00:35, Robert Antoni a écrit : Hi, Just my two cents, but : I'm open to any configuration change of my tinderbox. --disable-firebird-sdbc Why disable firebird ? It is an integral part of the official releases afaik (enve if still experimental). Or can TB dailies be anything, including either the kitchen sink or some mutilated reduced functionality ? Just trying to understand the general policy. Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice -- http://about.me/rbuj ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
АНОНС Тренинг SEMIN GROUP «СОСТАВЛЯЮЩИЕ ЭФФЕКТИВНОГО ОТДЕЛА ПРОДАЖ»
Your email client cannot read this email. To view it online, please go here: http://www.mailchieftain.info/display.php?M=110748C=8b8e33d830d3dbe1a0e658881128dcceS=340L=2N=325 To stop receiving these emails:http://www.mailchieftain.info/unsubscribe.php?M=110748C=8b8e33d830d3dbe1a0e658881128dcceL=2N=340 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - bridges/source configure.ac desktop/source m4/ax_boost_base.m4
bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx | 65 +
bridges/source/cpp_uno/gcc3_linux_powerpc64/share.hxx |1
bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx | 79 ++--
configure.ac|9 +
desktop/source/deployment/misc/dp_platform.cxx |3
m4/ax_boost_base.m4 |2
6 files changed, 136 insertions(+), 23 deletions(-)
New commits:
commit 26aa4245fba5287b2af4a5c580cd5e663ce0a002
Author: Caolán McNamara caol...@redhat.com
Date: Thu Aug 21 08:52:16 2014 +0100
Resolves: rhbz#1125588 port LibreOffice to ppc64le
Related: rhbz#1125588 first steps for ppc64le
almost certainly won't get us too far, but a start
(cherry picked from commit 170109708e6a082252efba3d2f1726bbd82b6452)
Change-Id: Ic20b97a97b6d506c32322173bd8332d15c3a4555
openjdk appears to use ppc64/server/libjvm.so and not
ppc64le/server/libjvm.so
Change-Id: Iff9e2e0ac9921b0d9d36a49fdcd2323d5dd124ee
(cherry picked from commit 632e4095ad92196480ad82cfa1f106c4c08ae1cc)
need to accept ppc64le as a lib64 using platform in ax_boost_base.m4
Change-Id: I86ef068661082addbd165629d3d6905695090a6b
(cherry picked from commit 2d48c52da712f8fa3c4a579494c824491afb8515)
linux_powerpc64le-linux_powerpc64_le to match dp_platform.cxx
Change-Id: Ib63e5a28d7ff12780a1051d94c5976244eab1814
(cherry picked from commit 2ced4d39cc1b8de233cd886d3ef991b3079500d2)
Related: rhbz#1125588 get as far as privateSnippetExecutor
Change-Id: Icc386083ecd9faefbedebbb9d2496a4eddfa0b2b
(cherry picked from commit 4c5bbbf059924f3aa24620a4cbbc35816978a606)
Related: rhbz#1125588 get to the end of cpp_mediate on ppc64le
Change-Id: Id3928ef5ac68ea13a7aa8723bc8b068ecf8075a0
(cherry picked from commit d8fcd8ca9af087e98a2f6d9cbcf6eb42cddd0c74)
Related: rhbz#1125588 force existence of argument save area
ELFv2 ABI on ppc64 optimises stack allocation
(http://gcc.gnu.org/ml/gcc-patches/2013-11/msg01149.html
so we're getting no argument save area
This now appears to pass the simple cases and onwards
to the tricky ones
Change-Id: Ie56d148ebea7fcfc023cb7183bc97f09186e66b4
(cherry picked from commit 6396e18f4d49c24283b170310a1892db40c128d3)
Related: rhbz#1125588 ppc64le has new struct passing rules
http://gcc.gnu.org/ml/gcc-patches/2013-11/msg01145.html
http://gcc.gnu.org/ml/gcc-patches/2013-11/msg01147.html
now we just fail instead of crash
Change-Id: I329c676337885bcf4fdfdcdb5912d75424862126
(cherry picked from commit 970ad502e3ea2cc992c6cc1c7583231aec5bf5da)
Related: rhbz#1125588 ppc64le fix simple struct returning
Change-Id: I1e253922fdb606648eff9865f1125a24e35b0d9a
(cherry picked from commit ee6fcdd18b1a839d7d60617d4fda622f6e6e7e66)
Resolves: rhbz#1125588 ppc64le passes testtools
*bzzt*, lightning arcs, faint smell of ozone, it's alive!
Change-Id: I0b42f4e2603e6d76200d63ab2e26bbb856ae1173
(cherry picked from commit 6ab1951ea2e31f47bc9f211dd9b2681c794b8e7f)
Reviewed-on: https://gerrit.libreoffice.org/11072
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
index 29e134a..eaee739 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
@@ -31,6 +31,11 @@
#include stdio.h
#include string.h
+#ifdef OSL_BIGENDIAN
+#define IS_BIG_ENDIAN 1
+#else
+#define IS_BIG_ENDIAN 0
+#endif
using namespace ::com::sun::star::uno;
@@ -67,7 +72,7 @@ static typelib_TypeClass cpp2uno_call(
if (pReturnTypeDescr)
{
-if (bridges::cpp_uno::shared::isSimpleType( pReturnTypeDescr ))
+if (!ppc64::return_in_hidden_param(pReturnTypeRef))
{
pUnoReturn = pRegisterReturn; // direct way for simple types
}
@@ -139,13 +144,13 @@ static typelib_TypeClass cpp2uno_call(
case typelib_TypeClass_BOOLEAN:
if (ng ppc64::MAX_GPR_REGS)
{
-pCppArgs[nPos] = pUnoArgs[nPos] = (((char *)gpreg) +
(sizeof(void*)-1));
+pCppArgs[nPos] = pUnoArgs[nPos] = (((char *)gpreg) +
7*IS_BIG_ENDIAN);
ng++;
gpreg++;
}
else
{
-pCppArgs[nPos] = pUnoArgs[nPos] = (((char *)ovrflw) +
(sizeof(void*)-1));
+pCppArgs[nPos] = pUnoArgs[nPos] = (((char *)ovrflw) +
7*IS_BIG_ENDIAN);
bOverflowUsed = true;
}
[Libreoffice-commits] core.git: svx/source
svx/source/tbxctrls/tbcontrl.cxx |9 -
1 file changed, 9 deletions(-)
New commits:
commit 8bfde0c1a6275c396e43829619d17350ba68c151
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Aug 25 10:39:33 2014 +0200
loplugin:unreffun
Change-Id: I6a772c32071a85579861e9f2c03f7664032ff643
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 4c2e985..881dcb9 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -138,7 +138,6 @@ public:
inline void SetVisibilityListener( const Link aVisListener ) {
aVisibilityListener = aVisListener; }
voidSetDefaultStyle( const OUString rDefault ) {
sDefaultStyle = rDefault; }
-DECL_STATIC_LINK( SvxStyleBox_Impl, FocusHdl_Impl, Control* );
protected:
virtual voidSelect() SAL_OVERRIDE;
@@ -661,14 +660,6 @@ void SvxStyleBox_Impl::UserDraw( const UserDrawEvent
rUDEvt )
}
}
-IMPL_STATIC_LINK( SvxStyleBox_Impl, FocusHdl_Impl, Control*, _pCtrl )
-{
-(void)pThis;
-if ( _pCtrl )
-_pCtrl-GrabFocus();
-return 0;
-}
-
static bool lcl_GetDocFontList( const FontList** ppFontList,
SvxFontNameBox_Impl* pBox )
{
bool bChanged = false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Upload nightly builds for OS X Mavericks
On 25/08/14 09:49, Alex Thurgood wrote: Absolutely, and I personally agree, but my question is more whether there is a way for a user of the dailies to easily know what is/isn't in the build, other than hopefully finding a build.log file also posted on the relevant page ? Say I wanted to kitchen sink LO on OSX and provide a TB, how would a user know from the download page, what was in it ? that's actually a good point - ideally the upload directory would contain the autogen.input of the tinderbox so it's immediately obvious what options were enabled in the build, to not waste time trying to test something that isn't even enabled. do we have all relevant settings in autogen.input? it is occasionally useful to know which MSVC version was used... perhaps upload config_*.mk too? or does config.log contain everything of importance? yep all the variables are in there... ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Upload nightly builds for OS X Mavericks
On Mon, Aug 25, 2014 at 9:49 AM, Alex Thurgood alex.thurg...@gmail.com wrote: Say I wanted to kitchen sink LO on OSX and provide a TB, how would a user know from the download page, what was in it ? Daily build are not for 'users' in the generic sens of the term, but for qa/testers. iow people that either know how to find the answer or know where/whom to ask And the build log should contain the config... so once should be able to figure it out fairly easily Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: filter/source
filter/source/graphicfilter/ieps/ieps.cxx | 38 +++---
1 file changed, 35 insertions(+), 3 deletions(-)
New commits:
commit 48500bdd0571b11f56161579b576e37883f4c81d
Author: Hiroto Kagotani hiroto.kagot...@gmail.com
Date: Tue Aug 19 16:07:49 2014 +0900
fdo#82290: avoid pipe deadlock by executing write(2) in a new thread
Change-Id: I65737399d9ac7ffa1eb623f3ff5fffbce6929801
Signed-off-by: Stephan Bergmann sberg...@redhat.com
diff --git a/filter/source/graphicfilter/ieps/ieps.cxx
b/filter/source/graphicfilter/ieps/ieps.cxx
index 003a52b..d24b6fc 100644
--- a/filter/source/graphicfilter/ieps/ieps.cxx
+++ b/filter/source/graphicfilter/ieps/ieps.cxx
@@ -36,6 +36,7 @@
#include unotools/tempfile.hxx
#include osl/process.h
#include osl/file.hxx
+#include osl/thread.h
#include boost/scoped_array.hpp
class FilterConfigItem;
@@ -265,6 +266,32 @@ static bool RenderAsEMF(const sal_uInt8* pBuf, sal_uInt32
nBytesRead, Graphic r
return bRet;
}
+struct WriteData
+{
+oslFileHandle m_pFile;
+const sal_uInt8 *m_pBuf;
+sal_uInt32 m_nBytesToWrite;
+};
+
+extern C {
+
+static void WriteFileInThread(void *wData)
+{
+sal_uInt64 nCount;
+WriteData *wdata = (WriteData *)wData;
+osl_writeFile(wdata-m_pFile, wdata-m_pBuf, wdata-m_nBytesToWrite,
nCount);
+// The number of bytes written does not matter.
+// The helper process may close its input stream before reading it all.
+// (e.g. at showpage in EPS)
+
+// File must be closed here.
+// Otherwise, the helper process may wait for the next input,
+// then its stdout is not closed and osl_readFile() blocks.
+if (wdata-m_pFile) osl_closeFile(wdata-m_pFile);
+}
+
+}
+
static bool RenderAsBMPThroughHelper(const sal_uInt8* pBuf, sal_uInt32
nBytesRead,
Graphic rGraphic, OUString rProgName, rtl_uString *pArgs[], size_t nArgs)
{
@@ -278,11 +305,14 @@ static bool RenderAsBMPThroughHelper(const sal_uInt8*
pBuf, sal_uInt32 nBytesRea
if (eErr!=osl_Process_E_None)
return false;
+WriteData Data;
+Data.m_pFile = pIn;
+Data.m_pBuf = pBuf;
+Data.m_nBytesToWrite = nBytesRead;
+oslThread hThread = osl_createThread(WriteFileInThread, Data);
+
bool bRet = false;
sal_uInt64 nCount;
-osl_writeFile(pIn, pBuf, nBytesRead, nCount);
-if (pIn) osl_closeFile(pIn);
-if (nCount == nBytesRead)
{
SvMemoryStream aMemStm;
sal_uInt8 aBuf[32000];
@@ -307,6 +337,8 @@ static bool RenderAsBMPThroughHelper(const sal_uInt8* pBuf,
sal_uInt32 nBytesRea
if (pErr) osl_closeFile(pErr);
osl_joinProcess(aProcess);
osl_freeProcessHandle(aProcess);
+osl_joinWithThread(hThread);
+osl_destroyThread(hThread);
return bRet;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Upload nightly builds for OS X Mavericks
On Mon, Aug 25, 2014 at 10:26 AM, Robert Antoni robert@gmail.com wrote: Hi, --disable-dependency-tracking (I prefer that it do always a clean build) --disable-ccache Then you should really use ccache... ccache do not make much sens when doing incremental build.. but it has a very big impact when doing clean-build Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: License statement
On 08/19/2014 07:51 AM, Hiroto Kagotani wrote: All of my past future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. on file at https://wiki.documentfoundation.org/index.php?title=Development/Developersoldid=99896 Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Upload nightly builds for OS X Mavericks
On Mon, Aug 25, 2014 at 11:28 AM, Michael Stahl mst...@redhat.com wrote: On 25/08/14 09:49, Alex Thurgood wrote: Absolutely, and I personally agree, but my question is more whether there is a way for a user of the dailies to easily know what is/isn't in the build, other than hopefully finding a build.log file also posted on the relevant page ? Say I wanted to kitchen sink LO on OSX and provide a TB, how would a user know from the download page, what was in it ? that's actually a good point - ideally the upload directory would contain the autogen.input of the tinderbox so it's immediately obvious what options were enabled in the build, to not waste time trying to test something that isn't even enabled. when using tb to upload dailies, a 'manifest' is uploaded that contains the needed info and more see: http://dev-builds.libreoffice.org/daily/master/MacOSX-x86@49-TDF/2014-08-25_01.28.31/master~2014-08-25_01.28.31_build_info.txt Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Upload nightly builds for OS X Mavericks
On 25/08/14 11:49, Norbert Thiebaud wrote: On Mon, Aug 25, 2014 at 11:28 AM, Michael Stahl mst...@redhat.com wrote: On 25/08/14 09:49, Alex Thurgood wrote: Absolutely, and I personally agree, but my question is more whether there is a way for a user of the dailies to easily know what is/isn't in the build, other than hopefully finding a build.log file also posted on the relevant page ? Say I wanted to kitchen sink LO on OSX and provide a TB, how would a user know from the download page, what was in it ? that's actually a good point - ideally the upload directory would contain the autogen.input of the tinderbox so it's immediately obvious what options were enabled in the build, to not waste time trying to test something that isn't even enabled. when using tb to upload dailies, a 'manifest' is uploaded that contains the needed info and more see: http://dev-builds.libreoffice.org/daily/master/MacOSX-x86@49-TDF/2014-08-25_01.28.31/master~2014-08-25_01.28.31_build_info.txt that's a good start ... unfortunately currently none of the Windows tinderboxes have a built_info.txt file in their latest build. ___ 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 #214 from foss f...@openmailbox.org --- Nominate 79546 do I have to add it, or will the nomination committee do that for me? -- 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: svx/source
svx/source/tbxctrls/tbcontrl.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit edc52015c30dd58b4c79fb2642df3d1f1996d8b0
Author: Matthew J. Francis mjay.fran...@gmail.com
Date: Mon Aug 25 11:46:02 2014 +0800
fdo#82260 Fix OS X font dropdown crash
Without this, font dropdowns intermittently crash after a window
is moved to another screen
Change-Id: I1af5d8224fd164b73c43a9655fbde364f530c979
Reviewed-on: https://gerrit.libreoffice.org/11105
Reviewed-by: Tor Lillqvist t...@collabora.com
Tested-by: Tor Lillqvist t...@collabora.com
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 881dcb9..f5a8091 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -874,7 +874,8 @@ void SvxFontNameBox_Impl::DataChanged( const
DataChangedEvent rDCEvt )
Size aDropSize( aLogicalSize.Width(), LOGICAL_EDIT_HEIGHT);
SetDropDownSizePixel(LogicToPixel(aDropSize, MAP_APPFONT));
}
-else if ( rDCEvt.GetType() == DATACHANGED_FONTS )
+else if ( ( rDCEvt.GetType() == DATACHANGED_FONTS ) ||
+ ( rDCEvt.GetType() == DATACHANGED_DISPLAY ) )
{
// The old font list in shell has likely been destroyed at this point,
so we need to get
// the new one before doing anything further.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/osx
vcl/osx/vclnsapp.mm | 18 ++
1 file changed, 18 insertions(+)
New commits:
commit 0350bcde37edb1f25cca68cb1447ba8f759aea15
Author: Matthew J. Francis mjay.fran...@gmail.com
Date: Mon Aug 25 11:32:42 2014 +0800
fdo#62054 Enable Select All, Undo and Redo in Save as... on OS X
Change-Id: I2051f54b0b031dcab4918c8c187ed434842ffdd4
Reviewed-on: https://gerrit.libreoffice.org/11104
Reviewed-by: Tor Lillqvist t...@collabora.com
Tested-by: Tor Lillqvist t...@collabora.com
diff --git a/vcl/osx/vclnsapp.mm b/vcl/osx/vclnsapp.mm
index ea544f7..d1d086f 100644
--- a/vcl/osx/vclnsapp.mm
+++ b/vcl/osx/vclnsapp.mm
@@ -200,6 +200,24 @@
if( [NSApp sendAction: @selector(cut:) to: nil from: nil] )
return;
}
+else if( [[pEvent charactersIgnoringModifiers]
isEqualToString: @a] )
+{
+if( [NSApp sendAction: @selector(selectAll:) to: nil from:
nil] )
+return;
+}
+else if( [[pEvent charactersIgnoringModifiers]
isEqualToString: @z] )
+{
+if( [NSApp sendAction: @selector(undo:) to: nil from: nil]
)
+return;
+}
+}
+else if( nModMask == (NSCommandKeyMask|NSShiftKeyMask) )
+{
+if( [[pEvent charactersIgnoringModifiers] isEqualToString:
@Z] )
+{
+if( [NSApp sendAction: @selector(redo:) to: nil from: nil]
)
+return;
+}
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: forms/source
forms/source/misc/services.cxx |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 2d43261c602c31a9362b0b8b1ac6af431a6f0994
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Aug 25 12:52:50 2014 +0200
Fix *_component_getFactory function type
Change-Id: I10414cbc61b5540f1b9f39b19699673868e9c3eb
diff --git a/forms/source/misc/services.cxx b/forms/source/misc/services.cxx
index d4839c1..189cf35 100644
--- a/forms/source/misc/services.cxx
+++ b/forms/source/misc/services.cxx
@@ -241,7 +241,7 @@ void SAL_CALL createRegistryInfo_FORMS()
}
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL frm_component_getFactory(const sal_Char*
_pImplName, XMultiServiceFactory* _pServiceManager, void* /*_pRegistryKey*/)
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL frm_component_getFactory(const sal_Char*
_pImplName, void* _pServiceManager, void* /*_pRegistryKey*/)
{
if (!_pServiceManager || !_pImplName)
return NULL;
@@ -273,7 +273,8 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL
frm_component_getFactory(const sal_Char* _pI
ReferenceXSingleServiceFactory xFactory(
::cppu::createSingleFactory(
-_pServiceManager,
+static_castcss::lang::XMultiServiceFactory*(
+_pServiceManager),
*pClasses,
aCurrentCreateFunction,
*pServices
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Amit andharia.a...@gmail.com changed: What|Removed |Added Hardware|All |Other OS|All |Windows (All) Status|CLOSED |UNCONFIRMED Resolution|FIXED |--- Version|4.1.0.0.alpha0+ Master |4.3.0.4 release Ever confirmed|1 |0 --- Comment #157 from Amit andharia.a...@gmail.com --- using spareadsheet, when i try to add new line in Cell ... means writing more than one line in a cell, save changes, close the file and re-open it, cell content appears all in single line. new line character is lost. i'm saving my file as .xlsx file. (MS Excel 2007/20010 etc. ) format. -- 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 Michael Stahl mst...@redhat.com changed: What|Removed |Added Hardware|Other |All OS|Windows (All) |All Status|UNCONFIRMED |RESOLVED Resolution|--- |FIXED Version|4.3.0.4 release |4.1.0.0.alpha0+ Master --- Comment #158 from Michael Stahl mst...@redhat.com --- closing MAB again please DO NOT reopen this bug -- 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 Michael Stahl mst...@redhat.com changed: What|Removed |Added Status|RESOLVED|CLOSED -- 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: forms/source
forms/source/component/imgprod.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 26e9e222685107df89dc5cf8f2de49b532830eab Author: Stephan Bergmann sberg...@redhat.com Date: Mon Aug 25 13:03:08 2014 +0200 Avoid incomplete type in fn sig to keep ubsan's RTTI-based checks happy Change-Id: I79422149fd25b1531673a517e2a340dbeab43b1a diff --git a/forms/source/component/imgprod.cxx b/forms/source/component/imgprod.cxx index 5e76b60..b692155 100644 --- a/forms/source/component/imgprod.cxx +++ b/forms/source/component/imgprod.cxx @@ -27,6 +27,7 @@ #include unotools/ucbstreamhelper.hxx #include vcl/graphicfilter.hxx #include com/sun/star/io/XInputStream.hpp +#include com/sun/star/lang/XMultiServiceFactory.hpp #include svtools/imageresourceaccess.hxx #include comphelper/processfactory.hxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - oox/source
oox/source/ppt/pptshape.cxx| 40 +
oox/source/ppt/pptshapecontext.cxx |5 ++--
2 files changed, 26 insertions(+), 19 deletions(-)
New commits:
commit 092a3a093b11485cb3c951cb36b56ce08218f1e4
Author: Matúš Kukan matus.ku...@collabora.com
Date: Tue Aug 19 16:26:12 2014 +0200
bnc#880448: Improved handling of placeholder shapes
If subTitle placeholder is not found, try body instead of title.
And use body text styles instead of title, for subTitle.
Also improve PPTShape::findPlaceholder to find placeholder
with just nSecondSubType type without the same index.
(cherry picked from commit 2a7119021edea8346e4673d57cac3f051a5d0968)
Conflicts:
oox/source/ppt/pptshape.cxx
Change-Id: I470e7268088eb989fb934007dfcf704f67d8cb1d
Reviewed-on: https://gerrit.libreoffice.org/11065
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx
index 70b2d79..ee8b1ab 100644
--- a/oox/source/ppt/pptshape.cxx
+++ b/oox/source/ppt/pptshape.cxx
@@ -90,12 +90,10 @@ oox::drawingml::TextListStylePtr
PPTShape::getSubTypeTextListStyle( const SlideP
{
case XML_ctrTitle :
case XML_title :
-case XML_subTitle :
pTextListStyle = rSlidePersist.getMasterPersist().get() ?
rSlidePersist.getMasterPersist()-getTitleTextStyle() :
rSlidePersist.getTitleTextStyle();
break;
+case XML_subTitle :
case XML_obj :
-pTextListStyle = rSlidePersist.getMasterPersist().get() ?
rSlidePersist.getMasterPersist()-getBodyTextStyle() :
rSlidePersist.getBodyTextStyle();
-break;
case XML_body :
if ( rSlidePersist.isNotesPage() )
pTextListStyle = rSlidePersist.getMasterPersist().get() ?
rSlidePersist.getMasterPersist()-getNotesTextStyle() :
rSlidePersist.getNotesTextStyle();
@@ -149,7 +147,7 @@ void PPTShape::addShape(
sServiceName = OUString();
else {
sServiceName =
com.sun.star.presentation.SubtitleShape;
-aMasterTextListStyle =
rSlidePersist.getMasterPersist().get() ?
rSlidePersist.getMasterPersist()-getTitleTextStyle() :
rSlidePersist.getTitleTextStyle();
+aMasterTextListStyle =
rSlidePersist.getMasterPersist().get() ?
rSlidePersist.getMasterPersist()-getBodyTextStyle() :
rSlidePersist.getBodyTextStyle();
}
}
break;
@@ -392,7 +390,8 @@ namespace
// 1. ph with nFirstSubType and the same oSubTypeIndex
// 2. ph with nFirstSubType
// 3. ph with nSecondSubType and the same oSubTypeIndex
-// 4. ph with the same oSubTypeIndex
+// 4. ph with nSecondSubType
+// 5. ph with the same oSubTypeIndex
oox::drawingml::ShapePtr PPTShape::findPlaceholder( sal_Int32 nFirstSubType,
sal_Int32 nSecondSubType,
const OptValue sal_Int32 oSubTypeIndex, std::vector
oox::drawingml::ShapePtr rShapes, bool bMasterOnly )
{
@@ -400,6 +399,7 @@ oox::drawingml::ShapePtr PPTShape::findPlaceholder(
sal_Int32 nFirstSubType, sal
oox::drawingml::ShapePtr aChoiceShapePtr1;
oox::drawingml::ShapePtr aChoiceShapePtr2;
oox::drawingml::ShapePtr aChoiceShapePtr3;
+oox::drawingml::ShapePtr aChoiceShapePtr4;
std::vector oox::drawingml::ShapePtr ::reverse_iterator aRevIter(
rShapes.rbegin() );
while (aRevIter != rShapes.rend())
{
@@ -414,27 +414,31 @@ oox::drawingml::ShapePtr PPTShape::findPlaceholder(
sal_Int32 nFirstSubType, sal
}
else if ((*aRevIter)-getSubType() == nSecondSubType
!aChoiceShapePtr2.get())
aChoiceShapePtr2 = *aRevIter;
-else if (!aChoiceShapePtr3.get())
-aChoiceShapePtr3 = *aRevIter;
+else if (!aChoiceShapePtr4.get())
+aChoiceShapePtr4 = *aRevIter;
}
else if ((*aRevIter)-getSubType() == nFirstSubType
!aChoiceShapePtr1.get())
aChoiceShapePtr1 = *aRevIter;
+else if ((*aRevIter)-getSubType() == nSecondSubType
!aChoiceShapePtr3.get())
+aChoiceShapePtr3 = *aRevIter;
}
std::vector oox::drawingml::ShapePtr rChildren =
(*aRevIter)-getChildren();
-aChoiceShapePtr3 = findPlaceholder( nFirstSubType, nSecondSubType,
oSubTypeIndex, rChildren, bMasterOnly );
-if (aChoiceShapePtr3.get())
+aChoiceShapePtr4 = findPlaceholder( nFirstSubType, nSecondSubType,
oSubTypeIndex, rChildren, bMasterOnly );
+if (aChoiceShapePtr4.get())
{
-if (aChoiceShapePtr3-getSubType() == nFirstSubType)
+if (aChoiceShapePtr4-getSubType() == nFirstSubType)
{
-if (aChoiceShapePtr3-getSubTypeIndex()
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - scp2/Module_scp2.mk
scp2/Module_scp2.mk |1 - 1 file changed, 1 deletion(-) New commits: commit e10e1b06cbbf337e8277063651b6e48011df5fd4 Author: Andras Timar andras.ti...@collabora.com Date: Thu Aug 7 12:18:03 2014 -0700 fdo#80927 - quickstart causing trouble on windows, disable it Change-Id: I0c46129cff44edaac72939c1b2bc8cbf02bdf68f Reviewed-on: https://gerrit.libreoffice.org/10817 Reviewed-by: Michael Stahl mst...@redhat.com Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk index be02cd8..767e443 100644 --- a/scp2/Module_scp2.mk +++ b/scp2/Module_scp2.mk @@ -33,7 +33,6 @@ $(eval $(call gb_Module_add_targets,scp2,\ ) \ $(if $(filter WNT,$(OS)),\ $(if $(DISABLE_ACTIVEX),,InstallModule_activex) \ - InstallModule_quickstart \ InstallModule_windows \ $(if $(filter MSC,$(COM)),\ InstallModule_winexplorerext \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 4 commits - jvmfwk/source leak-suppress.txt oox/source
jvmfwk/source/elements.cxx |3 --
leak-suppress.txt|3 ++
oox/source/drawingml/chart/modelbase.cxx |2 -
oox/source/drawingml/effectproperties.cxx| 16 +++
oox/source/drawingml/effectproperties.hxx|4 ++-
oox/source/drawingml/effectpropertiescontext.cxx | 24 +++
oox/source/drawingml/shape.cxx |6 ++---
7 files changed, 30 insertions(+), 28 deletions(-)
New commits:
commit 6797610bcfc41d2af57db03c5d9b52cfc30d09ed
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Mon Aug 25 13:00:41 2014 +0200
use ptr_vector to prevent memory leak
Found by Lsan.
Change-Id: I727098ea3861bacf89209615e4b46e986a72c1ce
diff --git a/oox/source/drawingml/effectproperties.cxx
b/oox/source/drawingml/effectproperties.cxx
index da94669..2fa608a 100644
--- a/oox/source/drawingml/effectproperties.cxx
+++ b/oox/source/drawingml/effectproperties.cxx
@@ -35,16 +35,16 @@ void EffectProperties::assignUsed( const EffectProperties
rSourceProps )
void EffectProperties::pushToPropMap( PropertyMap rPropMap,
const GraphicHelper rGraphicHelper ) const
{
-for( std::vector Effect* ::const_iterator it = maEffects.begin(); it !=
maEffects.end(); ++it )
-if( (*it)-msName == outerShdw )
+for( boost::ptr_vector Effect ::const_iterator it = maEffects.begin();
it != maEffects.end(); ++it )
+if( it-msName == outerShdw )
{
sal_Int32 nAttrDir = 0, nAttrDist = 0;
-std::map OUString, css::uno::Any ::iterator attribIt =
(*it)-maAttribs.find( dir );
-if( attribIt != (*it)-maAttribs.end() )
+std::map OUString, css::uno::Any ::const_iterator attribIt =
it-maAttribs.find( dir );
+if( attribIt != it-maAttribs.end() )
attribIt-second = nAttrDir;
-attribIt = (*it)-maAttribs.find( dist );
-if( attribIt != (*it)-maAttribs.end() )
+attribIt = it-maAttribs.find( dist );
+if( attribIt != it-maAttribs.end() )
attribIt-second = nAttrDist;
// Negative X or Y dist indicates left or up, respectively
@@ -56,8 +56,8 @@ void EffectProperties::pushToPropMap( PropertyMap rPropMap,
rPropMap.setProperty( PROP_Shadow, true );
rPropMap.setProperty( PROP_ShadowXDistance, nXDist);
rPropMap.setProperty( PROP_ShadowYDistance, nYDist);
-rPropMap.setProperty( PROP_ShadowColor,
(*it)-moColor.getColor(rGraphicHelper, -1 ) );
-rPropMap.setProperty( PROP_ShadowTransparence,
(*it)-moColor.getTransparency());
+rPropMap.setProperty( PROP_ShadowColor,
it-moColor.getColor(rGraphicHelper, -1 ) );
+rPropMap.setProperty( PROP_ShadowTransparence,
it-moColor.getTransparency());
}
}
diff --git a/oox/source/drawingml/effectproperties.hxx
b/oox/source/drawingml/effectproperties.hxx
index dae858c..4256b8d 100644
--- a/oox/source/drawingml/effectproperties.hxx
+++ b/oox/source/drawingml/effectproperties.hxx
@@ -14,6 +14,8 @@
#include oox/drawingml/color.hxx
#include oox/helper/propertymap.hxx
+#include boost/ptr_container/ptr_vector.hpp
+
namespace oox {
namespace drawingml {
@@ -42,7 +44,7 @@ struct EffectProperties
EffectShadowProperties maShadow;
/** Stores all effect properties, including those not supported by core
yet */
-std::vector Effect* maEffects;
+boost::ptr_vector Effect maEffects;
/** Overwrites all members that are explicitly set in rSourceProps. */
voidassignUsed( const EffectProperties rSourceProps );
diff --git a/oox/source/drawingml/effectpropertiescontext.cxx
b/oox/source/drawingml/effectpropertiescontext.cxx
index c99d364..7d6549c 100644
--- a/oox/source/drawingml/effectpropertiescontext.cxx
+++ b/oox/source/drawingml/effectpropertiescontext.cxx
@@ -76,22 +76,22 @@ ContextHandlerRef EffectPropertiesContext::onCreateContext(
sal_Int32 nElement,
{
case A_TOKEN( outerShdw ):
{
-mrEffectProperties.maEffects[nPos]-msName = outerShdw;
-saveUnsupportedAttribs( *mrEffectProperties.maEffects[nPos],
rAttribs );
+mrEffectProperties.maEffects[nPos].msName = outerShdw;
+saveUnsupportedAttribs( mrEffectProperties.maEffects[nPos],
rAttribs );
mrEffectProperties.maShadow.moShadowDist = rAttribs.getInteger(
XML_dist, 0 );
mrEffectProperties.maShadow.moShadowDir = rAttribs.getInteger(
XML_dir, 0 );
-return new ColorContext( *this,
mrEffectProperties.maEffects[nPos]-moColor );
+return new ColorContext( *this,
mrEffectProperties.maEffects[nPos].moColor );
}
break;
case A_TOKEN( innerShdw ):
{
-mrEffectProperties.maEffects[nPos]-msName = innerShdw;
-
[Libreoffice-commits] core.git: 4 commits - avmedia/source connectivity/source cppu/source dbaccess/source desktop/source dtrans/source extensions/source forms/source fpicker/source framework/source i
avmedia/source/vlc/wrapper/EventHandler.cxx |4 +++-
connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx |2 ++
cppu/source/AffineBridge/AffineBridge.cxx |4
cppu/source/threadpool/thread.cxx |2 ++
cppu/source/threadpool/thread.hxx |1 -
dbaccess/source/filter/xml/xmlfilter.cxx |2 ++
dbaccess/source/ui/dlg/odbcconfig.cxx |2 ++
dbaccess/source/ui/relationdesign/RelationController.cxx |2 ++
desktop/source/app/app.cxx|6 ++
desktop/source/offacc/acceptor.cxx|2 ++
dtrans/source/win32/clipb/MtaOleClipb.cxx |4
dtrans/source/win32/dnd/source.cxx|3 +++
dtrans/source/win32/dnd/target.cxx|3 +++
extensions/source/plugin/unx/mediator.cxx |2 ++
extensions/source/scanner/scanunx.cxx |2 ++
extensions/source/update/check/updatecheck.cxx|6 ++
extensions/source/update/check/updatecheckjob.cxx |2 ++
forms/source/component/EventThread.cxx|2 ++
fpicker/source/win32/filepicker/asynceventnotifier.cxx|3 +++
fpicker/source/win32/filepicker/asyncrequests.cxx |2 ++
fpicker/source/win32/filepicker/getfilenamewrapper.cxx|2 ++
fpicker/source/win32/folderpicker/MtaFop.cxx |3 +++
framework/source/helper/wakeupthread.cxx |2 ++
io/source/stm/opump.cxx |1 +
linguistic/source/gciterator.cxx |2 ++
sal/osl/unx/process.cxx |2 ++
sal/osl/w32/dllentry.c|3 +++
salhelper/source/timer.cxx|2 ++
sd/source/ui/remotecontrol/Transmitter.cxx|2 ++
sdext/source/presenter/PresenterTimer.cxx |2 ++
sfx2/source/appl/shutdowniconw32.cxx |2 ++
sfx2/source/doc/doctemplates.cxx |2 ++
sfx2/source/doc/docundomanager.cxx|2 +-
sfx2/source/doc/printhelper.cxx |2 ++
svx/source/accessibility/svxpixelctlaccessiblecontext.cxx |2 --
svx/source/core/extedit.cxx |2 ++
svx/source/form/fmsrcimp.cxx |2 ++
svx/source/svdraw/svdograf.cxx|2 ++
sw/source/core/docnode/finalthreadmanager.cxx |4
sw/source/core/docnode/retrieveinputstream.cxx|2 ++
sw/source/uibase/dbui/maildispatcher.cxx |2 ++
toolkit/source/awt/vclxtoolkit.cxx|3 +++
ucb/source/ucp/webdav/SerfLockStore.cxx |2 ++
unotools/source/ucbhelper/ucblockbytes.cxx|2 ++
vcl/unx/generic/dtrans/X11_selection.cxx |1 +
vcl/unx/generic/printer/cupsmgr.cxx |2 ++
vcl/unx/generic/printer/printerinfomanager.cxx|2 ++
vcl/unx/kde/UnxCommandThread.cxx |2 ++
vcl/unx/kde/UnxNotifyThread.cxx |2 ++
49 files changed, 108 insertions(+), 9 deletions(-)
New commits:
commit 57a4337e254b485df33dc01e508bb936adc6ec75
Author: Michael Stahl mst...@redhat.com
Date: Fri Aug 22 23:51:08 2014 +0200
set names on a bunch more threads...
Change-Id: I4c2f2f0bcce52839033876ec991529721e06a3c8
diff --git a/avmedia/source/vlc/wrapper/EventHandler.cxx
b/avmedia/source/vlc/wrapper/EventHandler.cxx
index 666ac94..40e2e45 100644
--- a/avmedia/source/vlc/wrapper/EventHandler.cxx
+++ b/avmedia/source/vlc/wrapper/EventHandler.cxx
@@ -28,6 +28,8 @@ void EventHandler::stop()
void EventHandler::run()
{
+osl_setThreadName(VLC EventHandler);
+
TCallback callback;
do
{
@@ -43,4 +45,4 @@ void EventHandler::run()
}
}
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
b/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
index 81030a73..60ba8c0 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
@@ -229,6 +229,8 @@ void MNS_XPCOM_EventLoop()
extern C void MNS_Mozilla_UI_Thread( void *arg )
{
+osl_setThreadName(MNS_Mozilla_UI_Thread);
+
aLive=1;
OSL_TRACE( IN : MNS_Mozilla_UI_Thread() );
UI_Thread_ARGS * args = (UI_Thread_ARGS*) arg;
diff --git a/cppu/source/AffineBridge/AffineBridge.cxx
b/cppu/source/AffineBridge/AffineBridge.cxx
index 786e9d9..24b8127 100644
---
[Libreoffice-commits] core.git: 3 commits - extensions/source include/sfx2 include/svx sfx2/source svx/source
extensions/source/abpilot/abpresid.hrc | 17 ++-
extensions/source/abpilot/abspilot.cxx |4 +--
extensions/source/abpilot/abspilot.src | 14 +++-
include/sfx2/newstyle.hxx |4 +--
include/sfx2/sfx.hrc |4 ---
include/svx/dialogs.hrc|4 ---
include/svx/fmresids.hrc | 14 +---
sfx2/source/appl/app.hrc |6 ++---
sfx2/source/appl/app.src | 24 +++---
sfx2/source/dialog/dialog.hrc |2 -
sfx2/source/dialog/dinfdlg.cxx |4 +--
sfx2/source/dialog/dinfdlg.src |6 +
sfx2/source/dialog/newstyle.cxx| 19 -
sfx2/source/dialog/newstyle.src|6 +
sfx2/source/dialog/templdlg.cxx| 12 ++-
sfx2/source/doc/doc.hrc|2 -
sfx2/source/doc/doc.src|6 +
sfx2/source/doc/guisaveas.cxx |8 ---
sfx2/source/doc/objserv.cxx|7 ++
sfx2/source/inc/sfxlocal.hrc |2 -
sfx2/source/view/view.hrc |2 -
sfx2/source/view/view.src |6 +
sfx2/source/view/viewfrm.cxx | 11 ++
svx/source/dialog/docrecovery.cxx |6 ++---
svx/source/dialog/docrecovery.src |6 +
svx/source/form/datanavi.cxx | 31 +++-
svx/source/form/datanavi.src | 36 +++--
27 files changed, 105 insertions(+), 158 deletions(-)
New commits:
commit 27d79b12e17a93f6e4eab2a3c09d423a4a04a63d
Author: Caolán McNamara caol...@redhat.com
Date: Mon Aug 25 10:45:11 2014 +0100
QueryBox RID_QRY_* - MessageDialog + string
Change-Id: I3349a513a1e1b6fefd1f0f07a8a0798a325d87db
diff --git a/extensions/source/abpilot/abpresid.hrc
b/extensions/source/abpilot/abpresid.hrc
index ac716b0..2ab08cc 100644
--- a/extensions/source/abpilot/abpresid.hrc
+++ b/extensions/source/abpilot/abpresid.hrc
@@ -28,7 +28,6 @@
#define RID_PAGE_START RID_ABP_START
#define RID_STRING_STARTRID_ABP_START
#define RID_UNTYPED_START RID_ABP_START
-#define RID_QUERYBOX_START RID_ABP_START
#define RID_BITMAP_STARTRID_ABP_START
// strings
@@ -46,18 +45,11 @@
#define RID_STR_MANUAL_FIELD_MAPPING( RID_STRING_START + 10 )
#define RID_STR_FINAL_CONFIRM ( RID_STRING_START + 11 )
#define RID_STR_NEEDTYPESELECTION ( RID_STRING_START + 12 )
+#define RID_STR_QRY_NO_EVO_GW ( RID_STRING_START + 13 )
+#define RID_STR_QRY_NOTABLES( RID_STRING_START + 14 )
// please adjust RID_STRING_END (below) when adding new strings
-#define RID_STRING_END RID_STR_NEEDTYPESELECTION
-
-// query boxes
-
-#define RID_QRY_NOTABLES( RID_QUERYBOX_START + 0 )
-// please adjust RID_QUERYBOX_END (below) when adding new query boxes
-
-#define RID_QRY_NO_EVO_GW ( RID_QUERYBOX_START + 1 )
-
-#define RID_QUERYBOX_ENDRID_QRY_NO_EVO_GW
+#define RID_STRING_END RID_STR_QRY_NOTABLES
// untyped resources
@@ -78,9 +70,6 @@
#if RID_STRING_END RID_ABP_END
#error please adjust the resource id ranges!!
#endif
-#if RID_QUERYBOX_END RID_ABP_END
-#error please adjust the resource id ranges!!
-#endif
#if RID_UNTYPED_END RID_ABP_END
#error please adjust the resource id ranges!!
#endif
diff --git a/extensions/source/abpilot/abspilot.cxx
b/extensions/source/abpilot/abspilot.cxx
index a93dd1e..bfe4cb1 100644
--- a/extensions/source/abpilot/abspilot.cxx
+++ b/extensions/source/abpilot/abspilot.cxx
@@ -28,7 +28,7 @@
#include admininvokationpage.hxx
#include tableselectionpage.hxx
#include vcl/waitobj.hxx
-#include vcl/msgbox.hxx
+#include vcl/layout.hxx
#include vcl/settings.hxx
#include abpfinalpage.hxx
#include fieldmappingpage.hxx
@@ -276,7 +276,7 @@ namespace abp
if ( aTables.empty() )
{
-if ( RET_YES != QueryBox( this, ModuleRes( (
getSettings().eType == AST_EVOLUTION_GROUPWISE ? RID_QRY_NO_EVO_GW :
RID_QRY_NOTABLES ) ) ).Execute() )
+if (RET_YES != MessageDialog(this, ModuleRes((
getSettings().eType == AST_EVOLUTION_GROUPWISE ? RID_STR_QRY_NO_EVO_GW :
RID_STR_QRY_NOTABLES)), VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO).Execute())
{
// cannot ask the user, or the user chose to use this data
source, though there are no tables
bAllow = false;
diff --git a/extensions/source/abpilot/abspilot.src
b/extensions/source/abpilot/abspilot.src
index 985915b..bb8ac22 100644
--- a/extensions/source/abpilot/abspilot.src
+++ b/extensions/source/abpilot/abspilot.src
@@ -54,20 +54,14 @@ String RID_STR_NEEDTYPESELECTION
Text [ en-US ] = Please select a type of address book.;
};
-QueryBox RID_QRY_NOTABLES
+String
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 1e/f659f66b6dfcc0b3af641f75ea31c6c72390f9
1e/f659f66b6dfcc0b3af641f75ea31c6c72390f9 |1 + 1 file changed, 1 insertion(+) New commits: commit 6869b31d36caff246a24622543abc8a2b661b63f Author: Caolán McNamara caol...@redhat.com Date: Mon Aug 25 12:29:48 2014 +0100 Notes added by 'git notes add' diff --git a/1e/f659f66b6dfcc0b3af641f75ea31c6c72390f9 b/1e/f659f66b6dfcc0b3af641f75ea31c6c72390f9 new file mode 100644 index 000..0372aa7 --- /dev/null +++ b/1e/f659f66b6dfcc0b3af641f75ea31c6c72390f9 @@ -0,0 +1 @@ +prefer: 4b7bced098d46b966ed40b68bc0b7f77904bcfdc ___ 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' - 40/81cb5c4a1c3289e0f2157148c8a855a7e5712c
40/81cb5c4a1c3289e0f2157148c8a855a7e5712c |1 + 1 file changed, 1 insertion(+) New commits: commit d8c25b38c24f5093785471eab8ecd1a9ef46b283 Author: Caolán McNamara caol...@redhat.com Date: Mon Aug 25 12:38:53 2014 +0100 Notes added by 'git notes add' diff --git a/40/81cb5c4a1c3289e0f2157148c8a855a7e5712c b/40/81cb5c4a1c3289e0f2157148c8a855a7e5712c new file mode 100644 index 000..0372aa7 --- /dev/null +++ b/40/81cb5c4a1c3289e0f2157148c8a855a7e5712c @@ -0,0 +1 @@ +prefer: 4b7bced098d46b966ed40b68bc0b7f77904bcfdc ___ 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' - 1a/f10d2b845d7c8e6a451e0cbb4e4f2500ce1d26
1a/f10d2b845d7c8e6a451e0cbb4e4f2500ce1d26 |1 + 1 file changed, 1 insertion(+) New commits: commit 5b6d2770485652a72694732f088fd3493f04e37b Author: Caolán McNamara caol...@redhat.com Date: Mon Aug 25 12:38:41 2014 +0100 Notes added by 'git notes add' diff --git a/1a/f10d2b845d7c8e6a451e0cbb4e4f2500ce1d26 b/1a/f10d2b845d7c8e6a451e0cbb4e4f2500ce1d26 new file mode 100644 index 000..0372aa7 --- /dev/null +++ b/1a/f10d2b845d7c8e6a451e0cbb4e4f2500ce1d26 @@ -0,0 +1 @@ +prefer: 4b7bced098d46b966ed40b68bc0b7f77904bcfdc ___ 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/w32/dllentry.c |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit df1f6debb793eea6e57914391a7174e0eafe3667
Author: Michael Stahl mst...@redhat.com
Date: Mon Aug 25 13:40:47 2014 +0200
fix this C file for Microsoft Pascal compiler
Change-Id: I08086caacb7abe0c85aeb184935b3f73666e9faf
diff --git a/sal/osl/w32/dllentry.c b/sal/osl/w32/dllentry.c
index f16cab7..dc30f8d 100644
--- a/sal/osl/w32/dllentry.c
+++ b/sal/osl/w32/dllentry.c
@@ -261,11 +261,12 @@ static DWORD GetParentProcessId()
static DWORD WINAPI ParentMonitorThreadProc( LPVOID lpParam )
{
-osl_setThreadName(headless ParentMonitorThread);
-
DWORD_PTR dwParentProcessId = (DWORD_PTR)lpParam;
HANDLE hParentProcess = OpenProcess( SYNCHRONIZE, FALSE,
dwParentProcessId );
+
+osl_setThreadName(headless ParentMonitorThread);
+
if ( IsValidHandle( hParentProcess ) )
{
if ( WAIT_OBJECT_0 == WaitForSingleObject( hParentProcess, INFINITE ) )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/table3.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit c25ac84688b596b9990d382d550f0514161b78c2
Author: Deena Francis deena.fran...@gmail.com
Date: Mon Aug 25 01:38:47 2014 +0530
Resolves fdo#81084 fdo#81696 fdo#80874 fdo#81010 : sort causes crash
Change-Id: I8fb9ec26bc549c264bfbf30177d720b20677b319
Reviewed-on: https://gerrit.libreoffice.org/11102
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 71c5323..2874cd6 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -932,9 +932,13 @@ void ScTable::SortReorderByRow(
std::vectorPatternSpan::iterator it = aSpans.begin(), itEnd =
aSpans.end();
for (; it != itEnd; ++it)
+pDocument-GetPool()-Put(*it-mpPattern);
+
+for (it = aSpans.begin(); it != itEnd; ++it)
{
assert(it-mpPattern); // should never be NULL.
aCol[nThisCol].SetPatternArea(it-mnRow1, it-mnRow2,
*it-mpPattern, true);
+pDocument-GetPool()-Remove(*it-mpPattern);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: fpicker/source
fpicker/source/win32/filepicker/getfilenamewrapper.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 1eb607eaaa3a0fdaa82d429b80df0a3bf6eaccfd Author: Michael Stahl mst...@redhat.com Date: Mon Aug 25 14:13:26 2014 +0200 oops, forgot to include osl/thread.h Change-Id: Iaef9e9356c7a75215a868bb7dbcaa25d1fb19e01 diff --git a/fpicker/source/win32/filepicker/getfilenamewrapper.cxx b/fpicker/source/win32/filepicker/getfilenamewrapper.cxx index 34202b0..35b8422 100644 --- a/fpicker/source/win32/filepicker/getfilenamewrapper.cxx +++ b/fpicker/source/win32/filepicker/getfilenamewrapper.cxx @@ -19,6 +19,7 @@ #include stdio.h #include osl/diagnose.h +#include osl/thread.h #include sal/log.hxx #include getfilenamewrapper.hxx ___ 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/inc/unofield.hxx |2 +-
sw/source/core/unocore/unocoll.cxx |4 ++--
sw/source/core/unocore/unofield.cxx | 10 +-
3 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 2406562733f62b96dd8e6537e1bf4bef147ef50c
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Aug 25 14:30:12 2014 +0200
Avoid unnecessary dereferencing of potential null pointers
Change-Id: Iba21dd394010a162a52bb576400cbbb9a9aad537
diff --git a/sw/source/core/inc/unofield.hxx b/sw/source/core/inc/unofield.hxx
index c3e0088..fb8582c 100644
--- a/sw/source/core/inc/unofield.hxx
+++ b/sw/source/core/inc/unofield.hxx
@@ -65,7 +65,7 @@ public:
static ::com::sun::star::uno::Reference
::com::sun::star::beans::XPropertySet
-CreateXFieldMaster(SwDoc rDoc, SwFieldType * pType,
+CreateXFieldMaster(SwDoc * pDoc, SwFieldType * pType,
sal_uInt16 nResId = 0x);
static OUString GetProgrammaticName(const SwFieldType rType, SwDoc rDoc);
diff --git a/sw/source/core/unocore/unocoll.cxx
b/sw/source/core/unocore/unocoll.cxx
index d08e8b9..c320cfa 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -774,7 +774,7 @@ uno::Reference uno::XInterface
SwXServiceProvider::MakeInstance(sal_uInt16
case SW_SERVICE_FIELDMASTER_SET_EXP : nResId = RES_SETEXPFLD;
break;
case SW_SERVICE_FIELDMASTER_DATABASE: nResId = RES_DBFLD;
break;
}
-xRet = SwXFieldMaster::CreateXFieldMaster(*pDoc, 0, nResId);
+xRet = SwXFieldMaster::CreateXFieldMaster(pDoc, 0, nResId);
}
break;
case SW_SERVICE_FIELDMASTER_BIBLIOGRAPHY:
@@ -785,7 +785,7 @@ uno::Reference uno::XInterface
SwXServiceProvider::MakeInstance(sal_uInt16
SwAuthorityFieldType aType(pDoc);
pType = pDoc-getIDocumentFieldsAccess().InsertFldType(aType);
}
-xRet = SwXFieldMaster::CreateXFieldMaster(*pDoc, pType);
+xRet = SwXFieldMaster::CreateXFieldMaster(pDoc, pType);
}
break;
case SW_SERVICE_PARAGRAPH :
diff --git a/sw/source/core/unocore/unofield.cxx
b/sw/source/core/unocore/unofield.cxx
index 566381e..70efab2 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -540,7 +540,7 @@ SwXFieldMaster::~SwXFieldMaster()
}
uno::Referencebeans::XPropertySet
-SwXFieldMaster::CreateXFieldMaster(SwDoc rDoc, SwFieldType *const pType,
+SwXFieldMaster::CreateXFieldMaster(SwDoc * pDoc, SwFieldType *const pType,
sal_uInt16 nResId)
{
// re-use existing SwXFieldMaster
@@ -552,8 +552,8 @@ SwXFieldMaster::CreateXFieldMaster(SwDoc rDoc,
SwFieldType *const pType,
if (!xFM.is())
{
SwXFieldMaster *const pFM( (pType)
-? new SwXFieldMaster(*pType, rDoc)
-: new SwXFieldMaster( rDoc, nResId));
+? new SwXFieldMaster(*pType, *pDoc)
+: new SwXFieldMaster(pDoc, nResId));
xFM.set(pFM);
if (pType)
{
@@ -1309,7 +1309,7 @@ SwXTextField::getTextFieldMaster() throw
(uno::RuntimeException, std::exception)
}
uno::Referencebeans::XPropertySet const xRet(
-SwXFieldMaster::CreateXFieldMaster(*m_pImpl-m_pDoc, pType));
+SwXFieldMaster::CreateXFieldMaster(m_pImpl-m_pDoc, pType));
return xRet;
}
@@ -2758,7 +2758,7 @@ uno::Any SwXTextFieldMasters::getByName(const OUString
rName)
css::uno::Referencecss::uno::XInterface());
uno::Referencebeans::XPropertySet const xRet(
-SwXFieldMaster::CreateXFieldMaster(*GetDoc(), pType));
+SwXFieldMaster::CreateXFieldMaster(GetDoc(), pType));
return uno::makeAny(xRet);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/CppunitTest_sw_htmlexport.mk sw/qa sw/source
sw/CppunitTest_sw_htmlexport.mk |2 +
sw/qa/extras/htmlexport/data/skipimage-embedded.doc |binary
sw/qa/extras/htmlexport/htmlexport.cxx | 13 ++-
sw/source/filter/html/htmlplug.cxx | 36 ++--
4 files changed, 47 insertions(+), 4 deletions(-)
New commits:
commit 971ffe10583dcdd195f429816760bc0acfb6297f
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Mon Aug 25 14:44:48 2014 +0200
sw HTML export: avoid loosing embedded objects when skipping images
Change-Id: If795af5430b319922cd8242ca82352e148dd680b
diff --git a/sw/CppunitTest_sw_htmlexport.mk b/sw/CppunitTest_sw_htmlexport.mk
index 59afe0a..70a8c4a 100644
--- a/sw/CppunitTest_sw_htmlexport.mk
+++ b/sw/CppunitTest_sw_htmlexport.mk
@@ -53,6 +53,7 @@ $(eval $(call gb_CppunitTest_use_vcl,sw_htmlexport))
$(eval $(call gb_CppunitTest_use_components,sw_htmlexport,\
basic/util/sb \
+ canvas/source/factory/canvasfactory \
comphelper/util/comphelp \
configmgr/source/configmgr \
embeddedobj/util/embobj \
@@ -65,6 +66,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_htmlexport,\
linguistic/source/lng \
oox/util/oox \
package/source/xstor/xstor \
+ sc/util/sc \
package/util/package2 \
sax/source/expatwrap/expwrap \
sw/util/sw \
diff --git a/sw/qa/extras/htmlexport/data/skipimage-embedded.doc
b/sw/qa/extras/htmlexport/data/skipimage-embedded.doc
new file mode 100644
index 000..b4b57ec
Binary files /dev/null and
b/sw/qa/extras/htmlexport/data/skipimage-embedded.doc differ
diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx
b/sw/qa/extras/htmlexport/htmlexport.cxx
index 5fd15ab..6903522 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -46,7 +46,7 @@ private:
void preTest(const char* filename) SAL_OVERRIDE
{
-if (getTestName() == testExportOfImagesWithSkipImageEnabled)
+if (getTestName().indexOf(SkipImage) != -1)
setFilterOptions(SkipImages);
else
setFilterOptions();
@@ -134,6 +134,17 @@
DECLARE_HTMLEXPORT_TEST(testExportOfImagesWithSkipImageEnabled, textAndImage.do
assertXPath(pDoc, /html/body/p/img, 0);
}
+DECLARE_HTMLEXPORT_TEST(testSkipImageEmbedded, skipimage-embedded.doc)
+{
+// Embedded spreadsheet was exported as image, so content was lost. Make
+// sure it's exported as HTML instead.
+htmlDocPtr pDoc = parseHtml(maTempFile);
+CPPUNIT_ASSERT(pDoc);
+
+// This was 0.
+assertXPath(pDoc, //table, 1);
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/html/htmlplug.cxx
b/sw/source/filter/html/htmlplug.cxx
index b9ca200..3155db1 100644
--- a/sw/source/filter/html/htmlplug.cxx
+++ b/sw/source/filter/html/htmlplug.cxx
@@ -41,6 +41,8 @@
#include frmfmt.hxx
#include svl/ownlist.hxx
+#include unotools/mediadescriptor.hxx
+#include unotools/streamwrap.hxx
#include pam.hxx
#include doc.hxx
#include ndtxt.hxx
@@ -51,10 +53,12 @@
#include wrthtml.hxx
#include htmlfly.hxx
#include swcss1.hxx
+#include unoframe.hxx
#include com/sun/star/embed/XClassifiedObject.hpp
#include com/sun/star/embed/EmbedStates.hpp
#include com/sun/star/embed/Aspects.hpp
#include com/sun/star/beans/XPropertySet.hpp
+#include com/sun/star/frame/XStorable.hpp
#include comphelper/embeddedobjectcontainer.hxx
#include comphelper/classids.hxx
@@ -1249,9 +1253,6 @@ Writer OutHTML_FrmFmtOLENodeGrf( Writer rWrt, const
SwFrmFmt rFrmFmt,
{
SwHTMLWriter rHTMLWrt = static_castSwHTMLWriter(rWrt);
-if (rHTMLWrt.mbSkipImages)
-return rWrt;
-
const SwFmtCntnt rFlyCntnt = rFrmFmt.GetCntnt();
sal_uLong nStt = rFlyCntnt.GetCntntIdx()-GetIndex()+1;
SwOLENode *pOLENd = rHTMLWrt.pDoc-GetNodes()[ nStt ]-GetOLENode();
@@ -1260,6 +1261,35 @@ Writer OutHTML_FrmFmtOLENodeGrf( Writer rWrt, const
SwFrmFmt rFrmFmt,
if( !pOLENd )
return rWrt;
+if (rHTMLWrt.mbSkipImages)
+{
+// If we skip images, embedded objects would be completely lost.
+// Instead, try to use the HTML export of the embedded object.
+uno::Referencetext::XTextContent xTextContent =
SwXTextEmbeddedObject::CreateXTextEmbeddedObject(*rHTMLWrt.pDoc,
const_castSwFrmFmt*(rFrmFmt));
+uno::Referencedocument::XEmbeddedObjectSupplier2
xEmbeddedObjectSupplier(xTextContent, uno::UNO_QUERY);
+uno::Referenceframe::XStorable
xStorable(xEmbeddedObjectSupplier-getEmbeddedObject(), uno::UNO_QUERY);
+
+// Figure out what is the filter name of the embedded object.
+uno::Referencelang::XServiceInfo xServiceInfo(xStorable,
uno::UNO_QUERY);
+OUString aFilter;
+if
(xServiceInfo-supportsService(com.sun.star.sheet.SpreadsheetDocument))
+aFilter = HTML (StarCalc);
+
+if (!aFilter.isEmpty())
+{
+SvMemoryStream aStream;
+
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 V Stuart Foote vstuart.fo...@utsa.edu changed: What|Removed |Added Depends on||79546 --- Comment #215 from V Stuart Foote vstuart.fo...@utsa.edu --- adding bug 79546 - OSX - no video playback in slideshow fullscreen display mode on OSX 10.9 -- 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] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst|1 - source/text/swriter/01/04090006.xhp |2 +- 2 files changed, 1 insertion(+), 2 deletions(-) New commits: commit b1ba04f8f29b92d30d65968e6253d48fbcc168ac Author: Caolán McNamara caol...@redhat.com Date: Mon Aug 25 14:19:22 2014 +0100 update help ids for print merge querybox .ui conversion Change-Id: Ibe2bd1e3872d05cbff519fd0466231e080301085 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 0542f80..8009a63 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -2179,7 +2179,6 @@ HID_POPUP_FRAME,33840, HID_POPUP_LINE,33841, HID_POPUP_LINEEND,34072, HID_POPUP_LINEEND_CTRL,34073, -HID_PRINT_AS_MERGE,54949, HID_PRINT_OPTIONS,33124, HID_PROP_ALIGN,37816, HID_PROP_ALLOW_ADDITIONS,37784, diff --git a/source/text/swriter/01/04090006.xhp b/source/text/swriter/01/04090006.xhp index 13859ca..ada92b8 100644 --- a/source/text/swriter/01/04090006.xhp +++ b/source/text/swriter/01/04090006.xhp @@ -117,7 +117,7 @@ bookmark xml-lang=en-US branch=hid/modules/swriter/ui/flddbpage/format id=bm_id3150087 localize=false/ paragraph role=heading id=hd_id3146948 xml-lang=en-US level=3 l10n=U oldref=29List of user-defined formats/paragraph paragraph role=paragraph id=par_id3150093 xml-lang=en-US l10n=U oldref=30ahelp hid=modules/swriter/ui/flddbpage/formatLists the available user-defined formats./ahelp/paragraph -bookmark xml-lang=en-US branch=hid/SW_HID_PRINT_AS_MERGE id=bm_id1835383 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/swriter/ui/printmergedialog/PrintMergeDialog id=bm_id1835383 localize=false/ paragraph role=heading id=par_idN107FF xml-lang=en-US level=2 l10n=NEWPrinting a form letter/paragraph paragraph role=paragraph id=par_idN10803 xml-lang=en-US l10n=NEWahelp hid=.When you print a document that contains database fields, a dialog asks you if you want to print a form letter. If you answer Yes, the link href=text/swriter/01/0115.xhpMail Merge/link dialog opens where you can select the database records to print./ahelp/paragraph paragraph role=heading id=par_idN10812 xml-lang=en-US level=3 l10n=NEWDo not show warning again/paragraph ___ 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 6292bfc282c56ec4a9098989957c4cdfc6ef1e0f Author: Caolán McNamara caol...@redhat.com Date: Mon Aug 25 14:19:22 2014 +0100 Updated core Project: help b1ba04f8f29b92d30d65968e6253d48fbcc168ac diff --git a/helpcontent2 b/helpcontent2 index c124f21..b1ba04f 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit c124f21d9c10bd56bfe8c1b1e89a898c360372a0 +Subproject commit b1ba04f8f29b92d30d65968e6253d48fbcc168ac ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 2 commits - include/oox oox/source
include/oox/ppt/pptshape.hxx |7 +-
oox/source/ppt/pptgraphicshapecontext.cxx | 13 +---
oox/source/ppt/pptshape.cxx | 86 --
oox/source/ppt/pptshapecontext.cxx| 65 +++---
4 files changed, 89 insertions(+), 82 deletions(-)
New commits:
commit 00339e4245e01eb9934e7755a497330ba5f49e42
Author: Matúš Kukan matus.ku...@collabora.com
Date: Tue Aug 19 16:26:12 2014 +0200
bnc#880448: Improved handling of placeholder shapes
If subTitle placeholder is not found, try body instead of title.
And use body text styles instead of title, for subTitle.
Also improve PPTShape::findPlaceholder to find placeholder
with just nSecondSubType type without the same index.
(cherry picked from commit 2a7119021edea8346e4673d57cac3f051a5d0968)
Conflicts:
oox/source/ppt/pptshape.cxx
Change-Id: I470e7268088eb989fb934007dfcf704f67d8cb1d
Reviewed-on: https://gerrit.libreoffice.org/11065
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
(cherry picked from commit 092a3a093b11485cb3c951cb36b56ce08218f1e4)
diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx
index b5d595c..ec75ce9 100644
--- a/oox/source/ppt/pptshape.cxx
+++ b/oox/source/ppt/pptshape.cxx
@@ -90,12 +90,10 @@ oox::drawingml::TextListStylePtr
PPTShape::getSubTypeTextListStyle( const SlideP
{
case XML_ctrTitle :
case XML_title :
-case XML_subTitle :
pTextListStyle = rSlidePersist.getMasterPersist().get() ?
rSlidePersist.getMasterPersist()-getTitleTextStyle() :
rSlidePersist.getTitleTextStyle();
break;
+case XML_subTitle :
case XML_obj :
-pTextListStyle = rSlidePersist.getMasterPersist().get() ?
rSlidePersist.getMasterPersist()-getBodyTextStyle() :
rSlidePersist.getBodyTextStyle();
-break;
case XML_body :
if ( rSlidePersist.isNotesPage() )
pTextListStyle = rSlidePersist.getMasterPersist().get() ?
rSlidePersist.getMasterPersist()-getNotesTextStyle() :
rSlidePersist.getNotesTextStyle();
@@ -149,7 +147,7 @@ void PPTShape::addShape(
sServiceName = OUString();
else {
sServiceName =
com.sun.star.presentation.SubtitleShape;
-aMasterTextListStyle =
rSlidePersist.getMasterPersist().get() ?
rSlidePersist.getMasterPersist()-getTitleTextStyle() :
rSlidePersist.getTitleTextStyle();
+aMasterTextListStyle =
rSlidePersist.getMasterPersist().get() ?
rSlidePersist.getMasterPersist()-getBodyTextStyle() :
rSlidePersist.getBodyTextStyle();
}
}
break;
@@ -392,7 +390,8 @@ namespace
// 1. ph with nFirstSubType and the same oSubTypeIndex
// 2. ph with nFirstSubType
// 3. ph with nSecondSubType and the same oSubTypeIndex
-// 4. ph with the same oSubTypeIndex
+// 4. ph with nSecondSubType
+// 5. ph with the same oSubTypeIndex
oox::drawingml::ShapePtr PPTShape::findPlaceholder( sal_Int32 nFirstSubType,
sal_Int32 nSecondSubType,
const OptValue sal_Int32 oSubTypeIndex, std::vector
oox::drawingml::ShapePtr rShapes, bool bMasterOnly )
{
@@ -400,6 +399,7 @@ oox::drawingml::ShapePtr PPTShape::findPlaceholder(
sal_Int32 nFirstSubType, sal
oox::drawingml::ShapePtr aChoiceShapePtr1;
oox::drawingml::ShapePtr aChoiceShapePtr2;
oox::drawingml::ShapePtr aChoiceShapePtr3;
+oox::drawingml::ShapePtr aChoiceShapePtr4;
std::vector oox::drawingml::ShapePtr ::reverse_iterator aRevIter(
rShapes.rbegin() );
while (aRevIter != rShapes.rend())
{
@@ -414,27 +414,31 @@ oox::drawingml::ShapePtr PPTShape::findPlaceholder(
sal_Int32 nFirstSubType, sal
}
else if ((*aRevIter)-getSubType() == nSecondSubType
!aChoiceShapePtr2.get())
aChoiceShapePtr2 = *aRevIter;
-else if (!aChoiceShapePtr3.get())
-aChoiceShapePtr3 = *aRevIter;
+else if (!aChoiceShapePtr4.get())
+aChoiceShapePtr4 = *aRevIter;
}
else if ((*aRevIter)-getSubType() == nFirstSubType
!aChoiceShapePtr1.get())
aChoiceShapePtr1 = *aRevIter;
+else if ((*aRevIter)-getSubType() == nSecondSubType
!aChoiceShapePtr3.get())
+aChoiceShapePtr3 = *aRevIter;
}
std::vector oox::drawingml::ShapePtr rChildren =
(*aRevIter)-getChildren();
-aChoiceShapePtr3 = findPlaceholder( nFirstSubType, nSecondSubType,
oSubTypeIndex, rChildren, bMasterOnly );
-if (aChoiceShapePtr3.get())
+aChoiceShapePtr4 = findPlaceholder( nFirstSubType, nSecondSubType,
oSubTypeIndex, rChildren, bMasterOnly );
+if (aChoiceShapePtr4.get())
[Libreoffice-commits] core.git: sw/source
sw/source/core/inc/unofield.hxx |2 +-
sw/source/core/unocore/unofield.cxx | 12 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 39380c04a5de4b56da566c139944b387a4ec133a
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Aug 25 15:26:54 2014 +0200
Avoid unnecessary dereferencing of potential null pointers
That pDoc can be null here and in previous
2406562733f62b96dd8e6537e1bf4bef147ef50c is somewhat fishy, but probably
related
to NOTE: the sw.SwXAutoTextEntry unoapi test depends on pDoc = 0 from
fdo#72695: avoid double-free race condition for SwXTextField. As mstahl
puts
it: hmm... theres some stupid unoapi test that inserts a field into an
SwXAutoTextEntry which is a horribly odd class that doesn't have any way of
creating SwXanything of its own SwDoc... so probably your commit is required
after all.
Change-Id: I2da77e1180e205eca274ce0330ee2a4d5aab29ac
diff --git a/sw/source/core/inc/unofield.hxx b/sw/source/core/inc/unofield.hxx
index fb8582c..78415a4 100644
--- a/sw/source/core/inc/unofield.hxx
+++ b/sw/source/core/inc/unofield.hxx
@@ -56,7 +56,7 @@ private:
virtual ~SwXFieldMaster();
-SwXFieldMaster(SwFieldType rType, SwDoc rDoc);
+SwXFieldMaster(SwFieldType rType, SwDoc * pDoc);
/// descriptor
SwXFieldMaster(SwDoc* pDoc, sal_uInt16 nResId);
diff --git a/sw/source/core/unocore/unofield.cxx
b/sw/source/core/unocore/unofield.cxx
index 70efab2..e59fd8d 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -435,10 +435,10 @@ public:
sal_Int32 m_nParam2;
Impl(SwModify *const pModify,
-SwDoc rDoc, sal_uInt16 const nResId, bool const bIsDescriptor)
+SwDoc * pDoc, sal_uInt16 const nResId, bool const bIsDescriptor)
: SwClient(pModify)
, m_EventListeners(m_Mutex)
-, m_pDoc( rDoc)
+, m_pDoc(pDoc)
, m_bIsDescriptor(bIsDescriptor)
, m_nResTypeId(nResId)
, m_fParam1(0.0)
@@ -526,12 +526,12 @@ SwXFieldMaster::getSupportedServiceNames() throw
(uno::RuntimeException, std::ex
SwXFieldMaster::SwXFieldMaster(SwDoc *const pDoc, sal_uInt16 const nResId)
: m_pImpl(new
Impl(pDoc-getIDocumentStylePoolAccess().GetPageDescFromPool(RES_POOLPAGE_STANDARD),
-*pDoc, nResId, true))
+pDoc, nResId, true))
{
}
-SwXFieldMaster::SwXFieldMaster(SwFieldType rType, SwDoc rDoc)
-: m_pImpl(new Impl(rType, rDoc, rType.Which(), false))
+SwXFieldMaster::SwXFieldMaster(SwFieldType rType, SwDoc * pDoc)
+: m_pImpl(new Impl(rType, pDoc, rType.Which(), false))
{
}
@@ -552,7 +552,7 @@ SwXFieldMaster::CreateXFieldMaster(SwDoc * pDoc,
SwFieldType *const pType,
if (!xFM.is())
{
SwXFieldMaster *const pFM( (pType)
-? new SwXFieldMaster(*pType, *pDoc)
+? new SwXFieldMaster(*pType, pDoc)
: new SwXFieldMaster(pDoc, nResId));
xFM.set(pFM);
if (pType)
___
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/layout/frmtool.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d66159c61a84b2da7d5d9d341c08aad6b33c4c7b Author: Stephan Bergmann sberg...@redhat.com Date: Mon Aug 25 15:37:13 2014 +0200 Remove unnecessary invalid downcast Change-Id: I53a9e864f01782cef10f2995ba90335f5c81077a diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx index aabdd39..e1cf3f4 100644 --- a/sw/source/core/layout/frmtool.cxx +++ b/sw/source/core/layout/frmtool.cxx @@ -2538,7 +2538,7 @@ void RestoreCntnt( SwFrm *pSav, SwLayoutFrm *pParent, SwFrm *pSibling, bool bGro pNxt = pSibling-mpNext; pSibling-mpNext = pSav; pSibling-_InvalidatePrt(); -((SwCntntFrm*)pSibling)-InvalidatePage( pPage ); +pSibling-InvalidatePage( pPage ); if ( ((SwCntntFrm*)pSibling)-GetFollow() ) pSibling-Prepare( PREP_CLEAR, 0, false ); } ___ 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/layout/frmtool.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0dd209b08189f1da6ccc80984f195baa1abb303c Author: Stephan Bergmann sberg...@redhat.com Date: Mon Aug 25 15:58:09 2014 +0200 Properly downcast to any type of SwFlowFrm, not just SwCntntFrm Change-Id: I6b3ade33c282823f4868c1fea5906d71eaeb5568 diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx index e1cf3f4..7eca28a 100644 --- a/sw/source/core/layout/frmtool.cxx +++ b/sw/source/core/layout/frmtool.cxx @@ -2539,7 +2539,7 @@ void RestoreCntnt( SwFrm *pSav, SwLayoutFrm *pParent, SwFrm *pSibling, bool bGro pSibling-mpNext = pSav; pSibling-_InvalidatePrt(); pSibling-InvalidatePage( pPage ); -if ( ((SwCntntFrm*)pSibling)-GetFollow() ) +if ( dynamic_castSwFlowFrm*(pSibling)-GetFollow() ) pSibling-Prepare( PREP_CLEAR, 0, false ); } else ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 Bug 75025 depends on bug 80755, which changed state. Bug 80755 Summary: StartCenter displays thumbnails of password-protected files https://bugs.freedesktop.org/show_bug.cgi?id=80755 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: svx/source
svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit bb11009aba7a12dd23da4e0f64008c1063fc6652
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Aug 25 16:11:32 2014 +0200
Remove unnecessary invalid downcasts
Change-Id: I04a6fa07ef4dfd2609b466c7c8ff9ba925c9683c
diff --git a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
index 00185bf..e62086d 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
@@ -629,14 +629,14 @@ public:
else if ( mpSecondArg-isConstant() (*mpSecondArg)() ==
1 )
aRet = mpFirstArg-fillNode( rEquations, NULL, nFlags
);
else if ( ( mpFirstArg-getType() == BINARY_FUNC_DIV )
// don't care of (pi/180)
- (
((BinaryFunctionExpression*)((BinaryFunctionExpression*)mpFirstArg.get())-mpFirstArg.get())-getType()
== ENUM_FUNC_PI )
- (
((BinaryFunctionExpression*)((BinaryFunctionExpression*)mpFirstArg.get())-mpSecondArg.get())-getType()
== FUNC_CONST ) )
+ (
((BinaryFunctionExpression*)mpFirstArg.get())-mpFirstArg.get()-getType() ==
ENUM_FUNC_PI )
+ (
((BinaryFunctionExpression*)mpFirstArg.get())-mpSecondArg.get()-getType() ==
FUNC_CONST ) )
{
aRet = mpSecondArg-fillNode( rEquations, NULL, nFlags
);
}
else if ( ( mpSecondArg-getType() == BINARY_FUNC_DIV )
// don't care of (pi/180)
- (
((BinaryFunctionExpression*)((BinaryFunctionExpression*)mpSecondArg.get())-mpFirstArg.get())-getType()
== ENUM_FUNC_PI )
- (
((BinaryFunctionExpression*)((BinaryFunctionExpression*)mpSecondArg.get())-mpSecondArg.get())-getType()
== FUNC_CONST ) )
+ (
((BinaryFunctionExpression*)mpSecondArg.get())-mpFirstArg.get()-getType() ==
ENUM_FUNC_PI )
+ (
((BinaryFunctionExpression*)mpSecondArg.get())-mpSecondArg.get()-getType() ==
FUNC_CONST ) )
{
aRet = mpFirstArg-fillNode( rEquations, NULL, nFlags
);
}
___
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/view/viewfun6.cxx | 48 +++--
1 file changed, 23 insertions(+), 25 deletions(-)
New commits:
commit c6477b9dd1564a0b3e8c63fea489f7ad464e3792
Author: Eike Rathke er...@redhat.com
Date: Mon Aug 25 16:17:12 2014 +0200
nitpick no need for an extra indentation level
Change-Id: Id7ab390cc28e83ac0ca6b9fff1c172ca46e88a68
diff --git a/sc/source/ui/view/viewfun6.cxx b/sc/source/ui/view/viewfun6.cxx
index b2494c1..838b82c 100644
--- a/sc/source/ui/view/viewfun6.cxx
+++ b/sc/source/ui/view/viewfun6.cxx
@@ -399,32 +399,30 @@ void ScViewFunc::InsertCurrentTime(short nReqFmt, const
OUString rUndoStr)
}
break;
case NUMBERFORMAT_DATETIME:
+switch (nCurNumFormatType)
{
-switch (nCurNumFormatType)
-{
-case NUMBERFORMAT_DATE:
-{
-double fDate = rtl::math::approxFloor( fCell);
-Time aActTime( Time::SYSTEM );
-fVal = fDate + aActTime.GetTimeInDays();
-}
-break;
-case NUMBERFORMAT_TIME:
-{
-double fTime = fCell - rtl::math::approxFloor(
fCell);
-Date aActDate( Date::SYSTEM );
-fVal = (aActDate - *pFormatter-GetNullDate())
+ fTime;
-}
-break;
-default:
-{
-DateTime aActDateTime( DateTime::SYSTEM );
-// Converting the null date to DateTime forces
the
-// correct operator-() to be used, resulting
in a
-// fractional date+time instead of only date
value.
-fVal = aActDateTime - DateTime(
*pFormatter-GetNullDate());
-}
-}
+case NUMBERFORMAT_DATE:
+{
+double fDate = rtl::math::approxFloor( fCell);
+Time aActTime( Time::SYSTEM );
+fVal = fDate + aActTime.GetTimeInDays();
+}
+break;
+case NUMBERFORMAT_TIME:
+{
+double fTime = fCell - rtl::math::approxFloor(
fCell);
+Date aActDate( Date::SYSTEM );
+fVal = (aActDate - *pFormatter-GetNullDate()) +
fTime;
+}
+break;
+default:
+{
+DateTime aActDateTime( DateTime::SYSTEM );
+// Converting the null date to DateTime forces the
+// correct operator-() to be used, resulting in a
+// fractional date+time instead of only date value.
+fVal = aActDateTime - DateTime(
*pFormatter-GetNullDate());
+}
}
break;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 76291] FILESAVE: Chinese hyperlinks modified upon Saving
https://bugs.freedesktop.org/show_bug.cgi?id=76291 Matthew Francis fdb...@neosheffield.co.uk changed: What|Removed |Added Blocks||83066 -- 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: cui/source include/svx sd/source svx/source
cui/source/tabpages/transfrm.cxx |4 ++--
include/svx/sderitm.hxx| 11 +++
sd/source/ui/func/fuconrec.cxx |2 +-
svx/source/sdr/contact/viewcontactofsdrrectobj.cxx |2 +-
svx/source/svdraw/svdattr.cxx |2 +-
svx/source/svdraw/svdedtv1.cxx |8
svx/source/svdraw/svdfmtf.cxx |2 +-
svx/source/svdraw/svdotext.cxx |4 ++--
8 files changed, 15 insertions(+), 20 deletions(-)
New commits:
commit e0c2ea6bde31bd68e1794154b72fddcd40dda7f9
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Aug 25 17:25:18 2014 +0200
Consistency around SdrMetricItem in svx/sderitm.hxx
...similar to what has been done for svx/sdtmfitm.hxx in
6a2ea81ca1622d2c2ad55bea8ddc28167fcc2794 Remove unused ctors and
68969cc61adecac481ae9656978ef952f435b310 Consistency around SdrMetricItem.
Change-Id: I4a0715b18bc3aa032779252cad2450c905a467a4
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index fdc4d4e..42b441e 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -479,7 +479,7 @@ bool SvxSlantTabPage::FillItemSet(SfxItemSet* rAttrs)
long nTmp = GetCoreValue( *m_pMtrRadius, ePoolUnit );
nTmp = Fraction( nTmp ) * aUIScale;
-rAttrs-Put( SdrEckenradiusItem( nTmp ) );
+rAttrs-Put( makeSdrEckenradiusItem( nTmp ) );
bModified = true;
}
@@ -528,7 +528,7 @@ void SvxSlantTabPage::Reset(const SfxItemSet* rAttrs)
if( pItem )
{
const double fUIScale(double(pView-GetModel()-GetUIScale()));
-const double fTmp((double)((const
SdrEckenradiusItem*)pItem)-GetValue() / fUIScale);
+const double fTmp((double)((const
SdrMetricItem*)pItem)-GetValue() / fUIScale);
SetMetricValue(*m_pMtrRadius, basegfx::fround(fTmp), ePoolUnit);
}
else
diff --git a/include/svx/sderitm.hxx b/include/svx/sderitm.hxx
index a6a22ec..ad03621 100644
--- a/include/svx/sderitm.hxx
+++ b/include/svx/sderitm.hxx
@@ -22,14 +22,9 @@
#include svx/sdmetitm.hxx
#include svx/svddef.hxx
-/**
- * class SdrEckenradiusItem
- */
-class SdrEckenradiusItem: public SdrMetricItem {
-public:
-SdrEckenradiusItem(long nRadius=0):
SdrMetricItem(SDRATTR_ECKENRADIUS,nRadius) {}
-SdrEckenradiusItem(SvStream rIn) : SdrMetricItem(SDRATTR_ECKENRADIUS,rIn)
{}
-};
+inline SdrMetricItem makeSdrEckenradiusItem(long nRadius) {
+return SdrMetricItem(SDRATTR_ECKENRADIUS, nRadius);
+}
#endif
diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx
index ebd76dbc..ced9706 100644
--- a/sd/source/ui/func/fuconrec.cxx
+++ b/sd/source/ui/func/fuconrec.cxx
@@ -431,7 +431,7 @@ void FuConstructRectangle::SetAttributes(SfxItemSet rAttr,
SdrObject* pObj)
nSlotId == SID_DRAW_SQUARE_ROUND_NOFILL)
{
// round corner
-rAttr.Put(SdrEckenradiusItem(500));
+rAttr.Put(makeSdrEckenradiusItem(500));
}
else if (nSlotId == SID_CONNECTOR_LINE ||
nSlotId == SID_CONNECTOR_LINE_ARROW_START ||
diff --git a/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx
b/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx
index 8a02658..2ab0173 100644
--- a/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx
@@ -71,7 +71,7 @@ namespace sdr
aObjectRange.getMinX(), aObjectRange.getMinY()));
// calculate corner radius
-sal_uInt32
nCornerRadius(((SdrEckenradiusItem)(rItemSet.Get(SDRATTR_ECKENRADIUS))).GetValue());
+sal_uInt32
nCornerRadius(((SdrMetricItem)(rItemSet.Get(SDRATTR_ECKENRADIUS))).GetValue());
double fCornerRadiusX;
double fCornerRadiusY;
drawinglayer::primitive2d::calculateRelativeCornerRadius(nCornerRadius,
aObjectRange, fCornerRadiusX, fCornerRadiusY);
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index dc43119..4dd3f77 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -139,7 +139,7 @@ SdrItemPool::SdrItemPool(
mppLocalPoolDefaults[SDRATTR_CAPTIONESCABS-SDRATTR_START]=new
SdrCaptionEscAbsItem;
mppLocalPoolDefaults[SDRATTR_CAPTIONLINELEN -SDRATTR_START]=new
SdrCaptionLineLenItem ;
mppLocalPoolDefaults[SDRATTR_CAPTIONFITLINELEN-SDRATTR_START]=new
SdrCaptionFitLineLenItem;
-mppLocalPoolDefaults[SDRATTR_ECKENRADIUS-SDRATTR_START]=new
SdrEckenradiusItem;
+mppLocalPoolDefaults[SDRATTR_ECKENRADIUS-SDRATTR_START]=new
SdrMetricItem(SDRATTR_ECKENRADIUS, 0);
mppLocalPoolDefaults[SDRATTR_TEXT_MINFRAMEHEIGHT-SDRATTR_START]=new
SdrMetricItem(SDRATTR_TEXT_MINFRAMEHEIGHT, 0);
mppLocalPoolDefaults[SDRATTR_TEXT_AUTOGROWHEIGHT
[Libreoffice-commits] core.git: 25 commits - basctl/AllLangResTarget_basctl.mk basctl/source basctl/uiconfig basctl/UIConfig_basicide.mk bin/count-todo-dialogs dbaccess/source dbaccess/uiconfig dbacce
basctl/AllLangResTarget_basctl.mk |1 basctl/UIConfig_basicide.mk|1 basctl/source/dlged/dlgresid.src |5 basctl/source/dlged/managelang.cxx |6 basctl/source/dlged/managelang.src | 30 basctl/source/inc/dlgresid.hrc |7 - basctl/uiconfig/basicide/ui/deletelangdialog.ui| 36 + bin/count-todo-dialogs |4 dbaccess/UIConfig_dbaccess.mk |5 dbaccess/source/ui/browser/brwctrlr.cxx|5 dbaccess/source/ui/browser/sbabrw.src |7 - dbaccess/source/ui/dlg/indexdialog.cxx |4 dbaccess/source/ui/dlg/indexdialog.src | 10 - dbaccess/source/ui/inc/dbu_resource.hrc|8 - dbaccess/source/ui/relationdesign/RelationController.cxx |5 dbaccess/source/ui/relationdesign/relation.src |7 - dbaccess/source/ui/tabledesign/TableController.cxx |6 dbaccess/source/ui/tabledesign/table.src | 14 -- dbaccess/uiconfig/ui/deleteallrowsdialog.ui| 82 dbaccess/uiconfig/ui/designsavemodifieddialog.ui | 83 dbaccess/uiconfig/ui/saveindexdialog.ui| 83 dbaccess/uiconfig/ui/savemodifieddialog.ui | 83 dbaccess/uiconfig/ui/tabledesignsavemodifieddialog.ui | 83 desktop/UIConfig_deployment.mk |1 desktop/source/app/desktop.hrc |3 desktop/source/app/desktop.src |6 desktop/source/app/lockfile2.cxx |9 - desktop/source/deployment/gui/dp_gui.hrc | 22 +-- desktop/source/deployment/gui/dp_gui_dialog.src| 42 +- desktop/source/deployment/gui/dp_gui_dialog2.cxx | 53 ++-- desktop/source/deployment/gui/dp_gui_dialog2.src |7 - desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx | 20 +-- desktop/source/deployment/gui/dp_gui_updatedialog.src | 10 - desktop/source/deployment/gui/dp_gui_versionboxes.src | 26 +-- desktop/uiconfig/ui/installforalldialog.ui | 83 editeng/source/misc/lingu.src | 13 - editeng/source/misc/splwrap.cxx| 11 - filter/source/pdf/impdialog.cxx|6 filter/source/pdf/impdialog.hrc|2 filter/source/pdf/impdialog.src|5 include/editeng/editrids.hrc |6 include/svtools/svtools.hrc| 25 +-- include/svx/fmresids.hrc |5 include/tools/rcid.h |5 include/vcl/msgbox.hxx |6 rsc/inc/rscdb.hxx |5 rsc/source/parser/rscibas.cxx | 28 rsc/source/parser/rscicpx.cxx | 32 rsc/source/parser/rscinit.cxx | 25 --- sfx2/source/appl/app.hrc |2 sfx2/source/appl/app.src |6 sfx2/source/appl/appopen.cxx |6 svtools/UIConfig_svt.mk|1 svtools/source/java/javaerror.src | 34 + svtools/source/java/javainteractionhandler.cxx | 15 +- svtools/uiconfig/ui/javadisableddialog.ui | 85 + svx/UIConfig_svx.mk|2 svx/source/form/datanavi.cxx | 13 - svx/source/form/datanavi.src | 11 - svx/source/form/fmshell.cxx|5 svx/source/form/fmstring.src |6 svx/source/inc/datanavi.hxx|3 svx/uiconfig/ui/formlinkwarndialog.ui | 71 ++ svx/uiconfig/ui/savemodifieddialog.ui | 85 + sw/UIConfig_swriter.mk |2 sw/inc/comcore.hrc |1 sw/inc/helpid.h|1 sw/source/core/crsr/viscrs.cxx |5 sw/source/ui/app/app.src | 15 -- sw/source/uibase/inc/app.hrc |1 sw/source/uibase/uiview/viewprt.cxx|
[Libreoffice-commits] core.git: sc/source sw/qa sw/source
sc/source/filter/html/htmlexp.cxx | 19 ---
sc/source/filter/inc/htmlexp.hxx |2 ++
sw/qa/extras/htmlexport/htmlexport.cxx |2 ++
sw/source/filter/html/htmlplug.cxx |1 +
4 files changed, 21 insertions(+), 3 deletions(-)
New commits:
commit 1ee98159f7749b2c1ad47de60a9b3057b9e9720e
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Mon Aug 25 16:12:33 2014 +0200
HTML export: avoid invalid output for embedded spreadsheets
When the sc document is embedded inside an sw one, then the sc HTML
export should just write what's inside the body. Add a filter option
for that in sc and use it from sw.
Change-Id: I3a9605bd62f0628b78cd782c11661f12bc2c3ae4
diff --git a/sc/source/filter/html/htmlexp.cxx
b/sc/source/filter/html/htmlexp.cxx
index 7104f60..f9facfc 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -210,7 +210,8 @@ ScHTMLExport::ScHTMLExport( SvStream rStrmP, const
OUString rBaseURL, ScDocume
bCalcAsShown( pDocP-GetDocOptions().IsCalcAsShown() ),
bTableDataWidth( true ),
bTableDataHeight( true ),
-mbSkipImages ( false )
+mbSkipImages ( false ),
+mbSkipHeaderFooter( false )
{
strcpy( sIndent, sIndentSource );
sIndent[0] = 0;
@@ -224,6 +225,10 @@ ScHTMLExport::ScHTMLExport( SvStream rStrmP, const
OUString rBaseURL, ScDocume
{
mbSkipImages = true;
}
+else if (rFilterOptions == SkipHeaderFooter)
+{
+mbSkipHeaderFooter = true;
+}
for ( sal_uInt16 j=0; j SC_HTML_FONTSIZES; j++ )
{
@@ -306,14 +311,18 @@ Size ScHTMLExport::MMToPixel( const Size rSize )
sal_uLong ScHTMLExport::Write()
{
+if (!mbSkipHeaderFooter)
+{
rStrm.WriteChar( '' ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_doctype
).WriteChar( ' ' ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_doctype40 ).WriteChar(
'' )
.WriteCharPtr( SAL_NEWLINE_STRING ).WriteCharPtr( SAL_NEWLINE_STRING );
TAG_ON_LF( OOO_STRING_SVTOOLS_HTML_html );
WriteHeader();
OUT_LF();
+}
WriteBody();
OUT_LF();
-TAG_OFF_LF( OOO_STRING_SVTOOLS_HTML_html );
+if (!mbSkipHeaderFooter)
+TAG_OFF_LF( OOO_STRING_SVTOOLS_HTML_html );
return rStrm.GetError();
}
@@ -544,6 +553,8 @@ void ScHTMLExport::WriteBody()
const SvxBrushItem* pBrushItem = (const SvxBrushItem*)rSet.Get(
ATTR_BACKGROUND );
// default text color black
+if (!mbSkipHeaderFooter)
+{
rStrm.WriteChar( '' ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_body );
if (!mbSkipImages)
@@ -608,13 +619,15 @@ void ScHTMLExport::WriteBody()
}
rStrm.WriteChar( '' ); OUT_LF();
+}
if ( bAll )
WriteOverview();
WriteTables();
-TAG_OFF_LF( OOO_STRING_SVTOOLS_HTML_body );
+if (!mbSkipHeaderFooter)
+TAG_OFF_LF( OOO_STRING_SVTOOLS_HTML_body );
}
void ScHTMLExport::WriteTables()
diff --git a/sc/source/filter/inc/htmlexp.hxx b/sc/source/filter/inc/htmlexp.hxx
index 8f70b0d..6120906 100644
--- a/sc/source/filter/inc/htmlexp.hxx
+++ b/sc/source/filter/inc/htmlexp.hxx
@@ -125,6 +125,8 @@ class ScHTMLExport : public ScExportBase
bool bTableDataWidth;
bool bTableDataHeight;
bool mbSkipImages;
+/// If HTML header and footer should be written as well, or just the
content itself.
+bool mbSkipHeaderFooter;
const SfxItemSet PageDefaults( SCTAB nTab );
diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx
b/sw/qa/extras/htmlexport/htmlexport.cxx
index 6903522..82d6cd4 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -143,6 +143,8 @@ DECLARE_HTMLEXPORT_TEST(testSkipImageEmbedded,
skipimage-embedded.doc)
// This was 0.
assertXPath(pDoc, //table, 1);
+// This was 2, the HTML header was in the document two times.
+assertXPath(pDoc, //meta[@name='generator'], 1);
}
#endif
diff --git a/sw/source/filter/html/htmlplug.cxx
b/sw/source/filter/html/htmlplug.cxx
index 3155db1..3705a07 100644
--- a/sw/source/filter/html/htmlplug.cxx
+++ b/sw/source/filter/html/htmlplug.cxx
@@ -1281,6 +1281,7 @@ Writer OutHTML_FrmFmtOLENodeGrf( Writer rWrt, const
SwFrmFmt rFrmFmt,
uno::Referenceio::XOutputStream xOutputStream(new
utl::OStreamWrapper(aStream));
utl::MediaDescriptor aMediaDescriptor;
aMediaDescriptor[FilterName] = aFilter;
+aMediaDescriptor[FilterOptions] = OUString(SkipHeaderFooter);
aMediaDescriptor[OutputStream] = xOutputStream;
xStorable-storeToURL(private:stream,
aMediaDescriptor.getAsConstPropertyValueList());
OString aData(reinterpret_castconst char*(aStream.GetData()),
aStream.GetSize());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
[Libreoffice-commits] core.git: sc/source
sc/source/filter/html/htmlexp.cxx | 110 +++---
1 file changed, 55 insertions(+), 55 deletions(-)
New commits:
commit c64945bcb9a69a2c4f69c673fa1935d91f70b238
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Mon Aug 25 17:50:29 2014 +0200
sc HTML export: indent conditional block
Change-Id: Ia96d201ce10fcb58b213b709506a54760c053643
diff --git a/sc/source/filter/html/htmlexp.cxx
b/sc/source/filter/html/htmlexp.cxx
index f9facfc..3b1cf12 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -313,11 +313,11 @@ sal_uLong ScHTMLExport::Write()
{
if (!mbSkipHeaderFooter)
{
-rStrm.WriteChar( '' ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_doctype
).WriteChar( ' ' ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_doctype40 ).WriteChar(
'' )
- .WriteCharPtr( SAL_NEWLINE_STRING ).WriteCharPtr( SAL_NEWLINE_STRING );
-TAG_ON_LF( OOO_STRING_SVTOOLS_HTML_html );
-WriteHeader();
-OUT_LF();
+rStrm.WriteChar( '' ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_doctype
).WriteChar( ' ' ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_doctype40 ).WriteChar(
'' )
+ .WriteCharPtr( SAL_NEWLINE_STRING ).WriteCharPtr(
SAL_NEWLINE_STRING );
+TAG_ON_LF( OOO_STRING_SVTOOLS_HTML_html );
+WriteHeader();
+OUT_LF();
}
WriteBody();
OUT_LF();
@@ -555,70 +555,70 @@ void ScHTMLExport::WriteBody()
// default text color black
if (!mbSkipHeaderFooter)
{
-rStrm.WriteChar( '' ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_body );
+rStrm.WriteChar( '' ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_body );
-if (!mbSkipImages)
-{
-if ( bAll GPOS_NONE != pBrushItem-GetGraphicPos() )
+if (!mbSkipImages)
{
-OUString aLink = pBrushItem-GetGraphicLink();
-OUString aGrfNm;
-
-// Embedded graphic - write using WriteGraphic
-if( aLink.isEmpty() )
+if ( bAll GPOS_NONE != pBrushItem-GetGraphicPos() )
{
-const Graphic* pGrf = pBrushItem-GetGraphic();
-if( pGrf )
+OUString aLink = pBrushItem-GetGraphicLink();
+OUString aGrfNm;
+
+// Embedded graphic - write using WriteGraphic
+if( aLink.isEmpty() )
{
-// Save graphic as (JPG) file
-aGrfNm = aStreamPath;
-sal_uInt16 nErr = XOutBitmap::WriteGraphic( *pGrf, aGrfNm,
-JPG, XOUTBMP_USE_NATIVE_IF_POSSIBLE );
-if( !nErr ) // Contains errors, as we have nothing to
output
+const Graphic* pGrf = pBrushItem-GetGraphic();
+if( pGrf )
{
-aGrfNm = URIHelper::SmartRel2Abs(
-INetURLObject(aBaseURL),
-aGrfNm, URIHelper::GetMaybeFileHdl(), true,
false);
+// Save graphic as (JPG) file
+aGrfNm = aStreamPath;
+sal_uInt16 nErr = XOutBitmap::WriteGraphic( *pGrf,
aGrfNm,
+JPG, XOUTBMP_USE_NATIVE_IF_POSSIBLE );
+if( !nErr ) // Contains errors, as we have nothing to
output
+{
+aGrfNm = URIHelper::SmartRel2Abs(
+INetURLObject(aBaseURL),
+aGrfNm, URIHelper::GetMaybeFileHdl(),
true, false);
+if ( HasCId() )
+MakeCIdURL( aGrfNm );
+aLink = aGrfNm;
+}
+}
+}
+else
+{
+aGrfNm = aLink;
+if( bCopyLocalFileToINet || HasCId() )
+{
+CopyLocalFileToINet( aGrfNm, aStreamPath );
if ( HasCId() )
MakeCIdURL( aGrfNm );
-aLink = aGrfNm;
}
+else
+aGrfNm = URIHelper::SmartRel2Abs(
+INetURLObject(aBaseURL),
+aGrfNm, URIHelper::GetMaybeFileHdl(), true,
false);
+aLink = aGrfNm;
}
-}
-else
-{
-aGrfNm = aLink;
-if( bCopyLocalFileToINet || HasCId() )
+if( !aLink.isEmpty() )
{
-CopyLocalFileToINet( aGrfNm, aStreamPath );
-if ( HasCId() )
-MakeCIdURL( aGrfNm );
+rStrm.WriteChar( ' ' ).WriteCharPtr(
OOO_STRING_SVTOOLS_HTML_O_background ).WriteCharPtr( =\ );
+OUT_STR(
[Libreoffice-commits] core.git: Branch 'feature/chart_opengl_window' - chart2/source
chart2/source/controller/main/ChartWindow.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f437b86023a472c1c97c285bf6630be39cecd7d4
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Mon Aug 25 18:43:06 2014 +0200
CHART_DUMMY_FACTORY should not control the OpenGL window
Change-Id: Ic6c640f7d37606b357672f2b73f95d51d1daba67
diff --git a/chart2/source/controller/main/ChartWindow.cxx
b/chart2/source/controller/main/ChartWindow.cxx
index fc0aab9..4b7ea3a 100644
--- a/chart2/source/controller/main/ChartWindow.cxx
+++ b/chart2/source/controller/main/ChartWindow.cxx
@@ -49,7 +49,7 @@ ChartWindow::ChartWindow( ChartController* pController,
Window* pParent, WinBits
: Window(pParent, nStyle)
, m_pWindowController( pController )
, m_bInPaint(false)
-, m_pOpenGLWindow(getenv(CHART_DUMMY_FACTORY) ? new
OpenGLWindow(this) : 0)
+, m_pOpenGLWindow(new OpenGLWindow(this))
{
this-SetHelpId( HID_SCH_WIN_DOCUMENT );
this-SetMapMode( MapMode(MAP_100TH_MM) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/chart_opengl_window' - chart2/source
chart2/source/view/main/ChartView.cxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit b056d3d0bedcb23786841c89d3029df37da0ba3e
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Mon Aug 25 19:03:27 2014 +0200
Revert Stop flickering in rendering of charts in Writer
Hide when it's actually a normal chart.
This reverts commit b79b862927d937d695b31df4bdb85d1fc8774f39.
Change-Id: Ib7aee142cea979293864f3916eb0580a82605b2b
diff --git a/chart2/source/view/main/ChartView.cxx
b/chart2/source/view/main/ChartView.cxx
index 07e6c281..8665d45 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -2496,6 +2496,11 @@ void ChartView::createShapes()
else
{
m_pGL3DPlotter.reset();
+
+// hide OpenGL window for now in normal charts
+OpenGLWindow* pWindow = mrChartModel.getOpenGLWindow();
+if(pWindow !getenv(CHART_DUMMY_FACTORY))
+pWindow-Show(false);
}
#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/chart_opengl_window' - chart2/source
chart2/source/view/main/ChartView.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit ded65fe3597aad601a390445c46584168706ac07
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Mon Aug 25 19:17:03 2014 +0200
Store env variable in a static variable instead
Change-Id: I5d6067806645722faac3fe90cbec01b6963f7283
diff --git a/chart2/source/view/main/ChartView.cxx
b/chart2/source/view/main/ChartView.cxx
index 8665d45..710c50e 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -2446,6 +2446,8 @@ bool ChartView::isReal3DChart()
return GL3DHelper::isGL3DDiagram(xDiagram);
}
+const char* envChartDummyFactory = getenv(CHART_DUMMY_FACTORY);
+
void ChartView::createShapes()
{
osl::ResettableMutexGuard aTimedGuard(maTimeMutex);
@@ -2499,7 +2501,7 @@ void ChartView::createShapes()
// hide OpenGL window for now in normal charts
OpenGLWindow* pWindow = mrChartModel.getOpenGLWindow();
-if(pWindow !getenv(CHART_DUMMY_FACTORY))
+if(pWindow !envChartDummyFactory)
pWindow-Show(false);
}
#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/chart_opengl_window' - chart2/source
chart2/source/view/main/ChartView.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 54cf6cb043d555bc1637871cdb0d24945385f103
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Mon Aug 25 19:21:54 2014 +0200
Oops, static was forgotten.
Change-Id: I0c316581ab8bfb0a49420006a0801d13021bd1ca
diff --git a/chart2/source/view/main/ChartView.cxx
b/chart2/source/view/main/ChartView.cxx
index 710c50e..4c27195 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -2446,7 +2446,7 @@ bool ChartView::isReal3DChart()
return GL3DHelper::isGL3DDiagram(xDiagram);
}
-const char* envChartDummyFactory = getenv(CHART_DUMMY_FACTORY);
+static const char* envChartDummyFactory = getenv(CHART_DUMMY_FACTORY);
void ChartView::createShapes()
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/chart_opengl_window' - chart2/source
chart2/source/view/charttypes/GL3DBarChart.cxx |4 1 file changed, 4 insertions(+) New commits: commit 8d06c4c9206ffa07d84249132048f985a5a78f0c Author: Zolnai Tamás tamas.zol...@collabora.com Date: Mon Aug 25 19:42:55 2014 +0200 mpRenderer-init() needs a context Change-Id: I9f6ce17fcc590597f357bf3ded5fe3eb41fb3810 diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx b/chart2/source/view/charttypes/GL3DBarChart.cxx index cabfe41..c887059 100644 --- a/chart2/source/view/charttypes/GL3DBarChart.cxx +++ b/chart2/source/view/charttypes/GL3DBarChart.cxx @@ -455,7 +455,9 @@ GL3DBarChart::GL3DBarChart( } mpRenderer-SetSize(aSize); mpWindow-setRenderer(this); +mpWindow-getContext().makeCurrent(); mpRenderer-init(); +mpWindow-getContext().resetCurrent(); } GL3DBarChart::BarInformation::BarInformation(const glm::vec3 rPos, float nVal, @@ -944,7 +946,9 @@ void GL3DBarChart::setOpenGLWindow(OpenGLWindow* pWindow) Size aSize = mpWindow-GetSizePixel(); mpRenderer-SetSize(aSize); mpWindow-setRenderer(this); +mpWindow-getContext().makeCurrent(); mpRenderer-init(); +mpWindow-getContext().resetCurrent(); mbValidContext = true; } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/chart_opengl_window' - chart2/source
chart2/source/view/main/ChartView.cxx | 19 +++
1 file changed, 11 insertions(+), 8 deletions(-)
New commits:
commit d572c50e8f3a41d0c2049f58924967d6f961f966
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Mon Aug 25 19:55:03 2014 +0200
Don't render with mp2DRenderer when we have 3D charts
Change-Id: Icb224f2d3dd55580532b1c4c43781ad444e51a43
diff --git a/chart2/source/view/main/ChartView.cxx
b/chart2/source/view/main/ChartView.cxx
index 4c27195..5753cc8 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -2707,15 +2707,18 @@ void ChartView::createShapes()
void ChartView::render()
{
-AbstractShapeFactory* pShapeFactory =
AbstractShapeFactory::getOrCreateShapeFactory(m_xShapeFactory);
-OpenGLWindow* pWindow = mrChartModel.getOpenGLWindow();
-if(pWindow)
-pWindow-setRenderer(mp2DRenderer.get());
-bool bRender = pShapeFactory-preRender(pWindow);
-if(bRender)
+if(!isReal3DChart())
{
-pShapeFactory-render(mxRootShape, pWindow !=
mp2DRenderer-getOpenGLWindow());
-pShapeFactory-postRender(pWindow);
+AbstractShapeFactory* pShapeFactory =
AbstractShapeFactory::getOrCreateShapeFactory(m_xShapeFactory);
+OpenGLWindow* pWindow = mrChartModel.getOpenGLWindow();
+if(pWindow)
+pWindow-setRenderer(mp2DRenderer.get());
+bool bRender = pShapeFactory-preRender(pWindow);
+if(bRender)
+{
+pShapeFactory-render(mxRootShape, pWindow !=
mp2DRenderer-getOpenGLWindow());
+pShapeFactory-postRender(pWindow);
+}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry sfx2/source
officecfg/registry/schema/org/openoffice/Office/Common.xcs |9 - sfx2/source/dialog/backingwindow.cxx |5 - 2 files changed, 12 insertions(+), 2 deletions(-) New commits: commit 895efd4f399fd717343bbc1ba3538fa01cf0a40a Author: Andras Timar andras.ti...@collabora.com Date: Mon Aug 25 20:50:27 2014 +0200 make background color of startcenter configurable Change-Id: Ice6a92186d641e9446b9d328518e4000c840a142 diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index 408874f..8ac7f69 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -2196,7 +2196,7 @@ prop oor:name=GenerateThumbnail oor:type=xs:boolean oor:nillable=false !-- UIHints: Tools Options - General Save - [Section] Save -- info -descSpecifies whether to generate a thumbnail image and place it inside the +descSpecifies whether to generate a thumbnail image and place it inside the the odf archive file, which makes it possible to see a preview of the document./desc labelStore a preview of this document/label /info @@ -3599,6 +3599,13 @@ /info value0/value /prop +prop oor:name=StartCenterBackgroundColor oor:type=xs:int oor:nillable=false + !--Default 7514196 = TDF Green-- + info +descSpecifies the background color of the start center./desc + /info + value7514196/value +/prop /group /group group oor:name=Java diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx index 1e6c4c8..e258b30 100644 --- a/sfx2/source/dialog/backingwindow.cxx +++ b/sfx2/source/dialog/backingwindow.cxx @@ -53,6 +53,8 @@ #include com/sun/star/task/InteractionHandler.hpp #include com/sun/star/ui/dialogs/TemplateDescription.hpp +#include officecfg/Office/Common.hxx + using namespace ::com::sun::star; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::frame; @@ -70,7 +72,6 @@ const char OPEN_URL[] = .uno:Open; const char SERVICENAME_CFGREADACCESS[] = com.sun.star.configuration.ConfigurationAccess; float fMultiplier = 1.4f; -const Color aButtonsBackground(114, 168, 84); // TDF green const Color aButtonsText(COL_WHITE); /*** @@ -292,6 +293,8 @@ void BackingWindow::initControls() mpHelpButton-SetControlForeground(aButtonsText); mpExtensionsButton-SetControlForeground(aButtonsText); +const Color aButtonsBackground(officecfg::Office::Common::Help::StartCenter::StartCenterBackgroundColor::get()); + mpAllButtonsBox-SetBackground(aButtonsBackground); mpSmallButtonsBox-SetBackground(aButtonsBackground); mpHelpBox-SetBackground(aButtonsBackground); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 4 commits - include/svx sc/source svx/source sw/source
include/svx/zoomsliderctrl.hxx |6 +
sc/source/ui/view/tabcont.cxx |3
sc/source/ui/view/tabview.cxx | 60 +++
svx/source/stbctrls/zoomsliderctrl.cxx | 87 +++---
sw/source/uibase/shells/drwtxtsh.cxx | 125 -
5 files changed, 125 insertions(+), 156 deletions(-)
New commits:
commit 1d1d1c62caf2ee6a96946e96d782e03f3ef80439
Author: Tomaž Vajngerl tomaz.vajng...@collabora.com
Date: Mon Aug 25 18:20:58 2014 +0200
fdo#36772 Move the scrollbar and sheet tabs in a separate row.
Change-Id: I57d891d9f6e89dafb4840a577ba55baa734fdcc2
diff --git a/sc/source/ui/view/tabcont.cxx b/sc/source/ui/view/tabcont.cxx
index df49a42..3bfeb99 100644
--- a/sc/source/ui/view/tabcont.cxx
+++ b/sc/source/ui/view/tabcont.cxx
@@ -39,8 +39,7 @@
ScTabControl::ScTabControl( Window* pParent, ScViewData* pData ) :
TabBar( pParent,
-WinBits(WB_BORDER | WB_3DLOOK | WB_SCROLL | WB_RANGESELECT |
-WB_MULTISELECT | WB_DRAG | WB_SIZEABLE) ),
+WinBits(WB_BORDER | WB_3DLOOK | WB_SCROLL | WB_RANGESELECT |
WB_MULTISELECT | WB_DRAG ) ),
DropTargetHelper( this ),
DragSourceHelper( this ),
pViewData( pData ),
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index 02b99b9..1b2520b 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -57,9 +57,6 @@
#define SPLIT_HANDLE_SIZE 5
#define SC_ICONSIZE 36
-#define SC_SCROLLBAR_MIN30
-#define SC_TABBAR_MIN 6
-
using namespace ::com::sun::star;
// Corner-Button
@@ -341,7 +338,12 @@ void ScTabView::DoResize( const Point rOffset, const
Size rSize, bool bInner )
aBorderPos = rOffset;
aFrameSize = rSize;
+const StyleSettings rStyleSettings =
pFrameWin-GetSettings().GetStyleSettings();
+
+sal_Int32 nTabWidth = pFrameWin-GetFont().GetHeight() + 4;
+
if ( aViewData.GetHSplitMode() != SC_SPLIT_NONE )
+{
if ( aViewData.GetHSplitPos() nSizeX - SPLIT_MARGIN )
{
aViewData.SetHSplitMode( SC_SPLIT_NONE );
@@ -349,7 +351,9 @@ void ScTabView::DoResize( const Point rOffset, const Size
rSize, bool bInner )
ActivatePart( SC_SPLIT_BOTTOMLEFT );
InvalidateSplit();
}
+}
if ( aViewData.GetVSplitMode() != SC_SPLIT_NONE )
+{
if ( aViewData.GetVSplitPos() nSizeY - SPLIT_MARGIN )
{
aViewData.SetVSplitMode( SC_SPLIT_NONE );
@@ -357,12 +361,13 @@ void ScTabView::DoResize( const Point rOffset, const
Size rSize, bool bInner )
ActivatePart( SC_SPLIT_BOTTOMLEFT );
InvalidateSplit();
}
+}
UpdateShow();
if (bHScroll || bVScroll) // Scrollbars horizontal oder vertikal
{
-long nScrollBarSize =
pFrameWin-GetSettings().GetStyleSettings().GetScrollBarSize();
+long nScrollBarSize = rStyleSettings.GetScrollBarSize();
if (bVScroll)
{
nBarX = nScrollBarSize;
@@ -370,7 +375,7 @@ void ScTabView::DoResize( const Point rOffset, const Size
rSize, bool bInner )
}
if (bHScroll)
{
-nBarY = nScrollBarSize;
+nBarY = nScrollBarSize + nTabWidth;
nSizeY -= nBarY - nOverlap;
}
@@ -401,7 +406,6 @@ void ScTabView::DoResize( const Point rOffset, const Size
rSize, bool bInner )
}
nSizeRt = nSizeX - nSizeLt - nSizeSp;
-long nTabSize = 0;
if (bTabControl)
{
// pending relative tab bar width from extended document
options
@@ -410,39 +414,30 @@ void ScTabView::DoResize( const Point rOffset, const
Size rSize, bool bInner )
SetRelTabBarWidth( mfPendingTabBarWidth );
mfPendingTabBarWidth = -1.0;
}
-
-nTabSize = pTabControl-GetSizePixel().Width()-nOverlap;
-
-if ( aViewData.GetHSplitMode() != SC_SPLIT_FIX )// bei
linkem Scrollbar
-{
-if (nTabSize nSizeLt-SC_SCROLLBAR_MIN) nTabSize =
nSizeLt-SC_SCROLLBAR_MIN;
-if (nTabSize SC_TABBAR_MIN) nTabSize = SC_TABBAR_MIN;
-nSizeLt -= nTabSize;
-}
-else// bei
rechtem Scrollbar
-{
-if (nTabSize nSizeRt-SC_SCROLLBAR_MIN) nTabSize =
nSizeRt-SC_SCROLLBAR_MIN;
-if (nTabSize SC_TABBAR_MIN) nTabSize = SC_TABBAR_MIN;
-nSizeRt -= nTabSize;
-}
}
-lcl_SetPosSize( *pTabControl, Point(nPosX-nOverlap, nPosY+nSizeY),
-Size(nTabSize+nOverlap,
nBarY), nTotalWidth, bLayoutRTL );
+Point aTabPoint(nPosX - nOverlap, nPosY +
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/unocoll.hxx |2
sw/source/core/doc/textboxhelper.cxx |2
sw/source/core/unocore/unocoll.cxx | 96 +--
sw/source/uibase/uno/unotxdoc.cxx|2
4 files changed, 51 insertions(+), 51 deletions(-)
New commits:
commit 8ad8d878320ad4e3cef1f6c1657781bf003d4e71
Author: Michael Stahl mst...@redhat.com
Date: Mon Aug 25 15:37:44 2014 +0200
SwXServiceProvider::MakeInstance() requires a SwDoc
Change-Id: I2522e43100baa691baeb55947bb47ce7ccabb5b4
diff --git a/sw/inc/unocoll.hxx b/sw/inc/unocoll.hxx
index d5c97bb..c365b7d 100644
--- a/sw/inc/unocoll.hxx
+++ b/sw/inc/unocoll.hxx
@@ -256,7 +256,7 @@ class SwXServiceProvider
public:
static OUStringGetProviderName(sal_uInt16 nObjectType);
static sal_uInt16 GetProviderType(const OUString rServiceName);
-static ::com::sun::star::uno::Reference ::com::sun::star::uno::XInterface
MakeInstance(sal_uInt16 nObjectType, SwDoc* pDoc);
+static ::com::sun::star::uno::Reference ::com::sun::star::uno::XInterface
MakeInstance(sal_uInt16 nObjectType, SwDoc rDoc);
static ::com::sun::star::uno::SequenceOUString GetAllServiceNames();
};
diff --git a/sw/source/core/doc/textboxhelper.cxx
b/sw/source/core/doc/textboxhelper.cxx
index c4de366..30604ee 100644
--- a/sw/source/core/doc/textboxhelper.cxx
+++ b/sw/source/core/doc/textboxhelper.cxx
@@ -54,7 +54,7 @@ void SwTextBoxHelper::create(SwFrmFmt* pShape)
if (!pShape-GetAttrSet().HasItem(RES_CNTNT))
{
// Create the associated TextFrame and insert it into the document.
-uno::Referencetext::XTextContent
xTextFrame(SwXServiceProvider::MakeInstance(SW_SERVICE_TYPE_TEXTFRAME,
pShape-GetDoc()), uno::UNO_QUERY);
+uno::Referencetext::XTextContent
xTextFrame(SwXServiceProvider::MakeInstance(SW_SERVICE_TYPE_TEXTFRAME,
*pShape-GetDoc()), uno::UNO_QUERY);
uno::Referencetext::XTextDocument
xTextDocument(pShape-GetDoc()-GetDocShell()-GetBaseModel(), uno::UNO_QUERY);
uno::Referencetext::XTextContentAppend
xTextContentAppend(xTextDocument-getText(), uno::UNO_QUERY);
xTextContentAppend-appendTextContent(xTextFrame,
uno::Sequencebeans::PropertyValue());
diff --git a/sw/source/core/unocore/unocoll.cxx
b/sw/source/core/unocore/unocoll.cxx
index c320cfa..4e303a0 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -517,7 +517,8 @@ sal_uInt16 SwXServiceProvider::GetProviderType(const
OUString rServiceName)
return SW_SERVICE_INVALID;
}
-uno::Reference uno::XInterface
SwXServiceProvider::MakeInstance(sal_uInt16 nObjectType, SwDoc* pDoc)
+uno::Referenceuno::XInterface
+SwXServiceProvider::MakeInstance(sal_uInt16 nObjectType, SwDoc rDoc)
{
SolarMutexGuard aGuard;
uno::Reference uno::XInterface xRet;
@@ -530,40 +531,41 @@ uno::Reference uno::XInterface
SwXServiceProvider::MakeInstance(sal_uInt16
break;
case SW_SERVICE_TYPE_TEXTFRAME:
{
-xRet = SwXTextFrame::CreateXTextFrame(*pDoc, 0);
+xRet = SwXTextFrame::CreateXTextFrame(rDoc, 0);
}
break;
case SW_SERVICE_TYPE_GRAPHIC :
case SW_SERVICE_TYPE_TEXT_GRAPHIC /* #i47503# */ :
{
-xRet = SwXTextGraphicObject::CreateXTextGraphicObject(*pDoc, 0);
+xRet = SwXTextGraphicObject::CreateXTextGraphicObject(rDoc, 0);
}
break;
case SW_SERVICE_TYPE_OLE :
{
-xRet = SwXTextEmbeddedObject::CreateXTextEmbeddedObject(*pDoc, 0);
+xRet = SwXTextEmbeddedObject::CreateXTextEmbeddedObject(rDoc, 0);
}
break;
case SW_SERVICE_TYPE_BOOKMARK :
{
-xRet = SwXBookmark::CreateXBookmark(*pDoc, 0);
+xRet = SwXBookmark::CreateXBookmark(rDoc, 0);
}
break;
case SW_SERVICE_TYPE_FIELDMARK :
{
-xRet = SwXFieldmark::CreateXFieldmark(*pDoc, 0, false);
+xRet = SwXFieldmark::CreateXFieldmark(rDoc, 0, false);
}
break;
case SW_SERVICE_TYPE_FORMFIELDMARK :
{
-xRet = SwXFieldmark::CreateXFieldmark(*pDoc, 0, true);
+xRet = SwXFieldmark::CreateXFieldmark(rDoc, 0, true);
}
break;
case SW_SERVICE_VBAOBJECTPROVIDER :
#ifndef DISABLE_SCRIPTING
{
-SwVbaObjectForCodeNameProvider* pObjProv = new
SwVbaObjectForCodeNameProvider( pDoc-GetDocShell() );
+SwVbaObjectForCodeNameProvider* pObjProv =
+new SwVbaObjectForCodeNameProvider(rDoc.GetDocShell());
xRet = (cppu::OWeakObject*)pObjProv;
}
#endif
@@ -571,9 +573,9 @@ uno::Reference uno::XInterface
SwXServiceProvider::MakeInstance(sal_uInt16
case SW_SERVICE_VBACODENAMEPROVIDER :
#ifndef DISABLE_SCRIPTING
{
-if ( pDoc-GetDocShell()
[Libreoffice-commits] core.git: Branch 'feature/chart_opengl_window' - 2 commits - chart2/inc chart2/source offapi/com svtools/source
chart2/inc/ChartModel.hxx |2 ++
chart2/source/model/main/ChartModel.cxx |7 +++
offapi/com/sun/star/chart2/XChartDocument.idl |4
svtools/source/misc/embedhlp.cxx | 14 +-
4 files changed, 26 insertions(+), 1 deletion(-)
New commits:
commit 14a0b9acb7f58b4ab8c94afa5e56c5e49a7b019e
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Mon Aug 25 21:47:34 2014 +0200
the DUMMY_CHART_FACTORY variable is not the only indicator for OpenGl charts
Change-Id: Idab33c8611526dc4749b4dbe4fe84e68138b4f73
diff --git a/chart2/inc/ChartModel.hxx b/chart2/inc/ChartModel.hxx
index 9b3eba3..cedfc1f 100644
--- a/chart2/inc/ChartModel.hxx
+++ b/chart2/inc/ChartModel.hxx
@@ -438,6 +438,8 @@ public:
virtual void SAL_CALL createDefaultChart() throw
(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+virtual sal_Bool SAL_CALL isOpenGLChart() throw
(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+
// XDataReceiver (public API)
virtual void SAL_CALL
attachDataProvider( const ::com::sun::star::uno::Reference
diff --git a/chart2/source/model/main/ChartModel.cxx
b/chart2/source/model/main/ChartModel.cxx
index ed0d24e..a3d97c2 100644
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -32,6 +32,7 @@
#include NameContainer.hxx
#include UndoManager.hxx
#include ChartView.hxx
+#include GL3DHelper.hxx
#include vcl/openglwin.hxx
@@ -964,6 +965,12 @@ void SAL_CALL ChartModel::createDefaultChart()
insertDefaultChart();
}
+sal_Bool SAL_CALL ChartModel::isOpenGLChart()
+throw (css::uno::RuntimeException, std::exception)
+{
+return GL3DHelper::isGL3DDiagram(m_xDiagram);
+}
+
// XTitled
uno::Reference chart2::XTitle SAL_CALL ChartModel::getTitleObject()
throw (uno::RuntimeException, std::exception)
diff --git a/offapi/com/sun/star/chart2/XChartDocument.idl
b/offapi/com/sun/star/chart2/XChartDocument.idl
index 0055cbb..57bcfc9 100644
--- a/offapi/com/sun/star/chart2/XChartDocument.idl
+++ b/offapi/com/sun/star/chart2/XChartDocument.idl
@@ -127,6 +127,10 @@ interface XChartDocument : ::com::sun::star::frame::XModel
/** Creates a default chart type for a brand-new chart object.
*/
void createDefaultChart();
+
+/** Returns true if the chart is based on OpenGL
+ */
+boolean isOpenGLChart();
};
} ; // chart2
diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx
index ed6b00a..cae50a2 100644
--- a/svtools/source/misc/embedhlp.cxx
+++ b/svtools/source/misc/embedhlp.cxx
@@ -793,7 +793,18 @@ bool EmbeddedObjectRef::IsChart(const
::com::sun::star::uno::Reference ::com::
bool EmbeddedObjectRef::IsGLChart(const ::com::sun::star::uno::Reference
::com::sun::star::embed::XEmbeddedObject xObj)
{
static const char* env = getenv(CHART_DUMMY_FACTORY);
-return IsChart(xObj) env;
+if (IsChart(xObj))
+{
+if (env)
+return true;
+
+uno::Reference chart2::XChartDocument
xChartDoc(xObj-getComponent(), uno::UNO_QUERY);
+if (!xChartDoc.is())
+return false;
+
+return xChartDoc-isOpenGLChart();
+}
+return false;
}
void EmbeddedObjectRef::UpdateReplacement()
commit a804600a101d97f58d76027427e8bb212a5bc206
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Mon Aug 25 19:09:39 2014 +0200
cache the call to getenv
Change-Id: I13095b13694aa092e3d5f542b5be12e703eb4590
diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx
index 4e96ff3..ed6b00a 100644
--- a/svtools/source/misc/embedhlp.cxx
+++ b/svtools/source/misc/embedhlp.cxx
@@ -792,7 +792,8 @@ bool EmbeddedObjectRef::IsChart(const
::com::sun::star::uno::Reference ::com::
bool EmbeddedObjectRef::IsGLChart(const ::com::sun::star::uno::Reference
::com::sun::star::embed::XEmbeddedObject xObj)
{
-return IsChart(xObj) getenv(CHART_DUMMY_FACTORY);
+static const char* env = getenv(CHART_DUMMY_FACTORY);
+return IsChart(xObj) env;
}
void EmbeddedObjectRef::UpdateReplacement()
___
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/window/builder.cxx |4 1 file changed, 4 insertions(+) New commits: commit bc16ad7c8d08d3c97c19c80b2de39adf932bdfc1 Author: Caolán McNamara caol...@redhat.com Date: Mon Aug 25 20:50:16 2014 +0100 connect gtk-yes and gtk-no up Change-Id: I5c17e633b9a638ed99d1129447f628155dd043cd diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 9ef687b..00ba2b5 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -679,6 +679,10 @@ namespace return (VclResId(SV_BUTTONTEXT_STOP).toString()); else if (rType == gtk-connect) return (VclResId(SV_BUTTONTEXT_CONNECT).toString()); +else if (rType == gtk-yes) +return (VclResId(SV_BUTTONTEXT_YES).toString()); +else if (rType == gtk-no) +return (VclResId(SV_BUTTONTEXT_NO).toString()); SAL_WARN(vcl.layout, unknown stock type: rType.getStr()); return OUString(); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/formulacell.cxx |8 +---
1 file changed, 1 insertion(+), 7 deletions(-)
New commits:
commit 0792aef9010007d5738723d8930990028bef2f9e
Author: Eike Rathke er...@redhat.com
Date: Mon Aug 25 21:54:42 2014 +0200
fdo#83067 also volatile cells need to listen to all references
As we now broadcast also cell moves it is not sufficient anymore to add
volatile cells only to the BCA_LISTEN_ALWAYS broadcaster, add them as
listener to all referenced cells and ranges as usual.
Change-Id: I7901b73db7e0c82c4bac302ae746810cbc16ea44
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index d846501..d10b9d4 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -1854,7 +1854,7 @@ void ScFormulaCell::InterpretTail(
ScInterpretTailParameter eTailParam )
if (pCode-IsRecalcModeAlways())
{
// The formula was previously volatile, but no more.
-EndListeningTo(pDocument);
+pDocument-EndListeningArea(BCA_LISTEN_ALWAYS, this);
pCode-SetExclusiveRecalcModeNormal();
}
else
@@ -3786,8 +3786,6 @@ void ScFormulaCell::StartListeningTo( ScDocument* pDoc )
if( pArr-IsRecalcModeAlways() )
{
pDoc-StartListeningArea(BCA_LISTEN_ALWAYS, this);
-SetNeedsListening( false);
-return;
}
pArr-Reset();
@@ -3826,8 +3824,6 @@ void ScFormulaCell::StartListeningTo(
sc::StartListeningContext rCxt )
if( pArr-IsRecalcModeAlways() )
{
rDoc.StartListeningArea(BCA_LISTEN_ALWAYS, this);
-SetNeedsListening( false);
-return;
}
pArr-Reset();
@@ -3893,7 +3889,6 @@ void ScFormulaCell::EndListeningTo( ScDocument* pDoc,
ScTokenArray* pArr,
if ( GetCode()-IsRecalcModeAlways() )
{
pDoc-EndListeningArea( BCA_LISTEN_ALWAYS, this );
-return;
}
if (!pArr)
@@ -3939,7 +3934,6 @@ void ScFormulaCell::EndListeningTo(
sc::EndListeningContext rCxt )
if (pArr-IsRecalcModeAlways())
{
rDoc.EndListeningArea(BCA_LISTEN_ALWAYS, this);
-return;
}
pArr-Reset();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - include/basebmp
include/basebmp/clippedlinerenderer.hxx | 24
1 file changed, 20 insertions(+), 4 deletions(-)
New commits:
commit 6182437f8312e5823b3c9022993730428e572667
Author: Caolán McNamara caol...@redhat.com
Date: Mon Aug 25 11:31:30 2014 +0100
return false if the clip region would div by zero
Change-Id: Ia0928306b3608df9c48a19b517edac54ba43bd57
diff --git a/include/basebmp/clippedlinerenderer.hxx
b/include/basebmp/clippedlinerenderer.hxx
index 077ff48..b3a5fd09 100644
--- a/include/basebmp/clippedlinerenderer.hxx
+++ b/include/basebmp/clippedlinerenderer.hxx
@@ -89,7 +89,12 @@ inline bool prepareClip( sal_Int32 a1,
if( clipCode1 (aMinFlag|aMaxFlag) )
{
-cb = (ca + da - int(!bRoundTowardsPt2)) / (2*da);
+sal_Int32 da2 = 2*da;
+
+if (da2 == 0)
+return false; // overflow
+
+cb = (ca + da - int(!bRoundTowardsPt2)) / (da2);
if( sb = 0 )
{
@@ -104,11 +109,16 @@ inline bool prepareClip( sal_Int32 a1,
return false; // fully clipped
}
-io_rem += ca - 2*da*cb;
+io_rem += ca - da2*cb;
}
else
{
-ca = (cb - da + 2*db - int(bRoundTowardsPt2)) / (2*db);
+sal_Int32 db2 = 2*db;
+
+if (db2 == 0)
+return false; // overflow
+
+ca = (cb - da + db2 - int(bRoundTowardsPt2)) / (db2);
if( sa = 0 )
{
o_as = a1 + ca;
@@ -122,7 +132,7 @@ inline bool prepareClip( sal_Int32 a1,
return false; // fully clipped
}
-io_rem += 2*db*ca - cb;
+io_rem += db2*ca - cb;
}
}
else
commit 739adde53bf93afa1d1cd2ea2ecaf0754feec934
Author: Caolán McNamara caol...@redhat.com
Date: Mon Aug 25 11:22:04 2014 +0100
detect conditions where loop cannot logically end
Change-Id: I7e2ec1e09614510e6798ba8d5b9990c189a8dbb9
diff --git a/include/basebmp/clippedlinerenderer.hxx
b/include/basebmp/clippedlinerenderer.hxx
index acb9cda..077ff48 100644
--- a/include/basebmp/clippedlinerenderer.hxx
+++ b/include/basebmp/clippedlinerenderer.hxx
@@ -269,6 +269,9 @@ void renderClippedLine( basegfx::B2IPoint aPt1,
if( bUseAlternateBresenham )
{
+if (rem 0 ady = 0)
+return; //break will never be hit under these circumstances
+
while(true)
{
acc.set(color, rowIter);
@@ -347,6 +350,9 @@ void renderClippedLine( basegfx::B2IPoint aPt1,
if( bUseAlternateBresenham )
{
+if (rem 0 adx = 0)
+return; //break will never be hit under these circumstances
+
while(true)
{
acc.set(color, colIter);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - configure.ac external/liblangtag external/openssl solenv/gbuild solenv/gcc-wrappers
configure.ac |3 +++ external/liblangtag/ExternalProject_langtag.mk |4 +++- external/openssl/ExternalProject_openssl.mk|2 +- solenv/gbuild/platform/com_MSC_class.mk|6 -- solenv/gcc-wrappers/g++.cxx|4 +++- solenv/gcc-wrappers/gcc.cxx|4 +++- solenv/gcc-wrappers/wrapper.cxx|5 - solenv/gcc-wrappers/wrapper.hxx|2 +- 8 files changed, 22 insertions(+), 8 deletions(-) New commits: commit f83c7358964cf9f265f21e7dfa72e82a26923b3e Author: Michael Stahl mst...@redhat.com Date: Fri Aug 8 14:58:08 2014 +0200 fdo#82430: configure: MSVC build: avoid using SSE2 instructions MSVC 2012 for x86 defaults to -arch:SSE2; binaries do not run on any AMD 32-bit CPU, neither on Intel Pentium III. http://msdn.microsoft.com/en-us/library/vstudio/7t5yh4fd%28v=vs.110%29.aspx (cherry picked from commit 8bd6bf93b7711a7ac7c5cbd7c3bb980481570ebd) fdo#82430: MSVC 2010 refuses both -clr and -arch in the same command (cherry picked from commit 36ce22f41a754fa405804434899a08a23081e721) fdo#82430: gcc-wrappers: don't stop if REAL_CXX_FLAGS is empty Hopefully should fix MSVC 2010 build... (cherry picked from commit a18ff3d5c75c2b468c48bd19439dee0689d24d67) Change-Id: Ie8253137db2699f2a7fa69c4ac4e7ded90931e3e Reviewed-on: https://gerrit.libreoffice.org/10925 Reviewed-by: Christian Lohmaier lohmaier+libreoff...@googlemail.com Tested-by: Christian Lohmaier lohmaier+libreoff...@googlemail.com diff --git a/configure.ac b/configure.ac index 809b353..02791ca 100644 --- a/configure.ac +++ b/configure.ac @@ -3775,6 +3775,9 @@ if test $_os = WINNT; then COMPATH=`echo $VC_PRODUCT_DIR` fi fi +if test $BITNESS_OVERRIDE = -a $vcnum != 100; then +CC=$CC -arch:SSE # MSVC 2012 default for x86 is -arch:SSE2 +fi export INCLUDE=`cygpath -d $COMPATH/Include` PathFormat $COMPATH diff --git a/external/liblangtag/ExternalProject_langtag.mk b/external/liblangtag/ExternalProject_langtag.mk index c3d4115..8835bdf 100644 --- a/external/liblangtag/ExternalProject_langtag.mk +++ b/external/liblangtag/ExternalProject_langtag.mk @@ -31,7 +31,9 @@ $(call gb_ExternalProject_get_state_target,langtag,build): $(if $(filter-out LINUX FREEBSD,$(OS)),,LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath,\\\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib) \ $(if $(filter-out SOLARIS,$(OS)),,LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-R$(COMMA)\\\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib) \ $(if $(filter-out WNTGCC,$(OS)$(COM)),,LDFLAGS=-Wl$(COMMA)--enable-runtime-pseudo-reloc-v2) \ -$(if $(filter WNTMSC,$(OS)$(COM)),REAL_CC=$(shell cygpath -w $(lastword $(CC \ +$(if $(filter WNTMSC,$(OS)$(COM)),\ + REAL_CC=$(shell cygpath -w $(lastword $(filter-out -%,$(CC \ + REAL_CC_FLAGS=$(filter -%,$(CC))) \ $(if $(VERBOSE)$(verbose),V=1) \ $(gb_Helper_set_ld_path) \ $(MAKE) \ diff --git a/external/openssl/ExternalProject_openssl.mk b/external/openssl/ExternalProject_openssl.mk index 12c7576..ea5f8b2 100644 --- a/external/openssl/ExternalProject_openssl.mk +++ b/external/openssl/ExternalProject_openssl.mk @@ -61,7 +61,7 @@ OPENSSL_PLATFORM := \ ifeq ($(COM),MSC) $(call gb_ExternalProject_get_state_target,openssl,build): $(call gb_ExternalProject_run,build,\ - export CC=$(shell cygpath -w $(CC)) \ + export CC=$(shell cygpath -w $(filter-out -%,$(CC))) $(filter -%,$(CC)) \ export PERL=$(shell cygpath -w $(PERL)) \ export LIB=$(ILIB) \ $(PERL) Configure $(OPENSSL_PLATFORM) no-idea \ diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index fb617ac..dec9e81 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -503,9 +503,11 @@ endef # /opt/lo/bin/ccache /cygdrive/c/PROGRA~2/MICROS~2.0/VC/bin/cl.exe gb_AUTOCONF_WRAPPERS = \ - REAL_CC=$(shell cygpath -w $(CC)) \ + REAL_CC=$(shell cygpath -w $(filter-out -%,$(CC))) \ + REAL_CC_FLAGS=$(filter -%,$(CC)) \ CC=$(call gb_Executable_get_target,gcc-wrapper) \ - REAL_CXX=$(shell cygpath -w $(CXX)) \ + REAL_CXX=$(shell cygpath -w $(filter-out -%,$(CXX))) \ + REAL_CXX_FLAGS=$(filter -%,$(CXX)) \ CXX=$(call gb_Executable_get_target,g++-wrapper) \ LD=$(shell cygpath -w $(COMPATH)/bin/link.exe) -nologo diff --git a/solenv/gcc-wrappers/g++.cxx b/solenv/gcc-wrappers/g++.cxx index d2ee3d5..626b164 100644 --- a/solenv/gcc-wrappers/g++.cxx +++
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/htmlexport/htmlexport.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8995bb0b63f7d0daf3cff20bf6a75761e3faeb35 Author: Miklos Vajna vmik...@collabora.co.uk Date: Mon Aug 25 22:30:54 2014 +0200 CppunitTest_sw_htmlexport: enable on Windows Change-Id: Id5a82aafc50f4758cff777e3e5b7560e3703 diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx b/sw/qa/extras/htmlexport/htmlexport.cxx index 82d6cd4..2d4f6fb 100644 --- a/sw/qa/extras/htmlexport/htmlexport.cxx +++ b/sw/qa/extras/htmlexport/htmlexport.cxx @@ -9,7 +9,7 @@ #include swmodeltestbase.hxx -#if !defined(MACOSX) !defined(WNT) +#if !defined(MACOSX) #include com/sun/star/awt/Gradient.hpp #include com/sun/star/drawing/FillStyle.hpp ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 78793] Make hiding the gallery easier ...
https://bugs.freedesktop.org/show_bug.cgi?id=78793
Samuel Mehrbrodt s.mehrbr...@gmail.com changed:
What|Removed |Added
Status|NEW |RESOLVED
Resolution|--- |WORKSFORME
CC||s.mehrbr...@gmail.com
--- Comment #3 from Samuel Mehrbrodt s.mehrbr...@gmail.com ---
That docking window is now gone - the gallery is always opened in the sidebar
('close' button included ;)
--
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: sc/qa
sc/qa/unit/ucalc.cxx | 108 +++
sc/qa/unit/ucalc.hxx |2
2 files changed, 110 insertions(+)
New commits:
commit a8526c4ab75af37574dff85ce4b9c9a5b88f4886
Author: Eike Rathke er...@redhat.com
Date: Tue Aug 26 01:07:45 2014 +0200
unit test for sort with volatile formula cells, fdo#83067
Change-Id: Ic832af76daac9114ea09740b725a4a45bd50bc1b
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index f06c2fc..3825bb9 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -5835,6 +5835,114 @@ void Test::testSortRefUpdate4()
m_pDoc-DeleteTab(0);
}
+// Make sure the refupdate works also with volatile cells, see fdo#83067
+/* FIXME: this test is not roll-over-midnight safe and will fail then! We may
+ * want to have something different, but due to the nature of volatile
+ * functions it's not that easy to come up with something reproducible staying
+ * stable over sorts.. ;-) Check for time and don't run test a few seconds
+ * before midnight, ermm.. */
+void Test::testSortRefUpdate5()
+{
+sc::AutoCalcSwitch aACSwitch(*m_pDoc, true); // turn auto calc on.
+m_pDoc-InsertTab(0, Sort);
+
+double aValCheck[][3] = {
+// Result, Unsorted order, Sorted result.
+{ 0, 4, 0 },
+{ 0, 1, 0 },
+{ 0, 3, 0 },
+{ 0, 2, 0 },
+};
+ScRange aSortRange;
+{
+const char* aData[][3] = {
+{ Date, Volatile, Order },
+{ 1999-05-05, =TODAY()-$A2, 4 },
+{ 1994-10-18, =TODAY()-$A3, 1 },
+{ 1996-06-30, =TODAY()-$A4, 3 },
+{ 1995-11-21, =TODAY()-$A5, 2 },
+};
+
+SCTAB nTab = 0;
+ScAddress aPos(0,0,nTab);
+clearRange(m_pDoc, ScRange(0, 0, nTab, 2, SAL_N_ELEMENTS(aData),
nTab));
+aSortRange = insertRangeData(m_pDoc, aPos, aData,
SAL_N_ELEMENTS(aData));
+CPPUNIT_ASSERT_MESSAGE(failed to insert range data at correct
position, aSortRange.aStart == aPos);
+
+// Actual results and expected sorted results.
+for (SCROW nRow=0; nRow
static_castSCROW(SAL_N_ELEMENTS(aValCheck)); ++nRow)
+{
+double fVal = m_pDoc-GetValue(ScAddress(1,nRow+1,0));
+aValCheck[nRow][0] = fVal;
+aValCheck[static_castsize_t(aValCheck[nRow][1])-1][2] = fVal;
+}
+}
+
+ScDBDocFunc aFunc(getDocShell());
+
+// Sort A1:B5.
+m_pDoc-SetAnonymousDBData( 0, new ScDBData( STR_DB_LOCAL_NONAME,
aSortRange.aStart.Tab(),
+aSortRange.aStart.Col(), aSortRange.aStart.Row(),
aSortRange.aEnd.Col(), aSortRange.aEnd.Row()));
+
+// Sort by column A.
+ScSortParam aSortData;
+aSortData.nCol1 = aSortRange.aStart.Col();
+aSortData.nCol2 = aSortRange.aEnd.Col();
+aSortData.nRow1 = aSortRange.aStart.Row();
+aSortData.nRow2 = aSortRange.aEnd.Row();
+aSortData.bHasHeader = true;
+aSortData.maKeyState[0].bDoSort = true; // sort on
+aSortData.maKeyState[0].nField = 0; // Date
+aSortData.maKeyState[0].bAscending = true; // ascending
+bool bSorted = aFunc.Sort(0, aSortData, true, true, true);
+CPPUNIT_ASSERT(bSorted);
+
+// Check the sorted values.
+m_pDoc-CalcAll();
+for (SCROW nRow=0; nRow static_castSCROW(SAL_N_ELEMENTS(aValCheck));
++nRow)
+{
+size_t i =
static_castsize_t(m_pDoc-GetValue(ScAddress(2,nRow+1,0)));// order 1..4
+CPPUNIT_ASSERT_EQUAL( static_castsize_t(nRow+1), i);
+CPPUNIT_ASSERT_EQUAL( aValCheck[i-1][2],
m_pDoc-GetValue(ScAddress(1,nRow+1,0)));
+}
+
+// Make sure the formula cells have been adjusted correctly.
+const char* aFormulaCheck[] = {
+// Volatile
+TODAY()-$A2,
+TODAY()-$A3,
+TODAY()-$A4,
+TODAY()-$A5,
+};
+for (SCROW nRow=0; nRow
static_castSCROW(SAL_N_ELEMENTS(aFormulaCheck)); ++nRow)
+{
+if (!checkFormula(*m_pDoc, ScAddress(1,nRow+1,0), aFormulaCheck[nRow]))
+CPPUNIT_FAIL(OString(Wrong formula in B +
OString::number(nRow+2) + .).getStr());
+}
+
+// Undo and check the result.
+SfxUndoManager* pUndoMgr = m_pDoc-GetUndoManager();
+pUndoMgr-Undo();
+m_pDoc-CalcAll();
+for (SCROW nRow=0; nRow static_castSCROW(SAL_N_ELEMENTS(aValCheck));
++nRow)
+{
+CPPUNIT_ASSERT_EQUAL( aValCheck[nRow][0],
m_pDoc-GetValue(ScAddress(1,nRow+1,0)));
+CPPUNIT_ASSERT_EQUAL( aValCheck[nRow][1],
m_pDoc-GetValue(ScAddress(2,nRow+1,0)));
+}
+
+// Redo and check the result.
+pUndoMgr-Redo();
+m_pDoc-CalcAll();
+for (SCROW nRow=0; nRow static_castSCROW(SAL_N_ELEMENTS(aValCheck));
++nRow)
+{
+size_t i =
static_castsize_t(m_pDoc-GetValue(ScAddress(2,nRow+1,0)));// order 1..4
+CPPUNIT_ASSERT_EQUAL( static_castsize_t(nRow+1), i);
+CPPUNIT_ASSERT_EQUAL( aValCheck[i-1][2],
m_pDoc-GetValue(ScAddress(1,nRow+1,0)));
+}
+
+
Re: Performance samples for LibreOffice ...
On Fri, Aug 22, 2014 at 09:06:24PM +0200, Jan Hubicka wrote: Another one I noticed :) /aux/hubicka/libreoffice/connectivity/source/inc/dbase/DIndex.hxx:41:15: warning: type �struct ODbaseIndex� violates one definition rule [-Wodr] class ODbaseIndex : public ODbaseIndex_BASE ^ /aux/hubicka/libreoffice/connectivity/source/inc/dbase/DIndex.hxx:41:15: note: a different type is defined in another translation unit class ODbaseIndex : public ODbaseIndex_BASE ^ /aux/hubicka/libreoffice/connectivity/source/inc/dbase/DIndex.hxx:74:29: note: the first difference of corresponding definitions is field �m_aHeader� NDXHeader m_aHeader; ^ /aux/hubicka/libreoffice/connectivity/source/inc/dbase/DIndex.hxx:74:29: note: a field of same name but different type is defined in another translation unit NDXHeader m_aHeader; ^ /aux/hubicka/libreoffice/connectivity/source/inc/dbase/DIndex.hxx:55:20: note: type �struct NDXHeader� should match type �struct NDXHeader� struct NDXHeader ^ /aux/hubicka/libreoffice/connectivity/source/inc/dbase/DIndex.hxx:55:20: note: the incompatible type is defined here struct NDXHeader Thisone will be harder to track - I can get better diagnostic with ODR merging patch once I get around updating it for mainline This looks like it is saying that there are two different (incompatible) definitions of type connectivity::dbase::ODbaseIndex::NDXHeader, but git grep NDXHeader finds only one. Care to explain the problem? Thanks. -- Lionel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: readlicense_oo/license
readlicense_oo/license/CREDITS.fodt | 2764 ++-- 1 file changed, 1433 insertions(+), 1331 deletions(-) New commits: commit 310a852e012ecfc10e813bea64438c1a862bb2c0 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Tue Aug 26 05:59:36 2014 +0200 update credits Change-Id: Ifda737653510ba95ae0c5aeb52f52d2a5aca3477 diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt index 5ccb7d7..4ae369a 100644 --- a/readlicense_oo/license/CREDITS.fodt +++ b/readlicense_oo/license/CREDITS.fodt @@ -1,10 +1,10 @@ ?xml version=1.0 encoding=UTF-8? office:document xmlns:office=urn:oasis:names:tc:opendocument:xmlns:office:1.0 xmlns:style=urn:oasis:names:tc:opendocument:xmlns:style:1.0 xmlns:text=urn:oasis:names:tc:opendocument:xmlns:text:1.0 xmlns:table=urn:oasis:names:tc:opendocument:xmlns:table:1.0 xmlns:draw=urn:oasis:names:tc:opendocument:xmlns:drawing:1.0 xmlns:fo=urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0 xmlns:xlink=http://www.w3.org/1999/xlink; xmlns:dc=http://purl.org/dc/elements/1.1/; xmlns:meta=urn:oasis:names:tc:opendocument:xmlns:meta:1.0 xmlns:number=urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0 xmlns:svg=urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0 xmlns:chart=urn:oasis:names:tc:opendocument:xmlns:chart:1.0 xmlns:dr3d=urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0 xmlns:math=http://www.w3.org/1998/Math/MathML; xmlns:form=urn:oasis:names:tc:opendocument:xmlns:form:1.0 xmlns:script=urn:oasis:names:tc:opendocument:xmlns:script:1.0 xmlns:config=urn:oas is:names:tc:opendocument:xmlns:config:1.0 xmlns:ooo=http://openoffice.org/2004/office; xmlns:ooow=http://openoffice.org/2004/writer; xmlns:oooc=http://openoffice.org/2004/calc; xmlns:dom=http://www.w3.org/2001/xml-events; xmlns:xforms=http://www.w3.org/2002/xforms; xmlns:xsd=http://www.w3.org/2001/XMLSchema; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xmlns:rpt=http://openoffice.org/2005/report; xmlns:of=urn:oasis:names:tc:opendocument:xmlns:of:1.2 xmlns:xhtml=http://www.w3.org/1999/xhtml; xmlns:grddl=http://www.w3.org/2003/g/data-view#; xmlns:officeooo=http://openoffice.org/2009/office; xmlns:tableooo=http://openoffice.org/2009/table; xmlns:drawooo=http://openoffice.org/2010/draw; xmlns:calcext=urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0 xmlns:loext=urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0 xmlns:field=urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0 xmlns:formx=urn:openoffice:names: experimental:ooxml-odf-interop:xmlns:form:1.0 xmlns:css3t=http://www.w3.org/TR/css3-text/; office:version=1.2 office:mimetype=application/vnd.oasis.opendocument.text - office:metadc:titleCredits » LibreOffice/dc:titlemeta:keywordCredits/meta:keywordmeta:keywordcontributors/meta:keywordmeta:keywordcoders/meta:keywordmeta:keyworddevelopers/meta:keyworddc:descriptionCredits for the LibreOffice development/coding./dc:descriptionmeta:generatorLibreOffice/4.3.0.3$Linux_X86_64 LibreOffice_project/08ebe52789a201dd7d38ef653ef7a48925e7f9f7/meta:generatordc:date2012-02-20T22:17:18.06000/dc:datemeta:editing-durationPT14M12S/meta:editing-durationmeta:editing-cycles3/meta:editing-cyclesmeta:document-statistic meta:table-count=5 meta:image-count=1 meta:object-count=0 meta:page-count=2 meta:paragraph-count=2883 meta:word-count=10106 meta:character-count=73162 meta:non-whitespace-character-count=64040/meta:user-defined meta:name=google-site-verificationJUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA/meta:user-defined/office:meta + office:metadc:titleCredits » LibreOffice/dc:titlemeta:keywordCredits/meta:keywordmeta:keywordcontributors/meta:keywordmeta:keywordcoders/meta:keywordmeta:keyworddevelopers/meta:keyworddc:descriptionCredits for the LibreOffice development/coding./dc:descriptionmeta:generatorLibreOffice/4.3.0.3$Linux_X86_64 LibreOffice_project/08ebe52789a201dd7d38ef653ef7a48925e7f9f7/meta:generatordc:date2012-02-20T22:17:18.06000/dc:datemeta:editing-durationPT14M12S/meta:editing-durationmeta:editing-cycles3/meta:editing-cyclesmeta:document-statistic meta:table-count=5 meta:image-count=1 meta:object-count=0 meta:page-count=2 meta:paragraph-count=2910 meta:word-count=10213 meta:character-count=73923 meta:non-whitespace-character-count=64706/meta:user-defined meta:name=google-site-verificationJUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA/meta:user-defined/office:meta office:settings config:config-item-set config:name=ooo:view-settings - config:config-item config:name=ViewAreaTop config:type=long527/config:config-item + config:config-item config:name=ViewAreaTop config:type=long89004/config:config-item config:config-item config:name=ViewAreaLeft config:type=long501/config:config-item config:config-item config:name=ViewAreaWidth config:type=long21724/config:config-item config:config-item
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3-1' - 3 commits - configure.ac external/liblangtag external/openssl readlicense_oo/license scp2/Module_scp2.mk solenv/gbuild solenv/gcc-wrappers
configure.ac |3 external/liblangtag/ExternalProject_langtag.mk |4 external/openssl/ExternalProject_openssl.mk|2 readlicense_oo/license/CREDITS.fodt| 6026 ++--- scp2/Module_scp2.mk|1 solenv/gbuild/platform/com_MSC_class.mk|6 solenv/gcc-wrappers/g++.cxx|4 solenv/gcc-wrappers/gcc.cxx|4 solenv/gcc-wrappers/wrapper.cxx|5 solenv/gcc-wrappers/wrapper.hxx|2 10 files changed, 3592 insertions(+), 2465 deletions(-) New commits: commit 71aa803545e3058024425e6548e9f492f488b71a Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Tue Aug 26 06:02:58 2014 +0200 update credits Change-Id: I22d336f580bff8aefe7aa102508af3d10f2c8012 diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt index be85bc7..4ae369a 100644 --- a/readlicense_oo/license/CREDITS.fodt +++ b/readlicense_oo/license/CREDITS.fodt @@ -1,24 +1,24 @@ ?xml version=1.0 encoding=UTF-8? office:document xmlns:office=urn:oasis:names:tc:opendocument:xmlns:office:1.0 xmlns:style=urn:oasis:names:tc:opendocument:xmlns:style:1.0 xmlns:text=urn:oasis:names:tc:opendocument:xmlns:text:1.0 xmlns:table=urn:oasis:names:tc:opendocument:xmlns:table:1.0 xmlns:draw=urn:oasis:names:tc:opendocument:xmlns:drawing:1.0 xmlns:fo=urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0 xmlns:xlink=http://www.w3.org/1999/xlink; xmlns:dc=http://purl.org/dc/elements/1.1/; xmlns:meta=urn:oasis:names:tc:opendocument:xmlns:meta:1.0 xmlns:number=urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0 xmlns:svg=urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0 xmlns:chart=urn:oasis:names:tc:opendocument:xmlns:chart:1.0 xmlns:dr3d=urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0 xmlns:math=http://www.w3.org/1998/Math/MathML; xmlns:form=urn:oasis:names:tc:opendocument:xmlns:form:1.0 xmlns:script=urn:oasis:names:tc:opendocument:xmlns:script:1.0 xmlns:config=urn:oas is:names:tc:opendocument:xmlns:config:1.0 xmlns:ooo=http://openoffice.org/2004/office; xmlns:ooow=http://openoffice.org/2004/writer; xmlns:oooc=http://openoffice.org/2004/calc; xmlns:dom=http://www.w3.org/2001/xml-events; xmlns:xforms=http://www.w3.org/2002/xforms; xmlns:xsd=http://www.w3.org/2001/XMLSchema; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xmlns:rpt=http://openoffice.org/2005/report; xmlns:of=urn:oasis:names:tc:opendocument:xmlns:of:1.2 xmlns:xhtml=http://www.w3.org/1999/xhtml; xmlns:grddl=http://www.w3.org/2003/g/data-view#; xmlns:officeooo=http://openoffice.org/2009/office; xmlns:tableooo=http://openoffice.org/2009/table; xmlns:drawooo=http://openoffice.org/2010/draw; xmlns:calcext=urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0 xmlns:loext=urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0 xmlns:field=urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0 xmlns:formx=urn:openoffice:names: experimental:ooxml-odf-interop:xmlns:form:1.0 xmlns:css3t=http://www.w3.org/TR/css3-text/; office:version=1.2 office:mimetype=application/vnd.oasis.opendocument.text - office:metadc:titleCredits » LibreOffice/dc:titlemeta:keywordCredits/meta:keywordmeta:keywordcontributors/meta:keywordmeta:keywordcoders/meta:keywordmeta:keyworddevelopers/meta:keyworddc:descriptionCredits for the LibreOffice development/coding./dc:descriptionmeta:generatorLibreOffice/4.2.2.1$Linux_X86_64 LibreOffice_project/3be8cda0bddd8e430d8cda1ebfd581265cca5a0f/meta:generatordc:date2012-02-20T22:17:18.06000/dc:datemeta:editing-durationPT14M12S/meta:editing-durationmeta:editing-cycles3/meta:editing-cyclesmeta:document-statistic meta:table-count=5 meta:image-count=1 meta:object-count=0 meta:page-count=1 meta:paragraph-count=2668 meta:word-count=9397 meta:character-count=67860 meta:non-whitespace-character-count=59388/meta:user-defined meta:name=google-site-verificationJUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA/meta:user-defined/office:meta + office:metadc:titleCredits » LibreOffice/dc:titlemeta:keywordCredits/meta:keywordmeta:keywordcontributors/meta:keywordmeta:keywordcoders/meta:keywordmeta:keyworddevelopers/meta:keyworddc:descriptionCredits for the LibreOffice development/coding./dc:descriptionmeta:generatorLibreOffice/4.3.0.3$Linux_X86_64 LibreOffice_project/08ebe52789a201dd7d38ef653ef7a48925e7f9f7/meta:generatordc:date2012-02-20T22:17:18.06000/dc:datemeta:editing-durationPT14M12S/meta:editing-durationmeta:editing-cycles3/meta:editing-cyclesmeta:document-statistic meta:table-count=5 meta:image-count=1 meta:object-count=0 meta:page-count=2 meta:paragraph-count=2910 meta:word-count=10213 meta:character-count=73923 meta:non-whitespace-character-count=64706/meta:user-defined
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3-1' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a194baa8db4709305b0d6749439c5455f58e6e72 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Tue Aug 26 04:55:01 2014 +0200 Updated core Project: translations 3350f80e541fc61ab0030d8e65e978a19081e09a diff --git a/translations b/translations index 970cab8..3350f80 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 970cab80f1c745ac81151777289c79341eefe9d3 +Subproject commit 3350f80e541fc61ab0030d8e65e978a19081e09a ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3-1' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit de2f1d37a9a5d052fba310267a0a259105734535 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Tue Aug 26 06:09:12 2014 +0200 bump product version to 4.3.1.2.0+ Change-Id: Ideebca9bc680daadd677ef25b333686564969653 diff --git a/configure.ac b/configure.ac index ed16fa4..a454ecc 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[4.3.1.1.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[4.3.1.2.0+],[],[],[http://documentfoundation.org/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-4.3.1.2'
Tag 'libreoffice-4.3.1.2' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2014-08-26 05:08 -0700 Tag libreoffice-4.3.1.2 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJT/Ag4AAoJEPQ0oe+v7q6jaBgP/21/N3+93L4PwCxjxY1VcMZl eM3pCysL2SOifqj04+fiS9mRND214kRVp5I+DlnzXSDg+GDQ5o6Eyj8JAPrus49U xK4+6sBdLfUYtOINx8ncV63gqHQ2AxpdYf8vBOnNj5b/HeZG0NoCBmMjI7BLvH8r JOhPjQw+gjXyqTo8rmt5NvMaat8v2CNJJRlOeokjfDCGy2LvuprQGRetp+V6oiiF 20fG+1na6frgISeO8EKvUuRdeItMu0tYle36FeOgBgg6uoJ4xrGfdpdcYeglVhlu 8j7VmHXypnVC8UUD3msT8IXiFXnWbSjntBEa6vEVC1+RZqAWICJgYXGyq7AY0vUc W7JysNua7oZzumyNrYCxeDv9MYSbs1mjMw8C7vposCD+4r6f8nL0NH3MAfyZ93kb MLgP/mCxQ4QqAAe4bmYQzlTdo/S96RvGHWqoEOKqiD+Z4opLVZwQ4Hz1FsT11wOS bjg+5UZg7ZgLxMB/2I7xKMD4FqdOOsA4QJOb98D4w7k3/U/l4l02bwzPMHp7TKSN 9wH/2kfRav2+7TD3NR6JJLOCBmKIPAQ42FmQxbHk0GW+gwMFIIqMo9XYFuqpvAI4 OEoyVyf75TW/Wums+UJcBN/3h9XaCxeF+8CsphNG0vJY5QaOJ3R1TrJ7VNc13z3n tr1BInwaNqmdowByPutG =IuCo -END PGP SIGNATURE- Changes since libreoffice-4.3.0.0.beta1-10: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-4.3.1.2'
Tag 'libreoffice-4.3.1.2' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2014-08-26 05:08 -0700 Tag libreoffice-4.3.1.2 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJT/Ag8AAoJEPQ0oe+v7q6j2ZMP/jfZk8TrIjf03RSTeMwmKyMU 9oRJgYnyWgapWWp2ov2FDVWyGeCL7CEqg/oZwA8p/7Ci5Sb7fYER6pF/aMFGAKZh ry//EIJPUB4i7A7epHzyOyekzWoyhBnLD0wN2qs+yKgbQAwtcV0Fo7oyyfQxJnr2 0fNMD0215uCGuEV/dk411WBDsCnBomYjUuLGaTP6ZzE4Z/pFYODZ41p66JUzAr3X ai1vNwXpYZT1Cy4lZYYSKAuEfKvz68N3mZeLvl5I/1Q9Yc5NBi3IMxVvUiaY9cW1 YfY3TyN1mOVzGqV1FA1Xhp0SoAl0pNRVkhl43Ostj2pGBj2nZrIKOG12I870/jeA rd614dcdbwVl6dyZJtObJCqDE0JRI9goMIPqAq6KYx8vlKtj7mG/JxMMDGM67v/u 4OR7yuI852laXpcwCSDMeMWOJGfM2/zaacu1n7uMfuQJvkYZMmnby9LC/Q141ekE ffGXTejmZzi9qvgd9DQM/+sFFZw5jc+vtXm/v6zfmzDlD9tbYM6CDu/E3Omfbb7u 5FllmG+E+ePW4fAyRsuxWJV90jT9KWdDCo1kxJJz9b9FFwJJeXQVWjzNq9ZeUsri GGbjI325HlClJuvf/D9J+8mdBjRZhmj3b3G1/WSZMDVDIJpWcSyoSt6G+dcL587T Tg2nbdOAjlc1Lks6t6FH =utrV -END PGP SIGNATURE- Changes since libreoffice-4.3.0.0.beta1-17: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-4.3.1.2'
Tag 'libreoffice-4.3.1.2' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2014-08-26 05:08 -0700 Tag libreoffice-4.3.1.2 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJT/AgzAAoJEPQ0oe+v7q6j/iAP/iQ75DG4+LKmR77GOtPcu07n w87bGM6pFLBNkn5agGTup+Cm6LFewKEMgtD+NSj2CmEfOPyTLdHANSQBIlkVDmTc NzD7jyAdjgHfoQLItPcHM4U7UkvBjJaZ8MuaGmoySes4LsJ2Rh4pbtPVsU2IGC/h IRCckyDk0rNHWcBJh9zB0atDL1BfC+jimGA089tQcWSLN3NUBrUQsfwHqTbPWBVh y/Q/W3ypm7BZboIbPwjg77d+lj29zDUrzrap1eP9rjpk6whiaC/cZ9GRe75pSdNV aGTYacb0l+s1NjW//nzftt39s1baQ/vIQkGK8h9VzAaWeUHmqh+3s6VhVDQuaT+A GfA+h6J5uUS6sXuyuFlKySjZjwWUv1SMKe61ns3w3q2iO3w7G209rDOu1V+cWHYC /iM7skw1gM+kdygfwLoidmMO0VpazWIhtVAAJSpfwbaAadOZaxoLBtw41zI8y5nS /jP5ilk3EHsAq4Ud89iHZ/uzb4yYs4MEjT+JSU1nY3z0eFh49yOXaR6ZOHqWrECW jjzWMdPCSSKwMDVgsC/ZOGkEudb503IqytGig3Iiz09iS4FILZRtOkFGcIsLFedG Hi/w58CdtkLWvpRXMHQMyoU/r303m8+y94/VltwjIUX1L/KtuDz7YGx5h+0dcdE7 wdfinnrH1HmjtriAmtLP =S1e0 -END PGP SIGNATURE- Changes since libreoffice-4.3.0.0.beta1-5: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-4.3.1.2'
Tag 'libreoffice-4.3.1.2' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2014-08-26 05:08 -0700 Tag libreoffice-4.3.1.2 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJT/AhAAAoJEPQ0oe+v7q6jf0IP/1GAhbOSZHTpsRT6bez8fAFv JtnGsbib55RSy+UB+SCsZlAXr2HcgaYEBnHlquL7T6dkE4+jlZ/7EALnd26bALv2 g/zOmdx2recl1YMm3PkczcRTZhclmlq9PPVYf6HQkYp4hpoLdpp03KUTTQ4ObsOZ kSyNJ2qMWXlNVR/aj/BE5DNVzqmHniwZonlxOFf+M4Nd9tD9Q9Y/M6bne0BF+pM2 AkRr3+OmISJp2otfFZ8MSYU9/Enk3eN/tFqbAeaU70ZPurhXwk4Lcp2812p3xSbn RELDhtwliywkTJoMi05cc+4sd/4QHddWTQsoVkT9CijXXYcfte8xcBEL6sAdATTn 28XxlMomDsCeFkbzZY3octeX3oZcL+rcGajaqjL7IyvfibRsnrEdT42S3PbgQWA1 b8W/Oq5FJPR0HGfYfwPVD5PGdW7ZrPFfH2qNXC6V3bVhf4PRuMqmcN9Jd7veT8cd UYXbgsElTRkMTYGSwV0/f/or3DlyRK637vlcsQoko1UtOZT6ooAaZ0IutW5lxxJg wJ5tl0u7FyqCz6fueOg4LaFAOmlnFNVFh7GQN5pFZXDcFkqXGkkahwTPRapYb58u e55iZocbKnpAYEAq/INqMHt+i+VAp4gBNxK55ruoJAVrQ1rRXEloa351CiynuVo4 yNDDKhUTbs3Wlrwb1uwD =JSiE -END PGP SIGNATURE- Changes since libreoffice-4-3-branch-point-796: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - sal/Library_sal.mk sal/osl
sal/Library_sal.mk |1 +
sal/osl/unx/uunxapi.cxx | 39 +++
2 files changed, 36 insertions(+), 4 deletions(-)
New commits:
commit fd85a9b29aab8e64389008a8055862ffc586d8a8
Author: Tor Lillqvist t...@collabora.com
Date: Fri Aug 15 01:39:49 2014 +0300
Don't do the security scope bookmark dance if not in a sandboxed process
No point in doing it in build-time tools like cppumaker which don't
run as sandboxed processes. Just slows them down a lot, while cfprefsd
consumes lots of CPU doing user preference lookups in vain for every
file accessed through the uunxapi functions.
Change-Id: I83e55a8e8d0c4f2c60c60ecad2c831e42c9e5bfd
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index cbc52a7..0df609d 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -80,6 +80,7 @@ $(eval $(call gb_Library_use_system_darwin_frameworks,sal,\
Carbon \
CoreFoundation \
Foundation \
+ $(if $(ENABLE_MACOSX_SANDBOX),Security) \
))
endif
diff --git a/sal/osl/unx/uunxapi.cxx b/sal/osl/unx/uunxapi.cxx
index a9f3c5f..4be32da 100644
--- a/sal/osl/unx/uunxapi.cxx
+++ b/sal/osl/unx/uunxapi.cxx
@@ -37,11 +37,36 @@ inline rtl::OString OUStringToOString(const rtl_uString* s)
#if defined(MACOSX) MAC_OS_X_VERSION_MIN_REQUIRED = 1070
HAVE_FEATURE_MACOSX_SANDBOX
+#include Foundation/Foundation.h
+#include Security/Security.h
+#include mach-o/dyld.h
+
static NSUserDefaults *userDefaults = NULL;
+static bool isSandboxed = false;
-static void get_user_defaults()
+static void do_once()
{
-userDefaults = [NSUserDefaults standardUserDefaults];
+SecCodeRef code;
+OSStatus rc = SecCodeCopySelf(kSecCSDefaultFlags, code);
+
+SecStaticCodeRef staticCode;
+if (rc == errSecSuccess)
+rc = SecCodeCopyStaticCode(code, kSecCSDefaultFlags, staticCode);
+
+CFDictionaryRef signingInformation;
+if (rc == errSecSuccess)
+rc = SecCodeCopySigningInformation(staticCode,
kSecCSRequirementInformation, signingInformation);
+
+CFDictionaryRef entitlements = NULL;
+if (rc == errSecSuccess)
+entitlements = (CFDictionaryRef)
CFDictionaryGetValue(signingInformation, kSecCodeInfoEntitlementsDict);
+
+if (entitlements != NULL)
+if (CFDictionaryGetValue(entitlements,
CFSTR(com.apple.security.app-sandbox)) != NULL)
+isSandboxed = true;
+
+if (isSandboxed)
+userDefaults = [NSUserDefaults standardUserDefaults];
}
typedef struct {
@@ -53,12 +78,15 @@ static accessFilePathState *
prepare_to_access_file_path( const char *cpFilePath )
{
static pthread_once_t once = PTHREAD_ONCE_INIT;
-pthread_once(once, get_user_defaults);
+pthread_once(once, do_once);
NSURL *fileURL = nil;
NSData *data = nil;
BOOL stale;
accessFilePathState *state;
+if (!isSandboxed)
+return NULL;
+
// If malloc() fails we are screwed anyway
state = (accessFilePathState*) malloc(sizeof(accessFilePathState));
@@ -86,6 +114,9 @@ prepare_to_access_file_path( const char *cpFilePath )
static void
done_accessing_file_path( const char * /*cpFilePath*/, accessFilePathState
*state )
{
+if (!isSandboxed)
+return;
+
int saved_errno = errno;
if (state-scopeURL != nil)
@@ -263,7 +294,7 @@ int open_c(const char *cpPath, int oflag, int mode)
int result = open(cpPath, oflag, mode);
#if defined(MACOSX) MAC_OS_X_VERSION_MIN_REQUIRED = 1070
HAVE_FEATURE_MACOSX_SANDBOX
-if (result != -1 (oflag O_CREAT) (oflag O_EXCL))
+if (isSandboxed result != -1 (oflag O_CREAT) (oflag O_EXCL))
{
// A new file was created. Check if it is outside the sandbox.
// (In that case it must be one the user selected as export or
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-qa] Media Support in LibreOffice
On Sat, Aug 23, 2014 at 7:59 PM, Jay Philips philip...@hotmail.com wrote: Hi Robinson, I have updated the wiki with my finds for Linux and Windows. Thanks! (And thanks to Owen for providing additional information) Alex's Mac findings can be found at https://www.libreoffice.org/bugzilla/show_bug.cgi?id=79546 and pretty much can be summaries as videos can be inserted and a preview will display, but has no playback. So there's no video playback on OSX right now? How about audio -- same problem? Alex did a lot of great testing w/different file formats in bug 79546. I'm going to add that to the wiki in tabular form. https://wiki.documentfoundation.org/Media_Support If someone is interested in performing some cross-platform testing re: image support, it would be great to have that included on the wiki as well. Cheers, --R -- Robinson Tryon QA Engineer - The Document Foundation Volunteer Coordinator - LibreOffice Community Outreach qu...@libreoffice.org ___ 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] Media Support in LibreOffice
Hey R, To my knowledge image support is pretty much all good (i'm assuming you mean simple image formats like jpg, png, etc), while more complex image formats have minor issues in eps (eps seems to have more problems outside of windows) and wmf (wmf is handled by a library managed by the document liberation team). Below are bugs i've reporter/commented on for the different formats. WMF https://bugs.freedesktop.org/show_bug.cgi?id=79664 https://www.libreoffice.org/bugzilla/show_bug.cgi?id=80503 https://www.libreoffice.org/bugzilla/show_bug.cgi?id=80389 https://www.libreoffice.org/bugzilla/show_bug.cgi?id=77525 EPS https://bugs.freedesktop.org/show_bug.cgi?id=80036 https://www.libreoffice.org/bugzilla/show_bug.cgi?id=70751 https://www.libreoffice.org/bugzilla/show_bug.cgi?id=81592 https://www.libreoffice.org/bugzilla/show_bug.cgi?id=71828 When it comes to svg, the svg insert library is quite good and constantly improving. When it comes to the svg open library that works in Draw, that one has quite alot of problems from the bug reports i've seen and i havent seen much work going into fixing those bugs. SVG Insert https://www.libreoffice.org/bugzilla/show_bug.cgi?id=78554 https://www.libreoffice.org/bugzilla/show_bug.cgi?id=82221 Regards, Jay Philips On 08/25/2014 07:02 PM, Robinson Tryon wrote: On Sat, Aug 23, 2014 at 7:59 PM, Jay Philips philip...@hotmail.com wrote: Hi Robinson, I have updated the wiki with my finds for Linux and Windows. Thanks! (And thanks to Owen for providing additional information) Alex's Mac findings can be found at https://www.libreoffice.org/bugzilla/show_bug.cgi?id=79546 and pretty much can be summaries as videos can be inserted and a preview will display, but has no playback. So there's no video playback on OSX right now? How about audio -- same problem? Alex did a lot of great testing w/different file formats in bug 79546. I'm going to add that to the wiki in tabular form. https://wiki.documentfoundation.org/Media_Support If someone is interested in performing some cross-platform testing re: image support, it would be great to have that included on the wiki as well. Cheers, --R ___ 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] Media Support in LibreOffice
Jay -- Can you tell me which version of LibreOffice you were using for the GNU/Linux test results in this bug? (Oh, and which input media files you tested would also be appreciated) https://wiki.documentfoundation.org/Media_Support#Test_Results Thanks, --R ___ 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-bugs] [Bug 81301] apply border won't work because of hyphen to en-dash autocorrect collision (nl-NL and nl-BE locales only)
https://bugs.freedesktop.org/show_bug.cgi?id=81301 --- Comment #11 from tommy27 ba...@quipo.it --- another Dutch autocorrect collision due to the hyphen to en-dash replacement is that when you type -- instead of the expected conversion to → you will get –- -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 83035] Spelling and grammar not working
https://bugs.freedesktop.org/show_bug.cgi?id=83035 Adolfo Jayme f...@libreoffice.org changed: What|Removed |Added Status|UNCONFIRMED |NEEDINFO Ever confirmed|0 |1 --- Comment #1 from Adolfo Jayme f...@libreoffice.org --- Thanks for filing this bug. Unfortunately, we cannot work on it because your description didn’t include enough information. You may find it helpful to read “How to report bugs effectively” http://www.chiark.greenend.org.uk/~sgtatham/bugs.html. We’d be grateful if you would then provide a more complete description of the problem. What steps did you try, did it work in a previous version, etcetera. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 80927] Win: crash with Quickstarter enabled
https://bugs.freedesktop.org/show_bug.cgi?id=80927 --- Comment #40 from Kiss-Kálmán Dániel kisskalmandan...@gmail.com --- (In reply to comment #39) (In reply to comment #38) I can reproduce this bug in 4.3.0.4 Win7 x64. It was not present from the time of installation, started after some time. Now i can reproduce it on almost every start of both Quickstarter and single apps like writer. On startup the program freezes for 6-8 minutes, and almost all other programs also freezes, in this period, not even CTRL+ALT+DELETE can't open the Windows joblist, until LibreOffice decies to un-freeze. UPDATE I uninstalled 4.3.0.4 and then installed 4.3.1.1, that fixed the bug for me lucky you ;) I tried but not for me ;( can you see the icon on the systemtray? -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 79546] OSX - no video playback in slideshow fullscreen display mode on OSX 10.9
https://bugs.freedesktop.org/show_bug.cgi?id=79546 --- Comment #35 from Alex Thurgood ipla...@yahoo.co.uk --- And regressions (comment 27) get ignored as no longer being MAB ? I give up. Seriously, what is the point of all the testing if this is the kind of automated response that a QAer gets ? When was this decided ? I don't see it in the minutes of the latest dev IRC, merely that a discussion took place. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 80650] lower case greek alphabet missing in localized Math symbol table
https://bugs.freedesktop.org/show_bug.cgi?id=80650 --- Comment #21 from Laurent BP jumbo4...@yahoo.fr --- (In reply to comment #20) A bibisect would be fantastic here in helping us resolve the problem: https://wiki.documentfoundation.org/QA/HowToBibisect @Joel: I don't know how we can do a bibisect on this bug: it appears *only* with locales, and intermediate builds are only English US (if I'm not wrong). -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 83044] New: FILESAVE: File gets corrupted after roundtrip due to w:text has a wrong child w:docPartGallery and w:docPartUnique
https://bugs.freedesktop.org/show_bug.cgi?id=83044 Priority: medium Bug ID: 83044 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: FILESAVE: File gets corrupted after roundtrip due to w:text has a wrong child w:docPartGallery and w:docPartUnique Severity: normal Classification: Unclassified OS: Linux (All) Reporter: rohit.deshm...@synerzip.com Hardware: Other Whiteboard: BSA Status: UNCONFIRMED Version: 4.4.0.0.alpha0+ Master Component: Writer Product: LibreOffice Created attachment 105217 -- https://bugs.freedesktop.org/attachment.cgi?id=105217action=edit Original file Steps to reproduce : 1] Open attached DOCX in LibreOffice 2] Perform save_as DOCX 3] Open saved file in MS Office 2010 Current behavior : File gets corrupt. Expected behavior : File should open in MS office 2010 without any error. Operating System: Ubuntu Version: 4.4.0.0.alpha0+ Master -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 83044] FILESAVE: File gets corrupted after roundtrip due to w:text has a wrong child w:docPartGallery and w:docPartUnique
https://bugs.freedesktop.org/show_bug.cgi?id=83044 Rohit Deshmukh rohit.deshm...@synerzip.com changed: What|Removed |Added Assignee|libreoffice-b...@lists.free |rohit.deshm...@synerzip.com |desktop.org | -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 79546] OSX - no video playback in slideshow fullscreen display mode on OSX 10.9
https://bugs.freedesktop.org/show_bug.cgi?id=79546 foss f...@openmailbox.org changed: What|Removed |Added Priority|high|highest --- Comment #36 from foss f...@openmailbox.org --- Alex, don't take this personally. I don't think it was done in bad intention. Raising back to highest since * broken core functions (or is using videos in presentations not a core functionality?) * happens frequently, 100% of times to be exact so from the flowchart this qualifies as Highest, Blocker. Maybe because it's only OSX makes it less bad? Also video usage in presentation is still a major pain on all platforms (linux seems to work a little if you're lucky, while OSX and windows seem to be completely broken. So it would be great of the dev team, to address this core functionality bug. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
