date:20150105

 desktop/win32/source/officeloader/officeloader.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3f88d949d9a1446e673385cc4d7ca40c7477fded
Author: Michael Stahl 
Date:   Mon Jan 5 21:43:20 2015 +0100

desktop: fix copypasta in officeloader.cxx

Change-Id: I66736e0b1e72e27c02ea718c3f07547b83fd949f

diff --git a/desktop/win32/source/officeloader/officeloader.cxx 
b/desktop/win32/source/officeloader/officeloader.cxx
index 7eb1427..e782c90 100644
--- a/desktop/win32/source/officeloader/officeloader.cxx
+++ b/desktop/win32/source/officeloader/officeloader.cxx
@@ -379,7 +379,7 @@ int WINAPI _tWinMain( HINSTANCE, HINSTANCE, LPTSTR, int )
 for ( n = 1; n < argc2; n++ )
 {
 if ( 0 == _tcsnicmp( argv2[n], _T("-headless"), 9 ) ||
- 0 == _tcsnicmp( argv2[n], _T("--headless"), 9 ) )
+ 0 == _tcsnicmp( argv2[n], _T("--headless"), 10 ) )
 {
 bHeadlessMode = TRUE;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Severe performance degradation on Linux

On 05.01.2015 18:36, Maarten Hoes wrote:
> 
> For what its worth, i can easily reproduce the script takes fairly long
> (about ~50 seconds on my vm's) to complete on both Ubuntu 14.04 and
> Fedora 21, both with the distro supplied binaries and a recent master.
> 
> I ran the script using strace -f. It shows a lot of calls on futex(
> 'FUTEX_WAIT_PRIVATE'), though im not sure how relevant that may be. I
> attached the strace output.

please try that again and use strace options -T -r so it's easier to see
where the time is spent.


On Tue, Dec 30, 2014 at 01:58:00PM +0100, Markus Mohrhard wrote:
>Hey,
>You or we can now speculate for a long time or you can just start
>profiling what is actually slow. Get a symbols build and run it with
>callgrind. You can interpret the results with kcachegrind which will
>hopefully show what took so much time and allow you to work on a fix.

this problem is probably not CPU bound, i'd guess something is waiting
for a time-out and callgrind's cycle-counting won't help much in that case.


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

Re: Dialog: Hide a control by C++ code

On 05.01.2015 21:56, jan wrote:
> Hi,
> 
> it seems that in Basic I can hide a control in a dialog simply with 
> 
> oControl.Visible=false
> 
> But I am totally at a loss on how to do this from a C++ extension? 
> 
> Reference< XControl > c_1 =
> xControlContainer->getControl(OU("txt_ActionParameter1"));
> c_1->Visible = false; // doesn't exist
> c_1>setVisible(false); // doesn't exist
> 
> I can't find this "Visible" property in the API documentation of XControl,
> either!

BASIC does some magic with identifiers, it uses reflection to look for
methods like "getVisible" and "setVisible" on the component.

probably it is finding com::sun::star::awt;:XWindow::setVisible() in
this case. something like this may work:

 Reference xWindow(c_1, uno::UNO_QUERY);
 xWindow->setVisible(false);

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

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

2015-01-05 Thread Andras Timar

 wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py   |6 
--
 wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py |2 +-
 wizards/source/formwizard/dbwizres.src |5 +
 3 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit 219b151ea72b942434167c862473203e5e68d568
Author: Andras Timar 
Date:   Mon Jan 5 22:15:29 2015 +0100

fdo#88068 make the string 'Red Line' localizable in Letter Wizard

Change-Id: If6a69eb384b7b7e6c71e96f126a27bcd45709ad4

diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py 
b/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py
index e61b6a7..2ef81e0 100644
--- a/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py
+++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py
@@ -229,7 +229,7 @@ class LetterWizardDialogResources(object):
 LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 64),
 "Marine" : oWizardResource.getResText(
 LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 65),
-"RedLine" : oWizardResource.getResText(
+"Red Line" : oWizardResource.getResText(
 LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 66)}
 
 #Common Resources
commit 8bf129b621fd368df71f3861a98b9a4f33de816a
Author: Andras Timar 
Date:   Mon Jan 5 22:11:59 2015 +0100

fdo#88069 make the string 'Fax' localizable in Fax Wizard

Change-Id: I5258b47cba25451b36645e9de3a6a43e3ea3af4c

diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py 
b/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py
index c9a176c..25c5171 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py
@@ -105,7 +105,7 @@ class FaxWizardDialogResources(object):
 FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 39)
 self.resLabel2_value = oWizardResource.getResText(
 FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 40)
-
+
 #Create a Dictionary for the constants values.
 self.dictConstants = {
 "#to#" : oWizardResource.getResText(
@@ -129,6 +129,8 @@ class FaxWizardDialogResources(object):
 self.dictPrivateTemplate = {
 "Bottle" : oWizardResource.getResText(
 FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 49),
+"Fax" : oWizardResource.getResText(
+FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 56),
 "Lines" : oWizardResource.getResText(
 FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 50),
 "Marine" : oWizardResource.getResText(
@@ -144,7 +146,7 @@ class FaxWizardDialogResources(object):
 FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 54),
 "Modern Fax from Private" : oWizardResource.getResText(
 FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 55)}
-
+
 #Common Resources
 self.resOverwriteWarning = oWizardResource.getResText(
 FaxWizardDialogResources.RID_RID_COMMON_START + 19)
diff --git a/wizards/source/formwizard/dbwizres.src 
b/wizards/source/formwizard/dbwizres.src
index a27cf7b..5fc33b3 100644
--- a/wizards/source/formwizard/dbwizres.src
+++ b/wizards/source/formwizard/dbwizres.src
@@ -2396,6 +2396,11 @@ String RID_FAXWIZARDDIALOG_START + 55
 Text [ en-US] = "Modern Fax from Private";
 };
 
+String RID_FAXWIZARDDIALOG_START + 56
+{
+Text [ en-US] = "Fax";
+};
+
 // Fax Wizard Communication Start
 String RID_FAXWIZARDCOMMUNICATION_START + 1
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Dialog: Hide a control by C++ code

2015-01-05 Thread jan

Hi,

it seems that in Basic I can hide a control in a dialog simply with 

oControl.Visible=false

But I am totally at a loss on how to do this from a C++ extension? 

Reference< XControl > c_1 =
xControlContainer->getControl(OU("txt_ActionParameter1"));
c_1->Visible = false; // doesn't exist
c_1>setVisible(false); // doesn't exist

I can't find this "Visible" property in the API documentation of XControl,
either!

Thanks for any hints!
Jan



--
View this message in context: 
http://nabble.documentfoundation.org/Dialog-Hide-a-control-by-C-code-tp4135197.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

 dbaccess/source/ui/dlg/advancedsettings.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit bda665c442c5e59f5d6656a7d3e54ed1dfdc1b01
Author: Julien Nabet 
Date:   Wed Dec 31 13:57:19 2014 +0100

Related fdo#87840: mix between ignorecurrency and inputchecks

Cherry-picked from: 0f9ce69b327ee14f028c26e6af275779b8047def

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

diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx 
b/dbaccess/source/ui/dlg/advancedsettings.cxx
index 288f943..399369d 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.cxx
+++ b/dbaccess/source/ui/dlg/advancedsettings.cxx
@@ -154,8 +154,8 @@ namespace dbaui
 { &m_pSchema,   "useschemaname",   
DSID_SCHEMA,false },
 { &m_pIndexAppendix,"createindex", 
DSID_INDEXAPPENDIX, false },
 { &m_pDosLineEnds,  "eol", 
DSID_DOSLINEENDS,   false },
-{ &m_pIgnoreCurrency,   "inputchecks", 
DSID_IGNORECURRENCY,false },
-{ &m_pCheckRequiredFields,  "ignorecurrency",  
DSID_CHECK_REQUIRED_FIELDS, false },
+{ &m_pCheckRequiredFields,  "inputchecks", 
DSID_CHECK_REQUIRED_FIELDS, false },
+{ &m_pIgnoreCurrency,   "ignorecurrency",  
DSID_IGNORECURRENCY,false },
 { &m_pEscapeDateTime,   "useodbcliterals", 
DSID_ESCAPE_DATETIME,   false },
 { &m_pPrimaryKeySupport,"primarykeys", 
DSID_PRIMARY_KEY_SUPPORT,   false },
 { &m_pRespectDriverResultSetType,   "resulttype",  
DSID_RESPECTRESULTSETTYPE,  false },
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: offapi/com sc/inc sc/source

2015-01-05 Thread Tor Lillqvist

 offapi/com/sun/star/sheet/opencl/XOpenCLSelection.idl |   25 ++
 sc/inc/docuno.hxx |   14 +
 sc/source/ui/unoobj/docuno.cxx|   45 ++
 3 files changed, 84 insertions(+)

New commits:
commit 88fe046c158d5a20f8f9fa14a7d734ea3aaa85be
Author: Tor Lillqvist 
Date:   Mon Jan 5 20:39:55 2015 +0200

Extend the Calc UNO API for the conditions whether to use OpenCL for a 
formula

Setters/getters for the flag whether to restrict OpenCL to formulas that 
use a
subset of opcodes, and the lower limit on number of cells a fomula should
refer to in order for OpenCL to be considered.

Change-Id: Ifeb11d4e4003f13e392fe03f1ce2f89147f46e38

diff --git a/offapi/com/sun/star/sheet/opencl/XOpenCLSelection.idl 
b/offapi/com/sun/star/sheet/opencl/XOpenCLSelection.idl
index cbf1af0..b7f47b8 100644
--- a/offapi/com/sun/star/sheet/opencl/XOpenCLSelection.idl
+++ b/offapi/com/sun/star/sheet/opencl/XOpenCLSelection.idl
@@ -74,6 +74,31 @@ interface XOpenCLSelection : com::sun::star::uno::XInterface
  */
 sequence< OpenCLPlatform > getOpenCLPlatforms();
 
+/*
+ * Sets OpenCL to be considered only for formulas that use only a specific 
subset of opcodes.
+ */
+void enableOpcodeSubsetTest();
+
+/*
+ * Sets OpenCL to be considered for formulas regardless of what opcodes 
they contain.
+ */
+void disableOpcodeSubsetTest();
+
+/*
+ * Returns whether OpenCL is considered or not depending on the opcodes a 
formula uses.
+ */
+boolean isOpcodeSubsetTested();
+
+/*
+ * Sets the lower limit on the number of cells involved in a formula for 
OpenCL to be considered.
+ */
+void setFormulaCellNumberLimit( [in] long number );
+
+/*
+ * Returns the lower limit on the number of cells involved in a formula 
for OpenCL to be considered.
+ */
+long getFormulaCellNumberLimit();
+
 };
 
 }; }; }; }; };
diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx
index da0ea25..9f7ed0a 100644
--- a/sc/inc/docuno.hxx
+++ b/sc/inc/docuno.hxx
@@ -353,6 +353,20 @@ public:
 SAL_CALL getOpenCLPlatforms()
 throw(::com::sun::star::uno::RuntimeException, 
std::exception) SAL_OVERRIDE;
 
+virtual void SAL_CALL enableOpcodeSubsetTest()
+throw 
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+
+virtual void SAL_CALL disableOpcodeSubsetTest()
+throw 
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+
+virtual sal_Bool SAL_CALL isOpcodeSubsetTested()
+throw 
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+
+virtual void SAL_CALL setFormulaCellNumberLimit( sal_Int32 number )
+throw 
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+
+virtual sal_Int32 SAL_CALL getFormulaCellNumberLimit()
+throw 
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
 // ITiledRenderable
 virtual void paintTile( VirtualDevice& rDevice,
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 6993c04..10f50aa 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -28,6 +28,7 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -2448,6 +2449,50 @@ uno::Sequence< sheet::opencl::OpenCLPlatform > 
ScModelObj::getOpenCLPlatforms()
 #endif
 }
 
+namespace {
+
+void setOpcodeSubsetTest(bool bFlag)
+throw (uno::RuntimeException, std::exception)
+{
+boost::shared_ptr 
batch(comphelper::ConfigurationChanges::create());
+
officecfg::Office::Calc::Formula::Calculation::OpenCLSubsetOnly::set(bFlag, 
batch);
+batch->commit();
+}
+
+}
+
+void ScModelObj::enableOpcodeSubsetTest()
+throw (uno::RuntimeException, std::exception)
+{
+setOpcodeSubsetTest(true);
+}
+
+void ScModelObj::disableOpcodeSubsetTest()
+throw (uno::RuntimeException, std::exception)
+{
+setOpcodeSubsetTest(false);
+}
+
+sal_Bool ScModelObj::isOpcodeSubsetTested()
+throw (uno::RuntimeException, std::exception)
+{
+return 
officecfg::Office::Calc::Formula::Calculation::OpenCLSubsetOnly::get();
+}
+
+void ScModelObj::setFormulaCellNumberLimit( sal_Int32 number )
+throw (uno::RuntimeException, std::exception)
+{
+boost::shared_ptr 
batch(comphelper::ConfigurationChanges::create());
+
officecfg::Office::Calc::Formula::Calculation::OpenCLMinimumDataSize::set(number,
 batch);
+batch->commit();
+}
+
+sal_Int32 ScModelObj::getFormulaCellNumberLimit()
+throw (uno::RuntimeException, std::exception)
+{
+return 
officecfg::Office::Calc::Formula::Calculation::OpenCLMinimumDataSize::get().get();
+}
+
 ScDrawPagesObj::ScDrawPagesObj(ScDocShell* pDocSh) :
 pDocShell( pDocSh )
 {
___

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

 dbaccess/source/ui/dlg/advancedsettings.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2077e89fd1ba7cae10f22f751a674076b54bf9ab
Author: Julien Nabet 
Date:   Wed Dec 31 13:57:19 2014 +0100

Related fdo#87840: mix between ignorecurrency and inputchecks

Cherry-picked from 0f9ce69b327ee14f028c26e6af275779b8047def

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

diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx 
b/dbaccess/source/ui/dlg/advancedsettings.cxx
index d21a590..905465e 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.cxx
+++ b/dbaccess/source/ui/dlg/advancedsettings.cxx
@@ -153,8 +153,8 @@ namespace dbaui
 { &m_pSchema,   "useschemaname",   
DSID_SCHEMA,false },
 { &m_pIndexAppendix,"createindex", 
DSID_INDEXAPPENDIX, false },
 { &m_pDosLineEnds,  "eol", 
DSID_DOSLINEENDS,   false },
-{ &m_pIgnoreCurrency,   "inputchecks", 
DSID_IGNORECURRENCY,false },
-{ &m_pCheckRequiredFields,  "ignorecurrency",  
DSID_CHECK_REQUIRED_FIELDS, false },
+{ &m_pCheckRequiredFields,  "inputchecks", 
DSID_CHECK_REQUIRED_FIELDS, false },
+{ &m_pIgnoreCurrency,   "ignorecurrency",  
DSID_IGNORECURRENCY,false },
 { &m_pEscapeDateTime,   "useodbcliterals", 
DSID_ESCAPE_DATETIME,   false },
 { &m_pPrimaryKeySupport,"primarykeys", 
DSID_PRIMARY_KEY_SUPPORT,   false },
 { &m_pRespectDriverResultSetType,   "resulttype",  
DSID_RESPECTRESULTSETTYPE,  false },
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

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

New commits:
commit 4ac34fbf0238324687c2732cc9dec8f2f5b3866b
Author: Stanislav Horacek 
Date:   Mon Jan 5 21:38:56 2015 +0100

Updated core
Project: help  bab9e3aa54942efff0b2d9b013ae700cab8611f3

fix heading level

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

diff --git a/helpcontent2 b/helpcontent2
index 8632d6d..bab9e3a 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 8632d6dca08c07b006b40b2c68f723b0f1c11406
+Subproject commit bab9e3aa54942efff0b2d9b013ae700cab8611f3
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/text

 source/text/shared/01/ref_pdf_export.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bab9e3aa54942efff0b2d9b013ae700cab8611f3
Author: Stanislav Horacek 
Date:   Mon Jan 5 21:38:56 2015 +0100

fix heading level

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

diff --git a/source/text/shared/01/ref_pdf_export.xhp 
b/source/text/shared/01/ref_pdf_export.xhp
index b2a3975..679c185 100644
--- a/source/text/shared/01/ref_pdf_export.xhp
+++ b/source/text/shared/01/ref_pdf_export.xhp
@@ -189,7 +189,7 @@
   Selects to export Impress slide transition effects to 
respective PDF effects.
   Bookmarks
 
-All bookmark levels
+All bookmark levels
   Select to show all bookmark levels when the reader 
opens the PDF file.
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

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

New commits:
commit 84dc3843087b5debdef298058d15029811c02ad2
Author: Stanislav Horacek 
Date:   Mon Jan 5 21:35:55 2015 +0100

Updated core
Project: help  8632d6dca08c07b006b40b2c68f723b0f1c11406

correct label for recalculation option

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

diff --git a/helpcontent2 b/helpcontent2
index b4cb9f0..8632d6d 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit b4cb9f06d6969aa1ccce515c13a97552ffadf1aa
+Subproject commit 8632d6dca08c07b006b40b2c68f723b0f1c11406
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/text

 source/text/shared/optionen/01060900.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8632d6dca08c07b006b40b2c68f723b0f1c11406
Author: Stanislav Horacek 
Date:   Mon Jan 5 21:35:55 2015 +0100

correct label for recalculation option

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

diff --git a/source/text/shared/optionen/01060900.xhp 
b/source/text/shared/optionen/01060900.xhp
index c1679bd..5c6989c 100644
--- a/source/text/shared/optionen/01060900.xhp
+++ b/source/text/shared/optionen/01060900.xhp
@@ -71,7 +71,7 @@
 Loading a large spreadsheet file can take a long time. If you don't need to 
update your large spreadsheet data immediately, you can postpone the 
recalculation at a better time.
 %PRODUCTNAME allows you to defer recalculation of Excel 2007 (and above) 
spreadsheets to speedup loading time.
 
-ODF 
Spreadsheets (not saved by %PRODUCTNAME):
+ODF 
Spreadsheet (not saved by %PRODUCTNAME):
 
 Recent versions of %PRODUCTNAME caches spreadsheet formula results into its 
ODF file.
 This feature helps %PRODUCTNAME to recalculate a large ODF spreadsheet saved 
by %PRODUCTNAME faster.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

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

New commits:
commit c740db938b8dcb660d023d0954f29f07ddcf8d23
Author: Stanislav Horacek 
Date:   Mon Jan 5 21:32:07 2015 +0100

Updated core
Project: help  b4cb9f06d6969aa1ccce515c13a97552ffadf1aa

correct title for RANK.EQ function

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

diff --git a/helpcontent2 b/helpcontent2
index b3fb984..b4cb9f0 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit b3fb9849fa298bf36ffb5a9967a109f40f0e5021
+Subproject commit b4cb9f06d6969aa1ccce515c13a97552ffadf1aa
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/text

 source/text/scalc/01/04060185.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b4cb9f06d6969aa1ccce515c13a97552ffadf1aa
Author: Stanislav Horacek 
Date:   Mon Jan 5 21:32:07 2015 +0100

correct title for RANK.EQ function

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

diff --git a/source/text/scalc/01/04060185.xhp 
b/source/text/scalc/01/04060185.xhp
index 92b3f71..a495f69 100644
--- a/source/text/scalc/01/04060185.xhp
+++ b/source/text/scalc/01/04060185.xhp
@@ -76,7 +76,7 @@
   numbers;determining ranks
 
 
-RANK.AVG
+RANK.EQ
 Returns the statistical rank of a 
given value, within a supplied array of values. If there are duplicate 
values in the list, these are given the same rank.
 The difference 
between RANK.AVG and RANK.EQ occurs when there are duplicates in the list of 
values. The RANK.EQ function returns the lower rank, 
whereas the RANK.AVG function returns the average 
rank.
 Syntax
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sw/source/filter/ww8/ww8par2.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit eb392a4bf464004396b48c56384886b8f1223538
Author: CaolÃ¡n McNamara 
Date:   Mon Jan 5 17:15:14 2015 +

asan: cast is totally wrong here

Change-Id: I7341813b706faad60888e374fa50542abeb6842d
(cherry picked from commit 3fab95491940160a1ee288491090b2f8b5875731)
Reviewed-on: https://gerrit.libreoffice.org/13747
Reviewed-by: David Tardon 
Tested-by: David Tardon 

diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 324b85c..2b0940b 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -1240,8 +1240,9 @@ void WW8TabBandDesc::ProcessSprmTTableBorders(int 
nBrcVer, const sal_uInt8* pPar
 // sprmTTableBorders
 if( nBrcVer == 6 )
 {
-for( int i = 0; i < 6; ++i )
-aDefBrcs[i] = WW8_BRC( ((WW8_BRCVer6*)&pParams)[i] );
+WW8_BRCVer6 *pVer6 = (WW8_BRCVer6*)pParams;
+for (int i = 0; i < 6; ++i)
+aDefBrcs[i] = WW8_BRC(pVer6[i]);
 }
 else if ( nBrcVer == 8 )
 {
___
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' - sw/source

 sw/source/filter/ww8/ww8par2.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 1b98b475d1885583d1b6ae059806d76b272ea30d
Author: CaolÃ¡n McNamara 
Date:   Mon Jan 5 17:15:14 2015 +

asan: cast is totally wrong here

Change-Id: I7341813b706faad60888e374fa50542abeb6842d
(cherry picked from commit 3fab95491940160a1ee288491090b2f8b5875731)
Reviewed-on: https://gerrit.libreoffice.org/13746
Reviewed-by: David Tardon 
Tested-by: David Tardon 

diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 3f7897e..b81f630 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -1272,8 +1272,9 @@ void WW8TabBandDesc::ProcessSprmTTableBorders(int 
nBrcVer, const sal_uInt8* pPar
 // sprmTTableBorders
 if( nBrcVer == 6 )
 {
-for( int i = 0; i < 6; ++i )
-aDefBrcs[i] = WW8_BRC( ((WW8_BRCVer6*)&pParams)[i] );
+WW8_BRCVer6 *pVer6 = (WW8_BRCVer6*)pParams;
+for (int i = 0; i < 6; ++i)
+aDefBrcs[i] = WW8_BRC(pVer6[i]);
 }
 else if ( nBrcVer == 8 )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-01-05 Thread Douglas Mencken

 sc/source/ui/optdlg/calcoptionsdlg.hxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 87e431946b345f73fb90ff11aa3d1a1e281d7253
Author: Douglas Mencken 
Date:   Fri Dec 26 22:09:57 2014 -0500

sc-calcoptionsdlg.hxx: add definition guards (HAVE_FEATURE_OPENCL)

fixes "error: 'OpenCLConfig' does not name a type" when building
without OpenCL support

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

diff --git a/sc/source/ui/optdlg/calcoptionsdlg.hxx 
b/sc/source/ui/optdlg/calcoptionsdlg.hxx
index e253a95..1ad8fcf 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.hxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.hxx
@@ -59,8 +59,10 @@ private:
 
 SvTreeListEntry *createItem(const OUString &rCaption, const OUString& 
sValue) const;
 void setValueAt(size_t nPos, const OUString &rString);
+#if HAVE_FEATURE_OPENCL
 OpenCLConfig::ImplMatcherSet& CurrentWhiteOrBlackList();
 const OpenCLConfig::ImplMatcher& CurrentWhiteOrBlackListEntry();
+#endif
 
 private:
 
___
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' - include/comphelper

2015-01-05 Thread David Tardon

 include/comphelper/seqstream.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6c1597d4f459250e35a228f95472c81d2be0263b
Author: David Tardon 
Date:   Mon Jan 5 16:44:56 2015 +0100

I assume this class is not public due to an oversight

Change-Id: If43e49dc05ad213cbbf6363dfa68a7a93959582f
(cherry picked from commit 02266c33f23cd9fa59b73db3ef88e32c24106587)
Reviewed-on: https://gerrit.libreoffice.org/13750
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/include/comphelper/seqstream.hxx b/include/comphelper/seqstream.hxx
index d572995..aea8329 100644
--- a/include/comphelper/seqstream.hxx
+++ b/include/comphelper/seqstream.hxx
@@ -76,7 +76,7 @@ private:
 };
 typedef ::cppu::WeakImplHelper1< ::com::sun::star::io::XOutputStream > 
OSequenceOutputStream_Base;
 
-class OSequenceOutputStream : public OSequenceOutputStream_Base
+class COMPHELPER_DLLPUBLIC OSequenceOutputStream : public 
OSequenceOutputStream_Base
 {
 protected:
 ::com::sun::star::uno::Sequence< sal_Int8 >&m_rSequence;
___
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' - editeng/source

 editeng/source/editeng/impedit4.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 5f287dc7e6e59b61c944d6ab39ab117d19b8179f
Author: Julien Nabet 
Date:   Mon Feb 2 18:02:50 2015 +0100

Resolves fdo#87968 : Assertion failed: false rtl_uString_newFromSubString

aNewText already contains the good string so calling copy method is wrong
(same pb for i18n::TransliterationModulesExtra::TITLE_CASE and
i18n::TransliterationModulesExtra::SENTENCE_CASE)

Change-Id: Ifce92f33e98af3a58a70d25da9c60cf3d584a001
Reviewed-on: https://gerrit.libreoffice.org/13724
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 
(cherry picked from commit 31de7888660f551597263413bfdf467aade36680)
Reviewed-on: https://gerrit.libreoffice.org/13753

diff --git a/editeng/source/editeng/impedit4.cxx 
b/editeng/source/editeng/impedit4.cxx
index 6af9a8f..c672732 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -2817,7 +2817,7 @@ EditSelection ImpEditEngine::TransliterateText( const 
EditSelection& rSelection,
 GetLanguage( EditPaM( pNode, nCurrentStart + 1 ) ),
 nCurrentStart, nLen, &aOffsets ));
 
-if (aNodeStr != aNewText.copy( nCurrentStart, nLen ))
+if (aNodeStr != aNewText)
 {
 aChgData.nStart = nCurrentStart;
 aChgData.nLen   = nLen;
@@ -2905,7 +2905,7 @@ EditSelection ImpEditEngine::TransliterateText( const 
EditSelection& rSelection,
 GetLanguage( EditPaM( pNode, nCurrentStart + 1 ) ),
 nCurrentStart, nLen, &aOffsets ));
 
-if ( aNodeStr != aNewText.copy( nCurrentStart, nLen ))
+if (aNodeStr != aNewText)
 {
 aChgData.nStart = nCurrentStart;
 aChgData.nLen   = nLen;
@@ -2943,7 +2943,7 @@ EditSelection ImpEditEngine::TransliterateText( const 
EditSelection& rSelection,
 Sequence< sal_Int32 > aOffsets;
 OUString aNewText( aTranslitarationWrapper.transliterate( 
aNodeStr, nLanguage, nCurrentStart, nLen, &aOffsets ) );
 
-if (aNodeStr != aNewText.copy( nCurrentStart, nLen ))
+if (aNodeStr != aNewText)
 {
 aChgData.nStart = nCurrentStart;
 aChgData.nLen   = nLen;
___
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' - editeng/source

 editeng/source/editeng/impedit4.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 9a779652a28d538184eb7fd8f4117ae9882feab9
Author: Julien Nabet 
Date:   Mon Feb 2 18:02:50 2015 +0100

Resolves fdo#87968 : Assertion failed: false rtl_uString_newFromSubString

aNewText already contains the good string so calling copy method is wrong
(same pb for i18n::TransliterationModulesExtra::TITLE_CASE and
i18n::TransliterationModulesExtra::SENTENCE_CASE)

Change-Id: Ifce92f33e98af3a58a70d25da9c60cf3d584a001
Reviewed-on: https://gerrit.libreoffice.org/13724
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 
(cherry picked from commit 31de7888660f551597263413bfdf467aade36680)
Reviewed-on: https://gerrit.libreoffice.org/13754

diff --git a/editeng/source/editeng/impedit4.cxx 
b/editeng/source/editeng/impedit4.cxx
index fd11281..41ae0cc 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -2819,7 +2819,7 @@ EditSelection ImpEditEngine::TransliterateText( const 
EditSelection& rSelection,
 GetLanguage( EditPaM( pNode, nCurrentStart + 1 ) ),
 nCurrentStart, nLen, &aOffsets ));
 
-if (aNodeStr != aNewText.copy( nCurrentStart, nLen ))
+if (aNodeStr != aNewText)
 {
 aChgData.nStart = nCurrentStart;
 aChgData.nLen   = nLen;
@@ -2907,7 +2907,7 @@ EditSelection ImpEditEngine::TransliterateText( const 
EditSelection& rSelection,
 GetLanguage( EditPaM( pNode, nCurrentStart + 1 ) ),
 nCurrentStart, nLen, &aOffsets ));
 
-if ( aNodeStr != aNewText.copy( nCurrentStart, nLen ))
+if (aNodeStr != aNewText)
 {
 aChgData.nStart = nCurrentStart;
 aChgData.nLen   = nLen;
@@ -2945,7 +2945,7 @@ EditSelection ImpEditEngine::TransliterateText( const 
EditSelection& rSelection,
 Sequence< sal_Int32 > aOffsets;
 OUString aNewText( aTranslitarationWrapper.transliterate( 
aNodeStr, nLanguage, nCurrentStart, nLen, &aOffsets ) );
 
-if (aNodeStr != aNewText.copy( nCurrentStart, nLen ))
+if (aNodeStr != aNewText)
 {
 aChgData.nStart = nCurrentStart;
 aChgData.nLen   = nLen;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [libo-marketing-priv] Announcing Pebble Smartwatch Application for LibreOffice Impress

2015-01-05 Thread Gülşah Köse

Hi Sophie

> Cloph once done, could we have the project on Pootle so the L10n team take
> care of it?
>
That would be great. :) Many thanks for the suggestions.


-- 
*Gülşah Köse*
*about.me *
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2015-01-05 Thread Miklos Vajna

 sw/inc/hintids.hxx  |1 
 sw/qa/extras/ww8export/data/commented-table.doc |binary
 sw/qa/extras/ww8export/ww8export.cxx|   12 ++
 sw/source/filter/basflt/fltshell.cxx|   14 ++
 sw/source/filter/inc/fltshell.hxx   |2 
 sw/source/filter/ww8/ww8par.cxx |  144 
 sw/source/filter/ww8/ww8par.hxx |6 -
 sw/source/filter/ww8/ww8par5.cxx|   12 ++
 sw/source/filter/ww8/ww8par6.cxx|3 
 sw/source/filter/ww8/ww8scan.cxx|  141 +++
 sw/source/filter/ww8/ww8scan.hxx|   39 ++
 sw/source/filter/ww8/ww8struc.hxx   |8 -
 12 files changed, 219 insertions(+), 163 deletions(-)

New commits:
commit ac95452f211038d9f0959f801ef33ee7a4cad277
Author: Miklos Vajna 
Date:   Tue Dec 30 18:49:04 2014 +0100

i#93570 DOC import: handle commented text ranges via RES_FLTR_ANNOTATIONMARK

And add a minimal reproducer that shows how the old way was broken.

(cherry picked from commit 0ec0ec267986644084baaa5bda5ba917dc5744df)

Conflicts:
sw/source/filter/ww8/ww8par.cxx

Change-Id: Ic2dadf9905d603b0fd0573651b235ecd5dd70e71

diff --git a/sw/qa/extras/ww8export/data/commented-table.doc 
b/sw/qa/extras/ww8export/data/commented-table.doc
new file mode 100644
index 000..049c7e3
Binary files /dev/null and b/sw/qa/extras/ww8export/data/commented-table.doc 
differ
diff --git a/sw/qa/extras/ww8export/ww8export.cxx 
b/sw/qa/extras/ww8export/ww8export.cxx
index f55967e..357b06a 100644
--- a/sw/qa/extras/ww8export/ww8export.cxx
+++ b/sw/qa/extras/ww8export/ww8export.cxx
@@ -440,6 +440,18 @@ DECLARE_WW8EXPORT_TEST(testWw8Cjklist35, "cjklist35.doc")
 CPPUNIT_ASSERT_EQUAL(style::NumberingType::NUMBER_LOWER_ZH, numFormat);
 }
 
+DECLARE_WW8EXPORT_TEST(testCommentedTable, "commented-table.doc")
+{
+// Document has a non-trivial commented text range, as the range contains 
a table.
+uno::Reference xTextFieldsSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
xFieldsAccess(xTextFieldsSupplier->getTextFields());
+uno::Reference 
xFields(xFieldsAccess->createEnumeration());
+uno::Reference xField(xFields->nextElement(), 
uno::UNO_QUERY);
+// After first import, there was an off-by-one during import, so this was 
"efore.\nA1\nB1\nAfte". (Notice the additional "e" prefix.)
+// After export and import, things got worse, this was "\nA1\nB1\nAfte".
+CPPUNIT_ASSERT_EQUAL(OUString("fore.\nA1\nB1\nAfte"), 
xField->getAnchor()->getString());
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index abcdf62..af76674 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -2192,79 +2192,6 @@ long SwWW8ImplReader::Read_And(WW8PLCFManResult* pRes)
 sAuthor = *pA;
 else
 sAuthor = sInitials;
-
-// If there is a bookmark tag, a text range should be commented.
-sal_uInt32 nTagBkmk = SVBT32ToUInt32(pDescri->ITagBkmk);
-if (nTagBkmk != 0x)
-{
-int nAtnIndex = GetAnnotationIndex(nTagBkmk);
-if (nAtnIndex != -1)
-{
-WW8_CP nStart = GetAnnotationStart(nAtnIndex);
-WW8_CP nEnd = 
GetAnnotationEnd(GetAnnotationEndIndex(nAtnIndex));
-//It is unfortunately fragile and wrong to assume that two
-//character positions in the original word document, which is
-//what nStart and nEnd are, will equate to the same length in
-//the destination writer document.
-//
-//Better would be, while writing the content into the writer
-//document to store the equivalent writer document positions
-//that relate to each annotation index as the parser passes
-//those points.
-sal_Int32 nLen = nEnd - nStart;
-// the start and end positions are apparently stored in
-// different arrays, so in an invalid file only one could exist
-if(SAL_MAX_INT32 != nEnd && SAL_MAX_INT32 != nStart && nLen > 
0)
-{
-if (pPaM->GetPoint()->nContent.GetIndex() >= nLen)
-{
-pPaM->SetMark();
-pPaM->GetPoint()->nContent -= nLen;
-}
-else if (pPaM->GetPoint()->nNode.GetNode().IsTxtNode() )
-{
-pPaM->SetMark();
-nLen -= pPaM->GetPoint()->nContent.GetIndex();
-
-SwTxtNode* pTxtNode = 0;
-
-// Find first text node which is affected by the 
comment
-while (

[Bug 79641] LibreOffice 4.4 most annoying bugs

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

Cor Nouws  changed:

   What|Removed |Added

 Depends on||87663

--- Comment #27 from Cor Nouws  ---
Adding Bug 87663 - CRASH when attempting to add ToC to document

-- 
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: [libo-marketing-priv] Announcing Pebble Smartwatch Application for LibreOffice Impress

2015-01-05 Thread Sophie Gautier

Hi,
Le 5 janv. 2015 20:47, "Gülşah Köse"  a écrit :
>>
>> Hi Gulsah,
>
>
>  Hi Michael
>
>>
>>
>> We'd really prefer to use the MPLv2 (Mozilla Public License) -
which is
>> a quad-license with the GPL/LGPL/AGPL - that just helps us avoid having
>> too many different license combinations around.
>> if you're ok with that :-)
>
>
> MPLv2 licence is ok for me. I changed the license of the project.-->
https://github.com/COMU/pebble-remote/blob/master/LICENCE
>
> I added i18n and l10n support project recently. Italian and Turkish
languages have been added.
>

Great, thanks a lot :-)
>
>>
>>
>> Are you interested in folding your work in up-stream & joining
the
>> LibreOffice development team ? =) I hope so.
>
>
>  I would be very pleased to join in the LibreOffice development team :)
>
>> And poke me / the list / Christian with your account name =)
>
>
> This is my account name : gulsahkose
>
Cloph once done, could we have the project on Pootle so the L10n team take
care of it?
Thanks in advance!
Cheers
Sophie
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [libo-marketing-priv] Announcing Pebble Smartwatch Application for LibreOffice Impress

2015-01-05 Thread Gülşah Köse

>
> Hi Gulsah,
>

 Hi Michael


>
> We'd really prefer to use the MPLv2 (Mozilla Public License) -
> which is
> a quad-license with the GPL/LGPL/AGPL - that just helps us avoid having
> too many different license combinations around.
> if you're ok with that :-)
>

MPLv2 licence is ok for me. I changed the license of the project.-->
https://github.com/COMU/pebble-remote/blob/master/LICENCE

I added i18n and l10n support project recently. Italian and Turkish
languages have been added.



>
> Are you interested in folding your work in up-stream & joining the
> LibreOffice development team ? =) I hope so.
>

 I would be very pleased to join in the LibreOffice development team :)

And poke me / the list / Christian with your account name =)
>

This is my account name : gulsahkose


-- 
*Gülşah Köse*
*about.me *
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: 5 commits - download.lst external/libmwaw include/comphelper writerperfect/qa writerperfect/source xmloff/source

2015-01-05 Thread David Tardon

 download.lst  |9 
 external/libmwaw/ExternalPackage_libmwaw.mk   |2 
 include/comphelper/seqstream.hxx  |2 
 writerperfect/qa/unit/data/draw/libmwaw/pass/MacDraw_Pro_1.0.hqx  |  109 
++
 writerperfect/qa/unit/data/writer/libe-book/pass/Broad_Band_eBook.lrf |binary
 writerperfect/source/writer/EBookImportFilter.cxx |5 
 xmloff/source/style/XMLFontAutoStylePool.cxx  |4 
 xmloff/source/style/XMLFontStylesContext.cxx  |   27 ++
 xmloff/source/style/XMLFontStylesContext_impl.hxx |8 
 9 files changed, 157 insertions(+), 9 deletions(-)

New commits:
commit 2862ef7e65e4994ff3cf173a36ec59b47445455e
Author: David Tardon 
Date:   Mon Jan 5 18:41:14 2015 +0100

export format of embedded font too

Change-Id: Ife7dbb298861a71987501f3847d3b931c7e83715

diff --git a/xmloff/source/style/XMLFontAutoStylePool.cxx 
b/xmloff/source/style/XMLFontAutoStylePool.cxx
index c121842..813f010 100644
--- a/xmloff/source/style/XMLFontAutoStylePool.cxx
+++ b/xmloff/source/style/XMLFontAutoStylePool.cxx
@@ -311,6 +311,10 @@ void XMLFontAutoStylePool::exportXML()
 GetExport().AddAttribute( XML_NAMESPACE_XLINK, 
XML_TYPE, "simple" );
 SvXMLElementExport fontFaceUri( GetExport(), 
XML_NAMESPACE_SVG,
 XML_FONT_FACE_URI, true, true );
+
+GetExport().AddAttribute( XML_NAMESPACE_SVG, 
XML_STRING, "truetype" );
+SvXMLElementExport fontFaceFormat( GetExport(), 
XML_NAMESPACE_SVG,
+XML_FONT_FACE_FORMAT, true, true );
 }
 }
 }
commit 0a0496858905622374f9880b21b35ac1943c7a19
Author: David Tardon 
Date:   Mon Jan 5 16:45:25 2015 +0100

read embedded fonts from Flat ODF

Change-Id: Ic94608f4afac9d8ac05ec3140d195b0526e9420a

diff --git a/xmloff/source/style/XMLFontStylesContext.cxx 
b/xmloff/source/style/XMLFontStylesContext.cxx
index 5f7dfa8..373e116 100644
--- a/xmloff/source/style/XMLFontStylesContext.cxx
+++ b/xmloff/source/style/XMLFontStylesContext.cxx
@@ -24,6 +24,8 @@
 #include 
 #include 
 
+#include 
+
 #include 
 #include 
 
@@ -33,6 +35,7 @@
 #include "fonthdl.hxx"
 #include 
 #include 
+#include 
 
 
 using namespace ::com::sun::star;
@@ -251,6 +254,12 @@ SvXMLImportContext * 
XMLFontStyleContextFontFaceUri::CreateChildContext(
 {
 if( nPrefix == XML_NAMESPACE_SVG && IsXMLToken( rLocalName, 
XML_FONT_FACE_FORMAT ))
 return new XMLFontStyleContextFontFaceFormat( GetImport(), nPrefix, 
rLocalName, xAttrList, *this );
+if( linkPath.isEmpty() && ( nPrefix == XML_NAMESPACE_OFFICE ) && 
IsXMLToken( rLocalName, XML_BINARY_DATA ) )
+{
+mxBase64Stream.set( new comphelper::OSequenceOutputStream( maFontData 
) );
+if( mxBase64Stream.is() )
+return new XMLBase64ImportContext( GetImport(), nPrefix, 
rLocalName, xAttrList, mxBase64Stream );
+}
 return SvXMLImportContext::CreateChildContext( nPrefix, rLocalName, 
xAttrList );
 }
 
@@ -276,9 +285,9 @@ const char* EOT_FORMAT  = "embedded-opentype";
 
 void XMLFontStyleContextFontFaceUri::EndElement()
 {
-if( linkPath.getLength() == 0 )
+if( ( linkPath.getLength() == 0 ) && ( maFontData.getLength() == 0 ) )
 {
-SAL_WARN( "xmloff", "svg:font-face-uri tag with no link; ignoring." );
+SAL_WARN( "xmloff", "svg:font-face-uri tag with no link or base64 
data; ignoring." );
 return;
 }
 bool eot;
@@ -298,7 +307,10 @@ void XMLFontStyleContextFontFaceUri::EndElement()
 SAL_WARN( "xmloff", "Unknown format of embedded font; assuming TTF." );
 eot = false;
 }
-handleEmbeddedFont( linkPath, eot );
+if ( maFontData.getLength() == 0 )
+handleEmbeddedFont( linkPath, eot );
+else
+handleEmbeddedFont( maFontData, eot );
 }
 
 void XMLFontStyleContextFontFaceUri::handleEmbeddedFont( const OUString& url, 
bool eot )
@@ -328,6 +340,15 @@ void XMLFontStyleContextFontFaceUri::handleEmbeddedFont( 
const OUString& url, bo
 SAL_WARN( "xmloff", "External URL for font file not handled." );
 }
 
+void XMLFontStyleContextFontFaceUri::handleEmbeddedFont( const 
::css::uno::Sequence< sal_Int8 >& rData, const bool eot )
+{
+const uno::Reference< io::XInputStream > xInput( new 
comphelper::SequenceInputStream( rData ) );
+const OUString fontName = font.familyName();
+if( EmbeddedFontsHelper::addEmbeddedFont( xInput, fontName, "?", 
std::vector< unsigned char >(), eot ) )
+GetImport().NotifyEmbeddedFontRead();
+xInput->closeInput();
+}
+
 SvXMLStyleContext *XMLFontStylesContext::CreateStyleChildContext(
 sal_uInt16 nPrefix,
 const OUString& rLocalName,
diff --git a/xmloff/source/style/XMLFo

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

2015-01-05 Thread Miklos Vajna

 include/svx/xfillit0.hxx|2 ++
 svx/source/xoutdev/xattr.cxx|   14 ++
 sw/source/core/docnode/nodedump.cxx |   28 +++-
 3 files changed, 19 insertions(+), 25 deletions(-)

New commits:
commit 2eb4bd3c8ce8d4ac76680e5179364b12a656ae94
Author: Miklos Vajna 
Date:   Mon Jan 5 18:39:47 2015 +0100

Factor out XFillStyleItem::dumpAsXml() from sw

Change-Id: I04aed56c1e32f98f8920530e3ba313765baa1bba

diff --git a/include/svx/xfillit0.hxx b/include/svx/xfillit0.hxx
index 68a1015..4ed3af6 100644
--- a/include/svx/xfillit0.hxx
+++ b/include/svx/xfillit0.hxx
@@ -50,6 +50,8 @@ public:
 OUString &rText, const IntlWrapper * = 0 ) 
const SAL_OVERRIDE;
 virtual sal_uInt16  GetValueCount() const SAL_OVERRIDE;
 css::drawing::FillStyle GetValue() const { return 
(css::drawing::FillStyle) SfxEnumItem::GetValue(); }
+
+void dumpAsXml(struct _xmlTextWriter* pWriter) const;
 };
 
 #endif
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index ae7e240..fc1625e 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -54,6 +54,7 @@
 #include 
 
 #include 
+#include 
 
 using namespace ::com::sun::star;
 
@@ -2189,6 +2190,19 @@ bool XFillStyleItem::PutValue( const 
::com::sun::star::uno::Any& rVal, sal_uInt8
 return true;
 }
 
+void XFillStyleItem::dumpAsXml(xmlTextWriterPtr pWriter) const
+{
+xmlTextWriterStartElement(pWriter, BAD_CAST("xFillStyleItem"));
+xmlTextWriterWriteAttribute(pWriter, BAD_CAST("whichId"), 
BAD_CAST(OString::number(Which()).getStr()));
+xmlTextWriterWriteAttribute(pWriter, BAD_CAST("value"), 
BAD_CAST(OString::number(GetValue()).getStr()));
+
+OUString aPresentation;
+GetPresentation(SFX_ITEM_PRESENTATION_NAMELESS, SFX_MAPUNIT_100TH_MM, 
SFX_MAPUNIT_100TH_MM, aPresentation);
+xmlTextWriterWriteAttribute(pWriter, BAD_CAST("presentation"), 
BAD_CAST(aPresentation.toUtf8().getStr()));
+
+xmlTextWriterEndElement(pWriter);
+}
+
 TYPEINIT1_AUTOFACTORY(XFillColorItem, XColorItem);
 
 XFillColorItem::XFillColorItem(sal_Int32 nIndex, const Color& rTheColor) :
diff --git a/sw/source/core/docnode/nodedump.cxx 
b/sw/source/core/docnode/nodedump.cxx
index 8ebd230..c887f2a 100644
--- a/sw/source/core/docnode/nodedump.cxx
+++ b/sw/source/core/docnode/nodedump.cxx
@@ -452,6 +452,9 @@ void lcl_dumpSfxItemSet(WriterHelper& writer, const 
SfxItemSet* pSet)
 case RES_COL:
 static_cast(pItem)->dumpAsXml(writer);
 break;
+case XATTR_FILLSTYLE:
+static_cast(pItem)->dumpAsXml(writer);
+break;
 default: bDone = false; break;
 }
 if (bDone)
@@ -466,31 +469,6 @@ void lcl_dumpSfxItemSet(WriterHelper& writer, const 
SfxItemSet* pSet)
 boost::optional oValue;
 switch (pItem->Which())
 {
-case XATTR_FILLSTYLE:
-{
-pWhich = "fill style";
-const XFillStyleItem* pFillStyleItem = static_cast(pItem);
-switch (pFillStyleItem->GetValue())
-{
-default:
-case drawing::FillStyle_NONE:
-oValue = "none";
-break;
-case drawing::FillStyle_SOLID:
-oValue = "solid";
-break;
-case drawing::FillStyle_GRADIENT:
-oValue = "gradient";
-break;
-case drawing::FillStyle_HATCH:
-oValue = "hatch";
-break;
-case drawing::FillStyle_BITMAP:
-oValue = "bitmap";
-break;
-}
-break;
-}
 case XATTR_FILLCOLOR:
 pWhich = "fill color";
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Severe performance degradation on Linux

2015-01-05 Thread Jens Tröger

Thank you, Maarten.

I tried to upload the callgrind data, but the email was rejected due to
its size.  Glad you can reproduce the slowness!

Now the question is: what's to cause of the socket slowness, compared to
the pipe performance?  Based on yesterday's findings, this might not be
a LO issue afterall.  Connecting to LO through a pipe gives me the same
performance (and faster) that I have on my Mac.  It's the socket connect
which is so slow.  See here for more data:

https://forum.openoffice.org/en/forum/viewtopic.php?f=20&t=74332&p=336914#p336975

The question lingers: why is socket connect on Linux so tremendously
slower than on the Mac...

http://superuser.com/questions/860321/linux-localhost-sockets-painfully-slower-than-on-mac

Jens

On Mon, Jan 05, 2015 at 06:36:47PM +0100, Maarten Hoes wrote:
>Hi,
>For what its worth, i can easily reproduce the script takes fairly long
>(about ~50 seconds on my vm's) to complete on both Ubuntu 14.04 and
>Fedora 21, both with the distro supplied binaries and a recent master.
>I ran the script using strace -f. It shows a lot of calls on futex(
>'FUTEX_WAIT_PRIVATE'), though im not sure how relevant that may be. I
>attached the strace output.
>- Maarten

-- 
Jens Tröger
http://savage.light-speed.de/
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - officecfg/registry sw/uiconfig

 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |6 ++
 sw/uiconfig/swriter/toolbar/frameobjectbar.xml   |   22 
++
 2 files changed, 20 insertions(+), 8 deletions(-)

New commits:
commit ca2174e24369bc63a2475ee471bf76697a859317
Author: Yousuf Philips 
Date:   Fri Dec 26 19:20:14 2014 +0400

fdo#81475 rearrangement of writer's frame toolbar (4.4)

Change-Id: I0c6b7469aba62a8d427ffebfdcc9f6212fb3fd3f
Reviewed-on: https://gerrit.libreoffice.org/13663
Reviewed-by: Yousuf Philips 
Tested-by: Yousuf Philips 
(cherry picked from commit 88ae2a436ec79dd152f9e81edea00e402438cc1f)
Reviewed-on: https://gerrit.libreoffice.org/13666
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 30d44a8..8982316 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -3188,11 +3188,17 @@
 
   Forward One
 
+
+  1
+
   
   
 
   Back One
 
+
+  1
+
   
   
 
diff --git a/sw/uiconfig/swriter/toolbar/frameobjectbar.xml 
b/sw/uiconfig/swriter/toolbar/frameobjectbar.xml
index 1b0614e..ce76e79 100644
--- a/sw/uiconfig/swriter/toolbar/frameobjectbar.xml
+++ b/sw/uiconfig/swriter/toolbar/frameobjectbar.xml
@@ -20,9 +20,11 @@
 http://openoffice.org/2001/toolbar"; 
xmlns:xlink="http://www.w3.org/1999/xlink"; toolbar:id="toolbar">
  
  
+ 
+ 
  
  
- 
+ 
  
  
  
@@ -35,17 +37,21 @@
  
  
  
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
  
  
  
  
  
- 
- 
- 
- 
- 
- 
  
  
-
\ No newline at end of file
+ 
+ 
+
___
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' - connectivity/source

 connectivity/source/drivers/mork/MDatabaseMetaDataHelper.cxx |   11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 62280beffe7f0c25c9d6a45fd5135a622f5ef4d4
Author: Julien Nabet 
Date:   Tue Dec 30 13:36:58 2014 +0100

Related fdo#87789: groups should appear like views and not like tables

Cherry-picked from 84e3c5acb07937a073fedbe3d5389fc72123923a

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

diff --git a/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.cxx 
b/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.cxx
index c4a239a..5c530d8 100644
--- a/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.cxx
+++ b/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.cxx
@@ -106,8 +106,15 @@ bool MDatabaseMetaDataHelper::getTables( OConnection* 
_pCon,
 
 SAL_INFO("connectivity.mork", "TableName: " << aTableName);
 
-aRow.push_back( new ORowSetValueDecorator( aTableName ) ); // 
Table name
-aRow.push_back( new ORowSetValueDecorator( OUString("TABLE") ) ); 
// Table type
+aRow.push_back( new ORowSetValueDecorator( aTableName ) ); // 
Table/View name
+if ((aTableName == "AddressBook") || (aTableName == 
"CollectedAddressBook"))
+{
+aRow.push_back( new ORowSetValueDecorator( OUString("TABLE") ) 
); // Table type
+}
+else
+{
+aRow.push_back( new ORowSetValueDecorator( OUString("VIEW") ) 
); // View type
+}
 aRow.push_back( ODatabaseMetaDataResultSet::getEmptyValue() ); // 
Remarks
 aRows.push_back(aRow);
 }
___
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' - connectivity/source

 connectivity/source/drivers/mork/MDatabaseMetaDataHelper.cxx |   11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 8656ea837f75b199aefab727ccb77f4ae209037c
Author: Julien Nabet 
Date:   Tue Dec 30 13:36:58 2014 +0100

Related fdo#87789: groups should appear like views and not like tables

Cherry-picked from 84e3c5acb07937a073fedbe3d5389fc72123923a

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

diff --git a/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.cxx 
b/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.cxx
index c4a239a..5c530d8 100644
--- a/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.cxx
+++ b/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.cxx
@@ -106,8 +106,15 @@ bool MDatabaseMetaDataHelper::getTables( OConnection* 
_pCon,
 
 SAL_INFO("connectivity.mork", "TableName: " << aTableName);
 
-aRow.push_back( new ORowSetValueDecorator( aTableName ) ); // 
Table name
-aRow.push_back( new ORowSetValueDecorator( OUString("TABLE") ) ); 
// Table type
+aRow.push_back( new ORowSetValueDecorator( aTableName ) ); // 
Table/View name
+if ((aTableName == "AddressBook") || (aTableName == 
"CollectedAddressBook"))
+{
+aRow.push_back( new ORowSetValueDecorator( OUString("TABLE") ) 
); // Table type
+}
+else
+{
+aRow.push_back( new ORowSetValueDecorator( OUString("VIEW") ) 
); // View type
+}
 aRow.push_back( ODatabaseMetaDataResultSet::getEmptyValue() ); // 
Remarks
 aRows.push_back(aRow);
 }
___
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' - sw/source

2015-01-05 Thread Justin Luth

 sw/source/filter/ww8/ww8par.cxx  |9 -
 sw/source/filter/ww8/ww8scan.hxx |2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 42f48db159980ad30588ed1d52867afbbe9648f5
Author: Justin Luth 
Date:   Fri Jan 2 07:44:33 2015 +0300

fdo#67870 WW8 filter: import zoom type

Change-Id: If919880b51bdb30d9afdb168dae8f84dbfe18524
(cherry picked from commit 615ba47c5937dd62573181a0404ae24968d7daec)
Reviewed-on: https://gerrit.libreoffice.org/13745
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 61e4b09..abcdf62 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -82,6 +82,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -1900,7 +1901,13 @@ void SwWW8ImplReader::ImportDop()
 aViewProps[1].Name = "VisibleBottom";
 aViewProps[1].Value <<= sal_Int32(0);
 aViewProps[2].Name = "ZoomType";
-aViewProps[2].Value <<= sal_Int16(0);
+//Import zoom type
+switch (pWDop->zkSaved) {
+case 1:  aViewProps[2].Value <<= sal_Int16(SVX_ZOOM_WHOLEPAGE); 
break;
+case 2:  aViewProps[2].Value <<= sal_Int16(SVX_ZOOM_PAGEWIDTH); 
break;
+case 3:  aViewProps[2].Value <<= sal_Int16(SVX_ZOOM_OPTIMAL);   
break;
+default: aViewProps[2].Value <<= sal_Int16(SVX_ZOOM_PERCENT);   
break;
+}
 
 uno::Reference< uno::XComponentContext > 
xComponentContext(comphelper::getProcessComponentContext());
 uno::Reference xBox = 
document::IndexedPropertyValues::create(xComponentContext);
diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
index a3ce96f..95711ae 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -1595,7 +1595,7 @@ public:
 sal_Int32   lKeyProtDoc;//  document protection password key, 
only valid if dop.fProtEnabled, dop.fLockAtn or dop.fLockRev are 1.
 sal_uInt16  wvkSaved : 3;   //  document view kind: 0 Normal view, 
1 Outline view, 2 Page View
 sal_uInt16  wScaleSaved : 9;///< Specifies the zoom percentage that 
was in use when the document was saved.
-sal_uInt16  zkSaved : 2;
+sal_uInt16  zkSaved : 2;//  document zoom type: 0 percent, 1 
whole/entire page, 2 page width, 3 text width/optimal
 boolfRotateFontW6 : 1;
 booliGutterPos : 1 ;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 30732] Character formatting not retained in entries of TOC, table lists, etc.

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

Adolfo Jayme  changed:

   What|Removed |Added

 CC||parrenin@gmail.com

--- Comment #34 from Adolfo Jayme  ---
*** Bug 88046 has been marked as a duplicate of this bug. ***

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

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

 sw/source/filter/ww8/ww8par2.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 3fab95491940160a1ee288491090b2f8b5875731
Author: CaolÃ¡n McNamara 
Date:   Mon Jan 5 17:15:14 2015 +

asan: cast is totally wrong here

Change-Id: I7341813b706faad60888e374fa50542abeb6842d

diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 0cd4d2c..c66c92e 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -1272,8 +1272,9 @@ void WW8TabBandDesc::ProcessSprmTTableBorders(int 
nBrcVer, const sal_uInt8* pPar
 // sprmTTableBorders
 if( nBrcVer == 6 )
 {
-for( int i = 0; i < 6; ++i )
-aDefBrcs[i] = WW8_BRC( ((WW8_BRCVer6*)&pParams)[i] );
+WW8_BRCVer6 *pVer6 = (WW8_BRCVer6*)pParams;
+for (int i = 0; i < 6; ++i)
+aDefBrcs[i] = WW8_BRC(pVer6[i]);
 }
 else if ( nBrcVer == 8 )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 cppu/source/threadpool/current.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4e59046114105cada50cea2848eb083b23a5df8b
Author: Stephan Bergmann 
Date:   Mon Jan 5 17:48:23 2015 +0100

Fix include

Change-Id: Ie5253f9b32bb6ed1099eca75b442ba26528f2b32

diff --git a/cppu/source/threadpool/current.cxx 
b/cppu/source/threadpool/current.cxx
index b43de4c..3135a4b 100644
--- a/cppu/source/threadpool/current.cxx
+++ b/cppu/source/threadpool/current.cxx
@@ -24,7 +24,7 @@
 #include "osl/thread.h"
 #include "osl/mutex.hxx"
 
-#include "uno/current_context.hxx"
+#include "uno/current_context.h"
 #include "uno/environment.hxx"
 #include "uno/mapping.hxx"
 #include "typelib/typedescription.h"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 include/com/sun/star/uno/Any.hxx   |9 -
 include/com/sun/star/uno/Reference.hxx |   13 +++--
 2 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 682f94317f65b9b9694468b41ef5ae29392c5828
Author: Stephan Bergmann 
Date:   Mon Jan 5 17:46:09 2015 +0100

These extern "C" functions are in the global namespace

Change-Id: I75bdb9ac71a3d36eeaf0b846e25d22a0aa923895

diff --git a/include/com/sun/star/uno/Any.hxx b/include/com/sun/star/uno/Any.hxx
index 9e9e7dc..4528935 100644
--- a/include/com/sun/star/uno/Any.hxx
+++ b/include/com/sun/star/uno/Any.hxx
@@ -35,6 +35,10 @@
 #include 
 #include 
 
+extern "C" CPPU_DLLPUBLIC rtl_uString * SAL_CALL 
cppu_Any_extraction_failure_msg(
+uno_Any const * pAny, typelib_TypeDescriptionReference * pType )
+SAL_THROW_EXTERN_C();
+
 namespace com
 {
 namespace sun
@@ -577,11 +581,6 @@ inline bool SAL_CALL operator != ( const Any & rAny, const 
C & value )
 return (! operator == ( rAny, value ));
 }
 
-extern "C" CPPU_DLLPUBLIC rtl_uString * SAL_CALL 
cppu_Any_extraction_failure_msg(
-uno_Any const * pAny, typelib_TypeDescriptionReference * pType )
-SAL_THROW_EXTERN_C();
-
-
 template 
 T Any::get() const
 {
diff --git a/include/com/sun/star/uno/Reference.hxx 
b/include/com/sun/star/uno/Reference.hxx
index 456c35f..1ba4e48 100644
--- a/include/com/sun/star/uno/Reference.hxx
+++ b/include/com/sun/star/uno/Reference.hxx
@@ -25,6 +25,13 @@
 #include 
 #include 
 
+extern "C" CPPU_DLLPUBLIC rtl_uString * SAL_CALL cppu_unsatisfied_iquery_msg(
+typelib_TypeDescriptionReference * pType )
+SAL_THROW_EXTERN_C();
+extern "C" CPPU_DLLPUBLIC rtl_uString * SAL_CALL cppu_unsatisfied_iset_msg(
+typelib_TypeDescriptionReference * pType )
+SAL_THROW_EXTERN_C();
+
 namespace com
 {
 namespace sun
@@ -57,12 +64,6 @@ inline XInterface * Reference< interface_type >::iquery(
 {
 return BaseReference::iquery(pInterface, interface_type::static_type());
 }
-extern "C" CPPU_DLLPUBLIC rtl_uString * SAL_CALL cppu_unsatisfied_iquery_msg(
-typelib_TypeDescriptionReference * pType )
-SAL_THROW_EXTERN_C();
-extern "C" CPPU_DLLPUBLIC rtl_uString * SAL_CALL cppu_unsatisfied_iset_msg(
-typelib_TypeDescriptionReference * pType )
-SAL_THROW_EXTERN_C();
 
 inline XInterface * BaseReference::iquery_throw(
 XInterface * pInterface, const Type & rType )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 79641] LibreOffice 4.4 most annoying bugs

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

Cor Nouws  changed:

   What|Removed |Added

 Depends on||88056

--- Comment #26 from Cor Nouws  ---
Adding Bug 88056 - [FILE OPEN/SAVE] field Insert ▸ Field ▸ Page Title not saved
/ reloaded

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

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - sw/source

 sw/source/filter/ascii/parasc.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit ba5d09072c4e9c103f6af3c44e689bc6c93e0477
Author: CaolÃ¡n McNamara 
Date:   Mon Jan 5 15:49:47 2015 +

valgrind: uninitialized read

on loading id:000386,src:00,op:havoc,rep:128.jpg as text

Change-Id: I98364ffbcc4ea788613cc8071c4d8774ba167033
(cherry picked from commit 0b39d560da27ece227830a4bcc5556ae902a0921)
Reviewed-on: https://gerrit.libreoffice.org/13744
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 

diff --git a/sw/source/filter/ascii/parasc.cxx 
b/sw/source/filter/ascii/parasc.cxx
index ddc6855..11c7f2e 100644
--- a/sw/source/filter/ascii/parasc.cxx
+++ b/sw/source/filter/ascii/parasc.cxx
@@ -324,6 +324,7 @@ sal_uLong SwASCIIParser::ReadChars()
 sal_Size nNewLen = lGCount, nCntBytes;
 aWork.reset(new sal_Unicode[nNewLen + 1]); // add 1 for '\0'
 sal_Unicode* pBuf = aWork.get();
+pBuf[nNewLen] = 0; // ensure '\0'
 
 nNewLen = rtl_convertTextToUnicode( hConverter, hContext,
 pArr, lGCount, pBuf, nNewLen,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] libvisio.git: src/lib

 src/lib/VSDContentCollector.cpp |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 49c0d44063c452f0927e8938951f065e1e488ecb
Author: CaolÃ¡n McNamara 
Date:   Mon Jan 5 17:33:26 2015 +0100

workaround error C2589: Â´(Â´ : illegal token on right side of Â´::Â´

Change-Id: I653ef7386ac4bd77bce40601bae5d2fd84764c83

diff --git a/src/lib/VSDContentCollector.cpp b/src/lib/VSDContentCollector.cpp
index d7365b0..1d98798 100644
--- a/src/lib/VSDContentCollector.cpp
+++ b/src/lib/VSDContentCollector.cpp
@@ -2256,14 +2256,14 @@ void 
libvisio::VSDContentCollector::_lineProperties(const VSDLineStyle &style, l
 styleProps.insert("draw:marker-start-viewbox", 
_linePropertiesMarkerViewbox(style.startMarker));
 styleProps.insert("draw:marker-start-path", 
_linePropertiesMarkerPath(style.startMarker));
 double w =  
m_scale*_linePropertiesMarkerScale(style.startMarker)*(0.1/(style.width*style.width+1)+2.54*style.width);
-styleProps.insert("draw:marker-start-width", std::max(w, 0.05));
+styleProps.insert("draw:marker-start-width", (std::max)(w, 0.05));
   }
   if (style.endMarker > 0)
   {
 styleProps.insert("draw:marker-end-viewbox", 
_linePropertiesMarkerViewbox(style.endMarker));
 styleProps.insert("draw:marker-end-path", 
_linePropertiesMarkerPath(style.endMarker));
 double w =  
m_scale*_linePropertiesMarkerScale(style.endMarker)*(0.1/(style.width*style.width+1)+2.54*style.width);
-styleProps.insert("draw:marker-end-width", std::max(w, 0.05));
+styleProps.insert("draw:marker-end-width", (std::max)(w, 0.05));
   }
 
   int dots1 = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 4 commits - compilerplugins/clang cppu/source include/com sfx2/source

 compilerplugins/clang/store/revisibility.cxx |   20 +++-
 cppu/source/cppu/cppu_opt.cxx|9 ++---
 cppu/source/threadpool/current.cxx   |5 +++--
 include/com/sun/star/uno/Any.hxx |3 ++-
 include/com/sun/star/uno/Reference.hxx   |5 +++--
 sfx2/source/appl/shutdownicon.hxx|3 ---
 sfx2/source/appl/shutdowniconunx.cxx |   11 +--
 7 files changed, 42 insertions(+), 14 deletions(-)

New commits:
commit f569c4197c8e3d63ddd0e8c1f71cc5a6161b2fe5
Author: Stephan Bergmann 
Date:   Mon Jan 5 17:25:10 2015 +0100

Improve loplugin:revisibility

(for non-Windows--only code, as MSVC would complain about such cases anyway)

Change-Id: Id6daf61b79bd31529bdaeb7c6df4f354731ae7d7

diff --git a/compilerplugins/clang/store/revisibility.cxx 
b/compilerplugins/clang/store/revisibility.cxx
index 11e3cc8..fec8ff7 100644
--- a/compilerplugins/clang/store/revisibility.cxx
+++ b/compilerplugins/clang/store/revisibility.cxx
@@ -41,11 +41,13 @@ bool ReVisibility::VisitFunctionDecl(FunctionDecl const * 
decl) {
 if (!ignoreLocation(decl) && hasExplicitVisibilityAttr(decl)
 && !isFriendDecl(decl))
 {
+Decl const * first = nullptr;
 for (Decl const * p = decl;;) {
 p = p->getPreviousDecl();
 if (p == nullptr) {
 break;
 }
+first = p;
 if (hasExplicitVisibilityAttr(p) && !isFriendDecl(p)) {
 report(
 DiagnosticsEngine::Warning,
@@ -57,9 +59,25 @@ bool ReVisibility::VisitFunctionDecl(FunctionDecl const * 
decl) {
 "Previous visibility declaration is here",
 p->getAttr()->getLocation())
 << p->getAttr()->getRange();
-break;
+return true;
 }
 }
+if (decl->isThisDeclarationADefinition() && first != nullptr
+&& !(compiler.getSourceManager().getFilename(
+ compiler.getSourceManager().getSpellingLoc(
+ decl->getLocation()))
+ .startswith(SRCDIR "/libreofficekit/")))
+{
+report(
+DiagnosticsEngine::Warning,
+"Visibility declaration on definition, not first declaration",
+decl->getAttr()->getLocation())
+<< decl->getAttr()->getRange();
+report(
+DiagnosticsEngine::Note, "First declaration is here",
+first->getLocation())
+<< first->getSourceRange();
+}
 }
 return true;
 }
commit f627c122461de4dd4e75a995145e8838b1d9bf34
Author: Stephan Bergmann 
Date:   Mon Jan 5 17:23:15 2015 +0100

No need for declarations in include file

...of functions only accessed via dlopen

Change-Id: I6b9998298fc6df68fb0d3003cef77a62ecef8976

diff --git a/sfx2/source/appl/shutdownicon.hxx 
b/sfx2/source/appl/shutdownicon.hxx
index a36547e..6965f42 100644
--- a/sfx2/source/appl/shutdownicon.hxx
+++ b/sfx2/source/appl/shutdownicon.hxx
@@ -170,9 +170,6 @@ extern "C" {
 void aqua_init_systray();
 void aqua_shutdown_systray();
 #  endif
-// external plugin systray impl.
-void plugin_init_sys_tray();
-void plugin_shutdown_sys_tray();
 }
 
 #endif
diff --git a/sfx2/source/appl/shutdowniconunx.cxx 
b/sfx2/source/appl/shutdowniconunx.cxx
index 746819d..199674f 100644
--- a/sfx2/source/appl/shutdowniconunx.cxx
+++ b/sfx2/source/appl/shutdowniconunx.cxx
@@ -55,6 +55,13 @@
 
 using namespace ::osl;
 
+extern "C" {
+
+void SAL_DLLPUBLIC_EXPORT plugin_init_sys_tray();
+void SAL_DLLPUBLIC_EXPORT plugin_shutdown_sys_tray();
+
+}
+
 static ResMgr *pVCLResMgr;
 static GtkStatusIcon* pTrayIcon;
 static GtkWidget *pExitMenuItem = NULL;
@@ -360,7 +367,7 @@ static void notify_file_changed(GFileMonitor * 
/*gfilemonitor*/, GFile * /*arg1*
 }
 #endif
 
-void SAL_DLLPUBLIC_EXPORT plugin_init_sys_tray()
+void plugin_init_sys_tray()
 {
 ::SolarMutexGuard aGuard;
 
@@ -411,7 +418,7 @@ void SAL_DLLPUBLIC_EXPORT plugin_init_sys_tray()
 #endif
 }
 
-void SAL_DLLPUBLIC_EXPORT plugin_shutdown_sys_tray()
+void plugin_shutdown_sys_tray()
 {
 ::SolarMutexGuard aGuard;
 if( !pTrayIcon )
commit 64ccf3ff3059f81532c88f974bad7399cddc9898
Author: Stephan Bergmann 
Date:   Mon Jan 5 17:21:40 2015 +0100

Include function declarations

Change-Id: Ib1ce66bf9ec71280409335c0a5022ecfe229f494

diff --git a/cppu/source/threadpool/current.cxx 
b/cppu/source/threadpool/current.cxx
index 6c66320..b43de4c 100644
--- a/cppu/source/threadpool/current.cxx
+++ b/cppu/source/threadpool/current.cxx
@@ -24,6 +24,7 @@
 #include "osl/thread.h"
 #include "osl/mutex.hxx"
 
+#include "uno/current_context.hxx"
 #include "uno/environment.hxx"
 #include "uno/mapping.hxx"
 #include "typelib/typedescription.h"
@@ -182,7 +183,7 @@ IdContainer * getIdContainer()
 }
 
 
-ext

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - embeddedobj/source include/oox oox/source sd/CppunitTest_sd_export_tests.mk sd/qa

 embeddedobj/source/msole/oleembed.cxx |   11 +++
 include/oox/export/shapes.hxx |2 
 oox/source/export/shapes.cxx  |  114 +-
 sd/CppunitTest_sd_export_tests.mk |   41 
 sd/qa/unit/data/odp/bnc822341.odp |binary
 sd/qa/unit/export-tests.cxx   |   45 +
 6 files changed, 144 insertions(+), 69 deletions(-)

New commits:
commit 416596954529dd7897ab81951c47ba5984b11a34
Author: Zolnai TamÃ¡s 
Date:   Tue Dec 23 10:45:19 2014 +0100

bnc#822341: PPTX export of embedded text documents

-Make embedded text documents exported by analogy with spreadsheet
embedded documents.
-Convert MS ole objects to LO sepcific objecst to allow
exporting those ole objects too.

Plus use gb_CppunitTest_use_rdb instead of wasting time on
finding out which missing components cause test failing.
Especcially when we have platform dependent components
(e.g. related to embedded object)

(cherry picked from commit 0c3d5fb0ad35ff7fc18917fc86fa58d9312fe3ae)

Conflicts:
sd/qa/unit/export-tests.cxx


ERROR: Attribute 'spid' must appear on element 'p:oleObj'.

As pointed out by CppunitTest_sd_export_tests.

(cherry picked from commit 124c33dd1d6bf2040f0153de8c9ecaebe759c3bd)

ERROR: Invalid content was found starting with element 'p:pic'.

Again, as pointed out by CppunitTest_sd_export_tests. Sadly it seems that 
the
spec and PowerPoint is not in sync here, so just do what makes both happy. 
This
fixes the --with-export-validation build.

(cherry picked from commit cf15306ccf49da290b391517e2c5dd22a4f1be45)

Change-Id: Ic76d659b51274777a1669c215344a1169ebcba81
8ecbc3ef4ea9dc84ebf88506967d02de04ded852
c76d659b51274777a1669c215344a1169ebcba81
Reviewed-on: https://gerrit.libreoffice.org/13600
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/embeddedobj/source/msole/oleembed.cxx 
b/embeddedobj/source/msole/oleembed.cxx
index 7bce91d..ca8b731 100644
--- a/embeddedobj/source/msole/oleembed.cxx
+++ b/embeddedobj/source/msole/oleembed.cxx
@@ -587,6 +587,17 @@ void SAL_CALL OleEmbeddedObject::changeState( sal_Int32 
nNewState )
 }
 }
 else
+#else
+// if it is possible, the object will be converted to OOo format
+if ( !m_bTriedConversion )
+{
+m_bTriedConversion = true;
+if ( TryToConvertToOOo() )
+{
+changeState( nNewState );
+return;
+}
+}
 #endif
 {
 throw embed::UnreachableStateException();
diff --git a/include/oox/export/shapes.hxx b/include/oox/export/shapes.hxx
index f0dcdcc..6403aec 100644
--- a/include/oox/export/shapes.hxx
+++ b/include/oox/export/shapes.hxx
@@ -43,7 +43,7 @@ namespace oox { namespace drawingml {
 class OOX_DLLPUBLIC ShapeExport : public DrawingML {
 
 private:
-static int mnSpreadsheetCounter;
+static int mnEmbeddeDocumentCounter;
 struct ShapeCheck
 {
 bool operator()( const ::com::sun::star::uno::Reference< 
::com::sun::star::drawing::XShape> s1, const ::com::sun::star::uno::Reference< 
::com::sun::star::drawing::XShape> s2 ) const
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 8d394fe..3526636 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -52,6 +52,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -111,7 +112,7 @@ namespace oox { namespace drawingml {
 mAny >>= variable;
 
 // not thread safe
-int ShapeExport::mnSpreadsheetCounter = 1;
+int ShapeExport::mnEmbeddeDocumentCounter = 1;
 
 ShapeExport::ShapeExport( sal_Int32 nXmlNamespace, FSHelperPtr pFS, 
ShapeHashMap* pShapeMap, XmlFilterBase* pFB, DocumentType eDocumentType, 
DMLTextExport* pTextExport )
 : DrawingML( pFS, pFB, eDocumentType, pTextExport )
@@ -988,47 +989,90 @@ ShapeExport& ShapeExport::WriteOLE2Shape( Reference< 
XShape > xShape )
 }
 else
 {
-// this part now supports only embedded spreadsheets, it can 
be extended to support remaining ooxml documents
-// only exporter, counter and object filename are specific to 
spreadsheet
-Reference< XSpreadsheetDocument > xSheetDoc( mAny, UNO_QUERY );
-if( xSheetDoc.is() && mpFB)
+const bool bSpreadSheet = Reference< XSpreadsheetDocument >( 
mAny, UNO_QUERY ).is();
+const bool bTextDocument = Reference< css::text::XTextDocument 
>( mAny, UNO_QUERY ).is();
+if( ( bSpreadSheet || bTextDocument ) && mpFB)
 {
 Reference< XComponent > xDocument( mAny, UNO_QUERY );
 if( xDocument.is() )
 {
-Reference< XOutputStream > xOutStream = 
mpFB->openFragmentStream( OUStringBuffer()
-

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

 oox/source/drawingml/textparagraphproperties.cxx|   12 +
 oox/source/drawingml/textparagraphpropertiescontext.cxx |5 +-
 sd/qa/unit/data/pptx/bnc862510_7.pptx   |binary
 sd/qa/unit/import-tests.cxx |   35 
 4 files changed, 51 insertions(+), 1 deletion(-)

New commits:
commit 5f2ceec031f06cf0b2756c8c699585e28ea1fcb8
Author: Zolnai TamÃ¡s 
Date:   Mon Dec 22 18:29:36 2014 +0100

bnc#862510: PPTX import: Wrong text horizontal adjustment inside shape.

When alignment is not specified, it should be set to the
default "left" value just on time, when properties are
pushed to the property set, otherwise uninitialized value
is better.

(cherry picked from commit 7a64988dbc7a1542aa38f0e8f9a8a47941fbc67d)

Conflicts:
sd/qa/unit/import-tests.cxx

Conflicts:
sd/qa/unit/import-tests.cxx

Change-Id: Ic294c5d7cc477f7515aea1c071ad9b67275c012d
Reviewed-on: https://gerrit.libreoffice.org/13604
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/oox/source/drawingml/textparagraphproperties.cxx 
b/oox/source/drawingml/textparagraphproperties.cxx
index 22bab14..a4797f3 100644
--- a/oox/source/drawingml/textparagraphproperties.cxx
+++ b/oox/source/drawingml/textparagraphproperties.cxx
@@ -28,6 +28,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -381,6 +382,8 @@ void TextParagraphProperties::apply( const 
TextParagraphProperties& rSourceProps
 moFirstLineIndentation = rSourceProps.moFirstLineIndentation;
 if( rSourceProps.mnLevel )
 mnLevel = rSourceProps.mnLevel;
+if( rSourceProps.moParaAdjust )
+moParaAdjust = rSourceProps.moParaAdjust;
 }
 
 void TextParagraphProperties::pushToPropSet( const ::oox::core::XmlFilterBase* 
pFilterBase,
@@ -478,6 +481,15 @@ void TextParagraphProperties::pushToPropSet( const 
::oox::core::XmlFilterBase* p
 aPropSet.setProperty( PROP_ParaTabStops, aSeq );
 }
 }
+
+if ( moParaAdjust )
+{
+aPropSet.setProperty( PROP_ParaAdjust, moParaAdjust.get());
+}
+else
+{
+aPropSet.setProperty( PROP_ParaAdjust, 
com::sun::star::style::ParagraphAdjust_LEFT);
+}
 }
 
 float TextParagraphProperties::getCharHeightPoints( float fDefault ) const
diff --git a/oox/source/drawingml/textparagraphpropertiescontext.cxx 
b/oox/source/drawingml/textparagraphpropertiescontext.cxx
index 6d51ee5..06c6625 100644
--- a/oox/source/drawingml/textparagraphpropertiescontext.cxx
+++ b/oox/source/drawingml/textparagraphpropertiescontext.cxx
@@ -54,7 +54,10 @@ 
TextParagraphPropertiesContext::TextParagraphPropertiesContext( ContextHandler2H
 PropertyMap& rPropertyMap( 
mrTextParagraphProperties.getTextParagraphPropertyMap() );
 
 // ST_TextAlignType
-rPropertyMap.setProperty( PROP_ParaAdjust, GetParaAdjust( 
rAttribs.getToken( XML_algn, XML_l ) ));
+if ( rAttribs.hasAttribute( XML_algn ) )
+{
+mrTextParagraphProperties.getParaAdjust() = GetParaAdjust( 
rAttribs.getToken( XML_algn, XML_l ) );
+}
 // TODO see to do the same with RubyAdjust
 
 // ST_Coordinate32
diff --git a/sd/qa/unit/data/pptx/bnc862510_7.pptx 
b/sd/qa/unit/data/pptx/bnc862510_7.pptx
new file mode 100644
index 000..0eb3bbe
Binary files /dev/null and b/sd/qa/unit/data/pptx/bnc862510_7.pptx differ
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 439f153..acb2bb6 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -53,6 +53,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -90,6 +91,7 @@ public:
 void testBnc904423();
 void testShapeLineStyle();
 void testBnc862510_6();
+void testBnc862510_7();
 
 CPPUNIT_TEST_SUITE(SdImportTest);
 CPPUNIT_TEST(testDocumentLayout);
@@ -120,6 +122,7 @@ public:
 CPPUNIT_TEST(testBnc904423);
 CPPUNIT_TEST(testShapeLineStyle);
 CPPUNIT_TEST(testBnc862510_6);
+CPPUNIT_TEST(testBnc862510_7);
 
 CPPUNIT_TEST_SUITE_END();
 };
@@ -1033,6 +1036,38 @@ void SdImportTest::testBnc862510_6()
 xDocShRef->DoClose();
 }
 
+void SdImportTest::testBnc862510_7()
+{
+// Title shape's text was aligned to left instead of center.
+::sd::DrawDocShellRef xDocShRef = 
loadURL(getURLFromSrc("/sd/qa/unit/data/pptx/bnc862510_7.pptx"), PPTX);
+
+uno::Reference< drawing::XDrawPagesSupplier > xDoc(
+xDocShRef->GetDoc()->getUnoModel(), uno::UNO_QUERY_THROW );
+
+uno::Reference< drawing::XDrawPage > xPage(
+xDoc->getDrawPages()->getByIndex(0), uno::UNO_QUERY_THROW );
+
+uno::Reference< beans::XPropertySet > xShape(
+xPage->getByIndex(0), uno::UNO_QUERY );
+CPPUNIT_ASSERT_MESSAGE( "no shape", xShape.is() );
+
+// Get first paragraph
+uno::Reference xText = 
uno::Reference(xShape, uno::UNO_QUERY)->getText();
+CPPUNIT_ASSERT_MESSAGE( "not a text shape", xText.is() );
+uno:

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

 sw/source/filter/ascii/parasc.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d284e07bf30ce9f07000500f14d589ce386649c2
Author: CaolÃ¡n McNamara 
Date:   Mon Jan 5 15:49:47 2015 +

valgrind: uninitialized read

on loading id:000386,src:00,op:havoc,rep:128.jpg as text

Change-Id: I98364ffbcc4ea788613cc8071c4d8774ba167033
(cherry picked from commit 0b39d560da27ece227830a4bcc5556ae902a0921)
Reviewed-on: https://gerrit.libreoffice.org/13743
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 

diff --git a/sw/source/filter/ascii/parasc.cxx 
b/sw/source/filter/ascii/parasc.cxx
index 68d8b38..d4e5347 100644
--- a/sw/source/filter/ascii/parasc.cxx
+++ b/sw/source/filter/ascii/parasc.cxx
@@ -323,6 +323,7 @@ sal_uLong SwASCIIParser::ReadChars()
 sal_Size nNewLen = lGCount, nCntBytes;
 aWork.reset(new sal_Unicode[nNewLen + 1]); // add 1 for '\0'
 sal_Unicode* pBuf = aWork.get();
+pBuf[nNewLen] = 0; // ensure '\0'
 
 nNewLen = rtl_convertTextToUnicode( hConverter, hContext,
 pArr, lGCount, pBuf, nNewLen,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sw/source/filter/ascii/parasc.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 013a6f221179503dab331f0256a0efbf9a629336
Author: CaolÃ¡n McNamara 
Date:   Mon Jan 5 15:49:47 2015 +

valgrind: uninitialized read

on loading id:000386,src:00,op:havoc,rep:128.jpg as text

Change-Id: I98364ffbcc4ea788613cc8071c4d8774ba167033
(cherry picked from commit 0b39d560da27ece227830a4bcc5556ae902a0921)
Reviewed-on: https://gerrit.libreoffice.org/13744
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 

diff --git a/sw/source/filter/ascii/parasc.cxx 
b/sw/source/filter/ascii/parasc.cxx
index 02a2ade..2940767 100644
--- a/sw/source/filter/ascii/parasc.cxx
+++ b/sw/source/filter/ascii/parasc.cxx
@@ -322,6 +322,7 @@ sal_uLong SwASCIIParser::ReadChars()
 sal_Size nNewLen = lGCount, nCntBytes;
 aWork.reset(new sal_Unicode[nNewLen + 1]); // add 1 for '\0'
 sal_Unicode* pBuf = aWork.get();
+pBuf[nNewLen] = 0; // ensure '\0'
 
 nNewLen = rtl_convertTextToUnicode( hConverter, hContext,
 pArr, lGCount, pBuf, nNewLen,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 svx/source/dialog/charmap.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0e12845a6460c6669e295b7ae638d10a76353558
Author: CaolÃ¡n McNamara 
Date:   Mon Jan 5 16:03:32 2015 +

these are new in icu 54, not 53 apparently

thanks to wsheets for noticing

Change-Id: Iec4d3fe3e15831c153d4638c577680cd58e0881a

diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index d50bc44..133b84b 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -1448,7 +1448,7 @@ void SubsetMap::InitList()
 aAllSubsets.push_back( Subset( 0x11680, 0x116CF, 
RID_SUBSETSTR_TAKRI ) );
 break;
 #endif
-#if U_ICU_VERSION_MAJOR_NUM >= 53
+#if U_ICU_VERSION_MAJOR_NUM >= 54
 case UBLOCK_BASSA_VAH:
 aAllSubsets.push_back( Subset( 0x16AD0, 0x16AFF, 
RID_SUBSETSTR_BASSA_VAH ) );
 break;
___
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' - oox/source sd/qa

 oox/source/drawingml/shape.cxx|   13 ++-
 sd/qa/unit/data/pptx/bnc862510_6.pptx |binary
 sd/qa/unit/import-tests.cxx   |   40 ++
 3 files changed, 48 insertions(+), 5 deletions(-)

New commits:
commit aa05a786a500df6aa00f953649ee3dde25d81d48
Author: Zolnai TamÃ¡s 
Date:   Mon Dec 22 17:51:00 2014 +0100

bnc#862510: PPTX import: Wrong text color inside shape

When theme index is 0, it means it's unset so we should not
apply that.

(cherry picked from commit 89206c472ecf18bfde6824cea8004921cd404365)

Change-Id: I62a9cd2a9b4c19f5acffc334d5e8263fe24fc8fd
Reviewed-on: https://gerrit.libreoffice.org/13603
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index ee6b268..bff4f63 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -1039,11 +1039,14 @@ Reference< XShape > Shape::createAndInsert(
 TextCharacterProperties aCharStyleProperties;
 if( const ShapeStyleRef* pFontRef = getShapeStyleRef( 
XML_fontRef ) )
 {
-if( pTheme )
-if( const TextCharacterProperties* pCharProps = 
pTheme->getFontStyle( pFontRef->mnThemedIdx ) )
-aCharStyleProperties.assignUsed( *pCharProps );
-SAL_INFO("oox.drawingml", OSL_THIS_FUNC << "use font 
color");
-aCharStyleProperties.maCharColor.assignIfUsed( 
pFontRef->maPhClr );
+if( pFontRef->mnThemedIdx != 0 )
+{
+if( pTheme )
+if( const TextCharacterProperties* pCharProps = 
pTheme->getFontStyle( pFontRef->mnThemedIdx ) )
+aCharStyleProperties.assignUsed( *pCharProps );
+SAL_INFO("oox.drawingml", OSL_THIS_FUNC << "use font 
color");
+aCharStyleProperties.maCharColor.assignIfUsed( 
pFontRef->maPhClr );
+}
 }
 
 Reference < XTextCursor > xAt = xText->createTextCursor();
diff --git a/sd/qa/unit/data/pptx/bnc862510_6.pptx 
b/sd/qa/unit/data/pptx/bnc862510_6.pptx
new file mode 100644
index 000..fc5f008
Binary files /dev/null and b/sd/qa/unit/data/pptx/bnc862510_6.pptx differ
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index b601871..439f153 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -89,6 +89,7 @@ public:
 void testBnc584721_4();
 void testBnc904423();
 void testShapeLineStyle();
+void testBnc862510_6();
 
 CPPUNIT_TEST_SUITE(SdImportTest);
 CPPUNIT_TEST(testDocumentLayout);
@@ -118,6 +119,7 @@ public:
 CPPUNIT_TEST(testBnc584721_4);
 CPPUNIT_TEST(testBnc904423);
 CPPUNIT_TEST(testShapeLineStyle);
+CPPUNIT_TEST(testBnc862510_6);
 
 CPPUNIT_TEST_SUITE_END();
 };
@@ -993,6 +995,44 @@ void SdImportTest::testShapeLineStyle()
 xDocShRef->DoClose();
 }
 
+void SdImportTest::testBnc862510_6()
+{
+// Black text was imported instead of gray
+::sd::DrawDocShellRef xDocShRef = 
loadURL(getURLFromSrc("/sd/qa/unit/data/pptx/bnc862510_6.pptx"), PPTX);
+
+uno::Reference< drawing::XDrawPagesSupplier > xDoc(
+xDocShRef->GetDoc()->getUnoModel(), uno::UNO_QUERY_THROW );
+
+uno::Reference< drawing::XDrawPage > xPage(
+xDoc->getDrawPages()->getByIndex(0), uno::UNO_QUERY_THROW );
+
+uno::Reference< beans::XPropertySet > xShape(
+xPage->getByIndex(0), uno::UNO_QUERY );
+CPPUNIT_ASSERT_MESSAGE( "no shape", xShape.is() );
+
+// Get first paragraph of the text
+uno::Reference xText = 
uno::Reference(xShape, uno::UNO_QUERY)->getText();
+CPPUNIT_ASSERT_MESSAGE( "not a text shape", xText.is() );
+uno::Reference paraEnumAccess;
+paraEnumAccess.set(xText, uno::UNO_QUERY);
+uno::Reference paraEnum = 
paraEnumAccess->createEnumeration();
+uno::Reference const xParagraph(paraEnum->nextElement(),
+uno::UNO_QUERY_THROW);
+
+// Get first run of the paragraph
+uno::Reference xRunEnumAccess(xParagraph, 
uno::UNO_QUERY);
+uno::Reference xRunEnum = 
xRunEnumAccess->createEnumeration();
+uno::Reference xRun(xRunEnum->nextElement(), 
uno::UNO_QUERY);
+uno::Reference< beans::XPropertySet > xPropSet( xRun, uno::UNO_QUERY_THROW 
);
+sal_Int32 nCharColor;
+xPropSet->getPropertyValue( "CharColor" ) >>= nCharColor;
+
+// Color should be gray
+CPPUNIT_ASSERT_EQUAL( sal_Int32(0x8B8B8B), nCharColor );
+
+xDocShRef->DoClose();
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SdImportTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sw/source/filter/ascii/parasc.cxx |1 +
 sw/source/filter/ww8/ww8par.cxx   |9 -
 sw/source/filter/ww8/ww8scan.hxx  |2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 0b39d560da27ece227830a4bcc5556ae902a0921
Author: CaolÃ¡n McNamara 
Date:   Mon Jan 5 15:49:47 2015 +

valgrind: uninitialized read

on loading id:000386,src:00,op:havoc,rep:128.jpg as text

Change-Id: I98364ffbcc4ea788613cc8071c4d8774ba167033

diff --git a/sw/source/filter/ascii/parasc.cxx 
b/sw/source/filter/ascii/parasc.cxx
index 68d8b38..d4e5347 100644
--- a/sw/source/filter/ascii/parasc.cxx
+++ b/sw/source/filter/ascii/parasc.cxx
@@ -323,6 +323,7 @@ sal_uLong SwASCIIParser::ReadChars()
 sal_Size nNewLen = lGCount, nCntBytes;
 aWork.reset(new sal_Unicode[nNewLen + 1]); // add 1 for '\0'
 sal_Unicode* pBuf = aWork.get();
+pBuf[nNewLen] = 0; // ensure '\0'
 
 nNewLen = rtl_convertTextToUnicode( hConverter, hContext,
 pArr, lGCount, pBuf, nNewLen,
commit 615ba47c5937dd62573181a0404ae24968d7daec
Author: Justin Luth 
Date:   Fri Jan 2 07:44:33 2015 +0300

fdo#67870 WW8 filter: import zoom type

Change-Id: If919880b51bdb30d9afdb168dae8f84dbfe18524

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 1d7dcad..9faf655 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -81,6 +81,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -1901,7 +1902,13 @@ void SwWW8ImplReader::ImportDop()
 aViewProps[1].Name = "VisibleBottom";
 aViewProps[1].Value <<= sal_Int32(0);
 aViewProps[2].Name = "ZoomType";
-aViewProps[2].Value <<= sal_Int16(0);
+//Import zoom type
+switch (pWDop->zkSaved) {
+case 1:  aViewProps[2].Value <<= sal_Int16(SVX_ZOOM_WHOLEPAGE); 
break;
+case 2:  aViewProps[2].Value <<= sal_Int16(SVX_ZOOM_PAGEWIDTH); 
break;
+case 3:  aViewProps[2].Value <<= sal_Int16(SVX_ZOOM_OPTIMAL);   
break;
+default: aViewProps[2].Value <<= sal_Int16(SVX_ZOOM_PERCENT);   
break;
+}
 
 uno::Reference< uno::XComponentContext > 
xComponentContext(comphelper::getProcessComponentContext());
 uno::Reference xBox = 
document::IndexedPropertyValues::create(xComponentContext);
diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
index fb08c8e..642a56a 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -1628,7 +1628,7 @@ public:
 sal_Int32   lKeyProtDoc;//  document protection password key, 
only valid if dop.fProtEnabled, dop.fLockAtn or dop.fLockRev are 1.
 sal_uInt16  wvkSaved : 3;   //  document view kind: 0 Normal view, 
1 Outline view, 2 Page View
 sal_uInt16  wScaleSaved : 9;///< Specifies the zoom percentage that 
was in use when the document was saved.
-sal_uInt16  zkSaved : 2;
+sal_uInt16  zkSaved : 2;//  document zoom type: 0 percent, 1 
whole/entire page, 2 page width, 3 text width/optimal
 boolfRotateFontW6 : 1;
 booliGutterPos : 1 ;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 32664] Keyboard volume keys don't work when LibreOffice is in focus

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

--- Comment #56 from mreeu...@yahoo.com ---
With the newest version of LibreOffice (v4.3.5.2) this bug is still a problem.
Either LibreOffice is getting keyboard input from the wrong place, or they do
it wrong. 

I saw  response (Comment 1) about "generalizing as unlike any other program".
I've tried and used thousands of programs, applications. None had this problem.
Apparently none of the programmers on this even HAS a media keyboard. 

This bug is there already for 4 years. FOUR YEARS. And should be very easy to
solve. 

Older bugs should get automatically a higher priority to solve over time. After
4 years it should be Importance: "highest / blocker"

How are any changes ever even being considered if older bugs are never solved.
Sure OpenOffice has the same problem, but why would LibreOffice need
"OpenOffice's permission" to improve... tho it was the entire point of the
initiative...

-- 
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: review or revert request

2015-01-05 Thread Miklos Vajna

Hi Michael,

On Tue, Dec 30, 2014 at 05:53:06PM +, Michael Meeks 
 wrote:
>   Quick nearly-new-year cockup; I just pushed a couple of commits to
> libreoffice-4-4 by mistake (push tree on the wrong branch) without
> review; hashes / commit msg appended.

Makes sense to me.

Regards,

Miklos


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

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

2015-01-05 Thread Tor Lillqvist

 bridges/source/jni_uno/jni_info.h |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ee75c0d0aabc934d1cad95cd4bf41a80500f546a
Author: Tor Lillqvist 
Date:   Mon Jan 5 16:08:07 2015 +0200

Fix build error with libstdc++ 4.7 and Clang

Using std::unordered_map causes a complex multi-line error message, call to
implicitly-deleted copy constructor of 'jni_uno::JNI_type_info_holder' etc.

Revert ce7f442bd0b600c0acc74d4757e894a2ba382c53 for one source file.

Change-Id: I24453498d3fcaadf900f2bb56a2812f8bce55dd4

diff --git a/bridges/source/jni_uno/jni_info.h 
b/bridges/source/jni_uno/jni_info.h
index 1e5b4e8..e38c4b3 100644
--- a/bridges/source/jni_uno/jni_info.h
+++ b/bridges/source/jni_uno/jni_info.h
@@ -23,7 +23,7 @@
 #include 
 
 #include 
-#include 
+#include 
 
 #include "jni_base.h"
 
@@ -114,7 +114,7 @@ struct JNI_type_info_holder: private boost::noncopyable
 {}
 };
 
-typedef std::unordered_map<
+typedef ::boost::unordered_map<
 OUString, JNI_type_info_holder, OUStringHash > t_str2type;
 
 class JNI_info: private boost::noncopyable
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 3 commits - filter/source sc/source vcl/source

 filter/source/graphicfilter/itiff/itiff.cxx |   11 +--
 sc/source/filter/excel/xistring.cxx |6 +++---
 vcl/source/filter/ixpm/xpmread.cxx  |4 +++-
 3 files changed, 11 insertions(+), 10 deletions(-)

New commits:
commit 76b878d66dfb464accc4d1ce83b0d1f5c1094abc
Author: CaolÃ¡n McNamara 
Date:   Fri Dec 19 09:52:39 2014 +

valgrind: initialize these

Change-Id: I6440832fe508689ffa8e20fa17827528331e3585
(cherry picked from commit 2645b1979365085edf4a94500f2c610bfc4e668b)

diff --git a/sc/source/filter/excel/xistring.cxx 
b/sc/source/filter/excel/xistring.cxx
index 6bb003f..dc903c5 100644
--- a/sc/source/filter/excel/xistring.cxx
+++ b/sc/source/filter/excel/xistring.cxx
@@ -120,7 +120,7 @@ void XclImpString::ReadFormats( XclImpStream& rStrm, 
XclFormatRunVec& rFormats,
 {
 for( sal_uInt16 nIdx = 0; nIdx < nRunCount; ++nIdx )
 {
-sal_uInt16 nChar, nFontIdx;
+sal_uInt16 nChar(0), nFontIdx(0);
 rStrm >> nChar >> nFontIdx;
 AppendFormat( rFormats, nChar, nFontIdx );
 }
@@ -129,7 +129,7 @@ void XclImpString::ReadFormats( XclImpStream& rStrm, 
XclFormatRunVec& rFormats,
 {
 for( sal_uInt16 nIdx = 0; nIdx < nRunCount; ++nIdx )
 {
-sal_uInt8 nChar, nFontIdx;
+sal_uInt8 nChar(0), nFontIdx(0);
 rStrm >> nChar >> nFontIdx;
 AppendFormat( rFormats, nChar, nFontIdx );
 }
@@ -144,7 +144,7 @@ void XclImpString::ReadObjFormats( XclImpStream& rStrm, 
XclFormatRunVec& rFormat
 rFormats.reserve( nRunCount );
 for( sal_uInt16 nIdx = 0; nIdx < nRunCount; ++nIdx )
 {
-sal_uInt16 nChar, nFontIdx;
+sal_uInt16 nChar(0), nFontIdx(0);
 rStrm >> nChar >> nFontIdx;
 rStrm.Ignore( 4 );
 AppendFormat( rFormats, nChar, nFontIdx );
commit f997c9fb5078d529f61eecb19f6b8ad0fc15314e
Author: Markus Mohrhard 
Date:   Sun Dec 28 20:16:17 2014 +0100

check size before looking into the string

Found by Asan. e.g moz233272-2.xpm

Change-Id: Ic563db41dbd4ce7250492e99f3e48a203cfdcf00
Reviewed-on: https://gerrit.libreoffice.org/13686
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 
(cherry picked from commit ba4b5741db25ff3b76a8d10d8f3745dfc1973749)
(cherry picked from commit cda3b8767fd8f5b43b1043852e9f90fd17a129f4)

diff --git a/vcl/source/filter/ixpm/xpmread.cxx 
b/vcl/source/filter/ixpm/xpmread.cxx
index 3a85978..ff42c2a 100644
--- a/vcl/source/filter/ixpm/xpmread.cxx
+++ b/vcl/source/filter/ixpm/xpmread.cxx
@@ -23,6 +23,7 @@
 #include "rgbtable.hxx"
 #define _XPMPRIVATE
 #include "xpmread.hxx"
+#include 
 
 // -
 // - XPMReader -
@@ -348,7 +349,8 @@ bool XPMReader::ImplGetColSub( sal_uInt8* pDest )
 {
 if ( pRGBTable[ i ].name == NULL )
 break;
-if ( pRGBTable[ i ].name[ mnParaSize ] == 0 )
+if ( std::strlen(pRGBTable[i].name) > mnParaSize &&
+pRGBTable[ i ].name[ mnParaSize ] == 0 )
 {
 if ( ImplCompare ( (unsigned char*)pRGBTable[ i ].name,
 mpPara, mnParaSize, XPMCASENONSENSITIVE ) )
commit d83cbc12afb9b6b91533d329015981d26adf8918
Author: CaolÃ¡n McNamara 
Date:   Mon Jan 5 10:56:32 2015 +

asan wrt mandriva57054-1.tiff

Change-Id: Ibb7ecfa637ff96fbda3a8ed5d67943ece28927e5
(cherry picked from commit f901624b5e13e300f8e2facd2a824202c21d9729)
Reviewed-on: https://gerrit.libreoffice.org/13739
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 

diff --git a/filter/source/graphicfilter/itiff/itiff.cxx 
b/filter/source/graphicfilter/itiff/itiff.cxx
index aa80b09..54efd86 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -934,23 +934,22 @@ sal_Bool TIFFReader::ConvertScanline( sal_uLong nY )
 {
 case 8 :
 {
-sal_uInt8 nLast;
 if ( bByteSwap )
 {
 if ( nPredictor == 2 )
 {
-nLast = BYTESWAP( (sal_uInt8)*pt++ );
+sal_uInt8 nLast = 0;
 for ( nx = 0; nx < nImageWidth; nx++ )
 {
+nLast += nx == 0 ? BYTESWAP( (sal_uInt8)*pt++ 
) : *pt++;
 pAcc->SetPixelIndex( nY, nx, nLast );
-nLast = nLast + *pt++;
 }
 }
 else
 {
 for ( nx = 0; nx < nImageWidth; nx++ )
 {
-nLast = *pt++;
+sal_uInt8 nLast = *pt++;

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

 filter/source/graphicfilter/itiff/itiff.cxx |   11 +--
 1 file changed, 5 insertions(+), 6 deletions(-)

New commits:
commit f28a5e89eb668b702e90beb58276cef5d74a6d18
Author: CaolÃ¡n McNamara 
Date:   Mon Jan 5 10:56:32 2015 +

asan wrt mandriva57054-1.tiff

Change-Id: Ibb7ecfa637ff96fbda3a8ed5d67943ece28927e5
(cherry picked from commit f901624b5e13e300f8e2facd2a824202c21d9729)
Reviewed-on: https://gerrit.libreoffice.org/13739
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 

diff --git a/filter/source/graphicfilter/itiff/itiff.cxx 
b/filter/source/graphicfilter/itiff/itiff.cxx
index 4122ab2..1d532cc 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -926,23 +926,22 @@ bool TIFFReader::ConvertScanline( sal_uLong nY )
 {
 case 8 :
 {
-sal_uInt8 nLast;
 if ( bByteSwap )
 {
 if ( nPredictor == 2 )
 {
-nLast = BYTESWAP( (sal_uInt8)*pt++ );
+sal_uInt8 nLast = 0;
 for ( nx = 0; nx < nImageWidth; nx++ )
 {
+nLast += nx == 0 ? BYTESWAP( (sal_uInt8)*pt++ 
) : *pt++;
 pAcc->SetPixelIndex( nY, nx, nLast );
-nLast = nLast + *pt++;
 }
 }
 else
 {
 for ( nx = 0; nx < nImageWidth; nx++ )
 {
-nLast = *pt++;
+sal_uInt8 nLast = *pt++;
 pAcc->SetPixelIndex( nY, nx, 
static_cast( (BYTESWAP((sal_uLong)nLast) - nMinSampleValue) * 
nMinMax ) );
 }
 }
@@ -951,11 +950,11 @@ bool TIFFReader::ConvertScanline( sal_uLong nY )
 {
 if ( nPredictor == 2 )
 {
-nLast = *pt++;
+sal_uInt8 nLast = 0;
 for ( nx = 0; nx < nImageWidth; nx++ )
 {
+nLast += *pt++;
 pAcc->SetPixelIndex( nY, nx, nLast );
-nLast = nLast + *pt++;
 }
 }
 else
___
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' - filter/source

 filter/source/graphicfilter/itiff/itiff.cxx |   11 +--
 1 file changed, 5 insertions(+), 6 deletions(-)

New commits:
commit 75bec3ec6a5aa4f792e8bc81bc441254d9aff18c
Author: CaolÃ¡n McNamara 
Date:   Mon Jan 5 10:56:32 2015 +

asan wrt mandriva57054-1.tiff

Change-Id: Ibb7ecfa637ff96fbda3a8ed5d67943ece28927e5
(cherry picked from commit f901624b5e13e300f8e2facd2a824202c21d9729)
Reviewed-on: https://gerrit.libreoffice.org/13738
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 

diff --git a/filter/source/graphicfilter/itiff/itiff.cxx 
b/filter/source/graphicfilter/itiff/itiff.cxx
index 719f51d..9dfa328 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -928,23 +928,22 @@ bool TIFFReader::ConvertScanline( sal_uLong nY )
 {
 case 8 :
 {
-sal_uInt8 nLast;
 if ( bByteSwap )
 {
 if ( nPredictor == 2 )
 {
-nLast = BYTESWAP( (sal_uInt8)*pt++ );
+sal_uInt8 nLast = 0;
 for ( nx = 0; nx < nImageWidth; nx++ )
 {
+nLast += nx == 0 ? BYTESWAP( (sal_uInt8)*pt++ 
) : *pt++;
 pAcc->SetPixelIndex( nY, nx, nLast );
-nLast = nLast + *pt++;
 }
 }
 else
 {
 for ( nx = 0; nx < nImageWidth; nx++ )
 {
-nLast = *pt++;
+sal_uInt8 nLast = *pt++;
 pAcc->SetPixelIndex( nY, nx, 
static_cast( (BYTESWAP((sal_uLong)nLast) - nMinSampleValue) * 
nMinMax ) );
 }
 }
@@ -953,11 +952,11 @@ bool TIFFReader::ConvertScanline( sal_uLong nY )
 {
 if ( nPredictor == 2 )
 {
-nLast = *pt++;
+sal_uInt8 nLast = 0;
 for ( nx = 0; nx < nImageWidth; nx++ )
 {
+nLast += *pt++;
 pAcc->SetPixelIndex( nY, nx, nLast );
-nLast = nLast + *pt++;
 }
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-01-05 Thread Lionel Elie Mamane

 connectivity/source/drivers/file/FResultSet.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit b00f2bbf9b970115da4452ea0aab93b1c8da7b11
Author: Lionel Elie Mamane 
Date:   Mon Jan 5 15:08:22 2015 +0100

fdo#80968 file resultset seek table to before beginning on opening resultset

Change-Id: I73abbc7cfe0804e729a711a247b6e085b4e41d95

diff --git a/connectivity/source/drivers/file/FResultSet.cxx 
b/connectivity/source/drivers/file/FResultSet.cxx
index 4e44f5e..afc9d96 100644
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -1296,6 +1296,7 @@ bool OResultSet::OpenImpl()
 m_nRowPos = -1;
 m_nFilePos  = 0;
 m_nRowCountResult = -1;
+m_pTable->seekRow(IResultSetHelper::ABSOLUTE1, 0, m_nFilePos);
 
 m_nLastVisitedPos = m_pTable->getCurrentLastPos();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 47302] Adding a new field in "Insert->Fields"

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

Sean Carlos  changed:

   What|Removed |Added

 Blocks||88056

-- 
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: ScFormulaCell size foo ...

2015-01-05 Thread Kohei Yoshida

Hi Eike,

On Fri, 2015-01-02 at 19:30 +0100, Eike Rathke wrote:
> If the ScFormulaCell instances were still allocated from the shared
> mempool we'd also have slightly less allocation overhead with the
> current code, but that is unrelated to the observation made here.
> Since
> introduction of #ifdef USE_MEMPOOL in sc/inc/formulacell.hxx and
> sc/source/core/data/formulacell.cxx the shared mempool is disabled.
> Why anyway?

I don't know who this question is directed at, but in case it's me, I
don't remember why, and if you believe enabling it would improve the
memory foot print, I'm all for it.  If there was any reason why, it
wouldn't be anything significant anyway.

Kohei

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

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

 oox/source/drawingml/textparagraphproperties.cxx|   12 +
 oox/source/drawingml/textparagraphpropertiescontext.cxx |5 +-
 sd/qa/unit/data/pptx/bnc862510_7.pptx   |binary
 sd/qa/unit/import-tests.cxx |   35 
 4 files changed, 51 insertions(+), 1 deletion(-)

New commits:
commit 50c9a8bf7473bf369ccd7e3060ef732ac6cf58f5
Author: Zolnai TamÃ¡s 
Date:   Mon Dec 22 18:30:43 2014 +0100

bnc#862510: PPTX import: Wrong text horizontal adjustment inside shape.

When alignment is not specified, it should be set to the
default "left" value just on time, when properties are
pushed to the property set, otherwise uninitialized value
is better.

(cherry picked from commit 7a64988dbc7a1542aa38f0e8f9a8a47941fbc67d)

Conflicts:
sd/qa/unit/import-tests.cxx

Conflicts:
sd/qa/unit/import-tests.cxx

Change-Id: Ic294c5d7cc477f7515aea1c071ad9b67275c012d
Reviewed-on: https://gerrit.libreoffice.org/13607
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/oox/source/drawingml/textparagraphproperties.cxx 
b/oox/source/drawingml/textparagraphproperties.cxx
index 76e1622..1e26066 100644
--- a/oox/source/drawingml/textparagraphproperties.cxx
+++ b/oox/source/drawingml/textparagraphproperties.cxx
@@ -28,6 +28,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "oox/helper/helper.hxx"
 #include "oox/helper/propertyset.hxx"
@@ -380,6 +381,8 @@ void TextParagraphProperties::apply( const 
TextParagraphProperties& rSourceProps
 moFirstLineIndentation = rSourceProps.moFirstLineIndentation;
 if( rSourceProps.mnLevel )
 mnLevel = rSourceProps.mnLevel;
+if( rSourceProps.moParaAdjust )
+moParaAdjust = rSourceProps.moParaAdjust;
 }
 
 void TextParagraphProperties::pushToPropSet( const ::oox::core::XmlFilterBase* 
pFilterBase,
@@ -477,6 +480,15 @@ void TextParagraphProperties::pushToPropSet( const 
::oox::core::XmlFilterBase* p
 aPropSet.setProperty( PROP_ParaTabStops, aSeq );
 }
 }
+
+if ( moParaAdjust )
+{
+aPropSet.setProperty( PROP_ParaAdjust, moParaAdjust.get());
+}
+else
+{
+aPropSet.setProperty( PROP_ParaAdjust, 
com::sun::star::style::ParagraphAdjust_LEFT);
+}
 }
 
 float TextParagraphProperties::getCharHeightPoints( float fDefault ) const
diff --git a/oox/source/drawingml/textparagraphpropertiescontext.cxx 
b/oox/source/drawingml/textparagraphpropertiescontext.cxx
index e592841..390cb16 100644
--- a/oox/source/drawingml/textparagraphpropertiescontext.cxx
+++ b/oox/source/drawingml/textparagraphpropertiescontext.cxx
@@ -54,7 +54,10 @@ 
TextParagraphPropertiesContext::TextParagraphPropertiesContext( ContextHandler2H
 PropertyMap& rPropertyMap( 
mrTextParagraphProperties.getTextParagraphPropertyMap() );
 
 // ST_TextAlignType
-rPropertyMap.setProperty( PROP_ParaAdjust, GetParaAdjust( 
rAttribs.getToken( XML_algn, XML_l ) ));
+if ( rAttribs.hasAttribute( XML_algn ) )
+{
+mrTextParagraphProperties.getParaAdjust() = GetParaAdjust( 
rAttribs.getToken( XML_algn, XML_l ) );
+}
 // TODO see to do the same with RubyAdjust
 
 // ST_Coordinate32
diff --git a/sd/qa/unit/data/pptx/bnc862510_7.pptx 
b/sd/qa/unit/data/pptx/bnc862510_7.pptx
new file mode 100644
index 000..0eb3bbe
Binary files /dev/null and b/sd/qa/unit/data/pptx/bnc862510_7.pptx differ
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index e5ab540..4ff2da3 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -53,6 +53,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -98,6 +99,7 @@ public:
 void testBnc904423();
 void testShapeLineStyle();
 void testBnc862510_6();
+void testBnc862510_7();
 #if !defined WNT
 void testBnc822341();
 #endif
@@ -137,6 +139,7 @@ public:
 CPPUNIT_TEST(testBnc904423);
 CPPUNIT_TEST(testShapeLineStyle);
 CPPUNIT_TEST(testBnc862510_6);
+CPPUNIT_TEST(testBnc862510_7);
 #if !defined WNT
 CPPUNIT_TEST(testBnc822341);
 #endif
@@ -1291,6 +1294,38 @@ void SdFiltersTest::testBnc862510_6()
 xDocShRef->DoClose();
 }
 
+void SdFiltersTest::testBnc862510_7()
+{
+// Title shape's text was aligned to left instead of center.
+::sd::DrawDocShellRef xDocShRef = 
loadURL(getURLFromSrc("/sd/qa/unit/data/pptx/bnc862510_7.pptx"));
+
+uno::Reference< drawing::XDrawPagesSupplier > xDoc(
+xDocShRef->GetDoc()->getUnoModel(), uno::UNO_QUERY_THROW );
+
+uno::Reference< drawing::XDrawPage > xPage(
+xDoc->getDrawPages()->getByIndex(0), uno::UNO_QUERY_THROW );
+
+uno::Reference< beans::XPropertySet > xShape(
+xPage->getByIndex(0), uno::UNO_QUERY );
+CPPUNIT_ASSERT_MESSAGE( "no shape", xShape.is() );
+
+// Get first paragraph
+uno::Reference xText = 
uno::Reference(xShape, uno::UNO_QUERY)->getText();
+CPPUNIT_ASSERT_

Re: build process stopped athsqldb_empty.odb

On 26.12.2014 04:57, aron wrote:
> My configure is 
> --with-visual-studio=2012
> --with-ant-home=/cygdrive/c/ant
> --without-junit
> --disable-directx
> --disable-atl
> --disable-activex
> --with-external-tar=/cygdrive/d/lo/lo-external
> --with-build-version="2014-12-26"
> --enable-pch
> --enable-symbols
> --with-windows-sdk=7.1A
> 
> Could anyone help me?
> Best regards
> 
> 2014-12-25 14:05 GMT+09:00 aron  >:
> 
> Hi
> I can' t build libreoffice-4.2.7.2 and 4.2.8.2, The build process
> always stopped when this window showed..
> 
> 
> When I force closed this window I got this error message

> Error: a unit test failed, please do one of:
> 
> export DEBUGCPPUNIT=TRUE# for exception catching
> export CPPUNITTRACE="gdb --args" # for interactive debugging on linux
> export CPPUNITTRACE=""[full path to devenv.exe]" /debugexe" # for
> interactive debugging in Visual Studio
> export VALGRIND=memcheck# for memory checking
> 
> and retry using: make CppunitTest_dbaccess_hsqldb_test
> 
> make[1]: ***
> [D:/lo/lo-core/workdir/CppunitTest/dbaccess_hsqldb_test.test] Error 1
> make[1]: *** Waiting for unfinished jobs

in order to finish your build you can just edit
"dbaccess/Module_dbaccess.mk" and remove the
"CppunitTest_dbaccess_hsqldb_test \" line to disable the test.

if you want to find out why the test fails, wait until it hangs and
attach Visual Studio debugger to the cppunittester.exe process; likely
it's some sort of deadlock. ...but it won't be fixed on the 4.2 release
branch now, would only be interesting if you can reproduce it on master.

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

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

 oox/source/drawingml/shape.cxx|   13 ++-
 sd/qa/unit/data/pptx/bnc862510_6.pptx |binary
 sd/qa/unit/import-tests.cxx   |   40 ++
 3 files changed, 48 insertions(+), 5 deletions(-)

New commits:
commit 4679ba35ad02a720789a8d0c571fafe4122d91a2
Author: Zolnai TamÃ¡s 
Date:   Mon Dec 22 17:53:00 2014 +0100

bnc#862510: PPTX import: Wrong text color inside shape

When theme index is 0, it means it's unset so we should not
apply that.

(cherry picked from commit 89206c472ecf18bfde6824cea8004921cd404365)

Conflicts:
sd/qa/unit/import-tests.cxx

Conflicts:
sd/qa/unit/import-tests.cxx

Change-Id: I62a9cd2a9b4c19f5acffc334d5e8263fe24fc8fd
Reviewed-on: https://gerrit.libreoffice.org/13606
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 93e9789..ef0feb7 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -1027,11 +1027,14 @@ Reference< XShape > Shape::createAndInsert(
 TextCharacterProperties aCharStyleProperties;
 if( const ShapeStyleRef* pFontRef = getShapeStyleRef( 
XML_fontRef ) )
 {
-if( pTheme )
-if( const TextCharacterProperties* pCharProps = 
pTheme->getFontStyle( pFontRef->mnThemedIdx ) )
-aCharStyleProperties.assignUsed( *pCharProps );
-SAL_INFO("oox.drawingml", OSL_THIS_FUNC << "use font 
color");
-aCharStyleProperties.maCharColor.assignIfUsed( 
pFontRef->maPhClr );
+if( pFontRef->mnThemedIdx != 0 )
+{
+if( pTheme )
+if( const TextCharacterProperties* pCharProps = 
pTheme->getFontStyle( pFontRef->mnThemedIdx ) )
+aCharStyleProperties.assignUsed( *pCharProps );
+SAL_INFO("oox.drawingml", OSL_THIS_FUNC << "use font 
color");
+aCharStyleProperties.maCharColor.assignIfUsed( 
pFontRef->maPhClr );
+}
 }
 
 Reference < XTextCursor > xAt = xText->createTextCursor();
diff --git a/sd/qa/unit/data/pptx/bnc862510_6.pptx 
b/sd/qa/unit/data/pptx/bnc862510_6.pptx
new file mode 100644
index 000..fc5f008
Binary files /dev/null and b/sd/qa/unit/data/pptx/bnc862510_6.pptx differ
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 68a205e..e5ab540 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -97,6 +97,7 @@ public:
 void testFdo79731();
 void testBnc904423();
 void testShapeLineStyle();
+void testBnc862510_6();
 #if !defined WNT
 void testBnc822341();
 #endif
@@ -135,6 +136,7 @@ public:
 CPPUNIT_TEST(testFdo79731);
 CPPUNIT_TEST(testBnc904423);
 CPPUNIT_TEST(testShapeLineStyle);
+CPPUNIT_TEST(testBnc862510_6);
 #if !defined WNT
 CPPUNIT_TEST(testBnc822341);
 #endif
@@ -1251,6 +1253,44 @@ void SdFiltersTest::testShapeLineStyle()
 xDocShRef->DoClose();
 }
 
+void SdFiltersTest::testBnc862510_6()
+{
+// Black text was imported instead of gray
+::sd::DrawDocShellRef xDocShRef = 
loadURL(getURLFromSrc("/sd/qa/unit/data/pptx/bnc862510_6.pptx"));
+
+uno::Reference< drawing::XDrawPagesSupplier > xDoc(
+xDocShRef->GetDoc()->getUnoModel(), uno::UNO_QUERY_THROW );
+
+uno::Reference< drawing::XDrawPage > xPage(
+xDoc->getDrawPages()->getByIndex(0), uno::UNO_QUERY_THROW );
+
+uno::Reference< beans::XPropertySet > xShape(
+xPage->getByIndex(0), uno::UNO_QUERY );
+CPPUNIT_ASSERT_MESSAGE( "no shape", xShape.is() );
+
+// Get first paragraph of the text
+uno::Reference xText = 
uno::Reference(xShape, uno::UNO_QUERY)->getText();
+CPPUNIT_ASSERT_MESSAGE( "not a text shape", xText.is() );
+uno::Reference paraEnumAccess;
+paraEnumAccess.set(xText, uno::UNO_QUERY);
+uno::Reference paraEnum = 
paraEnumAccess->createEnumeration();
+uno::Reference const xParagraph(paraEnum->nextElement(),
+uno::UNO_QUERY_THROW);
+
+// Get first run of the paragraph
+uno::Reference xRunEnumAccess(xParagraph, 
uno::UNO_QUERY);
+uno::Reference xRunEnum = 
xRunEnumAccess->createEnumeration();
+uno::Reference xRun(xRunEnum->nextElement(), 
uno::UNO_QUERY);
+uno::Reference< beans::XPropertySet > xPropSet( xRun, uno::UNO_QUERY_THROW 
);
+sal_Int32 nCharColor;
+xPropSet->getPropertyValue( "CharColor" ) >>= nCharColor;
+
+// Color should be black
+CPPUNIT_ASSERT_EQUAL( sal_Int32(0x8B8B8B), nCharColor );
+
+xDocShRef->DoClose();
+}
+
 #if !defined WNT
 
 void SdFiltersTest::testBnc822341()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lis

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

 cppu/source/cppu/cppu_opt.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9a6e2dd9e743157e00490d825502efaa21a75c25
Author: Stephan Bergmann 
Date:   Mon Jan 5 14:48:29 2015 +0100

Missing const

Change-Id: I8a1c520023b493c0494ac2ac650542d8ecc11c5d

diff --git a/cppu/source/cppu/cppu_opt.cxx b/cppu/source/cppu/cppu_opt.cxx
index 2d53721..3344143 100644
--- a/cppu/source/cppu/cppu_opt.cxx
+++ b/cppu/source/cppu/cppu_opt.cxx
@@ -55,7 +55,7 @@ extern "C" CPPU_DLLPUBLIC rtl_uString * SAL_CALL 
cppu_unsatisfied_iset_msg(
 
 
 extern "C" CPPU_DLLPUBLIC rtl_uString * SAL_CALL 
cppu_Any_extraction_failure_msg(
-uno_Any * pAny, typelib_TypeDescriptionReference * pType )
+uno_Any const * pAny, typelib_TypeDescriptionReference * pType )
 SAL_THROW_EXTERN_C()
 {
 OUStringBuffer buf;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: undefined reference to non-virtual thunk

On 16.12.2014 08:22, Kostas Tamateas wrote:
> Hello everyone,
> 
> I'm trying to build libreoffice-4.3.41 sources.
> My system is a Debian distribution 32-bit with gcc 4.9.1 and my configure is 
> this:
> 
> ../autogen.sh --enable-release-build --enable-mergelibs=yes --without-java 
> --without-junit --without-doxygen --disable-gconf --disable-firebird-sdbc 
> --disable-postgresql-sdbc --disable-collada --disable-dbus --disable-gtk 
> --disable-randr --disable-gltf --disable-liblangtag --disable-gstreamer 
> --disable-kdeab --disable-tdeab  --disable-systray --disable-coinmp 
> --disable-lpsolve --disable-sdremote --disable-cve-tests --disable-orcus 
> --disable-graphite --disable-odk --disable-cups --with-system-libs 
> --without-boost-date-time --without-boost-iostreams --disable-pdfimport 
> --disable-opengl --disable-opencl --disable-gstreamer-0-10 --with-webdav=neon
> 
> After long time I get this message:
> 
> /libreoffice-4.3.4.1/workdir/CxxObject/svx/source/fmcomp/fmgridif.o: 
> In function 
> `FmXGridControl::createPeer(com::sun::star::uno::Reference
>  const&, com::sun::star::uno::Reference 
> const&)':
> fmgridif.cxx:(.text+0x87dc): undefined reference to `non-virtual thunk to 
> WindowListenerMultiplexer::acquire()'
> fmgridif.cxx:(.text+0x8837): undefined reference to `non-virtual thunk to 
> FocusListenerMultiplexer::acquire()'
> fmgridif.cxx:(.text+0x8892): undefined reference to `non-virtual thunk to 
> KeyListenerMultiplexer::acquire()'
> fmgridif.cxx:(.text+0x88ed): undefined reference to `non-virtual thunk to 
> MouseListenerMultiplexer::acquire()'
> fmgridif.cxx:(.text+0x8948): undefined reference to `non-virtual thunk to 
> MouseMotionListenerMultiplexer::acquire()'
> fmgridif.cxx:(.text+0x89a3): undefined reference to `non-virtual thunk to 
> PaintListenerMultiplexer::acquire()'
> collect2: error: ld returned 1 exit status
> 
> Is a possible way to fix that problem ?

i think that this commit was intended to help here but i've never had
the problem myself so maybe it doesn't work - the commit is only in the
libreoffice-4-4 and master branches so you could try to "git
cherry-pick" it to libreoffice-4-3 and tell us if that helps.


commit bb182b47ca7362b05c03d583d3547643d9a99562
Author: Michael Stahl 
AuthorDate: Thu Aug 7 21:18:56 2014 +0200

toolkit: export some ListenerMultiplexer types

These are used from svx and apparently some (buggy?) toolchains fail
with
fmgridif.cxx:: undefined reference to `non-virtual thunk
 to WindowListenerMultiplexer::acquire()'
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'feature/vclref' - compilerplugins/clang

 compilerplugins/clang/vclwidgets.cxx |   86 +++
 1 file changed, 86 insertions(+)

New commits:
commit dc5e94a88b314238d267ad515497f63c34ae880a
Author: Noel Grandin 
Date:   Mon Jul 21 08:27:11 2014 +0200

new loplugin: VCL widget reference checker

First stage of new VCL widget reference checker

Change-Id: I63a2108a26b3c0e0a896d13672b1daa6f8e60b3a

diff --git a/compilerplugins/clang/vclwidgets.cxx 
b/compilerplugins/clang/vclwidgets.cxx
new file mode 100644
index 000..e7de68e
--- /dev/null
+++ b/compilerplugins/clang/vclwidgets.cxx
@@ -0,0 +1,86 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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 
+
+#include "plugin.hxx"
+#include "compat.hxx"
+#include "clang/AST/CXXInheritance.h"
+
+// Final goal: Checker for VCL widget references. Makes sure that VCL Window 
subclasses are properly referenced counted and dispose()'ed.
+//
+// But at the moment it just finds subclasses of Window which are not 
heap-allocated
+//
+// TODO do I need to check for local and static variables, too ?
+// TODO when we have a dispose() method, verify that the dispose() methods 
releases all of the Window references
+// TODO when we have a dispose() method, verify that it calls the super-class 
dispose() method at some point.
+
+namespace {
+
+class VCLWidgets:
+public RecursiveASTVisitor, public loplugin::Plugin
+{
+public:
+explicit VCLWidgets(InstantiationData const & data): Plugin(data) {}
+
+virtual void run() override { 
TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); }
+
+bool VisitFieldDecl(const FieldDecl * decl);
+
+bool mbFoundWindow;
+};
+
+bool forallBasesCallback(const CXXBaseSpecifier *Specifier, CXXBasePath &, 
void *UserData) {
+VCLWidgets* ro = (VCLWidgets*) UserData;
+QualType qt = Specifier->getType();
+std::string name = 
qt.getUnqualifiedType().getCanonicalType().getAsString();
+if (name == "class Window") {
+  ro->mbFoundWindow = true;
+  return true;
+}
+return false;
+}
+
+bool VCLWidgets::VisitFieldDecl(const FieldDecl * fieldDecl) {
+if (ignoreLocation(fieldDecl)) {
+return true;
+}
+if (fieldDecl->isBitField()) {
+return true;
+}
+const RecordType *recordType = fieldDecl->getType()->getAs();
+if (recordType == nullptr) {
+return true;
+}
+const CXXRecordDecl *recordDecl = 
dyn_cast(recordType->getDecl());
+if (recordDecl == nullptr) {
+return true;
+}
+// check if this field is derived from Window
+mbFoundWindow = false;
+CXXBasePaths paths;
+recordDecl->lookupInBases(forallBasesCallback, this, paths);
+if (!mbFoundWindow) {
+return true;
+}
+
+report(
+DiagnosticsEngine::Warning,
+"vcl::Window subclass allocated as a class member, should be allocated 
via VclReference.",
+fieldDecl->getLocation())
+  << fieldDecl->getSourceRange();
+return true;
+}
+
+
+loplugin::Plugin::Registration< VCLWidgets > X("vclwidgets");
+
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/vclref' - include/vcl vcl/qa vcl/source vcl/unx

 include/vcl/dialog.hxx  |4 -
 include/vcl/edit.hxx|4 -
 include/vcl/layout.hxx  |4 -
 include/vcl/vclref.hxx  |   20 +++--
 vcl/qa/cppunit/lifecycle.cxx|2 
 vcl/source/app/dbggui.cxx   |2 
 vcl/source/control/combobox.cxx |8 +--
 vcl/source/control/edit.cxx |   74 ++--
 vcl/source/window/layout.cxx|   50 
 vcl/unx/generic/app/i18n_status.cxx |2 
 10 files changed, 90 insertions(+), 80 deletions(-)

New commits:
commit 4e490ebab4001ef8d95a4eb3e94e98ddb56f9335
Author: Noel Grandin 
Date:   Mon Jan 5 14:29:59 2015 +0200

vcl: add cast operator to VclReference to convert to pointer

so we don't have to call .get() everywhere

Change-Id: If6ccd7dcf1a492b1e7703956ecbe8e5ac2dd0fb7

diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx
index d9cb949..c87adad 100644
--- a/include/vcl/dialog.hxx
+++ b/include/vcl/dialog.hxx
@@ -90,8 +90,8 @@ public:
 
 virtual void queue_resize(StateChangedType eReason = 
StateChangedType::LAYOUT) SAL_OVERRIDE;
 virtual bool set_property(const OString &rKey, const OString &rValue) 
SAL_OVERRIDE;
-VclButtonBox* get_action_area() { return mpActionArea.get(); }
-VclBox* get_content_area() { return mpContentArea.get(); }
+VclButtonBox* get_action_area() { return mpActionArea; }
+VclBox* get_content_area() { return mpContentArea; }
 
 virtual boolClose() SAL_OVERRIDE;
 
diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx
index 93868c7..62d0730 100644
--- a/include/vcl/edit.hxx
+++ b/include/vcl/edit.hxx
@@ -187,7 +187,7 @@ public:
 
 virtual voidSetModifyFlag();
 virtual voidClearModifyFlag();
-virtual boolIsModified() const { return mpSubEdit.get() ? 
mpSubEdit->mbModified : mbModified; }
+virtual boolIsModified() const { return mpSubEdit ? 
mpSubEdit->mbModified : mbModified; }
 
 virtual voidEnableUpdateData( sal_uLong nTimeout = 
EDIT_UPDATEDATA_TIMEOUT );
 virtual voidDisableUpdateData() { delete mpUpdateDataTimer; 
mpUpdateDataTimer = NULL; }
@@ -237,7 +237,7 @@ public:
 virtual voidSetUpdateDataHdl( const Link& rLink ) { 
maUpdateDataHdl = rLink; }
 
 voidSetSubEdit( VclReference pEdit );
-Edit*   GetSubEdit() const { return mpSubEdit.get(); }
+Edit*   GetSubEdit() const { return mpSubEdit; }
 
 boost::signals2::signal< void ( Edit* ) > autocompleteSignal;
 AutocompleteAction  GetAutocompleteAction() const { return 
meAutocompleteAction; }
diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index 843366b..d8d5e5f0 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -572,8 +572,8 @@ public:
 virtual vcl::Window *get_child() SAL_OVERRIDE;
 virtual const vcl::Window *get_child() const SAL_OVERRIDE;
 virtual bool set_property(const OString &rKey, const OString &rValue) 
SAL_OVERRIDE;
-ScrollBar& getVertScrollBar() { return *m_pVScroll.get(); }
-ScrollBar& getHorzScrollBar() { return *m_pHScroll.get(); }
+ScrollBar& getVertScrollBar() { return *m_pVScroll; }
+ScrollBar& getHorzScrollBar() { return *m_pHScroll; }
 Size getVisibleChildSize() const;
 //set to true to disable the built-in scrolling callbacks to allow the user
 //to override it
diff --git a/include/vcl/vclref.hxx b/include/vcl/vclref.hxx
index b8c15ea..0827af6 100644
--- a/include/vcl/vclref.hxx
+++ b/include/vcl/vclref.hxx
@@ -111,26 +111,36 @@ public:
 inline VclReference(
 const VclReference< derived_type > & rRef,
 typename ::vcl::detail::UpCast< reference_type, derived_type >::t = 0 )
-: m_rInnerRef( static_cast(rRef.get()) )
+: m_rInnerRef( static_cast(rRef) )
 {
 }
 
+/** Probably most common used: handle->someBodyOp().
+ */
+inline reference_type * SAL_CALL operator->() const
+{
+return m_rInnerRef.get();
+}
+
 /** Get the body. Can be used instead of operator->().
  I.e. handle->someBodyOp() and handle.get()->someBodyOp()
  are the same.
- */
+  */
 inline reference_type * SAL_CALL get() const
 {
 return m_rInnerRef.get();
 }
 
-/** Probably most common used: handle->someBodyOp().
- */
-inline reference_type * SAL_CALL operator->() const
+inline SAL_CALL operator reference_type * () const
 {
 return m_rInnerRef.get();
 }
 
+inline SAL_CALL operator bool () const
+{
+return m_rInnerRef.get() != NULL;
+}
+
 inline void disposeAndClear()
 {
 // hold it alive for the lifetime of this method
diff --git a/vcl/qa/cppunit/lifecycle.cxx b/vcl/qa/cppunit/lifecycle.cxx
index a2d75df..c4eef2e 100644
--- a/vcl/qa/cppunit/lifecycle.cxx
+++ b/vcl/qa/cppunit/lifecycle.cxx
@@ -90,7 +90,7 @@ void LifecycleT

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

 cppu/source/uno/lbenv.cxx |   12 +---
 1 file changed, 5 insertions(+), 7 deletions(-)

New commits:
commit f76f40560ef49c3da864073285ebe6b9a0cfad5f
Author: Stephan Bergmann 
Date:   Mon Jan 5 14:02:27 2015 +0100

More unnamed namespace clean-up

Change-Id: Iaba8b9b3415c357990b795b6f23b98929ac5e00a

diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx
index f9f1107..e8fa57d 100644
--- a/cppu/source/uno/lbenv.cxx
+++ b/cppu/source/uno/lbenv.cxx
@@ -133,11 +133,7 @@ struct EnvironmentsData
 bool isDisposing;
 };
 
-namespace
-{
-struct theEnvironmentsData : public rtl::Static< EnvironmentsData, 
theEnvironmentsData > {};
-}
-
+struct theEnvironmentsData : public rtl::Static< EnvironmentsData, 
theEnvironmentsData > {};
 
 struct uno_DefaultEnvironment : public uno_ExtEnvironment
 {
@@ -696,6 +692,7 @@ static void writeLine(
 writeLine( stream, aLine.getStr(), pFilter );
 }
 
+}
 
 extern "C" void SAL_CALL uno_dumpEnvironment(
 void * stream, uno_Environment * pEnv, const sal_Char * pFilter )
@@ -839,14 +836,14 @@ namespace
 };
 
 class theStaticOIdPart : public rtl::Static 
{};
-}
-
 
 inline static const OUString & unoenv_getStaticOIdPart()
 {
 return theStaticOIdPart::get().getOIdPart();
 }
 
+}
+
 extern "C"
 {
 
@@ -902,6 +899,7 @@ static void SAL_CALL unoenv_releaseInterface(
 }
 }
 
+namespace {
 
 EnvironmentsData::~EnvironmentsData()
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 cppu/source/uno/lbenv.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 406629e9a00ca51c65645c8cc230c0f8a7e9263f
Author: Stephan Bergmann 
Date:   Mon Jan 5 13:53:26 2015 +0100

These extern "C" functions are not in an unnamed namespace

Change-Id: I185b29c185094176e0992fc84c9cc82ff93de9c2

diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx
index ebbe602..f9f1107 100644
--- a/cppu/source/uno/lbenv.cxx
+++ b/cppu/source/uno/lbenv.cxx
@@ -1077,6 +1077,7 @@ static bool loadEnv(OUString const  & cLibStem,
 return true;
 }
 
+}
 
 extern "C"
 {
@@ -1179,6 +1180,4 @@ void SAL_CALL uno_getRegisteredEnvironments(
 
 } // extern "C"
 
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 cppu/source/uno/data.cxx |   15 +++
 1 file changed, 7 insertions(+), 8 deletions(-)

New commits:
commit debced0f2916f7cb412e6bfcb514e3017adc7202
Author: Stephan Bergmann 
Date:   Mon Jan 5 13:47:38 2015 +0100

These extern "C" functions are not in namespace cppu

Change-Id: Ia98b32bd8451051750fbf810958bdcfe584ea7be

diff --git a/cppu/source/uno/data.cxx b/cppu/source/uno/data.cxx
index f90a41c..d69bfb6 100644
--- a/cppu/source/uno/data.cxx
+++ b/cppu/source/uno/data.cxx
@@ -173,6 +173,8 @@ bool equalSequence(
 return _equalSequence( pDest, pSource, pElementType, queryInterface, 
release );
 }
 
+}
+
 extern "C"
 {
 
@@ -318,16 +320,13 @@ sal_Bool SAL_CALL uno_type_isAssignableFromData(
 _release( p, release );
 return (0 != p);
 }
-}
-
-
-
-
-
 
+}
 
 #if OSL_DEBUG_LEVEL > 1
 
+namespace cppu {
+
 #if defined( SAL_W32)
 #pragma pack(push, 8)
 #endif
@@ -591,8 +590,8 @@ BinaryCompatible_Impl::BinaryCompatible_Impl()
 
 static BinaryCompatible_Impl aTest;
 
-#endif
-
 }
 
+#endif
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - external/libvisio

 external/libvisio/UnpackedTarball_libvisio.mk |4 
 external/libvisio/vsd-msvc-max.patch.1|   19 +++
 2 files changed, 23 insertions(+)

New commits:
commit cf171c203d0cb46db946bdcd81cd84f027a7e917
Author: CaolÃ¡n McNamara 
Date:   Fri Jan 2 19:07:35 2015 +

workaround error C2589: Â´(Â´ : illegal token on right side of Â´::Â´

Change-Id: I3654a4eb4caa3a987f6d797c9bcb577c6fd6b426
(cherry picked from commit 1fc30a25e2c69fe8b365300b0784f3a282183e80)

diff --git a/external/libvisio/UnpackedTarball_libvisio.mk 
b/external/libvisio/UnpackedTarball_libvisio.mk
index e4c0561..3190833 100644
--- a/external/libvisio/UnpackedTarball_libvisio.mk
+++ b/external/libvisio/UnpackedTarball_libvisio.mk
@@ -11,4 +11,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libvisio))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,libvisio,$(VISIO_TARBALL)))
 
+$(eval $(call gb_UnpackedTarball_add_patches,libvisio,\
+   external/libvisio/vsd-msvc-max.patch.1 \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/external/libvisio/vsd-msvc-max.patch.1 
b/external/libvisio/vsd-msvc-max.patch.1
new file mode 100644
index 000..7d22ea1
--- /dev/null
+++ b/external/libvisio/vsd-msvc-max.patch.1
@@ -0,0 +1,19 @@
+--- a/src/lib/VSDContentCollector.cpp
 b/src/lib/VSDContentCollector.cpp
+@@ -2256,14 +2256,14 @@
+ styleProps.insert("draw:marker-start-viewbox", 
_linePropertiesMarkerViewbox(style.startMarker));
+ styleProps.insert("draw:marker-start-path", 
_linePropertiesMarkerPath(style.startMarker));
+ double w =  
m_scale*_linePropertiesMarkerScale(style.startMarker)*(0.1/(style.width*style.width+1)+2.54*style.width);
+-styleProps.insert("draw:marker-start-width", std::max(w, 0.05));
++styleProps.insert("draw:marker-start-width", (std::max)(w, 0.05));
+   }
+   if (style.endMarker > 0)
+   {
+ styleProps.insert("draw:marker-end-viewbox", 
_linePropertiesMarkerViewbox(style.endMarker));
+ styleProps.insert("draw:marker-end-path", 
_linePropertiesMarkerPath(style.endMarker));
+ double w =  
m_scale*_linePropertiesMarkerScale(style.endMarker)*(0.1/(style.width*style.width+1)+2.54*style.width);
+-styleProps.insert("draw:marker-end-width", std::max(w, 0.05));
++styleProps.insert("draw:marker-end-width", (std::max)(w, 0.05));
+   }
+ 
+   int dots1 = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx   |4 ++--
 bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx |5 ++---
 bridges/source/cpp_uno/gcc3_ios_arm/except.cxx |6 ++
 bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx  |5 ++---
 bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx |6 ++
 bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx  |1 -
 bridges/source/cpp_uno/gcc3_linux_arm/except.cxx   |6 ++
 bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx |1 -
 bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx  |6 ++
 bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx  |6 ++
 bridges/source/cpp_uno/gcc3_linux_intel/except.cxx |5 ++---
 bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx |1 -
 bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx  |6 ++
 bridges/source/cpp_uno/gcc3_linux_mips/except.cxx  |6 ++
 bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx   |6 ++
 bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx |6 ++
 bridges/source/cpp_uno/gcc3_linux_s390/except.cxx  |6 ++
 bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx |6 ++
 bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx |6 ++
 bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx  |1 -
 bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx   |5 ++---
 bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx   |6 ++
 bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx   |6 ++
 bridges/source/cpp_uno/mingw_intel/except.cxx  |6 ++
 bridges/source/cpp_uno/mingw_x86-64/cpp2uno.cxx|1 -
 bridges/source/cpp_uno/mingw_x86-64/except.cxx |6 ++
 bridges/source/cpp_uno/msvc_win32_intel/except.cxx |5 ++---
 bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx|5 ++---
 bridges/source/cpp_uno/shared/vtablefactory.cxx|4 ++--
 bridges/source/jni_uno/jni_info.h  |4 ++--
 30 files changed, 50 insertions(+), 93 deletions(-)

New commits:
commit ce7f442bd0b600c0acc74d4757e894a2ba382c53
Author: CaolÃ¡n McNamara 
Date:   Mon Jan 5 08:15:57 2015 +

boost::unordered_map->std::unordered_map

Change-Id: I3a16703727f1a421e0ed18079e14219a4feeb8c8

diff --git a/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx 
b/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx
index 1e9a488..4216566 100644
--- a/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx
+++ b/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx
@@ -26,7 +26,7 @@
 #include "sal/types.h"
 #include "typelib/typedescription.hxx"
 
-#include 
+#include 
 
 /*See: http://people.redhat.com/drepper/selinux-mem.html*/
 #if defined(LINUX) || defined(OPENBSD) || defined(FREEBSD) \
@@ -207,7 +207,7 @@ private:
 static void flushCode(
 unsigned char const * begin, unsigned char const * end);
 
-typedef boost::unordered_map< OUString, Vtables, OUStringHash > Map;
+typedef std::unordered_map< OUString, Vtables, OUStringHash > Map;
 
 osl::Mutex m_mutex;
 Map m_map;
diff --git a/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx 
b/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx
index 8d74357..2e22d92 100644
--- a/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx
@@ -21,7 +21,6 @@
 #include 
 #include 
 #include 
-#include 
 
 #include 
 #include 
@@ -30,7 +29,7 @@
 #include 
 #include 
 #include 
-
+#include 
 #include "share.hxx"
 #include 
 
@@ -89,7 +88,7 @@ static OUString toUNOname( char const * p )
 
 class RTTI
 {
-typedef boost::unordered_map< OUString, type_info *, OUStringHash > 
t_rtti_map;
+typedef std::unordered_map< OUString, type_info *, OUStringHash > 
t_rtti_map;
 
 Mutex m_mutex;
 t_rtti_map m_rttis;
diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx 
b/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
index d20bf42..8085445 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
@@ -22,8 +22,6 @@
 #include 
 
 #include 
-#include 
-
 #include 
 #include 
 #include 
@@ -35,7 +33,7 @@
 #include 
 #include 
 #include 
-
+#include 
 #include "share.hxx"
 
 using namespace ::osl;
@@ -130,7 +128,7 @@ static OUString toUNOname( char const * p )
 
 class RTTI
 {
-typedef boost::unordered_map< OUString, std::type_info *, OUStringHash > 
t_rtti_map;
+typedef std::unordered_map< OUString, std::type_info *, OUStringHash > 
t_rtti_map;
 
 Mutex m_mutex;
 t_rtti_map m_rttis;
diff --git a/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx 
b/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
index cdfaea2..1620467 100644
--- a/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
@@ -27,7 +27,6 @@
 #include 
 #include 
 
-#include 
 #include 
 #include

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

 cppu/source/uno/data.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit da2d66ce567460806c09ed2d936a98092ee059ff
Author: Stephan Bergmann 
Date:   Mon Jan 5 13:32:42 2015 +0100

include

Change-Id: I77d06a70f9c000f800b9b31d3b04aafe77754446

diff --git a/cppu/source/uno/data.cxx b/cppu/source/uno/data.cxx
index 68c6d87..f90a41c 100644
--- a/cppu/source/uno/data.cxx
+++ b/cppu/source/uno/data.cxx
@@ -22,8 +22,8 @@
 #include 
 
 #include "cppu/macros.hxx"
-
 #include "osl/mutex.hxx"
+#include "uno/data.h"
 
 #include "constr.hxx"
 #include "destr.hxx"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/vclref' - include/vcl vcl/qa vcl/source

 include/vcl/vclref.hxx   |   61 +++
 vcl/qa/cppunit/lifecycle.cxx |   14 ++---
 vcl/source/window/layout.cxx |   14 -
 3 files changed, 77 insertions(+), 12 deletions(-)

New commits:
commit 39354e856a1135aa83e92072c86e4344ac30eef4
Author: Noel Grandin 
Date:   Mon Jan 5 14:01:17 2015 +0200

vcl: implement upcasting of VclReference types

to make code less verbose

Change-Id: I0e28bfc412d50e798e6c215434cffc2183b104a6

diff --git a/include/vcl/vclref.hxx b/include/vcl/vclref.hxx
index ba3fdaa..b8c15ea 100644
--- a/include/vcl/vclref.hxx
+++ b/include/vcl/vclref.hxx
@@ -22,6 +22,52 @@
 
 #include 
 
+/// @cond INTERNAL
+namespace vcl { namespace detail {
+
+// A mechanism to enable up-casts, used by the VclReference conversion 
constructor,
+// heavily borrowed from boost::is_base_and_derived
+// (which manages to avoid compilation problems with ambiguous bases and cites
+// comp.lang.c++.moderated mail  "SuperSubclass
+// (is_base_and_derived) complete implementation!" by Rani Sharoni and cites
+// Aleksey Gurtovoy for the workaround for MSVC), to avoid including Boost
+// headers in URE headers (could ultimately be based on C++11 std::is_base_of):
+
+template< typename T1, typename T2 > struct UpCast {
+private:
+template< bool, typename U1, typename > struct C
+{ typedef U1 t; };
+
+template< typename U1, typename U2 > struct C< false, U1, U2 >
+{ typedef U2 t; };
+
+struct S { char c[2]; };
+
+#if defined _MSC_VER
+static char f(T2 *, long);
+static S f(T1 * const &, int);
+#else
+template< typename U > static char f(T2 *, U);
+static S f(T1 *, int);
+#endif
+
+struct H {
+H(); // avoid C2514 "class has no constructors" from MSVC 2008
+#if defined _MSC_VER
+operator T1 * const & () const;
+#else
+operator T1 * () const;
+#endif
+operator T2 * ();
+};
+
+public:
+typedef typename C< sizeof (f(H(), 0)) == 1, void *, void >::t t;
+};
+
+}; }; // namespace detail, namespace vcl
+
 /**
  * A thin wrapper around rtl::Reference to implement the acquire and dispose 
semantics we want for references to vcl::Window subclasses.
  * @param reference_type must be a subclass of vcl::Window
@@ -53,6 +99,21 @@ public:
 : m_rInnerRef (handle.m_rInnerRef)
 {}
 
+/** Up-casting conversion constructor: Copies interface reference.
+
+Does not work for up-casts to ambiguous bases.  For the special case of
+up-casting to Reference< XInterface >, see the corresponding conversion
+operator.
+
+@param rRef another reference
+*/
+template< class derived_type >
+inline VclReference(
+const VclReference< derived_type > & rRef,
+typename ::vcl::detail::UpCast< reference_type, derived_type >::t = 0 )
+: m_rInnerRef( static_cast(rRef.get()) )
+{
+}
 
 /** Get the body. Can be used instead of operator->().
  I.e. handle->someBodyOp() and handle.get()->someBodyOp()
diff --git a/vcl/qa/cppunit/lifecycle.cxx b/vcl/qa/cppunit/lifecycle.cxx
index e054672..a2d75df 100644
--- a/vcl/qa/cppunit/lifecycle.cxx
+++ b/vcl/qa/cppunit/lifecycle.cxx
@@ -29,6 +29,7 @@ public:
 void testParentedWidgets();
 
 CPPUNIT_TEST_SUITE(LifecycleTest);
+CPPUNIT_TEST(testCast);
 CPPUNIT_TEST(testMultiDispose);
 CPPUNIT_TEST(testIsolatedWidgets);
 CPPUNIT_TEST(testParentedWidgets);
@@ -38,12 +39,15 @@ public:
 // A compile time sanity check
 void LifecycleTest::testCast()
 {
-//VclReference xButton(new PushButton(NULL, 0));
-//VclReference xWindow(xButton);
+VclReference xButton(new PushButton(NULL, 0));
+VclReference xWindow(xButton);
 
-//VclReference xField(new MetricField(NULL, 0));
-//VclReference xSpin(xField);
-//VclReference xEdit(xField);
+VclReference xField(new MetricField(NULL, 0));
+VclReference xSpin(xField);
+VclReference xEdit(xField);
+
+// the following line should NOT compile
+//VclReference xButton2(xWindow);
 }
 
 void LifecycleTest::testMultiDispose()
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index efe3adf..30c616c3 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -2165,33 +2165,33 @@ short MessageDialog::Execute()
 case VCL_BUTTONS_NONE:
 break;
 case VCL_BUTTONS_OK:
-pBtn = PushButtonPtr(new OKButton(pButtonBox));
+pBtn = new OKButton(pButtonBox);
 pBtn->SetStyle(pBtn->GetStyle() & WB_DEFBUTTON);
 pBtn->Show();
 m_aOwnedButtons.push_back(pBtn);
 m_aResponses[pBtn.get()] = RET_OK;
 break;
 case VCL_BUTTONS_CLOSE:
-pBtn = PushButtonPtr(new CloseButton(pButtonBox));
+pBtn = new

[Libreoffice-commits] core.git: chart2/source compilerplugins/clang connectivity/source cppu/source desktop/source editeng/source helpcompiler/source registry/source sc/source sfx2/source svtools/sour

 chart2/source/tools/_serviceregistration_tools.cxx  |2 
 compilerplugins/clang/store/revisibility.cxx|   71 
++
 connectivity/source/drivers/hsqldb/HStorageAccess.cxx   |   20 +-
 connectivity/source/drivers/hsqldb/StorageFileAccess.cxx|6 
 connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx |   14 -
 cppu/source/typelib/static_types.cxx|   16 +-
 cppu/source/typelib/typelib.cxx |   52 +++
 cppu/source/uno/EnvDcp.c|4 
 cppu/source/uno/EnvStack.cxx|   10 -
 cppu/source/uno/any.cxx |   16 +-
 cppu/source/uno/data.cxx|   26 +--
 cppu/source/uno/lbenv.cxx   |   10 -
 cppu/source/uno/lbmap.cxx   |8 -
 desktop/source/pkgchk/unopkg/unopkg_app.cxx |2 
 editeng/source/outliner/outlvw.cxx  |4 
 helpcompiler/source/HelpLinker.cxx  |2 
 registry/source/reflread.cxx|   70 
-
 registry/source/reflwrit.cxx|   20 +-
 registry/source/registry.cxx|   24 +--
 sc/source/filter/ftools/ftools.cxx  |2 
 sc/source/ui/drawfunc/fuins1.cxx|2 
 sfx2/source/dialog/dialoghelper.cxx |8 -
 sfx2/source/doc/docinf.cxx  |6 
 svtools/source/misc/langtab.cxx |2 
 svx/source/engine3d/helperhittest3d.cxx |2 
 svx/source/table/tabledesign.cxx|2 
 svx/source/xoutdev/xattrbmp.cxx |2 
 sw/source/core/doc/dbgoutsw.cxx |   54 +++
 sw/source/core/sw3io/sw3convert.cxx |2 
 sw/source/filter/basflt/fltini.cxx  |4 
 sw/source/uibase/envelp/envimg.cxx  |2 
 toolkit/source/helper/formpdfexport.cxx |2 
 tools/source/debug/debug.cxx|2 
 vcl/source/gdi/bitmapex.cxx |4 
 vcl/source/gdi/gdimetafiletools.cxx |2 
 vcl/source/gdi/sallayout.cxx|4 
 vcl/source/gdi/svgdata.cxx  |2 
 vcl/source/helper/canvastools.cxx   |8 -
 writerfilter/source/dmapper/DomainMapper_Impl.cxx   |1 
 39 files changed, 280 insertions(+), 210 deletions(-)

New commits:
commit 9720e8e5ef49ee56e3612123a52b4a464d5e96ad
Author: Stephan Bergmann 
Date:   Mon Jan 5 13:05:50 2015 +0100

Some loplugin:revisibility clean-up

Stumbled across such redundant visibility re-specifications when looking at 
the
odd case of cppu_unsatisfied_iquery_msg declared CPPU_DLLPUBLIC in
cppu/source/cppu/cppu_opt.cxx and used in inline code in
include/com/sun/star/uno/Reference.hxx with only a declaration lacking
CPPU_DLLPUBLIC visible, and wondering how that actually works on Windows.

However, this plugin is probably not worth it being run all the time, so
committing it to compilerplugins/clang/store/.

Change-Id: Ibc3c4e7499213de1b419ce7eb85455cb832e1510

diff --git a/chart2/source/tools/_serviceregistration_tools.cxx 
b/chart2/source/tools/_serviceregistration_tools.cxx
index 7870ad0..c50f461 100644
--- a/chart2/source/tools/_serviceregistration_tools.cxx
+++ b/chart2/source/tools/_serviceregistration_tools.cxx
@@ -182,7 +182,7 @@ static const struct ::cppu::ImplementationEntry 
g_entries_chart2_tools[] =
 // component exports
 extern "C"
 {
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL charttools_component_getFactory(
+void * SAL_CALL charttools_component_getFactory(
 const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
 return ::cppu::component_getFactoryHelper(
diff --git a/compilerplugins/clang/store/revisibility.cxx 
b/compilerplugins/clang/store/revisibility.cxx
new file mode 100644
index 000..11e3cc8
--- /dev/null
+++ b/compilerplugins/clang/store/revisibility.cxx
@@ -0,0 +1,71 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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 "plugin.hxx"
+
+// Find function declarations that redundantly re

[Libreoffice-commits] core.git: Changes to 'feature/tiled-editing'

New branch 'feature/tiled-editing' available with the following commits:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [libo-marketing-priv] Announcing Pebble Smartwatch Application for LibreOffice Impress

2015-01-05 Thread Michael Meeks

Hi Gulsah,

On Fri, 2015-01-02 at 13:53 -0500, Robinson Tryon wrote:
> On Fri, Jan 2, 2015 at 7:53 AM, Gülşah Köse  wrote:
> >...Libpebble’s license allows to use, copy, modify,
> > merge, publish, distribute, sublicense, and/or sell copies.

This is great.

> Yep, looks like the MIT license (but hard to read w/o the newlines):
> https://raw.githubusercontent.com/pebble/libpebble/master/LICENSE

That's no problem of course.

> > The files I got from this repository are under the libpebble directory
> > with its own license. I’ve used GPLv2.1 for my code.

We'd really prefer to use the MPLv2 (Mozilla Public License) - which is
a quad-license with the GPL/LGPL/AGPL - that just helps us avoid having
too many different license combinations around. It helps to have you in
this table & a quick statement to the list:

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

if you're ok with that :-)

I'd love to get you setup with commit access to push that into our
gerrit 'impress_remote' repository alongside the Android & iOS remotes:

https://gerrit.libreoffice.org/gitweb?p=impress_remote.git;a=summary

Are you interested in folding your work in up-stream & joining the
LibreOffice development team ? =) I hope so.

The first thing to do is to setup a gerrit commit account - which
should be reasonably easy; checkout:

https://wiki.documentfoundation.org/Development/gerrit/setup#Setting_yourself_up_for_gerrit_-_the_manual_way

And poke me / the list / Christian with your account name =)

Exciting stuff :-)

Michael.

-- 
 michael.me...@collabora.com  <><, Pseudo Engineer, itinerant idiot

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

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sd/uiconfig

 sd/uiconfig/sdraw/toolbar/toolbar.xml |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 10a202cbc1abee7963c58180e7791b480da817a2
Author: Yousuf Philips 
Date:   Thu Jan 1 04:52:36 2015 +0400

fdo#84909 remove insert image button from shapes toolbar (4.4)

Change-Id: Ib9f1d45cef0715dd328a6fc197e532d17ff78487
Reviewed-on: https://gerrit.libreoffice.org/13713
Reviewed-by: Yousuf Philips 
Tested-by: Yousuf Philips 
(cherry picked from commit 382361a385a6a99ca71d9d589d6e402d5c0a007c)
Reviewed-on: https://gerrit.libreoffice.org/13735
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/sd/uiconfig/sdraw/toolbar/toolbar.xml 
b/sd/uiconfig/sdraw/toolbar/toolbar.xml
index afdf921..8340dcc 100644
--- a/sd/uiconfig/sdraw/toolbar/toolbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/toolbar.xml
@@ -46,7 +46,6 @@
  
  
  
- 
  
  
  
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry

 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 32fb1cd5041383908041811c58fdf8d06e75cc49
Author: Yousuf Philips 
Date:   Mon Jan 5 06:34:51 2015 +0400

Change accellator to best suit the Table menu bar

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

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 7ba3aee..758b2d0 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -374,7 +374,7 @@
   
   
 
-  ~Insert Table...
+  Insert ~Table...
 
 
   1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sw/uiconfig/sweb/toolbar/standardbar.xml |   16 
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit bc4210772aebbbc91dc10b11090086b6143a9dc5
Author: Yousuf Philips 
Date:   Mon Jan 5 07:04:11 2015 +0400

fdo#81475 Improvements to writer web standard toolbar

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

diff --git a/sw/uiconfig/sweb/toolbar/standardbar.xml 
b/sw/uiconfig/sweb/toolbar/standardbar.xml
index b1b2d7a..ada23cb 100644
--- a/sw/uiconfig/sweb/toolbar/standardbar.xml
+++ b/sw/uiconfig/sweb/toolbar/standardbar.xml
@@ -49,22 +49,22 @@
  
  
  
- 
- 
  
  
- 
- 
  
  
  
+ 
  
- 
- 
  
- 
- 
+ 
+ 
+ 
+ 
  
+ 
+ 
+ 
  
  
  
___
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' - tools/source

 tools/source/stream/stream.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a9b90e663b435c8104265482fed38c9c8f820853
Author: CaolÃ¡n McNamara 
Date:   Mon Jan 5 11:33:31 2015 +

valgrind: Conditional jump or move depends on uninitialised value

Change-Id: Id5125052b49e322cdfa2c7d55d68e8a7a512965c
(cherry picked from commit bd03af56780aae3159dac8e40ee937824be3e906)

diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx
index 864876f..faf6e09 100644
--- a/tools/source/stream/stream.cxx
+++ b/tools/source/stream/stream.cxx
@@ -811,7 +811,7 @@ bool SvStream::StartReadingUnicodeText( rtl_TextEncoding 
eReadBomCharSet )
 return true;// nothing to read
 
 bool bTryUtf8 = false;
-sal_uInt16 nFlag;
+sal_uInt16 nFlag(0);
 sal_sSize nBack = sizeof(nFlag);
 this->ReadUInt16( nFlag );
 switch ( nFlag )
@@ -848,7 +848,7 @@ bool SvStream::StartReadingUnicodeText( rtl_TextEncoding 
eReadBomCharSet )
 }
 if (bTryUtf8)
 {
-unsigned char nChar;
+unsigned char nChar(0);
 nBack += sizeof(nChar);
 this->ReadUChar( nChar );
 if (nChar == 0xbf)
___
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' - tools/source

 tools/source/stream/stream.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a623b0df102aa4530cd46322f03806dfaf267f6e
Author: CaolÃ¡n McNamara 
Date:   Mon Jan 5 11:33:31 2015 +

valgrind: Conditional jump or move depends on uninitialised value

Change-Id: Id5125052b49e322cdfa2c7d55d68e8a7a512965c
(cherry picked from commit bd03af56780aae3159dac8e40ee937824be3e906)

diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx
index e320f6f..00cd17e 100644
--- a/tools/source/stream/stream.cxx
+++ b/tools/source/stream/stream.cxx
@@ -810,7 +810,7 @@ bool SvStream::StartReadingUnicodeText( rtl_TextEncoding 
eReadBomCharSet )
 return true;// nothing to read
 
 bool bTryUtf8 = false;
-sal_uInt16 nFlag;
+sal_uInt16 nFlag(0);
 sal_sSize nBack = sizeof(nFlag);
 this->ReadUInt16( nFlag );
 switch ( nFlag )
@@ -847,7 +847,7 @@ bool SvStream::StartReadingUnicodeText( rtl_TextEncoding 
eReadBomCharSet )
 }
 if (bTryUtf8)
 {
-unsigned char nChar;
+unsigned char nChar(0);
 nBack += sizeof(nChar);
 this->ReadUChar( nChar );
 if (nChar == 0xbf)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 tools/source/stream/stream.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit bd03af56780aae3159dac8e40ee937824be3e906
Author: CaolÃ¡n McNamara 
Date:   Mon Jan 5 11:33:31 2015 +

valgrind: Conditional jump or move depends on uninitialised value

Change-Id: Id5125052b49e322cdfa2c7d55d68e8a7a512965c

diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx
index db4a398..7c5deac 100644
--- a/tools/source/stream/stream.cxx
+++ b/tools/source/stream/stream.cxx
@@ -811,7 +811,7 @@ bool SvStream::StartReadingUnicodeText( rtl_TextEncoding 
eReadBomCharSet )
 return true;// nothing to read
 
 bool bTryUtf8 = false;
-sal_uInt16 nFlag;
+sal_uInt16 nFlag(0);
 sal_sSize nBack = sizeof(nFlag);
 this->ReadUInt16( nFlag );
 switch ( nFlag )
@@ -848,7 +848,7 @@ bool SvStream::StartReadingUnicodeText( rtl_TextEncoding 
eReadBomCharSet )
 }
 if (bTryUtf8)
 {
-unsigned char nChar;
+unsigned char nChar(0);
 nBack += sizeof(nChar);
 this->ReadUChar( nChar );
 if (nChar == 0xbf)
___
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' - embeddedobj/source include/oox oox/source sd/CppunitTest_sd_import_tests.mk sd/qa

 embeddedobj/source/msole/oleembed.cxx |   11 +++
 include/oox/export/shapes.hxx |2 
 oox/source/export/shapes.cxx  |  114 +-
 sd/CppunitTest_sd_import_tests.mk |   41 
 sd/qa/unit/data/odp/bnc822341.odp |binary
 sd/qa/unit/import-tests.cxx   |   46 +
 6 files changed, 145 insertions(+), 69 deletions(-)

New commits:
commit 2f7a4c04c0531a74b92546a7b8808d03a51ecd99
Author: Zolnai TamÃ¡s 
Date:   Tue Dec 23 10:51:05 2014 +0100

bnc#822341: PPTX export of embedded text documents

-Make embedded text documents exported by analogy with spreadsheet
embedded documents.
-Convert MS ole objects to LO sepcific objecst to allow
exporting those ole objects too.

Plus use gb_CppunitTest_use_rdb instead of wasting time on
finding out which missing components cause test failing.
Especcially when we have platform dependent components
(e.g. related to embedded object)

(cherry picked from commit 0c3d5fb0ad35ff7fc18917fc86fa58d9312fe3ae)

Conflicts:
sd/CppunitTest_sd_export_tests.mk
sd/qa/unit/export-tests.cxx


ERROR: Attribute 'spid' must appear on element 'p:oleObj'.

As pointed out by CppunitTest_sd_export_tests.

(cherry picked from commit 124c33dd1d6bf2040f0153de8c9ecaebe759c3bd)

ERROR: Invalid content was found starting with element 'p:pic'.

Again, as pointed out by CppunitTest_sd_export_tests. Sadly it seems that 
the
spec and PowerPoint is not in sync here, so just do what makes both happy. 
This
fixes the --with-export-validation build.

(cherry picked from commit cf15306ccf49da290b391517e2c5dd22a4f1be45)

Change-Id: Ic76d659b51274777a1669c215344a1169ebcba81
Reviewed-on: https://gerrit.libreoffice.org/13601
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/embeddedobj/source/msole/oleembed.cxx 
b/embeddedobj/source/msole/oleembed.cxx
index 0527900..abe4a24 100644
--- a/embeddedobj/source/msole/oleembed.cxx
+++ b/embeddedobj/source/msole/oleembed.cxx
@@ -587,6 +587,17 @@ void SAL_CALL OleEmbeddedObject::changeState( sal_Int32 
nNewState )
 }
 }
 else
+#else
+// if it is possible, the object will be converted to OOo format
+if ( !m_bTriedConversion )
+{
+m_bTriedConversion = true;
+if ( TryToConvertToOOo() )
+{
+changeState( nNewState );
+return;
+}
+}
 #endif
 {
 throw embed::UnreachableStateException();
diff --git a/include/oox/export/shapes.hxx b/include/oox/export/shapes.hxx
index c7f8d15..bfc0cab 100644
--- a/include/oox/export/shapes.hxx
+++ b/include/oox/export/shapes.hxx
@@ -42,7 +42,7 @@ namespace oox { namespace drawingml {
 class OOX_DLLPUBLIC ShapeExport : public DrawingML {
 
 private:
-static int mnSpreadsheetCounter;
+static int mnEmbeddeDocumentCounter;
 struct ShapeCheck
 {
 bool operator()( const ::com::sun::star::uno::Reference< 
::com::sun::star::drawing::XShape> s1, const ::com::sun::star::uno::Reference< 
::com::sun::star::drawing::XShape> s2 ) const
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 82d2b5e..0b5a8ef 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -52,6 +52,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -121,7 +122,7 @@ namespace oox { namespace drawingml {
 mAny >>= variable;
 
 // not thread safe
-int ShapeExport::mnSpreadsheetCounter = 1;
+int ShapeExport::mnEmbeddeDocumentCounter = 1;
 
 ShapeExport::ShapeExport( sal_Int32 nXmlNamespace, FSHelperPtr pFS, 
ShapeHashMap* pShapeMap, XmlFilterBase* pFB, DocumentType eDocumentType, 
DMLTextExport* pTextExport )
 : DrawingML( pFS, pFB, eDocumentType, pTextExport )
@@ -978,47 +979,90 @@ ShapeExport& ShapeExport::WriteOLE2Shape( Reference< 
XShape > xShape )
 }
 else
 {
-// this part now supports only embedded spreadsheets, it can 
be extended to support remaining ooxml documents
-// only exporter, counter and object filename are specific to 
spreadsheet
-Reference< XSpreadsheetDocument > xSheetDoc( mAny, UNO_QUERY );
-if( xSheetDoc.is() && mpFB)
+const bool bSpreadSheet = Reference< XSpreadsheetDocument >( 
mAny, UNO_QUERY ).is();
+const bool bTextDocument = Reference< css::text::XTextDocument 
>( mAny, UNO_QUERY ).is();
+if( ( bSpreadSheet || bTextDocument ) && mpFB)
 {
 Reference< XComponent > xDocument( mAny, UNO_QUERY );
 if( xDocument.is() )
 {
-Reference< XOutputStream > xOutStream = 
mpFB->openFragmentStream( OUStringBuffer()
-

[Libreoffice-commits] core.git: Branch 'feature/vclref' - vcl/source

2015-01-05 Thread Michael Meeks

 vcl/source/control/edit.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 6747e0e1ecb00cfab170cf709d70c60c78e9f192
Author: Michael Meeks 
Date:   Mon Jan 5 11:31:16 2015 +

vcl: chain to parent dispose properly.

Change-Id: I74371118b679b06b9631e00d34c3f88e58bce24c

diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index b1e9c66..63d4857 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -279,6 +279,8 @@ void Edit::dispose()
 }
 
 SetType(WINDOW_WINDOW);
+
+Control::dispose();
 }
 
 void Edit::ImplInitEditData()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Looking to Get Involved

2015-01-05 Thread fellowtraveler

Hello All:

I’ve been looking to get involved for a while but I am not really sure where to
start, it will defiantly be small. ;) I’ve checked out and built the code and
I did run into a problem with one of the unit tests, the specific problem that
I am seeing was actually discussed on the list:

https://www.mail-archive.com/libreoffice@lists.freedesktop.org/msg133962.html

Incidentally, the result I get for the failed test, getXPath(pXmlDoc,
"//a:srcRect", "l").toInt32(), is:

25630
crop-pixel.docx,/Users/jdp/Development/libreoffice/core/sw/qa/extras/ooxmlexport/ooxmlexport.cxx:489:testCropPixel::Import_Export_Import
assertion failed
- Expression: getXPath(pXmlDoc, "//a:srcRect", "l").toInt32() <= 21856

I didn’t notice that this problem, if it is a problem, was resolved.

In any case, I looked through the list of Bugs on Bugzilla looking for Easy CPP
Hacks and found 87026. I’ve been looking at it and though it certainly appears
easy, I don’t really have any experience with Glade.

So I am wondering was there any resolution to the unit test problem that I saw,
can I provide any additional information that might fix it? Is there something
I might be able to do to fix it?

Regarding the 87026 task, I am interested in assisting; is there somewhere I
can get more information on the UI or someone who might be able to discuss it
with me? Or perhaps there is a better place for me to start.

Thanks. :)

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

[Bug 84938] replace #defined constants with ‘enum class’

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

--- Comment #14 from Commit Notification 
 ---
Noel Grandin committed a patch related to this issue.
It has been pushed to "master":

http://cgit.freedesktop.org/libreoffice/core/commit/?id=8130714148d58dd2bf1ef12dcc6dd6d5838be0d1

fdo#84938: replace NUMBERFORMAT_INT_ constants with 'enum class'

It will be available in 4.5.0.

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

[Libreoffice-commits] core.git: 2 commits - connectivity/source extensions/source filter/source forms/source include/svx include/tools sc/source sd/source shell/source starmath/source svtools/source s

 connectivity/source/drivers/dbase/DIndex.cxx|4 +-
 connectivity/source/drivers/dbase/DIndexes.cxx  |2 -
 connectivity/source/drivers/dbase/DTable.cxx|8 ++--
 extensions/source/scanner/sane.cxx  |2 -
 filter/source/graphicfilter/egif/egif.cxx   |2 -
 filter/source/graphicfilter/eos2met/eos2met.cxx |4 +-
 filter/source/graphicfilter/epbm/epbm.cxx   |   12 ++
 filter/source/graphicfilter/epgm/epgm.cxx   |   12 ++
 filter/source/graphicfilter/epict/epict.cxx |2 -
 filter/source/graphicfilter/eppm/eppm.cxx   |   12 ++
 filter/source/graphicfilter/eps/eps.cxx |2 -
 filter/source/graphicfilter/eras/eras.cxx   |6 +--
 filter/source/graphicfilter/etiff/etiff.cxx |6 +--
 filter/source/graphicfilter/expm/expm.cxx   |6 +--
 filter/source/graphicfilter/icgm/cgm.cxx|2 -
 filter/source/graphicfilter/ieps/ieps.cxx   |6 +--
 filter/source/graphicfilter/ios2met/ios2met.cxx |   12 ++
 filter/source/graphicfilter/ipbm/ipbm.cxx   |2 -
 filter/source/graphicfilter/ipcx/ipcx.cxx   |2 -
 filter/source/graphicfilter/ipict/ipict.cxx |   10 ++---
 filter/source/graphicfilter/ipsd/ipsd.cxx   |2 -
 filter/source/graphicfilter/iras/iras.cxx   |2 -
 filter/source/graphicfilter/itga/itga.cxx   |2 -
 filter/source/graphicfilter/itiff/itiff.cxx |   11 ++
 filter/source/xmlfilterdetect/filterdetect.cxx  |2 -
 forms/source/component/Grid.cxx |2 -
 forms/source/misc/InterfaceContainer.cxx|2 -
 include/svx/svdmodel.hxx|   44 
 include/tools/stream.hxx|   20 ++
 sc/source/filter/excel/xeescher.cxx |2 -
 sc/source/filter/excel/xiescher.cxx |2 -
 sc/source/filter/xcl97/xcl97esc.cxx |2 -
 sc/source/ui/docshell/docsh.cxx |4 +-
 sc/source/ui/inc/impex.hxx  |   14 ---
 sd/source/filter/ppt/propread.cxx   |2 -
 shell/source/win32/simplemail/senddoc.cxx   |4 +-
 shell/source/win32/workbench/TestSmplMail.cxx   |8 ++--
 starmath/source/eqnolefilehdr.cxx   |2 -
 starmath/source/mathtype.cxx|4 +-
 svtools/source/misc/imap.cxx|   16 
 svx/source/svdraw/svdmodel.cxx  |4 +-
 sw/source/core/edit/edglss.cxx  |4 +-
 sw/source/core/unocore/unoobj.cxx   |4 +-
 sw/source/filter/ascii/wrtasc.cxx   |3 +
 sw/source/filter/ww8/wrtw8esh.cxx   |6 +--
 sw/source/filter/ww8/wrtww8.cxx |6 +--
 sw/source/filter/ww8/ww8glsy.cxx|4 +-
 sw/source/filter/ww8/ww8par.cxx |   10 ++---
 sw/source/filter/ww8/ww8par4.cxx|6 +--
 sw/source/uibase/dochdl/swdtflvr.cxx|4 +-
 tools/qa/cppunit/test_stream.cxx|4 +-
 tools/source/generic/poly.cxx   |8 ++--
 tools/source/stream/stream.cxx  |   20 +-
 vcl/source/filter/graphicfilter.cxx |   10 ++---
 vcl/source/filter/graphicfilter2.cxx|   30 
 vcl/source/filter/igif/gifread.cxx  |6 +--
 vcl/source/filter/jpeg/Exif.cxx |2 -
 vcl/source/filter/wmf/wmf.cxx   |   12 +++---
 vcl/source/filter/wmf/wmfwr.cxx |2 -
 vcl/source/gdi/animate.cxx  |6 +--
 vcl/source/gdi/cvtsvm.cxx   |   14 +++
 vcl/source/gdi/dibtools.cxx |   12 +++---
 vcl/source/gdi/gdimtf.cxx   |   14 +++
 vcl/source/gdi/impgraph.cxx |   24 ++---
 vcl/source/gdi/pngread.cxx  |8 ++--
 vcl/source/gdi/pngwrite.cxx |6 +--
 vcl/source/opengl/OpenGLHelper.cxx  |2 -
 67 files changed, 237 insertions(+), 255 deletions(-)

New commits:
commit 8130714148d58dd2bf1ef12dcc6dd6d5838be0d1
Author: Noel Grandin 
Date:   Mon Jan 5 08:47:31 2015 +0200

fdo#84938: replace NUMBERFORMAT_INT_ constants with 'enum class'

Change-Id: I9c67de31f5571b282adc132d973b79bccb35fdc9

diff --git a/connectivity/source/drivers/dbase/DIndex.cxx 
b/connectivity/source/drivers/dbase/DIndex.cxx
index d28fa19..c5f876b 100644
--- a/connectivity/source/drivers/dbase/DIndex.cxx
+++ b/connectivity/source/drivers/dbase/DIndex.cxx
@@ -155,7 +155,7 @@ bool ODbaseIndex::openIndexFile()
 m_pFileStream = 
OFileTable::createStream_simpleError(sFile,STREAM_READ | STREAM_NOCREATE | 
STREAM_SHARE_DENYNONE);
 if(m_pFileStream)
 {
-
m_pFileStream->SetNumberFormatInt(NUMBERFORMAT_INT_LITTLEENDIAN);
+m_pFileStream->SetEndian(SvStreamEndian::LITTLE

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

 filter/source/graphicfilter/itiff/itiff.cxx |   11 +--
 1 file changed, 5 insertions(+), 6 deletions(-)

New commits:
commit f901624b5e13e300f8e2facd2a824202c21d9729
Author: CaolÃ¡n McNamara 
Date:   Mon Jan 5 10:56:32 2015 +

asan wrt mandriva57054-1.tiff

Change-Id: Ibb7ecfa637ff96fbda3a8ed5d67943ece28927e5

diff --git a/filter/source/graphicfilter/itiff/itiff.cxx 
b/filter/source/graphicfilter/itiff/itiff.cxx
index 19ab6c7..1582a11 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -927,23 +927,22 @@ bool TIFFReader::ConvertScanline( sal_uLong nY )
 {
 case 8 :
 {
-sal_uInt8 nLast;
 if ( bByteSwap )
 {
 if ( nPredictor == 2 )
 {
-nLast = BYTESWAP( (sal_uInt8)*pt++ );
+sal_uInt8 nLast = 0;
 for ( nx = 0; nx < nImageWidth; nx++ )
 {
+nLast += nx == 0 ? BYTESWAP( (sal_uInt8)*pt++ 
) : *pt++;
 pAcc->SetPixelIndex( nY, nx, nLast );
-nLast = nLast + *pt++;
 }
 }
 else
 {
 for ( nx = 0; nx < nImageWidth; nx++ )
 {
-nLast = *pt++;
+sal_uInt8 nLast = *pt++;
 pAcc->SetPixelIndex( nY, nx, 
static_cast( (BYTESWAP((sal_uLong)nLast) - nMinSampleValue) * 
nMinMax ) );
 }
 }
@@ -952,11 +951,11 @@ bool TIFFReader::ConvertScanline( sal_uLong nY )
 {
 if ( nPredictor == 2 )
 {
-nLast = *pt++;
+sal_uInt8 nLast = 0;
 for ( nx = 0; nx < nImageWidth; nx++ )
 {
+nLast += *pt++;
 pAcc->SetPixelIndex( nY, nx, nLast );
-nLast = nLast + *pt++;
 }
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sc/source/ui/optdlg/calcoptionsdlg.cxx |   56 -
 1 file changed, 56 deletions(-)

New commits:
commit 8d98f035cf6c410d4b29bd58d86cfe86127db68b
Author: Stephan Bergmann 
Date:   Mon Jan 5 11:50:51 2015 +0100

loplugin:unreffun

class OptionString unused since e224c9cb929cd744674b5d4d265cfb4680c82a2b
"Refactor OpenCL settings dialog"

Change-Id: I14e6adebaa7ea9d4e733b65ef4ca90e6fe6dbce2

diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx 
b/sc/source/ui/optdlg/calcoptionsdlg.cxx
index da171ca..287fccc 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.cxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx
@@ -35,62 +35,6 @@
 
 namespace {
 
-class OptionString : public SvLBoxString
-{
-OUString maDesc;
-OUString maValue;
-public:
-OptionString(const OUString& rDesc, const OUString& rValue) :
-maDesc(rDesc), maValue(rValue) {}
-
-void SetValue(const OUString &rValue) { maValue = rValue; }
-
-virtual void Paint(const Point& rPos, SvTreeListBox& rDev, const 
SvViewDataEntry* pView, const SvTreeListEntry* pEntry) SAL_OVERRIDE;
-
-virtual void InitViewData(SvTreeListBox* pView, SvTreeListEntry* pEntry, 
SvViewDataItem* pViewData) SAL_OVERRIDE;
-};
-
-void OptionString::InitViewData(
-SvTreeListBox* pView, SvTreeListEntry* pEntry, SvViewDataItem* pViewData)
-{
-if( !pViewData )
-pViewData = pView->GetViewDataItem( pEntry, this );
-
-OUString aDesc = maDesc + ": ";
-Size aDescSize(pView->GetTextWidth(aDesc), pView->GetTextHeight());
-
-vcl::Font aOldFont = pView->GetFont();
-vcl::Font aFont = aOldFont;
-aFont.SetWeight(WEIGHT_BOLD);
-//To not make the SvTreeListBox try and recalculate all rows, call the
-//underlying SetFont, we just want to know what size this text will be
-//and are going to reset the font to the original again afterwards
-pView->Control::SetFont(aFont);
-Size aValueSize(pView->GetTextWidth(maValue), pView->GetTextHeight());
-pView->Control::SetFont(aOldFont);
-
-pViewData->maSize = Size(aDescSize.Width() + aValueSize.Width(), 
std::max(aDescSize.Height(), aValueSize.Height()));
-}
-
-void OptionString::Paint(const Point& rPos, SvTreeListBox& rDev, const 
SvViewDataEntry* /*pView*/, const SvTreeListEntry* /*pEntry*/)
-{
-Point aPos = rPos;
-OUString aDesc = maDesc + ": ";
-rDev.DrawText(aPos, aDesc);
-
-aPos.X() += rDev.GetTextWidth(aDesc);
-vcl::Font aOldFont = rDev.GetFont();
-vcl::Font aFont = aOldFont;
-aFont.SetWeight(WEIGHT_BOLD);
-
-//To not make the SvTreeListBox try and recalculate all rows, call the
-//underlying SetFont, we are going to draw this string and then going to
-//reset the font to the original again afterwards
-rDev.Control::SetFont(aFont);
-rDev.DrawText(aPos, maValue);
-rDev.Control::SetFont(aOldFont);
-}
-
 formula::FormulaGrammar::AddressConvention toAddressConvention(sal_Int32 nPos)
 {
 switch (nPos)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 i18nlangtag/source/languagetag/languagetag.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit a4467f6997f716f580a10a9c20076391257d09f2
Author: Stephan Bergmann 
Date:   Mon Jan 5 11:47:54 2015 +0100

Add TODO comment for when liblangtag gets updated

Change-Id: Ic90a9e76c5b1ecbe58ff663ec8970841b7e33d2d

diff --git a/i18nlangtag/source/languagetag/languagetag.cxx 
b/i18nlangtag/source/languagetag/languagetag.cxx
index 96c53c6..e7989f1 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -25,6 +25,9 @@
 
 #if defined(ENABLE_LIBLANGTAG)
 #define LT_HAVE_INLINE
+// TODO: remove above line again for liblangtag >= 0.5.5, cf.
+//  "Fix a
+// build issue with inline keyword"
 #include 
 #else
 /* Replacement code for LGPL phobic and Android systems.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 cui/source/options/optopencl.cxx |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit c02033a4b5f314228a761184a92294a6402508b4
Author: Stephan Bergmann 
Date:   Mon Jan 5 11:20:53 2015 +0100

-Werror,-Warray-bounds

Change-Id: If1c3bfdf6bf256da69b0837070955fabbe773c9d

diff --git a/cui/source/options/optopencl.cxx b/cui/source/options/optopencl.cxx
index 5fe100e..63475ea 100644
--- a/cui/source/options/optopencl.cxx
+++ b/cui/source/options/optopencl.cxx
@@ -93,11 +93,11 @@ SvxOpenCLTabPage::SvxOpenCLTabPage(vcl::Window* pParent, 
const SfxItemSet& rSet)
 rWiBar.InsertItem( 5, mpDrvVersion->GetText(), 0, nHBits );
 
 long aTabs[] = {5, 0, 0, 0, 0, 0};
-aTabs[2] = rBlBar.GetTextWidth(rBlBar.GetItemText(1)) + 12;
-aTabs[3] = rBlBar.GetTextWidth(rBlBar.GetItemText(2)) + aTabs[2] + 12;
-aTabs[4] = rBlBar.GetTextWidth(rBlBar.GetItemText(3)) + aTabs[3] + 12;
-aTabs[5] = rBlBar.GetTextWidth(rBlBar.GetItemText(4)) + aTabs[4] + 12;
-aTabs[6] = rBlBar.GetTextWidth(rBlBar.GetItemText(5)) + aTabs[5] + 12;
+aTabs[1] = rBlBar.GetTextWidth(rBlBar.GetItemText(1)) + 12;
+aTabs[2] = rBlBar.GetTextWidth(rBlBar.GetItemText(2)) + aTabs[1] + 12;
+aTabs[3] = rBlBar.GetTextWidth(rBlBar.GetItemText(3)) + aTabs[2] + 12;
+aTabs[4] = rBlBar.GetTextWidth(rBlBar.GetItemText(4)) + aTabs[3] + 12;
+aTabs[5] = rBlBar.GetTextWidth(rBlBar.GetItemText(5)) + aTabs[4] + 12;
 mpBlackList->SetTabs(aTabs, MAP_PIXEL);
 mpWhiteList->SetTabs(aTabs, MAP_PIXEL);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac

2015-01-05 Thread dilfridge

 configure.ac |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit f53e79acd0d42f5c41e1104056af9cf23e9e2e2a
Author: Andreas K. Huettel (dilfridge) 
Date:   Sun Jan 4 15:33:35 2015 +0100

Replace bash-specific code from configure.ac, fixes build for sh=dash users

Original patch by RÃ©mi Cardona 

Change-Id: I815567df8a868c3997e8ac357b8529fded28c950
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=525454
Reviewed-on: https://gerrit.libreoffice.org/13731
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/configure.ac b/configure.ac
index 8aa33d0..5dbe640 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11483,9 +11483,8 @@ test_font_map()
 FONTFILE_LOWER="$(echo $FONTFILE | $AWK '{print tolower($0)}')"
 
 TESTEXPR="'${FONTFILE_LOWER}' = '$(echo $FONT | $AWK '{print 
tolower($0)}').ttf'"
-while true ; do
+while test "$#" -ge 1 ; do
 MAPPING="$(echo $1 | $AWK '{print tolower($0)}')"; shift
-test -n "$MAPPING" || break
 TESTEXPR="${TESTEXPR} -o '${FONTFILE_LOWER}' = '$MAPPING-regular.ttf'"
 done
 if test $TESTEXPR
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 39596] use the CLang++ static analyser to find bugs

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

Commit Notification  changed:

   What|Removed |Added

 Whiteboard|EasyHack DifficultyBeginner |EasyHack DifficultyBeginner
   |SkillScript SkillCpp|SkillScript SkillCpp
   ||target:4.5.0

-- 
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 39596] use the CLang++ static analyser to find bugs