LibreOffice Gerrit News for submodules on 2014-11-03
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: + fdo#85686 update help page for Calc Option Formula in https://gerrit.libreoffice.org/12165 from Olivier Hallot * Merged changes on master for project help changed in the last 25 hours: None * 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-11-03
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + fdo#81475 - Rearrangement some buttons and add some hidden ones in https://gerrit.libreoffice.org/12203 from Yousuf Philips about module sw + TANGO: addition of new symbol icon and minor fixes to others in https://gerrit.libreoffice.org/12206 from Yousuf Philips about module icon-themes + OXYGEN: fixes to font color icons in https://gerrit.libreoffice.org/12204 from Yousuf Philips about module icon-themes + gbuild: introduce add_objcxxflags_exception_object/objects in https://gerrit.libreoffice.org/11815 from Douglas Mencken about module sal, solenv + pyhon: add lib-dynload libs to fixinstallnames (OS X) in https://gerrit.libreoffice.org/12200 from Robert Antoni Buj i Gelonch about module external + fdo#60906 - Make color configuration consistent in https://gerrit.libreoffice.org/12199 from Ioan Radu about module svtools End of freshness + vcl: merge DrawPolyLineDirect() and drawPolyLineDirectNoAACheck() in https://gerrit.libreoffice.org/12191 from Chris Sherlock about module include, vcl + HIG fixes for the rest of cui (and a bit of sw) in https://gerrit.libreoffice.org/12207 from Adolfo Jayme Barrientos about module cui, sw + Use rtl/character.hxx and de-objectize basiccharclass in https://gerrit.libreoffice.org/11979 from Arnaud Versini about module basic, include + fix memory leak of pointers contained in m_aErrDescList in https://gerrit.libreoffice.org/12205 from Takeshi Abe about module starmath + fdo#75256 Improve Sifr Icon Theme in https://gerrit.libreoffice.org/12158 from Matthias Freund about module icon-themes + fdo#39468 Translate German Comments - final bits of sc/source/filter/ in https://gerrit.libreoffice.org/12194 from Christian M. Heller about module sc + fdo#39468 Translate German Comments - sc/source/core/data/documen2.cxx in https://gerrit.libreoffice.org/12195 from Christian M. Heller about module sc * Merged changes on master for project core changed in the last 25 hours: + fix assert I added to KeyCode in https://gerrit.libreoffice.org/12180 from Noel Grandin + vcl: Refactor OutputDevice::TryDrawPolyLineDirect() in https://gerrit.libreoffice.org/12190 from Chris Sherlock + revert the KeyCode asserts in https://gerrit.libreoffice.org/12193 from Noel Grandin + vcl: include variable names in definition of OutputDevice::DrawPolyLine() in https://gerrit.libreoffice.org/12189 from Chris Sherlock + second attempt at fixing my asserts in https://gerrit.libreoffice.org/12184 from Noel Grandin * Abandoned changes on master for project core changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: + jvmfwk: Apple & Oracle's JRE detection for OS X 10.8+ in https://gerrit.libreoffice.org/12057 from Robert Antoni Buj i Gelonch + HIG-ification of GSoC Color Picker dialog in https://gerrit.libreoffice.org/11494 from Olivier Hallot + WIP: fdo#43090: Add an option to disable autoclose brackets in https://gerrit.libreoffice.org/12024 from Marcos Paulo de Souza + convert ScHint ID's to an enum in https://gerrit.libreoffice.org/11986 from Noel Grandin + fdo#39625 Make existing CppUnittests work in https://gerrit.libreoffice.org/11605 from Tobias Madl + fdo#58194 - export DOCX Automatic indent as firstLine indent in https://gerrit.libreoffice.org/10425 from Joren De Cuyper + WIP (do not merge): remove custom impl of bidirectional list in https://gerrit.libreoffice.org/11001 from Chris Laplante + fdo#83003 Startcenter: No method for returnin Recent Docs in https://gerrit.libreoffice.org/11525 from Efe Gürkan Yalaman + fdo#82335. in https://gerrit.libreoffice.org/11555 from Sudarshan Rao + fdo#81956 : Rendering of vml group shape was wrong. in https://gerrit.libreoffice.org/11013 from sushil_shinde + fdo#79018: LO hangs while opening file. in https://gerrit.libreoffice.org/9564 from Yogesh Bharate + 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#80996:Fix for DataLabel not preserved for ColumnChart after RT in https://gerrit.libreoffice.org/10169 from Dushyant Bhalgami + 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: Branch 'feature/perfwork4' - sc/source
sc/source/filter/excel/xetable.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ccb97bf357dee5d62fbd82a96f51e01366b47afc
Author: Kohei Yoshida
Date: Sun Nov 2 23:29:47 2014 -0500
Windows build fix.
Change-Id: I098a936c3d1998a234a82547d164afcd493f1e41
diff --git a/sc/source/filter/excel/xetable.cxx
b/sc/source/filter/excel/xetable.cxx
index 174b78a..bf9830d 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -2078,7 +2078,7 @@ void XclExpRowBuffer::Finalize( XclExpDefaultRowData&
rDefRowData, const ScfUInt
else
{
comphelper::ThreadPool &rPool =
comphelper::ThreadPool::getSharedOptimalPool();
-RowFinalizeTask *pTasks[ nThreads ];
+std::vector pTasks(nThreads, NULL);
for ( size_t i = 0; i < nThreads; i++ )
pTasks[ i ] = new RowFinalizeTask( rColXFIndexes, i == 0 );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/source
chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d9473f25380c627966b4406cc4cdfaafcf44bc37
Author: Markus Mohrhard
Date: Mon Nov 3 05:14:45 2014 +0100
coverity#1242524, arguments in wrong order
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
index fba08df..6fde3c4 100644
--- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
@@ -1262,7 +1262,7 @@ void WrappedDataRowSourceProperty::setPropertyValue(
const Any& rOuterValue, con
{
aSequenceMapping.realloc(0);
DataSourceHelper::setRangeSegmentation(
-m_spChart2ModelContact->getChartModel(), aSequenceMapping,
bNewUseColumns , bHasCategories, bFirstCellAsLabel );
+m_spChart2ModelContact->getChartModel(), aSequenceMapping,
bNewUseColumns , bFirstCellAsLabel , bHasCategories);
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: parallelizing crashtest runs (was: minutes of ESC call ...)
Hey, On Fri, Oct 31, 2014 at 2:45 PM, Christian Lohmaier wrote: > Hi Markus, *, > > On Fri, Oct 31, 2014 at 2:38 PM, Markus Mohrhard > wrote: >> >> The quick and ugly one is to partition the directories into 100 file >> directories. I have a script for that as I have done exactly that for >> the memcheck run on the 70 core Largo server. It is a quick and ugly >> implementation. >> The clean and much better solution is to move away from directory >> based invocation and partion by files on the fly. > > Yeah, I also thought of keeping the per-directory/filetype processing, > but instead run multiple dirs at once, rather divide the set of files > of a given dir into the chunks. > >> I have a >> proof-of-concept somewhere on my machine and will push a working >> version during the next days. > > nice :-) > So a working version is currently running on the VM. The version in the repo will be updated as soon as the script finishes without a problem. It parallelizes now nearly perfectly as it divides the work in 100 file chunks and works on them. This means that after the last update of the test files we have 641 jobs that will be put into a queue and we process as many jobs in parallel as we want (5 at the VM at the moment). Additionally the updated version of the script no longer hard codes a mapping from the file extension to the component and instead queries LibreOffice to see which component opened the file. That allows to remove quite a few mappings and will result in all file types to be imported. The old version only imported file types that were registered. The new script should scale nearly perfectly. There are still a few enhancements on my list so if anyone is interested in python tasks please talk to me. Regards, Markus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/perfwork4' - chart2/inc chart2/source include/svx offapi/com offapi/UnoApi_offapi.mk svx/inc svx/source
chart2/inc/ChartView.hxx | 10 +++-
chart2/source/view/main/ChartView.cxx| 16 +--
include/svx/charthelper.hxx |2
include/svx/sdr/contact/viewcontact.hxx |2
offapi/UnoApi_offapi.mk |1
offapi/com/sun/star/util/XUpdatable2.idl | 43 +++
svx/inc/sdr/contact/viewcontactofsdrole2obj.hxx |2
svx/source/sdr/contact/viewcontact.cxx |6 ++
svx/source/sdr/contact/viewcontactofsdrole2obj.cxx | 32 +-
svx/source/sdr/contact/viewobjectcontact.cxx | 29
svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx | 12 +
svx/source/svdraw/charthelper.cxx| 15 --
12 files changed, 146 insertions(+), 24 deletions(-)
New commits:
commit d1e4aae65428bdf0d36691586f30e2cc852654d8
Author: Kohei Yoshida
Date: Sun Nov 2 14:35:31 2014 -0500
Avoid re-constructing chart shapes when it's not in visible range.
The re-construction will be deferred until it becomes visible again.
Change-Id: I364ea8d38d48078dfd803b0e5bb20bfc8a2913ba
diff --git a/chart2/inc/ChartView.hxx b/chart2/inc/ChartView.hxx
index d155c45..047192a 100644
--- a/chart2/inc/ChartView.hxx
+++ b/chart2/inc/ChartView.hxx
@@ -37,7 +37,7 @@
#include
#include
#include
-#include
+#include
#include
#include
@@ -96,7 +96,7 @@ class ChartView : public ::cppu::WeakImplHelper10<
,::com::sun::star::lang::XUnoTunnel
,::com::sun::star::util::XModifyListener
,::com::sun::star::util::XModeChangeBroadcaster
-,::com::sun::star::util::XUpdatable
+,::com::sun::star::util::XUpdatable2
,::com::sun::star::beans::XPropertySet
,::com::sun::star::lang::XMultiServiceFactory
,::com::sun::star::qa::XDumper
@@ -169,6 +169,10 @@ public:
// ::com::sun::star::util::XUpdatable
virtual void SAL_CALL update() throw
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+// util::XUpdatable2
+virtual void SAL_CALL updateSoft() throw (css::uno::RuntimeException,
std::exception) SAL_OVERRIDE;
+virtual void SAL_CALL updateHard() throw (css::uno::RuntimeException,
std::exception) SAL_OVERRIDE;
+
// ::com::sun::star::beans::XPropertySet
virtual ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( )
throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName,
const ::com::sun::star::uno::Any& aValue ) throw
(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::beans::PropertyVetoException,
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
@@ -217,7 +221,7 @@ private: //methods
void impl_refreshAddIn();
bool impl_AddInDrawsAllByItself();
-void impl_updateView();
+void impl_updateView( bool bCheckLockedCtrler = true );
void render();
diff --git a/chart2/source/view/main/ChartView.cxx
b/chart2/source/view/main/ChartView.cxx
index 769c007..5af5d02 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -2639,7 +2639,7 @@ void SAL_CALL ChartView::disposing( const
lang::EventObject& /* rSource */ )
{
}
-void ChartView::impl_updateView()
+void ChartView::impl_updateView( bool bCheckLockedCtrler )
{
if( !m_pDrawModelWrapper )
return;
@@ -2650,7 +2650,7 @@ void ChartView::impl_updateView()
return;
}
-if (mrChartModel.hasControllersLocked())
+if (bCheckLockedCtrler && mrChartModel.hasControllersLocked())
return;
if( m_bViewDirty && !m_bInViewUpdate )
@@ -2834,7 +2834,7 @@ void SAL_CALL ChartView::removeModeChangeApproveListener(
const uno::Reference<
// XUpdatable
void SAL_CALL ChartView::update() throw (uno::RuntimeException, std::exception)
{
-impl_updateView();
+impl_updateView(true);
//#i100778# migrate all imported or old documents to a plot area sizing
exclusive axes (in case the save settings allow for this):
//Although in general it is a bad idea to change the model from within the
view this is exceptionally the best place to do this special conversion.
@@ -2845,6 +2845,16 @@ void SAL_CALL ChartView::update() throw
(uno::RuntimeException, std::exception)
impl_updateView();
}
+void SAL_CALL ChartView::updateSoft() throw (uno::RuntimeException,
std::exception)
+{
+update();
+}
+
+void SAL_CALL ChartView::updateHard() throw (uno::RuntimeException,
std::exception)
+{
+impl_updateView(false);
+}
+
// XPropertySet
Reference< beans::XPropertySetInfo > SAL_CALL ChartView::getPropertySetInfo()
throw (uno::RuntimeExc
Re: minutes of ESC call ...
Michael Meeks wrote: > + apparently a fiction that as of today there is idle TDF owned hardware. > No idea why this is relevant here, but for the record: there is a number of donated / sponsored boxes with TDF, that for various hysterical reasons are not under infra control. 3-4 of them are mostly idle or powered down. Cheers, -- Thorsten signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: coverity warnings update, < 200
Caolan McNamara wrote: > I reckon practically all the "swapped arguments" are ok except maybe for > 1242508. (caolanm->quikee: in 1b23e46051d8cc7c01fd8b4d0ea51bfec145db8e > there is.. > - pWriteAcc->SetPixel( i, x, aResultColor ); > + pWriteAcc->SetPixel( x, y, aResultColor ); > and SetPixel takes args named x, y. so are those arguments definitely > not the wrong way around or is it actually a real detected problem?) > Aye. But SetPixel arg ordering is just being totally silly. Fix pushed though. Cheers, -- Thorsten signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Java problem when running CppunitTest_dbaccess_dialog_save on OS X 10.10 with Oracle JDK 1.8
The file /Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Info.plist contains only CommandLine string for JVMCapabilities key, for this reason OS X doesn't detect a full java runtime installation. Regards, Robert On Sat, Nov 1, 2014 at 11:32 PM, Robert Antoni Buj i Gelonch < robert@gmail.com> wrote: > Not yet solved. No Java runtime present, requesting install. > > On Sat, Nov 1, 2014 at 8:41 PM, Robert Antoni Buj i Gelonch < > robert@gmail.com> wrote: > >> I think that the following command can solve the issue with Oracle's JDKs. >> >> sudo curl -o /Library/Java/Extensions/javaee-api-7.0.jar -O#L >> http://central.maven.org/maven2/javax/javaee-api/7.0/javaee-api-7.0.jar >> >> >> Regards, >> >> Robert >> >> On Sat, Nov 1, 2014 at 8:19 PM, Robert Antoni Buj i Gelonch < >> robert@gmail.com> wrote: >> >>> HSQLDB requires some J2EE libs that aren't bundled within a standard JDK >>> (javax.servlet). >>> >>> source files: >>> >>> ./workdir/UnpackedTarball/hsqldb/src/hsqlServlet.java >>> >>> ./workdir/UnpackedTarball/hsqldb/src/org/hsqldb/Servlet.java >>> >>> >>> build: >>> >>> ./workdir/UnpackedTarball/hsqldb/classes/hsqlServlet.class >>> >>> ./workdir/UnpackedTarball/hsqldb/classes/org/hsqldb/Servlet.class >>> >>> >>> Regards, >>> >>> Robert >>> >>> On Tue, Oct 28, 2014 at 11:22 AM, Stephan Bergmann >>> wrote: >>> On 10/20/2014 01:48 PM, Alexander Thurgood wrote: > I encountrered this very same problem, and solved it by installing the > appropriate JavaforOSX2014-001.dmg, which allowed my build to complete > the debug tests, but this apparently also has consequences for use of > third party jdbc drivers that rely on JDK 1.8 > In how far? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice >>> >>> >>> >>> -- >>> http://about.me/rbuj >>> >> >> >> >> -- >> http://about.me/rbuj >> > > > > -- > http://about.me/rbuj > -- http://about.me/rbuj ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/bitmap3.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 10e77ab3ff6f4314137acd6e2702a6e5c1ce1fae Author: Thorsten Behrens Date: Sun Nov 2 22:37:32 2014 +0100 coverity#1242508: swapped arguments Change-Id: If86cc3cd9ea40dc826c93d6adb6e11fab20a15eb diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx index ece13a3..588dd0a 100644 --- a/vcl/source/gdi/bitmap3.cxx +++ b/vcl/source/gdi/bitmap3.cxx @@ -2602,7 +2602,7 @@ bool Bitmap::ImplConvolutionPass(Bitmap& aNewBitmap, const int nNewSize, BitmapR (sal_uInt8) MinMax( aValueRed / aSum, 0, 255 ), (sal_uInt8) MinMax( aValueGreen / aSum, 0, 255 ), (sal_uInt8) MinMax( aValueBlue / aSum, 0, 255 ) ); -pWriteAcc->SetPixel( x, y, aResultColor ); +pWriteAcc->SetPixel( y, x, aResultColor ); } } aNewBitmap.ReleaseAccess( pWriteAcc ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Crash test update
Hey, On Sun, Nov 2, 2014 at 8:09 PM, Miklos Vajna wrote: > New crashtest update available at > http://dev-builds.libreoffice.org/crashtest/d72237741ed1d8f976032ff2ee5d2a8702d3380e/ > just ignore that one. The script ran into some errors due to changes in the python script. The next run will hopefully be correct again. Just a heads-up that the next run will also contain 2k documents more. Regards, Markus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] dev-tools.git: test-bugzilla-files/test-bugzilla-files.py
test-bugzilla-files/test-bugzilla-files.py | 70 -
1 file changed, 40 insertions(+), 30 deletions(-)
New commits:
commit 406588edb62589ef549f84e268b3268eb337c02a
Author: Markus Mohrhard
Date: Sun Nov 2 19:57:11 2014 +0100
better way to identify the component
diff --git a/test-bugzilla-files/test-bugzilla-files.py
b/test-bugzilla-files/test-bugzilla-files.py
index 11cf41c..e43e847 100644
--- a/test-bugzilla-files/test-bugzilla-files.py
+++ b/test-bugzilla-files/test-bugzilla-files.py
@@ -233,23 +233,45 @@ class
EventListener(XDocumentEventListener,unohelper.Base):
def mkPropertyValue(name, value):
return uno.createUnoStruct("com.sun.star.beans.PropertyValue",
name, 0, value, 0)
+de
+
+def getComponent(xDoc)
+if not xDoc:
+return "None"
+
+if xDoc.supportsService("com.sun.star.sheet.SpreadsheetDocument"):
+return "calc"
+elif xDoc.supportsService("com.sun.star.text.TextDocument"):
+return "writer"
+elif xDoc.supportsService("com.sun.star.drawing.DrawingDocument"):
+return "draw"
+elif
xDoc.supportsService("com.sun.star.presentation.PresentationDocument"):
+return "impress"
+elif xDoc.supportsService("com.sun.star.formula.FormularProperties"):
+return "math"
+elif xDoc.supportsService("com.sun.star.sdb.OfficeDatabaseDocument"):
+return "base"
+
+
+return "other"
### tests ###
-def loadFromURL(xContext, url, t, component):
+def loadFromURL(xContext, url, t):
xDesktop = xContext.ServiceManager.createInstanceWithContext(
"com.sun.star.frame.Desktop", xContext)
props = [("Hidden", True), ("ReadOnly", True)] # FilterName?
loadProps = tuple([mkPropertyValue(name, value) for (name, value) in
props])
-xListener = None
-if component == "writer":
-xListener = EventListener()
-xGEB = xContext.ServiceManager.createInstanceWithContext(
-"com.sun.star.frame.GlobalEventBroadcaster", xContext)
-xGEB.addDocumentEventListener(xListener)
+
+xListener = EventListener()
+xGEB = xContext.ServiceManager.createInstanceWithContext(
+"com.sun.star.frame.GlobalEventBroadcaster", xContext)
+xGEB.addDocumentEventListener(xListener)
+
try:
xDoc = None
xDoc = xDesktop.loadComponentFromURL(url, "_blank", 0, loadProps)
+component = getComponent(xDoc)
if component == "calc":
try:
if xDoc:
@@ -373,7 +395,6 @@ def exportDoc(xDoc, filterName, validationCommand,
filename, connection):
class ExportFileTest:
def __init__(self, xDoc, component, filename):
self.xDoc = xDoc
-self.component = component
self.filename = filename
def run(self, connection):
formats = self.getExportFormats()
@@ -396,9 +417,10 @@ class ExportFileTest:
"base" : ["odb"],
"math" : ["odf"]
}
-if not self.component in formats:
+component = getComponent(self.xDoc)
+if not component in formats:
return []
-return formats[self.component]
+return formats[component]
def getValidationCommand(self, filterName):
validationCommand = { "calc8" : "java
-Djavax.xml.validation.SchemaFactory:http://relaxng.org/ns/structure/1.0=org.iso_relax.verifier.jaxp.validation.RELAXNGSchemaFactoryImpl
-Dorg.iso_relax.verifier.VerifierFactoryLoader=com.sun.msv.verifier.jarv.FactoryLoaderImpl
-jar /home/buildslave/source/bin/odfvalidator.jar -e",
@@ -435,10 +457,9 @@ class ExportFileTest:
class LoadFileTest:
-def __init__(self, file, state, component):
+def __init__(self, file, state):
self.file = file
self.state = state
-self.component = component
def run(self, xContext, connection):
print("Loading document: " + self.file)
t = None
@@ -452,11 +473,11 @@ class LoadFileTest:
args = [connection]
t = threading.Timer(60, alarm_handler, args)
t.start()
-xDoc = loadFromURL(xContext, url, t, self.component)
+xDoc = loadFromURL(xContext, url, t)
print("doc loaded")
t.cancel()
if xDoc:
-exportTest = ExportFileTest(xDoc, self.component, self.file)
+exportTest = ExportFileTest(xDoc, self.file)
exportTest.run(connection)
self.state.goodFiles.append(self.file)
except pyuno.getClass("com.sun.star.beans.UnknownPropertyException"):
@@ -547,28 +568,17 @@ def writeReport(state, startTime):
timeoutFiles.write("\n")
timeoutFiles.close()
-validCalcFileExtensions = [ ".xlsx", ".xltx", ".xls", ".ods", ".ots", ".sxc",
".stc", ".fods", ".xlsb", ".xlsm", ".xltm", ".csv", ".slk", ".wks", ".sdc",
".sdc5" ]
-validWriterFileExtensions = [ ".docx" , ".rtf", ".odt", ".fodt", ".doc",
".odm", ".ott", "
Crash test update
New crashtest update available at http://dev-builds.libreoffice.org/crashtest/d72237741ed1d8f976032ff2ee5d2a8702d3380e/ exportCrashes.csv Description: Binary data importCrash.csv Description: Binary data validationErrors.csv Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'ports/macosx10.5/master' - 81 commits - accessibility/source apple_remote/source avmedia/Module_avmedia.mk bridges/Library_cpp_uno.mk bridges/source chart2/sour
Rebased ref, commits from common ancestor:
commit 0965b1513f46bc86a2e7bf80720cd16f7c3c4867
Author: Douglas Mencken
Date: Sat Oct 25 11:03:56 2014 -0400
vcl: workarounds for `objc_msgSend setDelegate' on OS X 10.5
(vcl/osx/salframe.cxx, vcl/osx/salmenu.cxx)
plus, move conditional includes in salframe.cxx down a bit
Change-Id: I39886b4590f227ec69042fed0f5240ba0b0fd7f2
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index 6bef65a..8afcda5 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -37,11 +37,6 @@
#include "osx/a11yfactory.h"
#include "quartz/utils.h"
-#if MACOSX_SDK_VERSION < 1060
-#include "vcl/timer.hxx"
-#include "osx/saltimer.h"
-#endif
-
#include "salwtype.hxx"
#include "premac.h"
@@ -54,6 +49,11 @@
#include
#include "postmac.h"
+#if MACOSX_SDK_VERSION < 1060
+#include "vcl/timer.hxx"
+#include "osx/saltimer.h"
+#endif
+
using namespace std;
AquaSalFrame* AquaSalFrame::s_pCaptureFrame = NULL;
@@ -201,16 +201,16 @@ void AquaSalFrame::initWindowAndView()
[mpNSWindow setAcceptsMouseMovedEvents: YES];
[mpNSWindow setHasShadow: YES];
-#if MACOSX_SDK_VERSION < 1060
-objc_msgSend(mpNSWindow, @selector(setDelegate:), mpNSWindow);
-#else
+#if MACOSX_SDK_VERSION >= 1060
+/* objc_msgSend(mpNSWindow, @selector(setDelegate:), mpNSWindow); */
[mpNSWindow setDelegate: static_cast >(mpNSWindow)];
-#endif
if( [mpNSWindow respondsToSelector: @selector(setRestorable:)])
{
objc_msgSend(mpNSWindow, @selector(setRestorable:), NO);
}
+#endif
+
const NSRect aRect = { NSZeroPoint, NSMakeSize( maGeometry.nWidth,
maGeometry.nHeight )};
mnTrackingRectTag = [mpNSView addTrackingRect: aRect owner: mpNSView
userData: nil assumeInside: NO];
diff --git a/vcl/osx/salmenu.cxx b/vcl/osx/salmenu.cxx
index 315c025..d670933 100644
--- a/vcl/osx/salmenu.cxx
+++ b/vcl/osx/salmenu.cxx
@@ -246,9 +246,8 @@ AquaSalMenu::AquaSalMenu( bool bMenuBar ) :
if( ! mbMenuBar )
{
mpMenu = [[SalNSMenu alloc] initWithMenu: this];
-#if MACOSX_SDK_VERSION < 1060
-objc_msgSend(mpMenu, @selector(setDelegate:), mpMenu);
-#else
+#if MACOSX_SDK_VERSION >= 1060
+/* objc_msgSend(mpMenu, @selector(setDelegate:), mpMenu); */
[mpMenu setDelegate: (id)mpMenu];
#endif
}
commit 6c623adef6ff6ad666470ad3d253b85f7efee296
Author: Douglas Mencken
Date: Sun Oct 26 06:38:10 2014 -0400
vcl: fix some "cannot convert 'objc_object*' to..." issues
Change-Id: I4b0e32c412937da4b2ea4bf350be32ea31362b3c
diff --git a/vcl/osx/a11ywrapper.mm b/vcl/osx/a11ywrapper.mm
index 4e19e1d..f821da7 100644
--- a/vcl/osx/a11ywrapper.mm
+++ b/vcl/osx/a11ywrapper.mm
@@ -160,7 +160,7 @@ static std::ostream &operator<<(std::ostream &s, NSPoint
point) {
// (getter with parameter)attributeNameHereAttributeForParameter:
// (setter) setAttributeNameHereAttributeForElement:to:
-(SEL)selectorForAttribute:(NSString *)attribute asGetter:(BOOL)asGetter
withGetterParameter:(BOOL)withGetterParameter {
-SEL selector = nil;
+SEL selector = (SEL)nil;
NSAutoreleasePool * pool = [ [ NSAutoreleasePool alloc ] init ];
@try {
// step 1: create method name from attribute name
@@ -186,7 +186,7 @@ static std::ostream &operator<<(std::ostream &s, NSPoint
point) {
// step 2: create selector
selector = NSSelectorFromString ( methodName );
} @catch ( id exception ) {
-selector = nil;
+selector = (SEL)nil;
}
[ pool release ];
return selector;
diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm
index b3efcae..f69fbf4 100644
--- a/vcl/osx/salframeview.mm
+++ b/vcl/osx/salframeview.mm
@@ -482,7 +482,7 @@ static AquaSalFrame* getMouseContainerFrame()
mpFrame = pFrame;
mMarkedRange = NSMakeRange(NSNotFound, 0);
mSelectedRange = NSMakeRange(NSNotFound, 0);
-mpReferenceWrapper = nil;
+mpReferenceWrapper = (ReferenceWrapper*)nil;
mpMouseEventListener = nil;
mpLastSuperEvent = nil;
}
@@ -1788,7 +1788,7 @@ private:
// some frames never become visible ..
::vcl::Window *pWindow = mpFrame -> GetWindow();
if ( ! pWindow )
-return nil;
+return (::com::sun::star::accessibility::XAccessibleContext*)nil;
mpReferenceWrapper = new ReferenceWrapper;
mpReferenceWrapper -> rAccessibleContext = pWindow ->
/*GetAccessibleChildWindow( 0 ) ->*/ GetAccessible() -> getAccessibleContext();
diff --git a/vcl/osx/salnativewidgets.cxx b/vcl/osx/salnativewidgets.cxx
index ce3ab41..69f7753 100644
--- a/vcl/osx/salnativewidgets.cxx
+++ b/vcl/osx/salnativewidgets.cxx
@@ -558,7 +558,7 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType,
[NSNumber numberWithBool:NO],
@"kCUIWindowFrameDrawTitleSeparatorKey",
[NSNumber numberWithBool:YES], @"is.fli
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/core/exportdata/ooxml/pass/abi9930.odt |binary
sw/source/filter/ww8/docxattributeoutput.cxx |2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d72237741ed1d8f976032ff2ee5d2a8702d3380e
Author: Miklos Vajna
Date: Sun Nov 2 18:22:16 2014 +0100
abi#9930 DocxAttributeOutput::AddToAttrList: avoid duplicated attributes
Change-Id: Ia799fc8b1b0e9bc6852b21194b71e1f3e683955e
diff --git a/sw/qa/core/exportdata/ooxml/pass/abi9930.odt
b/sw/qa/core/exportdata/ooxml/pass/abi9930.odt
new file mode 100644
index 000..04638df
Binary files /dev/null and b/sw/qa/core/exportdata/ooxml/pass/abi9930.odt differ
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 90ba7b0..2c50867 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -8422,7 +8422,7 @@ void DocxAttributeOutput::AddToAttrList(
::sax_fastparser::FastAttributeList* &p
{
sal_Int32 nName = va_arg( args, sal_Int32 );
const char* pValue = va_arg( args, const char* );
-if( pValue )
+if( pValue && !pAttrList->hasAttribute(nName) )
pAttrList->add( nName, pValue );
}
va_end( args );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Patch for [Bug 79082] FILESAVE: Tab positions not being retained in PPT
Hello, I have a patch for bug https://bugs.freedesktop.org/show_bug.cgi?id=79082 (tested on LibreOffice 4.3.2.2). There is a test file on bugzilla (https://bugs.freedesktop.org/attachment.cgi?id=106377), and also the patch file (https://bugs.freedesktop.org/attachment.cgi?id=108711). With kind regards, -- Piet van Oostrum WWW: http://pietvanoostrum.com/ PGP key: [8DAE142BE17999C4] ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/image_rework' - sc/CppunitTest_sc_subsequent_export_test.mk sc/qa sd/CppunitTest_sd_export_tests.mk sd/qa
dev/null |binary
sc/CppunitTest_sc_subsequent_export_test.mk |4 ++
sc/qa/unit/data/ods/document_with_two_images.ods |binary
sc/qa/unit/subsequent_export-test.cxx| 42 ++-
sd/CppunitTest_sd_export_tests.mk|4 ++
sd/qa/unit/data/odp/document_with_two_images.odp |binary
sd/qa/unit/export-tests.cxx | 42 +++
7 files changed, 64 insertions(+), 28 deletions(-)
New commits:
commit d3b48d987acea370bcfedb860009fb7a1487f13c
Author: Zolnai Tamás
Date: Sun Nov 2 17:44:33 2014 +0100
Improve Calc and Impress image tests based on auto swapping
Change-Id: I6a784a68cb1a1936196d35fc15af691d2aeb5773
diff --git a/sc/CppunitTest_sc_subsequent_export_test.mk
b/sc/CppunitTest_sc_subsequent_export_test.mk
index 3316beb..1cfaf69 100644
--- a/sc/CppunitTest_sc_subsequent_export_test.mk
+++ b/sc/CppunitTest_sc_subsequent_export_test.mk
@@ -117,6 +117,10 @@ $(eval $(call
gb_CppunitTest_use_components,sc_subsequent_export_test,\
))
endif
+$(eval $(call gb_CppunitTest_use_custom_headers,sc_subsequent_export_test,\
+ officecfg/registry \
+))
+
$(eval $(call gb_CppunitTest_use_configuration,sc_subsequent_export_test))
# vim: set noet sw=4 ts=4:
diff --git a/sc/qa/unit/data/ods/document_with_an_image.ods
b/sc/qa/unit/data/ods/document_with_two_images.ods
similarity index 66%
rename from sc/qa/unit/data/ods/document_with_an_image.ods
rename to sc/qa/unit/data/ods/document_with_two_images.ods
index adfcd4c..6e1cc68 100644
Binary files a/sc/qa/unit/data/ods/document_with_an_image.ods and
b/sc/qa/unit/data/ods/document_with_two_images.ods differ
diff --git a/sc/qa/unit/subsequent_export-test.cxx
b/sc/qa/unit/subsequent_export-test.cxx
index 9e058b2..b9a042e 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -7,6 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+#include
#include
#include
#include
@@ -60,7 +61,7 @@
#include
#include
-
+#include
#include
#include
#include
@@ -2267,26 +2268,19 @@ void ScExportTest::testSwappedOutImageExport()
"generic_HTML",
};
+// Set cache size to a very small value to make sure one of the images is
swapped out
+boost::shared_ptr< comphelper::ConfigurationChanges >
xBatch(comphelper::ConfigurationChanges::create());
+
officecfg::Office::Common::Cache::GraphicManager::TotalCacheSize::set(sal_Int32(1),
xBatch);
+xBatch->commit();
+
for( size_t nFilter = 0; nFilter < aFilterNames.size(); ++nFilter )
{
// Check whether the export code swaps in the image which was swapped
out before.
-ScDocShellRef xDocSh = loadDoc("document_with_an_image.", ODS);
+ScDocShellRef xDocSh = loadDoc("document_with_two_images.", ODS);
const OString sFailedMessage = OString("Failed on filter: ")
+
OUStringToOString(aFilterNames[nFilter], RTL_TEXTENCODING_ASCII_US);
-
-// Find and swap out the image
CPPUNIT_ASSERT_MESSAGE(sFailedMessage.getStr(), xDocSh.Is());
-ScDocument* pDoc = &xDocSh->GetDocument();
-CPPUNIT_ASSERT_MESSAGE(sFailedMessage.getStr(), pDoc);
-ScDrawLayer* pDrawLayer = pDoc->GetDrawLayer();
-CPPUNIT_ASSERT_MESSAGE(sFailedMessage.getStr(), pDrawLayer);
-const SdrPage* pPage = pDrawLayer->GetPage(0);
-CPPUNIT_ASSERT_MESSAGE(sFailedMessage.getStr(), pPage);
-const SdrObject* pObj = pPage->GetObj(0);
-CPPUNIT_ASSERT_MESSAGE(sFailedMessage.getStr(),
pObj->GetObjIdentifier() == OBJ_GRAF);
-const SdrGrafObj& rGrafObj = static_cast(*pObj);
-rGrafObj.ForceSwapOut();
// Export the document and import again for a check
ScDocShellRef xDocSh2 = saveAndReload(xDocSh, nFilter);
@@ -2298,7 +2292,7 @@ void ScExportTest::testSwappedOutImageExport()
uno::Reference< container::XIndexAccess > xIA(xDoc->getSheets(),
UNO_QUERY_THROW);
uno::Reference< drawing::XDrawPageSupplier > xDrawPageSupplier(
xIA->getByIndex(0), UNO_QUERY_THROW);
uno::Reference< container::XIndexAccess >
xDraws(xDrawPageSupplier->getDrawPage(), UNO_QUERY_THROW);
-CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
static_cast(1), xDraws->getCount());
+CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
static_cast(2), xDraws->getCount());
uno::Reference xImage(xDraws->getByIndex(0),
uno::UNO_QUERY);
uno::Reference< beans::XPropertySet > XPropSet( xImage,
uno::UNO_QUERY_THROW );
@@ -2318,6 +2312,24 @@ void ScExportTest::testSwappedOutImageExport()
CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
static_cast(610), xBitmap->getSize().Width );
CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
static_cast(381), xBitmap->getSize().Height );
}
+
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 75951, which changed state. Bug 75951 Summary: Calc - incorrect import of MS XLS formatted IF statements when opening spreadsheet in LibreOffice 4.2.x, regression from 4.1.x https://bugs.freedesktop.org/show_bug.cgi?id=75951 What|Removed |Added Status|NEEDINFO|RESOLVED Resolution|--- |INVALID -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/image_rework' - 2 commits - filter/source include/svx svx/source sw/CppunitTest_sw_globalfilter.mk sw/qa
dev/null|binary
filter/source/msfilter/msdffimp.cxx |1
include/svx/svdograf.hxx|3
svx/source/sdr/contact/viewobjectcontactofgraphic.cxx | 13 --
sw/CppunitTest_sw_globalfilter.mk |4
sw/qa/extras/globalfilter/data/document_with_two_images.odt |binary
sw/qa/extras/globalfilter/globalfilter.cxx | 64 +++-
7 files changed, 51 insertions(+), 34 deletions(-)
New commits:
commit 2fd3c39b7389e6a7a283dc218b627a7723e960b1
Author: Zolnai Tamás
Date: Sun Nov 2 17:10:08 2014 +0100
Make SdrGrafObj swapping methods private.
Plus remove some useless call of them.
Change-Id: I47a50b5734d799ac02ee7221c95f82415afb9497
diff --git a/filter/source/msfilter/msdffimp.cxx
b/filter/source/msfilter/msdffimp.cxx
index 7396abe..5f48e7e 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -3970,7 +3970,6 @@ SdrObject* SvxMSDffManager::ImportGraphic( SvStream& rSt,
SfxItemSet& rSet, cons
if ( bLinkGrf && !bGrfRead )
{
-static_cast(pRet)->ForceSwapIn();
Graphic aGraf(static_cast(pRet)->GetGraphic());
lcl_ApplyCropping( *this, &rSet, aGraf );
}
diff --git a/include/svx/svdograf.hxx b/include/svx/svdograf.hxx
index e600609..27beb28 100644
--- a/include/svx/svdograf.hxx
+++ b/include/svx/svdograf.hxx
@@ -69,6 +69,7 @@ private:
// to allow sdr::contact::ViewObjectContactOfGraphic access to
ImpUpdateGraphicLink()
friend class sdr::contact::ViewObjectContactOfGraphic;
+friend class SdrExchangeView; // Only for a ForceSwapIn() call.
friend class SdrGraphicLink;
private:
@@ -135,9 +136,11 @@ public:
voidSetGrafStreamURL( const OUString&
rGraphicStreamURL );
OUStringGetGrafStreamURL() const;
+private:
voidForceSwapIn() const;
voidForceSwapOut() const;
+public:
voidSetGraphicLink(const OUString& rFileName, const
OUString& rReferer, const OUString& rFilterName);
voidReleaseGraphicLink();
bool IsLinkedGraphic() const;
diff --git a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx
b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx
index a445b75..c95b42d 100644
--- a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx
@@ -245,8 +245,6 @@ namespace sdr
// prepare primitive generation with evtl. loading the graphic
when it's swapped out
SdrGrafObj& rGrafObj = const_cast< ViewObjectContactOfGraphic*
>(this)->getSdrGrafObj();
bool bDoAsynchronGraphicLoading(rGrafObj.GetModel() &&
rGrafObj.GetModel()->IsSwapGraphics());
-bool bSwapInDone(false);
-bool bSwapInExclusive(false);
if( bDoAsynchronGraphicLoading && rGrafObj.IsSwappedOut() )
{
@@ -262,16 +260,15 @@ namespace sdr
|| GetObjectContact().isOutputToPDFFile() )
{
bDoAsynchronGraphicLoading = false;
-bSwapInExclusive = true;
}
}
if( bDoAsynchronGraphicLoading )
{
-bSwapInDone = const_cast< ViewObjectContactOfGraphic*
>(this)->impPrepareGraphicWithAsynchroniousLoading();
+const_cast< ViewObjectContactOfGraphic*
>(this)->impPrepareGraphicWithAsynchroniousLoading();
}
else
{
-bSwapInDone = const_cast< ViewObjectContactOfGraphic*
>(this)->impPrepareGraphicWithSynchroniousLoading();
+const_cast< ViewObjectContactOfGraphic*
>(this)->impPrepareGraphicWithSynchroniousLoading();
}
// get return value by calling parent
@@ -294,12 +291,6 @@ namespace sdr
}
}
-// if swap in was forced only for printing metafile and pdf, swap
out again
-if( bSwapInDone && bSwapInExclusive )
-{
-rGrafObj.ForceSwapOut();
-}
-
return xRetval;
}
commit 5a5be09081fd88a985341ed5d7da0998fd5bc729
Author: Zolnai Tamás
Date: Sun Nov 2 12:43:35 2014 +0100
Improve swapped out image export writer test
Change-Id: Ibb5d9f1f0503ef16da89e3586f6e3fe2262a89c6
diff --git a/sw/CppunitTest_sw_globalfilter.mk
b/sw/CppunitTest_sw_globalfilter.mk
index 96787c0..b25bc89 100644
--- a/sw/CppunitTest_sw_globalfilter.mk
+++ b/sw/CppunitTest_sw_globalfilter.mk
@@ -83,6 +83,10 @@ $(eval $(call gb_CppunitTest_use_components,sw_globalfilter,\
xmloff/util/xo \
))
+$(eval $(call gb_CppunitTest_use_custom_headers,sw_globalfilter,\
+ officecfg/registry \
+))
+
$(eval $(call gb_Cppu
Re: 10.10 tinderbox builds crashes on opening any file
I've sent a patch proposal, https://gerrit.libreoffice.org/#/c/12200/
Regards,
Robert
On Sun, Nov 2, 2014 at 12:32 PM, Robert Antoni Buj i Gelonch <
robert@gmail.com> wrote:
> The following command also fixes the issue and you don't need to create
> any link to LibreOfficePython.framework:
>
> # find
> /Applications/LibreOfficeDev.app/Contents/Frameworks/LibreOfficePython.framework/Versions/3.3/lib/python3.3/lib-dynload
> -name "*.so" -exec install_name_tool -change
> /Volumes/Master/lo/core/workdir/UnpackedTarball/python3/python-inst/@__OOO/LibreOfficePython.framework/Versions/3.3/LibreOfficePython
> @loader_path/../../../LibreOfficePython '{}' \;
>
>
> Regards,
>
> Robert
>
> On Sun, Nov 2, 2014 at 3:19 AM, Robert Antoni Buj i Gelonch <
> robert@gmail.com> wrote:
>
>> It's an issue related with LibreOfficePython.framework and
>> install_name_tool:
>>
>> 1 - create the folder where LibreOfficePython.framework was installed in
>> the tinderbox:
>>
>> $: sudo mkdir -p
>> /Volumes/Master/lo/core/workdir/UnpackedTarball/python3/python-inst/@__OOO
>>
>> 2 - create a symbolic link to LibreOfficePython.framework:
>>
>> $: sudo ln -s
>> /Applications/LibreOfficeDev.app/Contents/Frameworks/LibreOfficePython.framework
>> /Volumes/Master/lo/core/workdir/UnpackedTarball/python3/python-inst/@__OOO/LibreOfficePython.framework
>>
>> 3 - Launch LibreOffice:
>>
>> $: /Applications/LibreOfficeDev.app/Contents/MacOS/soffice
>>
>>
>> Regards,
>>
>> Robert
>>
>> On Sat, Nov 1, 2014 at 10:40 AM, Robert Antoni Buj i Gelonch wrote:
>>
>>> Doing a clean build seems that doesn't solve the issue, so I'm going to
>>> install the development environment from scratch.
>>>
>>> On Fri, Oct 31, 2014 at 11:16 AM, Christian Lohmaier wrote:
>>>
Hi Robert,
there have been reports on IRC that the daily builds of your tinderbox
(@64) crashes when opening any file.
Those crashes don't occur with the daily builds from my bot (@49),
that also compiles on Mac OSX 10.10 (although with the default
min-version.
As your bot does incremental builds: could you try a make clean to see
whether the problem is caused by some incompatible changes that
weren't picked up properly by the incremental build?
The user who reported it often hangs out in the #libreoffice-qa
channel (nich steve-_-2)
Thanks a lot,
ciao
Christian
>>>
>>>
>>>
>>> --
>>> http://about.me/rbuj
>>>
>>
>>
>>
>> --
>> http://about.me/rbuj
>>
>
>
>
> --
> http://about.me/rbuj
>
--
http://about.me/rbuj
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 51550, which changed state. Bug 51550 Summary: FILESAVE as .docx looses embedded OLE objects https://bugs.freedesktop.org/show_bug.cgi?id=51550 What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/image_rework' - 2 commits - sw/inc sw/source
sw/inc/ndgrf.hxx |3 +++
sw/source/core/doc/notxtfrm.cxx|2 --
sw/source/core/graphic/ndgrf.cxx | 14 +-
sw/source/filter/html/htmlgrin.cxx | 10 --
4 files changed, 4 insertions(+), 25 deletions(-)
New commits:
commit 6f425bd88b823cf7633552d24a3eb69eeb9c33f8
Author: Zolnai Tamás
Date: Sun Nov 2 11:47:04 2014 +0100
Remove some useless swapping call inside SwGrfNode
Change-Id: I4cd2677197c7a6cff71e2966c2b2dd2285032c07
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index 9973837..47c2740 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -341,7 +341,6 @@ void SwGrfNode::onGraphicChanged()
if(pFlyFmt)
{
-const bool bWasSwappedOut = GetGrfObj().IsSwappedOut();
OUString aName;
OUString aTitle;
OUString aDesc;
@@ -382,11 +381,6 @@ void SwGrfNode::onGraphicChanged()
{
SetDescription(aDesc);
}
-
-if (bWasSwappedOut)
-{
-SwapOut();
-}
}
}
@@ -675,10 +669,6 @@ bool SwGrfNode::SavePersistentData()
return true;
}
-// swap in first if already in storage
-if( HasEmbeddedStreamName() && !SwapIn() )
-return false;
-
// #i44367#
// Do not delete graphic file in storage, because the graphic file could
// be referenced by other graphic nodes.
@@ -997,9 +987,7 @@ SwCntntNode* SwGrfNode::MakeCopy( SwDoc* pDoc, const
SwNodeIndex& rIdx ) const
}
else
{
-if( maGrfObj.IsSwappedOut() )
-const_cast(this)->SwapIn();
-aTmpGrf = maGrfObj.GetGraphic();
+aTmpGrf = GetGrf();
}
const sfx2::LinkManager& rMgr =
getIDocumentLinksAdministration()->GetLinkManager();
commit c56e2e804acac67ad02b9454c6aa748ef2117201
Author: Zolnai Tamás
Date: Sun Nov 2 11:36:49 2014 +0100
Make SwGrfNode swapping methods private
Change-Id: Ide3043f2f245c097a7b4c07ba2e0713510296b3e
diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx
index 5a2dcbd..f8f9e46 100644
--- a/sw/inc/ndgrf.hxx
+++ b/sw/inc/ndgrf.hxx
@@ -169,10 +169,13 @@ public:
const Graphic* pGraphic = 0,
const GraphicObject* pGrfObj = 0,
bool bModify = true );
+private:
/// Loading of graphic immediately before displaying.
bool SwapIn( bool bWaitForData = false );
/// Remove graphic in order to free memory.
bool SwapOut();
+
+public:
bool HasEmbeddedStreamName() const { return maGrfObj.HasUserData(); }
/// applying new stream name for embedded graphic - needed as saving the
document might change this stream name
void ApplyNewEmbeddedStreamName(const OUString& r)
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index 612b785..9f45a32 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -599,8 +599,6 @@ void SwNoTxtFrm::Modify( const SfxPoolItem* pOld, const
SfxPoolItem* pNew )
}
} while( pVSh != (pSh = (SwViewShell*)pSh->GetNext() ));
}
-else
-pNd->SwapIn();
}
}
break;
diff --git a/sw/source/filter/html/htmlgrin.cxx
b/sw/source/filter/html/htmlgrin.cxx
index 83db824..5755bcd 100644
--- a/sw/source/filter/html/htmlgrin.cxx
+++ b/sw/source/filter/html/htmlgrin.cxx
@@ -563,7 +563,6 @@ IMAGE_SETEVENT:
Size aGrfSz( 0, 0 );
bool bSetTwipSize = true; // Twip-Size am Node setzen?
bool bChangeFrmSize = false;// Frame-Format nachtraeglich anpassen?
-bool bRequestGrfNow = false;
bool bSetScaleImageMap = false;
sal_uInt8 nPrcWidth = 0, nPrcHeight = 0;
@@ -575,7 +574,6 @@ IMAGE_SETEVENT:
// Tabelle layoutet wird.
if( pTable!=0 && !nWidth )
{
-bRequestGrfNow = true;
IncGrfsThatResizeTable();
}
@@ -799,14 +797,6 @@ IMAGE_SETEVENT:
if( !aMacroItem.GetMacroTable().empty() )
pFlyFmt->SetFmtAttr( aMacroItem );
-// Wenn die Grafik gleich angeforder wird, muss dies geschehen,
-// nachdem das Format vollstaendig aufgebaut ist, weil es evtl.
-// gleich (synchron) angepasst wird (war bug #40983#)
-if (bRequestGrfNow && pGrfNd)
-{
-pGrfNd->SwapIn();
-}
-
// Ggf. Frames anlegen und Auto-gebundenen Rahmen registrieren
RegisterFlyFrm( pFlyFmt );
___
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' - sw/inc sw/source writerfilter/source
sw/inc/IDocumentSettingAccess.hxx |3 ++-
sw/source/core/doc/DocumentSettingManager.cxx |6 ++
sw/source/core/inc/DocumentSettingManager.hxx |1 +
sw/source/core/text/itrform2.cxx |3 ++-
sw/source/core/uibase/uno/SwXDocumentSettings.cxx | 21 -
sw/source/filter/ww8/ww8par.cxx |1 +
sw/source/filter/xml/xmlimp.cxx | 10 ++
writerfilter/source/filter/ImportFilter.cxx |1 +
8 files changed, 43 insertions(+), 3 deletions(-)
New commits:
commit cff2323e10161d3cbbdba088e8ec74aee3839c62
Author: Michael Stahl
Date: Thu Oct 30 15:12:33 2014 +0100
fdo#79602: sw: add new compatibiltiy flag PropLineSpacingShrinksFirstLine
This is enabled by default, to get the new formatting where the first
line of a paragraph is shrunk if a proportional line spacing < 100% is
applied; existing OOo documents get the previous (before LO 3.3)
formatting. Since the formatting in LO releases is broken anyway, it
does not matter much which way documents written by old LO get
formatted.
(cherry picked from commit 9605763e3dc8c85137787c77c31e8639553a35ed)
Conflicts:
sw/source/filter/ww8/ww8par.cxx
Change-Id: I0952f568a933c137bd03070759989cac3517d8b9
Reviewed-on: https://gerrit.libreoffice.org/12157
Reviewed-by: Miklos Vajna
Tested-by: Miklos Vajna
diff --git a/sw/inc/IDocumentSettingAccess.hxx
b/sw/inc/IDocumentSettingAccess.hxx
index 4e94a1e..a67d469 100644
--- a/sw/inc/IDocumentSettingAccess.hxx
+++ b/sw/inc/IDocumentSettingAccess.hxx
@@ -79,6 +79,7 @@ namespace com { namespace sun { namespace star { namespace
i18n { struct Forbidd
TAB_OVER_MARGIN,
// MS Word still wraps text around objects with less space than LO
would.
SURROUND_TEXT_WRAP_SMALL,
+ PROP_LINE_SPACING_SHRINKS_FIRST_LINE,
// COMPATIBILITY FLAGS END
BROWSE_MODE,
@@ -93,7 +94,7 @@ namespace com { namespace sun { namespace star { namespace
i18n { struct Forbidd
FLOATTABLE_NOMARGINS,
EMBED_FONTS,
EMBED_SYSTEM_FONTS,
- APPLY_PARAGRAPH_MARK_FORMAT_TO_NUMBERING
+ APPLY_PARAGRAPH_MARK_FORMAT_TO_NUMBERING,
};
public:
diff --git a/sw/source/core/doc/DocumentSettingManager.cxx
b/sw/source/core/doc/DocumentSettingManager.cxx
index 68ff997..184b242 100644
--- a/sw/source/core/doc/DocumentSettingManager.cxx
+++ b/sw/source/core/doc/DocumentSettingManager.cxx
@@ -75,6 +75,7 @@ sw::DocumentSettingManager::DocumentSettingManager(SwDoc
&rDoc)
mbBackgroundParaOverDrawings(false),
mbTabOverMargin(false),
mbSurroundTextWrapSmall(false),
+mbPropLineSpacingShrinksFirstLine(true),
mApplyParagraphMarkFormatToNumbering(false),
mbLastBrowseMode( false )
@@ -149,6 +150,7 @@ bool sw::DocumentSettingManager::get(/*[in]*/
DocumentSettingId id) const
case BACKGROUND_PARA_OVER_DRAWINGS: return
mbBackgroundParaOverDrawings;
case TAB_OVER_MARGIN: return mbTabOverMargin;
case SURROUND_TEXT_WRAP_SMALL: return mbSurroundTextWrapSmall;
+case PROP_LINE_SPACING_SHRINKS_FIRST_LINE: return
mbPropLineSpacingShrinksFirstLine;
case BROWSE_MODE: return mbLastBrowseMode; // Attention: normally the
SwViewShell has to be asked!
case HTML_MODE: return mbHTMLMode;
@@ -311,6 +313,10 @@ void sw::DocumentSettingManager::set(/*[in]*/
DocumentSettingId id, /*[in]*/ boo
mbSurroundTextWrapSmall = value;
break;
+case PROP_LINE_SPACING_SHRINKS_FIRST_LINE:
+mbPropLineSpacingShrinksFirstLine = value;
+break;
+
// COMPATIBILITY FLAGS END
case BROWSE_MODE: //can be used temporary (load/save) when no
SwViewShell is available
diff --git a/sw/source/core/inc/DocumentSettingManager.hxx
b/sw/source/core/inc/DocumentSettingManager.hxx
index 2e8ab4b..3226278 100644
--- a/sw/source/core/inc/DocumentSettingManager.hxx
+++ b/sw/source/core/inc/DocumentSettingManager.hxx
@@ -85,6 +85,7 @@ class DocumentSettingManager :
bool mbBackgroundParaOverDrawings;
bool mbTabOverMargin;
bool mbSurroundTextWrapSmall;
+bool mbPropLineSpacingShrinksFirstLine; // fdo#79602
bool mApplyParagraphMarkFormatToNumbering;
bool mbLastBrowseMode : 1;
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index 4880013..9dfa8ad 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -1743,7 +1743,8 @@ void SwTxtFormatter::CalcRealHeight( bool bNewLine )
case SVX_LINE_SPACE_AUTO:
// shrink first line of paragraph too on spacing < 100%
if (IsParaLine() &&
-pSpace->GetInterLineSpaceRule() ==
SVX_INTER_LINE_SPACE_PROP)
+pSpace->GetInterLineSp
[Libreoffice-commits] core.git: wizards/source
wizards/source/access2base/DoCmd.xba | 53 ++-
1 file changed, 28 insertions(+), 25 deletions(-)
New commits:
commit 5c7413feb8a612453be9a1d906411ca204695b3a
Author: Jean-Pierre Ledure
Date: Sun Nov 2 16:34:07 2014 +0100
Access2Base - Extension of GoTorecord action to table/query datasheets
Change-Id: I334491e2c75e666bde9db25a01abd5f71a993153
diff --git a/wizards/source/access2base/DoCmd.xba
b/wizards/source/access2base/DoCmd.xba
index b1c06e1..4a31284 100644
--- a/wizards/source/access2base/DoCmd.xba
+++ b/wizards/source/access2base/DoCmd.xba
@@ -72,7 +72,7 @@ Dim sFilter As String, oWindow As Object, oDatabase As
Object, oTarget As Object
Set oTarget = _DatabaseForm(._Name,
pvControlName)
Case acQuery, acTable
If pvControlName <> "" Then
Goto Exit_Function
- Set oTarget =
oWindow.Frame.Controller.FormOperations.Cursor
+ Set oTarget =
.Frame.Controller.FormOperations.Cursor
Case Else ' Ignore action
Goto Exit_Function
End Select
@@ -764,13 +764,14 @@ Public Function GoToRecord(Optional ByVal pvObjectType As
Variant _
Utils._SetCalledSub("GoToRecord")
If IsMissing(pvObjectName) Then pvObjectName = ""
- If IsMissing(pvObjectType) Then
- If pvObjectName <> "" Then pvObjectType =
acDataForm Else pvObjectType = acActiveDataObject
- End If
+ If IsMissing(pvObjectType) Then pvObjectType = acActiveDataObject
+' If IsMissing(pvObjectType) Then
+' If pvObjectName <> "" Then pvObjectType =
acDataForm Else pvObjectType = acActiveDataObject
+' End If
If IsMissing(pvRecord) Then pvRecord = acNext
If IsMissing(pvOffset) Then pvOffset = 1
If Not (Utils._CheckArgument(pvObjectType, 1, Utils._AddNumeric() _
- , Array(acActiveDataObject, acDataForm)) _
+ , Array(acActiveDataObject, acDataForm,
acDataQuery, acDataTable)) _
And Utils._CheckArgument(pvObjectName, 2, vbString) _
And Utils._CheckArgument(pvRecord, 3, Utils._AddNumeric() _
, Array(acFirst, acGoTo, acLast, acNewRec,
acNext, acPrevious)) _
@@ -779,22 +780,22 @@ Public Function GoToRecord(Optional ByVal pvObjectType As
Variant _
If pvObjectType = acActiveDataObject And pvObjectName <>
"" Then Goto Error_Target
If pvOffset < 0 And pvRecord <> acGoTo Then Goto Error_Offset
-Dim ofForm As Object, oGeneric As Object
+Dim ofForm As Object, oGeneric As Object, oResultSet As Object, oWindow As
Object
Dim i As Integer, iCount As Integer, bFound As Boolean, lOffset As Long
Dim sObjectName, iLengthName As Integer
Select Case pvObjectType
- Case acActiveDataObject ' Determine
active form
- iCount = Application._CountOpenForms()
- If iCount = 0 Then Goto Error_ActiveForm
- bFound = False
- For i = 0 To iCount - 1 '
Determine form having the focus
- Set ofForm = Application.Forms(i)
- If
ofForm.Component.CurrentController.Frame.IsActive() Then
- bFound = True
- Exit For
- End If
- Next i
- If Not bFound Then Goto Error_ActiveForm
+ Case acActiveDataObject
+ Set oWindow = _SelectWindow()
+ With oWindow
+ Select Case .WindowType
+ Case acForm
+ Set oResultSet =
_DatabaseForm(._Name, "")
+ Case acQuery, acTable
+ Set oResultSet =
.Frame.Controller.FormOperations.Cursor
+ Case Else ' Ignore
action
+ Goto Exit_Function
+ End Select
+ End With
Case acDataForm
' pvObjectName can be "myForm",
"Forms!myForm", "Forms!myForm!mySubform" or
"Forms!myForm!mySubform.Form"
sObjectName = UCase(pvObjectName)
@@ -816,12 +817,17 @@ Dim sObjectName, iLengthName As Integer
Case Else
Set ofForm =
Application.Forms(pvObjectName)
End Select
- Case Else '
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sw/source
sw/source/core/text/itrform2.cxx | 18 +-
1 file changed, 13 insertions(+), 5 deletions(-)
New commits:
commit 7ca9c060155b79a037861a972843a70b8a518c4f
Author: Michael Stahl
Date: Wed Oct 29 23:50:21 2014 +0100
fdo#79602: sw: fix text formatting of proportional line space < 100%
SwTxtFormatter::CalcRealHeight(): Apply the special treatment of < 100%
line space shrinking the Height() of the line only to the first line
in a paragraph; the subsequent ones are shrunk again (to the square of
the desired proportion) 30 lines later.
Also set the Ascent of the line, as the wrong base-line causes the lower
part of the line to be clipped.
(regression from 42532d42bfcdb12df86376cda009e8e315a82153)
(cherry picked from commit 4e223fab04279c3583689e69fa1342966e81de36)
Conflicts:
sw/source/core/text/itrform2.cxx
Change-Id: I0424396263293deaa318c80eedc2237cdb01b22b
Reviewed-on: https://gerrit.libreoffice.org/12156
Reviewed-by: Miklos Vajna
Tested-by: Miklos Vajna
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index 2738b9b..4880013 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -1741,24 +1741,30 @@ void SwTxtFormatter::CalcRealHeight( bool bNewLine )
switch( pSpace->GetLineSpaceRule() )
{
case SVX_LINE_SPACE_AUTO:
-if (pSpace->GetInterLineSpaceRule()==SVX_INTER_LINE_SPACE_PROP) {
+// shrink first line of paragraph too on spacing < 100%
+if (IsParaLine() &&
+pSpace->GetInterLineSpaceRule() ==
SVX_INTER_LINE_SPACE_PROP)
+{
long nTmp = pSpace->GetPropLineSpace();
+// Word will render < 50% too but it's just not
readable
+if( nTmp < 50 )
+nTmp = nTmp ? 50 : 100;
if (nTmp<100) { // code adaped from fixed line height
nTmp *= nLineHeight;
nTmp /= 100;
if( !nTmp )
++nTmp;
nLineHeight = (KSHORT)nTmp;
-/*
-//@TODO figure out how WW maps ascent and descent
-//in case of prop line spacing <100%
KSHORT nAsc = ( 4 * nLineHeight ) / 5; // 80%
+#if 0
+// could do clipping here (like Word does)
+// but at 0.5 its unreadable either way...
if( nAsc < pCurr->GetAscent() ||
nLineHeight - nAsc < pCurr->Height() -
pCurr->GetAscent() )
pCurr->SetClipping( true );
+#endif
pCurr->SetAscent( nAsc );
-*/
pCurr->Height( nLineHeight );
pInf->GetParaPortion()->SetFixLineHeight();
}
@@ -1784,6 +1790,8 @@ void SwTxtFormatter::CalcRealHeight( bool bNewLine )
break;
default: OSL_FAIL( ": unknown LineSpaceRule" );
}
+// Note: for the _first_ line the line spacing of the previous
+// paragraph is applied in SwFlowFrm::CalcUpperSpace()
if( !IsParaLine() )
switch( pSpace->GetInterLineSpaceRule() )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 7 commits - oox/source starmath/source svl/source sw/source writerfilter/source
oox/source/drawingml/customshapepresetdata.cxx | 10 --
oox/source/shape/WpsContext.cxx |1 -
starmath/source/rtfexport.cxx|1 -
starmath/source/wordexportbase.cxx |2 --
svl/source/items/grabbagitem.cxx |4
sw/source/core/doc/textboxhelper.cxx | 11 ++-
sw/source/core/layout/softpagebreak.cxx |1 -
sw/source/core/layout/ssfrm.cxx | 14 --
sw/source/core/layout/swselectionlist.cxx|1 -
sw/source/core/layout/tabfrm.cxx | 12
sw/source/core/layout/trvlfrm.cxx| 12
sw/source/core/layout/virtoutp.cxx |5 -
sw/source/core/layout/wsfrm.cxx | 15 ---
sw/source/filter/ww8/docxsdrexport.cxx | 14 --
sw/source/filter/ww8/docxtablestyleexport.cxx|6 --
sw/source/filter/ww8/rtfattributeoutput.cxx | 16
sw/source/filter/ww8/rtfexport.cxx | 13 -
sw/source/filter/ww8/rtfsdrexport.cxx|3 ---
writerfilter/source/dmapper/SdtHelper.cxx|7 ---
writerfilter/source/dmapper/TablePositionHandler.cxx |3 ---
writerfilter/source/filter/RtfFilter.cxx |5 -
writerfilter/source/rtftok/rtfcontrolwords.cxx |1 -
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 16
writerfilter/source/rtftok/rtflookahead.cxx |3 ---
writerfilter/source/rtftok/rtfsdrimport.cxx |9 -
writerfilter/source/rtftok/rtftokenizer.cxx |3 ---
26 files changed, 2 insertions(+), 186 deletions(-)
New commits:
commit 29f33d1a41f7206709677734d3d32cee0ba8a23a
Author: Miklos Vajna
Date: Sun Nov 2 15:58:24 2014 +0100
SwTextBoxHelper::findTextBoxes: cleanup
Change-Id: Id926289a4b37b7a24f0e54f8f582a7658a713376
diff --git a/sw/source/core/doc/textboxhelper.cxx
b/sw/source/core/doc/textboxhelper.cxx
index bcabdd0..6a49724 100644
--- a/sw/source/core/doc/textboxhelper.cxx
+++ b/sw/source/core/doc/textboxhelper.cxx
@@ -134,9 +134,8 @@ std::set
SwTextBoxHelper::findTextBoxes(const SwNode& rNode)
const SwDoc* pDoc = rNode.GetDoc();
const SwCntntNode* pCntntNode = 0;
const SwCntntFrm* pCntntFrm = 0;
-if (pDoc->getIDocumentLayoutAccess().GetCurrentViewShell() &&
-(pCntntNode = rNode.GetCntntNode()) &&
-(pCntntFrm =
pCntntNode->getLayoutFrm(pDoc->getIDocumentLayoutAccess().GetCurrentLayout(
+bool bHaveViewShell =
pDoc->getIDocumentLayoutAccess().GetCurrentViewShell();
+if (bHaveViewShell && (pCntntNode = rNode.GetCntntNode()) && (pCntntFrm =
pCntntNode->getLayoutFrm(pDoc->getIDocumentLayoutAccess().GetCurrentLayout(
{
// We can use the layout information to iterate over only the frames
which are anchored to us.
std::set aRet;
commit 6756ee4743b4c750aa54a1b0f17f1fc945340089
Author: Miklos Vajna
Date: Sun Nov 2 15:32:46 2014 +0100
unused includes in RTF filter and related files
Change-Id: Id13e10f2ceed3985c78ccc542e6677eccc0cb1c7
diff --git a/oox/source/drawingml/customshapepresetdata.cxx
b/oox/source/drawingml/customshapepresetdata.cxx
index 78d0af1..0eadef1 100644
--- a/oox/source/drawingml/customshapepresetdata.cxx
+++ b/oox/source/drawingml/customshapepresetdata.cxx
@@ -13,18 +13,8 @@
#include
#include "drawingml/customshapeproperties.hxx"
-#include "oox/helper/helper.hxx"
-#include "oox/helper/propertymap.hxx"
-#include "oox/helper/propertyset.hxx"
#include "oox/token/tokenmap.hxx"
#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
using namespace ::com::sun::star;
diff --git a/oox/source/shape/WpsContext.cxx b/oox/source/shape/WpsContext.cxx
index 9e3218e..a22d6b8 100644
--- a/oox/source/shape/WpsContext.cxx
+++ b/oox/source/shape/WpsContext.cxx
@@ -13,7 +13,6 @@
#include
#include
#include
-#include
#include
diff --git a/starmath/source/rtfexport.cxx b/starmath/source/rtfexport.cxx
index d700732..0167c19 100644
--- a/starmath/source/rtfexport.cxx
+++ b/starmath/source/rtfexport.cxx
@@ -10,7 +10,6 @@
#include "rtfexport.hxx"
-#include
#include
#include
diff --git a/starmath/source/wordexportbase.cxx
b/starmath/source/wordexportbase.cxx
index 885ca72..21b3301 100644
--- a/starmath/source/wordexportbase.cxx
+++ b/starmath/source/wordexportbase.cxx
@@ -10,8 +10,6 @@
#include "wordexportbase.hxx"
-#include
-
SmWordExportBase::SmWordExportBase(const SmNode* pIn)
: m_pTree(pIn)
{
diff --git a/svl/source/items/grabbagitem.cxx b/svl/source/items/grabbagitem.cxx
index aa2b3e3..dd1bf24 100644
--- a/svl/source/items/grabbagitem.cxx
+++ b/svl/source/items/grabbagitem.cxx
@@ -8,11 +8,7 @@
*/
#include
[PATCH] configure.ac: turn valgrind automagic into --enable-valgrind option
Hi! Please consider a patch to configure.ac. - valgrind headers might be present, but not wished for libreoffice - if valgrind support is desired but for some reason not found, configure should not keep quiet and continue Attaching a patch that hopes to achieve this in as few lines as possible. Best regards, Andreas --- a/configure.ac 2014-11-01 17:49:19.341284752 +0100 +++ b/configure.ac 2014-11-01 20:04:37.820715480 +0100 @@ -985,6 +985,10 @@ AS_HELP_STRING([--disable-ooenv], [Disable ooenv for the instdir installation.])) +AC_ARG_ENABLE(valgrind, +AS_HELP_STRING([--enable-valgrind], +[Enable valgrind support.])) + AC_ARG_ENABLE(lto, AS_HELP_STRING([--enable-lto], [Enable link-time optimization. Suitable for (optimised) product builds. Building might take @@ -5751,10 +5755,12 @@ AC_SUBST([ENABLE_RUNTIME_OPTIMIZATIONS]) dnl === -dnl Check if valgrind headers are available +dnl Check whether to enable valgrind support and if headers available dnl === ENABLE_VALGRIND= -if test "$cross_compiling" != yes; then +AC_MSG_CHECKING([whether to enable valgrind support]) +if test "$enable_valgrind" = yes -a "$cross_compiling" != yes; then +AC_MSG_RESULT([yes]) prev_cppflags=$CPPFLAGS # Is VALGRIND_CFLAGS something one is supposed to have in the environment, # or where does it come from? @@ -5762,6 +5768,11 @@ AC_CHECK_HEADER([valgrind/valgrind.h], [ENABLE_VALGRIND=TRUE]) CPPFLAGS=$prev_cppflags +if test -z "$ENABLE_VALGRIND"; then +AC_MSG_ERROR([Could not find valgrind/valgrind.h, but valgrind support was requested.]) +fi +else +AC_MSG_RESULT([no]) fi AC_SUBST([ENABLE_VALGRIND]) if test -z "$ENABLE_VALGRIND"; then ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: 10.10 tinderbox builds crashes on opening any file
The following command also fixes the issue and you don't need to create any
link to LibreOfficePython.framework:
# find
/Applications/LibreOfficeDev.app/Contents/Frameworks/LibreOfficePython.framework/Versions/3.3/lib/python3.3/lib-dynload
-name "*.so" -exec install_name_tool -change
/Volumes/Master/lo/core/workdir/UnpackedTarball/python3/python-inst/@__OOO/LibreOfficePython.framework/Versions/3.3/LibreOfficePython
@loader_path/../../../LibreOfficePython '{}' \;
Regards,
Robert
On Sun, Nov 2, 2014 at 3:19 AM, Robert Antoni Buj i Gelonch <
robert@gmail.com> wrote:
> It's an issue related with LibreOfficePython.framework and
> install_name_tool:
>
> 1 - create the folder where LibreOfficePython.framework was installed in
> the tinderbox:
>
> $: sudo mkdir -p
> /Volumes/Master/lo/core/workdir/UnpackedTarball/python3/python-inst/@__OOO
>
> 2 - create a symbolic link to LibreOfficePython.framework:
>
> $: sudo ln -s
> /Applications/LibreOfficeDev.app/Contents/Frameworks/LibreOfficePython.framework
> /Volumes/Master/lo/core/workdir/UnpackedTarball/python3/python-inst/@__OOO/LibreOfficePython.framework
>
> 3 - Launch LibreOffice:
>
> $: /Applications/LibreOfficeDev.app/Contents/MacOS/soffice
>
>
> Regards,
>
> Robert
>
> On Sat, Nov 1, 2014 at 10:40 AM, Robert Antoni Buj i Gelonch wrote:
>
>> Doing a clean build seems that doesn't solve the issue, so I'm going to
>> install the development environment from scratch.
>>
>> On Fri, Oct 31, 2014 at 11:16 AM, Christian Lohmaier wrote:
>>
>>> Hi Robert,
>>>
>>> there have been reports on IRC that the daily builds of your tinderbox
>>> (@64) crashes when opening any file.
>>>
>>> Those crashes don't occur with the daily builds from my bot (@49),
>>> that also compiles on Mac OSX 10.10 (although with the default
>>> min-version.
>>>
>>> As your bot does incremental builds: could you try a make clean to see
>>> whether the problem is caused by some incompatible changes that
>>> weren't picked up properly by the incremental build?
>>>
>>> The user who reported it often hangs out in the #libreoffice-qa
>>> channel (nich steve-_-2)
>>>
>>> Thanks a lot,
>>>
>>> ciao
>>> Christian
>>>
>>
>>
>>
>> --
>> http://about.me/rbuj
>>
>
>
>
> --
> http://about.me/rbuj
>
--
http://about.me/rbuj
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
