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

[Caolán McNamara]

 
writerfilter/qa/cppunittests/rtftok/data/pass/sf_508f4e169fb76c80745d3541bd01b0a2-73462-minimized.rtf
 |binary
 writerfilter/source/rtftok/rtfdocumentimpl.cxx 
   |   23 +-
 2 files changed, 13 insertions(+), 10 deletions(-)

New commits:
commit 28df98abeca9774868cadef29b81559fd325d865
Author: Caolán McNamara 
Date:   Tue Aug 19 08:40:20 2014 +0100

empty m_aStates

valgrind + bff

Change-Id: I7b45e10471de77bd0481adf0bccdbf852c36d815

diff --git 
a/writerfilter/qa/cppunittests/rtftok/data/pass/sf_508f4e169fb76c80745d3541bd01b0a2-73462-minimized.rtf
 
b/writerfilter/qa/cppunittests/rtftok/data/pass/sf_508f4e169fb76c80745d3541bd01b0a2-73462-minimized.rtf
new file mode 100644
index 000..e8e27ee
Binary files /dev/null and 
b/writerfilter/qa/cppunittests/rtftok/data/pass/sf_508f4e169fb76c80745d3541bd01b0a2-73462-minimized.rtf
 differ
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 3cbc638..f2bea77 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -5743,16 +5743,19 @@ int RTFDocumentImpl::popState()
 case DESTINATION_FLYMAINCONTENT:
 case DESTINATION_SHPPICT:
 case DESTINATION_SHAPE:
-m_aStates.top().aFrame = aState.aFrame;
-if (aState.nDestinationState == DESTINATION_SHPPICT && 
!m_aStates.empty() && m_aStates.top().nDestinationState == 
DESTINATION_LISTPICTURE)
+if (!m_aStates.empty())
 {
-RTFSprms aAttributes;
-aAttributes.set(NS_ooxml::LN_CT_NumPicBullet_numPicBulletId, 
RTFValue::Pointer_t(new RTFValue(m_nListPictureId++)));
-RTFSprms aSprms;
-// Dummy value, real picture is already sent to dmapper.
-aSprms.set(NS_ooxml::LN_CT_NumPicBullet_pict, 
RTFValue::Pointer_t(new RTFValue(0)));
-RTFValue::Pointer_t pValue(new RTFValue(aAttributes, aSprms));
-m_aListTableSprms.set(NS_ooxml::LN_CT_Numbering_numPicBullet, 
pValue, OVERWRITE_NO_APPEND);
+m_aStates.top().aFrame = aState.aFrame;
+if (aState.nDestinationState == DESTINATION_SHPPICT && 
m_aStates.top().nDestinationState == DESTINATION_LISTPICTURE)
+{
+RTFSprms aAttributes;
+aAttributes.set(NS_ooxml::LN_CT_NumPicBullet_numPicBulletId, 
RTFValue::Pointer_t(new RTFValue(m_nListPictureId++)));
+RTFSprms aSprms;
+// Dummy value, real picture is already sent to dmapper.
+aSprms.set(NS_ooxml::LN_CT_NumPicBullet_pict, 
RTFValue::Pointer_t(new RTFValue(0)));
+RTFValue::Pointer_t pValue(new RTFValue(aAttributes, aSprms));
+m_aListTableSprms.set(NS_ooxml::LN_CT_Numbering_numPicBullet, 
pValue, OVERWRITE_NO_APPEND);
+}
 }
 break;
 case DESTINATION_SHAPETEXT:
@@ -5780,7 +5783,7 @@ int RTFDocumentImpl::popState()
 break;
 default:
 {
-if (m_aStates.size() && m_aStates.top().nDestinationState == 
DESTINATION_PICT)
+if (!m_aStates.empty() && m_aStates.top().nDestinationState == 
DESTINATION_PICT)
 m_aStates.top().aPicture = aState.aPicture;
 }
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: odk/examples

[Chris Laplante]

 
odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/component.cxx
 |4 ---
 odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx   
   |4 +--
 odk/examples/DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.hxx 
   |3 --
 odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.cxx   
   |4 +--
 odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.hxx
   |2 -
 odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.hxx
   |5 ---
 odk/examples/OLE/activex/SOComWindowPeer.h 
   |3 --
 odk/examples/cpp/DocumentLoader/DocumentLoader.cxx 
   |9 --
 odk/examples/cpp/complextoolbarcontrols/MyListener.h   
   |2 -
 odk/examples/cpp/counter/counter.cxx   
   |   13 +-
 odk/examples/cpp/counter/countermain.cxx   
   |9 --
 odk/examples/cpp/custompanel/ctp_factory.cxx   
   |4 ---
 odk/examples/cpp/custompanel/ctp_factory.hxx   
   |4 ---
 odk/examples/cpp/custompanel/ctp_panel.cxx 
   |7 -
 odk/examples/cpp/custompanel/ctp_panel.hxx 
   |7 -
 15 files changed, 10 insertions(+), 70 deletions(-)

New commits:
commit 341d9c4f089c4e8dee96c49a81abf24ab809f367
Author: Chris Laplante 
Date:   Mon Aug 18 16:15:41 2014 -0400

odk: Clean up comments

Change-Id: I38aa34192244cdd29e1cce7ac612aa9cd5f9e8a1
Reviewed-on: https://gerrit.libreoffice.org/11006
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git 
a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/component.cxx
 
b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/component.cxx
index 6233fb7..6a57f32 100644
--- 
a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/component.cxx
+++ 
b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/component.cxx
@@ -53,10 +53,6 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::registry;
 
-
-// EXPORTED 

-
-
 /**
  * This function is called to get service factories for an implementation.
  *
diff --git 
a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx 
b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx
index 7075197..0530fed 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx
@@ -280,8 +280,8 @@ void SAL_CALL OConnection::setTransactionIsolation( 
sal_Int32 level ) throw(SQLE
 ::osl::MutexGuard aGuard( m_aMutex );
 checkDisposed(OConnection_BASE::rBHelper.bDisposed);
 
-// set your isolation level
-// please have a look at @see com.sun.star.sdbc.TransactionIsolation
+/// set your isolation level
+/// please have a look at @see com.sun.star.sdbc.TransactionIsolation
 }
 
 sal_Int32 SAL_CALL OConnection::getTransactionIsolation(  ) 
throw(SQLException, RuntimeException)
diff --git 
a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.hxx 
b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.hxx
index fe1449b..66e6d4b 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.hxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.hxx
@@ -45,9 +45,6 @@ namespace connectivity
 namespace skeleton
 {
 
-// Class: ODatabaseMetaData
-
-
 typedef ::cppu::WeakImplHelper1< 
::com::sun::star::sdbc::XDatabaseMetaData> ODatabaseMetaData_BASE;
 
 class ODatabaseMetaData : public ODatabaseMetaData_BASE
diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.cxx 
b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.cxx
index 8cf2944..a1950a4 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.cxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.cxx
@@ -86,8 +86,8 @@ rtl::OUString SkeletonDriver::getImplementationName_Static(  
) throw(RuntimeExce
 
 Sequence< ::rtl::OUString > SkeletonDriver::getSupportedServiceNames_Static(  
) throw (RuntimeException)
 {
-// which service is supported
-// for more information @see com.sun.star.sdbc.Driver
+/// which service is supported
+/// for more information @see com.sun.star.sdbc.Driver
 Sequence< ::rtl::OUString > aSNS( 1 );
 aSNS[0] = ::rtl::OUString("com.sun.star.sdbc.Driver");
 return aSNS;
diff --

[Libreoffice-commits] core.git: writerperfect/source

[Caolán McNamara]

 writerperfect/source/common/WPXSvInputStream.cxx |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 83991055eed93bb0ad96e3690062798a57df6c74
Author: Caolán McNamara 
Date:   Tue Aug 19 08:59:35 2014 +0100

can actually manage to ask createStream for missing streams

writerperfect::(anonymous 
namespace)::OLEStorageImpl::createStream(rtl::OUString const&) 
(WPXSvInputStream.cxx:260)
writerperfect::WPXSvInputStreamImpl::getSubStreamByName(char const*) 
(WPXSvInputStream.cxx:201)
MWAWInputStream::unzipStream()
MWAWInputStream::MWAWInputStream

valgrind + bff

Change-Id: Iaecb8b7f05ed4369ddd37b34166dc3c3388ffb4d

diff --git a/writerperfect/source/common/WPXSvInputStream.cxx 
b/writerperfect/source/common/WPXSvInputStream.cxx
index 264dcc8..1f8d575 100644
--- a/writerperfect/source/common/WPXSvInputStream.cxx
+++ b/writerperfect/source/common/WPXSvInputStream.cxx
@@ -253,9 +253,8 @@ SotStorageStreamRef OLEStorageImpl::createStream(const 
rtl::OUString &rPath)
 
 const OLEStorageMap_t::const_iterator aIt = maStorageMap.find(aDir);
 
-// We can only get there for paths that are present in the OLE.
-// Which means the storage must exist.
-assert(maStorageMap.end() != aIt);
+if (maStorageMap.end() == aIt)
+return 0;
 
 return aIt->second.ref->OpenSotStream(aName, STREAM_STD_READ);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sd/source

[Zolnai Tamás]

 sd/source/ui/func/fuinsert.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fd63ba45742e0886f15f907c03025b9dcc84d8ab
Author: Zolnai Tamás 
Date:   Tue Aug 19 10:09:02 2014 +0200

Fix Insert 3D Model file dialog's "All supported formats" filter

It seems on some system the file dialog does not like spaces
between the formats.

Change-Id: Ifa69f4f210061209f7f0aa9223417d06b06b577a

diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index 6a97b07..4d20dcb 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -786,7 +786,7 @@ void FuInsert3DModel::DoExecute( SfxRequest& )
 aDlg.SetTitle( "Insert 3D Model" );
 
 #if HAVE_FEATURE_COLLADA
-aDlg.AddFilter( "All supported formats", "*.json; *.dae; *.kmz"  );
+aDlg.AddFilter( "All supported formats", "*.json;*.dae;*.kmz"  );
 #else
 aDlg.AddFilter( "All supported formats", "*.json"  );
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scripting/java

[Noel Grandin]

 
scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
 |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 0c8c3a536b07d3adb8cd558debd0d409cabb8b9e
Author: Noel Grandin 
Date:   Tue Aug 19 10:21:22 2014 +0200

fix java1.5 build compatibility

accidentally introduced by me in commit 0477e6c3 "java: add
@Override annotation to overriding methods"

Change-Id: Ieccd78f57282778a5e8f805f7a40f5e6a24e9498

diff --git 
a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
 
b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
index ce909f0..e7ac14c 100644
--- 
a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
+++ 
b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
@@ -266,7 +266,6 @@ public class ScriptEditorForJavaScript implements 
ScriptEditor
 });
 Context.addContextListener(sdb);
 sdb.setScopeProvider(new ScopeProvider() {
-@Override
 public Scriptable getScope() {
 return 
org.mozilla.javascript.tools.shell.Main.getScope();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sd/source

[Eilidh McAdam]

 sd/source/ui/view/DocumentRenderer.cxx |   33 -
 1 file changed, 28 insertions(+), 5 deletions(-)

New commits:
commit 7b31e45ec7106d2cfbdbb7915d97667ba710f81c
Author: Eilidh McAdam 
Date:   Mon Jun 23 20:55:21 2014 +0100

Make Draw use paper size when printing - fdo#63905

Previously, Draw/Impress use the default size from the printer.
Now Draw uses the paper size (specified in page formatting).
Impress still uses the old method - not sure if this is correct
but printing handouts etc probably complicate print/paper size.

Change-Id: If90bae4ac59cd95dd50fcd8deb25fd900756193e
Reviewed-on: https://gerrit.libreoffice.org/9866
Reviewed-by: Matúš Kukan 
Tested-by: Matúš Kukan 

diff --git a/sd/source/ui/view/DocumentRenderer.cxx 
b/sd/source/ui/view/DocumentRenderer.cxx
index ba5445d..c370a69 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -1369,7 +1369,19 @@ private:
 else if (rInfo.maPageSize.Width() < rInfo.maPageSize.Height())
 rInfo.meOrientation = ORIENTATION_LANDSCAPE;
 
-const Size aPaperSize (rInfo.mpPrinter->GetPaperSize());
+// Draw should abide by specified paper size
+Size aPaperSize;
+if (mpOptions->IsDraw())
+{
+aPaperSize.setWidth(rInfo.maPageSize.Width());
+aPaperSize.setHeight(rInfo.maPageSize.Height());
+}
+else
+{
+aPaperSize.setWidth(rInfo.mpPrinter->GetPaperSize().Width());
+aPaperSize.setHeight(rInfo.mpPrinter->GetPaperSize().Height());
+}
+
 if( (rInfo.meOrientation == ORIENTATION_LANDSCAPE &&
   (aPaperSize.Width() < aPaperSize.Height()))
||
@@ -1432,10 +1444,21 @@ private:
 
 if (mpOptions->IsTime())
 aInfo.msTimeDate += 
GetSdrGlobalData().GetLocaleData()->getTime( Time( Time::SYSTEM ), false, false 
);
-aInfo.maPrintSize = aInfo.mpPrinter->GetOutputSize();
-maPrintSize = awt::Size(
-aInfo.mpPrinter->GetPaperSize().Width(),
-aInfo.mpPrinter->GetPaperSize().Height());
+
+// Draw should use specified paper size when printing
+if (mpOptions->IsDraw())
+{
+aInfo.maPrintSize = mrBase.GetDocument()->GetSdPage(0, 
PK_STANDARD)->GetSize();
+maPrintSize = awt::Size(aInfo.maPrintSize.Width(),
+aInfo.maPrintSize.Height());
+}
+else
+{
+aInfo.maPrintSize = aInfo.mpPrinter->GetOutputSize();
+maPrintSize = awt::Size(
+aInfo.mpPrinter->GetPaperSize().Width(),
+aInfo.mpPrinter->GetPaperSize().Height());
+}
 
 switch (mpOptions->GetOutputQuality())
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 sw/qa/core/exportdata/ooxml/pass/sdt-before-table.docx |binary
 sw/source/filter/ww8/docxattributeoutput.cxx   |3 +++
 2 files changed, 3 insertions(+)

New commits:
commit 914431e165ab4c9d99be329a8b8c68fdaccff960
Author: Miklos Vajna 
Date:   Tue Aug 19 10:22:48 2014 +0200

DOCX export: handle multi-para SDT's ending right before a table

Change-Id: I47ea5fd6e1b4d9d5a2893112efdcd810c4c84cfb

diff --git a/sw/qa/core/exportdata/ooxml/pass/sdt-before-table.docx 
b/sw/qa/core/exportdata/ooxml/pass/sdt-before-table.docx
new file mode 100644
index 000..da51cc7
Binary files /dev/null and 
b/sw/qa/core/exportdata/ooxml/pass/sdt-before-table.docx differ
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 86065cb..d2c4f71 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -2953,6 +2953,9 @@ void DocxAttributeOutput::switchHeaderFooter(bool 
isHeaderFooter, sal_Int32 inde
 
 void DocxAttributeOutput::StartTable( ww8::WW8TableNodeInfoInner::Pointer_t 
pTableTextNodeInfoInner )
 {
+// In case any paragraph SDT's are open, close them here.
+EndParaSdtBlock();
+
 m_pSerializer->startElementNS( XML_w, XML_tbl, FSEND );
 
 tableFirstCells.push_back(pTableTextNodeInfoInner);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: LO 4.3.2.0.0+ build fails on RTF cppunit tests (seg. fault)

[Caolán McNamara]

On Mon, 2014-08-18 at 22:47 +0200, Jean-Baptiste Faure wrote:
> Hi,
> 
> On Ubuntu 14.04 x86-64 building 4.3 branch fails by segmentation fault
> in RTF cppunit tests. It seems that the problem comes from this commit :
> https://gerrit.libreoffice.org/gitweb?p=core.git;a=commit;h=d2e69f454a30e64acb04f88a5d753169dbfc5259

Can you get a bt of the failure ?

C.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: LO 4.3.2.0.0+ build fails on RTF cppunit tests (seg. fault)

[Jean-Baptiste Faure]

Le 19/08/2014 11:32, Caolán McNamara a écrit :
> On Mon, 2014-08-18 at 22:47 +0200, Jean-Baptiste Faure wrote:
>> Hi,
>>
>> On Ubuntu 14.04 x86-64 building 4.3 branch fails by segmentation fault
>> in RTF cppunit tests. It seems that the problem comes from this commit :
>> https://gerrit.libreoffice.org/gitweb?p=core.git;a=commit;h=d2e69f454a30e64acb04f88a5d753169dbfc5259
> 
> Can you get a bt of the failure ?

Here is the bt I got. Hope this help.

Best regards.
JBF
-- 
Seuls des formats ouverts peuvent assurer la pérennité de vos documents.
jbf@jbf-laptop:~/LibO/lo43$ export CPPUNITTRACE="gdb --args"
jbf@jbf-laptop:~/LibO/lo43$ make CppunitTest_writerfilter_rtftok
make -j 2 -rs -f [...]/LibO/lo43/Makefile.gbuild CppunitTest_writerfilter_rtftok
[build CUT] writerfilter_rtftok
GNU gdb (Ubuntu 7.7-0ubuntu3.2) 7.7
Copyright (C) 2014 Free Software Foundation, Inc.
License GPLv3+: GNU GPL version 3 or later 
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.  Type "show copying"
and "show warranty" for details.
This GDB was configured as "x86_64-linux-gnu".
Type "show configuration" for configuration details.
For bug reporting instructions, please see:
.
Find the GDB manual and other documentation resources online at:
.
For help, type "help".
Type "apropos word" to search for commands related to "word"...
Reading symbols from [...]/LibO/lo43/workdir/LinkTarget/Executable/cppunittester...(no debugging symbols found)...done.
(gdb) run
Starting program: [...]/LibO/lo43/workdir/LinkTarget/Executable/cppunittester [...]/LibO/lo43/workdir/LinkTarget/CppunitTest/libtest_writerfilter_rtftok.so --headless -env:BRAND_BASE_DIR=file://[...]/LibO/lo43/instdir -env:BRAND_SHARE_SUBDIR=share -env:UserInstallation=file://[...]/LibO/lo43/workdir/CppunitTest/writerfilter_rtftok.test.user -env:CONFIGURATION_LAYERS=xcsxcu:file://[...]/LibO/lo43/instdir/share/registry -env:UNO_TYPES=file://[...]/LibO/lo43/instdir/program/types/offapi.rdb\ file://[...]/LibO/lo43/instdir/ure/share/misc/types.rdb -env:UNO_SERVICES=file://[...]/LibO/lo43/workdir/Rdb/ure/services.rdb\ file://[...]/LibO/lo43/workdir/ComponentTarget/configmgr/source/configmgr.component\ file://[...]/LibO/lo43/workdir/ComponentTarget/framework/util/fwk.component\ file://[...]/LibO/lo43/workdir/ComponentTarget/i18npool/util/i18npool.component\ file://[...]/LibO/lo43/workdir/ComponentTarget/svtools/util/svt.component\ file://[...]/LibO/lo43/workdir/ComponentTarget/ucb/source/core/ucb1.component\ file://[...]/LibO/lo43/workdir/ComponentTarget/ucb/source/ucp/file/ucpfile1.component\ file://[...]/LibO/lo43/workdir/ComponentTarget/writerfilter/util/writerfilter.component -env:URE_INTERNAL_LIB_DIR=file://[...]/LibO/lo43/instdir/ure/lib -env:LO_LIB_DIR=file://[...]/LibO/lo43/instdir/program -env:LO_JAVA_DIR=file://[...]/LibO/lo43/instdir/program/classes --protector [...]/LibO/lo43/workdir/LinkTarget/Library/unoexceptionprotector.so unoexceptionprotector --protector [...]/LibO/lo43/workdir/LinkTarget/Library/unobootstrapprotector.so unobootstrapprotector
[Thread debugging using libthread_db enabled]
Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_db.so.1".
[New Thread 0x2c58b700 (LWP 19242)]
File tested,Test Result,Execution Time (ms)
file://[...]/LibO/lo43/writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2007-0245-1.rtf,Pass,485
file://[...]/LibO/lo43/writerfilter/qa/cppunittests/rtftok/data/pass/rhbz960019.rtf,Pass,14
file://[...]/LibO/lo43/writerfilter/qa/cppunittests/rtftok/data/pass/TCI-TN65GP-DDRHDLL-partial.rtf,Pass,147
file://[...]/LibO/lo43/writerfilter/qa/cppunittests/rtftok/data/pass/EDB-18754-1.rtf,Pass,43
file://[...]/LibO/lo43/writerfilter/qa/cppunittests/rtftok/data/pass/fdo64656.rtf,Pass,13
file://[...]/LibO/lo43/writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2010--1.rtf,Pass,1
file://[...]/LibO/lo43/writerfilter/qa/cppunittests/rtftok/data/pass/fdo49666.rtf,Pass,2
file://[...]/LibO/lo43/writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2005-2972-2.rtf,Pass,2
file://[...]/LibO/lo43/writerfilter/qa/cppunittests/rtftok/data/pass/abi4817.rtf,Pass,0
file://[...]/LibO/lo43/writerfilter/qa/cppunittests/rtftok/data/pass/abi3623.rtf,Pass,1
file://[...]/LibO/lo43/writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2014-1761-2.rtf,Pass,2
file://[...]/LibO/lo43/writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2005-2972-1.rtf,Pass,2
file://[...]/LibO/lo43/writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2010-3452-1.rtf,Pass,0
file://[...]/LibO/lo43/writerfilter/qa/cppunittests/rtftok/data/pass/sf_edeb1eb341ad4c8608af9396952724a0-41170.rtf,
Program received signal SIGSEGV, Segmentation fault.
0x2aaab1adcd9a in writerfilter::dmapper::DomainMapper_Impl::finishParagraph(boost::shared_ptr) () from [...]/LibO/lo43/instdir/program/libwriterfilterlo.so
(gdb) bt
#0  

[Libreoffice-commits] core.git: desktop/source

[Ptyl Dragon]

 desktop/source/app/sofficemain.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit b00ce3241ef6456d10af869b2bc07cf0db7618dd
Author: Ptyl Dragon 
Date:   Mon Aug 18 18:29:20 2014 +0300

fix for PtylTestEncryptionAndExport (on sofficemain.cxx)

Change-Id: I2857dae2df3b3e7e89b5bd56b35a4b8f3868920e

diff --git a/desktop/source/app/sofficemain.cxx 
b/desktop/source/app/sofficemain.cxx
index ef7d172..dff16e8 100644
--- a/desktop/source/app/sofficemain.cxx
+++ b/desktop/source/app/sofficemain.cxx
@@ -134,7 +134,10 @@ extern "C" void PtylTestEncryptionAndExport(const char 
*pathname)
 
 utl::MediaDescriptor media;
 media[utl::MediaDescriptor::PROP_FILTERNAME()] <<= OUString("MS Word 2007 
XML");
-css::uno::Sequence encryptionData = 
comphelper::OStorageHelper::CreatePackageEncryptionData("myPassword");
+OUString password("myPassword");
+css::uno::Sequence encryptionData(1);
+encryptionData[0].Name = "OOXPassword";
+encryptionData[0].Value = css::uno::makeAny(password);
 media[utl::MediaDescriptor::PROP_ENCRYPTIONDATA()] <<= encryptionData;
 
 css::uno::Reference model(component, 
css::uno::UNO_QUERY);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Markus Mohrhard]

 sc/qa/unit/subsequent_export-test.cxx |   11 ---
 1 file changed, 11 deletions(-)

New commits:
commit 8ae264eb2f4bcd8cfdf6561857630c031cecd206
Author: Markus Mohrhard 
Date:   Tue Aug 19 10:42:21 2014 +0200

enable test after fixing the validation error

Change-Id: I99cd2c23d640eef744b292d3643baab6d42d191f

diff --git a/sc/qa/unit/subsequent_export-test.cxx 
b/sc/qa/unit/subsequent_export-test.cxx
index 8d9a67a..601b0d8 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -111,9 +111,7 @@ public:
 void testFunctionsExcel2010( sal_uLong nFormatType );
 void testFunctionsExcel2010XLSX();
 void testFunctionsExcel2010XLS();
-#if 0
 void testFunctionsExcel2010ODS();
-#endif
 
 void testRelativePaths();
 void testSheetProtection();
@@ -154,14 +152,7 @@ public:
 CPPUNIT_TEST(testRelativePaths);
 #endif
 CPPUNIT_TEST(testSheetProtection);
-
-/* TODO: export to ODS currently (2014-04-28) makes the validator stumble,
- * probably due to a loext:fill-character attribute in a
- *  element (says number:text tag would not be
- * allowed, which is nonsense). Skip this test until solved. */
-#if 0
 CPPUNIT_TEST(testFunctionsExcel2010ODS);
-#endif
 
 CPPUNIT_TEST_SUITE_END();
 
@@ -1983,12 +1974,10 @@ void ScExportTest::testSheetProtection()
 xDocSh2->DoClose();
 }
 
-#if 0
 void ScExportTest::testFunctionsExcel2010ODS()
 {
 testFunctionsExcel2010(ODS);
 }
-#endif
 
 ScExportTest::ScExportTest()
   : ScBootstrapFixture("/sc/qa/unit/data")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: LO 4.3.2.0.0+ build fails on RTF cppunit tests (seg. fault)

[Caolán McNamara]

On Tue, 2014-08-19 at 11:52 +0200, Jean-Baptiste Faure wrote:
> Le 19/08/2014 11:32, Caolán McNamara a écrit :
> > On Mon, 2014-08-18 at 22:47 +0200, Jean-Baptiste Faure wrote:
> >> Hi,
> >>
> >> On Ubuntu 14.04 x86-64 building 4.3 branch fails by segmentation fault
> >> in RTF cppunit tests. It seems that the problem comes from this commit :
> >> https://gerrit.libreoffice.org/gitweb?p=core.git;a=commit;h=d2e69f454a30e64acb04f88a5d753169dbfc5259
> > 
> > Can you get a bt of the failure ?
> 
> Here is the bt I got. Hope this help.

https://gerrit.libreoffice.org/#/c/11018/ should fix this

C.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PATCH 01/17] XSLT: Better error messages in measure_conversion.xsl

[Andrew Sayers]

On Mon, Aug 18, 2014 at 02:05:15pm +0200, Jan-Marek Glogowski wrote:
> Thanks for the patches, but they won't be accepted in this form.
> 
> Please follow
> 
> https://wiki.documentfoundation.org/Development/gerrit

Er, ok.  I had been following Google's first link for "libreoffice patch
process":

https://wiki.documentfoundation.org/Development/Patch_Handling_Guidelines

That page implies both forms are acceptable, so I picked the one that seemed
like the least hassle for a one-time patch.  If that's not the case, could I
suggest making the page a simple link to the gerrit page, or at least amending
the pre-preamble with words to the effect of "patches will no longer be
accepted in the form described on this page"?

- Andrew
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Miklos Vajna]

 sw/qa/core/exportdata/ooxml/pass/sdt-around-float-table.docx |binary
 sw/source/filter/ww8/docxattributeoutput.cxx |3 +++
 2 files changed, 3 insertions(+)

New commits:
commit b3f4709d739743d744b8bb4c2231bb80772af2f6
Author: Miklos Vajna 
Date:   Tue Aug 19 12:47:07 2014 +0200

DOCX export: handle SDT around floating tables

Change-Id: I07fedc201c51008baca3254dcc099f0182aa4c72

diff --git a/sw/qa/core/exportdata/ooxml/pass/sdt-around-float-table.docx 
b/sw/qa/core/exportdata/ooxml/pass/sdt-around-float-table.docx
new file mode 100644
index 000..1d57e7b
Binary files /dev/null and 
b/sw/qa/core/exportdata/ooxml/pass/sdt-around-float-table.docx differ
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index d2c4f71..b3f2255 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -41,6 +41,7 @@
 #include "wrtww8.hxx"
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -442,6 +443,8 @@ void DocxAttributeOutput::EndParagraph( 
ww8::WW8TableNodeInfoInner::Pointer_t pT
 ++m_nTextFrameLevel;
 if( m_nTextFrameLevel == 1 )
 {
+comphelper::FlagRestorationGuard 
aStartedParaSdtGuard(m_bStartedParaSdt, false);
+
 assert(!m_postponedCustomShape);
 m_postponedCustomShape = new std::list< PostponedDrawing >;
 for (size_t nIndex = 0; nIndex < m_aFramesOfParagraph.size(); ++nIndex)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: LO 4.3.2.0.0+ build fails on RTF cppunit tests (seg. fault)

[Jean-Baptiste Faure]

Hi Caolán,

Le 19/08/2014 12:51, Caolán McNamara a écrit :
> On Tue, 2014-08-19 at 11:52 +0200, Jean-Baptiste Faure wrote:
>> Le 19/08/2014 11:32, Caolán McNamara a écrit :
>>> On Mon, 2014-08-18 at 22:47 +0200, Jean-Baptiste Faure wrote:
 Hi,

 On Ubuntu 14.04 x86-64 building 4.3 branch fails by segmentation fault
 in RTF cppunit tests. It seems that the problem comes from this commit :
 https://gerrit.libreoffice.org/gitweb?p=core.git;a=commit;h=d2e69f454a30e64acb04f88a5d753169dbfc5259
>>>
>>> Can you get a bt of the failure ?
>>
>> Here is the bt I got. Hope this help.
> 
> https://gerrit.libreoffice.org/#/c/11018/ should fix this

Indeed, this commit solves the problem in my build.

Thank you very much :-)

Best regards.
JBF

-- 
Seuls des formats ouverts peuvent assurer la pérennité de vos documents.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Discussion of Bug 37759 - Pixel around Objects like ellipse

[Papamatti]

Hello list,

I investigate the problem of two pixels (top left and bottom right)
around predefined shapes (circle, smiley, ellipse...)

You can reproduce the bug by
- Open LibreOffice Draw
- Draw a ellipse or circle
- Select your object and convert it to a polygon
- change into the edit points mode
- now you can see the additional point top left and bottom right.

You can move these dots around, delete them and so on. Unfortunalely
they are visible on export into pdf or any other format.

This Bug does not exist in OOO3.20 and was fixed in AOO3.40.
It was Introduces during the development of OOo 3.30 and found it's way
during the fork into LibreOffice 3.3. This is the story so far.

I investigate the files, which OOo 3.20 and LO4.2.4 are creating with
the steps described above and with an simple ellipse.

OpenOffice 3.20 has created this structure:
(There are no additional dots, and, surprise if i open this file with
LO4.2.4 and save it into another file and reopen it with LO4.2.4 the bug
is not present! Conclusion: The bug has something to do with the
creation of these shapes!)


  

  
   
 
   
 



LibreOffice 4.2.4 (Ubuntu 14.04) creates this structure after drawing a
ellipse:


  

  


  

  


LibreOffice 4.2.4 (Ubuntu 14.04) creates this structure after convert
the ellipse into a polygon:
(But instead of a polygon, LO creates a path!!!)


  

  

  

  


After deleting the two additional dots and save the file again it
changed to a polygon!!!:
(Also look at the svg width, hight and the svg:viewBox) ;-)


  

  

  

  


Alternatively I create this file, instead of deleting the two dots I
move them slightly away from the object. The result is:


  

  

  

  


Very strange.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: vcl/unx

[David Tardon]

 vcl/unx/gtk/fpicker/SalGtkPicker.cxx |2 +-
 vcl/unx/gtk/fpicker/SalGtkPicker.hxx |7 ---
 vcl/unx/gtk/window/gtksalmenu.cxx|9 +
 3 files changed, 2 insertions(+), 16 deletions(-)

New commits:
commit ca54b6ea903da7a1bc815c27389d2f1d362edaff
Author: David Tardon 
Date:   Tue Aug 19 15:22:45 2014 +0200

use SolarMutex instead of a custom GdkThreadLock

C.f. commit 861a1c2dea41c141bffce54c30d53e65b7b88973.

Change-Id: I9f6cf917c63ee8c0db5461529c4ee277e231368f

diff --git a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx 
b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
index 25553aa..ccae7d1 100644
--- a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
@@ -98,7 +98,7 @@ extern "C"
 {
 static gboolean canceldialog(RunDialog *pDialog)
 {
-GdkThreadLock lock;
+SolarMutexGuard g;
 pDialog->cancel();
 return false;
 }
diff --git a/vcl/unx/gtk/fpicker/SalGtkPicker.hxx 
b/vcl/unx/gtk/fpicker/SalGtkPicker.hxx
index 6a72e7f..8f4552c 100644
--- a/vcl/unx/gtk/fpicker/SalGtkPicker.hxx
+++ b/vcl/unx/gtk/fpicker/SalGtkPicker.hxx
@@ -66,13 +66,6 @@ class SalGtkPicker
 OUString getResString( sal_Int32 aId );
 };
 
-class GdkThreadLock
-{
-public:
-GdkThreadLock() { gdk_threads_enter(); }
-~GdkThreadLock() { gdk_threads_leave(); }
-};
-
 //Run the Gtk Dialog. Watch for any "new windows" created while we're
 //executing and consider that a CANCEL event to avoid e.g. "file cannot be 
opened"
 //modal dialogs and this one getting locked if some other API call causes this
diff --git a/vcl/unx/gtk/window/gtksalmenu.cxx 
b/vcl/unx/gtk/window/gtksalmenu.cxx
index 92176b7..09cd44f 100644
--- a/vcl/unx/gtk/window/gtksalmenu.cxx
+++ b/vcl/unx/gtk/window/gtksalmenu.cxx
@@ -450,17 +450,10 @@ void GtkSalMenu::SetSubMenu( SalMenuItem* pSalMenuItem, 
SalMenu* pSubMenu, unsig
 pItem->mpSubMenu = pGtkSubMenu;
 }
 
-class GdkThreadLock
-{
-public:
-GdkThreadLock() { gdk_threads_enter(); }
-~GdkThreadLock() { gdk_threads_leave(); }
-};
-
 static bool bInvalidMenus = false;
 static gboolean RefreshMenusUnity(gpointer)
 {
-GdkThreadLock aLock;
+SolarMutexGuard g;
 
 SalDisplay* pSalDisplay = GetGenericData()->GetSalDisplay();
 std::list< SalFrame* >::const_iterator pSalFrame = 
pSalDisplay->getFrames().begin();
___
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' - writerfilter/source

[Caolán McNamara]

 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 5b980040676f2ce0f09b37e1070acb506cbe15e0
Author: Caolán McNamara 
Date:   Tue Jun 10 14:07:19 2014 +0100

fix build, coverity#1209547 Unchecked dynamic_cast

(cherry picked from commit f4c80aaf3f2b97661ecf1cfd014aaa5ad00da846)

Change-Id: Ibf614156aeafcd74be444cf388e02a9273d38d5f
Reviewed-on: https://gerrit.libreoffice.org/11018
Reviewed-by: David Tardon 
Tested-by: David Tardon 

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index ad460fa..0e18852 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1086,7 +1086,7 @@ void DomainMapper_Impl::finishParagraph( PropertyMapPtr 
pPropertyMap )
 dmapper_logger->attribute("isTextAppend", xTextAppend.is());
 #endif
 
-if(xTextAppend.is() && ! getTableManager( ).isIgnore() && pParaContext != 
NULL)
+if (xTextAppend.is() && !getTableManager( ).isIgnore() && pParaContext != 
NULL)
 {
 try
 {
@@ -1221,14 +1221,17 @@ void DomainMapper_Impl::finishParagraph( PropertyMapPtr 
pPropertyMap )
 }
 
 m_bParaChanged = false;
-if(!pParaContext->IsFrameMode())
+if (!pParaContext || !pParaContext->IsFrameMode())
 { // If the paragraph is in a frame, it's not a paragraph of the section 
itself.
 m_bIsFirstParaInSection = false;
 m_bIsLastParaInSection = false;
 }
 
-// Reset the frame properties for the next paragraph
-pParaContext->ResetFrameProperties();
+if (pParaContext)
+{
+// Reset the frame properties for the next paragraph
+pParaContext->ResetFrameProperties();
+}
 
 #ifdef DEBUG_DOMAINMAPPER
 dmapper_logger->endElement();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - writerfilter/source

[Caolán McNamara]

 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 2a12ec16edbfad4c25c2cfe261c39fcb69abb4c6
Author: Caolán McNamara 
Date:   Tue Jun 10 14:07:19 2014 +0100

fix build, coverity#1209547 Unchecked dynamic_cast

(cherry picked from commit f4c80aaf3f2b97661ecf1cfd014aaa5ad00da846)

Change-Id: Ibf614156aeafcd74be444cf388e02a9273d38d5f
Reviewed-on: https://gerrit.libreoffice.org/11019
Reviewed-by: David Tardon 
Tested-by: David Tardon 

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 1d5c199..3b55e86 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1047,7 +1047,7 @@ void DomainMapper_Impl::finishParagraph( PropertyMapPtr 
pPropertyMap )
 dmapper_logger->attribute("isTextAppend", xTextAppend.is());
 #endif
 
-if(xTextAppend.is() && ! getTableManager( ).isIgnore() && pParaContext != 
NULL)
+if (xTextAppend.is() && !getTableManager( ).isIgnore() && pParaContext != 
NULL)
 {
 try
 {
@@ -1182,14 +1182,17 @@ void DomainMapper_Impl::finishParagraph( PropertyMapPtr 
pPropertyMap )
 }
 
 m_bParaChanged = false;
-if(!pParaContext->IsFrameMode())
+if (!pParaContext || !pParaContext->IsFrameMode())
 { // If the paragraph is in a frame, it's not a paragraph of the section 
itself.
 m_bIsFirstParaInSection = false;
 m_bIsLastParaInSection = false;
 }
 
-// Reset the frame properties for the next paragraph
-pParaContext->ResetFrameProperties();
+if (pParaContext)
+{
+// Reset the frame properties for the next paragraph
+pParaContext->ResetFrameProperties();
+}
 
 #ifdef DEBUG_DOMAINMAPPER
 dmapper_logger->endElement();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/inc

[Takeshi Abe]

 sw/inc/doc.hxx|5 +
 sw/inc/editsh.hxx |4 +---
 sw/inc/tox.hxx|2 +-
 3 files changed, 3 insertions(+), 8 deletions(-)

New commits:
commit 44afb981a587fb5b5e6fd9ba5c5b138526cfb04b
Author: Takeshi Abe 
Date:   Tue Aug 19 18:24:54 2014 +0900

fdo#75757: remove inheritance to std::vector

by replacing it with a typedef.

Change-Id: Iaa88086e3c5195012982dd625bfd589de2e484a2
Reviewed-on: https://gerrit.libreoffice.org/11017
Reviewed-by: David Tardon 
Tested-by: David Tardon 

diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index e000a91..4a57c9b 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -42,6 +42,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -126,11 +127,7 @@ class SwSectionFmt;
 class SwSectionFmts;
 class SwSectionData;
 class SwSelBoxes;
-class SwTOXBase;
 class SwTOXBaseSection;
-class SwTOXMark;
-class SwTOXMarks;
-class SwTOXType;
 class SwTOXTypes;
 class SwTabCols;
 class SwTable;
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 6691202..60f0f2d 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -32,6 +32,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -77,9 +78,6 @@ class SwFmtFtn;
 class SwSection;
 class SwSectionData;
 class SwSectionFmt;
-class SwTOXMarks;
-class SwTOXBase;
-class SwTOXType;
 class SwTableAutoFmt;
 class SwPageDesc;
 class SwTxtINetFmt;
diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx
index 375a27b..4165a66 100644
--- a/sw/inc/tox.hxx
+++ b/sw/inc/tox.hxx
@@ -40,7 +40,7 @@ class SwTOXMark;
 class SwTxtTOXMark;
 class SwDoc;
 
-class SwTOXMarks : public std::vector {};
+typedef std::vector SwTOXMarks;
 
 // Entry of content index, alphabetical index or user defined index
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 75757] remove inheritance to std::map and std::vector

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=75757

--- Comment #24 from Commit Notification 
 ---
Takeshi Abe committed a patch related to this issue.
It has been pushed to "master":

http://cgit.freedesktop.org/libreoffice/core/commit/?id=44afb981a587fb5b5e6fd9ba5c5b138526cfb04b

fdo#75757: remove inheritance to std::vector



The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds
Affected users are encouraged to test the fix and report feedback.

-- 
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 44580] share autocorrect replacement table for misc. language subgroups

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=44580

--- Comment #16 from tommy27  ---
first of all we have to define the exact position of those autocorrect files.

default replacements are under ...\LibreOffice 4\share\autocorr

these are use for first time use of the autocorrect engine and are copied into
the user profile which should be under ...LibreOffice 4\user\autocorr

further edits (addition of new entries, removal or modification of existing
one) will affect the files in the "user" profile, not those under "share"

so in a french scenario, since you have an unlocalized version under "share"
which is acor_fr.dat, when you use it for the first time in a french(france)
document it will be copied under "user" as acor_fr-FR.dat and will apply just
to french(france) documents and not to other variants like french(canada).

if you wanna an unlocalized version of the french autocorrect list, you have to
manually copy the acor_fr.dat from "share" and place it under "user"

this will work and apply replacements either in french(france) or in
french(canada) documents.

the problem is that actually you don't see the unlocalized french list in the
autocorrect options dropdown menus, so further edits are not possible.

the code should be tweaked to display unlocalized language list as well.

actually you see:

French (France)  --> acor_fr-FR.dat
French (Canada)  --> acor_fr-CA.dat
etc. etc.

while you should be able to see:

French   --> acor_fr.dat
French (France)  --> acor_fr-FR.dat
French (Canada)  --> acor_fr-CA.dat
etc. etc.

-- 
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 44580] share autocorrect replacement table for misc. language subgroups

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=44580

--- Comment #17 from tommy27  ---
(In reply to comment #15)
> Tommy27: 
> Just to be sure to understand, it would mean:
> - a first file for initial unlocalized file
> - a second file for unlocalized autocorrect if you edit the unlocalized list
> - a third file for your localized autocorrect if you edit localized list
> => So autocorrect process should search in second and third file first (in
> which order? A user could have made a mistake and put a same word to replace
> but a different replacement) and if there's none of these files, should
> search in first file only
> Is it correct?

I made a test to see how the code behaves in front of conflicts.

let's say you have:
color → colour in acor_en-GB.dat
colour → color in acor_en-US.dat

each one will apply only respectively in british english and american english
documents with no conflicts.

If you instead have a:
color → colour in acor_en.dat 
it will apply to american english documents as well

so it means that currently the autocorrect engine looks first in the
unlocalized version (acor_en.dat) rather than the localized version
(acor_en-US.dat) which doesn't look good to me.

In my opinion when you have conflicts, the autocorrect engine should look first
in the autocorrect list which is specific for the document language, in this
case (acor_en-US.dat), and only in a second time in the unlocalized version
(acor_en.dat) if there's no replacement in the previous file.

-- 
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

Re: [PATCH 01/17] XSLT: Better error messages in measure_conversion.xsl

[Kohei Yoshida]

On Tue, 2014-08-19 at 12:12 +0100, Andrew Sayers wrote:
> https://wiki.documentfoundation.org/Development/Patch_Handling_Guidelines

The content of this page is now gone.  If you are an admin and/or has
more clue about how the wiki pages are organized, feel free to clean
this up.

Thanks,

Kohei

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: filter/source

[Caolán McNamara]

 filter/source/graphicfilter/itiff/itiff.cxx |   29 
 1 file changed, 17 insertions(+), 12 deletions(-)

New commits:
commit 1ab0e8717bee9fee6c42015647bccfbf1683b8fc
Author: Caolán McNamara 
Date:   Tue Aug 19 15:14:04 2014 +0100

guard against division by 0

valgrind + bff

Change-Id: I5fa40f7a9759c98bb70ee6eb854dd9b376401f89

diff --git a/filter/source/graphicfilter/itiff/itiff.cxx 
b/filter/source/graphicfilter/itiff/itiff.cxx
index 1eb4c8a..b588aa2 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -1324,29 +1324,34 @@ bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & 
rGraphic )
 bByteSwap = true;
 
 nStripsPerPlane = ( nImageLength - 1 ) / GetRowsPerStrip() 
+ 1;
-nBytesPerRow = ( nImageWidth * nSamplesPerPixel / nPlanes 
* nBitsPerSample + 7 ) >> 3;
+bStatus = nPlanes != 0;
 
-for ( sal_uLong j = 0; j < 4; j++ )
+if (bStatus)
 {
-try
-{
-pMap[ j ] = new sal_uInt8[ nBytesPerRow ];
-}
-catch (const std::bad_alloc &)
+nBytesPerRow = ( nImageWidth * nSamplesPerPixel / 
nPlanes * nBitsPerSample + 7 ) >> 3;
+
+for ( sal_uLong j = 0; j < 4; j++ )
 {
-pMap[ j ] = NULL;
-bStatus = false;
-break;
+try
+{
+pMap[ j ] = new sal_uInt8[ nBytesPerRow ];
+}
+catch (const std::bad_alloc &)
+{
+pMap[ j ] = NULL;
+bStatus = false;
+break;
+}
 }
 }
 
-if (HasAlphaChannel())
+if (bStatus && HasAlphaChannel())
 {
 pAlphaMask = new AlphaMask( aTargetSize );
 pMaskAcc = pAlphaMask->AcquireWriteAccess();
 }
 
-if ( bStatus && ReadMap( 10, 60 ) )
+if (bStatus && ReadMap(10, 60))
 {
 nMaxPos = std::max( pTIFF->Tell(), nMaxPos );
 MakePalCol();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: chart2/source

[Takeshi Abe]

 chart2/source/controller/main/ChartController_Position.cxx |8 +++-
 chart2/source/controller/main/ChartController_TextEdit.cxx |5 ++---
 2 files changed, 5 insertions(+), 8 deletions(-)

New commits:
commit 82cb89fa059ea1a0d1e6db05f9edd42d724289f7
Author: Takeshi Abe 
Date:   Tue Aug 19 22:00:18 2014 +0900

Avoid possible memory leaks in case of exceptions

Change-Id: I41392572692bc219ae18ad89d95fc8be47d6812c

diff --git a/chart2/source/controller/main/ChartController_Position.cxx 
b/chart2/source/controller/main/ChartController_Position.cxx
index c28c697..91d0f8e 100644
--- a/chart2/source/controller/main/ChartController_Position.cxx
+++ b/chart2/source/controller/main/ChartController_Position.cxx
@@ -40,6 +40,7 @@
 #include 
 #include 
 #include 
+#include 
 
 namespace chart
 {
@@ -128,7 +129,6 @@ void ChartController::executeDispatch_PositionAndSize()
 ObjectNameProvider::getName( eObjectType)),
 m_xUndoManager );
 
-SfxAbstractTabDialog * pDlg = NULL;
 try
 {
 SfxItemSet aItemSet = 
m_pDrawViewWrapper->getPositionAndSizeItemSetFromMarkedObject();
@@ -140,8 +140,8 @@ void ChartController::executeDispatch_PositionAndSize()
 SolarMutexGuard aGuard;
 SvxAbstractDialogFactory * pFact = SvxAbstractDialogFactory::Create();
 OSL_ENSURE( pFact, "No dialog factory" );
-pDlg = pFact->CreateSchTransformTabDialog(
-m_pChartWindow, &aItemSet, pSdrView, 
RID_SCH_TransformTabDLG_SVXPAGE_ANGLE, bResizePossible );
+boost::scoped_ptr 
pDlg(pFact->CreateSchTransformTabDialog(
+m_pChartWindow, &aItemSet, pSdrView, 
RID_SCH_TransformTabDLG_SVXPAGE_ANGLE, bResizePossible ));
 OSL_ENSURE( pDlg, "Couldn't create SchTransformTabDialog" );
 
 if( pDlg->Execute() == RET_OK )
@@ -168,11 +168,9 @@ void ChartController::executeDispatch_PositionAndSize()
 aUndoGuard.commit();
 }
 }
-delete pDlg;
 }
 catch(const uno::Exception& e)
 {
-delete pDlg;
 ASSERT_EXCEPTION( e );
 }
 }
diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx 
b/chart2/source/controller/main/ChartController_TextEdit.cxx
index 5ec36e3..43050bf 100644
--- a/chart2/source/controller/main/ChartController_TextEdit.cxx
+++ b/chart2/source/controller/main/ChartController_TextEdit.cxx
@@ -41,6 +41,7 @@
 #include 
 #include 
 #include 
+#include 
 
 namespace chart
 {
@@ -168,7 +169,7 @@ void 
ChartController::executeDispatch_InsertSpecialCharacter()
 Font aCurFont = 
m_pDrawViewWrapper->getOutliner()->GetRefDevice()->GetFont();
 aSet.Put( SvxFontItem( aCurFont.GetFamily(), aCurFont.GetName(), 
aCurFont.GetStyleName(), aCurFont.GetPitch(), aCurFont.GetCharSet(), 
SID_ATTR_CHAR_FONT ) );
 
-SfxAbstractDialog * pDlg = pFact->CreateSfxDialog( m_pChartWindow, aSet, 
getFrame(), RID_SVXDLG_CHARMAP );
+boost::scoped_ptr pDlg(pFact->CreateSfxDialog( 
m_pChartWindow, aSet, getFrame(), RID_SVXDLG_CHARMAP ));
 OSL_ENSURE( pDlg, "Couldn't create SvxCharacterMap dialog" );
 if( pDlg->Execute() == RET_OK )
 {
@@ -206,8 +207,6 @@ void 
ChartController::executeDispatch_InsertSpecialCharacter()
 pOutliner->SetUpdateMode(true);
 pOutlinerView->ShowCursor();
 }
-
-delete pDlg;
 }
 
 uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PATCH 01/17] XSLT: Better error messages in measure_conversion.xsl

[Dennis Roczek]

deleted.

Am 19.08.2014 15:49, schrieb Kohei Yoshida:

On Tue, 2014-08-19 at 12:12 +0100, Andrew Sayers wrote:

https://wiki.documentfoundation.org/Development/Patch_Handling_Guidelines


The content of this page is now gone.  If you are an admin and/or has
more clue about how the wiki pages are organized, feel free to clean
this up.

Thanks,

Kohei

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice





smime.p7s
Description: S/MIME Cryptographic Signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: vcl/source

[Caolán McNamara]

 vcl/source/window/layout.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 36490fff3f4d1b4a7e4b7902a866abb177a0bf54
Author: Caolán McNamara 
Date:   Tue Aug 19 16:14:23 2014 +0100

facepalm: nAvailHeight is not derived from allocation Width

Change-Id: Ic99c6519b02c546e0d3574cb756e3fb172d1ff52

diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 21e49f5..ffce00d 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -1694,7 +1694,7 @@ void VclScrolledWindow::setAllocation(const Size 
&rAllocation)
 if (pChild && pChild->IsVisible())
 aChildReq = getLayoutRequisition(*pChild);
 
-long nAvailHeight = rAllocation.Width();
+long nAvailHeight = rAllocation.Height();
 long nAvailWidth = rAllocation.Width();
 // vert. ScrollBar
 if (GetStyle() & WB_AUTOVSCROLL)
___
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' - sd/source

[Zolnai Tamás]

 sd/source/ui/func/fuinsert.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0107cb29903c1e2fdf4c7390671a8b8bc6900e54
Author: Zolnai Tamás 
Date:   Tue Aug 19 10:09:02 2014 +0200

Fix Insert 3D Model file dialog's "All supported formats" filter

It seems on some system the file dialog does not like spaces
between the formats.

(cherry picked from commit fd63ba45742e0886f15f907c03025b9dcc84d8ab)

Conflicts:
sd/source/ui/func/fuinsert.cxx

Change-Id: Ifa69f4f210061209f7f0aa9223417d06b06b577a
Reviewed-on: https://gerrit.libreoffice.org/11016
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index e3fbd43..cd03700 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -789,7 +789,7 @@ void FuInsert3DModel::DoExecute( SfxRequest& )
 sfx2::FileDialogHelper aDlg( 
ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 );
 
 aDlg.SetTitle( "Insert 3D Model" );
-aDlg.AddFilter( "All supported formats", "*.json; *.dae; *.kmz"  );
+aDlg.AddFilter( "All supported formats", "*.json;*.dae;*.kmz"  );
 aDlg.AddFilter( "JSON - GL Transmission Format", "*.json" );
 aDlg.AddFilter( "DAE - COLLADA", "*.dae" );
 aDlg.AddFilter( "KMZ - Keyhole Markup language Zipped", "*.kmz"  );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/CppunitTest_sw_ooxmlexport2.mk sw/CppunitTest_sw_ooxmlexport3.mk sw/CppunitTest_sw_ooxmlexport4.mk sw/CppunitTest_sw_ooxmlexport5.mk sw/CppunitTest_sw_ooxmlexport.mk

[Luboš Luňák]

 sw/CppunitTest_sw_ooxmlexport.mk  |   47 
 sw/CppunitTest_sw_ooxmlexport2.mk |   16 
 sw/CppunitTest_sw_ooxmlexport3.mk |   16 
 sw/CppunitTest_sw_ooxmlexport4.mk |   16 
 sw/CppunitTest_sw_ooxmlexport5.mk |   16 
 sw/Module_sw.mk   |4 
 sw/ooxmlexport_setup.mk   |   51 
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx  | 3317 --
 sw/qa/extras/ooxmlexport/ooxmlexport2.cxx | 1118 ++
 sw/qa/extras/ooxmlexport/ooxmlexport3.cxx | 1048 +
 sw/qa/extras/ooxmlexport/ooxmlexport4.cxx |  803 +++
 sw/qa/extras/ooxmlexport/ooxmlexport5.cxx |  677 ++
 12 files changed, 3767 insertions(+), 3362 deletions(-)

New commits:
commit 869a3e1b7f269053b4fed6d768939c0ab595bc76
Author: Luboš Luňák 
Date:   Tue Aug 19 17:20:08 2014 +0200

split CppunitTest_sw_ooxmlexport into several tests

In order to allow running them in parallel. There are already enough
tests to make it run for a couple of minutes and it's annoying to
see only once core busy with it.
I intentionally left the original file at the same name, without 1
appended, in order to avoid merge problems.

Change-Id: I097c45c34797cc68f5d1790cf31eefc96fbaf44e

diff --git a/sw/CppunitTest_sw_ooxmlexport.mk b/sw/CppunitTest_sw_ooxmlexport.mk
index 1d30e31..c7467a3 100644
--- a/sw/CppunitTest_sw_ooxmlexport.mk
+++ b/sw/CppunitTest_sw_ooxmlexport.mk
@@ -11,50 +11,7 @@
 
 include $(SRCDIR)/sw/ooxmlexport_setup.mk
 
-$(eval $(call gb_CppunitTest_CppunitTest,sw_ooxmlexport))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sw_ooxmlexport, \
-sw/qa/extras/ooxmlexport/ooxmlexport \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sw_ooxmlexport, \
-   $(sw_ooxmlexport_libraries) \
-))
-
-$(eval $(call gb_CppunitTest_use_externals,sw_ooxmlexport,\
-   boost_headers \
-libxml2 \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sw_ooxmlexport,\
--I$(SRCDIR)/sw/inc \
--I$(SRCDIR)/sw/source/core/inc \
-   -I$(SRCDIR)/sw/qa/extras/inc \
-$$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_api,sw_ooxmlexport,\
-offapi \
-udkapi \
-))
-
-$(eval $(call gb_CppunitTest_use_ure,sw_ooxmlexport))
-$(eval $(call gb_CppunitTest_use_vcl,sw_ooxmlexport))
-
-$(eval $(call gb_CppunitTest_use_components,sw_ooxmlexport,\
-   $(sw_ooxmlexport_components) \
-   filter/source/storagefilterdetect/storagefd \
-))
-
-$(eval $(call gb_CppunitTest_use_configuration,sw_ooxmlexport))
-
-$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_ooxmlexport))
-
-$(eval $(call gb_CppunitTest_use_packages,sw_ooxmlexport,\
-   oox_customshapes \
-   oox_generated \
-))
-
-$(call gb_CppunitTest_get_target,sw_ooxmlexport) : $(call 
gb_Library_get_target,iti)
+# empty second argument (i.e. no 1)
+$(call sw_ooxmlexport_test,)
 
 # vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_ooxmlexport2.mk 
b/sw/CppunitTest_sw_ooxmlexport2.mk
new file mode 100644
index 000..c656aba
--- /dev/null
+++ b/sw/CppunitTest_sw_ooxmlexport2.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#*
+
+include $(SRCDIR)/sw/ooxmlexport_setup.mk
+
+$(call sw_ooxmlexport_test,2)
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_ooxmlexport3.mk 
b/sw/CppunitTest_sw_ooxmlexport3.mk
new file mode 100644
index 000..13f3508
--- /dev/null
+++ b/sw/CppunitTest_sw_ooxmlexport3.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#*
+
+include $(SRCDIR)/sw/ooxmlexport_setup.mk
+
+$(call sw_ooxmlexport_test,3)
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_ooxmlexport4.mk 
b/sw/CppunitTest_sw_ooxmlexport4.mk
new file mode 100644
index 000..951b595
--- /dev/null
+++ b/sw/CppunitTest_sw_ooxmlexport4.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the M

[Libreoffice-commits] core.git: cui/uiconfig

[Caolán McNamara]

 cui/uiconfig/ui/newmenu.ui |  190 -
 1 file changed, 190 deletions(-)

New commits:
commit 69d673b1ae8731c088aab7a9e67f5861e056f8f2
Author: Caolán McNamara 
Date:   Tue Aug 19 16:39:18 2014 +0100

dangling unused .ui file

Change-Id: Ifc1968e5474c7f252960d4b790d6f01db29cab8a

diff --git a/cui/uiconfig/ui/newmenu.ui b/cui/uiconfig/ui/newmenu.ui
deleted file mode 100644
index 93325f6..000
--- a/cui/uiconfig/ui/newmenu.ui
+++ /dev/null
@@ -1,190 +0,0 @@
-
-
-  
-  
-  
-False
-5
-dialog
-
-  
-False
-2
-
-  
-False
-vertical
-start
-
-  
-gtk-ok
-True
-True
-True
-True
-  
-  
-False
-True
-0
-  
-
-
-  
-gtk-cancel
-True
-True
-True
-True
-  
-  
-False
-True
-1
-  
-
-
-  
-gtk-help
-True
-True
-True
-True
-  
-  
-False
-True
-2
-  
-
-  
-  
-False
-True
-end
-0
-  
-
-
-  
-True
-False
-vertical
-
-  
-True
-False
-0
-_Menu name
-True
-  
-  
-False
-True
-0
-  
-
-
-  
-True
-True
-•
-  
-  
-False
-True
-1
-  
-
-
-  
-True
-False
-0
-Menu 
_position
-True
-  
-  
-False
-True
-2
-  
-
-
-  
-True
-False
-
-  
-True
-True
-in
-
-  
-
-  
-  
-False
-True
-0
-  
-
-
-  
-True
-False
-vertical
-
-  
-True
-False
-gtk-go-up
-  
-  
-False
-True
-0
-  
-
-
-  
-True
-False
-gtk-go-down
-  
-  
-False
-True
-1
-  
-
-  
-  
-False
-True
-1
-  
-
-  
-  
-False
-True
-3
-  
-
-  
-  
-False
-True
-1
-  
-
-  
-
-
-  ok
-  cancel
-  help
-
-  
-
___
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' - 3 commits - sw/qa sw/source writerfilter/source

[Miklos Vajna]

 sw/qa/extras/ooxmlexport/data/first-header-footer.docx  |binary
 sw/qa/extras/ooxmlexport/data/footer-body-distance.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx|   38 ++-
 sw/qa/extras/ww8import/data/fdo81102.doc|binary
 sw/qa/extras/ww8import/ww8import.cxx|   16 
 sw/source/filter/ww8/ww8par.cxx |5 -
 writerfilter/source/dmapper/DomainMapper_Impl.cxx   |4 -
 writerfilter/source/dmapper/PropertyMap.cxx |   53 +++-
 8 files changed, 69 insertions(+), 47 deletions(-)

New commits:
commit 4a1c82de77f28a107198b8d8da3cf840d541360a
Author: Miklos Vajna 
Date:   Mon Jul 14 12:34:23 2014 +0200

DOCX import: fix FooterBodyDistance for first pages

The root cause was that code in
SectionPropertyMap::PrepareHeaderFooterProperties() saved member
variables on the stack, modified them, then restored them at the end of
the method, but forgot to restore m_nBottomMargin there.

The result of this was that First Page's FooterBodyDistance got set to
zero, which is not the same as Default Style's FooterBodyDistance (150),
so on export sw::util::IsPlausableSingleWordSection() returned false,
which turned the page break into a section break.

Change-Id: I1afa2603de1313ae1e2aaefd4b7c771fce27e21e
(cherry picked from commit 8cf681c5049970573020d8b808c990441b9cf828)
Signed-off-by: Luboš Luňák 

diff --git a/sw/qa/extras/ooxmlexport/data/footer-body-distance.docx 
b/sw/qa/extras/ooxmlexport/data/footer-body-distance.docx
new file mode 100644
index 000..0244d76
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/footer-body-distance.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 30a6d2f..fdcab8a 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3651,6 +3651,13 @@ DECLARE_OOXMLEXPORT_TEST(testFirstHeaderFooter, 
"first-header-footer.docx")
 CPPUNIT_ASSERT_EQUAL(OUString("Even page footer 2"),  
parseDump("/root/page[6]/footer/txt/text()"));
 }
 
+DECLARE_OOXMLEXPORT_TEST(testFooterBodyDistance, "footer-body-distance.docx")
+{
+if (xmlDocPtr pXmlDoc = parseExport())
+// Page break was exported as section break, this was 0
+assertXPath(pXmlDoc, "/w:document/w:body/w:p/w:r/w:br", 1);
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx 
b/writerfilter/source/dmapper/PropertyMap.cxx
index 647c915..0b47cad 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -868,6 +868,7 @@ void SectionPropertyMap::PrepareHeaderFooterProperties( 
bool bFirstPage )
 // Restore original top margin, so we don't end up with a smaller margin 
in case we have to produce two page styles from one Word section.
 m_nTopMargin = nTopMargin;
 m_nHeaderTop = nHeaderTop;
+m_nBottomMargin = nBottomMargin;
 m_nHeaderBottom = nHeaderBottom;
 }
 
commit 2e7a33658983b6863d3847daca0265e43fbe18ba
Author: Luke Deller 
Date:   Wed Jul 9 22:39:41 2014 +1000

fdo#81102: fix .doc import of blank even page header

Honour the "different odd & even pages" header/footer setting from the
doc file even if there is no content for an even page header or footer.

Conflicts:
sw/qa/extras/ww8import/ww8import.cxx
Reviewed on:
https://gerrit.libreoffice.org/10191

(cherry picked from commit b5bb15013617c6b9f1cdd089acae0bfb7104fa3a)
Signed-off-by: Luboš Luňák 

Conflicts:
sw/qa/extras/ww8import/ww8import.cxx

Change-Id: I963f7f7189e399b1d859db0788fbfd291e868c54

diff --git a/sw/qa/extras/ww8import/data/fdo81102.doc 
b/sw/qa/extras/ww8import/data/fdo81102.doc
new file mode 100755
index 000..e8a5507
Binary files /dev/null and b/sw/qa/extras/ww8import/data/fdo81102.doc differ
diff --git a/sw/qa/extras/ww8import/ww8import.cxx 
b/sw/qa/extras/ww8import/ww8import.cxx
index 81b0043..2fca67c 100644
--- a/sw/qa/extras/ww8import/ww8import.cxx
+++ b/sw/qa/extras/ww8import/ww8import.cxx
@@ -496,6 +496,22 @@ DECLARE_WW8IMPORT_TEST(testBnc787942, "bnc787942.doc")
 parseDump("/root/page[1]/body/txt[4]/anchored");
 }
 
+DECLARE_WW8IMPORT_TEST(testFdo81102, "fdo81102.doc")
+{
+// get page style at beginning of document
+uno::Reference textDocument(
+mxComponent, uno::UNO_QUERY);
+uno::Reference start(
+textDocument->getText()->getStart(), uno::UNO_QUERY);
+OUString pageStyleName = getProperty(start, "PageStyleName");
+uno::Reference pageStyle(
+getStyles("PageStyles")->getByName(pageStyleName), uno::UNO_QUERY);
+
+// check that left and right pages do not share the same header
+bool headerIsShared = getProperty(pageStyle, "HeaderIsShared");
+CPPUNIT

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

[Miklos Vajna]

 sw/qa/core/exportdata/ooxml/pass/sdt-sectpr.docx |binary
 sw/source/filter/ww8/docxattributeoutput.cxx |   15 ++-
 sw/source/filter/ww8/docxattributeoutput.hxx |4 
 sw/source/filter/ww8/docxexport.cxx  |4 
 writerfilter/CustomTarget_source.mk  |4 ++--
 writerfilter/source/ooxml/factoryimpl.py |   23 ---
 6 files changed, 40 insertions(+), 10 deletions(-)

New commits:
commit 788632dcb0450cc9863a5a332b6df50b92f30c4d
Author: Miklos Vajna 
Date:   Tue Aug 19 18:12:16 2014 +0200

DOCX export: handle SDT end right before a section break introducing headers

Change-Id: I0fab5ae4335ed6016d31aa243b131899c3154388

diff --git a/sw/qa/core/exportdata/ooxml/pass/sdt-sectpr.docx 
b/sw/qa/core/exportdata/ooxml/pass/sdt-sectpr.docx
new file mode 100644
index 000..334b6e5
Binary files /dev/null and b/sw/qa/core/exportdata/ooxml/pass/sdt-sectpr.docx 
differ
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index b3f2255..9f43f7f 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -292,13 +292,14 @@ void DocxAttributeOutput::StartParagraph( 
ww8::WW8TableNodeInfo::Pointer_t pText
 bEndParaSdt = m_bStartedParaSdt && rMap.find("ParaSdtEndBefore") 
!= rMap.end();
 }
 }
-if (bEndParaSdt)
+if (bEndParaSdt || (m_bStartedParaSdt && m_bHadSectPr))
 {
 // This is the common case: "close sdt before the current paragraph" 
was requrested by the next paragraph.
 EndSdtBlock();
 bEndParaSdt = false;
 m_bStartedParaSdt = false;
 }
+m_bHadSectPr = false;
 
 // this mark is used to be able to enclose the paragraph inside a sdr tag.
 // We will only know if we have to do that later.
@@ -5390,6 +5391,7 @@ void DocxAttributeOutput::StartSection()
 aSeqOrder[i] = aOrder[i];
 
 m_pSerializer->mark( aSeqOrder );
+m_bHadSectPr = true;
 }
 
 void DocxAttributeOutput::EndSection()
@@ -8216,6 +8218,7 @@ DocxAttributeOutput::DocxAttributeOutput( DocxExport 
&rExport, FSHelperPtr pSeri
   m_pRedlineData( NULL ),
   m_nRedlineId( 0 ),
   m_bOpenedSectPr( false ),
+  m_bHadSectPr(false),
   m_bRunTextIsOn( false ),
   m_bWritingHeaderFooter( false ),
   m_bAnchorLinkedToNode(false),
@@ -8368,4 +8371,14 @@ void DocxAttributeOutput::AddToAttrList( 
::sax_fastparser::FastAttributeList* &p
 va_end( args );
 }
 
+void DocxAttributeOutput::SetStartedParaSdt(bool bStartedParaSdt)
+{
+m_bStartedParaSdt = bStartedParaSdt;
+}
+
+bool DocxAttributeOutput::IsStartedParaSdt()
+{
+return m_bStartedParaSdt;
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx 
b/sw/source/filter/ww8/docxattributeoutput.hxx
index 343afaf..d0bfe92 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -746,6 +746,8 @@ private:
 
 /// Flag indicating that the section properties are being written
 bool m_bOpenedSectPr;
+/// Did we have a section break in this paragraph? Set by StartSection(), 
reset by the next StartParagraph().
+bool m_bHadSectPr;
 
 /// Flag indicating that the Run Text is being written
 bool m_bRunTextIsOn;
@@ -960,6 +962,8 @@ public:
 void SetAlternateContentChoiceOpen( bool bAltContentChoiceOpen ) { 
m_bAlternateContentChoiceOpen = bAltContentChoiceOpen; }
 bool IsAlternateContentChoiceOpen( ) { return 
m_bAlternateContentChoiceOpen; }
 void GetSdtEndBefore(const SdrObject* pSdrObj);
+void SetStartedParaSdt(bool bStartedParaSdt);
+bool IsStartedParaSdt();
 };
 
 #endif // INCLUDED_SW_SOURCE_FILTER_WW8_DOCXATTRIBUTEOUTPUT_HXX
diff --git a/sw/source/filter/ww8/docxexport.cxx 
b/sw/source/filter/ww8/docxexport.cxx
index 43272db..7f8ef58 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -714,6 +714,9 @@ void DocxExport::WriteHeaderFooter( const SwFmt& rFmt, bool 
bHeader, const char*
 m_pVMLExport->SetFS( pFS );
 m_pSdrExport->setSerializer(pFS);
 SetFS( pFS );
+bool bStartedParaSdt = m_pAttrOutput->IsStartedParaSdt();
+m_pAttrOutput->SetStartedParaSdt(false);
+
 m_pAttrOutput->switchHeaderFooter(true, m_nHeadersFootersInSection++);
 // do the work
 WriteHeaderFooterText( rFmt, bHeader );
@@ -728,6 +731,7 @@ void DocxExport::WriteHeaderFooter( const SwFmt& rFmt, bool 
bHeader, const char*
 m_pVMLExport->SetFS( m_pDocumentFS );
 m_pSdrExport->setSerializer(m_pDocumentFS);
 SetFS( m_pDocumentFS );
+m_pAttrOutput->SetStartedParaSdt(bStartedParaSdt);
 
 // close the tag
 sal_Int32 nReference;
commit 1c06dc14a1f4cf6bf6121aa9a7b62e8890256161
Author: Miklos Vajna 
Date:   Tue Aug 19 14:26:28 2014 +0200

writerfilter: stop reading namespace-alias elements in

[Libreoffice-commits] core.git: vcl/source

[Caolán McNamara]

 vcl/source/window/layout.cxx |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 749f7548b4ee746d69c20a828ea6d3b853eba8d3
Author: Caolán McNamara 
Date:   Tue Aug 19 17:20:00 2014 +0100

only subtract height of hscroll if visible

otherwise infinite loop in extensions update check

Change-Id: I0dbf4f34208f1bf0854e365006a79470b26571f3

diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index ffce00d..88823f1 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -1706,8 +1706,11 @@ void VclScrolledWindow::setAllocation(const Size 
&rAllocation)
 // horz. ScrollBar
 if (GetStyle() & WB_AUTOHSCROLL)
 {
-m_aHScroll.Show(nAvailWidth < aChildReq.Width());
-nAvailHeight -= getLayoutRequisition(m_aHScroll).Height();
+bool bShowHScroll = nAvailWidth < aChildReq.Width();
+m_aHScroll.Show(bShowHScroll);
+
+if (bShowHScroll)
+nAvailHeight -= getLayoutRequisition(m_aHScroll).Height();
 
 if (GetStyle() & WB_AUTOVSCROLL)
 m_aVScroll.Show(nAvailHeight < aChildReq.Height());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/CppunitTest_sw_ooxmlexport2.mk sw/CppunitTest_sw_ooxmlexport3.mk sw/CppunitTest_sw_ooxmlexport4.mk sw/CppunitTest_sw_ooxmlexport5.mk sw/CppunitTest_sw_ooxmlexport.mk

[Luboš Luňák]

 sw/CppunitTest_sw_ooxmlexport.mk  |2 +-
 sw/CppunitTest_sw_ooxmlexport2.mk |2 +-
 sw/CppunitTest_sw_ooxmlexport3.mk |2 +-
 sw/CppunitTest_sw_ooxmlexport4.mk |2 +-
 sw/CppunitTest_sw_ooxmlexport5.mk |2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 6fc89b66dfe24825993993731878cbbb1121d803
Author: Luboš Luňák 
Date:   Tue Aug 19 18:29:40 2014 +0200

try to fix windows build

Change-Id: I7620d71fe34b5f7bbd9bf9bf63b634d85cdb4d6c

diff --git a/sw/CppunitTest_sw_ooxmlexport.mk b/sw/CppunitTest_sw_ooxmlexport.mk
index c7467a3..d3e7ac1 100644
--- a/sw/CppunitTest_sw_ooxmlexport.mk
+++ b/sw/CppunitTest_sw_ooxmlexport.mk
@@ -12,6 +12,6 @@
 include $(SRCDIR)/sw/ooxmlexport_setup.mk
 
 # empty second argument (i.e. no 1)
-$(call sw_ooxmlexport_test,)
+$(eval $(call sw_ooxmlexport_test,))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_ooxmlexport2.mk 
b/sw/CppunitTest_sw_ooxmlexport2.mk
index c656aba..7dbc8b3 100644
--- a/sw/CppunitTest_sw_ooxmlexport2.mk
+++ b/sw/CppunitTest_sw_ooxmlexport2.mk
@@ -11,6 +11,6 @@
 
 include $(SRCDIR)/sw/ooxmlexport_setup.mk
 
-$(call sw_ooxmlexport_test,2)
+$eval( $(call sw_ooxmlexport_test,2))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_ooxmlexport3.mk 
b/sw/CppunitTest_sw_ooxmlexport3.mk
index 13f3508..42b0e51 100644
--- a/sw/CppunitTest_sw_ooxmlexport3.mk
+++ b/sw/CppunitTest_sw_ooxmlexport3.mk
@@ -11,6 +11,6 @@
 
 include $(SRCDIR)/sw/ooxmlexport_setup.mk
 
-$(call sw_ooxmlexport_test,3)
+$eval( $(call sw_ooxmlexport_test,3))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_ooxmlexport4.mk 
b/sw/CppunitTest_sw_ooxmlexport4.mk
index 951b595..129a946 100644
--- a/sw/CppunitTest_sw_ooxmlexport4.mk
+++ b/sw/CppunitTest_sw_ooxmlexport4.mk
@@ -11,6 +11,6 @@
 
 include $(SRCDIR)/sw/ooxmlexport_setup.mk
 
-$(call sw_ooxmlexport_test,4)
+$eval( $(call sw_ooxmlexport_test,4))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_ooxmlexport5.mk 
b/sw/CppunitTest_sw_ooxmlexport5.mk
index ea8cf65..a84562f 100644
--- a/sw/CppunitTest_sw_ooxmlexport5.mk
+++ b/sw/CppunitTest_sw_ooxmlexport5.mk
@@ -11,6 +11,6 @@
 
 include $(SRCDIR)/sw/ooxmlexport_setup.mk
 
-$(call sw_ooxmlexport_test,5)
+$eval( $(call sw_ooxmlexport_test,5))
 
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 44580] share autocorrect replacement table for misc. language subgroups

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=44580

--- Comment #18 from Julien Nabet  ---
(In reply to comment #17)
> (In reply to comment #15)
> > Tommy27: 
> > Just to be sure to understand, it would mean:
> > - a first file for initial unlocalized file
> > - a second file for unlocalized autocorrect if you edit the unlocalized list
> > - a third file for your localized autocorrect if you edit localized list
> > => So autocorrect process should search in second and third file first (in
> > which order? A user could have made a mistake and put a same word to replace
> > but a different replacement) and if there's none of these files, should
> > search in first file only
> > Is it correct?
> 
> I made a test to see how the code behaves in front of conflicts.
> 
> let's say you have:
> color → colour in acor_en-GB.dat
> colour → color in acor_en-US.dat
> 
> each one will apply only respectively in british english and american
> english documents with no conflicts.
> 
> If you instead have a:
> color → colour in acor_en.dat 
> it will apply to american english documents as well
> 
> so it means that currently the autocorrect engine looks first in the
> unlocalized version (acor_en.dat) rather than the localized version
> (acor_en-US.dat) which doesn't look good to me.
> 
> In my opinion when you have conflicts, the autocorrect engine should look
> first in the autocorrect list which is specific for the document language,
> in this case (acor_en-US.dat), and only in a second time in the unlocalized
> version (acor_en.dat) if there's no replacement in the previous file.
With fresh build of master sources + French UI by default here are my tests.

Open autocorrect French France, change "afirmer => affirmer" to "afirmer =>
afffirmer".
I get "afffirmer" (3 f) when I type "afirmer". I close LO and reopen and the
change is still the localized one.

I'm quite lost here :-(

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sw/CppunitTest_sw_ooxmlexport2.mk sw/CppunitTest_sw_ooxmlexport3.mk sw/CppunitTest_sw_ooxmlexport4.mk sw/CppunitTest_sw_ooxmlexport5.mk

[Luboš Luňák]

 sw/CppunitTest_sw_ooxmlexport2.mk |2 +-
 sw/CppunitTest_sw_ooxmlexport3.mk |2 +-
 sw/CppunitTest_sw_ooxmlexport4.mk |2 +-
 sw/CppunitTest_sw_ooxmlexport5.mk |2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit bbc2f9e9903dcef059c719a8007e12c3e662a51e
Author: Luboš Luňák 
Date:   Tue Aug 19 18:35:22 2014 +0200

fix last commit

Change-Id: I32d3f99a2f090637d6891123f91093c0bcceddf4

diff --git a/sw/CppunitTest_sw_ooxmlexport2.mk 
b/sw/CppunitTest_sw_ooxmlexport2.mk
index 7dbc8b3..2be67c0 100644
--- a/sw/CppunitTest_sw_ooxmlexport2.mk
+++ b/sw/CppunitTest_sw_ooxmlexport2.mk
@@ -11,6 +11,6 @@
 
 include $(SRCDIR)/sw/ooxmlexport_setup.mk
 
-$eval( $(call sw_ooxmlexport_test,2))
+$(eval $(call sw_ooxmlexport_test,2))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_ooxmlexport3.mk 
b/sw/CppunitTest_sw_ooxmlexport3.mk
index 42b0e51..cdb9ab1 100644
--- a/sw/CppunitTest_sw_ooxmlexport3.mk
+++ b/sw/CppunitTest_sw_ooxmlexport3.mk
@@ -11,6 +11,6 @@
 
 include $(SRCDIR)/sw/ooxmlexport_setup.mk
 
-$eval( $(call sw_ooxmlexport_test,3))
+$(eval $(call sw_ooxmlexport_test,3))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_ooxmlexport4.mk 
b/sw/CppunitTest_sw_ooxmlexport4.mk
index 129a946..1a92a48 100644
--- a/sw/CppunitTest_sw_ooxmlexport4.mk
+++ b/sw/CppunitTest_sw_ooxmlexport4.mk
@@ -11,6 +11,6 @@
 
 include $(SRCDIR)/sw/ooxmlexport_setup.mk
 
-$eval( $(call sw_ooxmlexport_test,4))
+$(eval $(call sw_ooxmlexport_test,4))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_ooxmlexport5.mk 
b/sw/CppunitTest_sw_ooxmlexport5.mk
index a84562f..42b873e 100644
--- a/sw/CppunitTest_sw_ooxmlexport5.mk
+++ b/sw/CppunitTest_sw_ooxmlexport5.mk
@@ -11,6 +11,6 @@
 
 include $(SRCDIR)/sw/ooxmlexport_setup.mk
 
-$eval( $(call sw_ooxmlexport_test,5))
+$(eval $(call sw_ooxmlexport_test,5))
 
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Discussion of Bug 37759 - Pixel around Objects like ellipse

[Regina Henschel]

Hi Papamatti,

you mean https://bugs.freedesktop.org/show_bug.cgi?id=37559 ?

Papamatti schrieb:

Hello list,

I investigate the problem of two pixels (top left and bottom right)
around predefined shapes (circle, smiley, ellipse...)


Do you want to fix it?



You can reproduce the bug by
- Open LibreOffice Draw
- Draw a ellipse or circle


from the shape category "custom shape".


- Select your object and convert it to a polygon
- change into the edit points mode
- now you can see the additional point top left and bottom right.


I have used "Pentagon" and have got these additional points too. My 
first thought was, that it is something special for the MS-types, but 
the error remains, when I change to draw:type="non-primitive".




You can move these dots around, delete them and so on. Unfortunalely
they are visible on export into pdf or any other format.

This Bug does not exist in OOO3.20 and was fixed in AOO3.40.
It was Introduces during the development of OOo 3.30 and found it's way
during the fork into LibreOffice 3.3. This is the story so far.


Do you know a related issue or commit or cws from that time?



I investigate the files, which OOo 3.20 and LO4.2.4 are creating with
the steps described above and with an simple ellipse.

OpenOffice 3.20 has created this structure:
(There are no additional dots, and, surprise if i open this file with
LO4.2.4 and save it into another file and reopen it with LO4.2.4 the bug
is not present! Conclusion: The bug has something to do with the
creation of these shapes!)


   
 
   

  

  



That is a different kind of shape. Notice draw:ellipse instead of 
draw:custom-shape.





LibreOffice 4.2.4 (Ubuntu 14.04) creates this structure after drawing a
ellipse:


   
 
   
 
 
   
 
   


LibreOffice 4.2.4 (Ubuntu 14.04) creates this structure after convert
the ellipse into a polygon:
(But instead of a polygon, LO creates a path!!!)


   
 
   
 
   
 
   


After deleting the two additional dots and save the file again it
changed to a polygon!!!:
(Also look at the svg width, hight and the svg:viewBox) ;-)


If you make your tests with "Pentagon", it is easier to reconstruct the 
conversion.





   
 
   
 
   
 
   



After conversion it has only straight path segments, and after removing 
'M0 0zM2001 2001z' it is only one closed path. Therefore there is no 
need for the complex handling using a svd:d attribute, but a simple list 
of points is sufficient.


[..]

The two additional points should not be there. But I guess they were 
introduced to solve another problem. (Read related discussion in 
https://issues.apache.org/ooo/show_bug.cgi?id=37213 and 
https://issues.apache.org/ooo/show_bug.cgi?id=124084#c10.) Perhaps 
Thorsten remembers the reason and why they are not Apache OpenOffice.


Kind regards
Regina



___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Discussion of Bug 37759 - Pixel around Objects like ellipse

[Regina Henschel]

Regina Henschel schrieb:

Hi Papamatti,

you mean https://bugs.freedesktop.org/show_bug.cgi?id=37559 ?

Papamatti schrieb:

Hello list,

I investigate the problem of two pixels (top left and bottom right)
around predefined shapes (circle, smiley, ellipse...)


Do you want to fix it?


I think, the code that adds these points is

if( !bLineGeometryNeededOnly )
   1906 {
   1907 // hack aNewB2DPolyPolygon to fill logic rect - this is
   1908 // needed to produce gradient fills that look like mso
   1909 aNewB2DPolygon.clear();
   1910 aNewB2DPolygon.append(basegfx::B2DPoint(0,0));
   1911 aNewB2DPolygon.setClosed(true);
   1912 aNewB2DPolyPolygon.append(aNewB2DPolygon);
   1913
   1914 aNewB2DPolygon.clear();
   1915 
aNewB2DPolygon.append(basegfx::B2DPoint(aLogicRect.GetWidth(),
   1916 
aLogicRect.GetHeight()));

   1917 aNewB2DPolygon.setClosed(true);
   1918 aNewB2DPolyPolygon.append(aNewB2DPolygon);
   1919 }

in core/svx/source/customshapes/EnhancedCustomShape2d.cxx

I have currently now build to verify my assumption.

Kind regards
Regina


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Discussion of Bug 37759 - Pixel around Objects like ellipse

[Regina Henschel]

Regina Henschel schrieb:


I have currently now build to verify my assumption.


I have currently no build to verify my assumption.
--^

Kind regards
Regina
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: framework/source

[Tor Lillqvist]

 framework/source/services/pathsettings.cxx |   36 -
 1 file changed, 31 insertions(+), 5 deletions(-)

New commits:
commit a0de5cc93db6153059a0912d5d76d056cf8c595e
Author: Tor Lillqvist 
Date:   Tue Aug 19 20:16:53 2014 +0300

fdo#529470: I can't remove a path in AutoText dialog

This is, not surprisingly, somewhat weird code, but I think this patch does
what is necessary, it does fix the bug.

Change-Id: Ie1947b311f1455ba48a904f5ef42ad92899fac31

diff --git a/framework/source/services/pathsettings.cxx 
b/framework/source/services/pathsettings.cxx
index 271eeff..f82fc24 100644
--- a/framework/source/services/pathsettings.cxx
+++ b/framework/source/services/pathsettings.cxx
@@ -402,8 +402,8 @@ private:
 So real user defined paths can be extracted from the list of
 fix internal paths !
  */
-void impl_purgeKnownPaths(const PathSettings::PathInfo& rPath,
- OUStringList&   lList);
+void impl_purgeKnownPaths(PathSettings::PathInfo& rPath,
+  OUStringList&   lList);
 
 /** rebuild the member m_lPropDesc using the path list m_lPaths. */
 void impl_rebuildPropertyDescriptor();
@@ -1042,10 +1042,13 @@ OUStringList 
PathSettings::impl_convertOldStyle2Path(const OUString& sOldStylePa
 return lList;
 }
 
-void PathSettings::impl_purgeKnownPaths(const PathSettings::PathInfo& rPath,
-   OUStringList&   lList)
+void PathSettings::impl_purgeKnownPaths(PathSettings::PathInfo& rPath,
+OUStringList&   lList)
 {
-OUStringList::const_iterator pIt;
+OUStringList::iterator pIt;
+
+// Erase items in the internal path list from lList.
+// Also erase items in the internal path list from the user path list.
 for (  pIt  = rPath.lInternalPaths.begin();
pIt != rPath.lInternalPaths.end();
  ++pIt )
@@ -1054,7 +1057,29 @@ void PathSettings::impl_purgeKnownPaths(const 
PathSettings::PathInfo& rPath,
 OUStringList::iterator pItem = lList.find(rItem);
 if (pItem != lList.end())
 lList.erase(pItem);
+pItem = rPath.lUserPaths.find(rItem);
+if (pItem != rPath.lUserPaths.end())
+rPath.lUserPaths.erase(pItem);
+}
+
+// Erase itsems not in lList from the user path list.
+pIt = rPath.lUserPaths.begin();
+while ( pIt != rPath.lUserPaths.end() )
+{
+const OUString& rItem = *pIt;
+OUStringList::iterator pItem = lList.find(rItem);
+if ( pItem == lList.end() )
+{
+rPath.lUserPaths.erase(pIt);
+pIt = rPath.lUserPaths.begin();
+}
+else
+{
+++pIt;
+}
 }
+
+// Erase items in the user path list from lList.
 for (  pIt  = rPath.lUserPaths.begin();
pIt != rPath.lUserPaths.end();
  ++pIt )
@@ -1065,6 +1090,7 @@ void PathSettings::impl_purgeKnownPaths(const 
PathSettings::PathInfo& rPath,
 lList.erase(pItem);
 }
 
+// Erase the write path from lList
 OUStringList::iterator pItem = lList.find(rPath.sWritePath);
 if (pItem != lList.end())
 lList.erase(pItem);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: "user profile" in testing

[Terrence Enger]

On Mon, 2014-08-18 at 15:58 +0200, Stephan Bergmann wrote:
> On 08/17/2014 06:54 PM, Terrence Enger wrote:
[ incorrect guess about what -evn:UserInstalltion does ]
> 
> No; what happens exactly is:  Whenever at LO 4 start-up no LO 4 user 
> profile exists (e.g. because -env:UserInstallation points to a directory 
> that does not exist) and a LO 3 user profile exists at the canonic 
> location (i.e., not taking into account any -env:UserInstallation) and 
> the LO 3 user profile does not contain a MIGRATED4 marker file, then the 
> MIGRATED4 marker file is written into the LO 3 user profile and data 
> from the LO 3 user profile is migrated into the newly created LO 4 user 
> profile.
>
> > Is it a reportable bug if LibreOffice crashes when using a user
> > profile created by an earlier version?  ( I tend to the position that
> > every crash is a bug, but I can well see that a lot of bugs
> > "RESOLVED WONTFIX" could become annoying. )
> 
> Such crashes should generally be considered bugs that should be fixed. 
> An exception is when the user profile data that causes the crash can 
> only have been produced by a "non-official" LO version (e.g. a nightly 
> snapshot).

Bah!  Humbug!  Despite my best efforts, I am unable to reproduce the
crash which provoked my interest.  It is time to invoke the First Rule
of Holes.

Thank you, Stephan, for your patience with a fat-fingered (and very
frustrated) klutz.

Terry.

> 
> Stephan


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Crash test update

[Caolán McNamara]

On Fri, 2014-08-15 at 23:44 +, crashtest.libreoff...@gmail.com
wrote:
> New crashtest update available at 
> dev-builds.libreoffice.org/crashtest/212f745c29c7399fa0d62a53d3836dc1e829e953

http://dev-builds.libreoffice.org/crashtest/212f745c29c7399fa0d62a53d3836dc1e829e953/odb/crashlog.txt
says
Crash:/srv/crashtestdata/files/odb/ooo53788-1.odb through disposed
Crash:/srv/crashtestdata/files/odb/ooo81518-1.odb through disposed

How exactly is libreoffice invoked on these, and how is the build
configured because they don't crash for me on load, but both do display
a migration dialog so presumably the problem is in some headless more
code path but soffice --headless --convert-to pdf ooo53788-1.odb doesn't
fail either.

C.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sd/source

[Caolán McNamara]

 sd/source/core/sdpage2.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit f47baab6d35752b0babba768e299416ea5dd447d
Author: Caolán McNamara 
Date:   Tue Aug 19 20:49:17 2014 +0100

Resolves: fdo#82355 crash on loading ppt

regression probably triggered by...

commit 2e3c45afc6c5ea74f1f8b4a7dce806e537870546
Date:   Fri Mar 4 07:38:16 2011 -0800
Remove usage of deprecated List container.

but that just stopped at the first NULL by chance

Change-Id: I767e3bc3130d99cedceb4172857d1741c677b19b

diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx
index d49893a..b8ef36d 100644
--- a/sd/source/core/sdpage2.cxx
+++ b/sd/source/core/sdpage2.cxx
@@ -208,9 +208,10 @@ void SdPage::SetPresentationLayout(const OUString& 
rLayoutName,
 
 if (pSheet != pOldSheet)
 {
-pObj->EndListening(*pOldSheet);
+if (pOldSheet)
+pObj->EndListening(*pOldSheet);
 
-if (!pObj->IsListening(*pSheet))
+if (pSheet && !pObj->IsListening(*pSheet))
 pObj->StartListening(*pSheet);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 sc/source/ui/view/viewfun6.cxx |   81 +++--
 1 file changed, 70 insertions(+), 11 deletions(-)

New commits:
commit 5a05115ee25683b5fc7c79ab418eaeed120bd3b0
Author: Eike Rathke 
Date:   Tue Aug 19 21:47:33 2014 +0200

more flexible handling of current date/time hotkeys

Let Ctrl+; current date and Shift+Ctrl+; (Ctrl+:) current time behave more
flexible, depending on the formatting (and as such the type) of the existing
cell content.

key date on time  cell => current date + time of cell => date+time 
formatted cell
key date on other cell => current date => date formatted cell
key time on date  cell => date of cell + current time => date+time 
formatted cell
key time on other cell => current time => time formatted cell

Change-Id: I2ccbfbab3c50c36a72c4db4696520e32f94caefa

diff --git a/sc/source/ui/view/viewfun6.cxx b/sc/source/ui/view/viewfun6.cxx
index 483156b8..ba9fbfb 100644
--- a/sc/source/ui/view/viewfun6.cxx
+++ b/sc/source/ui/view/viewfun6.cxx
@@ -244,6 +244,25 @@ void ScViewFunc::InsertCurrentTime(short nCellFmt, const 
OUString& rUndoStr)
 ScDocument& rDoc = pDocSh->GetDocument();
 ::svl::IUndoManager* pUndoMgr = pDocSh->GetUndoManager();
 SvNumberFormatter* pFormatter = rDoc.GetFormatTable();
+const sal_uInt32 nCurNumFormat = rDoc.GetNumberFormat(aCurPos);
+const SvNumberformat* pCurNumFormatEntry = 
pFormatter->GetEntry(nCurNumFormat);
+const short nCurNumFormatType = (pCurNumFormatEntry ?
+(pCurNumFormatEntry->GetType() & ~NUMBERFORMAT_DEFINED) : 
NUMBERFORMAT_UNDEFINED);
+// Combine requested date/time stamp with existing cell time/date, if any.
+switch (nCellFmt)
+{
+case NUMBERFORMAT_DATE:
+if (nCurNumFormatType == NUMBERFORMAT_TIME)
+nCellFmt = NUMBERFORMAT_DATETIME;
+break;
+case NUMBERFORMAT_TIME:
+if (nCurNumFormatType == NUMBERFORMAT_DATE)
+nCellFmt = NUMBERFORMAT_DATETIME;
+break;
+default:
+assert(!"unhandled current date/time request");
+nCellFmt = NUMBERFORMAT_DATETIME;
+}
 double fVal;
 switch (nCellFmt)
 {
@@ -253,29 +272,53 @@ void ScViewFunc::InsertCurrentTime(short nCellFmt, const 
OUString& rUndoStr)
 fVal = aActDate - *pFormatter->GetNullDate();
 }
 break;
-default:
-assert(!"unhandled current date/time");
-// fallthru
 case NUMBERFORMAT_TIME:
-case NUMBERFORMAT_DATETIME: // for now treat datetime and time 
identically
 {
-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());
+Time aActTime( Time::SYSTEM );
+fVal = aActTime.GetTimeInDays();
+}
+break;
+case NUMBERFORMAT_DATETIME:
+{
+switch (nCurNumFormatType)
+{
+case NUMBERFORMAT_DATE:
+{
+double fDate = rtl::math::approxFloor( 
rDoc.GetValue( aCurPos));
+Time aActTime( Time::SYSTEM );
+fVal = fDate + aActTime.GetTimeInDays();
+}
+break;
+case NUMBERFORMAT_TIME:
+{
+double fCell = rDoc.GetValue( aCurPos);
+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;
 }
+
 pUndoMgr->EnterListAction(rUndoStr, rUndoStr);
+
 pDocSh->GetDocFunc().SetValueCell(aCurPos, fVal, true);
 
 // Set the new cell format only when it differs from the current cell
 // format type.
-sal_uInt32 nCurNumFormat = rDoc.GetNumberFormat(aCurPos);
-const SvNumberformat* pEntry = pFormatter->GetEntry(nCurNumFormat);
-if (!pEntry || !(pEntry->GetType() & nCellFm

Re: Crash test update

[Markus Mohrhard]

Hey,

On Tue, Aug 19, 2014 at 9:38 PM, Caolán McNamara  wrote:
> On Fri, 2014-08-15 at 23:44 +, crashtest.libreoff...@gmail.com
> wrote:
>> New crashtest update available at 
>> dev-builds.libreoffice.org/crashtest/212f745c29c7399fa0d62a53d3836dc1e829e953
>
> http://dev-builds.libreoffice.org/crashtest/212f745c29c7399fa0d62a53d3836dc1e829e953/odb/crashlog.txt
> says
> Crash:/srv/crashtestdata/files/odb/ooo53788-1.odb through disposed
> Crash:/srv/crashtestdata/files/odb/ooo81518-1.odb through disposed
>
> How exactly is libreoffice invoked on these, and how is the build
> configured because they don't crash for me on load, but both do display
> a migration dialog so presumably the problem is in some headless more
> code path but soffice --headless --convert-to pdf ooo53788-1.odb doesn't
> fail either.
>

So they use headles and invisible but at least the invisible stuff has
never really caused any problems. Normally if you can't reproduce the
problem locally with --headless it is either a false positive or
related to pyuno calling the loadComponentFromURL directly. In both
cases just send me such documents and I'll check on the server if I
can create a backtrace.

Regards,
Markus
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sw/inc sw/source

[Valentin Kettner]

 sw/inc/doc.hxx|9 ++-
 sw/inc/node.hxx   |2 
 sw/inc/txtinet.hxx|6 ++
 sw/source/core/doc/DocumentLinksAdministrationManager.cxx |   10 
 sw/source/core/doc/docchart.cxx   |   12 +---
 sw/source/core/doc/doccorr.cxx|   35 +++---
 sw/source/core/doc/htmltbl.cxx|3 -
 sw/source/core/doc/notxtfrm.cxx   |7 +-
 sw/source/core/doc/visiturl.cxx   |4 -
 sw/source/core/docnode/ndtbl.cxx  |2 
 sw/source/core/docnode/node.cxx   |4 -
 sw/source/core/docnode/section.cxx|9 ++-
 sw/source/core/docnode/swbaslnk.cxx   |9 ++-
 sw/source/core/draw/dcontact.cxx  |2 
 sw/source/core/fields/ddefld.cxx  |8 +--
 sw/source/core/inc/drawfont.hxx   |6 +-
 sw/source/core/inc/fntcache.hxx   |6 +-
 sw/source/core/inc/swfont.hxx |6 +-
 sw/source/core/inc/visiturl.hxx   |4 -
 sw/source/core/layout/pagedesc.cxx|4 -
 sw/source/core/text/itratr.cxx|   10 +---
 sw/source/core/txtnode/fntcache.cxx   |4 -
 sw/source/core/txtnode/fntcap.cxx |2 
 sw/source/core/txtnode/swfont.cxx |2 
 sw/source/core/txtnode/txtatr2.cxx|2 
 sw/source/core/unocore/unofield.cxx   |9 +++
 sw/source/core/unocore/unoflatpara.cxx|4 -
 sw/source/core/unocore/unoidx.cxx |9 +++
 sw/source/filter/html/css1atr.cxx |4 -
 sw/source/filter/html/htmlform.cxx|6 +-
 sw/source/filter/html/htmlforw.cxx|4 -
 sw/source/filter/html/htmltabw.cxx|4 -
 sw/source/filter/html/swhtml.cxx  |9 +--
 sw/source/filter/ww8/docxexportfilter.cxx |4 -
 sw/source/filter/ww8/rtfexportfilter.cxx  |4 -
 sw/source/filter/ww8/wrtww8.cxx   |3 -
 sw/source/uibase/app/apphdl.cxx   |6 +-
 sw/source/uibase/app/swmodul1.cxx |3 -
 38 files changed, 121 insertions(+), 116 deletions(-)

New commits:
commit 15295ab6db7cb46ea5f155d33a08027c62fb0e41
Author: Valentin Kettner 
Date:   Fri Aug 15 19:09:49 2014 +0200

Refactored SwDoc::GetEditShell .

Removed its output paramater as GetCurrentViewShell should be
used instead and added a const version.

Change-Id: Iad8b57553b6e93e3472ce8c6905d08e8d49af770

diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 4a57c9b..1fbb206 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -441,7 +441,7 @@ private:
 const SwTxtFmtColl* pSplitColl, int nOutlineLevel = 0 
);
 
 // Update charts of given table.
-void _UpdateCharts( const SwTable& rTbl, SwViewShell& rVSh ) const;
+void _UpdateCharts( const SwTable& rTbl, SwViewShell const & rVSh ) const;
 
 bool _SelectNextRubyChars( SwPaM& rPam, SwRubyListEntry& rRubyEntry,
 sal_uInt16 nMode );
@@ -1342,8 +1342,9 @@ public:
 const SwAttrPool& GetAttrPool() const   { return *mpAttrPool; }
   SwAttrPool& GetAttrPool() { return *mpAttrPool; }
 
-// Search an EditShell or, if appropriate, a SwViewShell via layout.
-SwEditShell* GetEditShell( SwViewShell** ppSh = 0 ) const;
+// Search for an EditShell.
+SwEditShell const * GetEditShell() const;
+SwEditShell* GetEditShell();
 ::sw::IShellCursorSupplier * GetIShellCursorSupplier();
 
 // OLE 2.0-notification.
@@ -1410,7 +1411,7 @@ public:
 // Query if URL was visited.
 // Query via Doc, if only a Bookmark has been given.
 // In this case the document name has to be set in front.
-bool IsVisitedURL( const OUString& rURL ) const;
+bool IsVisitedURL( const OUString& rURL );
 
 // Save current values for automatic registration of exceptions in 
Autocorrection.
 void SetAutoCorrExceptWord( SwAutoCorrExceptWord* pNew );
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index 03c28dc..f83b806 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -257,7 +257,7 @@ public:
 IDocumentListItems& getIDocumentListItems();
 
 /// Is node in the visible area of the Shell?
-bool IsInVisibleArea( SwViewShell* pSh = 0 ) const;
+bool IsInVisibleArea( SwViewShell const * pSh = 0 ) const;
 /// Is node in an protected area?
 bool IsInProtectSect() const;
 /**  Is node in somet

[Libreoffice-commits] core.git: 2 commits - writerfilter/documentation writerfilter/source

[Miklos Vajna]

 writerfilter/documentation/ooxml/model.rng   |   17 ---
 writerfilter/source/ooxml/model.xml  |   30 ---
 writerfilter/source/ooxml/modelpreprocess.py |   22 ---
 3 files changed, 9 insertions(+), 60 deletions(-)

New commits:
commit 8b6ce55b90558703a8748c30690f6d5ecaf60d66
Author: Miklos Vajna 
Date:   Tue Aug 19 23:21:48 2014 +0200

writerfilter: remove now unused namespace-alias elements

Change-Id: If58b3a9f5b1d79d164bb1c2a7c18aa4f99f00ca8

diff --git a/writerfilter/documentation/ooxml/model.rng 
b/writerfilter/documentation/ooxml/model.rng
index 7c6c2fc..6f365ff 100644
--- a/writerfilter/documentation/ooxml/model.rng
+++ b/writerfilter/documentation/ooxml/model.rng
@@ -222,9 +222,6 @@ documentation for that file. The schema has two parts:
   
 
   
-
-  
-  
 
   
   
@@ -234,20 +231,6 @@ documentation for that file. The schema has two parts:
   
 
   
-  
-
-  
-  
-  
-  
-
-  
-
-  
 http://relaxng.org/ns/structure/1.0";>
-  http://www.w3.org/XML/1998/namespace"; alias="xml"/>
-  http://schemas.openxmlformats.org/officeDocument/2006/relationships"; 
alias="officeRel"/>
-  http://purl.oclc.org/ooxml/officeDocument/relationships"; 
alias="officeRel"/>
-  
-  http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme";
 alias="officeRelTheme"/>
-  http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing"; 
alias="dmlWordDr"/>
-  http://purl.oclc.org/ooxml/drawingml/wordprocessingDrawing"; 
alias="dmlWordDr"/>
-  http://schemas.openxmlformats.org/drawingml/2006/main"; alias="dml"/>
-  http://purl.oclc.org/ooxml/drawingml/main"; 
alias="dml"/>
-  
-  http://schemas.openxmlformats.org/drawingml/2006/picture"; 
alias="dmlPicture"/>
-  http://purl.oclc.org/ooxml/drawingml/picture"; 
alias="dmlPicture"/>
-  http://schemas.openxmlformats.org/drawingml/2006/diagram"; 
alias="dmlDiagram"/>
-  http://purl.oclc.org/ooxml/drawingml/diagram"; 
alias="dmlDiagram"/>
-  http://schemas.openxmlformats.org/drawingml/2006/lockedCanvas"; 
alias="dmlLockedCanvas"/>
-  http://purl.oclc.org/ooxml/drawingml/lockedCanvas"; 
alias="dmlLockedCanvas"/>
-  http://schemas.microsoft.com/office/word/2010/wordprocessingShape"; 
alias="wps"/>
-  http://schemas.microsoft.com/office/word/2010/wordprocessingGroup"; 
alias="wpg"/>
-  http://schemas.openxmlformats.org/drawingml/2006/chart"; alias="dmlChart"/>
-  http://purl.oclc.org/ooxml/drawingml/chart"; 
alias="dmlChart"/>
-  
-  http://schemas.openxmlformats.org/wordprocessingml/2006/main"; 
alias="doc"/>
-  http://purl.oclc.org/ooxml/wordprocessingml/main"; 
alias="doc"/>
-  http://schemas.openxmlformats.org/officeDocument/2006/math"; 
alias="officeMath"/>
-  http://purl.oclc.org/ooxml/officeDocument/math"; 
alias="officeMath"/>
-  http://schemas.openxmlformats.org/schemaLibrary/2006/main"; 
alias="schema"/>
-  http://schemas.openxmlformats.org/markup-compatibility/2006"; alias="mce"/>
-  http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing"; 
alias="wp14"/>
-  http://schemas.microsoft.com/office/word/2010/wordml"; 
alias="w14"/>
-  http://schemas.microsoft.com/office/drawing/2010/main"; alias="a14"/>
   
   
   
commit a5396d64a4db684672b1e65ec32acf0070f645ce
Author: Miklos Vajna 
Date:   Tue Aug 19 23:16:36 2014 +0200

writerfilter: stop reading namespace-alias elements

The same info is already available from oox.

Change-Id: I0725799e1f3ffebf6140ad38a0ce376e5417265d

diff --git a/writerfilter/source/ooxml/modelpreprocess.py 
b/writerfilter/source/ooxml/modelpreprocess.py
index 3c14199..11fa3e8 100644
--- a/writerfilter/source/ooxml/modelpreprocess.py
+++ b/writerfilter/source/ooxml/modelpreprocess.py
@@ -13,8 +13,8 @@ import sys
 
 
 def prefixFromUrl(url):
-if url in list(namespaceAliases.keys()):
-return namespaceAliases[url]
+if url in list(ooxUrlAliases.keys()):
+return ooxUrlAliases[url]
 else:
 if url.startswith("http://";):
 return url.replace('http://', '').replace('/', '_').replace('.', 
'_')
@@ -24,8 +24,8 @@ def prefixFromUrl(url):
 
 def prefixForGrammar(namespace):
 ns = nsForGrammar(namespace)
-if ns in list(namespaceAliases.keys()):
-prefix = namespaceAliases[ns]
+if ns in list(ooxUrlAliases.keys()):
+prefix = ooxUrlAliases[ns]
 return prefix
 else:
 return prefixFromUrl(ns)
@@ -48,6 +48,7 @@ def parseNamespaces(fro):
 id, alias, url = line.split(' ')
 ooxUrlIds[url] = id
 ooxAliasIds[alias] = id
+ooxUrlAliases[url] = alias
 sock.close()
 
 
@@ -68,15 +69,10 @@ def check(model):
 
 
 def preprocess(model):
-for i in model.getElementsByTagName("namespace-alias"):
-name = i.getAttribute("name")
-i.setAttribute("id", ooxUrlIds[name])
-namespaceAliases[name] = i.getAttribute("alias")
-
 for i in model.getElements

Crash test update

[crashtest.libreoff...@gmail.com]

New crashtest update available at 
dev-builds.libreoffice.org/crashtest/66c6d1ef204f3507e7663a1b8b1be05b9ec71092


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 Gerrit News for core on 2014-08-20

[gerrit]

Moin!

* Open changes on master for project core changed in the last 25 hours:

 First time contributors doing great things! 
+ jurt: Throwable.getCause() instead of Throwable.getTargetException()
  in https://gerrit.libreoffice.org/11027 from Robert Antoni Buj i Gelonch
  about module jurt
+ xmerge: Convert a primitive type into a string
  in https://gerrit.libreoffice.org/11026 from Robert Antoni Buj i Gelonch
  about module xmerge
+ fdo#82290: avoid pipe deadlock by executing write(2) in a new thread
  in https://gerrit.libreoffice.org/11014 from Hiroto Kagotani
  about module filter
 End of freshness 

+ Remove more useless includes of tools/debug.hxx
  in https://gerrit.libreoffice.org/11020 from Marcos Paulo de Souza
  about module connectivity, svtools, tools, unotools
+ create clang plugin to warn about C-style casts
  in https://gerrit.libreoffice.org/10367 from Noel Grandin
  about module compilerplugins, include
+ fdo#81956 : Rendering of vml group shape was wrong.
  in https://gerrit.libreoffice.org/11013 from sushil_shinde
  about module sw, writerfilter


* Merged changes on master for project core changed in the last 25 hours:

+ fdo#75757: remove inheritance to std::vector
  in https://gerrit.libreoffice.org/11017 from Takeshi Abe
+ fix intermittent crash in make check
  in https://gerrit.libreoffice.org/10996 from Noel Grandin
+ Make Draw use paper size when printing - fdo#63905
  in https://gerrit.libreoffice.org/9866 from Eilidh McAdam
+ odk: Clean up comments
  in https://gerrit.libreoffice.org/11006 from Chris Laplante
+ svx: Cleanup ASCII art and useless comments
  in https://gerrit.libreoffice.org/11011 from Chris Laplante


* 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:

+ fdo#63154: Rearrange some solar.h includes
  in https://gerrit.libreoffice.org/10892 from Marcos Paulo de Souza
+ VS2013: Make 64 bit shell extensions optional
  in https://gerrit.libreoffice.org/10163 from David Ostrovsky
+ 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
+ Use assert instead of OSL_ASSERT in sal/
  in https://gerrit.libreoffice.org/10113 from Arnaud Versini
+ 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

[Tor Lillqvist]

 sc/source/ui/view/viewfun6.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a1a480f91e6f43df23b9ecdf47d5cd230c50ebed
Author: Tor Lillqvist 
Date:   Wed Aug 20 09:01:41 2014 +0300

Wa: C4701: potentially uninitialized local variable 'fVal' used

Change-Id: I579205c4cdc3149ef0c1b01daef32155a13d666b

diff --git a/sc/source/ui/view/viewfun6.cxx b/sc/source/ui/view/viewfun6.cxx
index ba9fbfb..b7a429c 100644
--- a/sc/source/ui/view/viewfun6.cxx
+++ b/sc/source/ui/view/viewfun6.cxx
@@ -263,7 +263,7 @@ void ScViewFunc::InsertCurrentTime(short nCellFmt, const 
OUString& rUndoStr)
 assert(!"unhandled current date/time request");
 nCellFmt = NUMBERFORMAT_DATETIME;
 }
-double fVal;
+double fVal(0);
 switch (nCellFmt)
 {
 case NUMBERFORMAT_DATE:
___
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' - vcl/source

[Caolán McNamara]

 vcl/source/window/layout.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit dac4825abef1c9a4d970dab7dbec26673126342a
Author: Caolán McNamara 
Date:   Tue Aug 19 16:14:23 2014 +0100

facepalm: nAvailHeight is not derived from allocation Width

Change-Id: Ic99c6519b02c546e0d3574cb756e3fb172d1ff52
(cherry picked from commit 36490fff3f4d1b4a7e4b7902a866abb177a0bf54)
Reviewed-on: https://gerrit.libreoffice.org/11023
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 5ae3412..9e204a8 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -1694,7 +1694,7 @@ void VclScrolledWindow::setAllocation(const Size 
&rAllocation)
 if (pChild && pChild->IsVisible())
 aChildReq = getLayoutRequisition(*pChild);
 
-long nAvailHeight = rAllocation.Width();
+long nAvailHeight = rAllocation.Height();
 long nAvailWidth = rAllocation.Width();
 // vert. ScrollBar
 if (GetStyle() & WB_AUTOVSCROLL)
___
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' - vcl/source

[Caolán McNamara]

 vcl/source/window/layout.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 14bdff6f667ab28e14618fcb3dfb83bf2c2c765f
Author: Caolán McNamara 
Date:   Tue Aug 19 16:14:23 2014 +0100

facepalm: nAvailHeight is not derived from allocation Width

Change-Id: Ic99c6519b02c546e0d3574cb756e3fb172d1ff52
(cherry picked from commit 36490fff3f4d1b4a7e4b7902a866abb177a0bf54)
Reviewed-on: https://gerrit.libreoffice.org/11024
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 8d8ab0d..517fa33 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -1692,7 +1692,7 @@ void VclScrolledWindow::setAllocation(const Size 
&rAllocation)
 if (pChild && pChild->IsVisible())
 aChildReq = getLayoutRequisition(*pChild);
 
-long nAvailHeight = rAllocation.Width();
+long nAvailHeight = rAllocation.Height();
 long nAvailWidth = rAllocation.Width();
 // vert. ScrollBar
 if (GetStyle() & WB_AUTOVSCROLL)
___
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' - configure.ac

[Michael Stahl]

 configure.ac |   14 --
 1 file changed, 12 insertions(+), 2 deletions(-)

New commits:
commit ba754e8ba8897be196de48c48df63b9671115356
Author: Michael Stahl 
Date:   Fri Aug 15 13:25:22 2014 +0200

configure: don't try to use Win32 make on release branch

Change-Id: Icd8c1b45659ca323aef25a55803f5b1ce078b9d3
Reviewed-on: https://gerrit.libreoffice.org/10932
Reviewed-by: Thomas Arnhold 
Tested-by: Thomas Arnhold 
(cherry picked from commit 2087b54aab25ddbab5128af9f777b1686bc0ce5e)
Reviewed-on: https://gerrit.libreoffice.org/10990
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/configure.ac b/configure.ac
index 312eacd..2560a0d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4798,8 +4798,18 @@ for a in "$MAKE" "$GNUMAKE" make gmake gnumake; do
 if test -n "$a"; then
 $a --version 2> /dev/null | grep GNU  2>&1 > /dev/null
 if test $? -eq 0;  then
-GNUMAKE=`which $a`
-break
+if test "$build_os" = "cygwin"; then
+if test -n "$($a -v | grep 'Built for Windows')" ; then
+AC_MSG_NOTICE([$a is a native Win32 make, which is not 
supported on this old branch.])
+unset GNUMAKE
+else
+GNUMAKE=`which $a`
+break
+fi
+else
+GNUMAKE=`which $a`
+break
+fi
 fi
 fi
 done
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/oox oox/inc

[Markus Mohrhard]

 include/oox/drawingml/chart/modelbase.hxx |   12 
 oox/inc/drawingml/chart/axismodel.hxx |6 --
 2 files changed, 18 deletions(-)

New commits:
commit 1558b50e4fd5c26275efd824e731dc46fca781a4
Author: Markus Mohrhard 
Date:   Tue Aug 19 05:01:20 2014 +0200

remove whitespace

Change-Id: I5634bf40e8ccc4ce076409907c13f9c6f52d11a3

diff --git a/include/oox/drawingml/chart/modelbase.hxx 
b/include/oox/drawingml/chart/modelbase.hxx
index d46ebbd..68bb9b7 100644
--- a/include/oox/drawingml/chart/modelbase.hxx
+++ b/include/oox/drawingml/chart/modelbase.hxx
@@ -30,8 +30,6 @@ namespace oox {
 namespace drawingml {
 namespace chart {
 
-
-
 template< typename ModelType >
 class ModelRef : public ::boost::shared_ptr< ModelType >
 {
@@ -51,8 +49,6 @@ public:
 ModelType&   getOrCreate( const Param1Type& rParam1 ) { if( !*this ) 
this->reset( new ModelType( rParam1 ) ); return **this; }
 };
 
-
-
 template< typename ModelType >
 class ModelVector : public RefVector< ModelType >
 {
@@ -71,8 +67,6 @@ private:
 ModelType&   append( ModelType* pModel ) { this->push_back( value_type( 
pModel ) ); return *pModel; }
 };
 
-
-
 template< typename KeyType, typename ModelType >
 class ModelMap : public RefMap< KeyType, ModelType >
 {
@@ -92,8 +86,6 @@ private:
 ModelType&   insert( KeyType eKey, ModelType* pModel ) { (*this)[ eKey 
].reset( pModel ); return *pModel; }
 };
 
-
-
 struct NumberFormat
 {
 OUString maFormatCode;   /// Number format code.
@@ -104,8 +96,6 @@ struct NumberFormat
 voidsetAttributes( const AttributeList& rAttribs );
 };
 
-
-
 struct LayoutModel
 {
 double  mfX;/// Left position of this object.
@@ -123,8 +113,6 @@ struct LayoutModel
 ~LayoutModel();
 };
 
-
-
 } // namespace chart
 } // namespace drawingml
 } // namespace oox
diff --git a/oox/inc/drawingml/chart/axismodel.hxx 
b/oox/inc/drawingml/chart/axismodel.hxx
index a206185..c4ba8d4 100644
--- a/oox/inc/drawingml/chart/axismodel.hxx
+++ b/oox/inc/drawingml/chart/axismodel.hxx
@@ -27,8 +27,6 @@ namespace oox {
 namespace drawingml {
 namespace chart {
 
-
-
 struct AxisDispUnitsModel
 {
 typedef ModelRef< Shape >   ShapeRef;
@@ -47,8 +45,6 @@ struct AxisDispUnitsModel
 ~AxisDispUnitsModel();
 };
 
-
-
 struct AxisModel
 {
 typedef ModelRef< Shape >   ShapeRef;
@@ -94,8 +90,6 @@ struct AxisModel
 ~AxisModel();
 };
 
-
-
 } // namespace chart
 } // namespace drawingml
 } // namespace oox
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: xmerge/source

[rbuj]

 xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java   
  |6 +++---
 xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java   
  |3 +--
 
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java
 |3 +--
 3 files changed, 5 insertions(+), 7 deletions(-)

New commits:
commit b9813addf2816e4058069892963e50a97643023d
Author: rbuj 
Date:   Tue Aug 19 19:41:13 2014 +0200

xmerge: Convert a primitive type into a string

Avoid unnecessary temporaries when converting primitive data types into a 
String.

Change-Id: If361383be52d8258be7c8c9bddf3ba05d5ca92c1
Reviewed-on: https://gerrit.libreoffice.org/11026
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git 
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java 
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java
index 0234a1b..28c964c 100644
--- 
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java
+++ 
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java
@@ -534,7 +534,7 @@ public class ParaStyle extends Style implements Cloneable {
 for (int i = 0; i <= TEXT_INDENT; i++) {
 if (isSet[i]) {
 double temp = value[i] / 100.0;
-String stringVal = (new Double(temp)).toString() + "mm";
+String stringVal = Double.toString(temp) + "mm";
 node.setAttribute(attrName[i], stringVal);
 }
 }
@@ -542,10 +542,10 @@ public class ParaStyle extends Style implements Cloneable 
{
 if (isSet[LINE_HEIGHT]) {
 String stringVal;
 if ((value[LINE_HEIGHT] & LH_PCT) != 0)
-stringVal = (Integer.valueOf(value[LINE_HEIGHT] & 
LH_VALUEMASK)).toString() + "%";
+stringVal = Integer.toString(value[LINE_HEIGHT] & 
LH_VALUEMASK) + "%";
 else {
 double temp = (value[LINE_HEIGHT] & LH_VALUEMASK) / 100.0;
-stringVal = (new Double(temp)).toString() + "mm";
+stringVal = Double.toString(temp) + "mm";
 }
 node.setAttribute(attrName[LINE_HEIGHT], stringVal);
 }
diff --git 
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java 
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java
index 83efc31..c752f1e 100644
--- 
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java
+++ 
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java
@@ -559,8 +559,7 @@ public class TextStyle extends Style implements Cloneable {
 node.setAttribute("style:text-position", "sub 58%");
 
 if (sizeInPoints != 0) {
-Integer fs = Integer.valueOf(sizeInPoints);
-node.setAttribute("fo:font-size", fs.toString() + "pt");
+node.setAttribute("fo:font-size", Integer.toString(sizeInPoints) + 
"pt");
 }
 
 if (fontName != null)
diff --git 
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java
 
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java
index e437e18..434912c 100644
--- 
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java
+++ 
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java
@@ -412,8 +412,7 @@ public class CellStyle extends Style implements Cloneable {
 node.setAttribute("style:text-position", "sub 58%");
 
 if (fmt.getFontSize() != 0) {
-Integer fs = Integer.valueOf(fmt.getFontSize());
-node.setAttribute("fo:font-size", fs.toString() + "pt");
+node.setAttribute("fo:font-size", 
Integer.toString(fmt.getFontSize()) + "pt");
 }
 
 if (fmt.getFontName() != null)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: jurt/com

[rbuj]

 jurt/com/sun/star/comp/loader/FactoryHelper.java   |4 ++--
 jurt/com/sun/star/comp/loader/JavaLoader.java  |2 +-
 jurt/com/sun/star/lib/uno/environments/remote/Job.java |2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 37c49c305852f4a58e010c63331ba302462754d9
Author: rbuj 
Date:   Tue Aug 19 21:34:58 2014 +0200

jurt: Throwable.getCause() instead of Throwable.getTargetException()

As of the JDK 1.4, Throwable.getCause() is the preferred method for getting 
thrown target exception.

Change-Id: I14f3f9ae52869d1149f92b32562e7fb3293109b5
Reviewed-on: https://gerrit.libreoffice.org/11027
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/jurt/com/sun/star/comp/loader/FactoryHelper.java 
b/jurt/com/sun/star/comp/loader/FactoryHelper.java
index 2a71201..92b4801 100644
--- a/jurt/com/sun/star/comp/loader/FactoryHelper.java
+++ b/jurt/com/sun/star/comp/loader/FactoryHelper.java
@@ -198,7 +198,7 @@ public class FactoryHelper {
 try {
 return _constructor.newInstance( args );
 } catch (InvocationTargetException invocationTargetException) {
-Throwable targetException = 
invocationTargetException.getTargetException();
+Throwable targetException = 
invocationTargetException.getCause();
 
 if (targetException instanceof java.lang.RuntimeException)
 throw (java.lang.RuntimeException)targetException;
@@ -274,7 +274,7 @@ public class FactoryHelper {
 }
 return instance;
 } catch (InvocationTargetException invocationTargetException) {
-Throwable targetException = 
invocationTargetException.getTargetException();
+Throwable targetException = 
invocationTargetException.getCause();
 
 if (targetException instanceof java.lang.RuntimeException)
 throw (java.lang.RuntimeException)targetException;
diff --git a/jurt/com/sun/star/comp/loader/JavaLoader.java 
b/jurt/com/sun/star/comp/loader/JavaLoader.java
index d7f757a..c82f8e9 100644
--- a/jurt/com/sun/star/comp/loader/JavaLoader.java
+++ b/jurt/com/sun/star/comp/loader/JavaLoader.java
@@ -353,7 +353,7 @@ public class JavaLoader implements XImplementationLoader,
 + implementationName + " because " + e.toString() );
 } catch ( InvocationTargetException e ) {
 throw new CannotActivateFactoryException("Can not activate the 
factory for "
-+ implementationName + " because " + 
e.getTargetException().toString() );
++ implementationName + " because " + 
e.getCause().toString() );
 }
 
 return returnObject;
diff --git a/jurt/com/sun/star/lib/uno/environments/remote/Job.java 
b/jurt/com/sun/star/lib/uno/environments/remote/Job.java
index 47fc033..1d8b366 100644
--- a/jurt/com/sun/star/lib/uno/environments/remote/Job.java
+++ b/jurt/com/sun/star/lib/uno/environments/remote/Job.java
@@ -90,7 +90,7 @@ public class Job {
 ? dispatch_queryInterface((Type) args[0])
 : md.getMethod().invoke(_object, args);
 } catch (InvocationTargetException e) {
-exception = e.getTargetException();
+exception = e.getCause();
 if (exception == null) {
 exception = e;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 44580] share autocorrect replacement table for misc. language subgroups

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=44580

--- Comment #19 from tommy27  ---
Created attachment 104939
  --> https://bugs.freedesktop.org/attachment.cgi?id=104939&action=edit
autocorrect testkit

Hi Julien, probably my test in comment 17 was not 100% accurate.

try replicating this new experiment.

a- download the attached .zip file which contains 3 minimal autocorrect .dat
file

1- acor_und.dat
it has a single entry: test → test1
it will apply in any document regardless the language since the acor_und.dat
file is the global autocorrect list (you can find it at the top of the language
dropdown list in the autocorrect replacement table under [All] (don't know
how's localized in french)

2- acor_en-GB.dat
it has a single entry: test → test2
it will apply only in document where the language is English(UK)

3- acor_en.dat
it has a single entry: test → test3
it should apply in any document written in any of the English variants (UK, US,
Australia etc.)

b- place these 3 dat files in the autocorr subfolder of the user profile

c- load a blank new Writer document and set the language as English(UK)

d- type test and see how it gets autocorrected

e- compare with my results with LibO 4.2.6.2 under Win7x64:

- all 3 dat files present → test corrected into test2, so the localized variant
acor_en-GB.dat rules over the acor_und.dat and  acor_en.dat

- remove the und.dat file → again you get test2, so the  en-GB.dat wins over
the en.dat

- remove only the  en-GB.dat file → you get test3 so the en.dat wins over the
und.dat

- remove both en-GB.dat and und.dat → again you get test3 since only en.dat is
left

- remove both  en-GB.dat and en.dat → you get test1 since only und.dat is left

so basically in case of autocorrect conflicts the “en-GB” list wins over the
“en” list and over the “und” list.

I agree this is the correct behavior since the language of the document should
tell which is the first autocorrect list to look inside.

f- same results if I rename those file to match italian locale (i.e.
acor_it.dat and acor_it-IT.dat) and I write an italian(Italy) document.

g- different results if you do the same trick with german or french locales. In
those cases the renamed acor_de.dat and acor_fr.dat files will have no effect
even if you remove the und.dat and the de-DE.dat and the fr-FR.dat files. So it
seems that the unlocalized variant .dat files doesn't work in some language
subgroups... this is strange and unconsistent with the results with Italian and
English where it worked with no issue.

Do you have any thoughts about that?

-- 
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 44580] share autocorrect replacement table for misc. language subgroups

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=44580

--- Comment #20 from tommy27  ---
P.S. when you remove some .dat files as described in the tests above always
remember to close LibO first and then restart the program again.

-- 
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