date:20150501

[Bug 67832] upgrade our jfreereport libraries

2015-05-01 Thread bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=67832

David Tardon  changed:

   What|Removed |Added

 CC||libreoffice@lists.freedeskt
   ||op.org
 Whiteboard|needsDevEval|EasyHack DifficultyBeginner
   ||SkillScript TopicCleanup

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

LO 4.4 build fails

2015-05-01 Thread Jean-Baptiste Faure

Hi,

it seems that the last commit for LO 4.4 branch [1] breaks the build.
I get the following error message, even with a complete rebuild :

> : ROOTMODULEGID=gid_Module_Root
> : LCPRODUCTNAME=libreoffice
> : LICENSENAME=LGPL
> : CLI_URE_POLICY_VERSION=22.0.0.0
> : 
> : 
> : 
> : Setting Root Module: gid_Module_Root
> : Error: "gid_File_Share_Config_Sofficecfg_uiconfig_scanner_Lang" is multi 
> lingual, but not in language pack (Assigned module: gid_Module_Root)!
> : 
> : *
> : ERROR: ERROR: Incorrect assignments for language packs. at 
> [...]/LibO/lo44/solenv/bin/modules/installer/scriptitems.pm line 2068.
> : *
> 
> [...]/LibO/lo44/instsetoo_native/CustomTarget_install.mk:97: recipe for 
> target 
> '[...]/LibO/lo44/workdir/CustomTarget/instsetoo_native/install/install.phony' 
> failed
> make[1]: *** 
> [[...]/LibO/lo44/workdir/CustomTarget/instsetoo_native/install/install.phony] 
> Error 1
> Makefile:237: recipe for target 'build' failed
> make: *** [build] Error 2


[1]
https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=13cbbea83019906201a4a4bb193c2fbfaf1f2b11

Best regards.
JBF
-- 
Seuls des formats ouverts peuvent assurer la pérennité de vos documents.
Disclaimer: my Internet Provider being located in France, each of our
Internet communications will be scanned by French spying services.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2015-05-01 Thread Andras Timar

 scp2/source/ooo/module_lang_template.scp |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 9e0d9045f891bb19a41e5987ca1e6a5cec8d44a4
Author: Andras Timar 
Date:   Fri May 1 07:17:10 2015 +0200

scp2: add scanner ui files to language pack template

Change-Id: I10105770a119db8a21a3d09642f99b556440a57d
(cherry picked from commit 0ecf20cd185813327613c01bc6cbff9721cef1f1)
Reviewed-on: https://gerrit.libreoffice.org/15583
Tested-by: David Tardon 
Reviewed-by: David Tardon 

diff --git a/scp2/source/ooo/module_lang_template.scp 
b/scp2/source/ooo/module_lang_template.scp
index e5b8752..ce8ee9d 100644
--- a/scp2/source/ooo/module_lang_template.scp
+++ b/scp2/source/ooo/module_lang_template.scp
@@ -36,6 +36,7 @@ Module gid_Module_Langpack_Basis_Template
  gid_File_Share_Config_Sofficecfg_uiconfig_fps_Lang,
  gid_File_Share_Config_Sofficecfg_uiconfig_sabpilot_Lang,
  gid_File_Share_Config_Sofficecfg_uiconfig_scalc_Lang,
+ gid_File_Share_Config_Sofficecfg_uiconfig_scanner_Lang,
  gid_File_Share_Config_Sofficecfg_uiconfig_schart_Lang,
  gid_File_Share_Config_Sofficecfg_uiconfig_sdraw_Lang,
  gid_File_Share_Config_Sofficecfg_uiconfig_sfx_Lang,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - sal/osl

2015-05-01 Thread Tor Lillqvist

 sal/osl/unx/mutex.cxx |   10 --
 1 file changed, 10 deletions(-)

New commits:
commit 5b8acf459e4a6728ea656e7abd5dfb08ad2ae345
Author: Tor Lillqvist 
Date:   Fri May 1 11:02:17 2015 +0300

Actually, let's just delete the now commented-out SAL_INFO lines

(It was I who added them in the first place.)

Next time somebody (falsely?) suspects a problem with mutex use and really
needs tracing, it's trivial to add temporary SAL_DEBUGs.

Change-Id: I3db02be777a728fbf4a1d1962f0ccfa16c630f15

diff --git a/sal/osl/unx/mutex.cxx b/sal/osl/unx/mutex.cxx
index a50cfa0..515a2ed 100644
--- a/sal/osl/unx/mutex.cxx
+++ b/sal/osl/unx/mutex.cxx
@@ -65,8 +65,6 @@ oslMutex SAL_CALL osl_createMutex()
 
 pthread_mutexattr_destroy(&aMutexAttr);
 
-//SAL_INFO("sal.osl.mutex", "osl_createMutex(): " << pMutex);
-
 return pMutex;
 }
 
@@ -74,8 +72,6 @@ void SAL_CALL osl_destroyMutex(oslMutexImpl *pMutex)
 {
 SAL_WARN_IF(!pMutex, "sal.osl.mutex", "null pMutex");
 
-//SAL_INFO("sal.osl.mutex", "osl_destroyMutex(" << pMutex << ")");
-
 if ( pMutex != 0 )
 {
 int nRet=0;
@@ -96,8 +92,6 @@ sal_Bool SAL_CALL osl_acquireMutex(oslMutexImpl *pMutex)
 {
 SAL_WARN_IF(!pMutex, "sal.osl.mutex", "null pMutex");
 
-//SAL_INFO("sal.osl.mutex", "osl_acquireMutex(" << pMutex << ")");
-
 if ( pMutex != 0 )
 {
 int nRet=0;
@@ -129,8 +123,6 @@ sal_Bool SAL_CALL osl_tryToAcquireMutex(oslMutexImpl 
*pMutex)
 result = true;
 }
 
-//SAL_INFO("sal.osl.mutex", "osl_tryToAcquireMutex(" << pMutex << "): " << 
(result ? "YES" : "NO"));
-
 return result;
 }
 
@@ -138,8 +130,6 @@ sal_Bool SAL_CALL osl_releaseMutex(oslMutexImpl *pMutex)
 {
 SAL_WARN_IF(!pMutex, "sal.osl.mutex", "null pMutex");
 
-//SAL_INFO("sal.osl.mutex", "osl_releaseMutex(" << pMutex << ")");
-
 if ( pMutex )
 {
 int nRet=0;
commit 9a812c0177cfb7119181bc5afd6c7d935918485e
Author: Tor Lillqvist 
Date:   Fri May 1 10:58:38 2015 +0300

Let's disable these too then for consistency

Change-Id: I17d17b1cad83a55f9a2c0db80e272c419529b45a

diff --git a/sal/osl/unx/mutex.cxx b/sal/osl/unx/mutex.cxx
index d822078..a50cfa0 100644
--- a/sal/osl/unx/mutex.cxx
+++ b/sal/osl/unx/mutex.cxx
@@ -65,7 +65,7 @@ oslMutex SAL_CALL osl_createMutex()
 
 pthread_mutexattr_destroy(&aMutexAttr);
 
-SAL_INFO("sal.osl.mutex", "osl_createMutex(): " << pMutex);
+//SAL_INFO("sal.osl.mutex", "osl_createMutex(): " << pMutex);
 
 return pMutex;
 }
@@ -74,7 +74,7 @@ void SAL_CALL osl_destroyMutex(oslMutexImpl *pMutex)
 {
 SAL_WARN_IF(!pMutex, "sal.osl.mutex", "null pMutex");
 
-SAL_INFO("sal.osl.mutex", "osl_destroyMutex(" << pMutex << ")");
+//SAL_INFO("sal.osl.mutex", "osl_destroyMutex(" << pMutex << ")");
 
 if ( pMutex != 0 )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: LO 4.4 build fails

2015-05-01 Thread Andras Timar

Hi,

On Fri, May 1, 2015 at 9:17 AM, Jean-Baptiste Faure
 wrote:
> Hi,
>
> it seems that the last commit for LO 4.4 branch [1] breaks the build.
> I get the following error message, even with a complete rebuild :

The followup commit fixed the problem. Sorry for the inconveniences.
http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-4-4&id=9e0d9045f891bb19a41e5987ca1e6a5cec8d44a4

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

[GSoC] Introduction - Krisztian Pinter - Cleanup internal drawing units in Calc

2015-05-01 Thread Krisztian Pinter

Hi All!

My name is Krisztian, I am an MSc student at the Hungarian ELTE University.
I have participated in GSoC with LibreOffice before, in 2013 with rewriting
the Start Center and in 2014 with improving the color selection. This year
I am going to be doing some refactoring work on Calc, unifying drawing
units.

I hope this summer will be as fruitful as the last two! :)

Best regards,
Krisztian
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

unused code in Calc source?

2015-05-01 Thread Winfried Donkers

Hi,

In sc/inc/compiler.hxx, struct AddInMap a member bMapDupToInternal is defined.
As far as I can see, it is not really used in the code.
That is, in sc/source/core/tool/odffmap.cxx it gets a value, but that seems 
unused.
The only use I can find, is in a comment in 
sc/source/filter/excel/xlformula.cxx.
Is it useful to keep this member, or can it be removed (with relevant comments 
in both odffmap.cxx and xlformula.cxx)?

Winfried

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

[Libreoffice-commits] translations.git: Branch 'libreoffice-4-4' - source/th

2015-05-01 Thread Andras Timar

 source/th/cui/source/tabpages.po |   48 +--
 1 file changed, 2 insertions(+), 46 deletions(-)

New commits:
commit 3739ccfcfba54d723a2ae5142f5f36fd8edbc707
Author: Andras Timar 
Date:   Fri May 1 13:08:45 2015 +0200

tdf#90929 fix Thai translation of 'Tabloid' page format

Change-Id: Ide6454a40a881fba66bbfe416f704335a89db4a8

diff --git a/source/th/cui/source/tabpages.po b/source/th/cui/source/tabpages.po
index e8e900e..a902a9f 100644
--- a/source/th/cui/source/tabpages.po
+++ b/source/th/cui/source/tabpages.po
@@ -305,29 +305,7 @@ msgctxt ""
 "Tabloid\n"
 "itemlist.text"
 msgid "Tabloid"
-msgstr ""
-"#-#-#-#-#  ribbar.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"à¸à¸²à¸£à¸²à¸\n"
-"#-#-#-#-#  table.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"à¸à¸²à¸£à¸²à¸\n"
-"#-#-#-#-#  fldui.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"à¸à¸²à¸£à¸²à¸\n"
-"#-#-#-#-#  chrdlg.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"à¸à¸²à¸£à¸²à¸\n"
-"#-#-#-#-#  resource.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"Table\n"
-"#-#-#-#-#  appl.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"à¸à¸²à¸£à¸²à¸\n"
-"#-#-#-#-#  Office.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"à¸à¸²à¸£à¸²à¸\n"
-"#-#-#-#-#  dbpilots.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"à¸à¸²à¸£à¸²à¸\n"
-"#-#-#-#-#  bibliography.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"à¸à¸²à¸£à¸²à¸\n"
-"#-#-#-#-#  dialogs.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"à¸à¸²à¸£à¸²à¸\n"
-"#-#-#-#-#  items.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"à¸à¸²à¸£à¸²à¸"
+msgstr "à¸à¸²à¸£à¸²à¸"
 
 #: page.src
 msgctxt ""
@@ -624,29 +602,7 @@ msgctxt ""
 "Tabloid\n"
 "itemlist.text"
 msgid "Tabloid"
-msgstr ""
-"#-#-#-#-#  ribbar.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"à¸à¸²à¸£à¸²à¸\n"
-"#-#-#-#-#  table.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"à¸à¸²à¸£à¸²à¸\n"
-"#-#-#-#-#  fldui.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"à¸à¸²à¸£à¸²à¸\n"
-"#-#-#-#-#  chrdlg.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"à¸à¸²à¸£à¸²à¸\n"
-"#-#-#-#-#  resource.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"Table\n"
-"#-#-#-#-#  appl.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"à¸à¸²à¸£à¸²à¸\n"
-"#-#-#-#-#  Office.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"à¸à¸²à¸£à¸²à¸\n"
-"#-#-#-#-#  dbpilots.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"à¸à¸²à¸£à¸²à¸\n"
-"#-#-#-#-#  bibliography.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"à¸à¸²à¸£à¸²à¸\n"
-"#-#-#-#-#  dialogs.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"à¸à¸²à¸£à¸²à¸\n"
-"#-#-#-#-#  items.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"à¸à¸²à¸£à¸²à¸"
+msgstr "à¸à¸²à¸£à¸²à¸"
 
 #: page.src
 msgctxt ""
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - translations

2015-05-01 Thread Andras Timar

 translations |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 510e0edfece604784e5783fdc31788521f6c7e9f
Author: Andras Timar 
Date:   Fri May 1 13:08:45 2015 +0200

Updated core
Project: translations  3739ccfcfba54d723a2ae5142f5f36fd8edbc707

tdf#90929 fix Thai translation of 'Tabloid' page format

Change-Id: Ide6454a40a881fba66bbfe416f704335a89db4a8

diff --git a/translations b/translations
index ba4bf5b..3739ccf 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit ba4bf5bfaa0a475ddd90506a5f8282b1b2625d6a
+Subproject commit 3739ccfcfba54d723a2ae5142f5f36fd8edbc707
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-05-01 Thread Caolán McNamara

 sw/source/core/layout/flowfrm.cxx |9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 971adcd9e19e0bcab5855aae9be58d2203b46169
Author: CaolÃ¡n McNamara 
Date:   Fri May 1 12:12:28 2015 +0100

Resolves: tdf#90141 layout crash with table in footnote

this also makes cloudon File_1308.docx not crash, which
is the last outstanding crashtesting import failure

Change-Id: I06867a1b06316c6dab62ebd8a55f3a02b57b9f31

diff --git a/sw/source/core/layout/flowfrm.cxx 
b/sw/source/core/layout/flowfrm.cxx
index 4fc786d..f84d7a8 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -1792,8 +1792,15 @@ bool SwFlowFrm::MoveFwd( bool bMakePage, bool 
bPageBreak, bool bMoveAlways )
 {
 //MoveFtnCntFwd might need to be updated as well.
 SwFtnBossFrm *pOldBoss = m_rThis.FindFtnBossFrm();
-if ( m_rThis.IsInFtn() )
+if (m_rThis.IsInFtn())
+{
+if (!m_rThis.IsCntntFrm())
+{
+SAL_WARN("sw.core", "Tables in footnotes are not truly supported");
+return false;
+}
 return static_cast(m_rThis).MoveFtnCntFwd( bMakePage, 
pOldBoss );
+}
 
 if( !IsFwdMoveAllowed() && !bMoveAlways )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - translations

2015-05-01 Thread Andras Timar

 translations |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ef75458371e2e48cc965429d33e9eb513936e75f
Author: Andras Timar 
Date:   Fri May 1 13:18:49 2015 +0200

Updated core
Project: translations  f71054b6a80b3a3684a48bf8d860f6a382f2a473

tdf#90846 'Optimal View' mislabelled in English (GB)

Change-Id: Icb64a4ab54abd0d19b208a98cc36f5b986dfee81

diff --git a/translations b/translations
index 3739ccf..f71054b 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 3739ccfcfba54d723a2ae5142f5f36fd8edbc707
+Subproject commit f71054b6a80b3a3684a48bf8d860f6a382f2a473
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Branch 'libreoffice-4-4' - source/en-GB

2015-05-01 Thread Andras Timar

 source/en-GB/svx/source/stbctrls.po |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f71054b6a80b3a3684a48bf8d860f6a382f2a473
Author: Andras Timar 
Date:   Fri May 1 13:18:49 2015 +0200

tdf#90846 'Optimal View' mislabelled in English (GB)

Change-Id: Icb64a4ab54abd0d19b208a98cc36f5b986dfee81

diff --git a/source/en-GB/svx/source/stbctrls.po 
b/source/en-GB/svx/source/stbctrls.po
index b48c479..83e5168 100644
--- a/source/en-GB/svx/source/stbctrls.po
+++ b/source/en-GB/svx/source/stbctrls.po
@@ -206,7 +206,7 @@ msgctxt ""
 "ZOOM_OPTIMAL\n"
 "menuitem.text"
 msgid "Optimal View"
-msgstr "Zoom Out"
+msgstr "Optimal View"
 
 #: stbctrls.src
 msgctxt ""
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

New Defects reported by Coverity Scan for LibreOffice

2015-05-01 Thread scan-admin


Hi,

Please find the latest report on new defect(s) introduced to LibreOffice found 
with Coverity Scan.

2 new defect(s) introduced to LibreOffice found with Coverity Scan.
12 defect(s), reported by Coverity Scan earlier, were marked fixed in the 
recent build analyzed by Coverity Scan.

New defect(s) Reported-by: Coverity Scan
Showing 2 of 2 defect(s)


** CID 1296293:  Uninitialized members  (UNINIT_CTOR)
/svx/source/engine3d/float3d.cxx: 324 in Svx3DWin::Svx3DWin(SfxBindings *, 
SfxChildWindow *, vcl::Window *)()



*** CID 1296293:  Uninitialized members  (UNINIT_CTOR)
/svx/source/engine3d/float3d.cxx: 324 in Svx3DWin::Svx3DWin(SfxBindings *, 
SfxChildWindow *, vcl::Window *)()
318 Reset();
319 
320 //lock down the size of the initial largest default mode as the 
permanent size
321 aSize = get_preferred_size();
322 set_width_request(aSize.Width());
323 set_height_request(aSize.Height());
>>> CID 1296293:  Uninitialized members  (UNINIT_CTOR)
>>> Non-static class member "ePoolUnit" is not initialized in this 
>>> constructor nor in any functions that it calls.
324 }
325 
326 Svx3DWin::~Svx3DWin()
327 {
328 disposeOnce();
329 }

** CID 1296292:  Incorrect expression  (MIXED_ENUMS)
/sc/source/ui/miscdlgs/highred.cxx: 226 in 
ScHighlightChgDlg::OKBtnHdl(PushButton *)()



*** CID 1296292:  Incorrect expression  (MIXED_ENUMS)
/sc/source/ui/miscdlgs/highred.cxx: 226 in 
ScHighlightChgDlg::OKBtnHdl(PushButton *)()
220 IMPL_LINK( ScHighlightChgDlg, OKBtnHdl, PushButton*, pOKBtn )
221 {
222 if (pOKBtn == m_pOkButton)
223 {
224 aChangeViewSet.SetShowChanges(m_pHighlightBox->IsChecked());
225 aChangeViewSet.SetHasDate(m_pFilterCtr->IsDate());
>>> CID 1296292:  Incorrect expression  (MIXED_ENUMS)
>>> Mixing enum types "ScChgsDateMode" and "SvxRedlinDateMode" for "eMode".
226 ScChgsDateMode eMode = (ScChgsDateMode) 
m_pFilterCtr->GetDateMode();
227 aChangeViewSet.SetTheDateMode( eMode );
228 Date aFirstDate( m_pFilterCtr->GetFirstDate() );
229 tools::Time aFirstTime( m_pFilterCtr->GetFirstTime() );
230 Date aLastDate( m_pFilterCtr->GetLastDate() );
231 tools::Time aLastTime( m_pFilterCtr->GetLastTime() );



To view the defects in Coverity Scan visit, 
https://scan.coverity.com/projects/211?tab=overview

To manage Coverity Scan email notifications for 
"libreoffice@lists.freedesktop.org", click 
https://scan.coverity.com/subscriptions/edit?email=libreoffice%40lists.freedesktop.org&token=d6481d718a775246b2340f282ebe5939
 .

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

Re: Crash test update

2015-05-01 Thread Caolán McNamara

On Thu, 2015-04-30 at 10:17 +0200, Miklos Vajna wrote:
> On Wed, Apr 29, 2015 at 02:27:22PM +0200, Miklos Vajna 
>  wrote:
> > Sounds like a regression, 4.3 branch point imports it fine, but 4.4
> > branch point does not. I'll have a look.
> 
> 57d254d42b6e1d836bd21e6fb2e968af2b511c7d should take care of this.

And 971adcd9e19e0bcab5855aae9be58d2203b46169 now stops the layout crash
with tables in footnotes. Writer can't really have tables in footnotes,
I can't remember what sort of hackery we have in doc/rtf to avoid that
happening in those formats. Anyway, by my count (which will probably be
a little ahead of the next crash test report) that finally makes no
import crashes/asserts out of approx 76 thousand input files.

C.

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

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - translations

2015-05-01 Thread Andras Timar

 translations |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5c49c7cab35be0863408444d4fe06711cfdb7650
Author: Andras Timar 
Date:   Fri May 1 13:32:49 2015 +0200

Updated core
Project: translations  b11e34f1d06f02a7f7d17f01ab9a9ea259c90e87

tdf#90264 Missing translation in button UI for pt_BR

Change-Id: If2f42bb092619ae1a1ba0e1f8b145c6c62c1d122

diff --git a/translations b/translations
index f71054b..b11e34f 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit f71054b6a80b3a3684a48bf8d860f6a382f2a473
+Subproject commit b11e34f1d06f02a7f7d17f01ab9a9ea259c90e87
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Branch 'libreoffice-4-4' - source/pt-BR

2015-05-01 Thread Andras Timar

 source/pt-BR/svx/uiconfig/ui.po |   65 +++-
 1 file changed, 64 insertions(+), 1 deletion(-)

New commits:
commit b11e34f1d06f02a7f7d17f01ab9a9ea259c90e87
Author: Andras Timar 
Date:   Fri May 1 13:32:49 2015 +0200

tdf#90264 Missing translation in button UI for pt_BR

Change-Id: If2f42bb092619ae1a1ba0e1f8b145c6c62c1d122

diff --git a/source/pt-BR/svx/uiconfig/ui.po b/source/pt-BR/svx/uiconfig/ui.po
index e82cf3a..058f8d0 100644
--- a/source/pt-BR/svx/uiconfig/ui.po
+++ b/source/pt-BR/svx/uiconfig/ui.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2014-11-18 11:23+0100\n"
+"POT-Creation-Date: 2015-05-01 13:23+0200\n"
 "PO-Revision-Date: 2014-11-26 16:35-0200\n"
 "Last-Translator: Olivier Hallot \n"
 "Language-Team: Brazilian Portuguese \n"
@@ -853,6 +853,15 @@ msgctxt ""
 msgid "Recent"
 msgstr "Recente"
 
+#: colorwindow.ui
+msgctxt ""
+"colorwindow.ui\n"
+"color_picker_button\n"
+"label\n"
+"string.text"
+msgid "Custom Colorâ¦"
+msgstr ""
+
 #: compressgraphicdialog.ui
 msgctxt ""
 "compressgraphicdialog.ui\n"
@@ -1339,6 +1348,15 @@ msgstr "_Iniciar recuperaÃ§Ã£o >"
 #: docrecoveryrecoverdialog.ui
 msgctxt ""
 "docrecoveryrecoverdialog.ui\n"
+"cancel\n"
+"label\n"
+"string.text"
+msgid "Discard Recovery Data"
+msgstr "Descartar dados de recuperaÃ§Ã£o"
+
+#: docrecoveryrecoverdialog.ui
+msgctxt ""
+"docrecoveryrecoverdialog.ui\n"
 "desc\n"
 "label\n"
 "string.text"
@@ -1904,6 +1922,15 @@ msgctxt ""
 msgid "Pipette"
 msgstr "Pipeta"
 
+#: floatingcontour.ui
+msgctxt ""
+"floatingcontour.ui\n"
+"spinbutton\n"
+"tooltip_text\n"
+"string.text"
+msgid "Color Tolerance"
+msgstr ""
+
 #: fontworkgallerydialog.ui
 msgctxt ""
 "fontworkgallerydialog.ui\n"
@@ -2606,6 +2633,42 @@ msgstr "PosiÃ§Ã£o de encaixe"
 #: paralinespacingcontrol.ui
 msgctxt ""
 "paralinespacingcontrol.ui\n"
+"spacing_1\n"
+"label\n"
+"string.text"
+msgid "Spacing: 1"
+msgstr "EspaÃ§amento: 1"
+
+#: paralinespacingcontrol.ui
+msgctxt ""
+"paralinespacingcontrol.ui\n"
+"spacing_115\n"
+"label\n"
+"string.text"
+msgid "Spacing: 1.15"
+msgstr "EspaÃ§amento: 1.15"
+
+#: paralinespacingcontrol.ui
+msgctxt ""
+"paralinespacingcontrol.ui\n"
+"spacing_15\n"
+"label\n"
+"string.text"
+msgid "Spacing: 1.5"
+msgstr "EspaÃ§amento: 1.5"
+
+#: paralinespacingcontrol.ui
+msgctxt ""
+"paralinespacingcontrol.ui\n"
+"spacing_2\n"
+"label\n"
+"string.text"
+msgid "Spacing: 2"
+msgstr "EspaÃ§amento: 2"
+
+#: paralinespacingcontrol.ui
+msgctxt ""
+"paralinespacingcontrol.ui\n"
 "label3\n"
 "label\n"
 "string.text"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-05-01 Thread Caolán McNamara

 svx/source/engine3d/float3d.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 9b09908eb2c634c5abd17246cae8f4fb781eb5a6
Author: CaolÃ¡n McNamara 
Date:   Fri May 1 12:35:25 2015 +0100

coverity#1296293 Uninitialized scalar field

Change-Id: I3e0af14bb04ac769fdb9861631171f4b437deda0

diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index dd66ce9..a903ccf 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -98,6 +98,7 @@ Svx3DWin::Svx3DWin(SfxBindings* pInBindings, SfxChildWindow 
*pCW, vcl::Window* p
 , pConvertTo3DItem(0)
 , pConvertTo3DLatheItem(0)
 , mpImpl(new Svx3DWinImpl())
+, ePoolUnit(SFX_MAPUNIT_MM)
 , mpRemember2DAttributes(NULL)
 , bOnly3DChanged(false)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - extensions/source include/svx sc/inc sc/source svx/source

2015-05-01 Thread Caolán McNamara

 extensions/source/dbpilots/unoautopilot.hxx |6 --
 include/svx/ctredlin.hxx|3 ++-
 sc/inc/chgviset.hxx |   13 +
 sc/source/core/tool/chgviset.cxx|6 +++---
 sc/source/filter/xml/xmlimprt.cxx   |2 +-
 sc/source/ui/miscdlgs/highred.cxx   |2 +-
 sc/source/ui/view/viewutil.cxx  |   14 +++---
 svx/source/dialog/ctredlin.cxx  |4 
 8 files changed, 27 insertions(+), 23 deletions(-)

New commits:
commit 0978dbbab46ce1f37ed4f27b8358c1a44c02143f
Author: CaolÃ¡n McNamara 
Date:   Fri May 1 12:53:35 2015 +0100

another attempt to get coverity to parse this

i.e.

coverity#1296212 Misused comma operator
coverity#1296213 Misused comma operator

Change-Id: I8f02530e151ac597f58710894891c3ac559d91ce

diff --git a/extensions/source/dbpilots/unoautopilot.hxx 
b/extensions/source/dbpilots/unoautopilot.hxx
index a7678c1..0a0bcf8 100644
--- a/extensions/source/dbpilots/unoautopilot.hxx
+++ b/extensions/source/dbpilots/unoautopilot.hxx
@@ -84,12 +84,14 @@ namespace dbp
 // XServiceInfo - static methods
 static ::com::sun::star::uno::Sequence< OUString > 
getSupportedServiceNames_Static() throw( 
::com::sun::star::uno::RuntimeException )
 {
-return SERVICEINFO().getServiceNames();
+SERVICEINFO aInfo;
+return aInfo.getServiceNames();
 }
 
 static OUString getImplementationName_Static() throw( 
::com::sun::star::uno::RuntimeException )
 {
-return SERVICEINFO().getImplementationName();
+SERVICEINFO aInfo;
+return aInfo.getImplementationName();
 }
 
 static ::com::sun::star::uno::Reference< 
::com::sun::star::uno::XInterface >
commit aeeb79486305efa46ea76d1041b6c9a9c745bfea
Author: CaolÃ¡n McNamara 
Date:   Fri May 1 12:50:33 2015 +0100

coverity#1296292 merge these two enum types

Change-Id: I4f82ca5f7a6b39235c0b871dbaffeba44377

diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx
index 93e8390..43e7181 100644
--- a/include/svx/ctredlin.hxx
+++ b/include/svx/ctredlin.hxx
@@ -38,7 +38,7 @@
 
 enum class SvxRedlinDateMode
 {
-BEFORE, SINCE, EQUAL, NOTEQUAL, BETWEEN, SAVE
+BEFORE, SINCE, EQUAL, NOTEQUAL, BETWEEN, SAVE, NONE
 };
 
 /// Struct for sorting data.
diff --git a/sc/inc/chgviset.hxx b/sc/inc/chgviset.hxx
index aa66f76..55440e8 100644
--- a/sc/inc/chgviset.hxx
+++ b/sc/inc/chgviset.hxx
@@ -20,13 +20,10 @@
 #define INCLUDED_SC_INC_CHGVISET_HXX
 
 #include 
+#include 
 #include "rangelst.hxx"
 #include "scdllapi.h"
 
-enum ScChgsDateMode{SCDM_DATE_BEFORE=0,SCDM_DATE_SINCE=1,SCDM_DATE_EQUAL=2,
-SCDM_DATE_NOTEQUAL=3,SCDM_DATE_BETWEEN=4, 
SCDM_DATE_SAVE=5,
-SCDM_NO_DATEMODE=6};
-
 namespace utl {
 class TextSearch;
 }
@@ -43,7 +40,7 @@ private:
 OUStringaAuthorToShow;
 OUStringaComment;
 ScRangeList aRangeList;
-ScChgsDateMode  eDateMode;
+SvxRedlinDateMode   eDateMode;
 boolbShowIt;
 boolbIsDate;
 boolbIsAuthor;
@@ -62,7 +59,7 @@ public:
 : pCommentSearcher(NULL)
 , aFirstDateTime(DateTime::EMPTY)
 , aLastDateTime(DateTime::EMPTY)
-, eDateMode(SCDM_DATE_BEFORE)
+, eDateMode(SvxRedlinDateMode::BEFORE)
 , bShowIt(false)
 , bIsDate(false)
 , bIsAuthor(false)
@@ -87,8 +84,8 @@ public:
 boolHasDate() const {return bIsDate;}
 voidSetHasDate(bool nFlag) {bIsDate=nFlag;}
 
-voidSetTheDateMode(ScChgsDateMode eDatMod){ 
eDateMode=eDatMod; }
-ScChgsDateMode  GetTheDateMode() const { return eDateMode; }
+voidSetTheDateMode(SvxRedlinDateMode eDatMod){ 
eDateMode=eDatMod; }
+SvxRedlinDateMode   GetTheDateMode() const { return eDateMode; }
 
 voidSetTheFirstDateTime(const DateTime& aDateTime) 
{aFirstDateTime=aDateTime;}
 const DateTime& GetTheFirstDateTime()const {return aFirstDateTime;}
diff --git a/sc/source/core/tool/chgviset.cxx b/sc/source/core/tool/chgviset.cxx
index 01f830c..0526c64 100644
--- a/sc/source/core/tool/chgviset.cxx
+++ b/sc/source/core/tool/chgviset.cxx
@@ -115,13 +115,13 @@ void ScChangeViewSettings::AdjustDateMode( const 
ScDocument& rDoc )
 {
 switch ( eDateMode )
 {   // corresponds with ScViewUtil::IsActionShown
-case SCDM_DATE_EQUAL :
-case SCDM_DATE_NOTEQUAL :
+case SvxRedlinDateMode::EQUAL :
+case SvxRedlinDateMode::NOTEQUAL :
 aFirstDateTime.SetTime( 0 );
 aLastDateTime = aFirstDateTime;
 aLastDateTime.SetTime( 23595999 );
 break;
-case SCDM_DATE_SAVE:
+case SvxRedlinDateMode::SAVE:
 {
 const ScChang

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

2015-05-01 Thread Zolnai Tamás

 sw/source/uibase/shells/textsh1.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit d2448a45767230d3e2913becb44f1a8bd2dfc46a
Author: Zolnai TamÃ¡s 
Date:   Fri May 1 12:20:19 2015 +0200

tdf#90968: Highlighting is not repeated with Ctrl+Shft+Y (Edit>Repeat)

Regression from:
08cfbbaca2d23727bc95912082ae46b8f8a37f03

Use undo actions to make the shell handle all of the background
related changes in one piece.

Change-Id: Ia2b64267727693f663ace5daf1dc094a663ea345

diff --git a/sw/source/uibase/shells/textsh1.cxx 
b/sw/source/uibase/shells/textsh1.cxx
index 0c0ed9b..ac1e453 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -1176,6 +1176,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
 
 if(!pApply && (rWrtSh.HasSelection() || rReq.IsAPI()))
 {
+rWrtSh.StartUndo( UNDO_INSATTR );
 SvxBrushItem aBrushItem(RES_CHRATR_BACKGROUND);
 aBrushItem.SetColor(aSet);
 rWrtSh.SetAttrItem( aBrushItem );
@@ -1199,6 +1200,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
 }
 rWrtSh.SetAttrItem( aGrabBag );
 }
+rWrtSh.EndUndo( UNDO_INSATTR );
 }
 else if(!pApply || pApply->nColor != 
SID_ATTR_CHAR_COLOR_BACKGROUND_EXT)
 {
@@ -1229,6 +1231,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
 {
 if(nSlot == SID_ATTR_CHAR_COLOR_BACKGROUND_EXT)
 {
+rWrtSh.StartUndo( UNDO_INSATTR );
 rWrtSh.SetAttrItem(
 SvxBrushItem( rEdtWin.GetTextBackColor(), 
RES_CHRATR_BACKGROUND) );
 
@@ -1251,6 +1254,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
 }
 rWrtSh.SetAttrItem( aGrabBag );
 }
+rWrtSh.EndUndo( UNDO_INSATTR );
 }
 else
 rWrtSh.SetAttrItem(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: LO 4.4 build fails

2015-05-01 Thread Jean-Baptiste Faure

Hi,

Le 01/05/2015 10:39, Andras Timar a écrit :
> Hi,
> 
> On Fri, May 1, 2015 at 9:17 AM, Jean-Baptiste Faure
>  wrote:
>> Hi,
>>
>> it seems that the last commit for LO 4.4 branch [1] breaks the build.
>> I get the following error message, even with a complete rebuild :
> 
> The followup commit fixed the problem. Sorry for the inconveniences.
> http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-4-4&id=9e0d9045f891bb19a41e5987ca1e6a5cec8d44a4

Thank you very much for the quick fix, it works now.

Best regards.

JBF

-- 
Seuls des formats ouverts peuvent assurer la pérennité de vos documents.
Disclaimer: my Internet Provider being located in France, each of our
Internet communications will be scanned by French spying services.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - vcl/unx

2015-05-01 Thread Caolán McNamara

 vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx  |2 ++
 vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx |7 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 2d13cf60ecdab83997c9cd7275c799ddd96617cd
Author: CaolÃ¡n McNamara 
Date:   Fri Apr 24 11:01:50 2015 +0100

Resolves: tdf#73211 gtk checkboxes need erase afer toggling

because an unchecked checkbox can have a smaller paint area
than a checked checkbox. This has always bugged me

(cherry picked from commit d194074aa34e3724dd9b93fbc81bf2ba793cd37a)

Conflicts:
vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx

Change-Id: Iac0f075089611b47c381863a9655445d732bfddc
Reviewed-on: https://gerrit.libreoffice.org/15510
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx 
b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index b1e7e23..226ea69 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -441,6 +441,8 @@ void GtkData::initNWF( void )
 pSVData->maNWFData.mnMenuFormatBorderX = xthickness + horizontal_padding;
 pSVData->maNWFData.mnMenuFormatBorderY = ythickness + vertical_padding;
 
+pSVData->maNWFData.mbCheckBoxNeedsErase = true;
+
 if( SalGetDesktopEnvironment() == "KDE" )
 {
 // #i97196# ensure a widget exists and the style engine was loaded
diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx 
b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index 2a1f4e7..ed4c2d0 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -1470,7 +1470,12 @@ bool GtkSalGraphics::IsNativeControlSupported( 
ControlType nType, ControlPart nP
 return false;
 }
 
-void GtkData::initNWF() {}
+void GtkData::initNWF()
+{
+ImplSVData* pSVData = ImplGetSVData();
+pSVData->maNWFData.mbCheckBoxNeedsErase = true;
+}
+
 void GtkData::deInitNWF() {}
 
 void GtkSalGraphics::getStyleContext(GtkStyleContext** style, GtkWidget* 
widget)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-05-01 Thread Caolán McNamara

 extensions/source/dbpilots/unoautopilot.hxx |   19 ++-
 1 file changed, 2 insertions(+), 17 deletions(-)

New commits:
commit 74ca4861900b0833aeb12860bfec235b015bcdc7
Author: CaolÃ¡n McNamara 
Date:   Fri May 1 14:40:36 2015 +0100

these are static all the way down

Change-Id: I20fe835f81680866412fde5e28f508625b043402

diff --git a/extensions/source/dbpilots/unoautopilot.hxx 
b/extensions/source/dbpilots/unoautopilot.hxx
index 0a0bcf8..46e1bc0 100644
--- a/extensions/source/dbpilots/unoautopilot.hxx
+++ b/extensions/source/dbpilots/unoautopilot.hxx
@@ -31,19 +31,6 @@
 
 namespace dbp
 {
-//= IServiceInfo
-
-/** interface for the SERVICEINFO template parameter of the OUnoAutoPilot 
class
-*/
-struct IServiceInfo
-{
-public:
-OUString getImplementationName() const;
-::com::sun::star::uno::Sequence< OUString >
-getServiceNames() const;
-};
-
-
 //= OUnoAutoPilot
 
 typedef ::svt::OGenericUnoDialogOUnoAutoPilot_Base;
@@ -84,14 +71,12 @@ namespace dbp
 // XServiceInfo - static methods
 static ::com::sun::star::uno::Sequence< OUString > 
getSupportedServiceNames_Static() throw( 
::com::sun::star::uno::RuntimeException )
 {
-SERVICEINFO aInfo;
-return aInfo.getServiceNames();
+return SERVICEINFO::getServiceNames();
 }
 
 static OUString getImplementationName_Static() throw( 
::com::sun::star::uno::RuntimeException )
 {
-SERVICEINFO aInfo;
-return aInfo.getImplementationName();
+return SERVICEINFO::getImplementationName();
 }
 
 static ::com::sun::star::uno::Reference< 
::com::sun::star::uno::XInterface >
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

License statement Linus Behrens

2015-05-01 Thread Isabell Behrens

All of my son Linus Leonard Behrens' past & future contributions to
LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license,
until further notice.

Isabell Behrens-Wimber 


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

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

2015-05-01 Thread Jan Holesovsky

 sw/inc/ndtyp.hxx |8 +++-
 sw/inc/node.hxx  |   17 +
 sw/source/core/doc/docnew.cxx|2 +-
 sw/source/core/docnode/nodes.cxx |   18 +-
 4 files changed, 22 insertions(+), 23 deletions(-)

New commits:
commit befe83a707e8faf37094523550dfa5bcf87be279
Author: Jan Holesovsky 
Date:   Thu Apr 30 12:59:15 2015 +0200

sw: Decouple ND_SECTIONDUMMY from ND_SECTIONNODE, and rename it.

Change-Id: Ic88a133d20336ce0548154847edd9900cb5b7691

diff --git a/sw/inc/ndtyp.hxx b/sw/inc/ndtyp.hxx
index c62f706..cbf71ab 100644
--- a/sw/inc/ndtyp.hxx
+++ b/sw/inc/ndtyp.hxx
@@ -26,13 +26,12 @@
 // in base class.
 const sal_uInt8 ND_ENDNODE  = 0x01;
 const sal_uInt8 ND_STARTNODE= 0x02;
-const sal_uInt8 ND_TABLENODE= 0x04 | ND_STARTNODE; // SwTableNode is 
derived from SwStartNode
+const sal_uInt8 ND_TABLENODE= 0x04 | ND_STARTNODE; ///< SwTableNode is 
derived from SwStartNode.
 const sal_uInt8 ND_TEXTNODE = 0x08;
 const sal_uInt8 ND_GRFNODE  = 0x10;
 const sal_uInt8 ND_OLENODE  = 0x20;
-const sal_uInt8 ND_SECTIONDUMMY = 0x40; //(ND_SECTIONNODE & ~ND_STARTNODE);
-
-const sal_uInt8 ND_SECTIONNODE  = ND_SECTIONDUMMY | ND_STARTNODE;
+const sal_uInt8 ND_SECTIONNODE  = 0x40 | ND_STARTNODE; ///< SwSectionNode is 
derived from SwStartNode.
+const sal_uInt8 ND_PLACEHOLDER  = 0x80;
 
 // NoTxtNode (if any of the 2 bits are set).
 const sal_uInt8 ND_NOTXTNODE= ND_GRFNODE | ND_OLENODE;
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index 51bfb2e..d7621be 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -567,15 +567,16 @@ public:
 
 };
 
-/** This class is internal. And quite frankly I don't know what 
ND_SECTIONDUMMY is for,
-   the class has been merely created to replace "SwNode( ND_SECTIONDUMMY )", 
the only case
-   of instantiating SwNode directly. Now SwNode can be an abstract base class. 
*/
-class SwDummySectionNode
-: private SwNode
+/** This class is internal, used only during 
DocumentContentOperationsManager::CopyWithFlyInFly(), and for undo.
+
+Some of the nodes are then replaced with SwPlaceholderNode, and at the end of 
the operation, removed again.
+FIXME find out if this is really necessary, and if we can avoid creation of 
the SwPlaceholderNodes in the first place.
+*/
+class SwPlaceholderNode : private SwNode
 {
 private:
 friend class SwNodes;
-SwDummySectionNode( const SwNodeIndex &rWhere );
+SwPlaceholderNode(const SwNodeIndex &rWhere);
 };
 
 inline   SwEndNode   *SwNode::GetEndNode()
@@ -731,8 +732,8 @@ inline const SfxPoolItem& SwCntntNode::GetAttr( sal_uInt16 
nWhich,
 return GetSwAttrSet().Get( nWhich, bInParents );
 }
 
-inline SwDummySectionNode::SwDummySectionNode( const SwNodeIndex &rWhere )
-: SwNode( rWhere, ND_SECTIONDUMMY )
+inline SwPlaceholderNode::SwPlaceholderNode(const SwNodeIndex &rWhere)
+: SwNode(rWhere, ND_PLACEHOLDER)
 {
 }
 
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 05ec76d..0e945b3 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -942,7 +942,7 @@ SwNodeIndex SwDoc::AppendDoc(const SwDoc& rSource, 
sal_uInt16 const nStartPageNu
 #endif
 pTargetShell->StartAllAction();
 
-// Otherwise we have to handle SwDummySectionNodes as first node
+// Otherwise we have to handle SwPlaceholderNodes as first node
 if ( pTargetPageDesc ) {
 OUString name = pTargetPageDesc->GetName();
 pTargetShell->InsertPageBreak( &name, nStartPageNumber );
diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index 9a54ec9..0806894 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -622,7 +622,7 @@ bool SwNodes::_MoveNodes( const SwNodeRange& aRange, 
SwNodes & rNodes,
 rNodes))
 {
 // use placeholder in UndoNodes array
-new SwDummySectionNode( aIdx );
+new SwPlaceholderNode(aIdx);
 }
 else
 {
@@ -694,7 +694,7 @@ bool SwNodes::_MoveNodes( const SwNodeRange& aRange, 
SwNodes & rNodes,
 aIdx -= nInsPos;
 nInsPos = 0;
 }
-new SwDummySectionNode( aIdx );
+new SwPlaceholderNode(aIdx);
 --aRg.aEnd;
 --aIdx;
 break;
@@ -814,7 +814,7 @@ bool SwNodes::_MoveNodes( const SwNodeRange& aRange, 
SwNodes & rNodes,
 }
 break;
 
-case ND_SECTIONDUMMY:
+case ND_PLACEHOLDER:
 if (GetDoc()->GetIDocumentUndoRedo().IsUndoNodes(*this))
 {
 if( &rNodes == this ) // inside UndoNodesArray
@@ -1753,7 +1753,7 @@ void SwNodes::_CopyNodes( const SwNodeRange& rRange,
 
 //

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

2015-05-01 Thread Caolán McNamara

 include/sfx2/sidebar/SidebarToolBox.hxx   |1 +
 vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx |   13 -
 2 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit 01f2d3fed2e4d52490241a926f08e29d2bda41a4
Author: CaolÃ¡n McNamara 
Date:   Fri May 1 17:14:06 2015 +0100

gtk3: distinguish between first, last and only tabs

Change-Id: Ic69b84a3dd94ee25d5e660da152b1e776fa2b38e

diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx 
b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index 9ee90c4..f8fcb1d 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -956,7 +956,18 @@ bool GtkSalGraphics::drawNativeControl( ControlType nType, 
ControlPart nPart, co
 gtk_style_context_set_state(context, flags);
 if (nType == CTRL_TAB_ITEM)
 {
-gtk_style_context_add_region(mpNoteBookStyle, GTK_STYLE_REGION_TAB, 
GTK_REGION_EVEN);
+
+const TabitemValue& rTabitemValue = static_cast(aValue);
+
+GtkRegionFlags eFlags(GTK_REGION_EVEN);
+if (rTabitemValue.isFirst() && rTabitemValue.isLast())
+eFlags = GTK_REGION_ONLY;
+else if (rTabitemValue.isFirst())
+eFlags = GTK_REGION_FIRST;
+else if (rTabitemValue.isLast())
+eFlags = GTK_REGION_LAST;
+
+gtk_style_context_add_region(mpNoteBookStyle, GTK_STYLE_REGION_TAB, 
eFlags);
 gtk_style_context_add_class(context, GTK_STYLE_CLASS_TOP);
 }
 if (styleClass)
commit 79acfc59aa84018827a9a68edbbb0576e65588a2
Author: CaolÃ¡n McNamara 
Date:   Fri May 1 16:18:29 2015 +0100

missing include

Change-Id: If649c044d5dde770942cc4d859d1191612a247c7

diff --git a/include/sfx2/sidebar/SidebarToolBox.hxx 
b/include/sfx2/sidebar/SidebarToolBox.hxx
index a49f668..80ae7a1 100644
--- a/include/sfx2/sidebar/SidebarToolBox.hxx
+++ b/include/sfx2/sidebar/SidebarToolBox.hxx
@@ -20,6 +20,7 @@
 #define INCLUDED_SFX2_SIDEBAR_SIDEBARTOOLBOX_HXX
 
 #include 
+#include 
 #include 
 #include 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-05-01 Thread Linus Behrens

 svx/source/svdraw/svdmodel.cxx |   76 -
 svx/source/svdraw/svdogrp.cxx  |   76 -
 2 files changed, 76 insertions(+), 76 deletions(-)

New commits:
commit 48231d12738d62c5dfe9ff8beaae3c2e328a15e7
Author: Linus Behrens 
Date:   Thu Apr 23 16:12:55 2015 +0200

Replaced nAnz, nObjAnz with nCount, nObjCount respectively

Change-Id: I4a479828650a3015670561cf391befa3da731bae
Reviewed-on: https://gerrit.libreoffice.org/15494
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index 3d485bc..65754a6 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -326,10 +326,10 @@ void SdrModel::SetReadOnly(bool bYes)
 
 
 
-void SdrModel::SetMaxUndoActionCount(sal_uIntPtr nAnz)
+void SdrModel::SetMaxUndoActionCount(sal_uIntPtr nCount)
 {
-if (nAnz<1) nAnz=1;
-nMaxUndoCount=nAnz;
+if (nCount<1) nCount=1;
+nMaxUndoCount=nCount;
 if (pUndoStack!=NULL) {
 while (pUndoStack->size()>nMaxUndoCount) {
 delete pUndoStack->back();
@@ -671,8 +671,8 @@ void SdrModel::ClearModel(bool bCalledFromDestructor)
 
 sal_Int32 i;
 // delete all drawing pages
-sal_Int32 nAnz=GetPageCount();
-for (i=nAnz-1; i>=0; i--)
+sal_Int32 nCount=GetPageCount();
+for (i=nCount-1; i>=0; i--)
 {
 DeletePage( (sal_uInt16)i );
 }
@@ -680,8 +680,8 @@ void SdrModel::ClearModel(bool bCalledFromDestructor)
 PageListChanged();
 
 // delete all Masterpages
-nAnz=GetMasterPageCount();
-for(i=nAnz-1; i>=0; i--)
+nCount=GetMasterPageCount();
+for(i=nCount-1; i>=0; i--)
 {
 DeleteMasterPage( (sal_uInt16)i );
 }
@@ -835,13 +835,13 @@ void SdrModel::ImpReformatAllTextObjects()
 if( isLocked() )
 return;
 
-sal_uInt16 nAnz=GetMasterPageCount();
+sal_uInt16 nCount=GetMasterPageCount();
 sal_uInt16 nNum;
-for (nNum=0; nNumReformatAllTextObjects();
 }
-nAnz=GetPageCount();
-for (nNum=0; nNumReformatAllTextObjects();
 }
 }
@@ -855,14 +855,14 @@ void SdrModel::ImpReformatAllEdgeObjects()
 if( isLocked() )
 return;
 
-sal_uInt16 nAnz=GetMasterPageCount();
+sal_uInt16 nCount=GetMasterPageCount();
 sal_uInt16 nNum;
-for (nNum=0; nNumReformatAllEdgeObjects();
 }
-nAnz=GetPageCount();
-for (nNum=0; nNumReformatAllEdgeObjects();
 }
@@ -910,13 +910,13 @@ SdrModel::GetDocumentStream( OUString const& rURL,
 // convert template attributes from the string into "hard" attributes
 void SdrModel::BurnInStyleSheetAttributes()
 {
-sal_uInt16 nAnz=GetMasterPageCount();
+sal_uInt16 nCount=GetMasterPageCount();
 sal_uInt16 nNum;
-for (nNum=0; nNumBurnInStyleSheetAttributes();
 }
-nAnz=GetPageCount();
-for (nNum=0; nNumBurnInStyleSheetAttributes();
 }
 }
@@ -1252,9 +1252,9 @@ void SdrModel::TakeMetricStr(long nVal, OUString& rStr, 
bool bNoUnitChars, sal_I
 if(nKomma < 0)
 {
 // negative nKomma (decimal point) means: add zeros
-sal_Int32 nAnz(-nKomma);
+sal_Int32 nCount(-nKomma);
 
-for(sal_Int32 i=0; i 0 && aBuf.getLength() <= nKomma)
 {
 // if necessary, add zeros before the decimal point
-sal_Int32 nAnz = nKomma - aBuf.getLength();
+sal_Int32 nCount = nKomma - aBuf.getLength();
 
-if(nAnz >= 0 && LocaleDataWrapper::isNumLeadingZero())
-nAnz++;
+if(nCount >= 0 && LocaleDataWrapper::isNumLeadingZero())
+nCount++;
 
-for(sal_Int32 i=0; iSetPageNum(i);
 }
@@ -1402,9 +1402,9 @@ void SdrModel::RecalcPageNums(bool bMaster)
 }
 else
 {
-sal_uInt16 nAnz=sal_uInt16(maPages.size());
+sal_uInt16 nCount=sal_uInt16(maPages.size());
 sal_uInt16 i;
-for (i=0; iSetPageNum(i);
 }
@@ -1414,14 +1414,14 @@ void SdrModel::RecalcPageNums(bool bMaster)
 
 void SdrModel::InsertPage(SdrPage* pPage, sal_uInt16 nPos)
 {
-sal_uInt16 nAnz=GetPageCount();
-if (nPos>nAnz) nPos=nAnz;
+sal_uInt16 nCount=GetPageCount();
+if (nPos>nCount) nPos=nCount;
 maPages.insert(maPages.begin()+nPos,pPage);
 PageListChanged();
 pPage->SetInserted(true);
 pPage->SetPageNum(nPos);
 pPage->SetModel(this);
-if (nPosnAnz) nPos=nAnz;
+sal_uInt16 nCount=GetMasterPageCount();
+if (nPos>nCount) nPos=nCount;
 maMaPag.insert(maMaPag.begin()+nPos,pPage);
 MasterPageListChanged();
 pPage->SetInserted(true);
 pPage->SetPageNum(nPos);
 pPage->SetModel(this);
-if (nPosGetObjCount();
-for (size_t i=0; iGetObjCount();
+for (size_t i=0; iGetObj(i);
 SdrObjTransformInfoRec aInfo;
 pObj->TakeObjInfo(aInfo);
@@ -115,7 +115,7 @@ void SdrObjGroup::TakeObjInfo(SdrObjTransformInfoRec& 
rInfo) const
 if (!aInfo.bCanCon

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sw/qa sw/source

2015-05-01 Thread Michael Stahl

 sw/qa/core/macros-test.cxx|   31 +++
 sw/source/core/undo/undel.cxx |6 +-
 2 files changed, 36 insertions(+), 1 deletion(-)

New commits:
commit d70174ef1bc5894fe3cd46d4bda1dfd5f6422d39
Author: Michael Stahl 
Date:   Thu Apr 30 23:14:02 2015 +0200

tdf#90816: sw: fix bookmark loss in SwUndoDelete

_DelBookmarks() will actually delete marks that exactly match both start
and end position of the range, so restrict the call to only the
fully-deleted nodes that will be moved to the Undo-array.

(regression from 370febbf19a5f362394d1c9e69b12dcb218f6501)

(cherry picked from commit c7fb1d8334d2289906ac2a0a8c32946493d10e00)

Conflicts:
sw/qa/core/macros-test.cxx

Change-Id: Icf5097774aa55ee152a1e20c0c7264330955c615
Reviewed-on: https://gerrit.libreoffice.org/15581
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/sw/qa/core/macros-test.cxx b/sw/qa/core/macros-test.cxx
index 3101de7..1f33c91 100644
--- a/sw/qa/core/macros-test.cxx
+++ b/sw/qa/core/macros-test.cxx
@@ -69,6 +69,7 @@ public:
 void testVba();
 #endif
 void testBookmarkDeleteAndJoin();
+void testBookmarkDeleteTdf90816();
 void testFdo55289();
 void testFdo68983();
 CPPUNIT_TEST_SUITE(SwMacrosTest);
@@ -79,6 +80,7 @@ public:
 CPPUNIT_TEST(testVba);
 #endif
 CPPUNIT_TEST(testBookmarkDeleteAndJoin);
+CPPUNIT_TEST(testBookmarkDeleteTdf90816);
 CPPUNIT_TEST(testFdo55289);
 CPPUNIT_TEST(testFdo68983);
 
@@ -204,6 +206,35 @@ void SwMacrosTest::testBookmarkDeleteAndJoin()
 }
 }
 
+void SwMacrosTest::testBookmarkDeleteTdf90816()
+{
+SwDoc *const pDoc = new SwDoc;
+pDoc->GetIDocumentUndoRedo().DoUndo(true); // bug is in SwUndoDelete
+SwNodeIndex aIdx(pDoc->GetNodes().GetEndOfContent(), -1);
+SwPaM aPaM(aIdx);
+
+IDocumentContentOperations & rIDCO(pDoc->getIDocumentContentOperations());
+rIDCO.AppendTxtNode(*aPaM.GetPoint());
+rIDCO.InsertString(aPaM, OUString("ABC"));
+aPaM.Move(fnMoveBackward, fnGoCntnt);
+aPaM.SetMark();
+aPaM.Move(fnMoveBackward, fnGoCntnt);
+IDocumentMarkAccess & rIDMA = *pDoc->getIDocumentMarkAccess();
+sw::mark::IMark *pMark =
+rIDMA.makeMark(aPaM, "test", IDocumentMarkAccess::MarkType::BOOKMARK);
+CPPUNIT_ASSERT(pMark);
+
+// delete the same selection as the bookmark
+rIDCO.DeleteAndJoin(aPaM, false);
+
+// bookmark still there?
+auto iter = rIDMA.getAllMarksBegin();
+CPPUNIT_ASSERT_MESSAGE("the bookmark was deleted",
+iter != rIDMA.getAllMarksEnd());
+CPPUNIT_ASSERT(*aPaM.Start() == (*iter)->GetMarkPos());
+CPPUNIT_ASSERT(*aPaM.End() == (*iter)->GetOtherMarkPos());
+}
+
 void SwMacrosTest::testFdo55289()
 {
 SwDoc *const pDoc = new SwDoc;
diff --git a/sw/source/core/undo/undel.cxx b/sw/source/core/undo/undel.cxx
index 253ef99..0c5c1f1 100644
--- a/sw/source/core/undo/undel.cxx
+++ b/sw/source/core/undo/undel.cxx
@@ -156,7 +156,11 @@ SwUndoDelete::SwUndoDelete(
 {
 DelCntntIndex( *rPam.GetMark(), *rPam.GetPoint() );
 ::sw::UndoGuard const undoGuard(pDoc->GetIDocumentUndoRedo());
-_DelBookmarks(pStt->nNode, pEnd->nNode, nullptr, &pStt->nContent, 
&pEnd->nContent);
+if (nEndNode - nSttNode > 1) // check for fully selected nodes
+{
+SwNodeIndex const start(pStt->nNode, +1);
+_DelBookmarks(start, pEnd->nNode);
+}
 }
 
 nSetPos = pHistory ? pHistory->Count() : 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: License statement Linus Behrens

2015-05-01 Thread Thorsten Behrens

Isabell Behrens wrote:
> All of my son Linus Leonard Behrens' past & future contributions to
> LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license,
> until further notice.
> 
> Isabell Behrens-Wimber 
> 
Consent of both parents required, which is hereby explicitely granted
for the license statement above.

-- Thorsten Behrens


signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[GSoC] Introduction - Mihály Palenik

2015-05-01 Thread Mihály Palenik

Hello,

My name is Mihály. I am studying at Eötvös Lóránd Science University
faculty of Computer Science MSc at Budapest.
This year my project is 'Rework the Expert Configuration dialog'
https://wiki.documentfoundation.org/Development/Gsoc/Ideas#Rework_the_Expert_Configuration_dialog
.
My mentor is Caolán McNamara.

Best regards,
Mihály Palenik
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - postprocess/packcomponents postprocess/prj scp2/source

2015-05-01 Thread Andrea Pescetti

 postprocess/packcomponents/makefile.mk |1 -
 postprocess/prj/build.lst  |2 +-
 scp2/source/writer/file_writer.scp |2 --
 scp2/source/writer/module_writer.scp   |1 -
 4 files changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 5188493226e3ef3a8aa26dbfa9790595c6a26553
Author: Andrea Pescetti 
Date:   Fri May 1 17:20:22 2015 +

#i126281# Do not build/ship hwpfilter.

diff --git a/postprocess/packcomponents/makefile.mk 
b/postprocess/packcomponents/makefile.mk
index 4ef5f14..37657c3 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -121,7 +121,6 @@ my_components = \
 fps_office \
 frm \
 guesslang \
-hwp \
 i18npool \
 i18nsearch \
 lng \
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index ce2a2f5..62aa24e 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,4 +1,4 @@
-po  postprocess ::  svgio accessibility automation basctl bean 
chart2 configmgr CRASHREP:crashrep COINMP:coinmp cui dbaccess desktop dtrans 
embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter 
forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 
lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin 
psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native 
slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge 
xmlsecurity MORE_FONTS:more_fonts OOo:pyuno OOo:readlicense_oo SO:top 
unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign 
sdext SWEXT:swext smoketestdoc uui writerfilter winaccessibility oox 
MYSQLC:mysqlc LIBXSLT:libxslt NULL
+po  postprocess ::  svgio accessibility automation basctl bean 
chart2 configmgr CRASHREP:crashrep COINMP:coinmp cui dbaccess desktop dtrans 
embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter 
forms fpicker helpcontent2 io JAVAINSTALLER2:javainstaller2 lingucomponent 
MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config 
remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow 
starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge 
xmlsecurity MORE_FONTS:more_fonts OOo:pyuno OOo:readlicense_oo SO:top 
unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign 
sdext SWEXT:swext smoketestdoc uui writerfilter winaccessibility oox 
MYSQLC:mysqlc LIBXSLT:libxslt NULL
 po postprocess usr1-   all 
po_mkout NULL
 po postprocess\checkxmlnmake   -   all po_checkxml NULL
 po postprocess\checkdelivernmake   -   all po_checkdlv NULL
diff --git a/scp2/source/writer/file_writer.scp 
b/scp2/source/writer/file_writer.scp
index 2dd953bb1..be0d386 100644
--- a/scp2/source/writer/file_writer.scp
+++ b/scp2/source/writer/file_writer.scp
@@ -25,8 +25,6 @@
 
 STD_LIB_FILE( gid_File_Lib_Swd , swd)
 
-SPECIAL_LIB_FILE(gid_File_Lib_Hwpreader, hwp)
-
 File gid_File_Exe_Swriter
 BIN_FILE_BODY;
 Dir = gid_Brand_Dir_Program;
diff --git a/scp2/source/writer/module_writer.scp 
b/scp2/source/writer/module_writer.scp
index 828dd92..9f246da 100644
--- a/scp2/source/writer/module_writer.scp
+++ b/scp2/source/writer/module_writer.scp
@@ -40,7 +40,6 @@ Module gid_Module_Prg_Wrt_Bin
 Styles = (HIDDEN_ROOT);
 Files = 
(gid_File_Bin_Cde_Sagenda,gid_File_Bin_Cde_Sfax,gid_File_Bin_Cde_Slabel,
 gid_File_Bin_Cde_Sletter,gid_File_Bin_Cde_Smemo,gid_File_Bin_Cde_Svcard,
-gid_File_Lib_Hwpreader,
 gid_File_Lib_Swd,
 gid_File_Lib_Swui,
 gid_File_Lib_Msword,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: download.lst external/liborcus RepositoryExternal.mk sc/source

2015-05-01 Thread Markus Mohrhard

 RepositoryExternal.mk |4 
 download.lst  |2 
 external/liborcus/UnpackedTarball_liborcus.mk |   13 -
 external/liborcus/liborcus-boost-msvc.patch.1 |   14 +
 external/liborcus/liborcus-fix-win-build.patch.1  |  265 ++
 external/liborcus/liborcus-mdds-configure.patch.1 |   70 +
 external/liborcus/liborcus_0.1.0-dllimport.patch  |   24 -
 external/liborcus/visibility.patch|   11 
 sc/source/filter/html/htmlpars.cxx|   30 ++
 sc/source/filter/inc/orcusinterface.hxx   |   10 
 sc/source/filter/orcus/interface.cxx  |   48 +++
 11 files changed, 438 insertions(+), 53 deletions(-)

New commits:
commit a1280bd47fddd668f1ff224f18639c8d595ec6f7
Author: Markus Mohrhard 
Date:   Tue Apr 21 01:14:21 2015 +0200

update to liborcus 0.9.0

Includes a lot of help from Norbert for finding the boost MSVC problem.

Change-Id: I5184bc40e2c3861883b8587784117b1c4558fa5f
Reviewed-on: https://gerrit.libreoffice.org/15453
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index b6324cf..f8da89f 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3188,7 +3188,7 @@ $(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
 )
 $(call gb_LinkTarget_add_libs,$(1),\
-   $(call 
gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs/liborcus-0.8$(gb_StaticLibrary_PLAINEXT)
 \
+   $(call 
gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs/liborcus-0.10$(gb_StaticLibrary_PLAINEXT)
 \
 )
 
 $(if $(SYSTEM_BOOST), \
@@ -3205,7 +3205,7 @@ $(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
 )
 $(call gb_LinkTarget_add_libs,$(1),\
-   $(call 
gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs/liborcus-parser-0.8$(gb_StaticLibrary_PLAINEXT)
 \
+   $(call 
gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs/liborcus-parser-0.10$(gb_StaticLibrary_PLAINEXT)
 \
 )
 
 endef
diff --git a/download.lst b/download.lst
index 7c0b781..db42e21 100644
--- a/download.lst
+++ b/download.lst
@@ -117,7 +117,7 @@ export OPENCOLLADA_TARBALL := 
OpenCOLLADA-master-6509aa13af.tar.bz2
 export OPENLDAP_TARBALL := 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz
 export OPENSSL_MD5SUM := a06c547dac9044161a477211049f60ef
 export OPENSSL_TARBALL := openssl-1.0.2a.tar.gz
-export ORCUS_TARBALL := 7681383be6ce489d84c1c74f4e7f9643-liborcus-0.7.0.tar.bz2
+export ORCUS_TARBALL := 3f64f27b9fd59e55ca4c5ba95cd32da0-liborcus-0.9.0.tar.xz
 export PAGEMAKER_MD5SUM := 795cc7a59ace4db2b12586971d668671
 export PAGEMAKER_TARBALL := libpagemaker-0.0.2.tar.bz2
 export PIXMAN_TARBALL := c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2
diff --git a/external/liborcus/UnpackedTarball_liborcus.mk 
b/external/liborcus/UnpackedTarball_liborcus.mk
index 126f250..5372911 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -18,18 +18,11 @@ liborcus_patches :=
 # make config.sub recognize arm-linux-androideabi
 # liborcus_patches += liborcus_0.1.0-configure.patch
 
-# don't use dllimport
-liborcus_patches += liborcus_0.1.0-dllimport.patch
+liborcus_patches += liborcus-mdds-configure.patch.1
 
-# Any -fvisibility= etc. settings are passed into liborcus' CXXFLAGS via
-# gb_VISIBILITY_FLAGS[_CXX]:
-liborcus_patches += visibility.patch
+liborcus_patches += liborcus-boost-msvc.patch.1
 
-# :
-
-liborcus_patches += liborcus_0.7.0-configure.gcc5.patch.0
+liborcus_patches += liborcus-fix-win-build.patch.1
 
 $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
$(foreach patch,$(liborcus_patches),external/liborcus/$(patch)) \
diff --git a/external/liborcus/liborcus-boost-msvc.patch.1 
b/external/liborcus/liborcus-boost-msvc.patch.1
new file mode 100644
index 000..c25bbf7
--- /dev/null
+++ b/external/liborcus/liborcus-boost-msvc.patch.1
@@ -0,0 +1,14 @@
+Only in liborcus: build.log
+Only in liborcus: config.log
+diff -ur liborcus.org/configure liborcus/configure
+--- liborcus.org/configure 2015-04-25 20:24:21.650666000 -0500
 liborcus/configure 2015-04-25 20:25:44.689795700 -0500
+@@ -17021,6 +17021,7 @@
+   grep -v '#' |
+   tr -d '\r' |
+   tr -s '\n' ' ' |
++  $SED "s/^conftest.$ac_ext //" |
+   $SED -n -e "/^boost-lib-version = /{s///;s/[\" ]//g;p;q;}" >conftest.i 
2>&1; then :
+   boost_cv_lib_version=`cat conftest.i`
+ fi
+Only in liborcus: vc120.pdb
diff --git a/external/liborcus/liborcus-fix-win-build.patch.1 
b/external/liborcus/liborcus-fix-win-build.patch.1
new file mode 100644
index 000..629ff82
--- /dev/null
+++ b/external/liborcus/liborcus-fix-win-build.patch.1
@@ -0,0 +1,265 @@
+Only in liborcus: build.log
+Only in liborcus: config.h
+Only in liborcus

Re: License statement Linus Behrens

2015-05-01 Thread Norbert Thiebaud

On Fri, May 1, 2015 at 12:03 PM, Thorsten Behrens
 wrote:
> Isabell Behrens wrote:
>> All of my son Linus Leonard Behrens' past & future contributions to
>> LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license,
>> until further notice.
>>
>> Isabell Behrens-Wimber
>>
> Consent of both parents required, which is hereby explicitely granted
> for the license statement above.
>

Added to 
https://wiki.documentfoundation.org/WikiAction/submit/Development/Developers

Glückwunsch, Linus :-)
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2015-05-01 Thread Caolán McNamara

 uui/source/iahndl-errorhandler.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit c6b5535f1c957f134d67952145b539e262f4ca0d
Author: CaolÃ¡n McNamara 
Date:   Fri May 1 20:55:09 2015 +0100

VclPtr: error dialogs never deleted

Change-Id: I43ef768c4c0a29599fd95f5653769bf1583a3d97

diff --git a/uui/source/iahndl-errorhandler.cxx 
b/uui/source/iahndl-errorhandler.cxx
index 3b12c7b..31dfe1e 100644
--- a/uui/source/iahndl-errorhandler.cxx
+++ b/uui/source/iahndl-errorhandler.cxx
@@ -101,6 +101,9 @@ executeErrorDialog(
 }
 
 sal_uInt16 aResult = xBox->Execute();
+
+xBox.disposeAndClear();
+
 switch( aResult )
 {
 case RET_OK:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 51/88493226e3ef3a8aa26dbfa9790595c6a26553

2015-05-01 Thread Caolán McNamara

 51/88493226e3ef3a8aa26dbfa9790595c6a26553 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 337b061e1114e586775a4c092981c3a207595619
Author: CaolÃ¡n McNamara 
Date:   Fri May 1 20:57:07 2015 +0100

Notes added by 'git notes add'

diff --git a/51/88493226e3ef3a8aa26dbfa9790595c6a26553 
b/51/88493226e3ef3a8aa26dbfa9790595c6a26553
new file mode 100644
index 000..7239d27
--- /dev/null
+++ b/51/88493226e3ef3a8aa26dbfa9790595c6a26553
@@ -0,0 +1 @@
+prefer: f974db5d89eacf0c23e303c22c62972014e9db16
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: download.lst external/liborcus RepositoryExternal.mk sc/source

2015-05-01 Thread Markus Mohrhard

 RepositoryExternal.mk |4 
 download.lst  |2 
 external/liborcus/UnpackedTarball_liborcus.mk |   13 -
 external/liborcus/liborcus-boost-msvc.patch.1 |   14 -
 external/liborcus/liborcus-fix-win-build.patch.1  |  265 --
 external/liborcus/liborcus-mdds-configure.patch.1 |   70 -
 external/liborcus/liborcus_0.1.0-dllimport.patch  |   24 +
 external/liborcus/visibility.patch|   11 
 sc/source/filter/html/htmlpars.cxx|   30 --
 sc/source/filter/inc/orcusinterface.hxx   |   10 
 sc/source/filter/orcus/interface.cxx  |   48 ---
 11 files changed, 53 insertions(+), 438 deletions(-)

New commits:
commit 861a86dfca00bc42b57d70621605d5831e6305a5
Author: Markus Mohrhard 
Date:   Fri May 1 20:09:28 2015 +

Revert "update to liborcus 0.9.0"

This reverts commit a1280bd47fddd668f1ff224f18639c8d595ec6f7.

Change-Id: I2ad873f012ebae6858c8895c14ed695dbd881fc4
Reviewed-on: https://gerrit.libreoffice.org/15586
Tested-by: Markus Mohrhard 
Reviewed-by: Markus Mohrhard 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index f8da89f..b6324cf 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3188,7 +3188,7 @@ $(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
 )
 $(call gb_LinkTarget_add_libs,$(1),\
-   $(call 
gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs/liborcus-0.10$(gb_StaticLibrary_PLAINEXT)
 \
+   $(call 
gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs/liborcus-0.8$(gb_StaticLibrary_PLAINEXT)
 \
 )
 
 $(if $(SYSTEM_BOOST), \
@@ -3205,7 +3205,7 @@ $(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
 )
 $(call gb_LinkTarget_add_libs,$(1),\
-   $(call 
gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs/liborcus-parser-0.10$(gb_StaticLibrary_PLAINEXT)
 \
+   $(call 
gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs/liborcus-parser-0.8$(gb_StaticLibrary_PLAINEXT)
 \
 )
 
 endef
diff --git a/download.lst b/download.lst
index db42e21..7c0b781 100644
--- a/download.lst
+++ b/download.lst
@@ -117,7 +117,7 @@ export OPENCOLLADA_TARBALL := 
OpenCOLLADA-master-6509aa13af.tar.bz2
 export OPENLDAP_TARBALL := 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz
 export OPENSSL_MD5SUM := a06c547dac9044161a477211049f60ef
 export OPENSSL_TARBALL := openssl-1.0.2a.tar.gz
-export ORCUS_TARBALL := 3f64f27b9fd59e55ca4c5ba95cd32da0-liborcus-0.9.0.tar.xz
+export ORCUS_TARBALL := 7681383be6ce489d84c1c74f4e7f9643-liborcus-0.7.0.tar.bz2
 export PAGEMAKER_MD5SUM := 795cc7a59ace4db2b12586971d668671
 export PAGEMAKER_TARBALL := libpagemaker-0.0.2.tar.bz2
 export PIXMAN_TARBALL := c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2
diff --git a/external/liborcus/UnpackedTarball_liborcus.mk 
b/external/liborcus/UnpackedTarball_liborcus.mk
index 5372911..126f250 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -18,11 +18,18 @@ liborcus_patches :=
 # make config.sub recognize arm-linux-androideabi
 # liborcus_patches += liborcus_0.1.0-configure.patch
 
-liborcus_patches += liborcus-mdds-configure.patch.1
+# don't use dllimport
+liborcus_patches += liborcus_0.1.0-dllimport.patch
 
-liborcus_patches += liborcus-boost-msvc.patch.1
+# Any -fvisibility= etc. settings are passed into liborcus' CXXFLAGS via
+# gb_VISIBILITY_FLAGS[_CXX]:
+liborcus_patches += visibility.patch
 
-liborcus_patches += liborcus-fix-win-build.patch.1
+# :
+
+liborcus_patches += liborcus_0.7.0-configure.gcc5.patch.0
 
 $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
$(foreach patch,$(liborcus_patches),external/liborcus/$(patch)) \
diff --git a/external/liborcus/liborcus-boost-msvc.patch.1 
b/external/liborcus/liborcus-boost-msvc.patch.1
deleted file mode 100644
index c25bbf7..000
--- a/external/liborcus/liborcus-boost-msvc.patch.1
+++ /dev/null
@@ -1,14 +0,0 @@
-Only in liborcus: build.log
-Only in liborcus: config.log
-diff -ur liborcus.org/configure liborcus/configure
 liborcus.org/configure 2015-04-25 20:24:21.650666000 -0500
-+++ liborcus/configure 2015-04-25 20:25:44.689795700 -0500
-@@ -17021,6 +17021,7 @@
-   grep -v '#' |
-   tr -d '\r' |
-   tr -s '\n' ' ' |
-+  $SED "s/^conftest.$ac_ext //" |
-   $SED -n -e "/^boost-lib-version = /{s///;s/[\" ]//g;p;q;}" >conftest.i 
2>&1; then :
-   boost_cv_lib_version=`cat conftest.i`
- fi
-Only in liborcus: vc120.pdb
diff --git a/external/liborcus/liborcus-fix-win-build.patch.1 
b/external/liborcus/liborcus-fix-win-build.patch.1
deleted file mode 100644
index 629ff82..000
--- a/external/liborcus/liborcus-fix-win-build.patch.1
+++ /dev/null
@@ -1,265 +0,0 @@
-Only in liborcus: build.log
-Only in liborcus: config.h
-Only in li

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.4' - 17 commits - basic/source connectivity/source cui/source formula/source include/unotools officecfg/registry readlicense_oo/license Re

2015-05-01 Thread Michael Stahl

 RepositoryExternal.mk   |1 
 basic/source/comp/exprnode.cxx  |8 
 connectivity/source/drivers/calc/CConnection.cxx|   10 
 connectivity/source/inc/calc/CConnection.hxx|   10 
 cui/source/dialogs/about.cxx|9 
 formula/source/ui/dlg/FormulaHelper.cxx |2 
 include/unotools/closeveto.hxx  |3 
 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |6 
 readlicense_oo/license/CREDITS.fodt | 2163 
--
 scp2/source/ooo/file_ooo.scp|1 
 scp2/source/ooo/module_lang_template.scp|1 
 sd/source/ui/func/fudraw.cxx|7 
 sd/source/ui/remotecontrol/BluetoothServer.cxx  |2 
 sfx2/source/doc/docfile.cxx |   20 
 sw/qa/core/data/ooxml/pass/fill.docx|binary
 sw/qa/core/macros-test.cxx  |   31 
 sw/qa/extras/ooxmlexport/data/duplicate-east-asia.odt   |binary
 sw/qa/extras/ooxmlexport/ooxmlexport5.cxx   |   12 
 sw/source/core/undo/undel.cxx   |6 
 sw/source/core/unocore/swunohelper.cxx  |7 
 sw/source/filter/ww8/wrtw8esh.cxx   |   38 
 sw/source/filter/ww8/wrtww8.hxx |2 
 unotest/Library_unobootstrapprotector.mk|5 
 unotools/source/misc/closeveto.cxx  |   17 
 vcl/quartz/ctfonts.cxx  |2 
 writerfilter/source/ooxml/model.xml |6 
 26 files changed, 1238 insertions(+), 1131 deletions(-)

New commits:
commit b09a3d9b6ac17226744d7a09adb1cd0d5aa6e0ca
Author: Michael Stahl 
Date:   Thu Apr 30 23:14:02 2015 +0200

tdf#90816: sw: fix bookmark loss in SwUndoDelete

_DelBookmarks() will actually delete marks that exactly match both start
and end position of the range, so restrict the call to only the
fully-deleted nodes that will be moved to the Undo-array.

(regression from 370febbf19a5f362394d1c9e69b12dcb218f6501)

(cherry picked from commit c7fb1d8334d2289906ac2a0a8c32946493d10e00)

Conflicts:
sw/qa/core/macros-test.cxx

Change-Id: Icf5097774aa55ee152a1e20c0c7264330955c615
Reviewed-on: https://gerrit.libreoffice.org/15581
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/sw/qa/core/macros-test.cxx b/sw/qa/core/macros-test.cxx
index 3101de7..1f33c91 100644
--- a/sw/qa/core/macros-test.cxx
+++ b/sw/qa/core/macros-test.cxx
@@ -69,6 +69,7 @@ public:
 void testVba();
 #endif
 void testBookmarkDeleteAndJoin();
+void testBookmarkDeleteTdf90816();
 void testFdo55289();
 void testFdo68983();
 CPPUNIT_TEST_SUITE(SwMacrosTest);
@@ -79,6 +80,7 @@ public:
 CPPUNIT_TEST(testVba);
 #endif
 CPPUNIT_TEST(testBookmarkDeleteAndJoin);
+CPPUNIT_TEST(testBookmarkDeleteTdf90816);
 CPPUNIT_TEST(testFdo55289);
 CPPUNIT_TEST(testFdo68983);
 
@@ -204,6 +206,35 @@ void SwMacrosTest::testBookmarkDeleteAndJoin()
 }
 }
 
+void SwMacrosTest::testBookmarkDeleteTdf90816()
+{
+SwDoc *const pDoc = new SwDoc;
+pDoc->GetIDocumentUndoRedo().DoUndo(true); // bug is in SwUndoDelete
+SwNodeIndex aIdx(pDoc->GetNodes().GetEndOfContent(), -1);
+SwPaM aPaM(aIdx);
+
+IDocumentContentOperations & rIDCO(pDoc->getIDocumentContentOperations());
+rIDCO.AppendTxtNode(*aPaM.GetPoint());
+rIDCO.InsertString(aPaM, OUString("ABC"));
+aPaM.Move(fnMoveBackward, fnGoCntnt);
+aPaM.SetMark();
+aPaM.Move(fnMoveBackward, fnGoCntnt);
+IDocumentMarkAccess & rIDMA = *pDoc->getIDocumentMarkAccess();
+sw::mark::IMark *pMark =
+rIDMA.makeMark(aPaM, "test", IDocumentMarkAccess::MarkType::BOOKMARK);
+CPPUNIT_ASSERT(pMark);
+
+// delete the same selection as the bookmark
+rIDCO.DeleteAndJoin(aPaM, false);
+
+// bookmark still there?
+auto iter = rIDMA.getAllMarksBegin();
+CPPUNIT_ASSERT_MESSAGE("the bookmark was deleted",
+iter != rIDMA.getAllMarksEnd());
+CPPUNIT_ASSERT(*aPaM.Start() == (*iter)->GetMarkPos());
+CPPUNIT_ASSERT(*aPaM.End() == (*iter)->GetOtherMarkPos());
+}
+
 void SwMacrosTest::testFdo55289()
 {
 SwDoc *const pDoc = new SwDoc;
diff --git a/sw/source/core/undo/undel.cxx b/sw/source/core/undo/undel.cxx
index 253ef99..0c5c1f1 100644
--- a/sw/source/core/undo/undel.cxx
+++ b/sw/source/core/undo/undel.cxx
@@ -156,7 +156,11 @@ SwUndoDelete::SwUndoDelete(
 {
 DelCntntInd

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.3' - 3 commits - swext/mediawiki vcl/unx

2015-05-01 Thread Caolán McNamara

 swext/mediawiki/src/filter/odt2mediawiki.xsl  |   67 ++
 vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx  |2 
 vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx |7 ++
 3 files changed, 65 insertions(+), 11 deletions(-)

New commits:
commit a0b8f9ec6df0a82c4fc45709952c39fd3990177b
Author: CaolÃ¡n McNamara 
Date:   Fri Apr 24 11:01:50 2015 +0100

Resolves: tdf#73211 gtk checkboxes need erase afer toggling

because an unchecked checkbox can have a smaller paint area
than a checked checkbox. This has always bugged me

(cherry picked from commit d194074aa34e3724dd9b93fbc81bf2ba793cd37a)

Conflicts:
vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx

Change-Id: Iac0f075089611b47c381863a9655445d732bfddc
Reviewed-on: https://gerrit.libreoffice.org/15510
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx 
b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index b1e7e23..226ea69 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -441,6 +441,8 @@ void GtkData::initNWF( void )
 pSVData->maNWFData.mnMenuFormatBorderX = xthickness + horizontal_padding;
 pSVData->maNWFData.mnMenuFormatBorderY = ythickness + vertical_padding;
 
+pSVData->maNWFData.mbCheckBoxNeedsErase = true;
+
 if( SalGetDesktopEnvironment() == "KDE" )
 {
 // #i97196# ensure a widget exists and the style engine was loaded
diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx 
b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index 2a1f4e7..ed4c2d0 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -1470,7 +1470,12 @@ bool GtkSalGraphics::IsNativeControlSupported( 
ControlType nType, ControlPart nP
 return false;
 }
 
-void GtkData::initNWF() {}
+void GtkData::initNWF()
+{
+ImplSVData* pSVData = ImplGetSVData();
+pSVData->maNWFData.mbCheckBoxNeedsErase = true;
+}
+
 void GtkData::deInitNWF() {}
 
 void GtkSalGraphics::getStyleContext(GtkStyleContext** style, GtkWidget* 
widget)
commit 12eaf026c3a42de8b03749947485d9851b0d9a6f
Author: Robert Antoni Buj Gelonch 
Date:   Fri Apr 24 12:29:54 2015 +0200

tdf#75019 bookmarks in exporting to mediawiki

Change-Id: Ieb066d37196a22e67226d59e12c7869c1fc8cc8a
Reviewed-on: https://gerrit.libreoffice.org/15509
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/swext/mediawiki/src/filter/odt2mediawiki.xsl 
b/swext/mediawiki/src/filter/odt2mediawiki.xsl
index 7d03510..7198a1f 100644
--- a/swext/mediawiki/src/filter/odt2mediawiki.xsl
+++ b/swext/mediawiki/src/filter/odt2mediawiki.xsl
@@ -516,12 +516,37 @@



-   
-   [
-   
-
-   
-   ]
+   
+   
+   [[
+   
+   
+   
+   
+   
+   
+   
+   
+   |
+   
+   
+   
+   
+   
+   
+   
+   
+   ]]
+   
+
+
+   [
+   
+
+   
+   ]
+   
+   



@@ -894,6 +919,25 @@


 
+   
+   
+   
+   
+   
+   
+   
+   
+

[Bug 34555] Make cropping handles for images (as in Draw/Impress) available for all LibreOffice applications

2015-05-01 Thread bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=34555

--- Comment #59 from elsupre...@hotmail.com ---
I propose a crop mode add-on to include crop handles to crop the image using a
crop rectanglelike Microsoft Office. 

As you can see in my link
(https://bugs.documentfoundation.org/attachment.cgi?id=115146&action=edit), now
when you move crop handles on a picture the full picture is shown with the
portions outside of the crop area grayed out until dragged into new crop
position.

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

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

2015-05-01 Thread Radu Ioan

 include/unotools/docinfohelper.hxx  |3 +
 oox/source/core/xmlfilterbase.cxx   |5 +-
 sw/qa/extras/ooxmlexport/data/tdf89790.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport5.cxx   |7 +++
 unotools/source/config/docinfohelper.cxx|   50 ++--
 5 files changed, 45 insertions(+), 20 deletions(-)

New commits:
commit 480ca7434a330b2678f9ef287cffd6d9cf27bed5
Author: Radu Ioan 
Date:   Sat Apr 4 19:03:35 2015 +0300

tdf#89790 -  DOCX: saving LO version number in correct tag in app.xml

Converted existing method that provides application name and version in two 
functions

Change-Id: I93b70da7c78ee5db3d6eb710a2a2a9f4b7b4fb86
Reviewed-on: https://gerrit.libreoffice.org/15151
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/include/unotools/docinfohelper.hxx 
b/include/unotools/docinfohelper.hxx
index ddc28b0..320b3b5 100644
--- a/include/unotools/docinfohelper.hxx
+++ b/include/unotools/docinfohelper.hxx
@@ -29,7 +29,8 @@ class UNOTOOLS_DLLPUBLIC DocInfoHelper
 {
 public:
 static OUString GetGeneratorString();
-
+static OUString GetApplicationString();
+static OUString GetVersionString();
 };
 
 }   // namespace utl
diff --git a/oox/source/core/xmlfilterbase.cxx 
b/oox/source/core/xmlfilterbase.cxx
index 4ff011a..772142b 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -58,6 +58,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using ::com::sun::star::xml::dom::DocumentBuilder;
 using ::com::sun::star::xml::dom::XDocument;
@@ -692,9 +693,9 @@ writeAppProperties( XmlFilterBase& rSelf, Reference< 
XDocumentProperties > xProp
 writeElement( pAppProps, XML_HyperlinksChanged, "hyperlinks changed" );
 writeElement( pAppProps, XML_DigSig,"digital signature" );
 #endif  /* def OOXTODO */
-writeElement( pAppProps, XML_Application,   
utl::DocInfoHelper::GetGeneratorString() );
+writeElement( pAppProps, XML_Application,   
utl::ConfigManager::getProductName() );
+writeElement( pAppProps, XML_AppVersion,
utl::DocInfoHelper::GetVersionString() );
 #ifdef OOXTODO
-writeElement( pAppProps, XML_AppVersion,"app version" );
 writeElement( pAppProps, XML_DocSecurity,   "doc security" );
 #endif  /* def OOXTODO */
 
diff --git a/sw/qa/extras/ooxmlexport/data/tdf89790.docx 
b/sw/qa/extras/ooxmlexport/data/tdf89790.docx
new file mode 100644
index 000..180951e
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf89790.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
index 6964c90..89a1502 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
@@ -795,6 +795,13 @@ DECLARE_OOXMLEXPORT_TEST(testSectionHeader, 
"sectionprot.odt")
 }
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf89790, "tdf89790.docx")
+{
+if (xmlDocPtr pXmlDoc = parseExport("docProps/app.xml"))
+
+ assertXPath(pXmlDoc, 
"/extended-properties:Properties/extended-properties:AppVersion");
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unotools/source/config/docinfohelper.cxx 
b/unotools/source/config/docinfohelper.cxx
index b5d0cf9..0ea143cf 100644
--- a/unotools/source/config/docinfohelper.cxx
+++ b/unotools/source/config/docinfohelper.cxx
@@ -41,30 +41,45 @@ OUString DocInfoHelper::GetGeneratorString()
 {
 aResult.append( aValue.replace( ' ', '_' ) );
 aResult.append( '/' );
+}
+
+aValue = GetVersionString();
+if ( !aValue.isEmpty() )
+{
+aResult.append( aValue );
+}
+
+return aResult.makeStringAndClear();
+}
+
+
+OUString DocInfoHelper::GetVersionString()
+{
+OUStringBuffer aResult;
 
-aValue = utl::ConfigManager::getProductVersion();
+// version is _$
+OUString aValue( utl::ConfigManager::getProductVersion() );
+if ( !aValue.isEmpty() )
+{
+aResult.append( aValue.replace( ' ', '_' ) );
+
+aValue = utl::ConfigManager::getProductExtension();
 if ( !aValue.isEmpty() )
 {
 aResult.append( aValue.replace( ' ', '_' ) );
-
-aValue = utl::ConfigManager::getProductExtension();
-if ( !aValue.isEmpty() )
-{
-aResult.append( aValue.replace( ' ', '_' ) );
-}
 }
-
-OUString os( "$_OS" );
-OUString arch( "$_ARCH" );
-::rtl::Bootstrap::expandMacros(os);
-::rtl::Bootstrap::expandMacros(arch);
-aResult.append( '$' );
-aResult.append( os );
-aResult.append( '_' );
-aResult.append( arch );
-aResult.append( ' ' );
 }
 
+OUString os( "$_OS" );
+OUString arch( "$_ARCH" );
+::rtl::Bootstrap::expandMacros(os);
+::rtl::Bootstrap::expandMacros(arch);
+aResult.append( '$' );
+aR

[Libreoffice-commits] core.git: 4 commits - cui/source dbaccess/source forms/source reportdesign/source sc/source starmath/source svtools/source sw/source

2015-05-01 Thread Michael Meeks

 cui/source/dialogs/hangulhanjadlg.cxx   |   15 ++-
 cui/source/inc/hangulhanjadlg.hxx   |1 
 dbaccess/source/ui/control/FieldDescControl.cxx |1 
 dbaccess/source/ui/querydesign/TableWindowTitle.cxx |7 ++-
 dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx  |3 -
 forms/source/richtext/richtextviewport.cxx  |   14 --
 reportdesign/source/ui/report/propbrw.cxx   |3 -
 sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx  |3 -
 sc/source/ui/dbgui/csvcontrol.cxx   |   41 +---
 sc/source/ui/inc/csvcontrol.hxx |7 +--
 sc/source/ui/pagedlg/tphfedit.cxx   |3 +
 sc/source/ui/view/gridwin.cxx   |3 -
 sc/source/ui/view/preview.cxx   |6 +-
 starmath/source/view.cxx|5 +-
 svtools/source/contnr/svimpbox.cxx  |2 
 svtools/source/contnr/treelistbox.cxx   |   12 -
 svtools/source/control/toolbarmenu.cxx  |4 +
 svtools/source/table/tablecontrol.cxx   |4 -
 svtools/source/toolpanel/paneltabbar.cxx|9 ++--
 sw/source/uibase/misc/redlndlg.cxx  |5 --
 20 files changed, 93 insertions(+), 55 deletions(-)

New commits:
commit 393c51cee8bc3de5a2a9f4e04161c59e8712f631
Author: Michael Meeks 
Date:   Fri May 1 16:33:01 2015 +0200

Audit LoseFocus - forms, reportdesign, sc, starmath, svtools.

Change-Id: If7068e59c88e8c3c3bafc70f64899a26d739e331

diff --git a/forms/source/richtext/richtextviewport.cxx 
b/forms/source/richtext/richtextviewport.cxx
index 6862f75..9a206b7 100644
--- a/forms/source/richtext/richtextviewport.cxx
+++ b/forms/source/richtext/richtextviewport.cxx
@@ -48,15 +48,21 @@ namespace frm
 void RichTextViewPort::GetFocus()
 {
 Control::GetFocus();
-m_pView->SetSelectionMode( EE_SELMODE_STD );
-m_pView->ShowCursor( true );
+if (m_pView)
+{
+m_pView->SetSelectionMode( EE_SELMODE_STD );
+m_pView->ShowCursor( true );
+}
 }
 
 
 void RichTextViewPort::LoseFocus()
 {
-m_pView->HideCursor();
-m_pView->SetSelectionMode( m_bHideInactiveSelection ? 
EE_SELMODE_HIDDEN : EE_SELMODE_STD );
+if (m_pView)
+{
+m_pView->HideCursor();
+m_pView->SetSelectionMode( m_bHideInactiveSelection ? 
EE_SELMODE_HIDDEN : EE_SELMODE_STD );
+}
 Control::LoseFocus();
 }
 
diff --git a/reportdesign/source/ui/report/propbrw.cxx 
b/reportdesign/source/ui/report/propbrw.cxx
index 0fb2b0e..9419791 100644
--- a/reportdesign/source/ui/report/propbrw.cxx
+++ b/reportdesign/source/ui/report/propbrw.cxx
@@ -579,7 +579,8 @@ IMPL_LINK( PropBrw, OnAsyncGetFocus, void*,  )
 void PropBrw::LoseFocus()
 {
 DockingWindow::LoseFocus();
-m_pDesignView->getController().InvalidateAll();
+if (m_pDesignView)
+m_pDesignView->getController().InvalidateAll();
 }
 
 }
diff --git a/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx 
b/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx
index 99bb77b..c3927578c 100644
--- a/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx
@@ -144,6 +144,7 @@ void ScPivotLayoutTreeListBase::GetFocus()
 void ScPivotLayoutTreeListBase::LoseFocus()
 {
 SvTreeListBox::LoseFocus();
-mpParent->mpPreviouslyFocusedListBox = this;
+if (mpParent)
+mpParent->mpPreviouslyFocusedListBox = this;
 }
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/pagedlg/tphfedit.cxx 
b/sc/source/ui/pagedlg/tphfedit.cxx
index 69dc943..c087920 100644
--- a/sc/source/ui/pagedlg/tphfedit.cxx
+++ b/sc/source/ui/pagedlg/tphfedit.cxx
@@ -291,6 +291,8 @@ void ScEditWindow::GetFocus()
 }
 else
 pAcc = NULL;
+
+Control::GetFocus();
 }
 
 void ScEditWindow::LoseFocus()
@@ -302,6 +304,7 @@ void ScEditWindow::LoseFocus()
 }
 else
 pAcc = NULL;
+Control::LoseFocus();
 }
 
 ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible 
> ScEditWindow::CreateAccessible()
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 69fd520..8cf05b2 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -286,6 +286,7 @@ void ScFilterListBox::LoseFocus()
 #ifndef UNX
 Hide();
 #endif
+vcl::Window::LoseFocus();
 }
 
 bool ScFilterListBox::PreNotify( NotifyEvent& rNEvt )
@@ -4871,7 +4872,7 @@ void ScGridWindow::LoseFocus()
 {
 ScTabViewShell* pViewShell = pViewData->GetViewShell();
 
-if (pViewShell->HasAccessibilityObjects())
+if (pViewShell && pViewShell->HasAccessibilityObjects())
 pViewShell->BroadcastAccessibility(ScAccGridWinFocusLostHint(eWhich, 
GetAccessible()));
 
 Window::LoseFocus();
diff --git a/sc/source/ui/view/preview.cxx b/sc/sour

LibreOffice Gerrit News for core on 2015-05-02

2015-05-01 Thread gerrit

Moin!

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

 First time contributors doing great things! 
+ tdf#34555 add to scalc: crop, change img, save img, edit with ext tools
  in https://gerrit.libreoffice.org/15589 from Philippe Jung
  about module officecfg, sc
+ tdf#34555 add crop features to svx
  in https://gerrit.libreoffice.org/15588 from Philippe Jung
  about module include, svx
+ tdf#34555 add crop features to sw
  in https://gerrit.libreoffice.org/15590 from Philippe Jung
  about module officecfg, sw
+ tdf#34555 Moving SID_OBJECT_CROP out of sd
  in https://gerrit.libreoffice.org/15587 from Philippe Jung
  about module include, sd, svx
+ tdf#86850 Always display clipboard functions in context menu
  in https://gerrit.libreoffice.org/15546 from Trent MacAlpine
  about module vcl
 End of freshness 

+ seed mt19937 with random data
  in https://gerrit.libreoffice.org/15591 from Norbert Thiebaud
  about module comphelper
+ vcl: simplify code by using std::any_of/std::none_of
  in https://gerrit.libreoffice.org/15585 from Takeshi Abe
  about module vcl
+ fdo#77985 make calc function NETWORKDAYS comply with ODFF1.2
  in https://gerrit.libreoffice.org/9827 from Winfried Donkers
  about module formula, include, sc, scaddins
+ prefer OUStringBuffer to concatenating OUString in a loop
  in https://gerrit.libreoffice.org/15582 from Takeshi Abe
  about module starmath


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

+ tdf#89790 -  DOCX: saving LO version number in correct tag in app.xml
  in https://gerrit.libreoffice.org/15151 from Ioan Radu
+ Revert "update to liborcus 0.9.0"
  in https://gerrit.libreoffice.org/15586 from Markus Mohrhard
+ update to liborcus 0.9.0
  in https://gerrit.libreoffice.org/15453 from Markus Mohrhard
+ Replaced nAnz, nObjAnz with nCount, nObjCount respectively
  in https://gerrit.libreoffice.org/15494 from Linus Behrens


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

+ tdf#34555 Make cropping handles for images available for all
  in https://gerrit.libreoffice.org/15541 from Philippe Jung


* Open changes needing tweaks, but being untouched for more than a week:

+ Resolves tdf#67712 form controls and draw objects
  in https://gerrit.libreoffice.org/15523 from Henry Castro
+ tdf#90494-Add new Attribute for exporting gradient angle diagonally
  in https://gerrit.libreoffice.org/15323 from Heena Gupta
+ preserve whitespaces here, tdf#88137, tdf#89254
  in https://gerrit.libreoffice.org/15375 from Markus Mohrhard
+ add kde5 build of vcl
  in https://gerrit.libreoffice.org/15327 from Jonathan Riddell
+ added currency dropdown menu may have some erors
  in https://gerrit.libreoffice.org/15274 from rajat vijay
+ Remove compiler Warnings
  in https://gerrit.libreoffice.org/15260 from Delveri Chick
+ Init
  in https://gerrit.libreoffice.org/15259 from Delveri Chick
+ tdf#90222: replace ScaList in scaddins with a std container
  in https://gerrit.libreoffice.org/15012 from Pieter Adriaensen
+ replace ScaList in scaddins with a std container tdf#90222
  in https://gerrit.libreoffice.org/15177 from Pieter Adriaensen
+ fdo#82335.
  in https://gerrit.libreoffice.org/11555 from Sudarshan Rao
+ tdf#64575 Photo Album: Better Image Layout
  in https://gerrit.libreoffice.org/14912 from Enes Ateş
+ WIP fdo#72987 Use firebird backup format for .odb no need for rebuild ind
  in https://gerrit.libreoffice.org/14968 from Popa Adrian Marius
+ Upgrade firebird to 2.5.3 , a few patches are already applied upstream
  in https://gerrit.libreoffice.org/15026 from Popa Adrian Marius
+ Fixed all  postfix operator++ and operator--
  in https://gerrit.libreoffice.org/14975 from Ahmad Samir
+ tdf#39468 Translate German Comments - sc/source/core/data/
  in https://gerrit.libreoffice.org/14866 from Christian M. Heller
+ tdf#49893: final fix for blank rectangle problem
  in https://gerrit.libreoffice.org/14584 from Vasily Melenchuk
+ xmloff: convert xof.component to use constructor syntax
  in https://gerrit.libreoffice.org/14820 from Chris Sherlock
+ xmloff: use constructor syntax in xo.component
  in https://gerrit.libreoffice.org/14803 from Chris Sherlock
+ sd: use constructor syntax for rest of sd.component
  in https://gerrit.libreoffice.org/14689 from Chris Sherlock
+ embeddedobj: convert emboleobj.*.component to constructor syntax
  in https://gerrit.libreoffice.org/14687 from Chris Sherlock
+ sc: use constructor syntax in sc.component
  in https://gerrit.libreoffice.org/14750 from Chris Sherlock
+ Convert ScDocument to constructor syntax, remove sc_component_getFactory(
  in https://gerrit.libreoffice.org/14751 from Chris Sherlock
+ scaddins: use constructor syntax for date.component
  in https://gerrit.libreoffice.org/14707 from Chris Sherlock
+ scaddins: use constructor syntax for pricing.component
  in https://gerrit.libreoffice.org/14706 from Chris Sherlock
+ scaddins: use constructor syntax for analysis.

41 matches

Mail list logo