[Libreoffice-commits] core.git: dbaccess/source reportdesign/source

[Noel Grandin]

 dbaccess/source/filter/xml/xmlExport.cxx |   10 +-
 reportdesign/source/filter/xml/xmlExport.cxx |   12 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 8b499cea76577b4221fccb17703aa9e86b625e90
Author: Noel Grandin 
Date:   Wed Jul 2 16:01:06 2014 +0200

fix spelling in class name OSpecialHanldeXMLExportPropertyMapper

Change-Id: Ideaa021f76f1c384150caad5ec6a41bf65bae28e

diff --git a/dbaccess/source/filter/xml/xmlExport.cxx 
b/dbaccess/source/filter/xml/xmlExport.cxx
index d173fa2..da522f6 100644
--- a/dbaccess/source/filter/xml/xmlExport.cxx
+++ b/dbaccess/source/filter/xml/xmlExport.cxx
@@ -170,10 +170,10 @@ namespace dbaxml
 }
 }
 
-class OSpecialHanldeXMLExportPropertyMapper : public 
SvXMLExportPropertyMapper
+class OSpecialHandleXMLExportPropertyMapper : public 
SvXMLExportPropertyMapper
 {
 public:
-OSpecialHanldeXMLExportPropertyMapper(const rtl::Reference< 
XMLPropertySetMapper >& rMapper) : SvXMLExportPropertyMapper(rMapper )
+OSpecialHandleXMLExportPropertyMapper(const rtl::Reference< 
XMLPropertySetMapper >& rMapper) : SvXMLExportPropertyMapper(rMapper )
 {
 }
 /** this method is called for every item that has the
@@ -225,10 +225,10 @@ ODBExport::ODBExport(const Reference< XComponentContext 
>& _rxContext,sal_uInt16
 _GetNamespaceMap().Add( GetXMLToken(XML_NP_NUMBER), 
GetXMLToken(XML_N_NUMBER), XML_NAMESPACE_NUMBER );
 
 m_xExportHelper = new 
SvXMLExportPropertyMapper(GetTableStylesPropertySetMapper());
-m_xColumnExportHelper = new 
OSpecialHanldeXMLExportPropertyMapper(GetColumnStylesPropertySetMapper());
+m_xColumnExportHelper = new 
OSpecialHandleXMLExportPropertyMapper(GetColumnStylesPropertySetMapper());
 
-m_xCellExportHelper = new 
OSpecialHanldeXMLExportPropertyMapper(GetCellStylesPropertySetMapper());
-m_xRowExportHelper = new 
OSpecialHanldeXMLExportPropertyMapper(OXMLHelper::GetRowStylesPropertySetMapper(
 true));
+m_xCellExportHelper = new 
OSpecialHandleXMLExportPropertyMapper(GetCellStylesPropertySetMapper());
+m_xRowExportHelper = new 
OSpecialHandleXMLExportPropertyMapper(OXMLHelper::GetRowStylesPropertySetMapper(
 true));
 
 GetAutoStylePool()->AddFamily(
 XML_STYLE_FAMILY_TABLE_TABLE,
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx 
b/reportdesign/source/filter/xml/xmlExport.cxx
index 1ce52a1..ffcf047 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -161,10 +161,10 @@ namespace rptxml
 
 
 
-class OSpecialHanldeXMLExportPropertyMapper : public 
SvXMLExportPropertyMapper
+class OSpecialHandleXMLExportPropertyMapper : public 
SvXMLExportPropertyMapper
 {
 public:
-OSpecialHanldeXMLExportPropertyMapper(const rtl::Reference< 
XMLPropertySetMapper >& rMapper) : SvXMLExportPropertyMapper(rMapper )
+OSpecialHandleXMLExportPropertyMapper(const rtl::Reference< 
XMLPropertySetMapper >& rMapper) : SvXMLExportPropertyMapper(rMapper )
 {
 }
 /** this method is called for every item that has the
@@ -275,17 +275,17 @@ ORptExport::ORptExport(const Reference< XComponentContext 
>& _rxContext, OUStrin
 m_xTableStylesExportPropertySetMapper = new 
SvXMLExportPropertyMapper(xTableStylesPropertySetMapper1);
 
 m_xCellStylesPropertySetMapper = OXMLHelper::GetCellStylePropertyMap( 
false, true);
-m_xCellStylesExportPropertySetMapper = new 
OSpecialHanldeXMLExportPropertyMapper(m_xCellStylesPropertySetMapper);
+m_xCellStylesExportPropertySetMapper = new 
OSpecialHandleXMLExportPropertyMapper(m_xCellStylesPropertySetMapper);
 
m_xCellStylesExportPropertySetMapper->ChainExportMapper(XMLTextParagraphExport::CreateParaExtPropMapper(*this));
 
 rtl::Reference < XMLPropertySetMapper > xColumnStylesPropertySetMapper = 
new XMLPropertySetMapper(OXMLHelper::GetColumnStyleProps(), m_xPropHdlFactory, 
true);
-m_xColumnStylesExportPropertySetMapper = new 
OSpecialHanldeXMLExportPropertyMapper(xColumnStylesPropertySetMapper);
+m_xColumnStylesExportPropertySetMapper = new 
OSpecialHandleXMLExportPropertyMapper(xColumnStylesPropertySetMapper);
 
 rtl::Reference < XMLPropertySetMapper > xRowStylesPropertySetMapper = new 
XMLPropertySetMapper(OXMLHelper::GetRowStyleProps(), m_xPropHdlFactory, true);
-m_xRowStylesExportPropertySetMapper = new 
OSpecialHanldeXMLExportPropertyMapper(xRowStylesPropertySetMapper);
+m_xRowStylesExportPropertySetMapper = new 
OSpecialHandleXMLExportPropertyMapper(xRowStylesPropertySetMapper);
 
 rtl::Reference < XMLPropertySetMapper > xPropMapper(new 
XMLTextPropertySetMapper( TEXT_PROP_MAP_PARA, true ));
-m_xParaPropMapper = new OSpecialHanldeXMLExportPropertyMapper( 
xPropMapper);
+m_xParaPropMapper = new OSpecialHandleXMLExportPropertyMapper( 
xPropMapper);
 
 OUString sFamily( GetXMLToken(XML_PARAGRAPH) );
 OUString aPrefix

Re: Haiku port

[Jan Holesovsky]

Hi Kacper,

Kacper Kasper píše v Čt 03. 07. 2014 v 19:58 +0200:

> > (*) Libreoffice is a fairly active and large project. any port will
> > need some sustained attention to keep up.
> 
> I am aware of that. I am willing to maintain it.

Glad to hear; and it is exciting to hear about a new LibreOffice
port :-)

As soon as you get LibreOffice on Haiku buildable & up-stream the
patches, would be great if you can setup a tinderbox

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

to make sure others are not breaking it for you either.

> About the issue with UNO I mentioned: it seems it is caused by some
> modules not being compiled (I compile them manually one by one now).
> I'll try to make full build work and come back with the results.

I guess your work consists of a mixture of trivial, and more advanced
patches.  I'd strongly encourage you to up-stream the trivial ones
immediately [but I guess the others made the point too :-)]; via gerrit
is ideal:

https://wiki.documentfoundation.org/Development/gerrit/setup

All the best,
Kendy

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

[Bug 65675] LibreOffice 4.2 most annoying bugs

[bugzilla-daemon]

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

Bug 65675 depends on bug 77057, which changed state.

Bug 77057 Summary: Installing/uninstalling LibreOffice messes up the KindMap in 
Windows 8.1
https://bugs.freedesktop.org/show_bug.cgi?id=77057

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

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

[Libreoffice-commits] dev-tools.git: scripts/build-portal.pl scripts/esc-bug-stats.pl

[Michael Meeks]

 scripts/build-portal.pl  |8 
 scripts/esc-bug-stats.pl |3 +++
 2 files changed, 11 insertions(+)

New commits:
commit 7dd15a2f55a5e1803d72038664ec3edd1a5b01d1
Author: Michael Meeks 
Date:   Fri Jul 4 09:05:24 2014 +0100

Find the perl modules next to the binary.

diff --git a/scripts/build-portal.pl b/scripts/build-portal.pl
index 32c977f..2e8edcc 100755
--- a/scripts/build-portal.pl
+++ b/scripts/build-portal.pl
@@ -1,10 +1,17 @@
 #!/usr/bin/perl -w
 
+use FindBin;
+use lib "$FindBin::Bin";
+
 use strict;
 use Bugzilla;
 
 my $git_dir = '/opt/libreoffice/push-tree';
 
+# FIXME: add a re-build-section thing ...
+# German comments: overall stats ... smallest  modules ...
+# a bit of text on how to fix that etc.
+
 sub usage()
 {
 print "build-portal.pl [--help] [--git path/to/git/repo]\n";
@@ -49,6 +56,7 @@ LibreOffice Development Portal
 $dialogs{ui_files} UI files
 $dialogs{ui_dialogs} dialogs left
 $dialogs{ui_tabpages} tab-pages left
+Get Involved
 
 
 
diff --git a/scripts/esc-bug-stats.pl b/scripts/esc-bug-stats.pl
index 5ac0810..872f9eb 100755
--- a/scripts/esc-bug-stats.pl
+++ b/scripts/esc-bug-stats.pl
@@ -1,5 +1,8 @@
 #!/usr/bin/perl -w
 
+use FindBin;
+use lib "$FindBin::Bin";
+
 use strict;
 use warnings;
 use Bugzilla;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 75025] LibreOffice 4.3 most annoying bugs

[bugzilla-daemon]

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

Mirek2  changed:

   What|Removed |Added

 Depends on||80474, 51534, 80476

-- 
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 'libreoffice-4-3-0' - scp2/inc

[Andras Timar]

 scp2/inc/macros.inc |4 
 1 file changed, 4 deletions(-)

New commits:
commit 84a834f865ee91876396daf7a516488fddab6dc2
Author: Andras Timar 
Date:   Thu Jul 3 13:35:03 2014 +0200

fdo#77057 quick fix: do not touch KindMap for alien file types

Change-Id: Iffc24dc7ce12de07660eadcf8a525e77856593e1
(cherry picked from commit 57bf88d21cacb025e7bea40da78616bb4d165215)
Reviewed-on: https://gerrit.libreoffice.org/10055
Tested-by: Fridrich Strba 
Reviewed-by: Fridrich Strba 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index bed8deb..12545aa 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -434,7 +434,6 @@ End
 REGISTRY_ENTRY_PRINT_CMD(name,modid,app) \
 REGISTRY_ENTRY_PRINTTO_CMD(name,modid,app) \
 REGISTRY_ENTRY_CAPABILITIES(name,modid,key,doc_type) \
-REGISTRY_ENTRY_KINDMAP(name, modid, key) \
 
 #define 
CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION(name,modid,key,cond,disp_name,icon_id,app,default,doc_type)
 \
 CONDITIONAL_MODULE_ENTRY(name,modid) \
@@ -449,9 +448,6 @@ End
 REGISTRY_ENTRY_PRINT_CMD(name,modid,app) \
 REGISTRY_ENTRY_PRINTTO_CMD(name,modid,app) \
 REGISTRY_ENTRY_TEMPLATE_CAPABILITIES(name,modid,key,doc_type) \
-REGISTRY_ENTRY_KINDMAP(name, modid, key) \
-
-
 
 #ifdef _MSC_VER
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jacobo Aragunde Pérez]

 vcl/unx/gtk/a11y/atkwrapper.cxx |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 47d7fb9bf61166cf8fadaa89a56183623e61f963
Author: Jacobo Aragunde Pérez 
Date:   Thu Jul 3 20:13:51 2014 +0200

fdo#39944: Fix mapping for some a11y roles to ATK

In particular, EDIT_BAR, EMBEDDED_OBJECT and HYPER_LINK were being
mapped to custom roles when specific roles exist; fixed passing the
proper name to registerRole.

Besides, moved two roles that were in the section 'don't exist in ATK
yet' because that's not the case now.

Change-Id: I6818a0ac623f45053812b5c6dd5fc25c9abf4f65
(cherry picked from commit 7c37cd7bb26b91bda5e57d7bd0cecdbc9d1ebb22)
Reviewed-on: https://gerrit.libreoffice.org/10068
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/vcl/unx/gtk/a11y/atkwrapper.cxx b/vcl/unx/gtk/a11y/atkwrapper.cxx
index a568953..5ed4dc2 100644
--- a/vcl/unx/gtk/a11y/atkwrapper.cxx
+++ b/vcl/unx/gtk/a11y/atkwrapper.cxx
@@ -278,8 +278,8 @@ static AtkRole mapToAtkRole( sal_Int16 nRole )
 if( ! initialized )
 {
 // re-use strings from ATK library
-roleMap[accessibility::AccessibleRole::EDIT_BAR] = registerRole("edit 
bar");
-roleMap[accessibility::AccessibleRole::EMBEDDED_OBJECT] = 
registerRole("embedded component");
+roleMap[accessibility::AccessibleRole::EDIT_BAR] = 
registerRole("editbar");
+roleMap[accessibility::AccessibleRole::EMBEDDED_OBJECT] = 
registerRole("embedded");
 roleMap[accessibility::AccessibleRole::CHART] = registerRole("chart");
 roleMap[accessibility::AccessibleRole::CAPTION] = 
registerRole("caption");
 roleMap[accessibility::AccessibleRole::DOCUMENT] = 
registerRole("document frame");
@@ -289,16 +289,16 @@ static AtkRole mapToAtkRole( sal_Int16 nRole )
 roleMap[accessibility::AccessibleRole::FORM] = registerRole("form");
 roleMap[accessibility::AccessibleRole::GROUP_BOX] = 
registerRole("grouping");
 roleMap[accessibility::AccessibleRole::COMMENT] = 
registerRole("comment");
+roleMap[accessibility::AccessibleRole::IMAGE_MAP] = 
registerRole("image map");
+roleMap[accessibility::AccessibleRole::TREE_ITEM] = registerRole("tree 
item");
+roleMap[accessibility::AccessibleRole::HYPER_LINK] = 
registerRole("link");
 
 // these don't exist in ATK yet
 roleMap[accessibility::AccessibleRole::END_NOTE] = registerRole("end 
note");
 roleMap[accessibility::AccessibleRole::FOOTNOTE] = registerRole("foot 
note");
-roleMap[accessibility::AccessibleRole::HYPER_LINK] = 
registerRole("hyper link");
 roleMap[accessibility::AccessibleRole::SHAPE] = registerRole("shape");
 roleMap[accessibility::AccessibleRole::TEXT_FRAME] = 
registerRole("text frame");
-roleMap[accessibility::AccessibleRole::IMAGE_MAP] = 
registerRole("image map");
 roleMap[accessibility::AccessibleRole::NOTE] = registerRole("note");
-roleMap[accessibility::AccessibleRole::TREE_ITEM] = registerRole("tree 
item");
 
 initialized = true;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jacobo Aragunde Pérez]

 vcl/unx/gtk/a11y/atkwrapper.cxx |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 2c7786a6bcb0b2628fce8fb2e3cd51fb8f4304fc
Author: Jacobo Aragunde Pérez 
Date:   Thu Jul 3 20:13:51 2014 +0200

fdo#39944: Fix mapping for some a11y roles to ATK

In particular, EDIT_BAR, EMBEDDED_OBJECT and HYPER_LINK were being
mapped to custom roles when specific roles exist; fixed passing the
proper name to registerRole.

Besides, moved two roles that were in the section 'don't exist in ATK
yet' because that's not the case now.

Change-Id: I6818a0ac623f45053812b5c6dd5fc25c9abf4f65
(cherry picked from commit 7c37cd7bb26b91bda5e57d7bd0cecdbc9d1ebb22)
Reviewed-on: https://gerrit.libreoffice.org/10066
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/unx/gtk/a11y/atkwrapper.cxx b/vcl/unx/gtk/a11y/atkwrapper.cxx
index f3ef8d5..a30bf16 100644
--- a/vcl/unx/gtk/a11y/atkwrapper.cxx
+++ b/vcl/unx/gtk/a11y/atkwrapper.cxx
@@ -291,8 +291,8 @@ static AtkRole mapToAtkRole( sal_Int16 nRole )
 if( ! initialized )
 {
 // re-use strings from ATK library
-roleMap[accessibility::AccessibleRole::EDIT_BAR] = registerRole("edit 
bar");
-roleMap[accessibility::AccessibleRole::EMBEDDED_OBJECT] = 
registerRole("embedded component");
+roleMap[accessibility::AccessibleRole::EDIT_BAR] = 
registerRole("editbar");
+roleMap[accessibility::AccessibleRole::EMBEDDED_OBJECT] = 
registerRole("embedded");
 roleMap[accessibility::AccessibleRole::CHART] = registerRole("chart");
 roleMap[accessibility::AccessibleRole::CAPTION] = 
registerRole("caption");
 roleMap[accessibility::AccessibleRole::DOCUMENT] = 
registerRole("document frame");
@@ -302,16 +302,16 @@ static AtkRole mapToAtkRole( sal_Int16 nRole )
 roleMap[accessibility::AccessibleRole::FORM] = registerRole("form");
 roleMap[accessibility::AccessibleRole::GROUP_BOX] = 
registerRole("grouping");
 roleMap[accessibility::AccessibleRole::COMMENT] = 
registerRole("comment");
+roleMap[accessibility::AccessibleRole::IMAGE_MAP] = 
registerRole("image map");
+roleMap[accessibility::AccessibleRole::TREE_ITEM] = registerRole("tree 
item");
+roleMap[accessibility::AccessibleRole::HYPER_LINK] = 
registerRole("link");
 
 // these don't exist in ATK yet
 roleMap[accessibility::AccessibleRole::END_NOTE] = registerRole("end 
note");
 roleMap[accessibility::AccessibleRole::FOOTNOTE] = registerRole("foot 
note");
-roleMap[accessibility::AccessibleRole::HYPER_LINK] = 
registerRole("hyper link");
 roleMap[accessibility::AccessibleRole::SHAPE] = registerRole("shape");
 roleMap[accessibility::AccessibleRole::TEXT_FRAME] = 
registerRole("text frame");
-roleMap[accessibility::AccessibleRole::IMAGE_MAP] = 
registerRole("image map");
 roleMap[accessibility::AccessibleRole::NOTE] = registerRole("note");
-roleMap[accessibility::AccessibleRole::TREE_ITEM] = registerRole("tree 
item");
 
 initialized = true;
 }
___
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' - scp2/source

[Andras Timar]

 scp2/source/ooo/file_ooo.scp |4 
 scp2/source/ooo/module_lang_template.scp |4 
 2 files changed, 8 insertions(+)

New commits:
commit 3372b1e0b36f3f7e89e88bb7495efad78fdd3417
Author: Andras Timar 
Date:   Thu Jul 3 18:14:17 2014 +0200

fdo#80535 add missing .ui localizations to install script

(cherry picked from commit e09931ce4d413929b9cbdbbf1f71ac5941ec25ba)
(cherry picked from commit 1f90cae1debed4b45bb51ced21a03aacd7973cff)
(cherry picked from commit e52b3a2be08b8811f76e1f2bbb1e2438dcfbb3b3)

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

diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 5875930..6f5d715 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -529,9 +529,13 @@ UI_FILELIST_ALL_LANG(basicide, modules/BasicIDE)
 UI_FILELIST_ALL_LANG(cui, cui)
 #ifdef DBCONNECTIVITY
 UI_FILELIST_ALL_LANG(dbaccess, dbaccess)
+UI_FILELIST_ALL_LANG(dbreport, modules/dbreport)
+UI_FILELIST_ALL_LANG(sbibliography, modules/sbibliography)
+UI_FILELIST_ALL_LANG(spropctrlr, modules/spropctrlr)
 #endif
 UI_FILELIST_ALL_LANG(desktop, desktop)
 UI_FILELIST_ALL_LANG(filter, filter)
+UI_FILELIST_ALL_LANG(sabpilot, modules/sabpilot)
 UI_FILELIST_ALL_LANG(scalc, modules/scalc)
 UI_FILELIST_ALL_LANG(schart, modules/schart)
 UI_FILELIST_ALL_LANG(sdraw, modules/sdraw)
diff --git a/scp2/source/ooo/module_lang_template.scp 
b/scp2/source/ooo/module_lang_template.scp
index 104712b..0ac4ea0 100644
--- a/scp2/source/ooo/module_lang_template.scp
+++ b/scp2/source/ooo/module_lang_template.scp
@@ -26,9 +26,13 @@ Module gid_Module_Langpack_Basis_Template
  gid_File_Share_Config_Sofficecfg_uiconfig_cui_Lang,
 #ifdef DBCONNECTIVITY
  gid_File_Share_Config_Sofficecfg_uiconfig_dbaccess_Lang,
+ gid_File_Share_Config_Sofficecfg_uiconfig_dbreport_Lang,
+ gid_File_Share_Config_Sofficecfg_uiconfig_sbibliography_Lang,
+ gid_File_Share_Config_Sofficecfg_uiconfig_spropctrlr_Lang,
 #endif
  gid_File_Share_Config_Sofficecfg_uiconfig_desktop_Lang,
  gid_File_Share_Config_Sofficecfg_uiconfig_filter_Lang,
+ gid_File_Share_Config_Sofficecfg_uiconfig_sabpilot_Lang,
  gid_File_Share_Config_Sofficecfg_uiconfig_scalc_Lang,
  gid_File_Share_Config_Sofficecfg_uiconfig_schart_Lang,
  gid_File_Share_Config_Sofficecfg_uiconfig_sdraw_Lang,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 39944] ACCESSIBILITY: Implement new ATK Roles

[bugzilla-daemon]

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

--- Comment #22 from Commit Notification 
 ---
Jacobo Aragunde Perez committed a patch related to this issue.
It has been pushed to "libreoffice-4-2":

http://cgit.freedesktop.org/libreoffice/core/commit/?id=47d7fb9bf61166cf8fadaa89a56183623e61f963&h=libreoffice-4-2

fdo#39944: Fix mapping for some a11y roles to ATK


It will be available in LibreOffice 4.2.6.

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

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

[Bug 39944] ACCESSIBILITY: Implement new ATK Roles

[bugzilla-daemon]

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

--- Comment #23 from Commit Notification 
 ---
Jacobo Aragunde Perez committed a patch related to this issue.
It has been pushed to "libreoffice-4-3":

http://cgit.freedesktop.org/libreoffice/core/commit/?id=2c7786a6bcb0b2628fce8fb2e3cd51fb8f4304fc&h=libreoffice-4-3

fdo#39944: Fix mapping for some a11y roles to ATK


It will be available in LibreOffice 4.3.1.

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: extras/source

[Adolfo Jayme Barrientos]

 extras/source/autocorr/lang/es/DocumentList.xml |  145 +++-
 1 file changed, 140 insertions(+), 5 deletions(-)

New commits:
commit 26890920b7a05817f6542dd807cb2b10c38c17c4
Author: Adolfo Jayme Barrientos 
Date:   Thu Jul 3 11:21:21 2014 -0500

Related fdo#77603: update Spanish autocorrection patterns.

I copied a bunch of patterns from the corresponding French file, and added 
a few common misspellings.

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

diff --git a/extras/source/autocorr/lang/es/DocumentList.xml 
b/extras/source/autocorr/lang/es/DocumentList.xml
index b6fdce2..b34248a 100644
--- a/extras/source/autocorr/lang/es/DocumentList.xml
+++ b/extras/source/autocorr/lang/es/DocumentList.xml
@@ -1,16 +1,132 @@
 
 http://openoffice.org/2001/block-list";>
+  
   
   
   
-  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
   
+  
   
   
   
   
   
   
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
   
   
   
@@ -27,6 +143,7 @@
   
   
   
+  
   
   
   
@@ -38,6 +155,7 @@
   
   
   
+  
   
   
   
@@ -49,6 +167,7 @@
   
   
   
+  
   
   
   
@@ -139,10 +258,12 @@
   
   
   
+  
   
   
   
   
+  
   
   
   
@@ -151,9 +272,17 @@
   
   
   
+  
   
+  
   
+  
+  
+  
+  
   
+  
+  
   
   
   
@@ -165,6 +294,7 @@
   
   
   
+  
   
   
   
@@ -201,6 +331,9 @@
   
   
   
+  
+  
+  
   
   
   
@@ -216,6 +349,10 @@
   
   
   
+  
+  
+  
+  
   
   
   
@@ -236,7 +373,6 @@
   
   
   
-  
   
   
   
@@ -270,6 +406,7 @@
   
   
   
+  
   
   
   
@@ -326,6 +463,7 @@
   
   
   
+  
   
   
   
@@ -363,7 +501,4 @@
   
   
   
-  
-  
-  
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sal/rtl

[Noel Grandin]

 sal/rtl/strtmpl.cxx |  238 ++--
 1 file changed, 178 insertions(+), 60 deletions(-)

New commits:
commit 281989007fd7dea997ed9a65f513f80b1aff67dd
Author: Noel Grandin 
Date:   Tue Jul 1 13:17:01 2014 +0200

Use standard library optimised routines for OUString/OString

..handling where possible.

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

diff --git a/sal/rtl/strtmpl.cxx b/sal/rtl/strtmpl.cxx
index c3d42c4..57c98e2 100644
--- a/sal/rtl/strtmpl.cxx
+++ b/sal/rtl/strtmpl.cxx
@@ -26,6 +26,7 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -45,18 +46,12 @@ inline void rtl_str_ImplCopy( IMPL_RTL_STRCODE* pDest,
 }
 */
 
-#define rtl_str_ImplCopy( _pDest, _pSrc, _nCount )  \
-{   \
-IMPL_RTL_STRCODE*   __mm_pDest  = _pDest;   \
-const IMPL_RTL_STRCODE* __mm_pSrc   = _pSrc;\
-sal_Int32   __mm_nCount = _nCount;  \
-while ( __mm_nCount > 0 )   \
-{   \
-*__mm_pDest = *__mm_pSrc;   \
-__mm_pDest++;   \
-__mm_pSrc++;\
-__mm_nCount--;  \
-}   \
+static inline void rtl_str_ImplCopy( IMPL_RTL_STRCODE* _pDest,
+ const IMPL_RTL_STRCODE* _pSrc,
+ sal_Int32 _nCount )
+{
+// take advantage of builtin optimisations
+memcpy( _pDest, _pSrc, _nCount * sizeof(IMPL_RTL_STRCODE));
 }
 
 /* === */
@@ -66,10 +61,24 @@ inline void rtl_str_ImplCopy( IMPL_RTL_STRCODE* pDest,
 sal_Int32 SAL_CALL IMPL_RTL_STRNAME( getLength )( const IMPL_RTL_STRCODE* pStr 
)
 SAL_THROW_EXTERN_C()
 {
-const IMPL_RTL_STRCODE* pTempStr = pStr;
-while( *pTempStr )
-pTempStr++;
-return pTempStr-pStr;
+// same as "if sal_Char mode"
+#ifndef IMPL_RTL_INTERN
+// take advantage of builtin optimisations
+return strlen( pStr);
+#else
+if (sizeof(IMPL_RTL_STRCODE) == sizeof(wchar_t))
+{
+// take advantage of builtin optimisations
+return wcslen((wchar_t*)pStr);
+}
+else
+{
+const IMPL_RTL_STRCODE* pTempStr = pStr;
+while( *pTempStr )
+pTempStr++;
+return pTempStr-pStr;
+}
+#endif
 }
 
 /* --- */
@@ -78,16 +87,30 @@ sal_Int32 SAL_CALL IMPL_RTL_STRNAME( compare )( const 
IMPL_RTL_STRCODE* pStr1,
 const IMPL_RTL_STRCODE* pStr2 )
 SAL_THROW_EXTERN_C()
 {
-sal_Int32 nRet;
-while ( ((nRet = ((sal_Int32)(IMPL_RTL_USTRCODE(*pStr1)))-
- ((sal_Int32)(IMPL_RTL_USTRCODE(*pStr2 == 0) &&
-*pStr2 )
+// same as "if sal_Char mode"
+#ifndef IMPL_RTL_INTERN
+// take advantage of builtin optimisations
+return strcmp( pStr1, pStr2);
+#else
+if (sizeof(IMPL_RTL_STRCODE) == sizeof(wchar_t))
 {
-pStr1++;
-pStr2++;
+// take advantage of builtin optimisations
+return wcscmp((wchar_t*)pStr1, (wchar_t*)pStr2);
 }
+else
+{
+sal_Int32 nRet;
+while ( ((nRet = ((sal_Int32)(IMPL_RTL_USTRCODE(*pStr1)))-
+ ((sal_Int32)(IMPL_RTL_USTRCODE(*pStr2 == 0) &&
+*pStr2 )
+{
+pStr1++;
+pStr2++;
+}
 
-return nRet;
+return nRet;
+}
+#endif
 }
 
 /* --- */
@@ -98,18 +121,36 @@ sal_Int32 SAL_CALL IMPL_RTL_STRNAME( compare_WithLength )( 
const IMPL_RTL_STRCOD
sal_Int32 nStr2Len )
 SAL_THROW_EXTERN_C()
 {
-sal_Int32 nRet = nStr1Len - nStr2Len;
-int nCount = (nRet <= 0) ? nStr1Len : nStr2Len;
+// same as "if sal_Char mode"
+#ifndef IMPL_RTL_INTERN
+// take advantage of builtin optimisations
+sal_Int32 nMin = std::min(nStr1Len, nStr2Len);
+sal_Int32 nRet = strncmp(pStr1, pStr2, nMin);
+return nRet == 0 ? nStr1Len - nStr2Len : nRet;
+#else
+if (sizeof(IMPL_RTL_STRCODE) == sizeof(wchar_t))
+{
+// take advantage of builtin optimisations
+sal_Int32 nMin = std::min(nStr1Len, nStr2Len);
+sal_Int32 nRet = wcsncmp((wchar_t*)pStr1, (wchar_t*)pStr2, nMin);
+return nRet == 0 ? nStr1Len - nStr2Len : nRet;
+}
+ 

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 14 commits - chart2/source external/libmspub i18npool/source lotuswordpro/source scp2/inc sd/source svl/source svtools/source svx/sou

[Jacobo Aragunde Pérez]

 chart2/source/controller/dialogs/DataBrowserModel.cxx  
   |4 -
 
external/libmspub/0001-fdo-80661-clash-with-a-global-symbol-from-libreoffic.patch
 |   38 +
 external/libmspub/UnpackedTarball_libmspub.mk  
   |6 +
 i18npool/source/collator/collator_unicode.cxx  
   |5 +
 lotuswordpro/source/filter/tocread.cxx 
   |   10 ++
 scp2/inc/macros.inc
   |4 -
 sd/source/ui/slidesorter/controller/SlsSlotManager.cxx 
   |   13 +++
 sd/source/ui/view/outlnvs2.cxx 
   |   11 ++
 svl/source/numbers/zforfind.cxx
   |   38 +
 svtools/source/svhtml/parhtml.cxx  
   |   12 ++-
 svx/source/fmcomp/gridcell.cxx 
   |7 +
 sw/qa/core/data/rtf/pass/fdo54641.rtf  
   |   39 ++
 sw/qa/extras/rtfexport/data/fdo78758.rtf   
   |9 ++
 sw/qa/extras/rtfexport/rtfexport.cxx   
   |   10 ++
 sw/source/filter/ww8/attributeoutputbase.hxx   
   |2 
 sw/source/filter/ww8/docxattributeoutput.cxx   
   |2 
 sw/source/filter/ww8/docxattributeoutput.hxx   
   |2 
 sw/source/filter/ww8/rtfattributeoutput.cxx
   |   37 -
 sw/source/filter/ww8/rtfattributeoutput.hxx
   |9 --
 sw/source/filter/ww8/wrtw8esh.cxx  
   |2 
 sw/source/filter/ww8/wrtw8nds.cxx  
   |4 -
 sw/source/filter/ww8/wrtww8gr.cxx  
   |2 
 sw/source/filter/ww8/ww8attributeoutput.hxx
   |2 
 sw/source/ui/frmdlg/frmpage.cxx
   |   10 +-
 vcl/source/gdi/outdev4.cxx 
   |2 
 vcl/unx/gtk/a11y/atkwrapper.cxx
   |   10 +-
 writerfilter/source/dmapper/DomainMapper_Impl.cxx  
   |8 +-
 writerfilter/source/dmapper/DomainMapper_Impl.hxx  
   |2 
 28 files changed, 245 insertions(+), 55 deletions(-)

New commits:
commit eca34a44bf3a697b4e113467750b4777f0cf46a6
Author: Jacobo Aragunde Pérez 
Date:   Thu Jul 3 20:13:51 2014 +0200

fdo#39944: Fix mapping for some a11y roles to ATK

In particular, EDIT_BAR, EMBEDDED_OBJECT and HYPER_LINK were being
mapped to custom roles when specific roles exist; fixed passing the
proper name to registerRole.

Besides, moved two roles that were in the section 'don't exist in ATK
yet' because that's not the case now.

Change-Id: I6818a0ac623f45053812b5c6dd5fc25c9abf4f65
(cherry picked from commit 7c37cd7bb26b91bda5e57d7bd0cecdbc9d1ebb22)
Reviewed-on: https://gerrit.libreoffice.org/10068
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/vcl/unx/gtk/a11y/atkwrapper.cxx b/vcl/unx/gtk/a11y/atkwrapper.cxx
index b93f6eb..5336f48 100644
--- a/vcl/unx/gtk/a11y/atkwrapper.cxx
+++ b/vcl/unx/gtk/a11y/atkwrapper.cxx
@@ -289,8 +289,8 @@ static AtkRole mapToAtkRole( sal_Int16 nRole )
 if( ! initialized )
 {
 // re-use strings from ATK library
-roleMap[accessibility::AccessibleRole::EDIT_BAR] = registerRole("edit 
bar");
-roleMap[accessibility::AccessibleRole::EMBEDDED_OBJECT] = 
registerRole("embedded component");
+roleMap[accessibility::AccessibleRole::EDIT_BAR] = 
registerRole("editbar");
+roleMap[accessibility::AccessibleRole::EMBEDDED_OBJECT] = 
registerRole("embedded");
 roleMap[accessibility::AccessibleRole::CHART] = registerRole("chart");
 roleMap[accessibility::AccessibleRole::CAPTION] = 
registerRole("caption");
 roleMap[accessibility::AccessibleRole::DOCUMENT] = 
registerRole("document frame");
@@ -300,16 +300,16 @@ static AtkRole mapToAtkRole( sal_Int16 nRole )
 roleMap[accessibility::AccessibleRole::FORM] = registerRole("form");
 roleMap[accessibility::AccessibleRole::GROUP_BOX] = 
registerRole("grouping");
 roleMap[accessibility::AccessibleRole::COMMENT] = 
registerRole("comment");
+roleMap[accessibility::AccessibleRole::IMAGE_MAP] = 
registerRole("image map");
+roleMap[accessibility::AccessibleRole::TREE_ITEM] = registerRole("tree 
item");
+roleMap[accessibility::AccessibleRole::HYPER_LINK] = 
registerRole("link");
 
 // th

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

[Caolán McNamara]

 extras/source/autocorr/lang/es/DocumentList.xml |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit da36ded02c67bb7481cd4378ce5f7d779c1a3533
Author: Caolán McNamara 
Date:   Fri Jul 4 10:38:04 2014 +0100

fix autotext

Change-Id: I3d8fb6e48bb5d9550ecbcb6f07eb7c83564903f7

diff --git a/extras/source/autocorr/lang/es/DocumentList.xml 
b/extras/source/autocorr/lang/es/DocumentList.xml
index b34248a..75e7562 100644
--- a/extras/source/autocorr/lang/es/DocumentList.xml
+++ b/extras/source/autocorr/lang/es/DocumentList.xml
@@ -13,8 +13,8 @@
   
   
   
-  
-  
+  
+  
   
   
   
@@ -26,8 +26,8 @@
   
   
   
-  
-  
+  
+  
   
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-colors' - svx/source

[Krisztian Pinter]

 svx/source/tbxctrls/tbcontrl.cxx |   10 +-
 1 file changed, 1 insertion(+), 9 deletions(-)

New commits:
commit ebb6c2f4a42d6d02ecaf5373e851181614b4ffe4
Author: Krisztian Pinter 
Date:   Fri Jul 4 11:41:28 2014 +0200

Fix SvxColorWindow_Impl::StateChanged updating

Change-Id: Ifb884f8830280d44ea3c73caf319109593bbebf9

diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index c905d42..b94a3cf 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -1255,15 +1255,7 @@ void SvxColorWindow_Impl::StateChanged( sal_uInt16 nSID, 
SfxItemState eState, co
 {
 if (( nSID == SID_COLOR_TABLE ) && ( pState->ISA( SvxColorListItem )))
 {
-XColorListRef pColorList = ((SvxColorListItem 
*)pState)->GetColorList();
-const long nColorCount(pColorList->Count());
-const Size aNewSize(aColorSet.layoutAllVisible(nColorCount));
-aColorSet.SetOutputSizePixel(aNewSize);
-static sal_Int32 nAdd = 4;
-
-SetOutputSizePixel(Size(aNewSize.Width() + nAdd, aNewSize.Height() 
+ nAdd));
-aColorSet.Clear();
-aColorSet.addEntriesForXColorList(*pColorList);
+Update();
 }
 else if ( SFX_ITEM_DEFAULT <= eState )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 sw/inc/section.hxx  |7 +--
 sw/inc/swserv.hxx   |5 -
 sw/inc/swtable.hxx  |7 +--
 sw/source/core/docnode/section.cxx  |2 +-
 sw/source/core/docnode/swbaslnk.cxx |2 +-
 sw/source/core/inc/bookmrk.hxx  |2 +-
 6 files changed, 5 insertions(+), 20 deletions(-)

New commits:
commit dfeef9e970a69c5736a54619b96607899c57e9a1
Author: Noel Grandin 
Date:   Fri Jul 4 10:31:22 2014 +0200

remove unnecessary header macro wizardry

using the #define SW_DECL_SWSERVEROBJECT_DEFINED to turn typedefs
on and off. Rather just use SvRef everywhere, like we do for
other reference types.

Change-Id: Id939c46c5861cd7440b66c5a84122f900ddb882c

diff --git a/sw/inc/section.hxx b/sw/inc/section.hxx
index c8756381..ba34359 100644
--- a/sw/inc/section.hxx
+++ b/sw/inc/section.hxx
@@ -40,12 +40,7 @@ class SwDoc;
 class SwSection;
 class SwSectionNode;
 class SwTOXBase;
-
-#ifndef SW_DECL_SWSERVEROBJECT_DEFINED
-#define SW_DECL_SWSERVEROBJECT_DEFINED
 class SwServerObject;
-typedef tools::SvRef SwServerObjectRef;
-#endif
 
 typedef std::vector SwSections;
 
@@ -154,7 +149,7 @@ class SW_DLLPUBLIC SwSection
 private:
 mutable SwSectionData m_Data;
 
-SwServerObjectRef m_RefObj; // Set if DataServer.
+tools::SvRef m_RefObj; // Set if DataServer.
 ::sfx2::SvBaseLinkRef m_RefLink;
 
 SAL_DLLPRIVATE void ImplSetHiddenFlag(
diff --git a/sw/inc/swserv.hxx b/sw/inc/swserv.hxx
index fa74018..f483342 100644
--- a/sw/inc/swserv.hxx
+++ b/sw/inc/swserv.hxx
@@ -76,11 +76,6 @@ public:
 void SetDdeBookmark( ::sw::mark::IMark& rBookmark);
 };
 
-#ifndef SW_DECL_SWSERVEROBJECT_DEFINED
-#define SW_DECL_SWSERVEROBJECT_DEFINED
-typedef tools::SvRef SwServerObjectRef;
-#endif
-
 #endif // INCLUDED_SW_INC_SWSERV_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx
index cda293b..6ac05e0 100644
--- a/sw/inc/swtable.hxx
+++ b/sw/inc/swtable.hxx
@@ -58,12 +58,7 @@ class SwUndoTblCpyTbl;
 class SwBoxSelection;
 struct SwSaveRowSpan;
 struct Parm;
-
-#ifndef SW_DECL_SWSERVEROBJECT_DEFINED
-#define SW_DECL_SWSERVEROBJECT_DEFINED
 class SwServerObject;
-typedef tools::SvRef SwServerObjectRef;
-#endif
 
 class SwTableLines : public std::vector {
 public:
@@ -99,7 +94,7 @@ class SW_DLLPUBLIC SwTable: public SwClient  //Client 
of FrmFmt.
 protected:
 SwTableLines aLines;
 SwTableSortBoxes m_TabSortContentBoxes;
-SwServerObjectRef refObj;   // In case DataServer -> pointer is set.
+tools::SvRef refObj;   // In case DataServer -> pointer is 
set.
 
 SwHTMLTableLayout *pHTMLLayout;
 
diff --git a/sw/source/core/docnode/section.cxx 
b/sw/source/core/docnode/section.cxx
index 50ea9f6..9baceca 100644
--- a/sw/source/core/docnode/section.cxx
+++ b/sw/source/core/docnode/section.cxx
@@ -1292,7 +1292,7 @@ static void lcl_UpdateLinksInSect( SwBaseLink& rUpdLnk, 
SwSectionNode& rSectNd )
 bool bRecursion = false;
 if( pSrcDoc == pDoc )
 {
-SwServerObjectRef refObj( (SwServerObject*)
+tools::SvRef refObj( (SwServerObject*)
 pDoc->CreateLinkSource( sRange ));
 if( refObj.Is() )
 {
diff --git a/sw/source/core/docnode/swbaslnk.cxx 
b/sw/source/core/docnode/swbaslnk.cxx
index df2476c..d5b4d09 100644
--- a/sw/source/core/docnode/swbaslnk.cxx
+++ b/sw/source/core/docnode/swbaslnk.cxx
@@ -463,7 +463,7 @@ const SwNode* SwBaseLink::GetAnchor() const
 
 bool SwBaseLink::IsRecursion( const SwBaseLink* pChkLnk ) const
 {
-SwServerObjectRef aRef( (SwServerObject*)GetObj() );
+tools::SvRef aRef( (SwServerObject*)GetObj() );
 if( aRef.Is() )
 {
 // As it's a ServerObject, we query all contained Links
diff --git a/sw/source/core/inc/bookmrk.hxx b/sw/source/core/inc/bookmrk.hxx
index dc5cb5d..5b5e6e6 100644
--- a/sw/source/core/inc/bookmrk.hxx
+++ b/sw/source/core/inc/bookmrk.hxx
@@ -155,7 +155,7 @@ namespace sw {
 virtual ~DdeBookmark();
 
 private:
-SwServerObjectRef m_aRefObj;
+tools::SvRef m_aRefObj;
 };
 
 class Bookmark
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - xmloff/source

[Oliver-Rainer Wittmann]

 xmloff/source/text/txtexppr.cxx |8 
 1 file changed, 8 insertions(+)

New commits:
commit 1ae655db954030d04fb3a413d57af2e47bea53af
Author: Oliver-Rainer Wittmann 
Date:   Fri Jul 4 08:19:12 2014 +

124107: ODF export - suppress export of fo:margin for paragraph styles

diff --git a/xmloff/source/text/txtexppr.cxx b/xmloff/source/text/txtexppr.cxx
index 102523d..a9b7144 100644
--- a/xmloff/source/text/txtexppr.cxx
+++ b/xmloff/source/text/txtexppr.cxx
@@ -462,7 +462,9 @@ void XMLTextExportPropertySetMapper::ContextFilter(
 XMLPropertyState* pClip11State = NULL;
 XMLPropertyState* pClipState = NULL;
 
+// filter fo:margin
 XMLPropertyState* pAllParaMargin = NULL;
+XMLPropertyState* pAllParaMarginRel = NULL;
 XMLPropertyState* pAllMargin = NULL;
 
 //
@@ -586,6 +588,7 @@ void XMLTextExportPropertySetMapper::ContextFilter(
 case CTF_TEXT_CLIP11:   pClip11State = propertie; break;
 case CTF_TEXT_CLIP: pClipState = propertie; break;
 case CTF_PARAMARGINALL: pAllParaMargin = propertie; break;
+case CTF_PARAMARGINALL_REL: pAllParaMarginRel = propertie; break;
 case CTF_MARGINALL: pAllMargin = propertie; break;
 
 //
@@ -675,6 +678,11 @@ void XMLTextExportPropertySetMapper::ContextFilter(
 pAllParaMargin->mnIndex = -1; // just export individual attributes...
 pAllParaMargin->maValue.clear();
 }
+if (pAllParaMarginRel)
+{
+pAllParaMarginRel->mnIndex = -1; // just export individual 
attributes...
+pAllParaMarginRel->maValue.clear();
+}
 if (pAllMargin)
 {
 pAllMargin->mnIndex = -1; // just export individual attributes...
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Necessary server reboots

[Alexander Werner]

Hi,

due to security updates, the following services will be unavailable for a short 
amount of time around 1030UTC today: Gerrit, Jenkins, AskLibO and others.

Alex
--
Alexander Werner 
Admin Team of The Document Foundation
The Document Foundation, Kurfürstendamm 188, 10707 Berlin
Rechtsfähige Stiftung des bürgerlichen Rechts
Legal details: http://www.documentfoundation.org/imprint







signature.asc
Description: Message signed with OpenPGP using GPGMail
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 1a/e655db954030d04fb3a413d57af2e47bea53af

[Michael Stahl]

 1a/e655db954030d04fb3a413d57af2e47bea53af |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 4c37ff74ecc89e75339549162b6ed4ed7744a15e
Author: Michael Stahl 
Date:   Fri Jul 4 13:12:14 2014 +0200

Notes added by 'git notes add'

diff --git a/1a/e655db954030d04fb3a413d57af2e47bea53af 
b/1a/e655db954030d04fb3a413d57af2e47bea53af
new file mode 100644
index 000..98c4126
--- /dev/null
+++ b/1a/e655db954030d04fb3a413d57af2e47bea53af
@@ -0,0 +1 @@
+prefer: 23c099a0236062724430efb986251637095c8d4f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Zolnai Tamás]

 avmedia/source/opengl/oglwindow.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2946c7c62718cb74feab554b5939ec340e6c4280
Author: Zolnai Tamás 
Date:   Fri Jul 4 13:21:58 2014 +0200

glTF: camera movement constraint: use distance from the boundary box

... instead of distance from model center position.

Change-Id: I379ab5e32cc5009d0eb751c4808fecf0109d1e5a

diff --git a/avmedia/source/opengl/oglwindow.cxx 
b/avmedia/source/opengl/oglwindow.cxx
index 9060145..9f09533 100644
--- a/avmedia/source/opengl/oglwindow.cxx
+++ b/avmedia/source/opengl/oglwindow.cxx
@@ -266,7 +266,7 @@ IMPL_LINK(OGLWindow, CameraHandler, VclWindowEvent*, pEvent)
 {
 // Limit zooming in orbit mode
 m_fCameraDistance += vMoveBy.z;
-if ((m_fCameraDistance < 0.75 * fModelSize && 
vMoveBy.z < 0.0 ) ||
+if ((m_fCameraDistance < 0.5 * fModelSize && vMoveBy.z 
< 0.0 ) ||
 (m_fCameraDistance > 2 * fModelSize && vMoveBy.z > 
0.0 ))
 {
 m_fCameraDistance -= vMoveBy.z;
@@ -292,7 +292,7 @@ IMPL_LINK(OGLWindow, CameraHandler, VclWindowEvent*, pEvent)
 glm::vec3 vView;
 glm::vec3 vUp;
 gltf_get_camera_pos(&m_rHandle, &vEye,&vView,&vUp);
-m_fCameraDistance = vEye.z - 
gltf_get_model_center_pos(&m_rHandle)->z;
+m_fCameraDistance = vEye.z - 
gltf_get_model_center_pos(&m_rHandle)->z - 
(gltf_get_model_size(&m_rHandle)/2.0);
 }
 }
 else if(nCode == KEY_F)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 8 commits - sc/source sd/source svx/source vcl/source

[Norbert Thiebaud]

 sc/source/ui/Accessibility/AccessibleDocument.cxx |4 ++--
 sc/source/ui/dbgui/filtdlg.cxx|9 ++---
 sd/source/filter/html/htmlex.cxx  |2 +-
 sd/source/filter/html/pubdlg.cxx  |1 -
 svx/source/form/fmshimp.cxx   |2 --
 vcl/source/gdi/gdimtf.cxx |4 ++--
 vcl/source/window/splitwin.cxx|8 +++-
 7 files changed, 18 insertions(+), 12 deletions(-)

New commits:
commit a89f979dea265d68f22daee013ee8c4ee30e6c5b
Author: Norbert Thiebaud 
Date:   Fri Jul 4 12:43:43 2014 +0200

coverity#735805 dereference null value

Change-Id: I3782cffb19e45635076f19eb568fc547b9680b0d

diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx
index 572e07e..ca0fdee 100644
--- a/sc/source/ui/dbgui/filtdlg.cxx
+++ b/sc/source/ui/dbgui/filtdlg.cxx
@@ -270,9 +270,12 @@ void ScFilterDlg::Init( const SfxItemSet& rArgSet )
 pDoc->GetFormatTable()->GetInputLineString( 
rItem.mfVal, 0, aValStr);
 else if (rItem.meType == ScQueryEntry::ByDate)
 {
-SvNumberFormatter* pFormatter = pDoc->GetFormatTable();
-pFormatter->GetInputLineString( rItem.mfVal,
-pFormatter->GetStandardFormat( 
NUMBERFORMAT_DATE), aValStr);
+if(pDoc)
+{
+SvNumberFormatter* pFormatter = 
pDoc->GetFormatTable();
+pFormatter->GetInputLineString( rItem.mfVal,
+
pFormatter->GetStandardFormat( NUMBERFORMAT_DATE), aValStr);
+}
 }
 else
 {
commit d3c3ba075c485e97c658d145319b36a69c60a5c8
Author: Norbert Thiebaud 
Date:   Fri Jul 4 12:35:22 2014 +0200

coverity#736163 Dereference Null return

Change-Id: I62046a619315d53dbeefbe0ebd26d24917adca14

diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx
index be04473..0f20582 100644
--- a/vcl/source/window/splitwin.cxx
+++ b/vcl/source/window/splitwin.cxx
@@ -2637,7 +2637,6 @@ void SplitWindow::InsertItem( sal_uInt16 nId, Window* 
pWindow, long nSize,
 {
 #ifdef DBG_UTIL
 sal_uInt16 nDbgDummy;
-DBG_ASSERT( ImplFindSet( mpMainSet, nSetId ), "SplitWindow::InsertItem() - 
Set not exists" );
 DBG_ASSERT( !ImplFindItem( mpMainSet, nId, nDbgDummy ), 
"SplitWindow::InsertItem() - Id already exists" );
 #endif
 
@@ -2646,6 +2645,13 @@ void SplitWindow::InsertItem( sal_uInt16 nId, Window* 
pWindow, long nSize,
 nSize = 1;
 
 ImplSplitSet* pSet   = ImplFindSet( mpMainSet, nSetId );
+#ifdef DBG_UTIL
+DBG_ASSERT( pSet, "SplitWindow::InsertItem() - Set not exists" );
+#endif
+if(!pSet)
+{
+return;
+}
 ImplSplitSet* pNewSet;
 ImplSplitItem* pItem;
 
commit a387d3c96c414da65396957b18df3202a720e2ba
Author: Norbert Thiebaud 
Date:   Fri Jul 4 12:29:39 2014 +0200

coverity#736159 Dereference Null return

Change-Id: I6581efb320a9e43cb242dabecfd500d4e04b058b

diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index 7158d4d..4fc7d3f 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -324,7 +324,7 @@ void GDIMetaFile::Play( GDIMetaFile& rMtf, size_t nPos )
 
 for( size_t nCurPos = nCurrentActionElement; nCurPos < nPos; nCurPos++ 
)
 {
-if( !Hook() )
+if( !Hook() && pAction )
 {
 pAction->Duplicate();
 rMtf.AddAction( pAction );
@@ -360,7 +360,7 @@ void GDIMetaFile::Play( OutputDevice* pOut, size_t nPos )
 size_t  i  = 0;
 for( size_t nCurPos = nCurrentActionElement; nCurPos < nPos; 
nCurPos++ )
 {
-if( !Hook() )
+if( !Hook() && pAction )
 {
 MetaCommentAction* pCommentAct = 
static_cast(pAction);
 if( pAction->GetType() == META_COMMENT_ACTION &&
commit 1b35b63e7bb5fd37c7db8575c55a273c59354175
Author: Norbert Thiebaud 
Date:   Fri Jul 4 11:40:55 2014 +0200

coverity#704033 Uncheck return value

Change-Id: I7c119d41d2419f1181f6fe30d501e5142d2586ec

diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 72c47a6..8d8c536 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -894,7 +894,6 @@ void SAL_CALL FmXFormShell::formDeactivated(const 
EventObject& rEvent) throw( Ru
 
 void FmXFormShell::disposing()
 {
-impl_checkDisposed();
 
 FmXFormShell_BASE::disposing();
 
commit bff3cba118eb43142b98be627ca6bdf31d7485fa
Author: Norbert Thiebaud 
Date:   Fri Jul 4 11:38:28 2014 +0200

coverity#704032 Uncheck return value

Change-Id: Ibb37a059f740580f1d02ed58172451ad5efdd8d5

diff --git 

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

[Michael Stahl]

 writerfilter/source/dmapper/GraphicImport.cxx |   39 --
 1 file changed, 39 deletions(-)

New commits:
commit 4efc9e9007bf8f7447111dbecb7fe48fd8116d3f
Author: Michael Stahl 
Date:   Fri Jul 4 13:51:30 2014 +0200

writerfilter: remove GraphicImport_Impl::nTopCrop etc.

These members were only initialized by the doctok, from
NS_rtf::LN_DYACROPTOP etc.

Change-Id: I933c1c4b8f2bb808dd04b82bc8efe5028a2a153d

diff --git a/writerfilter/source/dmapper/GraphicImport.cxx 
b/writerfilter/source/dmapper/GraphicImport.cxx
index 038d974..da20fa0 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -196,10 +196,6 @@ public:
 sal_Int32 nTopPosition;
 sal_Int32 nRightPosition;
 sal_Int32 nBottomPosition;
-sal_Int32 nLeftCrop;
-sal_Int32 nTopCrop;
-sal_Int32 nRightCrop;
-sal_Int32 nBottomCrop;
 
 bool  bUseSimplePos;
 sal_Int32 zOrder;
@@ -271,10 +267,6 @@ public:
 ,nTopPosition(0)
 ,nRightPosition(0)
 ,nBottomPosition(0)
-,nLeftCrop(0)
-,nTopCrop (0)
-,nRightCrop (0)
-,nBottomCrop(0)
 ,bUseSimplePos(false)
 ,zOrder(-1)
 ,nHoriOrient(   text::HoriOrientation::NONE )
@@ -1076,15 +1068,6 @@ void GraphicImport::lcl_sprm(Sprm& rSprm)
 void GraphicImport::lcl_entry(int /*pos*/, 
writerfilter::Reference::Pointer_t /*ref*/)
 {
 }
-/*-
-crop is stored as "fixed float" as 16.16 fraction value
-related to width/or height
-  ---*/
-void lcl_CalcCrop( sal_Int32& nCrop, sal_Int32 nRef )
-{
-nCrop = ((nCrop >> 16   ) * nRef )
-   + (((nCrop & 0x) * nRef ) >> 16);
-}
 
 uno::Reference< text::XTextContent > GraphicImport::createGraphicObject( const 
beans::PropertyValues& aMediaProperties )
 {
@@ -1291,28 +1274,6 @@ uno::Reference< text::XTextContent > 
GraphicImport::createGraphicObject( const b
 
 
xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName( 
PROP_CONTOUR_POLY_POLYGON),

aContourPolyPolygon);
-
-if( aGraphicSize.Width && aGraphicSize.Height )
-{
-//todo: i71651 graphic size is not provided by the 
GraphicDescriptor
-lcl_CalcCrop( m_pImpl->nTopCrop, aGraphicSize.Height );
-lcl_CalcCrop( m_pImpl->nBottomCrop, aGraphicSize.Height );
-lcl_CalcCrop( m_pImpl->nLeftCrop, aGraphicSize.Width );
-lcl_CalcCrop( m_pImpl->nRightCrop, aGraphicSize.Width );
-
-
-// We need a separate try-catch here, otherwise a bad crop 
setting will also nuke the size settings as well.
-try
-{
-
xGraphicProperties->setPropertyValue(rPropNameSupplier.GetName( 
PROP_GRAPHIC_CROP ),
-
uno::makeAny(text::GraphicCrop(m_pImpl->nTopCrop, m_pImpl->nBottomCrop, 
m_pImpl->nLeftCrop, m_pImpl->nRightCrop)));
-}
-catch (const uno::Exception& e)
-{
-SAL_WARN("writerfilter", "failed. Message :" << 
e.Message);
-}
-}
-
 }
 
 if(m_pImpl->eGraphicImportType == IMPORT_AS_DETECTED_INLINE || 
m_pImpl->eGraphicImportType == IMPORT_AS_DETECTED_ANCHOR)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - xmloff/source

[Oliver-Rainer Wittmann]

 xmloff/source/text/txtimppr.cxx |   41 ++--
 1 file changed, 35 insertions(+), 6 deletions(-)

New commits:
commit 9d50f2b20cdf409f30fe573afb6e8db20be0689e
Author: Oliver-Rainer Wittmann 
Date:   Fri Jul 4 11:36:35 2014 +

124107: ODF import - ignore fo:margin="100%" for paragraph styles as core 
attributes are not able to treat it correctly.

The result is the same - value are inherited from parent

diff --git a/xmloff/source/text/txtimppr.cxx b/xmloff/source/text/txtimppr.cxx
index a748923..b76f6e1 100644
--- a/xmloff/source/text/txtimppr.cxx
+++ b/xmloff/source/text/txtimppr.cxx
@@ -312,9 +312,11 @@ void XMLTextImportPropertyMapper::finished(
 XMLPropertyState* pVertOrientRelAsChar = 0;
 XMLPropertyState* pBackTransparency = NULL; // transparency in %
 XMLPropertyState* pBackTransparent = NULL;  // transparency as boolean
+
 XMLPropertyState* pAllParaMargin = 0;
 XMLPropertyState* pParaMargins[4] = { 0, 0, 0, 0 };
 ::std::auto_ptr pNewParaMargins[4];
+
 XMLPropertyState* pAllMargin = 0;
 XMLPropertyState* pMargins[4] = { 0, 0, 0, 0 };
 ::std::auto_ptr pNewMargins[4];
@@ -385,21 +387,42 @@ void XMLTextImportPropertyMapper::finished(
 bHasAnyWidth = sal_True; break;
 case CTF_BACKGROUND_TRANSPARENCY: pBackTransparency = property; break;
 case CTF_BACKGROUND_TRANSPARENT:  pBackTransparent = property; break;
+
 case CTF_PARAMARGINALL:
+pAllParaMargin = property;
+break;
 case CTF_PARAMARGINALL_REL:
-pAllParaMargin = property; break;
+{
+sal_uInt32 nValue;
+property->maValue >>= nValue;
+// treat fo:margin="100%" as it is not exisiting as the
+// corresponding core attribute classes -  and
+//  - are not able to treat such a value 
correctly.
+// The result will be the same as the values will be inherited
+// from parent, when the no margin attribute is given.
+if ( nValue != 100 )
+{
+pAllParaMargin = property;
+}
+}
+break;
+
 case CTF_PARALEFTMARGIN:
 case CTF_PARALEFTMARGIN_REL:
 pParaMargins[XML_LINE_LEFT] = property; break;
+
 case CTF_PARARIGHTMARGIN:
 case CTF_PARARIGHTMARGIN_REL:
 pParaMargins[XML_LINE_RIGHT] = property; break;
+
 case CTF_PARATOPMARGIN:
 case CTF_PARATOPMARGIN_REL:
 pParaMargins[XML_LINE_TOP] = property; break;
+
 case CTF_PARABOTTOMMARGIN:
 case CTF_PARABOTTOMMARGIN_REL:
 pParaMargins[XML_LINE_BOTTOM] = property; break;
+
 case CTF_MARGINALL:
 pAllMargin = property; break;
 case CTF_MARGINLEFT:
@@ -428,7 +451,8 @@ void XMLTextImportPropertyMapper::finished(
 
 for (sal_uInt16 i = 0; i < 4; i++)
 {
-if (pAllParaMargin && !pParaMargins[i])
+if ( pAllParaMargin != NULL
+ && pParaMargins[i] == NULL )
 {
 #ifdef DBG_UTIL
 sal_Int16 nTmp = getPropertySetMapper()->GetEntryContextId(
@@ -437,9 +461,12 @@ void XMLTextImportPropertyMapper::finished(
 nTmp <= CTF_PARABOTTOMMARGIN_REL,
 "wrong property context id" );
 #endif
-pNewParaMargins[i].reset(new XMLPropertyState(
-pAllParaMargin->mnIndex + (2*i) + 2, pAllParaMargin->maValue));
+// IMPORTANT NOTE: the index calculation depends on the right 
order in the property map
+pNewParaMargins[i].reset(
+new XMLPropertyState( pAllParaMargin->mnIndex + (2*i) + 2,
+  pAllParaMargin->maValue ) );
 }
+
 if (pAllMargin && !pMargins[i])
 {
 #ifdef DBG_UTIL
@@ -448,8 +475,10 @@ void XMLTextImportPropertyMapper::finished(
 OSL_ENSURE( nTmp >= CTF_MARGINLEFT && nTmp <= CTF_MARGINBOTTOM,
 "wrong property context id" );
 #endif
-pNewMargins[i].reset(new XMLPropertyState(
-pAllMargin->mnIndex + i + 1, pAllMargin->maValue));
+// IMPORTANT NOTE: the index calculation depends on the right 
order in the property map
+pNewMargins[i].reset(
+new XMLPropertyState( pAllMargin->mnIndex + i + 1,
+  pAllMargin->maValue ) );
 }
 if( pAllBorderDistance && !pBorderDistances[i] )
 {
___
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

[bugzilla-daemon]

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

--- Comment #48 from Daniel Rech  ---
(In reply to comment #47)
> (In reply to comment #46)
> > I have sent a fix proposal to the mailing list, but apparently my e-mail was
> > not approved by the moderators.
> 
> libreoffice at lists.freedesktop.org, the developer list, does not use
> moderation nor subscription (you can tell by the high amount of spam it
> gets). Where did you send your patch?
> 
> BTW, using Gerrit is much preferred
> (http://wiki.documentfoundation.org/gerrit).

This is the e-mail I received back after submitting my own:

"
Your mail to 'LibreOffice' with the subject

[PATCH] Only capture multimedia key events on Windows when in
presentation mode

Is being held until the list moderator can review it for approval.

The reason it is being held:

The message headers matched a filter rule

Either the message will get posted to the list, or you will receive
notification of the moderator's decision.  If you would like to cancel
this posting, please visit the following URL:
"

-- 
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: scp2/source

[Andras Timar]

 scp2/source/ooo/file_font_ooo.scp |   10 +++---
 scp2/source/ooo/module_hidden_ooo.scp |2 ++
 2 files changed, 9 insertions(+), 3 deletions(-)

New commits:
commit 97f63c17f7bc069a12e3afc3975f09897731a693
Author: Andras Timar 
Date:   Fri Jul 4 14:29:01 2014 +0200

add Carlito/Caladea fonts to install script

They were added in libreoffice-4-1 branch but not anywhere else.
See 2158e8bf85e139fd3cf59d00059ed2e2026f6a4a

Change-Id: I2dcec7898590b526161be7eec1afe4610e6fe534

diff --git a/scp2/source/ooo/file_font_ooo.scp 
b/scp2/source/ooo/file_font_ooo.scp
index e7a2da35..597d5af 100644
--- a/scp2/source/ooo/file_font_ooo.scp
+++ b/scp2/source/ooo/file_font_ooo.scp
@@ -1,7 +1,7 @@
 /*
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,7 +31,7 @@
 
 STD_FONT_FILELIST( gid_File_Fnt_Opensymb, "extras_fonts.filelist" )
 
-#ifndef WITHOUT_FONTS 
+#ifndef WITHOUT_FONTS
 
 // DejaVu fonts
 STD_FONT_FILELIST(gid_File_Fnt_DejaVu, "fonts_dejavu.filelist")
@@ -58,12 +58,16 @@ STD_FONT_FILELIST(gid_File_Fnt_SourceSans, 
"fonts_sourcesans.filelist")
 // Source Code Pro fonts
 STD_FONT_FILELIST(gid_File_Fnt_SourceCode, "fonts_sourcecode.filelist")
 
+//Carlito and Caladea fonts
+STD_FONT_FILELIST(gid_File_Fnt_Carlito, "fonts_carlito.filelist")
+STD_FONT_FILELIST(gid_File_Fnt_Caladea, "fonts_caladea.filelist")
+
 #endif
 
 // fontconfig updates to allow proper use of local fonts
 
 #ifdef UNX
-#ifndef WITHOUT_FONTS 
+#ifndef WITHOUT_FONTS
 File gid_File_FcLocal_Conf
 Dir = FILELIST_DIR;
 USER_FILE_BODY;
diff --git a/scp2/source/ooo/module_hidden_ooo.scp 
b/scp2/source/ooo/module_hidden_ooo.scp
index e01c2c3..d7dd6e0 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -315,6 +315,8 @@ Module gid_Module_Root_Fonts_OOo_Hidden
Default = YES;
Styles = (HIDDEN_ROOT);
Files = (gid_File_Fnt_Opensymb,
+   gid_File_Fnt_Caladea,
+   gid_File_Fnt_Carlito,
gid_File_Fnt_DejaVu,
gid_File_Fnt_Gentium,
gid_File_Fnt_LibSansNarrow,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 vcl/source/gdi/print.cxx |   18 --
 1 file changed, 12 insertions(+), 6 deletions(-)

New commits:
commit 1c6bd2c40fd03ec735fd6dbec01520f10ee1d55a
Author: Caolán McNamara 
Date:   Fri Jul 4 13:28:08 2014 +0100

Resolves: fdo#80911 toggle original page orientation on paper fallback

User defined page sizes which match rotated paper sizes available to the
printer don't work correctly when they are already in landscape mode.  i.e. 
the
orientation should be toggled, not overwritten.

Change-Id: I30dca5f988ad72319410a03f47eccff277be8640

diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index 6c8bdc4..ded7ebc 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -1352,6 +1352,7 @@ void Printer::ImplFindPaperFormatForUserSize( JobSetup& 
aJobSetup, bool bMatchNe
 int nLandscapeAngle = GetLandscapeAngle();
 int nPaperCount = GetPaperInfoCount();
 boolbFound = false;
+boolbToggleOrient = false;
 
 PaperInfo aInfo(pSetupData->mnPaperWidth, pSetupData->mnPaperHeight);
 
@@ -1364,7 +1365,6 @@ void Printer::ImplFindPaperFormatForUserSize( JobSetup& 
aJobSetup, bool bMatchNe
 {
 pSetupData->mePaperFormat = ImplGetPaperFormat( 
rPaperInfo.getWidth(),
 
rPaperInfo.getHeight() );
-pSetupData->meOrientation = ORIENTATION_PORTRAIT;
 bFound = true;
 break;
 }
@@ -1388,8 +1388,8 @@ void Printer::ImplFindPaperFormatForUserSize( JobSetup& 
aJobSetup, bool bMatchNe
 {
 pSetupData->mePaperFormat = ImplGetPaperFormat( 
rPaperInfo.getWidth(),
 
rPaperInfo.getHeight() );
-pSetupData->meOrientation = ORIENTATION_LANDSCAPE;
 bFound = true;
+bToggleOrient = true;
 break;
 }
 }
@@ -1399,7 +1399,6 @@ void Printer::ImplFindPaperFormatForUserSize( JobSetup& 
aJobSetup, bool bMatchNe
 {
  sal_Int64 nBestMatch = SAL_MAX_INT64;
  int nBestIndex = 0;
- Orientation eBestOrientation = ORIENTATION_PORTRAIT;
  for( int i = 0; i < nPaperCount; i++ )
  {
  const PaperInfo& rPaperInfo = GetPaperInfo( i );
@@ -1412,7 +1411,7 @@ void Printer::ImplFindPaperFormatForUserSize( JobSetup& 
aJobSetup, bool bMatchNe
  {
  nBestMatch = nMatch;
  nBestIndex = i;
- eBestOrientation = ORIENTATION_PORTRAIT;
+ bToggleOrient = false;
  }
 
  // check landscape match
@@ -1423,13 +1422,20 @@ void Printer::ImplFindPaperFormatForUserSize( JobSetup& 
aJobSetup, bool bMatchNe
  {
  nBestMatch = nMatch;
  nBestIndex = i;
- eBestOrientation = ORIENTATION_LANDSCAPE;
+ bToggleOrient = true;
  }
  }
  const PaperInfo& rBestInfo = GetPaperInfo( nBestIndex );
  pSetupData->mePaperFormat = ImplGetPaperFormat( rBestInfo.getWidth(),
  rBestInfo.getHeight() 
);
- pSetupData->meOrientation = eBestOrientation;
+}
+
+if (bToggleOrient)
+{
+if (pSetupData->meOrientation == ORIENTATION_PORTRAIT)
+pSetupData->meOrientation = ORIENTATION_LANDSCAPE;
+else
+pSetupData->meOrientation = ORIENTATION_PORTRAIT;
 }
 }
 
___
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' - scp2/source

[Andras Timar]

 scp2/source/ooo/file_font_ooo.scp |   10 +++---
 scp2/source/ooo/module_hidden_ooo.scp |2 ++
 2 files changed, 9 insertions(+), 3 deletions(-)

New commits:
commit 27df6cd7d168f637b9b642e826bed8f2e25cfb34
Author: Andras Timar 
Date:   Fri Jul 4 14:29:01 2014 +0200

add Carlito/Caladea fonts to install script

They were added in libreoffice-4-1 branch but not anywhere else.
See 2158e8bf85e139fd3cf59d00059ed2e2026f6a4a

Change-Id: I2dcec7898590b526161be7eec1afe4610e6fe534
(cherry picked from commit 97f63c17f7bc069a12e3afc3975f09897731a693)

diff --git a/scp2/source/ooo/file_font_ooo.scp 
b/scp2/source/ooo/file_font_ooo.scp
index 5e27d1f..e13dee3 100644
--- a/scp2/source/ooo/file_font_ooo.scp
+++ b/scp2/source/ooo/file_font_ooo.scp
@@ -1,7 +1,7 @@
 /*
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,7 +31,7 @@
 
 STD_FONT_FILELIST( gid_File_Fnt_Opensymb, "extras_fonts.filelist" )
 
-#ifndef WITHOUT_FONTS 
+#ifndef WITHOUT_FONTS
 
 // DejaVu fonts
 STD_FONT_FILELIST(gid_File_Fnt_DejaVu, "fonts_dejavu.filelist")
@@ -60,12 +60,16 @@ STD_FONT_FILELIST(gid_File_Fnt_SourceSans, 
"fonts_sourcesans.filelist")
 // Source Code Pro fonts
 STD_FONT_FILELIST(gid_File_Fnt_SourceCode, "fonts_sourcecode.filelist")
 
+//Carlito and Caladea fonts
+STD_FONT_FILELIST(gid_File_Fnt_Carlito, "fonts_carlito.filelist")
+STD_FONT_FILELIST(gid_File_Fnt_Caladea, "fonts_caladea.filelist")
+
 #endif
 
 // fontconfig updates to allow proper use of local fonts
 
 #ifdef UNX
-#ifndef WITHOUT_FONTS 
+#ifndef WITHOUT_FONTS
 File gid_File_FcLocal_Conf
 Dir = FILELIST_DIR;
 USER_FILE_BODY;
diff --git a/scp2/source/ooo/module_hidden_ooo.scp 
b/scp2/source/ooo/module_hidden_ooo.scp
index 22edd6c..e75d860 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -374,6 +374,8 @@ Module gid_Module_Root_Fonts_OOo_Hidden
Default = YES;
Styles = (HIDDEN_ROOT);
Files = (gid_File_Fnt_Opensymb,
+   gid_File_Fnt_Caladea,
+   gid_File_Fnt_Carlito,
gid_File_Fnt_DejaVu,
gid_File_Fnt_Gentium,
gid_File_Fnt_LibSansNarrow,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 8c/424ee978f5ea027289391332b1daab173b084b

[Caolán McNamara]

 8c/424ee978f5ea027289391332b1daab173b084b |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 6bf55f184704ecc45c54f326e8e48f90f9038d29
Author: Caolán McNamara 
Date:   Fri Jul 4 13:35:14 2014 +0100

Notes added by 'git notes add'

diff --git a/8c/424ee978f5ea027289391332b1daab173b084b 
b/8c/424ee978f5ea027289391332b1daab173b084b
new file mode 100644
index 000..8e5c182
--- /dev/null
+++ b/8c/424ee978f5ea027289391332b1daab173b084b
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 90/a3fb5a924cb16e3b2c05b2ac9d4cd6bd32d504

[Caolán McNamara]

 90/a3fb5a924cb16e3b2c05b2ac9d4cd6bd32d504 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d63d4a1051c57915e0d94f70d21016a36abee84e
Author: Caolán McNamara 
Date:   Fri Jul 4 13:36:53 2014 +0100

Notes added by 'git notes add'

diff --git a/90/a3fb5a924cb16e3b2c05b2ac9d4cd6bd32d504 
b/90/a3fb5a924cb16e3b2c05b2ac9d4cd6bd32d504
new file mode 100644
index 000..8e5c182
--- /dev/null
+++ b/90/a3fb5a924cb16e3b2c05b2ac9d4cd6bd32d504
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 chart2/source/model/template/ChartType.cxx |   24 ++--
 chart2/source/model/template/ChartType.hxx |7 +--
 2 files changed, 27 insertions(+), 4 deletions(-)

New commits:
commit 6cad548ee21f19b816726a03995b9bc8905757f8
Author: Michael Stahl 
Date:   Fri Jul 4 14:53:42 2014 +0200

chart2: add some locking to chart::ChartType UNO service

On the libreoffice-4-3 branch, chart2_unoapi crashed with what looks
like a corrupted ChartType::m_aDataSeries triggering STL assertions.

Try to protect the mutable members with SolarMutex guards.

Change-Id: I3f2edd36b8ecf37ef60239415f70abfc8b59244d

diff --git a/chart2/source/model/template/ChartType.cxx 
b/chart2/source/model/template/ChartType.cxx
index 0ead037..9ab9722 100644
--- a/chart2/source/model/template/ChartType.cxx
+++ b/chart2/source/model/template/ChartType.cxx
@@ -26,6 +26,7 @@
 #include "CloneHelper.hxx"
 #include "AxisIndexDefines.hxx"
 #include "ContainerHelper.hxx"
+#include 
 #include 
 #include 
 
@@ -56,7 +57,11 @@ ChartType::ChartType( const ChartType & rOther ) :
 m_xContext( rOther.m_xContext ),
 m_bNotifyChanges( true )
 {
-CloneHelper::CloneRefVector< Reference< chart2::XDataSeries > >( 
rOther.m_aDataSeries, m_aDataSeries );
+{
+SolarMutexGuard g; // access to rOther.m_aDataSeries
+CloneHelper::CloneRefVector >(
+rOther.m_aDataSeries, m_aDataSeries);
+}
 ModifyListenerHelper::addListenerToAllElements( m_aDataSeries, 
m_xModifyEventForwarder );
 }
 
@@ -145,6 +150,8 @@ void SAL_CALL ChartType::addDataSeries( const Reference< 
chart2::XDataSeries >&
 throw (lang::IllegalArgumentException,
uno::RuntimeException, std::exception)
 {
+SolarMutexGuard g;
+
 impl_addDataSeriesWithoutNotification( xDataSeries );
 fireModifyEvent();
 }
@@ -156,6 +163,8 @@ void SAL_CALL ChartType::removeDataSeries( const Reference< 
chart2::XDataSeries
 if( !xDataSeries.is())
 throw container::NoSuchElementException();
 
+SolarMutexGuard g;
+
 tDataSeriesContainerType::iterator aIt(
 ::std::find( m_aDataSeries.begin(), m_aDataSeries.end(), 
xDataSeries ) );
 
@@ -172,6 +181,8 @@ void SAL_CALL ChartType::removeDataSeries( const Reference< 
chart2::XDataSeries
 Sequence< Reference< chart2::XDataSeries > > SAL_CALL 
ChartType::getDataSeries()
 throw (uno::RuntimeException, std::exception)
 {
+SolarMutexGuard g;
+
 return ContainerHelper::ContainerToSequence( m_aDataSeries );
 }
 
@@ -179,6 +190,8 @@ void SAL_CALL ChartType::setDataSeries( const Sequence< 
Reference< chart2::XData
 throw (lang::IllegalArgumentException,
uno::RuntimeException, std::exception)
 {
+SolarMutexGuard g;
+
 m_bNotifyChanges = false;
 try
 {
@@ -304,7 +317,14 @@ void ChartType::firePropertyChangeEvent()
 
 void ChartType::fireModifyEvent()
 {
-if( m_bNotifyChanges )
+bool bNotifyChanges;
+
+{
+SolarMutexGuard g;
+bNotifyChanges = m_bNotifyChanges;
+}
+
+if (bNotifyChanges)
 m_xModifyEventForwarder->modified( lang::EventObject( static_cast< 
uno::XWeak* >( this )));
 }
 
diff --git a/chart2/source/model/template/ChartType.hxx 
b/chart2/source/model/template/ChartType.hxx
index 18dfaea..7facd15 100644
--- a/chart2/source/model/template/ChartType.hxx
+++ b/chart2/source/model/template/ChartType.hxx
@@ -140,7 +140,8 @@ protected:
  DECLARE_XTYPEPROVIDER()
 
 protected:
-::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener 
> m_xModifyEventForwarder;
+::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >
+const m_xModifyEventForwarder;
 
 private:
 void impl_addDataSeriesWithoutNotification(
@@ -149,13 +150,15 @@ private:
 
 private:
 ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext 
>
-m_xContext;
+const m_xContext;
 
 typedef
 ::std::vector< ::com::sun::star::uno::Reference<
 ::com::sun::star::chart2::XDataSeries > >
 tDataSeriesContainerType;
 
+// --- mutable members: the following members need mutex guard ---
+
 tDataSeriesContainerType  m_aDataSeries;
 
 bool  m_bNotifyChanges;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 9d/50f2b20cdf409f30fe573afb6e8db20be0689e

[Michael Stahl]

 9d/50f2b20cdf409f30fe573afb6e8db20be0689e |1 +
 1 file changed, 1 insertion(+)

New commits:
commit f898c95342ec328335a1e5ab9d7e85df58c0d0cc
Author: Michael Stahl 
Date:   Fri Jul 4 15:26:48 2014 +0200

Notes added by 'git notes add'

diff --git a/9d/50f2b20cdf409f30fe573afb6e8db20be0689e 
b/9d/50f2b20cdf409f30fe573afb6e8db20be0689e
new file mode 100644
index 000..98c4126
--- /dev/null
+++ b/9d/50f2b20cdf409f30fe573afb6e8db20be0689e
@@ -0,0 +1 @@
+prefer: 23c099a0236062724430efb986251637095c8d4f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 vcl/source/gdi/font.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 61dca7f849a61daeceb68856766c43995d6794e5
Author: Miklos Vajna 
Date:   Fri Jul 4 15:57:40 2014 +0200

vcl: printf -> SAL_INFO in Font::SetFillColor

Change-Id: Icbe3d7f2dc8e25bfde6efc92435f1cef50a3b419

diff --git a/vcl/source/gdi/font.cxx b/vcl/source/gdi/font.cxx
index b3daebd..a2fb925 100644
--- a/vcl/source/gdi/font.cxx
+++ b/vcl/source/gdi/font.cxx
@@ -300,8 +300,7 @@ void Font::SetFillColor( const Color& rColor )
 if ( rColor.GetTransparency() )
 mpImplFont->mbTransparent = true;
 if (GetUnderline() == UNDERLINE_SINGLE ) {
-fprintf(stderr, "I'm setting a filling (from Font) of (%d,%d,%d) \n",
-rColor.GetRed(), rColor.GetGreen(), rColor.GetBlue());
+SAL_INFO("vcl.gdi", "I'm setting a filling (from Font) of (" << 
rColor.GetRed() << "," << rColor.GetGreen() << "," << rColor.GetBlue() << ")");
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 10 commits - oox/source sc/source sd/CppunitTest_sd_export_tests.mk sd/Module_sd.mk sd/qa test/source

[Markus Mohrhard]

 oox/source/ppt/pptshape.cxx   |1 
 sc/source/ui/unoobj/datauno.cxx   |1 
 sd/CppunitTest_sd_export_tests.mk |  119 ++
 sd/Module_sd.mk   |1 
 sd/qa/unit/export-tests.cxx   |  427 ++
 sd/qa/unit/import-tests.cxx   |  395 ---
 sd/qa/unit/sdmodeltestbase.hxx|8 
 test/source/bootstrapfixture.cxx  |4 
 8 files changed, 559 insertions(+), 397 deletions(-)

New commits:
commit 9feb55b662ac75209adc664ef86571c261a74ded
Author: Markus Mohrhard 
Date:   Fri Jul 4 15:58:54 2014 +0200

make the validation working correctly

We still have ODP validation errors of the form:

Change-Id: Id60df0e07a0b6d3fd2613d5c66698a6cd9b99afd
Error: attribute "draw:fit-to-size" has a bad value. Possible values
are: false,true

diff --git a/sd/qa/unit/sdmodeltestbase.hxx b/sd/qa/unit/sdmodeltestbase.hxx
index 8c1eac7..64f5a6b 100644
--- a/sd/qa/unit/sdmodeltestbase.hxx
+++ b/sd/qa/unit/sdmodeltestbase.hxx
@@ -181,11 +181,11 @@ protected:
 save(pShell, pFormat, aTempFile);
 if(nExportType == ODP)
 {
-BootstrapFixture::validate(aTempFile.GetURL(), test::ODF);
+// BootstrapFixture::validate(aTempFile.GetFileName(), test::ODF);
 }
 else if(nExportType == PPTX)
 {
-// BootstrapFixture::validate(aTempFile.GetURL(), test::OOXML);
+BootstrapFixture::validate(aTempFile.GetFileName(), test::OOXML);
 }
 return loadURL(aTempFile.GetURL());
 }
commit 76f7a05fa34835ab5ec20259d1254f3255432097
Author: Markus Mohrhard 
Date:   Fri Jul 4 15:53:40 2014 +0200

document strange code, coverity#704001

Change-Id: Id6668f47f0549e719010141929b011aa028812d2

diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx
index ac260c7..b848791 100644
--- a/sc/source/ui/unoobj/datauno.cxx
+++ b/sc/source/ui/unoobj/datauno.cxx
@@ -2052,6 +2052,7 @@ void SAL_CALL ScDatabaseRangeObj::setPropertyValue(
 {
 if (ScUnoHelpFunctions::GetBoolFromAny( aValue ))
 {
+// only here to set bIsAdvanced in ScDBData
 ScRange aRange;
 aNewData.GetAdvancedQuerySource(aRange);
 aNewData.SetAdvancedQuerySource(&aRange);
commit 4f1b91205f2535eba355e020de31080bc155f75b
Author: Markus Mohrhard 
Date:   Fri Jul 4 05:34:32 2014 +0200

remove unused header file

Change-Id: I78c2462f56fb4b5792f396bb7e0dd2c0fd237420

diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 3298b46..01aade4 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -47,8 +47,6 @@
 #include 
 #include 
 
-#include 
-
 using namespace ::com::sun::star;
 
 /// Impress import filters tests.
commit 7e3f0824a16746b1d5f62e9fca987e5a10fda92f
Author: Markus Mohrhard 
Date:   Fri Jul 4 05:34:13 2014 +0200

improve test failure message

Change-Id: I71d6b65b046bfc31692ba12423288c55fccb2d02

diff --git a/test/source/bootstrapfixture.cxx b/test/source/bootstrapfixture.cxx
index 110e0a5..fe0a1ea 100644
--- a/test/source/bootstrapfixture.cxx
+++ b/test/source/bootstrapfixture.cxx
@@ -171,8 +171,8 @@ void test::BootstrapFixture::validate(const OUString& 
rPath, test::ValidationFor
 
 int returnValue = system(OUStringToOString(aCommand, 
RTL_TEXTENCODING_UTF8).getStr());
 CPPUNIT_ASSERT_EQUAL_MESSAGE(
-OUStringToOString(aCommand, RTL_TEXTENCODING_UTF8).getStr(), 0,
-returnValue);
+OUStringToOString(OUString("failed to execute: ") + aCommand,
+RTL_TEXTENCODING_UTF8).getStr(), 0, returnValue);
 
 OString aContentString = loadFile(aOutput.GetURL());
 OUString aContentOUString = OStringToOUString(aContentString, 
RTL_TEXTENCODING_UTF8);
commit 597189f481ddd1a5724d7af75362053f4b5cd9c8
Author: Markus Mohrhard 
Date:   Fri Jul 4 05:26:20 2014 +0200

enable ODP export validation in sd export test

Change-Id: I849d2f0d8631cfb91326d80e554c9ce55940abd8

diff --git a/sd/qa/unit/sdmodeltestbase.hxx b/sd/qa/unit/sdmodeltestbase.hxx
index 636bd0d..8c1eac7 100644
--- a/sd/qa/unit/sdmodeltestbase.hxx
+++ b/sd/qa/unit/sdmodeltestbase.hxx
@@ -179,6 +179,14 @@ protected:
 utl::TempFile aTempFile(OUString(), true, &aExt);
 aTempFile.EnableKillingFile();
 save(pShell, pFormat, aTempFile);
+if(nExportType == ODP)
+{
+BootstrapFixture::validate(aTempFile.GetURL(), test::ODF);
+}
+else if(nExportType == PPTX)
+{
+// BootstrapFixture::validate(aTempFile.GetURL(), test::OOXML);
+}
 return loadURL(aTempFile.GetURL());
 }
 
commit f4dca0bfa53c717f6fafddf8fbf699ca7372180a
Author: Markus Mohrhard 
Date:   Fri Jul 4 05:15:31 2014 +0200

split sd's import and export tests

Change-Id: I06d5b02ec94c7bb74b64cd210267acf2be1a4931

diff

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - filter/source

[Armin Le Grand]

 filter/source/svg/svgwriter.cxx |   12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 246d1ce469c155b81743cb6eaa065da2b19d7dcc
Author: Armin Le Grand 
Date:   Fri Jul 4 12:15:15 2014 +

i124825 secure usage of object ID in preparation of names for line 
start/end geometry

diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 416020c..26f3d2a 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -1647,7 +1647,11 @@ void SVGActionWriter::ImplWriteActions( const 
GDIMetaFile& rMtf,
 if(aStartArrow.Count())
 {
 mapCurShape->maShapePolyPoly = aStartArrow;
-mapCurShape->maId = *pElementId + B2UCONST("_") + 
::rtl::OUString::valueOf(nEntryCount++);
+
+if( pElementId ) // #i124825# pElementId is 
optinal, may be zero
+{
+mapCurShape->maId = *pElementId + 
B2UCONST("_") + ::rtl::OUString::valueOf(nEntryCount++);
+}
 
 ImplWriteShape( *mapCurShape );
 }
@@ -1655,7 +1659,11 @@ void SVGActionWriter::ImplWriteActions( const 
GDIMetaFile& rMtf,
 if(aEndArrow.Count())
 {
 mapCurShape->maShapePolyPoly = aEndArrow;
-mapCurShape->maId = *pElementId + B2UCONST("_") + 
::rtl::OUString::valueOf(nEntryCount++);
+
+if( pElementId ) // #i124825# pElementId is 
optinal, may be zero
+{
+mapCurShape->maId = *pElementId + 
B2UCONST("_") + ::rtl::OUString::valueOf(nEntryCount++);
+}
 
 ImplWriteShape( *mapCurShape );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/libgltf

[Zolnai Tamás]

 external/libgltf/UnpackedTarball_libgltf.mk |1 
 external/libgltf/patches/stop_a_potential_memory_leak.patch |   27 
 2 files changed, 28 insertions(+)

New commits:
commit 8ea270213ba95544011fc3a79cc33f0511f6c62e
Author: Zolnai Tamás 
Date:   Fri Jul 4 16:46:23 2014 +0200

libgltf: Stop a memory leak

Change-Id: I7f3f5cfcdc368907670d58b07300889ea8452340

diff --git a/external/libgltf/UnpackedTarball_libgltf.mk 
b/external/libgltf/UnpackedTarball_libgltf.mk
index 2e027ad..f1e618c 100644
--- a/external/libgltf/UnpackedTarball_libgltf.mk
+++ b/external/libgltf/UnpackedTarball_libgltf.mk
@@ -32,6 +32,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libgltf,\
external/libgltf/patches/fix_package_file.patch \
external/libgltf/patches/comma_at_end_of_enumerator_list.patch \
external/libgltf/patches/extra_semicolon.patch \
+   external/libgltf/patches/stop_a_potential_memory_leak.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libgltf/patches/stop_a_potential_memory_leak.patch 
b/external/libgltf/patches/stop_a_potential_memory_leak.patch
new file mode 100644
index 000..1dff583
--- /dev/null
+++ b/external/libgltf/patches/stop_a_potential_memory_leak.patch
@@ -0,0 +1,27 @@
+changeset:   1068:ef62f9d46016
+branch:  improvement
+parent:  1065:ce62a560f347
+user:LeiQu
+date:Tue Jul 01 14:46:15 2014 +0800
+summary: Fix the bug of memory leak
+
+diff -ur libgltf.org/src/LoadScene.cpp libgltf/src/LoadScene.cpp
+--- libgltf.org/src/LoadScene.cpp  2014-07-04 16:35:53.702409179 +0200
 libgltf/src/LoadScene.cpp  2014-07-04 16:35:59.926408911 +0200
+@@ -1052,10 +1052,14 @@
+ std::string nodeId;
+ for (; it != itEnd; ++it)
+ {
+-Animation* pAnimation = new Animation();
+ boost::property_tree::ptree pAnimTree = it->second;
+ nodeId = parseChannel(pAnimTree);
+-parsePara(pAnimTree, pAnimation, nodeId);
++if (nodeId.empty())
++{
++continue;
++}
++Animation* pAnimation = new Animation();
++parsePara(pAnimTree, pAnimation, nodeId); 
+ this->pScene->insertAnimMap(nodeId, pAnimation);
+ }
+ return true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/template_manager_improvements' - sfx2/source

[Efe Gürkan YALAMAN]

 sfx2/source/dialog/backingwindow.cxx |   31 ++-
 sfx2/source/dialog/backingwindow.hxx |1 +
 2 files changed, 31 insertions(+), 1 deletion(-)

New commits:
commit ea20bddcf54a0d35d944855931e8b9e51bf02842
Author: Efe Gürkan YALAMAN 
Date:   Fri Jul 4 18:04:30 2014 +0300

Start of filtering implementation

Change-Id: Iebf71deb4739703d87b944300cbc1b8ee2daacc5

diff --git a/sfx2/source/dialog/backingwindow.cxx 
b/sfx2/source/dialog/backingwindow.cxx
index daa5322..15c126a 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -33,6 +33,7 @@
 #include 
 #include 
 
+#include 
 
 #include 
 #include 
@@ -301,7 +302,20 @@ void BackingWindow::initControls()
  *Filter and the bars*/
 
 setupButton( mpOpenButton );
-setupButton( mpTemplateButton );
+//setupButton( mpTemplateButton );
+Font bFont(mpTemplateButton->GetControlFont());
+bFont.SetHeight(nButtonsFontSize);
+mpTemplateButton->SetControlFont(bFont);
+
+// color that fits the theme
+mpTemplateButton->SetControlForeground(aButtonsText);
+
+
+mpTemplateButton->SetDropDown( PUSHBUTTON_DROPDOWN_MENUBUTTON );
+MenuButton *pMenuButton = static_cast (mpTemplateButton);
+pMenuButton->SetMenuMode( MENUBUTTON_MENUMODE_TIMED );
+pMenuButton->SetActivateHdl( LINK( this, BackingWindow, ActivateHdl ));
+//pMenuButton->Activate();
 
 setupButton( mpWriterAllButton );
 setupButton( mpDrawAllButton );
@@ -574,6 +588,21 @@ IMPL_LINK( BackingWindow, ClickHdl, Button*, pButton )
 return 0;
 }
 
+IMPL_LINK( BackingWindow, ActivateHdl, Button*, pButton )
+{
+printf("-");
+MenuButton *pMenuButton = static_cast (pButton);
+PopupMenu *pFilterMenu = new PopupMenu;
+
+//pFilterMenu->SetSelectHdl(LINK( this, BackingWindow, 
FilterMenuSelectHdl));
+pFilterMenu->InsertItem(0, "Writer");
+
+
+pMenuButton->SetPopupMenu( pFilterMenu );
+
+
+return 0;
+}
 
 
 IMPL_LINK_NOARG( BackingWindow, OpenRegionHdl)
diff --git a/sfx2/source/dialog/backingwindow.hxx 
b/sfx2/source/dialog/backingwindow.hxx
index c6cdade..b2b14ca 100644
--- a/sfx2/source/dialog/backingwindow.hxx
+++ b/sfx2/source/dialog/backingwindow.hxx
@@ -111,6 +111,7 @@ class BackingWindow
 std::set maSelFolders;
 
 DECL_LINK(ClickHdl, Button*);
+DECL_LINK(ActivateHdl, Button*);
 DECL_LINK(ExtLinkClickHdl, Button*);
 DECL_LINK(OpenRegionHdl, void*);
 DECL_LINK(OpenTemplateHdl, ThumbnailViewItem*);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Armin Le Grand]

 svgio/inc/svgio/svgreader/svgclippathnode.hxx |6 --
 svgio/inc/svgio/svgreader/svgmasknode.hxx |6 --
 svgio/source/svgreader/svgclippathnode.cxx|   12 +++-
 svgio/source/svgreader/svgmasknode.cxx|   17 -
 svgio/source/svgreader/svgstyleattributes.cxx |6 --
 5 files changed, 39 insertions(+), 8 deletions(-)

New commits:
commit 7c4fb287bb1e69725560cd4688e1d1d99d4498e0
Author: Armin Le Grand 
Date:   Thu Jul 3 15:49:09 2014 +

Resolves: #i124852# Corrected mask and clip polygons for userSpaceOnUse

(cherry picked from commit 247d5bc4d13c8ab299f8ca72768946f59815dca4)

Change-Id: I328a55e940db64d3dad04902bf81ede56a0dfe73

diff --git a/svgio/inc/svgio/svgreader/svgclippathnode.hxx 
b/svgio/inc/svgio/svgreader/svgclippathnode.hxx
index d7fbf9b..36586d8 100644
--- a/svgio/inc/svgio/svgreader/svgclippathnode.hxx
+++ b/svgio/inc/svgio/svgreader/svgclippathnode.hxx
@@ -47,8 +47,10 @@ namespace svgio
 virtual void parseAttribute(const OUString& rTokenName, SVGToken 
aSVGToken, const OUString& aContent) SAL_OVERRIDE;
 virtual void 
decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool 
bReferenced) const SAL_OVERRIDE;
 
-/// apply contained clipPath to given geometry
-void apply(drawinglayer::primitive2d::Primitive2DSequence& 
rTarget) const;
+/// apply contained clipPath to given geometry #i124852# transform 
may be needed
+void apply(
+drawinglayer::primitive2d::Primitive2DSequence& rTarget,
+const basegfx::B2DHomMatrix* pTransform) const;
 
 /// clipPathUnits content
 SvgUnits getClipPathUnits() const { return maClipPathUnits; }
diff --git a/svgio/inc/svgio/svgreader/svgmasknode.hxx 
b/svgio/inc/svgio/svgreader/svgmasknode.hxx
index e0f66b1..897401f 100644
--- a/svgio/inc/svgio/svgreader/svgmasknode.hxx
+++ b/svgio/inc/svgio/svgreader/svgmasknode.hxx
@@ -52,8 +52,10 @@ namespace svgio
 virtual void parseAttribute(const OUString& rTokenName, SVGToken 
aSVGToken, const OUString& aContent) SAL_OVERRIDE;
 virtual void 
decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool 
bReferenced) const SAL_OVERRIDE;
 
-/// apply contained clipPath to given geometry
-void apply(drawinglayer::primitive2d::Primitive2DSequence& 
rTarget) const;
+/// apply contained clipPath to given geometry #i124852# transform 
may be needed
+void apply(
+drawinglayer::primitive2d::Primitive2DSequence& rTarget,
+const basegfx::B2DHomMatrix* pTransform) const;
 
 /// x content, set if found in current context
 const SvgNumber& getX() const { return maX; }
diff --git a/svgio/source/svgreader/svgclippathnode.cxx 
b/svgio/source/svgreader/svgclippathnode.cxx
index c8b7e18..0a7f0f4 100644
--- a/svgio/source/svgreader/svgclippathnode.cxx
+++ b/svgio/source/svgreader/svgclippathnode.cxx
@@ -125,7 +125,9 @@ namespace svgio
 }
 }
 
-void 
SvgClipPathNode::apply(drawinglayer::primitive2d::Primitive2DSequence& 
rContent) const
+void SvgClipPathNode::apply(
+drawinglayer::primitive2d::Primitive2DSequence& rContent,
+const basegfx::B2DHomMatrix* pTransform) const
 {
 if(rContent.hasElements() && Display_none != getDisplay())
 {
@@ -172,6 +174,14 @@ namespace svgio
 aContentRange.getRange(),
 aContentRange.getMinimum()));
 }
+else // userSpaceOnUse
+{
+// #i124852#
+if(pTransform)
+{
+aClipPolyPolygon.transform(*pTransform);
+}
+}
 
 // #i124313# try to avoid creating an embedding to a 
MaskPrimitive2D if
 // possible; MaskPrimitive2D processing is potentially 
expensive
diff --git a/svgio/source/svgreader/svgmasknode.cxx 
b/svgio/source/svgreader/svgmasknode.cxx
index 7d3a72b..e80f2e8 100644
--- a/svgio/source/svgreader/svgmasknode.cxx
+++ b/svgio/source/svgreader/svgmasknode.cxx
@@ -190,7 +190,9 @@ namespace svgio
 }
 }
 
-void 
SvgMaskNode::apply(drawinglayer::primitive2d::Primitive2DSequence& rTarget) 
const
+void SvgMaskNode::apply(
+drawinglayer::primitive2d::Primitive2DSequence& rTarget,
+const basegfx::B2DHomMatrix* pTransform) const
 {
 if(rTarget.hasElements() && Display_none != getDisplay())
 {
@@ -252,6 +254,19 @@ namespace svgio
 
 aMaskTarget = 
drawinglayer::primitive2d::Primitive2DSequence(&xTransform, 1);
 }
+

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 24/7d5bc4d13c8ab299f8ca72768946f59815dca4

[Caolán McNamara]

 24/7d5bc4d13c8ab299f8ca72768946f59815dca4 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 8d9d9d2952213ada5ea076a8c4d93d327a01f773
Author: Caolán McNamara 
Date:   Fri Jul 4 16:14:52 2014 +0100

Notes added by 'git notes add'

diff --git a/24/7d5bc4d13c8ab299f8ca72768946f59815dca4 
b/24/7d5bc4d13c8ab299f8ca72768946f59815dca4
new file mode 100644
index 000..8d956da
--- /dev/null
+++ b/24/7d5bc4d13c8ab299f8ca72768946f59815dca4
@@ -0,0 +1 @@
+merged as: 7c4fb287bb1e69725560cd4688e1d1d99d4498e0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 24/6d1ce469c155b81743cb6eaa065da2b19d7dcc

[Caolán McNamara]

 24/6d1ce469c155b81743cb6eaa065da2b19d7dcc |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 505a15125d297e7bbde3e7156f3627a59f001aa7
Author: Caolán McNamara 
Date:   Fri Jul 4 16:18:11 2014 +0100

Notes added by 'git notes add'

diff --git a/24/6d1ce469c155b81743cb6eaa065da2b19d7dcc 
b/24/6d1ce469c155b81743cb6eaa065da2b19d7dcc
new file mode 100644
index 000..e87cd65
--- /dev/null
+++ b/24/6d1ce469c155b81743cb6eaa065da2b19d7dcc
@@ -0,0 +1 @@
+merged as: 1a0b8d8e6cc09e457f1820a8d812d03940caf858
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Armin Le Grand]

 filter/source/svg/svgwriter.cxx |   12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 1a0b8d8e6cc09e457f1820a8d812d03940caf858
Author: Armin Le Grand 
Date:   Fri Jul 4 12:15:15 2014 +

Resolves: #i124825# secure usage of object ID...

in preparation of names for line start/end geometry

(cherry picked from commit 246d1ce469c155b81743cb6eaa065da2b19d7dcc)

Conflicts:
filter/source/svg/svgwriter.cxx

Change-Id: I1a267b33f87cbb935c783670a51853832d483b1a

diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 80e90ac..baea39f 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -3168,7 +3168,11 @@ void SVGActionWriter::ImplWriteActions( const 
GDIMetaFile& rMtf,
 if(aStartArrow.Count())
 {
 mapCurShape->maShapePolyPoly = aStartArrow;
-mapCurShape->maId = *pElementId + "_" + 
OUString::number(nEntryCount++);
+
+if( pElementId ) // #i124825# pElementId is 
optinal, may be zero
+{
+mapCurShape->maId = *pElementId + "_" + 
OUString::number(nEntryCount++);
+}
 
 ImplWriteShape( *mapCurShape );
 }
@@ -3176,7 +3180,11 @@ void SVGActionWriter::ImplWriteActions( const 
GDIMetaFile& rMtf,
 if(aEndArrow.Count())
 {
 mapCurShape->maShapePolyPoly = aEndArrow;
-mapCurShape->maId = *pElementId + "_" + 
OUString::number(nEntryCount++);
+
+if( pElementId ) // #i124825# pElementId is 
optinal, may be zero
+{
+mapCurShape->maId = *pElementId + "_" + 
OUString::number(nEntryCount++);
+}
 
 ImplWriteShape( *mapCurShape );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 sw/qa/extras/ooxmlexport/data/bnc884615.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx  |6 ++
 writerfilter/source/dmapper/DomainMapper.cxx |2 +-
 writerfilter/source/dmapper/OLEHandler.cxx   |   10 --
 writerfilter/source/dmapper/OLEHandler.hxx   |4 +++-
 5 files changed, 18 insertions(+), 4 deletions(-)

New commits:
commit 15c3a08b8b1e8060f9659c7bc98480a39d1802c5
Author: Miklos Vajna 
Date:   Fri Jul 4 16:38:40 2014 +0200

bnc#884615 VML import: import OLE objects in header with background wrapping

We already do this for drawingML shapes since commit
500343105707a9905f5198a4af6ad58fe307b7c2 (DOCX drawingML shape import:
always set Opaque, 2013-12-04), make the VML / OLE case behave the same
as well.

Change-Id: Ic22f1f3cfd325ccbbb9bd6fe9814553683e4de55

diff --git a/sw/qa/extras/ooxmlexport/data/bnc884615.docx 
b/sw/qa/extras/ooxmlexport/data/bnc884615.docx
new file mode 100755
index 000..51ee5ca
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/bnc884615.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
index 22635f4..0aa8235 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
@@ -1736,6 +1736,12 @@ DECLARE_OOXMLEXPORT_TEST(testfdo79591, "fdo79591.docx")
 assertXPath(pXmlDoc, 
"/w:document/w:body/w:p/w:r/mc:AlternateContent/mc:Fallback/w:pict/v:shape", 
"ID", "");
 }
 
+DECLARE_OOXMLEXPORT_TEST(testBnc884615, "bnc884615.docx")
+{
+// The problem was that the shape in the header wasn't in the background.
+CPPUNIT_ASSERT_EQUAL(false, bool(getProperty(getShape(1), 
"Opaque")));
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index ea66861..98e14d7 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -2217,7 +2217,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, 
PropertyMapPtr rContext )
 writerfilter::Reference::Pointer_t pProperties = 
rSprm.getProps();
 if( pProperties.get( ) )
 {
-OLEHandlerPtr pOLEHandler( new OLEHandler );
+OLEHandlerPtr pOLEHandler( new OLEHandler(*this) );
 pProperties->resolve(*pOLEHandler);
 if ( pOLEHandler->isOLEObject( ) )
 {
diff --git a/writerfilter/source/dmapper/OLEHandler.cxx 
b/writerfilter/source/dmapper/OLEHandler.cxx
index 1976a13..a07b443 100644
--- a/writerfilter/source/dmapper/OLEHandler.cxx
+++ b/writerfilter/source/dmapper/OLEHandler.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 #include 
+#include 
 #include 
 #include "GraphicHelpers.hxx"
 
@@ -45,11 +46,12 @@ namespace dmapper {
 using namespace ::com::sun::star;
 
 
-OLEHandler::OLEHandler() :
+OLEHandler::OLEHandler(DomainMapper& rDomainMapper) :
 LoggedProperties(dmapper_logger, "OLEHandler"),
 m_nDxaOrig(0),
 m_nDyaOrig(0),
-m_nWrapMode(1)
+m_nWrapMode(1),
+m_rDomainMapper(rDomainMapper)
 {
 }
 
@@ -104,6 +106,10 @@ void OLEHandler::lcl_attribute(Id rName, Value & rVal)
 
 try
 {
+// Shapes in the header or footer should be in the 
background.
+if (m_rDomainMapper.IsInHeaderFooter())
+xShapeProps->setPropertyValue("Opaque", 
uno::makeAny(false));
+
 m_aShapeSize = xTempShape->getSize();
 m_aShapePosition = xTempShape->getPosition();
 
diff --git a/writerfilter/source/dmapper/OLEHandler.hxx 
b/writerfilter/source/dmapper/OLEHandler.hxx
index 00b4d8a..9e22fc1 100644
--- a/writerfilter/source/dmapper/OLEHandler.hxx
+++ b/writerfilter/source/dmapper/OLEHandler.hxx
@@ -40,6 +40,7 @@ namespace com{ namespace sun{ namespace star{
 namespace writerfilter {
 namespace dmapper
 {
+class DomainMapper;
 /** Handler for OLE objects
  */
 class OLEHandler : public LoggedProperties
@@ -63,6 +64,7 @@ class OLEHandler : public LoggedProperties
 ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > 
m_xReplacement;
 
 ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > 
m_xInputStream;
+DomainMapper& m_rDomainMapper;
 
 // Properties
 virtual void lcl_attribute(Id Name, Value & val) SAL_OVERRIDE;
@@ -73,7 +75,7 @@ class OLEHandler : public LoggedProperties
 const OUString& sObjectName );
 
 public:
-OLEHandler();
+OLEHandler(DomainMapper& rDomainMapper);
 virtual ~OLEHandler();
 
 inline ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape 
> getShape( ) { return m_xShape; };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffi

[Bug 75025] LibreOffice 4.3 most annoying bugs

[bugzilla-daemon]

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

Bug 75025 depends on bug 79158, which changed state.

Bug 79158 Summary: dataloss:Paragraph style background colour ignored on read 
and lost on save
https://bugs.freedesktop.org/show_bug.cgi?id=79158

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

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

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

[Norbert Thiebaud]

 sw/source/core/frmedt/fecopy.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 23275beec1eabe3f3c3d1655b806811862df8f94
Author: Norbert Thiebaud 
Date:   Fri Jul 4 16:31:43 2014 +0200

coverity#1213073-5 Unchecked dynamic cast

Change-Id: I166fdb236f5f70ae854d14b00860a6ef2b814b32

diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx
index c980082..be8058f 100644
--- a/sw/source/core/frmedt/fecopy.cxx
+++ b/sw/source/core/frmedt/fecopy.cxx
@@ -723,10 +723,10 @@ bool SwFEShell::Paste( SwDoc* pClpDoc, bool 
bIncludingPageFrames )
 // cursor of the ring points to identical document positions. Then
 // we should avoid double insertion of text portions...
 while( nCursorCount > 1 && *pCurrCrsr->GetPoint() ==
-*(dynamic_cast(pCurrCrsr->GetPrev())->GetPoint()) )
+*(static_cast(pCurrCrsr->GetPrev())->GetPoint()) )
 {
 --nCursorCount;
-pCurrCrsr = dynamic_cast(pCurrCrsr->GetNext());
+pCurrCrsr = static_cast(pCurrCrsr->GetNext());
 pStartCursor = pCurrCrsr;
 }
 SwPosition aStartPos( *pStartCursor->GetPoint() );
@@ -758,7 +758,7 @@ bool SwFEShell::Paste( SwDoc* pClpDoc, bool 
bIncludingPageFrames )
 }
 else // as long as we find more insert positions in the cursor 
ring
 {// we'll take them
-pCurrCrsr = dynamic_cast(pCurrCrsr->GetNext());
+pCurrCrsr = static_cast(pCurrCrsr->GetNext());
 aInsertPos = *pCurrCrsr->GetPoint();
 --nCursorCount;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Norbert Thiebaud]

 dbaccess/source/ui/misc/propertystorage.cxx |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 27e86fe677d24f99a22f51bbef2de5bee3872580
Author: Norbert Thiebaud 
Date:   Fri Jul 4 19:19:41 2014 +0200

coverity#735691 Unchecked dynimic cast

Change-Id: I5b26469792cf7b2ac6b1b28e2419cadeea09a37d

diff --git a/dbaccess/source/ui/misc/propertystorage.cxx 
b/dbaccess/source/ui/misc/propertystorage.cxx
index f13c3a1..3d59a5e 100644
--- a/dbaccess/source/ui/misc/propertystorage.cxx
+++ b/dbaccess/source/ui/misc/propertystorage.cxx
@@ -62,7 +62,12 @@ namespace dbaui
 // TODO: one could throw an IllegalArgumentException here - 
finally, this method
 // is (to be) used from within an 
XPropertySet::setPropertyValue implementation,
 // where this would be the appropriate reaction on wrong value 
types
-boost::scoped_ptr< ITEMTYPE > pClone( dynamic_cast< ITEMTYPE* 
>( pTypedItem->Clone() ) );
+ITEMTYPE* pCloneItem = dynamic_cast< ITEMTYPE* >( 
pTypedItem->Clone() );
+if(!pCloneItem)
+{
+return false;
+}
+boost::scoped_ptr< ITEMTYPE > pClone( pCloneItem);
 assert(pClone.get());
 pClone->SetValue( aValue );
 _rSet.Put( *pClone );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - android/experimental

[Tomaž Vajngerl]

 android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitShell.java   
  |   12 -
 android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java  
  |   87 +-
 
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java 
 |   57 --
 android/experimental/LOAndroid3/src/java/org/libreoffice/MockTileProvider.java 
  |   27 ++-
 android/experimental/LOAndroid3/src/java/org/libreoffice/TileIterator.java 
  |4 
 android/experimental/LOAndroid3/src/java/org/libreoffice/TileProvider.java 
  |7 
 
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java
 |   27 ---
 
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoSoftwareLayerClient.java
 |   24 --
 android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/Layer.java  
  |1 
 
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/MultiTileLayer.java
   |6 
 android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/SubTile.java
  |3 
 11 files changed, 93 insertions(+), 162 deletions(-)

New commits:
commit ff6aac4167dc72c6546ebfa43f9ede81247c1741
Author: Tomaž Vajngerl 
Date:   Fri Jul 4 19:31:54 2014 +0200

LOAndroid3: Simplify begin/endDrawing calls, remove JSON metadata

Change-Id: Ie8aadd20095eeea05110032ac026a6027771aab8

diff --git 
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitShell.java 
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitShell.java
index 9d0dec7..e4f6b08 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitShell.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitShell.java
@@ -18,7 +18,7 @@ public class LOKitShell {
 
 public static int getDpi() {
 DisplayMetrics metrics = 
LibreOfficeMainActivity.mAppContext.getResources().getDisplayMetrics();
-return (int) metrics.density * 200;
+return (int) metrics.density * 160;
 }
 
 public static ByteBuffer allocateDirectBuffer(int size) {
diff --git 
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java 
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
index 7539d71..63bc72b 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
@@ -8,6 +8,7 @@ import android.graphics.Rect;
 import android.util.JsonWriter;
 import android.util.Log;
 
+import org.mozilla.gecko.gfx.FloatSize;
 import org.mozilla.gecko.gfx.SubTile;
 import org.mozilla.gecko.gfx.ViewportMetrics;
 
@@ -18,8 +19,10 @@ import java.util.Random;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
 public class LOKitThread extends Thread {
-private static final String LOGTAG = "GeckoThread";
+private static final String LOGTAG = LOKitThread.class.getSimpleName();
+
 private static final int TILE_SIZE = 256;
+private LibreOfficeMainActivity mApplication;
 private TileProvider mTileProvider;
 
 public ConcurrentLinkedQueue gEvents = new 
ConcurrentLinkedQueue();
@@ -29,90 +32,34 @@ public class LOKitThread extends Thread {
 }
 
 private boolean draw() throws InterruptedException {
-final LibreOfficeMainActivity application = 
LibreOfficeMainActivity.mAppContext;
-
-if (mTileProvider == null)
-mTileProvider = new 
LOKitTileProvider(application.getLayerController());
-
 int pageWidth = mTileProvider.getPageWidth();
 int pageHeight = mTileProvider.getPageHeight();
 
-String metadata = createJson(0, 0, pageWidth, pageHeight, pageWidth, 
pageHeight, 0, 0, 1.0);
 mViewportMetrics = new ViewportMetrics();
+mViewportMetrics.setPageSize(new FloatSize(pageWidth, pageHeight));
 
-boolean shouldContinue = 
application.getLayerClient().beginDrawing(pageWidth, pageHeight, TILE_SIZE, 
TILE_SIZE, metadata);
+boolean shouldContinue = 
mApplication.getLayerClient().beginDrawing(mViewportMetrics);
 
 if (!shouldContinue) {
 return false;
 }
 
-Log.i(LOGTAG, "Filling tiles..");
-
 for (SubTile tile : mTileProvider.getTileIterator()) {
-application.getLayerClient().addTile(tile);
+mApplication.getLayerClient().addTile(tile);
 }
 
-Log.i(LOGTAG, "End Draw");
-
-application.getLayerClient().endDrawing(0, 0, pageWidth, pageHeight);
+mApplication.getLayerClient().endDrawing();
 
 return true;
 }
 
-private String createJson(ViewportMetrics viewportMetrics) {
-return createJson(
-(int) viewportMetrics.getOrigin().x,
-(int) viewportMetrics.getOrigin().y,
-(int) viewportMetrics.getSize().width,
-(int) viewportMetrics.getSi

[Libreoffice-commits] core.git: 5 commits - chart2/source cui/source svx/source vcl/generic

[Norbert Thiebaud]

 chart2/source/controller/main/DragMethod_RotateDiagram.cxx |4 +-
 cui/source/options/optinet2.cxx|   18 ++---
 svx/source/customshapes/EnhancedCustomShape3d.cxx  |2 -
 vcl/generic/print/bitmap_gfx.cxx   |   13 +++--
 vcl/generic/print/printerjob.cxx   |4 ++
 5 files changed, 30 insertions(+), 11 deletions(-)

New commits:
commit 1c053e7eb3dd08d1971450844dfdf61e7ddfae6a
Author: Norbert Thiebaud 
Date:   Fri Jul 4 20:09:01 2014 +0200

coverity#735340 Unchecked return value

Change-Id: I13df98f64ce505a08ba3e8b2582a17f5d202c4d1

diff --git a/vcl/generic/print/printerjob.cxx b/vcl/generic/print/printerjob.cxx
index 84dbd42..9635aa3 100644
--- a/vcl/generic/print/printerjob.cxx
+++ b/vcl/generic/print/printerjob.cxx
@@ -478,7 +478,9 @@ PrinterJob::EndJob()
 }
 }
 else
-chmod( aFileName.getStr(), mnFileMode );
+{
+(void)chmod( aFileName.getStr(), mnFileMode );
+}
 }
 if (pDestFILE == NULL)
 pDestFILE = fopen (aFileName.getStr(), "w");
commit 6151c6f4508fad5f37142d6c6c3286191ecd580c
Author: Norbert Thiebaud 
Date:   Fri Jul 4 20:06:16 2014 +0200

coverity#735300-1 Unchecked return value

Change-Id: I9cb69643ba43adc76ef38db61da2b7c1c3d3e3c1

diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 9fad8b6..00dbf79 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -1030,18 +1030,28 @@ bool MozPluginTabPage::installPlugin()
 #ifdef UNIX
 // get the real file referred by .so lnk file
 char* pHome = getpwuid(getuid())->pw_dir;
+if(!pHome)
+{
+return false;
+}
 OString lnkFilePath(OString(pHome) + 
OString("/.mozilla/plugins/libnpsoplugin" SAL_DLLEXTENSION));
-remove(lnkFilePath.getStr());
+(void)remove(lnkFilePath.getStr());
 
 // create the dirs if necessary
 struct stat buf;
 char tmpDir[NPP_PATH_MAX] = {0};
-sprintf(tmpDir, "%s/.mozilla", pHome);
+snprintf(tmpDir, NPP_PATH_MAX, "%s/.mozilla", pHome);
 if (0 > stat(lnkFilePath.getStr(), &buf))
 {
-mkdir(tmpDir, 0755);
+if(mkdir(tmpDir, 0755))
+{
+return false;
+}
 strcat(tmpDir, "/plugins");
-mkdir(tmpDir, 0755);
+if(mkdir(tmpDir, 0755))
+{
+return false;
+}
 }
 
 // get the real file path
commit b89311b9710697b3d0fc3a5b474c05c3cab91f42
Author: Norbert Thiebaud 
Date:   Fri Jul 4 19:52:50 2014 +0200

coverity#735602-3 Division by zero

Change-Id: I2da9857e4d526b60b3bf50e10ab180c493fb288f

diff --git a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx 
b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
index eb0ea60..fc2d9d7 100644
--- a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
+++ b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
@@ -115,9 +115,9 @@ void DragMethod_RotateDiagram::MoveSdrDrag(const Point& 
rPnt)
 
 //calculate new angle
 double fX = F_PI / 2.0 * (double)(rPnt.Y() - m_aStartPos.Y())
-/ (double)m_aReferenceRect.GetHeight();
+/ m_aReferenceRect.GetHeight() > 0 ? 
(double)m_aReferenceRect.GetHeight() : 1.0;
 double fY = F_PI * (double)(rPnt.X() - m_aStartPos.X())
-/ (double)m_aReferenceRect.GetWidth();
+/ m_aReferenceRect.GetWidth() > 0 ? 
(double)m_aReferenceRect.GetWidth() : 1.0;
 
 if( m_eRotationDirection != ROTATIONDIRECTION_Y )
 m_fAdditionalYAngleRad = fY;
commit 2fe0d7bc992c5c38ac09e4b76f720c924565a61b
Author: Norbert Thiebaud 
Date:   Fri Jul 4 19:44:46 2014 +0200

coverity#704538-9 Division by zero

Change-Id: Ia77648c3e0442bb5e0a08d01bbd495c9d7c8bbf5

diff --git a/vcl/generic/print/bitmap_gfx.cxx b/vcl/generic/print/bitmap_gfx.cxx
index a7bac34..9ee5677 100644
--- a/vcl/generic/print/bitmap_gfx.cxx
+++ b/vcl/generic/print/bitmap_gfx.cxx
@@ -410,9 +410,16 @@ void
 PrinterGfx::DrawBitmap (const Rectangle& rDest, const Rectangle& rSrc,
 const PrinterBmp& rBitmap)
 {
-double fScaleX = (double)rDest.GetWidth() / (double)rSrc.GetWidth();
-double fScaleY = (double)rDest.GetHeight() / (double)rSrc.GetHeight();
-
+double fScaleX = (double)rDest.GetWidth();
+double fScaleY = (double)rDest.GetHeight();
+if(rSrc.GetWidth() > 0)
+{
+fScaleX = (double)rDest.GetWidth() / (double)rSrc.GetWidth();
+}
+if(rSrc.GetHeigth() > 0)
+{
+fScaleY = (double)rDest.GetHeight() / (double)rSrc.GetHeight();
+}
 PSGSave ();
 PSTranslate (rDest.BottomLeft());
 PSScale (fScaleX, fScaleY);
commit 982c6ab3346f55a877a58f7bb73e74daa27e9820
Author: Norbert Thiebaud 
Date:   Fri Jul 4 19:38:21 2014 +0200

coverity#704499-501 Division by z

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

[Norbert Thiebaud]

 registry/source/keyimpl.cxx |   19 ++-
 1 file changed, 18 insertions(+), 1 deletion(-)

New commits:
commit e18e2b174c6bcf8ed5c5a6d3c88e84f31f2f375a
Author: Norbert Thiebaud 
Date:   Fri Jul 4 20:30:59 2014 +0200

coverity#1213422 Tainted Scalar

Change-Id: I87e845f346fda225127e3439e768b31a8eb93be3

diff --git a/registry/source/keyimpl.cxx b/registry/source/keyimpl.cxx
index 38fa3bb..52c2642 100644
--- a/registry/source/keyimpl.cxx
+++ b/registry/source/keyimpl.cxx
@@ -707,6 +707,15 @@ RegError ORegKey::getLongListValue(const OUString& 
valueName, sal_Int32** pValue
 
 rtl_freeMemory(pBuffer);
 
+/* check for 'reasonable' value */
+/* surely 10 millions entry in a registry list should be enough */
+if(valueSize > 4000)
+{
+pValueList = NULL;
+*pLen = 0;
+rtl_freeMemory(pBuffer);
+return REG_INVALID_VALUE;
+}
 pBuffer = (sal_uInt8*)rtl_allocateMemory(valueSize);
 
 if ( rValue.readAt(VALUE_HEADEROFFSET, pBuffer, valueSize, readBytes) )
@@ -727,12 +736,20 @@ RegError ORegKey::getLongListValue(const OUString& 
valueName, sal_Int32** pValue
 sal_uInt32 len = 0;
 readUINT32(pBuffer, len);
 
+/* make sure the declared size of the arry is consistant with the amount 
of data we have read */
+if(len > (valueSize - 4) / 4)
+{
+pValueList = NULL;
+*pLen = 0;
+rtl_freeMemory(pBuffer);
+return REG_INVALID_VALUE;
+}
 *pLen = len;
 sal_Int32* pVList = (sal_Int32*)rtl_allocateZeroMemory(len * 
sizeof(sal_Int32));
 
 sal_uInt32 offset = 4; // initial 4 Bytes fuer die Laenge des Arrays;
 
-for (sal_uInt32 i=0; i < len; i++)
+for (sal_uInt32 i = 0; i < len; i++)
 {
 readINT32(pBuffer+offset, pVList[i]);
 offset += 4;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Niklas Johansson]

 accessibility/source/standard/vclxaccessiblelist.cxx |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit c6ff6106882494be61425c4cad38f935fca97d47
Author: Niklas Johansson 
Date:   Fri Jul 4 19:25:09 2014 +0200

Notify screen readers when selection changes in listboxes

When you change selections in listboxes without dropdown fuctionality
an accessilble event needs to be sent, this does not happen today.
An example of such listbox is the Suggestions in the Spelling and
Grammar dialog.

Change-Id: I6100c88ae5398d8bf3f511aee7b35e88fbf151f5
Reviewed-on: https://gerrit.libreoffice.org/10087
Tested-by: Norbert Thiebaud 
Reviewed-by: Norbert Thiebaud 

diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx 
b/accessibility/source/standard/vclxaccessiblelist.cxx
index beb252c..d54d515 100644
--- a/accessibility/source/standard/vclxaccessiblelist.cxx
+++ b/accessibility/source/standard/vclxaccessiblelist.cxx
@@ -300,8 +300,13 @@ void VCLXAccessibleList::UpdateSelection_Impl_Acc(bool 
b_IsDropDownList)
 }
 else if (m_aBoxType == LISTBOX && !b_IsDropDownList)
 {
-if ( aNewValue.hasValue())
+if ( aNewValue.hasValue() || aOldValue.hasValue() )
 {
+NotifyAccessibleEvent(
+AccessibleEventId::ACTIVE_DESCENDANT_CHANGED,
+aOldValue,
+aNewValue );
+
 NotifyListItem(aNewValue);
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Takeshi Abe]

 svtools/source/brwbox/brwbox1.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8c95c0e71aa6c006de8a7a706dd17a22366ed4c7
Author: Takeshi Abe 
Date:   Thu Jul 3 12:16:33 2014 +0900

first delete, then nullify

Otherwise an unreachable can happen.

Change-Id: I04f03fc97aa73eb0bf75ad71ca8a1cf2d3729c08
Reviewed-on: https://gerrit.libreoffice.org/10047
Tested-by: Norbert Thiebaud 
Reviewed-by: Norbert Thiebaud 

diff --git a/svtools/source/brwbox/brwbox1.cxx 
b/svtools/source/brwbox/brwbox1.cxx
index a5f68dd..bde475f 100644
--- a/svtools/source/brwbox/brwbox1.cxx
+++ b/svtools/source/brwbox/brwbox1.cxx
@@ -2295,8 +2295,8 @@ void BrowseBox::SetMode( BrowserMode nMode )
 }
 else
 {
-pColSel = 0;
 delete pColSel;
+pColSel = 0;
 }
 
 if ( bMultiSelection )
___
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

[Lionel Elie Mamane]

 connectivity/source/parse/sqlbison.y |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 91ec81fe56ef4bcd93f598c7f36ec81f2c59eb28
Author: Lionel Elie Mamane 
Date:   Thu Jul 3 15:42:40 2014 +0200

JOINs are left-associative

Change-Id: I24fdd2ce9bb87cc52a7c84ec8cd300bc13b11461
Reviewed-on: https://gerrit.libreoffice.org/10057
Tested-by: Norbert Thiebaud 
Reviewed-by: Norbert Thiebaud 

diff --git a/connectivity/source/parse/sqlbison.y 
b/connectivity/source/parse/sqlbison.y
index 97e1ae9..dda9dd3 100644
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
@@ -121,7 +121,8 @@ using namespace connectivity;
 
 %token  SQL_TOKEN_GRANT SQL_TOKEN_GROUP SQL_TOKEN_HAVING 
SQL_TOKEN_IN SQL_TOKEN_INDICATOR SQL_TOKEN_INNER SQL_TOKEN_INTEGER 
SQL_TOKEN_INTO SQL_TOKEN_IS SQL_TOKEN_INTERSECT
 
-%token  SQL_TOKEN_JOIN SQL_TOKEN_KEY SQL_TOKEN_LEADING 
SQL_TOKEN_LIKE SQL_TOKEN_LOCAL SQL_TOKEN_LOWER
+%left  SQL_TOKEN_JOIN
+%token  SQL_TOKEN_KEY SQL_TOKEN_LEADING SQL_TOKEN_LIKE 
SQL_TOKEN_LOCAL SQL_TOKEN_LOWER
 %token  SQL_TOKEN_MAX SQL_TOKEN_MIN SQL_TOKEN_NATURAL 
SQL_TOKEN_NCHAR SQL_TOKEN_NULL SQL_TOKEN_NUMERIC
 
 %token  SQL_TOKEN_OCTET_LENGTH SQL_TOKEN_OF SQL_TOKEN_ON 
SQL_TOKEN_OPTION SQL_TOKEN_ORDER SQL_TOKEN_OUTER
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Lionel Elie Mamane]

 connectivity/source/parse/sqlbison.y |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 5c4823689bfe294db2ad046c8d33f70111eb8ca0
Author: Lionel Elie Mamane 
Date:   Thu Jul 3 15:42:40 2014 +0200

JOINs are left-associative

Change-Id: I24fdd2ce9bb87cc52a7c84ec8cd300bc13b11461
Reviewed-on: https://gerrit.libreoffice.org/10059
Tested-by: Norbert Thiebaud 
Reviewed-by: Norbert Thiebaud 

diff --git a/connectivity/source/parse/sqlbison.y 
b/connectivity/source/parse/sqlbison.y
index 6e7b973..3484b0d 100644
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
@@ -123,7 +123,8 @@ using namespace connectivity;
 
 %token  SQL_TOKEN_GRANT SQL_TOKEN_GROUP SQL_TOKEN_HAVING 
SQL_TOKEN_IN SQL_TOKEN_INDICATOR SQL_TOKEN_INNER SQL_TOKEN_INTEGER 
SQL_TOKEN_INTO SQL_TOKEN_IS SQL_TOKEN_INTERSECT
 
-%token  SQL_TOKEN_JOIN SQL_TOKEN_KEY SQL_TOKEN_LEADING 
SQL_TOKEN_LIKE SQL_TOKEN_LOCAL SQL_TOKEN_LOWER
+%left  SQL_TOKEN_JOIN
+%token  SQL_TOKEN_KEY SQL_TOKEN_LEADING SQL_TOKEN_LIKE 
SQL_TOKEN_LOCAL SQL_TOKEN_LOWER
 %token  SQL_TOKEN_MAX SQL_TOKEN_MIN SQL_TOKEN_NATURAL 
SQL_TOKEN_NCHAR SQL_TOKEN_NULL SQL_TOKEN_NUMERIC
 
 %token  SQL_TOKEN_OCTET_LENGTH SQL_TOKEN_OF SQL_TOKEN_ON 
SQL_TOKEN_OPTION SQL_TOKEN_ORDER SQL_TOKEN_OUTER
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Norbert Thiebaud]

 vcl/generic/print/bitmap_gfx.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4aa157e1259f925f4572331a1f9a95f5234a319e
Author: Norbert Thiebaud 
Date:   Fri Jul 4 21:05:13 2014 +0200

fix typo in coverity#704538-9

Change-Id: If4868ad8190fcb1a64ae6fc18791d7a266d1b1e9

diff --git a/vcl/generic/print/bitmap_gfx.cxx b/vcl/generic/print/bitmap_gfx.cxx
index 9ee5677..9a6d7e8 100644
--- a/vcl/generic/print/bitmap_gfx.cxx
+++ b/vcl/generic/print/bitmap_gfx.cxx
@@ -416,7 +416,7 @@ PrinterGfx::DrawBitmap (const Rectangle& rDest, const 
Rectangle& rSrc,
 {
 fScaleX = (double)rDest.GetWidth() / (double)rSrc.GetWidth();
 }
-if(rSrc.GetHeigth() > 0)
+if(rSrc.GetHeight() > 0)
 {
 fScaleY = (double)rDest.GetHeight() / (double)rSrc.GetHeight();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Norbert Thiebaud]

 chart2/source/controller/main/DragMethod_RotateDiagram.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 22906fd3470ae33b7fcb4c74095d663789c6178d
Author: Norbert Thiebaud 
Date:   Fri Jul 4 21:21:34 2014 +0200

add parenthese to fix precedence issue

Change-Id: Ifb4c750f4ddedd27593acde4e93331e74e9d37c4

diff --git a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx 
b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
index fc2d9d7..d98bc32 100644
--- a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
+++ b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
@@ -115,9 +115,9 @@ void DragMethod_RotateDiagram::MoveSdrDrag(const Point& 
rPnt)
 
 //calculate new angle
 double fX = F_PI / 2.0 * (double)(rPnt.Y() - m_aStartPos.Y())
-/ m_aReferenceRect.GetHeight() > 0 ? 
(double)m_aReferenceRect.GetHeight() : 1.0;
+/ (m_aReferenceRect.GetHeight() > 0 ? 
(double)m_aReferenceRect.GetHeight() : 1.0);
 double fY = F_PI * (double)(rPnt.X() - m_aStartPos.X())
-/ m_aReferenceRect.GetWidth() > 0 ? 
(double)m_aReferenceRect.GetWidth() : 1.0;
+/ (m_aReferenceRect.GetWidth() > 0 ? 
(double)m_aReferenceRect.GetWidth() : 1.0);
 
 if( m_eRotationDirection != ROTATIONDIRECTION_Y )
 m_fAdditionalYAngleRad = fY;
___
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' - sw/qa writerfilter/source

[Miklos Vajna]

 sw/qa/extras/ooxmlexport/data/bnc884615.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |6 ++
 writerfilter/source/dmapper/DomainMapper.cxx |2 +-
 writerfilter/source/dmapper/OLEHandler.cxx   |   10 --
 writerfilter/source/dmapper/OLEHandler.hxx   |4 +++-
 5 files changed, 18 insertions(+), 4 deletions(-)

New commits:
commit c52cb57cc893a6b42d77ceb4cf08a3816824ca4f
Author: Miklos Vajna 
Date:   Fri Jul 4 16:38:40 2014 +0200

bnc#884615 VML import: import OLE objects in header with background wrapping

We already do this for drawingML shapes since commit
500343105707a9905f5198a4af6ad58fe307b7c2 (DOCX drawingML shape import:
always set Opaque, 2013-12-04), make the VML / OLE case behave the same
as well.

(cherry picked from commit 15c3a08b8b1e8060f9659c7bc98480a39d1802c5)

Conflicts:
sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx

Change-Id: Ic22f1f3cfd325ccbbb9bd6fe9814553683e4de55

diff --git a/sw/qa/extras/ooxmlexport/data/bnc884615.docx 
b/sw/qa/extras/ooxmlexport/data/bnc884615.docx
new file mode 100755
index 000..51ee5ca
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/bnc884615.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 456eae2..460d497 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2082,6 +2082,12 @@ DECLARE_OOXMLEXPORT_TEST(testFdo69649, "fdo69649.docx")
 CPPUNIT_ASSERT(contents.match("15"));
 }
 
+DECLARE_OOXMLEXPORT_TEST(testBnc884615, "bnc884615.docx")
+{
+// The problem was that the shape in the header wasn't in the background.
+CPPUNIT_ASSERT_EQUAL(false, bool(getProperty(getShape(1), 
"Opaque")));
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index a824f6e..eb0fb89 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -3467,7 +3467,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, 
PropertyMapPtr rContext, SprmType
 writerfilter::Reference::Pointer_t pProperties = 
rSprm.getProps();
 if( pProperties.get( ) )
 {
-OLEHandlerPtr pOLEHandler( new OLEHandler );
+OLEHandlerPtr pOLEHandler( new OLEHandler(*this) );
 pProperties->resolve(*pOLEHandler);
 if ( pOLEHandler->isOLEObject( ) )
 {
diff --git a/writerfilter/source/dmapper/OLEHandler.cxx 
b/writerfilter/source/dmapper/OLEHandler.cxx
index 44e4f4b..1ace46d 100644
--- a/writerfilter/source/dmapper/OLEHandler.cxx
+++ b/writerfilter/source/dmapper/OLEHandler.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 #include 
+#include 
 #include 
 #include "GraphicHelpers.hxx"
 
@@ -45,11 +46,12 @@ namespace dmapper {
 using namespace ::com::sun::star;
 
 
-OLEHandler::OLEHandler() :
+OLEHandler::OLEHandler(DomainMapper& rDomainMapper) :
 LoggedProperties(dmapper_logger, "OLEHandler"),
 m_nDxaOrig(0),
 m_nDyaOrig(0),
-m_nWrapMode(1)
+m_nWrapMode(1),
+m_rDomainMapper(rDomainMapper)
 {
 }
 
@@ -104,6 +106,10 @@ void OLEHandler::lcl_attribute(Id rName, Value & rVal)
 
 try
 {
+// Shapes in the header or footer should be in the 
background.
+if (m_rDomainMapper.IsInHeaderFooter())
+xShapeProps->setPropertyValue("Opaque", 
uno::makeAny(false));
+
 m_aShapeSize = xTempShape->getSize();
 m_aShapePosition = xTempShape->getPosition();
 
diff --git a/writerfilter/source/dmapper/OLEHandler.hxx 
b/writerfilter/source/dmapper/OLEHandler.hxx
index 63e9207..d7106b1 100644
--- a/writerfilter/source/dmapper/OLEHandler.hxx
+++ b/writerfilter/source/dmapper/OLEHandler.hxx
@@ -41,6 +41,7 @@ namespace com{ namespace sun{ namespace star{
 namespace writerfilter {
 namespace dmapper
 {
+class DomainMapper;
 /** Handler for OLE objects
  */
 class WRITERFILTER_DLLPRIVATE OLEHandler : public LoggedProperties
@@ -64,13 +65,14 @@ class WRITERFILTER_DLLPRIVATE OLEHandler : public 
LoggedProperties
 ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > 
m_xReplacement;
 
 ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > 
m_xInputStream;
+DomainMapper& m_rDomainMapper;
 
 // Properties
 virtual void lcl_attribute(Id Name, Value & val);
 virtual void lcl_sprm(Sprm & sprm);
 
 public:
-OLEHandler();
+OLEHandler(DomainMapper& rDomainMapper);
 virtual ~OLEHandler();
 
 inline ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape 
> getShape( ) { return m_xShape; };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman

Gatlin Sullivan

[Gatlin Sullivan]

All of my past & future contributions to LibreOffice may be licensed
under the MPLv2/LGPLv3+ dual license or public domain.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Andras Timar]

 scp2/source/ooo/file_font_ooo.scp |   10 +++---
 scp2/source/ooo/module_hidden_ooo.scp |2 ++
 2 files changed, 9 insertions(+), 3 deletions(-)

New commits:
commit 9717da810901c9d70dc87b7363dd2dbf3cd5b195
Author: Andras Timar 
Date:   Fri Jul 4 14:29:01 2014 +0200

add Carlito/Caladea fonts to install script

They were added in libreoffice-4-1 branch but not anywhere else.
See 2158e8bf85e139fd3cf59d00059ed2e2026f6a4a

Change-Id: I2dcec7898590b526161be7eec1afe4610e6fe534
(cherry picked from commit 97f63c17f7bc069a12e3afc3975f09897731a693)
Reviewed-on: https://gerrit.libreoffice.org/10082
Tested-by: Michael Stahl 
Reviewed-by: Michael Stahl 

diff --git a/scp2/source/ooo/file_font_ooo.scp 
b/scp2/source/ooo/file_font_ooo.scp
index e7a2da35..597d5af 100644
--- a/scp2/source/ooo/file_font_ooo.scp
+++ b/scp2/source/ooo/file_font_ooo.scp
@@ -1,7 +1,7 @@
 /*
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,7 +31,7 @@
 
 STD_FONT_FILELIST( gid_File_Fnt_Opensymb, "extras_fonts.filelist" )
 
-#ifndef WITHOUT_FONTS 
+#ifndef WITHOUT_FONTS
 
 // DejaVu fonts
 STD_FONT_FILELIST(gid_File_Fnt_DejaVu, "fonts_dejavu.filelist")
@@ -58,12 +58,16 @@ STD_FONT_FILELIST(gid_File_Fnt_SourceSans, 
"fonts_sourcesans.filelist")
 // Source Code Pro fonts
 STD_FONT_FILELIST(gid_File_Fnt_SourceCode, "fonts_sourcecode.filelist")
 
+//Carlito and Caladea fonts
+STD_FONT_FILELIST(gid_File_Fnt_Carlito, "fonts_carlito.filelist")
+STD_FONT_FILELIST(gid_File_Fnt_Caladea, "fonts_caladea.filelist")
+
 #endif
 
 // fontconfig updates to allow proper use of local fonts
 
 #ifdef UNX
-#ifndef WITHOUT_FONTS 
+#ifndef WITHOUT_FONTS
 File gid_File_FcLocal_Conf
 Dir = FILELIST_DIR;
 USER_FILE_BODY;
diff --git a/scp2/source/ooo/module_hidden_ooo.scp 
b/scp2/source/ooo/module_hidden_ooo.scp
index 6b36645..c269045 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -316,6 +316,8 @@ Module gid_Module_Root_Fonts_OOo_Hidden
Default = YES;
Styles = (HIDDEN_ROOT);
Files = (gid_File_Fnt_Opensymb,
+   gid_File_Fnt_Caladea,
+   gid_File_Fnt_Carlito,
gid_File_Fnt_DejaVu,
gid_File_Fnt_Gentium,
gid_File_Fnt_LibSansNarrow,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar]

 scp2/source/ooo/file_font_ooo.scp |   10 +++---
 scp2/source/ooo/module_hidden_ooo.scp |2 ++
 2 files changed, 9 insertions(+), 3 deletions(-)

New commits:
commit d4492b12c53235ec158c48011a67568accb6e3a6
Author: Andras Timar 
Date:   Fri Jul 4 14:29:01 2014 +0200

add Carlito/Caladea fonts to install script

They were added in libreoffice-4-1 branch but not anywhere else.
See 2158e8bf85e139fd3cf59d00059ed2e2026f6a4a

Change-Id: I2dcec7898590b526161be7eec1afe4610e6fe534
(cherry picked from commit 97f63c17f7bc069a12e3afc3975f09897731a693)
Reviewed-on: https://gerrit.libreoffice.org/10083
Tested-by: Michael Stahl 
Reviewed-by: Michael Stahl 

diff --git a/scp2/source/ooo/file_font_ooo.scp 
b/scp2/source/ooo/file_font_ooo.scp
index e7a2da35..597d5af 100644
--- a/scp2/source/ooo/file_font_ooo.scp
+++ b/scp2/source/ooo/file_font_ooo.scp
@@ -1,7 +1,7 @@
 /*
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,7 +31,7 @@
 
 STD_FONT_FILELIST( gid_File_Fnt_Opensymb, "extras_fonts.filelist" )
 
-#ifndef WITHOUT_FONTS 
+#ifndef WITHOUT_FONTS
 
 // DejaVu fonts
 STD_FONT_FILELIST(gid_File_Fnt_DejaVu, "fonts_dejavu.filelist")
@@ -58,12 +58,16 @@ STD_FONT_FILELIST(gid_File_Fnt_SourceSans, 
"fonts_sourcesans.filelist")
 // Source Code Pro fonts
 STD_FONT_FILELIST(gid_File_Fnt_SourceCode, "fonts_sourcecode.filelist")
 
+//Carlito and Caladea fonts
+STD_FONT_FILELIST(gid_File_Fnt_Carlito, "fonts_carlito.filelist")
+STD_FONT_FILELIST(gid_File_Fnt_Caladea, "fonts_caladea.filelist")
+
 #endif
 
 // fontconfig updates to allow proper use of local fonts
 
 #ifdef UNX
-#ifndef WITHOUT_FONTS 
+#ifndef WITHOUT_FONTS
 File gid_File_FcLocal_Conf
 Dir = FILELIST_DIR;
 USER_FILE_BODY;
diff --git a/scp2/source/ooo/module_hidden_ooo.scp 
b/scp2/source/ooo/module_hidden_ooo.scp
index 22edd6c..e75d860 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -374,6 +374,8 @@ Module gid_Module_Root_Fonts_OOo_Hidden
Default = YES;
Styles = (HIDDEN_ROOT);
Files = (gid_File_Fnt_Opensymb,
+   gid_File_Fnt_Caladea,
+   gid_File_Fnt_Carlito,
gid_File_Fnt_DejaVu,
gid_File_Fnt_Gentium,
gid_File_Fnt_LibSansNarrow,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

3 Patches for FDO#70998

[Gatlin Sullivan]

I have added myself to the list of contributors. I have sent my licensing
to the list.

I was working on the EasyHack fdo#70998 (
https://bugs.freedesktop.org/show_bug.cgi?id=70998). I am using a laptop
with low extra space on disk. I can't download the full source of
LibreOffice; therefore, I have not compiled my changes. I used opengrok a
while ago to find the files and diffed them locally. I am just altering
text.

Would somebody please review these patches, please?

There has been a patch applied to the bug since I posted these diffs to the
bug on 2014-06-14, but it should not affect these entries.

/core/officecfg/registry/schema/org/openoffice/Office/

Common.xcs
/core/svx/inc/ 
globlmn+tmpl.hrc
/core/sd/source/ui/app/

menuids_tmpl.src

Requestingly, Gatlin.


On Fri, Jul 4, 2014 at 2:29 PM, Gatlin Sullivan <
gatlibs.libreoff...@gmail.com> wrote:

> All of my past & future contributions to LibreOffice may be licensed under 
> the MPLv2/LGPLv3+ dual license or public domain.
>
>
--- Common.xcs  2014-06-14 16:28:44.040246888 -0500
+++ Common.xcs_new  2014-06-14 18:18:35.790613492 -0500
@@ -4334,7 +4334,7 @@
 preview that can be displayed as replacement. The preview
 graphic will also be printed if the printer is not capable of
 Postscript.
-Preview - Picture preview (TIFF) / Interchange
+Preview - Image preview (TIFF) / Interchange
 (EPSI)
   
   
--- globlmn_tmpl.hrc2014-06-14 16:28:33.495801080 -0500
+++ globlmn_tmpl.hrc_new2014-06-14 18:19:56.078248830 -0500
@@ -256,17 +256,17 @@
 #define ITEM_COMPRESS_GRAPHIC \
 Identifier = SID_COMPRESS_GRAPHIC ; \
 Command = ".uno:CompressGraphic" ; \
-Text [ en-US ] = "Compress Graphic..." ; \
+Text [ en-US ] = "Compress Image..." ; \
 
 #define ITEM_SAVE_GRAPHIC \
 Identifier = SID_SAVE_GRAPHIC ; \
 Command = ".uno:SaveGraphic" ; \
-Text [ en-US ] = "Save Graphic..." ; \
+Text [ en-US ] = "Save Image..." ; \
 
 #define ITEM_CHANGE_PICTURE \
 Identifier = SID_CHANGE_PICTURE ; \
 Command = ".uno:ChangePicture" ; \
-Text [ en-US ] = "Change Picture..." ; \
+Text [ en-US ] = "Change Image..." ; \
 
 #define ITEM_VIEW_ATTR_ZOOM \
 Identifier = SID_ATTR_ZOOM ; \
--- menuids_tmpl.src2014-06-14 16:28:48.708444313 -0500
+++ menuids_tmpl.src_new2014-06-14 18:20:34.499986148 -0500
@@ -147,7 +147,7 @@
 {\
 Identifier = SID_SELECT_BACKGROUND ; \
 HelpId = CMD_SID_SELECT_BACKGROUND ; \
-Text [ en-US ] = "Set Background Picture for Slide ..." ; \
+Text [ en-US ] = "Set Background Image for Slide ..." ; \
 };
 #define MN_DISPLAY_MASTER_BACKGROUND \
 MenuItem\
@@ -855,7 +855,7 @@
 {\
 Identifier = SID_ATTR_GRAF_CROP ; \
 HelpId = CMD_SID_ATTR_GRAF_CROP ; \
-Text [ en-US ] = "Crop Picture..." ; \
+Text [ en-US ] = "Crop Image..." ; \
 };
 
 #define MN_NAVIGATOR\
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Michael Stahl]

 svx/inc/pch/precompiled_svxcore.hxx   |1 -
 svx/source/sdr/contact/viewcontactofopenglobj.cxx |1 -
 2 files changed, 2 deletions(-)

New commits:
commit 6598676ab061b72e66275fcf45098b9f45d459fa
Author: Michael Stahl 
Date:   Fri Jul 4 21:55:02 2014 +0200

svx: the openglprimitive2d.hxx has been removed

Change-Id: Icfb4772fd13db381739e178b70886139705aca84

diff --git a/svx/inc/pch/precompiled_svxcore.hxx 
b/svx/inc/pch/precompiled_svxcore.hxx
index 636e2c9..9568a03 100644
--- a/svx/inc/pch/precompiled_svxcore.hxx
+++ b/svx/inc/pch/precompiled_svxcore.hxx
@@ -349,7 +349,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/svx/source/sdr/contact/viewcontactofopenglobj.cxx 
b/svx/source/sdr/contact/viewcontactofopenglobj.cxx
index 75768ac..4742fdc 100644
--- a/svx/source/sdr/contact/viewcontactofopenglobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofopenglobj.cxx
@@ -10,7 +10,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Matúš Kukan]

 sw/qa/extras/ww8import/ww8import.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 63e4cd95be982da3b85883cde067b5e06c6e5efb
Author: Matúš Kukan 
Date:   Wed Jun 25 09:45:07 2014 +0200

error: no matching function for call to 'assertEquals'

Change-Id: I0b87c2abeec30e9e4eab3ce488a5828b8a5b475d
(cherry picked from commit 4a3b0e544dbc45a3972006a2ead75492d6876f95)
Signed-off-by: Michael Stahl 

diff --git a/sw/qa/extras/ww8import/ww8import.cxx 
b/sw/qa/extras/ww8import/ww8import.cxx
index db1ca82..09467cd 100644
--- a/sw/qa/extras/ww8import/ww8import.cxx
+++ b/sw/qa/extras/ww8import/ww8import.cxx
@@ -275,7 +275,7 @@ DECLARE_WW8IMPORT_TEST(testBnc875715, "bnc875715.doc")
 uno::Reference 
xTextSectionsSupplier(mxComponent, uno::UNO_QUERY);
 uno::Reference 
xSections(xTextSectionsSupplier->getTextSections(), uno::UNO_QUERY);
 // Was incorrectly set as -1270.
-CPPUNIT_ASSERT_EQUAL(0, getProperty(xSections->getByIndex(0), 
"SectionLeftMargin"));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), 
getProperty(xSections->getByIndex(0), "SectionLeftMargin"));
 }
 
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 65675] LibreOffice 4.2 most annoying bugs

[bugzilla-daemon]

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

--- Comment #171 from David  ---
Bug 67379 is a regression from 4.0 and is really getting to be quite annoying.

-- 
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 32664] Keyboard volume keys don't work when LibreOffice is in focus

[bugzilla-daemon]

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

--- Comment #49 from Samuel M.  ---
Hi Daniel,

I think you can just add your patch as an attachment to 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 Gerrit News for core on 2014-07-05

[gerrit]

Moin!

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

 First time contributors doing great things! 
+ fdo76279:Invalid Citation on RoundTrip
  in https://gerrit.libreoffice.org/9898 from Sourav Mahajan
  about module sw, writerfilter
+ fdo#80898:Fix for embedded obj 97-2003 MS Doc File
  in https://gerrit.libreoffice.org/10078 from Dushyant Bhalgami
  about module sw
+ include correct header to use std:: namespace for strlen
  in https://gerrit.libreoffice.org/10076 from Douglas Mencken
  about module include
 End of freshness 

+ new loplugin: externalandnotdefined
  in https://gerrit.libreoffice.org/9901 from Noel Grandin
  about module basctl, basic, bean, bridges, chart2, compilerplugins, cppu, 
cppuhelper, desktop, editeng, embeddedobj, filter, forms, include, jvmfwk, 
reportdesign, rsc, sal, sc, scripting, sd, sfx2, svx, sw, toolkit, vcl
+ fdo#80195 IFERROR() fails to return correct value
  in https://gerrit.libreoffice.org/9830 from Winfried Donkers
  about module sc


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

+ first delete, then nullify
  in https://gerrit.libreoffice.org/10047 from Takeshi Abe
+ Notify screen readers when selection changes in listboxes
  in https://gerrit.libreoffice.org/10087 from Niklas Johansson
+ Related fdo#77603: update Spanish autocorrection patterns.
  in https://gerrit.libreoffice.org/10061 from Adolfo Jayme Barrientos
+ Use standard library optimised routines for OUString/OString
  in https://gerrit.libreoffice.org/10020 from Noel Grandin


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

None

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

+ Replace the whole content for copied documents
  in https://gerrit.libreoffice.org/9862 from Jan-Marek Glogowski
+ fdo#78947 : The File gets corrupted when saved in LO
  in https://gerrit.libreoffice.org/9775 from BisalNayal
+ fdo#79018: LO hangs while opening file.
  in https://gerrit.libreoffice.org/9564 from Yogesh Bharate
+ configure, gbuild: remove Cygwin paths from make environment
  in https://gerrit.libreoffice.org/9698 from Michael Stahl
+ sw/docx export: fix handling of document with header and section(s)
  in https://gerrit.libreoffice.org/6248 from Pierre-Eric Pelloux-Prayer
+ move OpenGLContext to SAL
  in https://gerrit.libreoffice.org/9429 from David Tardon
+ Changes for Wordml
  in https://gerrit.libreoffice.org/9013 from Michel Messak
+ fdo#64945 Remove inconvenient localized symbol code.
  in https://gerrit.libreoffice.org/8696 from Darshana Padmadas
+ fdo#77716 : Paragraph spacing is not preserved after RT.
  in https://gerrit.libreoffice.org/9197 from Tushar Bende
+ Lots of changes to Tango icons
  in https://gerrit.libreoffice.org/7987 from Miroslav Mazel
+ Refactored swooxmlexport tests cases. Added function to check contents.
  in https://gerrit.libreoffice.org/8390 from Nikhil Walvekar
+ fdo#77121 Header / Footer positions not preserved after RT
  in https://gerrit.libreoffice.org/9235 from Priyanka Gaikwad


Best,

Your friendly LibreOffice Gerrit Digest Mailer

Note: The bot generating this message can be found and improved here:
   
https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice